Update to Claws Mail 3.9.1 release

Changelog: http://claws-mail.org/news.php

claws-mail:
- Now whole release is distributed as one file
- Move common stuff to Makefile.claws
- Cleanup many accumulated, old and not needed things
- Move bogofilter, pgp and spamassassin plugins to separate ports
- Dillo plugin was dropped so drop option for it

plugins:
- All plugins ports are now slaves to main port
- Remove all distinfo and pkg-plist files - this is
  now handled by main port
- Deprecate cachesaver and gtkhtml2_viewer plugins - they are not
  maintained by upstream anymore

6 files changed, 185 insertions, 152 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 31856ca9cbe1..d8470b007075 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -2,84 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	claws-mail
-PORTVERSION=	3.9.0
-PORTREVISION=	3
 CATEGORIES=	mail news ipv6
-MASTER_SITES=	SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
 
-MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Lightweight and very featureful GTK+ based e-mail and news client
 
-LICENSE=	GPLv3
-
 LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
-		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		pcre:${PORTSDIR}/devel/pcre \
-		curl:${PORTSDIR}/ftp/curl \
-		cairo:${PORTSDIR}/graphics/cairo \
-		png15:${PORTSDIR}/graphics/png \
 		etpan:${PORTSDIR}/mail/libetpan \
-		gmp:${PORTSDIR}/math/gmp \
-		freetype:${PORTSDIR}/print/freetype2 \
-		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		gnutls:${PORTSDIR}/security/gnutls \
-		gcrypt:${PORTSDIR}/security/libgcrypt \
-		gpg-error:${PORTSDIR}/security/libgpg-error \
-		tasn1:${PORTSDIR}/security/libtasn1 \
-		nettle:${PORTSDIR}/security/nettle \
-		p11-kit:${PORTSDIR}/security/p11-kit \
-		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		xcb:${PORTSDIR}/x11/libxcb
+		gcrypt:${PORTSDIR}/security/libgcrypt
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
-CONFLICTS=	sylpheed-claws
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
-		xfixes xi xinerama xrandr xrender
-USE_GNOME=	atk glib20 gnomehack gtk20 libartlgpl2 libxml2 pango
-GNU_CONFIGURE=	yes
-USES=		pkgconfig iconv
+USE_GNOME=	gtk20
+USES=		iconv pathfix pkgconfig
 INSTALLS_ICONS=	yes
-MAKE_JOBS_SAFE=	yes
 
 MAN1=		claws-mail.1
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} --disable-dbus
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -pthread"
-
-OPTIONS_DEFINE=	BOGOFILTER COMPFACE DEBUG DILLO ENCHANT GPGME IPV6 JPILOT LDAP \
-		MANUAL SPAMASSASSIN STARTUP THEMES
+OPTIONS_DEFINE=	COMPFACE DEBUG DOCS ENCHANT IPV6 JPILOT LDAP \
+		MANUAL NLS STARTUP THEMES
 
-BOGOFILTER_DESC=	Bogofilter plugin
 COMPFACE_DESC=		X-Face support
-DILLO_DESC=		Dillo HTML viewer plugin
 ENCHANT_DESC=		Spell checking support
-GPGME_DESC=		PGP/GnuPG/SMIME plugins
-JPILOT_DESC=		JPilot plugin
+JPILOT_DESC=		JPilot support
 MANUAL_DESC=		User manual
-SPAMASSASSIN_DESC=	SpamAssassin plugin
 STARTUP_DESC=		Startup notification support
 THEMES_DESC=		Additional themes
 
 OPTIONS_DEFAULT=	COMPFACE ENCHANT MANUAL STARTUP THEMES
 
