mail/claws-mail: Update to 3.19.0

- Update to 3.19.0 - Reset PORTREVISION where apropriate (notably in slave ports) And while here, also portclippy and portfmt a bit. Approved by: Chris Hutchinson <portmaster@bsdforge.com> (maintainer) PR: 263059
freebsd · May 20, 2022 · 32ad969 · 32ad969
1 parent a1bd6c4
commit 32ad969
Show file tree

Hide file tree

Showing 33 changed files with 46 additions and 58 deletions.
diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	address_keeper
-PORTREVISION=	0
 
 COMMENT=	Recipient addresses keeper plugin for Claws Mail
 

diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile
@@ -1,7 +1,6 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 
 PORTNAME=	archive
-PORTREVISION=	0
 
 COMMENT=	Mail archiver plugin for Claws Mail
 

diff --git a/mail/claws-mail-att_remover/Makefile b/mail/claws-mail-att_remover/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	att_remover
-PORTREVISION=	0
 
 COMMENT=	Attachments removing plugin for Claws Mail
 

diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	attachwarner
-PORTREVISION=	0
 
 COMMENT=	Not attached file warning plugin for Claws Mail
 

diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <pawel@FreeBSD.org>
 
 PORTNAME=	bogofilter
-PORTREVISION=	0
 
 COMMENT=	Spam filtering plugin for Claws Mail
 

diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
@@ -1,7 +1,6 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 
 PORTNAME=	bsfilter
-PORTREVISION=	0
 
 COMMENT=	Spam filtering, bsfilter based plugin for Claws Mail
 

diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	clamd
-PORTREVISION=	1
 
 COMMENT=	ClamAV based antivirus plugin for Claws Mail
 

diff --git a/mail/claws-mail-dillo/Makefile b/mail/claws-mail-dillo/Makefile
@@ -1,7 +1,6 @@
 # Created by: Rozhuk Ivan <rozhuk.im@gmail.com>
 
 PORTNAME=	dillo
-PORTREVISION=	0
 
 COMMENT=	Viewing of html messages using the Dillo web browser
 

diff --git a/mail/claws-mail-dillo/pkg-descr b/mail/claws-mail-dillo/pkg-descr
@@ -5,5 +5,4 @@ It features:
 - Optional fetching and displaying of remote images
 - Browsing the web from within of Claws Mail
 
-
-WWW: https://www.claws-mail.org/plugins.php
+WWW: https://www.claws-mail.org/plugin.php?plugin=dillo
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	fetchinfo
-PORTREVISION=	0
 
 COMMENT=	Header insertion plugin for Claws Mail
 

diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <pawel@FreeBSD.org>
 
 PORTNAME=	gdata
-PORTREVISION=	0
 
 COMMENT=	Plugin providing Google Contacts in the Tab-address completion
 

diff --git a/mail/claws-mail-gdata/pkg-descr b/mail/claws-mail-gdata/pkg-descr
@@ -3,4 +3,4 @@ Provides access to GData (Google services) for Claws Mail.
 The only currently implemented feature is inclusion of
 Google contacts into the address completion.
 
-WWW: https://www.claws-mail.org/plugins.php
+WWW: https://www.claws-mail.org/plugin.php?plugin=gdata
diff --git a/mail/claws-mail-libravatar/Makefile b/mail/claws-mail-libravatar/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <pawel@freebsd.org>
 
 PORTNAME=	libravatar
-PORTREVISION=	0
 
 COMMENT=	Avatar display plugin for Claws Mail
 

diff --git a/mail/claws-mail-litehtml_viewer/Makefile b/mail/claws-mail-litehtml_viewer/Makefile
@@ -1,7 +1,6 @@
 # Created by: Rozhuk Ivan <rozhuk.im@gmail.com>
 
 PORTNAME=	litehtml_viewer
-PORTREVISION=	1
 
 COMMENT=	Viewer plugin for HTML emails, using the litehtml library
 

diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	mailmbox
-PORTREVISION=	0
 
 COMMENT=	Mbox maildir plugin for Claws Mail
 

diff --git a/mail/claws-mail-managesieve/Makefile b/mail/claws-mail-managesieve/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <pawel@FreeBSD.org>
 
 PORTNAME=	managesieve
-PORTREVISION=	0
 
 COMMENT=	Sieve filters manager for Claws Mail
 

diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	newmail
-PORTREVISION=	0
 
 COMMENT=	Message header summary logging plugin for Claws Mail
 

diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	notification
-PORTREVISION=	1
 
 COMMENT=	New mail notification plugin for Claws Mail
 

diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	pdf_viewer
-PORTREVISION=	9
 
 COMMENT=	PDF and PostScript viewer plugin for Claws Mail
 

diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	perl
-PORTREVISION=	0
 
 COMMENT=	Perl filtering plugin for Claws Mail
 

diff --git a/mail/claws-mail-pgp/Makefile b/mail/claws-mail-pgp/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <pawel@FreeBSD.org>
 
 PORTNAME=	pgp
-PORTREVISION=	0
 
 COMMENT=	PGP plugins for Claws Mail
 

diff --git a/mail/claws-mail-plugins/Makefile b/mail/claws-mail-plugins/Makefile
@@ -1,7 +1,7 @@
 # Created by: Rozhuk Ivan <rozhuk.im@gmail.com>
 
 PORTNAME=	claws-mail-plugins
-PORTVERSION=	3.18.0
+PORTVERSION=	3.19.0
 CATEGORIES=	mail news
 
 MAINTAINER=	portmaster@BSDforge.com

diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
@@ -1,7 +1,6 @@
 # Created by: v.velox@vvelox.net
 
 PORTNAME=	rssyl
-PORTREVISION=	0
 PORTEPOCH=	4
 
 COMMENT=	RSS/Atom feed reader plugin for Claws Mail

diff --git a/mail/claws-mail-rssyl/pkg-descr b/mail/claws-mail-rssyl/pkg-descr
@@ -1,4 +1,4 @@
 This plugin allows you to read your favorite newsfeeds in Claws Mail.
 RSS 1.0, 2.0 and Atom feeds are currently supported.
 
-WWW: https://www.claws-mail.org/plugin.php?plugin=rssyl
+WWW: https://www.claws-mail.org/plugins.php
diff --git a/mail/claws-mail-spam_report/Makefile b/mail/claws-mail-spam_report/Makefile
@@ -1,7 +1,6 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 
 PORTNAME=	spam_report
-PORTREVISION=	0
 
 COMMENT=	Spam report plugin for Claws Mail
 

diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <pawel@FreeBSD.org>
 
 PORTNAME=	spamassassin
-PORTREVISION=	0
 
 COMMENT=	SpamAssassin plugin for Claws Mail
 

diff --git a/mail/claws-mail-tnef_parse/Makefile b/mail/claws-mail-tnef_parse/Makefile
@@ -1,7 +1,6 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 
 PORTNAME=	tnef_parse
-PORTREVISION=	0
 
 COMMENT=	TNEF attachment format parser plugin for Claws Mail
 

diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	vcalendar
-PORTREVISION=	0
 
 COMMENT=	vCalendar plugin for Claws Mail
 

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
@@ -1,7 +1,6 @@
 # Created by: Simon 'corecode' Schubert <corecode@corecode.ath.cx>
 
 PORTNAME=	claws-mail
