From 01c420e177547c1d3711df6351eb071d0072271a Mon Sep 17 00:00:00 2001 From: Xin LI Date: Sat, 12 Aug 2023 16:42:58 -0700 Subject: [PATCH] mail/claws-mail: upgrade to 3.19.1 and 4.1.1. PR: ports/273090 Approved by: maintainer --- mail/claws-mail-clamd/Makefile | 1 - mail/claws-mail-pdf_viewer/Makefile | 1 - mail/claws-mail/Makefile | 1 - mail/claws-mail/Makefile.claws | 4 ---- mail/claws-mail/Makefile.ver | 4 ++-- mail/claws-mail/distinfo | 11 +++++------ mail/claws-mail/files/extra-patch-configure.ac | 11 ----------- 7 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 mail/claws-mail/files/extra-patch-configure.ac diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile index 73beb07aff0d..f163639a437b 100644 --- a/mail/claws-mail-clamd/Makefile +++ b/mail/claws-mail-clamd/Makefile @@ -1,5 +1,4 @@ PORTNAME= clamd -PORTREVISION= 1 COMMENT= ClamAV based antivirus plugin for Claws Mail WWW= https://www.claws-mail.org/plugins.php diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile index 8c9e34eca313..23b92717b8b5 100644 --- a/mail/claws-mail-pdf_viewer/Makefile +++ b/mail/claws-mail-pdf_viewer/Makefile @@ -1,5 +1,4 @@ PORTNAME= pdf_viewer -PORTREVISION= 10 COMMENT= PDF and PostScript viewer plugin for Claws Mail WWW= https://www.claws-mail.org/plugin.php?plugin=pdf_viewer diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index ea6c4f919f62..45481eaac6af 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,5 +1,4 @@ PORTNAME= claws-mail -PORTREVISION= 1 CATEGORIES= mail news COMMENT= Lightweight and featureful GTK+ based e-mail and news client diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws index 53ee30e66310..dc05c10dedf5 100644 --- a/mail/claws-mail/Makefile.claws +++ b/mail/claws-mail/Makefile.claws @@ -13,10 +13,6 @@ CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static .include "${.CURDIR}/../claws-mail/Makefile.ver" .include "${.CURDIR}/../claws-mail/Makefile.claws.plugins" -.if ${MASTER_OPTIONS:MGTK2} -EXTRA_PATCHES+= ${.CURDIR}/../claws-mail/files/extra-patch-configure.ac -.endif - .for p in ${CLAWS_PLUGINS} CONFIGURE_ARGS+= --disable-${p}-plugin .endfor diff --git a/mail/claws-mail/Makefile.ver b/mail/claws-mail/Makefile.ver index 919bdfbb00da..c4b79c88c63b 100644 --- a/mail/claws-mail/Makefile.ver +++ b/mail/claws-mail/Makefile.ver @@ -3,8 +3,8 @@ MASTER_OPTIONS!= ${MAKE} -C ${.CURDIR}/../claws-mail -V PORT_OPTIONS .endif .if ${MASTER_OPTIONS:MGTK2} -PORTVERSION= 3.19.0 +PORTVERSION= 3.19.1 .endif .if ${MASTER_OPTIONS:MGTK3} -PORTVERSION= 4.1.0 +PORTVERSION= 4.1.1 .endif diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo index 02ecfa0e2b1c..1c240e132d37 100644 --- a/mail/claws-mail/distinfo +++ b/mail/claws-mail/distinfo @@ -1,6 +1,5 @@ -TIMESTAMP = 1667251029 -SHA256 (claws-mail-3.19.0.tar.xz) = 0d0c757a9975da1f97bf5309cd051c18ad6c765fefe9319276aa3a9e48229fa2 -SIZE (claws-mail-3.19.0.tar.xz) = 6543188 -TIMESTAMP = 1667290477 -SHA256 (claws-mail-4.1.0.tar.xz) = 0e1a9ca0db8d2a9e058ae30cdc7fc919779214ec3c56ee0c8a7f88cc23817a8e -SIZE (claws-mail-4.1.0.tar.xz) = 6471604 +TIMESTAMP = 1691825727 +SHA256 (claws-mail-3.19.1.tar.xz) = ac57fa557cf15c62e5f8fad247585fc609f0a696f6da54ed42cc000b6c6d6813 +SIZE (claws-mail-3.19.1.tar.xz) = 6580844 +SHA256 (claws-mail-4.1.1.tar.xz) = b189e700c1896f5e0deb0b76d4bfa820eb7ac1935ee10aa9afbada3cf53a0344 +SIZE (claws-mail-4.1.1.tar.xz) = 6523688 diff --git a/mail/claws-mail/files/extra-patch-configure.ac b/mail/claws-mail/files/extra-patch-configure.ac deleted file mode 100644 index 7be834dbee9b..000000000000 --- a/mail/claws-mail/files/extra-patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2022-10-31 21:17:54 UTC -+++ configure.ac -@@ -2116,7 +2116,7 @@ AM_CONDITIONAL(BUILD_DILLO_PLUGIN, test x"$enable_dil - AM_CONDITIONAL(BUILD_FANCY_PLUGIN, test x"$enable_fancy_plugin" != xno) - AM_CONDITIONAL(BUILD_FETCHINFO_PLUGIN, test x"$enable_fetchinfo_plugin" != xno) - AM_CONDITIONAL(BUILD_GDATA_PLUGIN, test x"$enable_gdata_plugin" != xno) --AM_CONDITIONAL(BUILD_KEYWORD_WARNER_PLUGIN, test x"$enable_keywordwarner_plugin" != xno) -+AM_CONDITIONAL(BUILD_KEYWORD_WARNER_PLUGIN, test x"$enable_keyword_warner_plugin" != xno) - AM_CONDITIONAL(BUILD_LIBRAVATAR_PLUGIN, test x"$enable_libravatar_plugin" != xno) - AM_CONDITIONAL(BUILD_LITEHTML_VIEWER_PLUGIN, test x"$enable_litehtml_viewer_plugin" != xno) - AM_CONDITIONAL(BUILD_MAILMBOX_PLUGIN, test x"$enable_mailmbox_plugin" != xno)