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,12 +1,11 @@ PORTNAME= clamd -PORTREVISION= 1 COMMENT= ClamAV based antivirus plugin for Claws Mail WWW= https://www.claws-mail.org/plugins.php RUN_DEPENDS= clamd:security/clamav CLAWS_PLUGINS_BUILD= ${PORTNAME} .include "../claws-mail/Makefile.claws" .include 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,14 +1,13 @@ 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 LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib USES+= ghostscript CLAWS_PLUGINS_BUILD= ${PORTNAME} .include "../claws-mail/Makefile.claws" .include 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,106 +1,105 @@ PORTNAME= claws-mail -PORTREVISION= 1 CATEGORIES= mail news COMMENT= Lightweight and featureful GTK+ based e-mail and news client WWW= https://www.claws-mail.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl \ libetpan.so:mail/libetpan \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls \ libharfbuzz.so:print/harfbuzz \ libnettle.so:security/nettle \ libsasl2.so:security/cyrus-sasl2 RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ mime-support>0:misc/mime-support USES= autoreconf compiler:c++11-lang cpe desktop-file-utils gettext \ gettext-tools gnome pathfix pkgconfig python shebangfix \ ssl xorg USE_GNOME= cairo librsvg2 USE_XORG= ice sm SHEBANG_FILES= tools/*.pl tools/*.py tools/tb2claws-mail OPTIONS_DEFINE= COMPFACE DEBUG DOCS ENCHANT IPV6 LDAP NLS STARTUP \ THEMES OPTIONS_DEFAULT= COMPFACE ENCHANT GTK2 STARTUP THEMES OPTIONS_RADIO= BRANCH OPTIONS_RADIO_BRANCH= GTK2 GTK3 OPTIONS_SUB= yes COMPFACE_DESC= X-Face support ENCHANT_DESC= Spell checking support GTK2_DESC= Build GTK2+ release GTK3_DESC= Build GTK3+ release STARTUP_DESC= Startup notification support THEMES_DESC= Additional themes COMPFACE_LIB_DEPENDS= libcompface.so:mail/faces COMPFACE_CONFIGURE_ENABLE= compface DEBUG_CONFIGURE_ON= --enable-maintainer-mode ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant ENCHANT_CONFIGURE_ENABLE= enchant IPV6_CONFIGURE_ENABLE= ipv6 LDAP_USES= ldap LDAP_CONFIGURE_ENABLE= ldap NLS_USES= gettext-tools NLS_CONFIGURE_OFF= --disable-nls STARTUP_LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification STARTUP_CONFIGURE_ENABLE= startup-notification THEMES_RUN_DEPENDS= claws-mail-themes>0:x11-themes/claws-mail-themes .include MASTER_OPTIONS= ${PORT_OPTIONS} .include "Makefile.claws" .if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 PLIST_SUB+= GTK2="" .else PLIST_SUB+= GTK2="@comment " .endif .if ${PORT_OPTIONS:MGTK3} USE_GNOME+= gtk30 .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/src/common/ssl.c post-install: @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools && \ ${INSTALL_SCRIPT} acroread2claws-mail.pl \ calypso_convert.pl claws-mail-compose-insert-files.pl \ cm-reparent.pl convert_mbox.pl csv2addressbook.pl ddg_search.pl \ eud2gc.py filter_conv.pl filter_conv_new.pl fix_date.sh \ gif2xface.pl google_msgid.pl kmail-mailbox2claws-mail.pl \ kmail2claws-mail.pl kmail2claws-mail_v2.pl mairix.sh \ mew2claws-mail.pl multiwebsearch.conf multiwebsearch.pl \ nautilus2claws-mail.sh outlook2claws-mail.pl popfile-link.sh \ tb2claws-mail tbird2claws.py textviewer.pl textviewer.sh \ thunderbird-filters-convertor.pl update-po uudec uuooffice \ vcard2xml.py \ ${STAGEDIR}${DATADIR}) post-install-DOCS-on: (cd ${WRKSRC} && ${INSTALL_DATA} NEWS README TODO ${STAGEDIR}${DOCSDIR}) ${INSTALL_DATA} ${WRKSRC}/tools/README ${STAGEDIR}${DOCSDIR}/README.tools .include 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 @@ -1,57 +1,53 @@ CATEGORIES?= mail MASTER_SITES= http://www.claws-mail.org/download.php?file=releases/ MAINTAINER= portmaster@bsdforge.com LICENSE= GPLv3 USES+= autoreconf gettext-tools gmake iconv libtool pkgconfig tar:xz GNU_CONFIGURE= yes 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 .if defined(CLAWS_PLUGINS_BUILD) DISTNAME= claws-mail-${PORTVERSION} PKGNAMEPREFIX= claws-mail- BUILD_DEPENDS+= claws-mail>=${PORTVERSION}:mail/claws-mail RUN_DEPENDS+= claws-mail>=${PORTVERSION}:mail/claws-mail MASTERDIR= ${.CURDIR}/../claws-mail DESCR= ${.CURDIR}/pkg-descr FILESDIR= ${.CURDIR}/files PLIST= ${NONEXISTENT} PKGMESSAGE= ${.CURDIR}/pkg-message CONFIGURE_ARGS+= --disable-nls . for p in ${CLAWS_PLUGINS_BUILD} CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S|--disable-${p}-plugin||} PLIST_FILES+= lib/claws-mail/plugins/${p:S|spam_|spam|}.so . endfor do-build: . for p in ${CLAWS_PLUGINS_BUILD} (cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD}) . endfor do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/claws-mail/plugins . for p in ${CLAWS_PLUGINS_BUILD} (cd ${WRKSRC}/src/plugins/${p} && \ ${INSTALL_LIB} .libs/${p:S|spam_|spam|}.so \ ${STAGEDIR}${PREFIX}/lib/claws-mail/plugins) . endfor .endif 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 @@ -1,10 +1,10 @@ .if !defined(MASTER_OPTIONS) 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)