+.include "Makefile.claws"
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MBOGOFILTER}
-RUN_DEPENDS+=		bogofilter:${PORTSDIR}/mail/bogofilter
-CONFIGURE_ARGS+=	--enable-bogofilter-plugin
-PLIST_SUB+=		BOGO_PLUG=""
-.else
-CONFIGURE_ARGS+=	--disable-bogofilter-plugin
-PLIST_SUB+=		BOGO_PLUG="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MCOMPFACE}
 LIB_DEPENDS+=		compface:${PORTSDIR}/mail/faces
 CONFIGURE_ARGS+=	--enable-compface
@@ -126,41 +79,10 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@Comment "
 .endif
 
-.if ${PORT_OPTIONS:MSPAMASSASSIN}
-RUN_DEPENDS+=		spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
-CONFIGURE_ARGS+=	--enable-spamassassin-plugin
-PLIST_SUB+=		SA_PLUG=""
-.else
-CONFIGURE_ARGS+=	--disable-spamassassin-plugin
-PLIST_SUB+=		SA_PLUG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGPGME}
-PLIST_SUB+=		GPGME=""
-CONFIGURE_ARGS+=	--enable-pgpmime-plugin --enable-pgpcore-plugin \
-			--enable-pgpinline-plugin --enable-smime-plugin
-LIB_DEPENDS+=		gpgme:${PORTSDIR}/security/gpgme \
-			gpg-error:${PORTSDIR}/security/libgpg-error \
-			assuan:${PORTSDIR}/security/libassuan
-RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
-.else
-PLIST_SUB+=		GPGME="@comment "
-CONFIGURE_ARGS+=	--disable-pgpmime-plugin --disable-pgpcore-plugin \
-			--disable-pgpinline-plugin --disable-smime-plugin
-.endif
-
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-maintainer-mode
 .endif
 
-.if ${PORT_OPTIONS:MDILLO}
-PLIST_SUB+=	DILLO=""
-RUN_DEPENDS+=	dillo:${PORTSDIR}/www/dillo
-.else
-PLIST_SUB+=	DILLO="@comment "
-CONFIGURE_ARGS+=	--disable-dillo-viewer-plugin
-.endif
-
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
@@ -168,8 +90,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MSTARTUP}
-LIB_DEPENDS+=		startup-notification-1:${PORTSDIR}/x11/startup-notification \
-			xcb-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS+=		startup-notification-1:${PORTSDIR}/x11/startup-notification
 CONFIGURE_ARGS+=	--enable-startup-notification
 .else
 CONFIGURE_ARGS+=	--disable-startup-notification