-PORTREVISION=	1
 CATEGORIES=	mail news
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
@@ -11,51 +10,53 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libetpan.so:mail/libetpan \
-		libfreetype.so:print/freetype2 \
-		libharfbuzz.so:print/harfbuzz \
-		libsasl2.so:security/cyrus-sasl2 \
-		libgnutls.so:security/gnutls \
-		libgcrypt.so:security/libgcrypt \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
-		libnettle.so:security/nettle
-RUN_DEPENDS=	mime-support>0:misc/mime-support \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+		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:3.5+ shebangfix ssl xorg
-USE_XORG=	ice sm
+		gettext-tools gnome pathfix pkgconfig python:3.5+ shebangfix \
+		ssl xorg
 USE_GNOME=	cairo gtk20 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 STARTUP THEMES
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		COMPFACE DEBUG DOCS ENCHANT IPV6 LDAP NLS STARTUP \
+			THEMES
+OPTIONS_DEFAULT=	COMPFACE ENCHANT STARTUP THEMES
+OPTIONS_SUB=		yes
 
-COMPFACE_DESC=		X-Face support
+COMPFACE_DESC=	X-Face support
+ENCHANT_DESC=	Spell checking support
+STARTUP_DESC=	Startup notification support
+THEMES_DESC=	Additional themes
+
+COMPFACE_LIB_DEPENDS=		libcompface.so:mail/faces
 COMPFACE_CONFIGURE_ENABLE=	compface
-COMPFACE_LIB_DEPENDS=	libcompface.so:mail/faces
 
 DEBUG_CONFIGURE_ON=	--enable-maintainer-mode
 
-ENCHANT_DESC=		Spell checking support
+ENCHANT_LIB_DEPENDS=		libenchant.so:textproc/enchant
 ENCHANT_CONFIGURE_ENABLE=	enchant
-ENCHANT_LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
+LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_ENABLE=	ldap
-LDAP_USE=		openldap=yes
 
-NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext-tools
+NLS_CONFIGURE_OFF=	--disable-nls
 
-STARTUP_DESC=		Startup notification support
+STARTUP_LIB_DEPENDS=		libstartup-notification-1.so:x11/startup-notification
 STARTUP_CONFIGURE_ENABLE=	startup-notification
-STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
-THEMES_DESC=		Additional themes
 THEMES_RUN_DEPENDS=	claws-mail-themes>0:x11-themes/claws-mail-themes
 
 .include "Makefile.claws"

diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
@@ -1,4 +1,4 @@
-PORTVERSION=	3.18.0
+PORTVERSION=	3.19.0
 CATEGORIES?=	mail
 MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
 

diff --git a/mail/claws-mail/Makefile.claws.plugins b/mail/claws-mail/Makefile.claws.plugins
@@ -10,6 +10,7 @@ CLAWS_PLUGINS=	acpi_notifier \
 		fancy \
 		fetchinfo \
 		gdata \
+		keyword_warner \
 		libravatar \
 		litehtml_viewer \
 		mailmbox \

diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1626114302
-SHA256 (claws-mail-3.18.0.tar.xz) = cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
-SHA512 (claws-mail-3.18.0.tar.xz) = 3f73e11fc75234c44c0faf266a196c7f1c80b837fb920fc4a3979ede81f37efd180c006ab6436ae9c2dffde2d6c3bf6340a90d93e1e3fa8821fb09693d030811
-SIZE (claws-mail-3.18.0.tar.xz) = 6517632
+TIMESTAMP = 1652727190
+SHA256 (claws-mail-3.19.0.tar.xz) = 0d0c757a9975da1f97bf5309cd051c18ad6c765fefe9319276aa3a9e48229fa2
+SHA512 (claws-mail-3.19.0.tar.xz) = 88780df55873919197d3c6df5102a8eb89a586e8287419c179e1d0af839435a719814b1e3643aa783a7badeadceafda2dc3cb4a3265432b5ad3a210663922b20
+SIZE (claws-mail-3.19.0.tar.xz) = 6543188
diff --git a/mail/claws-mail/files/patch-configure.ac b/mail/claws-mail/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac	2022-03-11 12:05:14.000000000 +0100
++++ configure.ac.patched	2022-05-18 23:30:12.273740000 +0200
+@@ -2116,7 +2116,7 @@
+ 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)