Re: update mail/claws-mail

On Wed, 21 Jul 2021 00:04:44 +0200
Solene Rapenne <solene@perso.pw> wrote:

> new version fixing libcroco, some extra whitespaces and maybe other
> errors I forgot about.

4.0.0 Works for me.
As always I don't run plugins, but the basics do work.

> Index: Makefile
> ===================================================================
> RCS file: /home/reposync/ports/mail/claws-mail/Makefile,v
> retrieving revision 1.131
> diff -u -p -r1.131 Makefile
> --- Makefile 9 Jun 2021 19:50:08 -0000 1.131
> +++ Makefile 20 Jul 2021 17:34:01 -0000
> @@ -6,9 +6,8 @@ COMMENT-spamassassin= spamassassin plugi
> COMMENT-pdfviewer= pdfviewer plugin
> COMMENT-gdata= gdata plugin
>
> -V= 3.17.8
> +V= 4.0.0
> DISTNAME= claws-mail-${V}
> -REVISION= 0
> PKGNAME-main= ${DISTNAME}
> PKGNAME-bogofilter= claws-mail-bogofilter-${V}
> PKGNAME-spamassassin= claws-mail-spamassassin-${V}
> @@ -22,7 +21,7 @@ HOMEPAGE= https://www.claws-mail.org/
> # GPLv3+
> PERMIT_PACKAGE= Yes
>
> -MASTER_SITES= http://www.claws-mail.org/releases/
> +MASTER_SITES= https://www.claws-mail.org/releases/
>
> DIST_SUBDIR= claws
>
> @@ -41,33 +40,35 @@ RUN_DEPENDS-spamassassin=${BUILD_PKGPATH
> mail/p5-Mail-SpamAssassin
>
> WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB += Xrandr Xrender atk-1.0 cairo crypto curl etpan execinfo
> -WANTLIB += expat ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0
> -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
> -WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m nghttp2 pango-1.0
> +WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 cairo cairo-gobject
> +WANTLIB += crypto curl etpan execinfo expat ffi fontconfig freetype
> +WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
> +WANTLIB += graphite2 gtk-3 harfbuzz iconv intl jpeg m nghttp2 pango-1.0
> WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> -WANTLIB += sasl2 ssl xcb xcb-render xcb-shm z
> +WANTLIB += sasl2 ssl xcb xcb-render xcb-shm z epoxy
> +WANTLIB += ${COMPILER_LIBCXX}
>
> WANTLIB-main = ${WANTLIB}
> -WANTLIB-main += ICE SM X11-xcb archive assuan b2 bz2 c canberra canberra-gtk
> -WANTLIB-main += charset cairo-gobject db dbus-1 dbus-glib-1 enchant gmp gnutls gpg-error
> -WANTLIB-main += gpgme gumbo hogweed ical icalss icalvcal icudata icui18n icuuc idn2
> -WANTLIB-main += ltdl lz4 lzma nettle notify ogg p11-kit perl rsvg-2
> -WANTLIB-main += startup-notification-1 ${COMPILER_LIBCXX} tasn1 unistring vorbis
> -WANTLIB-main += vorbisfile xcb-util xml2 zstd gthread-2.0
> +WANTLIB-main += ICE SM X11-xcb archive assuan b2 bz2 c
> +WANTLIB-main += charset db dbus-1 dbus-glib-1 enchant
> +WANTLIB-main += gmp gnutls gpg-error gpgme gthread-2.0 gumbo hogweed ical icalss
> +WANTLIB-main += icalvcal icudata icui18n icuuc idn2 lz4 lzma nettle notify
> +WANTLIB-main += p11-kit perl rsvg-2 startup-notification-1 tasn1 unistring
> +WANTLIB-main += xcb-util xml2 zstd
>
> WANTLIB-gdata = ${WANTLIB}
> -WANTLIB-gdata += brotlicommon brotlidec gck-1 gcr-base-3 gcrypt gdata
> -WANTLIB-gdata += goa-1.0 gpg-error gthread-2.0 idn2 json-glib-1.0 lzma
> -WANTLIB-gdata += p11-kit psl soup-2.4 sqlite3 unistring xml2
> +WANTLIB-gdata += brotlicommon brotlidec gck-1 gcr-base-3
> +WANTLIB-gdata += gcrypt gdata goa-1.0 gpg-error idn2 json-glib-1.0
> +WANTLIB-gdata += lzma p11-kit psl soup-2.4 sqlite3 unistring xml2
>
> WANTLIB-pdfviewer = ${WANTLIB}
> -WANTLIB-pdfviewer += jpeg lcms2 lzma openjp2 png poppler poppler-glib tiff zstd
> -WANTLIB-pdfviewer += ${COMPILER_LIBCXX}
> +WANTLIB-pdfviewer += lcms2 lzma openjp2 png poppler poppler-glib tiff zstd
>
> -LIB_DEPENDS= mail/libetpan \
> +
> +LIB_DEPENDS= devel/glib2 \
> + mail/libetpan \
> security/cyrus-sasl2 \
> - x11/gtk+2
> + x11/gtk+3
>
> RUN_DEPENDS-main= ${RUN_DEPENDS} \
> devel/desktop-file-utils \
> @@ -77,7 +78,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
> archivers/libarchive \
> archivers/xz \
> archivers/zstd \
> - audio/libcanberra,-gtk \
> + devel/glib2 \
> devel/libnotify \
> devel/startup-notification \
> security/gnutls>=2.2 \
> @@ -87,26 +88,22 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
> textproc/enchant \
> textproc/libical \
> www/gumbo \
> - x11/dbus-glib
> + x11/dbus-glib \
> + x11/gnome/at-spi2-atk
>
> LIB_DEPENDS-pdfviewer= ${LIB_DEPENDS} \
> print/poppler
>
> LIB_DEPENDS-gdata= ${LIB_DEPENDS} \
> - devel/libgdata \
> - security/nss
> + devel/libgdata
>
> -#geolocation looks for champlain <= 0.10
> -#python tries to dlopen libpython2.7.so
> CONFIGURE_ARGS+= --disable-acpi_notifier-plugin \
> --disable-compface \
> --disable-fancy-plugin \
> - --disable-geolocation-plugin \
> --disable-python-plugin \
> --disable-tnef_parse-plugin \
> --disable-bsfilter-plugin \
> - --enable-crash-dialog \
> - --enable-new-addrbook
> + --enable-crash-dialog
>
> USE_GMAKE= Yes
> LIBTOOL_FLAGS= --tag=disable-static
> Index: distinfo
> ===================================================================
> RCS file: /home/reposync/ports/mail/claws-mail/distinfo,v
> retrieving revision 1.41
> diff -u -p -r1.41 distinfo
> --- distinfo 27 Oct 2020 09:25:37 -0000 1.41
> +++ distinfo 19 Jul 2021 08:22:25 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (claws/claws-mail-3.17.8.tar.gz) = UNQHidMwY8FrOLQXe+iP+x1JnnUAfoYwZwmW+iyyXyA=
> -SIZE (claws/claws-mail-3.17.8.tar.gz) = 12509574
> +SHA256 (claws/claws-mail-4.0.0.tar.gz) = bwQ2RxX5es2MJsft1hpXWY2Sb1fnlsA7udkIDPo9yJQ=
> +SIZE (claws/claws-mail-4.0.0.tar.gz) = 12360386
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /home/reposync/ports/mail/claws-mail/pkg/PLIST-main,v
> retrieving revision 1.44
> diff -u -p -r1.44 PLIST-main
> --- pkg/PLIST-main 20 Aug 2020 06:50:33 -0000 1.44
> +++ pkg/PLIST-main 17 Jul 2021 09:39:44 -0000
> @@ -122,7 +122,6 @@ include/claws-mail/gtk/foldersort.h
> include/claws-mail/gtk/gtkaspell.h
> include/claws-mail/gtk/gtkcmclist.h
> include/claws-mail/gtk/gtkcmctree.h
> -include/claws-mail/gtk/gtkcmoptionmenu.h
> include/claws-mail/gtk/gtksctree.h
> include/claws-mail/gtk/gtkshruler.h
> include/claws-mail/gtk/gtkunit.h
> @@ -178,6 +177,7 @@ include/claws-mail/mutt.h
> include/claws-mail/news.h
> include/claws-mail/news_gtk.h
> include/claws-mail/noticeview.h
> +include/claws-mail/oauth2.h
> include/claws-mail/partial_download.h
> include/claws-mail/password.h
> include/claws-mail/password_gtk.h
> @@ -363,9 +363,6 @@ share/locale/nb/LC_MESSAGES/claws-mail.m
> share/locale/nl/LC_MESSAGES/claws-mail.mo
> share/locale/pl/LC_MESSAGES/claws-mail.mo
> share/locale/pt_BR/LC_MESSAGES/claws-mail.mo
> -share/locale/pt_PT/
> -share/locale/pt_PT/LC_MESSAGES/
> -share/locale/pt_PT/LC_MESSAGES/claws-mail.mo
> share/locale/ro/LC_MESSAGES/claws-mail.mo
> share/locale/ru/LC_MESSAGES/claws-mail.mo
> share/locale/sk/LC_MESSAGES/claws-mail.mo
>