@@ -180,14 +101,12 @@ RUN_DEPENDS+=	${LOCALBASE}/share/claws-mail/themes/ZX-0_1.1/down_arrow.xpm:${POR
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|-lresolv||g; s|-lpisock\"|-liconv &|g' \
-		-e 's|-DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED||g' \
+	@${REINPLACE_CMD} -e 's|-lresolv||g; s|-lpisock\"|-liconv &|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g ; s|/usr/share|${LOCALBASE}/share|g' \
 		${WRKSRC}/src/procmime.c
-	@${REINPLACE_CMD} -e "s|po intl src|po src| ; s:@CLAWS_GNOME2:#@CLAWS_GNOME2:g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s:-Wno-unused-function::" ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e "/(GPGME_LIBS)/d" \
+		${WRKSRC}/src/Makefile.in
 	@for f in `${FIND} ${WRKSRC}/tools -type f -print`; do \
 		${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done
 
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
new file mode 100644
index 000000000000..9414f3b37f88
--- /dev/null
+++ b/mail/claws-mail/Makefile.claws
@@ -0,0 +1,80 @@
+# $FreeBSD$
+
+PORTVERSION=	3.9.1
+CATEGORIES?=	mail
+MASTER_SITES=	SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
+
+MAINTAINER=	pawel@FreeBSD.org
+
+LICENSE=	GPLv3
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+
+CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
+		--disable-dbus
+
+CLAWS_PLUGINS=	acpi_notifier \
+		address_keeper \
+		archive \
+		att_remover \
+		attachwarner \
+		bogofilter \
+		bsfilter \
+		clamd \
+		fancy \
+		fetchinfo \
+		gdata \
+		geolocation \
+		mailmbox \
+		newmail \
+		notification \
+		pdf_viewer \
+		perl \
+		python \
+		pgpcore \
+		pgpinline \
+		pgpmime \
+		rssyl \
+		smime \
+		spam_report \
+		spamassassin \
+		tnef_parse \
+		vcalendar
+
+.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}:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS+=	claws-mail>=${PORTVERSION}:${PORTSDIR}/mail/claws-mail
+
+MASTERDIR=	${.CURDIR}/../../mail/claws-mail
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${NONEXISTENT}
+PKGMESSAGE=	${.CURDIR}/pkg-message
+
+.  for p in ${CLAWS_PLUGINS_BUILD}
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S|--disable-${p}-plugin||}
+PLIST_FILES+=	lib/claws-mail/plugins/${p}.a  \
+		lib/claws-mail/plugins/${p}.la \
+		lib/claws-mail/plugins/${p}.so
+.  endfor
+
+do-build:
+.  for p in ${CLAWS_PLUGINS_BUILD}
+	cd ${WRKSRC}/src/plugins/${p} && ${GMAKE}
+.  endfor
+
+do-install:
+.  for p in ${CLAWS_PLUGINS_BUILD}
+	cd ${WRKSRC}/src/plugins/${p} && ${GMAKE} install
+.  endfor
+
+.endif
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 45eb68a22549..17c816b45ae9 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (claws-mail-3.9.0.tar.bz2) = ed70975a5056b3ffc4fe6e977f0d9606febc1499763c090241b029a73ff24e65
-SIZE (claws-mail-3.9.0.tar.bz2) = 7425870
+SHA256 (claws-mail-3.9.1.tar.bz2) = 376e535aac746dccbd8871c6f3ff6ced3010b5f7c048f4e3d18e66dfb5622910
+SIZE (claws-mail-3.9.1.tar.bz2) = 9367489
diff --git a/mail/claws-mail/files/patch-Makefile.in b/mail/claws-mail/files/patch-Makefile.in
index c9e60b1bf01f..9ffe4cb22ab1 100644
--- a/mail/claws-mail/files/patch-Makefile.in
+++ b/mail/claws-mail/files/patch-Makefile.in
@@ -1,23 +1,14 @@
---- Makefile.in.orig	2012-11-14 20:13:46.000000000 +0100
-+++ Makefile.in	2012-11-14 20:16:17.000000000 +0100
-@@ -41,7 +41,7 @@
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/claws-features.h.in $(srcdir)/claws-mail.pc.in \
- 	$(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
--	AUTHORS COPYING ChangeLog INSTALL NEWS TODO
-+	AUTHORS ChangeLog INSTALL NEWS TODO RELEASE_NOTES
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/check-type.m4 \
- 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
-@@ -359,7 +359,6 @@
- 	ChangeLog.gtk1 \
+--- Makefile.in.orig	2013-05-08 17:03:48.000000000 +0200
++++ Makefile.in	2013-05-08 17:10:43.000000000 +0200
+@@ -427,7 +427,6 @@
  	ChangeLog.pre2.0.0 \
  	ChangeLog.2.0.0-3.0.0 \
+ 	ChangeLog.3.0.0-3.9.0 \
 -	RELEASE_NOTES \
  	claws-mail-128x128.png \
  	claws-mail-64x64.png \
  	claws-mail.pc.in \
-@@ -388,8 +387,6 @@
+@@ -458,8 +457,6 @@
  clawsinclude_HEADERS = \
  	claws-features.h
  
diff --git a/mail/claws-mail/files/patch-configure b/mail/claws-mail/files/patch-configure
new file mode 100644
index 000000000000..c044e2123597
--- /dev/null
+++ b/mail/claws-mail/files/patch-configure
@@ -0,0 +1,48 @@
+--- configure.orig	2013-05-10 16:42:16.000000000 +0200
++++ configure	2013-05-10 16:44:12.000000000 +0200
+@@ -20468,45 +20468,6 @@
+ if test $pkg_failed = yes; then
+    	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4" 2>&1`
+-        else
+-	        LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$LIBSOUP_PKG_ERRORS" >&5
+-
+-	as_fn_error $? "Package requirements (libsoup-2.4) were not met:
+-
+-$LIBSOUP_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables LIBSOUP_CFLAGS
+-and LIBSOUP_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables LIBSOUP_CFLAGS
+-and LIBSOUP_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+ else
+ 	LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS
+ 	LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index d20086cc0de4..23188dbf0da1 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -156,14 +156,29 @@ include/claws-mail/news_gtk.h
 include/claws-mail/noticeview.h
 include/claws-mail/partial_download.h
 include/claws-mail/pine.h
-%%GPGME%%include/claws-mail/plugins/pgpcore/passphrase.h
-%%GPGME%%include/claws-mail/plugins/pgpcore/pgp_viewer.h
-%%GPGME%%include/claws-mail/plugins/pgpcore/prefs_gpg.h
-%%GPGME%%include/claws-mail/plugins/pgpcore/select-keys.h
-%%GPGME%%include/claws-mail/plugins/pgpcore/sgpgme.h
-%%GPGME%%include/claws-mail/plugins/pgpinline/pgpinline.h
-%%GPGME%%include/claws-mail/plugins/pgpmime/pgpmime.h
-%%GPGME%%include/claws-mail/plugins/smime/smime.h
+include/claws-mail/plugins/claws-mail/archiver.h
+include/claws-mail/plugins/claws-mail/archiver_prefs.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/eggaccelerators.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-error.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-info.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-key-file-registry.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-listener.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-marshal.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-registry.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-utils.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/gtk-hotkey-x11-listener.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/gtkhotkey.h
+include/claws-mail/plugins/claws-mail/gtkhotkey/tomboykeybinder.h
+include/claws-mail/plugins/claws-mail/ical.h
+include/claws-mail/plugins/pgpcore/passphrase.h
+include/claws-mail/plugins/pgpcore/pgp_viewer.h
+include/claws-mail/plugins/pgpcore/prefs_gpg.h
+include/claws-mail/plugins/pgpcore/select-keys.h
+include/claws-mail/plugins/pgpcore/sgpgme.h
+include/claws-mail/plugins/pgpinline/pgpinline.h
+include/claws-mail/plugins/pgpmime/pgpmime.h
+include/claws-mail/plugins/smime/smime.h
+include/claws-mail/plugins/vcalendar/vcal_interface.h
 include/claws-mail/pop.h
 include/claws-mail/prefs_account.h
 include/claws-mail/prefs_actions.h
@@ -222,33 +237,9 @@ include/claws-mail/uri_opener.h
 include/claws-mail/vcard.h
 include/claws-mail/viewtypes.h
 include/claws-mail/wizard.h
-%%BOGO_PLUG%%lib/claws-mail/plugins/bogofilter.a
-%%BOGO_PLUG%%lib/claws-mail/plugins/bogofilter.la
-%%BOGO_PLUG%%lib/claws-mail/plugins/bogofilter.so
-%%DILLO%%lib/claws-mail/plugins/dillo_viewer.a
-%%DILLO%%lib/claws-mail/plugins/dillo_viewer.la
-%%DILLO%%lib/claws-mail/plugins/dillo_viewer.so
-%%GPGME%%lib/claws-mail/plugins/pgpcore.a
-%%GPGME%%lib/claws-mail/plugins/pgpcore.la
-%%GPGME%%lib/claws-mail/plugins/pgpcore.so
-%%GPGME%%lib/claws-mail/plugins/pgpinline.a
-%%GPGME%%lib/claws-mail/plugins/pgpinline.deps
-%%GPGME%%lib/claws-mail/plugins/pgpinline.la
-%%GPGME%%lib/claws-mail/plugins/pgpinline.so
-%%GPGME%%lib/claws-mail/plugins/pgpmime.a
-%%GPGME%%lib/claws-mail/plugins/pgpmime.deps
-%%GPGME%%lib/claws-mail/plugins/pgpmime.la
-%%GPGME%%lib/claws-mail/plugins/pgpmime.so
-%%GPGME%%lib/claws-mail/plugins/smime.a
-%%GPGME%%lib/claws-mail/plugins/smime.la
-%%GPGME%%lib/claws-mail/plugins/smime.so
-%%GPGME%%lib/claws-mail/plugins/smime.deps
-%%SA_PLUG%%lib/claws-mail/plugins/spamassassin.a
-%%SA_PLUG%%lib/claws-mail/plugins/spamassassin.la
-%%SA_PLUG%%lib/claws-mail/plugins/spamassassin.so
-lib/claws-mail/plugins/trayicon.a
-lib/claws-mail/plugins/trayicon.la
-lib/claws-mail/plugins/trayicon.so
+lib/claws-mail/plugins/pgpinline.deps
+lib/claws-mail/plugins/pgpmime.deps
+lib/claws-mail/plugins/smime.deps
 libdata/pkgconfig/claws-mail.pc
 share/applications/claws-mail.desktop
 %%DATADIR%%/OOo2claws-mail.pl
@@ -303,9 +294,9 @@ share/applications/claws-mail.desktop
 %%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.pdf
 %%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.ps
 %%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.txt
-share/icons/hicolor/128x128/apps/claws-mail-128x128.png
+share/icons/hicolor/128x128/apps/claws-mail.png
 share/icons/hicolor/48x48/apps/claws-mail.png
-share/icons/hicolor/64x64/apps/claws-mail-64x64.png
+share/icons/hicolor/64x64/apps/claws-mail.png
 %%NLS%%share/locale/bg/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/claws-mail.mo
@@ -314,6 +305,7 @@ share/icons/hicolor/64x64/apps/claws-mail-64x64.png
 %%NLS%%share/locale/es/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/claws-mail.mo
+%%NLS%%share/locale/he/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/id_ID/LC_MESSAGES/claws-mail.mo
 %%NLS%%share/locale/it/LC_MESSAGES/claws-mail.mo
@@ -331,7 +323,6 @@ share/icons/hicolor/64x64/apps/claws-mail-64x64.png
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
 %%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/id_ID
-@dirrmtry %%DATADIR%%
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual/pl
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual/fr
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual/es
@@ -339,15 +330,19 @@ share/icons/hicolor/64x64/apps/claws-mail-64x64.png
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual/de
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual
 @dirrmtry %%DOCSDIR%%
+@dirrmtry %%DATADIR%%
 @dirrmtry share/applications
 @dirrmtry lib/claws-mail/plugins
 @dirrmtry lib/claws-mail
-%%GPGME%%@dirrm include/claws-mail/plugins/pgpmime
-%%GPGME%%@dirrm include/claws-mail/plugins/pgpinline
-%%GPGME%%@dirrm include/claws-mail/plugins/pgpcore
-%%GPGME%%@dirrm include/claws-mail/plugins/smime
+@dirrm include/claws-mail/plugins/vcalendar
+@dirrm include/claws-mail/plugins/smime
+@dirrm include/claws-mail/plugins/pgpmime
+@dirrm include/claws-mail/plugins/pgpinline
+@dirrm include/claws-mail/plugins/pgpcore
+@dirrm include/claws-mail/plugins/claws-mail/gtkhotkey
+@dirrm include/claws-mail/plugins/claws-mail
+@dirrm include/claws-mail/plugins
 @dirrm include/claws-mail/gtk
 @dirrm include/claws-mail/etpan
 @dirrm include/claws-mail/common
-@dirrmtry include/claws-mail/plugins
-@dirrmtry include/claws-mail
+@dirrm include/claws-mail