summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/claws-mail-address_keeper/Makefile30
-rw-r--r--mail/claws-mail-address_keeper/distinfo2
-rw-r--r--mail/claws-mail-address_keeper/pkg-plist16
-rw-r--r--mail/claws-mail-archiver/Makefile19
-rw-r--r--mail/claws-mail-archiver/distinfo2
-rw-r--r--mail/claws-mail-archiver/pkg-plist9
-rw-r--r--mail/claws-mail-att_remover/Makefile20
-rw-r--r--mail/claws-mail-att_remover/distinfo2
-rw-r--r--mail/claws-mail-attach_warner/Makefile34
-rw-r--r--mail/claws-mail-attach_warner/distinfo2
-rw-r--r--mail/claws-mail-attach_warner/pkg-plist23
-rw-r--r--mail/claws-mail-bsfilter/Makefile31
-rw-r--r--mail/claws-mail-bsfilter/distinfo2
-rw-r--r--mail/claws-mail-bsfilter/pkg-plist19
-rw-r--r--mail/claws-mail-cachesaver/Makefile5
-rw-r--r--mail/claws-mail-clamd/Makefile31
-rw-r--r--mail/claws-mail-clamd/distinfo2
-rw-r--r--mail/claws-mail-clamd/pkg-plist17
-rw-r--r--mail/claws-mail-fancy/Makefile36
-rw-r--r--mail/claws-mail-fancy/distinfo2
-rw-r--r--mail/claws-mail-fancy/pkg-plist21
-rw-r--r--mail/claws-mail-fetchinfo/Makefile29
-rw-r--r--mail/claws-mail-fetchinfo/distinfo2
-rw-r--r--mail/claws-mail-fetchinfo/pkg-plist6
-rw-r--r--mail/claws-mail-gdata/Makefile32
-rw-r--r--mail/claws-mail-gdata/distinfo2
-rw-r--r--mail/claws-mail-gdata/pkg-plist15
-rw-r--r--mail/claws-mail-gtkhtml2_viewer/Makefile4
-rw-r--r--mail/claws-mail-mailmbox/Makefile20
-rw-r--r--mail/claws-mail-mailmbox/distinfo2
-rw-r--r--mail/claws-mail-newmail/Makefile20
-rw-r--r--mail/claws-mail-newmail/distinfo2
-rw-r--r--mail/claws-mail-notification/Makefile32
-rw-r--r--mail/claws-mail-notification/distinfo2
-rw-r--r--mail/claws-mail-notification/pkg-plist35
-rw-r--r--mail/claws-mail-pdf_viewer/Makefile28
-rw-r--r--mail/claws-mail-pdf_viewer/distinfo2
-rw-r--r--mail/claws-mail-pdf_viewer/pkg-plist19
-rw-r--r--mail/claws-mail-perl/Makefile26
-rw-r--r--mail/claws-mail-perl/distinfo2
-rw-r--r--mail/claws-mail-python/Makefile30
-rw-r--r--mail/claws-mail-python/distinfo2
-rw-r--r--mail/claws-mail-python/pkg-plist18
-rw-r--r--mail/claws-mail-rssyl/Makefile33
-rw-r--r--mail/claws-mail-rssyl/distinfo2
-rw-r--r--mail/claws-mail-rssyl/pkg-plist24
-rw-r--r--mail/claws-mail-spamreport/Makefile36
-rw-r--r--mail/claws-mail-spamreport/distinfo2
-rw-r--r--mail/claws-mail-spamreport/pkg-plist20
-rw-r--r--mail/claws-mail-tnef/Makefile34
-rw-r--r--mail/claws-mail-tnef/distinfo2
-rw-r--r--mail/claws-mail-tnef/pkg-plist19
-rw-r--r--mail/claws-mail-vcalendar/Makefile36
-rw-r--r--mail/claws-mail-vcalendar/distinfo2
-rw-r--r--mail/claws-mail-vcalendar/pkg-plist30
-rw-r--r--mail/claws-mail/Makefile103
-rw-r--r--mail/claws-mail/Makefile.claws80
-rw-r--r--mail/claws-mail/distinfo4
-rw-r--r--mail/claws-mail/files/patch-Makefile.in19
-rw-r--r--mail/claws-mail/files/patch-configure48
-rw-r--r--mail/claws-mail/pkg-plist83
61 files changed, 257 insertions, 975 deletions
diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
index 6370c77d4bde..7ab4dbffaba5 100644
--- a/mail/claws-mail-address_keeper/Makefile
+++ b/mail/claws-mail-address_keeper/Makefile
@@ -2,35 +2,11 @@
# $FreeBSD$
PORTNAME= address_keeper
-PORTVERSION= 1.0.7
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Recipient addresses keeper plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USES= iconv
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= address_keeper
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-address_keeper/distinfo b/mail/claws-mail-address_keeper/distinfo
deleted file mode 100644
index 8e3673ca3e5b..000000000000
--- a/mail/claws-mail-address_keeper/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (address_keeper-1.0.7.tar.gz) = ed3f1aee0ff9d4f9879938a8f3615ddb7d037b666d2cebbf65dcb45b8937b019
-SIZE (address_keeper-1.0.7.tar.gz) = 381829
diff --git a/mail/claws-mail-address_keeper/pkg-plist b/mail/claws-mail-address_keeper/pkg-plist
deleted file mode 100644
index f695331f2202..000000000000
--- a/mail/claws-mail-address_keeper/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-lib/claws-mail/plugins/address_keeper.so
-lib/claws-mail/plugins/address_keeper.la
-lib/claws-mail/plugins/address_keeper.a
-%%NLS%%share/locale/ca/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/de/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/es/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/address_keeper.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-archiver/Makefile b/mail/claws-mail-archiver/Makefile
index 1cfab099a603..67b2c2290777 100644
--- a/mail/claws-mail-archiver/Makefile
+++ b/mail/claws-mail-archiver/Makefile
@@ -1,23 +1,12 @@
-# Created by: Martin Wilke
+# Created by: Martin Wilke <miwi@FreeBSD.org>
# $FreeBSD$
PORTNAME= archiver
-PORTVERSION= 0.6.13
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= archive-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Mail archiver plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
+CLAWS_PLUGINS_BUILD= archive
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-archiver/distinfo b/mail/claws-mail-archiver/distinfo
deleted file mode 100644
index cf58cb35dbc9..000000000000
--- a/mail/claws-mail-archiver/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (archive-0.6.13.tar.gz) = 0edf299d82760f28f553bcd1abc02337ca5adfde0626313dc361584d9bf0359b
-SIZE (archive-0.6.13.tar.gz) = 463329
diff --git a/mail/claws-mail-archiver/pkg-plist b/mail/claws-mail-archiver/pkg-plist
deleted file mode 100644
index f849a0e0d537..000000000000
--- a/mail/claws-mail-archiver/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-include/claws-mail/plugins/archive/archiver.h
-include/claws-mail/plugins/archive/archiver_prefs.h
-lib/claws-mail/plugins/archive.a
-lib/claws-mail/plugins/archive.la
-lib/claws-mail/plugins/archive.so
-@dirrmtry lib/claws-mail/plugins
-@dirrmtry lib/claws-mail
-@dirrmtry include/claws-mail/plugins/archive
-@dirrmtry include/claws-mail/plugins
diff --git a/mail/claws-mail-att_remover/Makefile b/mail/claws-mail-att_remover/Makefile
index 6077a28e43a8..76e3f0ad4f9f 100644
--- a/mail/claws-mail-att_remover/Makefile
+++ b/mail/claws-mail-att_remover/Makefile
@@ -2,25 +2,11 @@
# $FreeBSD$
PORTNAME= att_remover
-PORTVERSION= 1.0.15
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Attachments removing plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-PLIST_FILES= lib/claws-mail/plugins/att_remover.a \
- lib/claws-mail/plugins/att_remover.la \
- lib/claws-mail/plugins/att_remover.so
+CLAWS_PLUGINS_BUILD= att_remover
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-att_remover/distinfo b/mail/claws-mail-att_remover/distinfo
deleted file mode 100644
index 2b60460a8769..000000000000
--- a/mail/claws-mail-att_remover/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (att_remover-1.0.15.tar.gz) = f0946331dd692c2ab6b13ed4791338c823359b59649a24dfb6fd4b1b4bb66d32
-SIZE (att_remover-1.0.15.tar.gz) = 318481
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index b0c89f43cd0f..d54b36215ee2 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -2,39 +2,11 @@
# $FreeBSD$
PORTNAME= attach_warner
-PORTVERSION= 1.0
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= attachwarner-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Not attached file warning plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USES= iconv
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --with-iconv-prefix=${LOCALBASE} \
- --with-libintl-prefix=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= attachwarner
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-attach_warner/distinfo b/mail/claws-mail-attach_warner/distinfo
deleted file mode 100644
index a9684fe8391d..000000000000
--- a/mail/claws-mail-attach_warner/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (attachwarner-1.0.tar.gz) = 6b66677bd8a4bedbeb96ce41eab1c2d8ee2f1b20742926e4df732f82f025e15a
-SIZE (attachwarner-1.0.tar.gz) = 402072
diff --git a/mail/claws-mail-attach_warner/pkg-plist b/mail/claws-mail-attach_warner/pkg-plist
deleted file mode 100644
index 8419bc03e066..000000000000
--- a/mail/claws-mail-attach_warner/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-lib/claws-mail/plugins/attachwarner.a
-lib/claws-mail/plugins/attachwarner.la
-lib/claws-mail/plugins/attachwarner.so
-%%NLS%%share/locale/ca/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/de/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/es/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/it/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/attachwarner.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index bff92553771f..5694e9e880e2 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -2,36 +2,11 @@
# $FreeBSD$
PORTNAME= bsfilter
-PORTVERSION= 1.0.9
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= bsfilter_plugin-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Spam filtering, bsfilter based plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_XORG= x11
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= bsfilter
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-bsfilter/distinfo b/mail/claws-mail-bsfilter/distinfo
deleted file mode 100644
index df44b592b519..000000000000
--- a/mail/claws-mail-bsfilter/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (bsfilter_plugin-1.0.9.tar.gz) = 5107d95ec609c16e468c0cbba3ed844a63fed0fcf31ad8fcdfda77234124066b
-SIZE (bsfilter_plugin-1.0.9.tar.gz) = 407396
diff --git a/mail/claws-mail-bsfilter/pkg-plist b/mail/claws-mail-bsfilter/pkg-plist
deleted file mode 100644
index 97a017044945..000000000000
--- a/mail/claws-mail-bsfilter/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-lib/claws-mail/plugins/bsfilter.a
-lib/claws-mail/plugins/bsfilter.la
-lib/claws-mail/plugins/bsfilter.so
-%%NLS%%share/locale/ca/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/es/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/it/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 1a8d8a847700..1cd6040e0b79 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cachesaver
PORTVERSION= 0.10.9
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
@@ -20,6 +20,9 @@ USE_GMAKE= yes
USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
+DEPRECATED= No longer maintained by Claws Mail team
+EXPIRATION_DATE=2013-06-11
+
PLIST_FILES= lib/claws-mail/plugins/cachesaver.a \
lib/claws-mail/plugins/cachesaver.la \
lib/claws-mail/plugins/cachesaver.so
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index 5d75cf30e4d8..54e886a11f07 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -2,37 +2,13 @@
# $FreeBSD$
PORTNAME= clamd
-PORTVERSION= 3.5.5
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= ClamAV based antivirus plugin for Claws Mail
-LICENSE= GPLv3
+RUN_DEPENDS= clamd:${PORTSDIR}/security/clamav
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail \
- clamd:${PORTSDIR}/security/clamav
-
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USES= iconv
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= clamd
post-install:
@${ECHO}
@@ -41,4 +17,5 @@ post-install:
@${ECHO_CMD} "********************************************************************************"
@${ECHO}
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-clamd/distinfo b/mail/claws-mail-clamd/distinfo
deleted file mode 100644
index d2470333e053..000000000000
--- a/mail/claws-mail-clamd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (clamd-3.5.5.tar.gz) = 0b433e128899e5fcf76201a9aaf2bebef4273a313fe36195e94595baa6fbefec
-SIZE (clamd-3.5.5.tar.gz) = 411572
diff --git a/mail/claws-mail-clamd/pkg-plist b/mail/claws-mail-clamd/pkg-plist
deleted file mode 100644
index 0c1ce5194dbc..000000000000
--- a/mail/claws-mail-clamd/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-lib/claws-mail/plugins/clamd.so
-lib/claws-mail/plugins/clamd.la
-lib/claws-mail/plugins/clamd.a
-%%NLS%%share/locale/cs/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/es/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/it/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/clamd.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index b64b56e72735..ea535c86256c 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -2,42 +2,14 @@
# $FreeBSD$
PORTNAME= fancy
-PORTVERSION= 0.9.17
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Webkit based HTML renderer plugin for Claws Mail
-LICENSE= GPLv3
-
-LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
- soup-gnome:${PORTSDIR}/devel/libsoup-gnome \
+LIB_DEPENDS= soup-gnome:${PORTSDIR}/devel/libsoup-gnome \
webkitgtk:${PORTSDIR}/www/webkit-gtk2
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf
-USES= iconv
-USE_GNOME= gtk20
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
- --with-libintl-prefix=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= fancy
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-fancy/distinfo b/mail/claws-mail-fancy/distinfo
deleted file mode 100644
index 8b2f59da68ef..000000000000
--- a/mail/claws-mail-fancy/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (fancy-0.9.17.tar.gz) = 8d88906544f5221333ec54260fca55f96d141731326e328162d5569523f6b115
-SIZE (fancy-0.9.17.tar.gz) = 401521
diff --git a/mail/claws-mail-fancy/pkg-plist b/mail/claws-mail-fancy/pkg-plist
deleted file mode 100644
index bfa7c3202c98..000000000000
--- a/mail/claws-mail-fancy/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $FreeBSD$
-lib/claws-mail/plugins/fancy.so
-lib/claws-mail/plugins/fancy.la
-lib/claws-mail/plugins/fancy.a
-%%NLS%%share/locale/ca/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/es/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/it/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/fancy.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index a43bfadb21a4..88383a2f4460 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -2,34 +2,11 @@
# $FreeBSD$
PORTNAME= fetchinfo
-PORTVERSION= 0.4.25
-PORTREVISION= 1
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= ${PORTNAME}-plugin-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Header insertion plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf
-USES= iconv
-MAKE_JOBS_SAFE= yes
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= fetchinfo
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-fetchinfo/distinfo b/mail/claws-mail-fetchinfo/distinfo
deleted file mode 100644
index 58089ca44c1d..000000000000
--- a/mail/claws-mail-fetchinfo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (fetchinfo-plugin-0.4.25.tar.gz) = 94fa60b0bc4245a6e25c453127b8caf2bd356ad27d6c7da57cabb3bd8eeec0e4
-SIZE (fetchinfo-plugin-0.4.25.tar.gz) = 377476
diff --git a/mail/claws-mail-fetchinfo/pkg-plist b/mail/claws-mail-fetchinfo/pkg-plist
deleted file mode 100644
index 479f801a83bf..000000000000
--- a/mail/claws-mail-fetchinfo/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/claws-mail/plugins/fetchinfo_plugin.a
-lib/claws-mail/plugins/fetchinfo_plugin.la
-lib/claws-mail/plugins/fetchinfo_plugin.so
-%%NLS%%share/locale/fr/LC_MESSAGES/fetchinfo-plugin.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/fetchinfo-plugin.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/fetchinfo-plugin.mo
diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
index 44a966f10fa8..e96924dc2377 100644
--- a/mail/claws-mail-gdata/Makefile
+++ b/mail/claws-mail-gdata/Makefile
@@ -2,39 +2,13 @@
# $FreeBSD$
PORTNAME= gdata
-PORTVERSION= 0.5
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= ${PORTNAME}_plugin-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Plugin providing Google Contacts in the Tab-address completion
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
LIB_DEPENDS= gdata:${PORTSDIR}/devel/libgdata
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-GNU_CONFIGURE= yes
-USES= iconv
-USE_GMAKE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
- --with-libintl-prefix=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= gdata
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-gdata/distinfo b/mail/claws-mail-gdata/distinfo
deleted file mode 100644
index a6a687990d7a..000000000000
--- a/mail/claws-mail-gdata/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gdata_plugin-0.5.tar.gz) = 7352efcbe078d23f3a8df49affdbb63cfe98b06ca138ce63e4ac82b49ebfb469
-SIZE (gdata_plugin-0.5.tar.gz) = 372567
diff --git a/mail/claws-mail-gdata/pkg-plist b/mail/claws-mail-gdata/pkg-plist
deleted file mode 100644
index bc160c577991..000000000000
--- a/mail/claws-mail-gdata/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-lib/claws-mail/plugins/gdata_plugin.so
-lib/claws-mail/plugins/gdata_plugin.la
-lib/claws-mail/plugins/gdata_plugin.a
-%%NLS%%share/locale/cs/LC_MESSAGES/gdata_plugin.mo
-%%NLS%%share/locale/es/LC_MESSAGES/gdata_plugin.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/gdata_plugin.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/gdata_plugin.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/gdata_plugin.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/gdata_plugin.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/gdata_plugin.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/gdata_plugin.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
-@dirrmtry lib/claws-mail/plugins
-@dirrmtry lib/claws-mail
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index 09b3c043119d..1bd29598ef4a 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gtkhtml2_viewer
PORTVERSION= 0.34
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
PKGNAMEPREFIX= claws-mail-
@@ -22,6 +23,9 @@ USE_GNOME= gtk20
USES= iconv
MAKE_JOBS_SAFE= yes
+DEPRECATED= No longer maintained, please use mail/claws-mail-fancy instead
+EXPIRATION_DATE=2013-06-11
+
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index b651865f2dea..d6c18b514f43 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -2,25 +2,11 @@
# $FreeBSD$
PORTNAME= mailmbox
-PORTVERSION= 1.15
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Mbox maildir plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-PLIST_FILES= lib/claws-mail/plugins/mailmbox.a \
- lib/claws-mail/plugins/mailmbox.la \
- lib/claws-mail/plugins/mailmbox.so
+CLAWS_PLUGINS_BUILD= mailmbox
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-mailmbox/distinfo b/mail/claws-mail-mailmbox/distinfo
deleted file mode 100644
index f953266b63c9..000000000000
--- a/mail/claws-mail-mailmbox/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mailmbox-1.15.tar.gz) = 633f7835261c88a0aa06de38553ac935a1799a7128120963a7fa87ace01dac18
-SIZE (mailmbox-1.15.tar.gz) = 394046
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index f88714ed944a..3c8a4125b7a9 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -2,25 +2,11 @@
# $FreeBSD$
PORTNAME= newmail
-PORTVERSION= 0.0.16
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Message header summary logging plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-PLIST_FILES= lib/claws-mail/plugins/newmail.a \
- lib/claws-mail/plugins/newmail.la \
- lib/claws-mail/plugins/newmail.so
+CLAWS_PLUGINS_BUILD= newmail
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-newmail/distinfo b/mail/claws-mail-newmail/distinfo
deleted file mode 100644
index fe96c06802a4..000000000000
--- a/mail/claws-mail-newmail/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (newmail-0.0.16.tar.gz) = cf5117b394c40a2eabb60cc7c45d7ebfb34d028e88cc97c49d25d3f219306e38
-SIZE (newmail-0.0.16.tar.gz) = 311897
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index da8ae686878f..c89a833f1991 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -2,39 +2,13 @@
# $FreeBSD$
PORTNAME= notification
-PORTVERSION= 0.31
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= notification_plugin-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= New mail notification plugin for Claws Mail
-LICENSE= GPLv3
-
LIB_DEPENDS= notify:${PORTSDIR}/devel/libnotify
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
- --with-libintl-prefix=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= notification
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
deleted file mode 100644
index 83dad82b98ac..000000000000
--- a/mail/claws-mail-notification/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (notification_plugin-0.31.tar.gz) = 51cf2f52d60535e0ee8e1a80340cc12c6ed2179055846141afbf94faadca539e
-SIZE (notification_plugin-0.31.tar.gz) = 561196
diff --git a/mail/claws-mail-notification/pkg-plist b/mail/claws-mail-notification/pkg-plist
deleted file mode 100644
index 9a1b1e3aaf0d..000000000000
--- a/mail/claws-mail-notification/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-include/claws-mail/plugins/notification_plugin/gtkhotkey/eggaccelerators.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-error.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-info.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-key-file-registry.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-listener.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-marshal.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-registry.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-utils.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-x11-listener.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/gtkhotkey.h
-include/claws-mail/plugins/notification_plugin/gtkhotkey/tomboykeybinder.h
-lib/claws-mail/plugins/notification_plugin.a
-lib/claws-mail/plugins/notification_plugin.la
-lib/claws-mail/plugins/notification_plugin.so
-%%NLS%%share/locale/ca/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/es/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/it/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
-@dirrm include/claws-mail/plugins/notification_plugin/gtkhotkey
-@dirrm include/claws-mail/plugins/notification_plugin
-@dirrmtry include/claws-mail/plugins
-@dirrmtry include/claws-mail
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index ff86a1c1a181..fbebe6f1935e 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -2,37 +2,15 @@
# $FreeBSD$
PORTNAME= pdf_viewer
-PORTVERSION= 0.9.3
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= PDF and PostScript viewer plugin for Claws Mail
-LICENSE= GPLv3
-
LIB_DEPENDS= poppler-glib:${PORTSDIR}/graphics/poppler-glib
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-USE_GMAKE= yes
-USES= iconv
USE_GHOSTSCRIPT=yes
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= pdf_viewer
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-pdf_viewer/distinfo b/mail/claws-mail-pdf_viewer/distinfo
deleted file mode 100644
index 07ab2cadb26f..000000000000
--- a/mail/claws-mail-pdf_viewer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pdf_viewer-0.9.3.tar.gz) = 0c7e4bd58ad878fc59d6c11db16086176b173ee4c9eb6850aa2429efc8cb24eb
-SIZE (pdf_viewer-0.9.3.tar.gz) = 406297
diff --git a/mail/claws-mail-pdf_viewer/pkg-plist b/mail/claws-mail-pdf_viewer/pkg-plist
deleted file mode 100644
index fe45be768faf..000000000000
--- a/mail/claws-mail-pdf_viewer/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-lib/claws-mail/plugins/pdf_viewer.a
-lib/claws-mail/plugins/pdf_viewer.la
-lib/claws-mail/plugins/pdf_viewer.so
-%%NLS%%share/locale/ca/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/pdf_viewer.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/pdf_viewer.mo
diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index 14d15d482506..b3618dfec2e0 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -2,33 +2,19 @@
# $FreeBSD$
PORTNAME= perl
-PORTVERSION= 0.9.20
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= perl_plugin-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Perl filtering plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf
USE_PERL5= yes
-MAKE_JOBS_SAFE= yes
-PLIST_FILES= lib/claws-mail/plugins/perl_plugin.a \
- lib/claws-mail/plugins/perl_plugin.la \
- lib/claws-mail/plugins/perl_plugin.so \
- share/claws-mail/matcherrc2perlfilter.pl
+PLIST_FILES+= share/claws-mail/matcherrc2perlfilter.pl
+
+CLAWS_PLUGINS_BUILD= perl
post-install:
- @${MKDIR} ${PREFIX}/share/claws-mail
- @${INSTALL_SCRIPT} ${WRKSRC}/tools/matcherrc2perlfilter.pl \
+ @${INSTALL_SCRIPT} ${WRKSRC}/src/plugins/perl/tools/matcherrc2perlfilter.pl \
${PREFIX}/share/claws-mail/
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-perl/distinfo b/mail/claws-mail-perl/distinfo
deleted file mode 100644
index 3659e4bd1227..000000000000
--- a/mail/claws-mail-perl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perl_plugin-0.9.20.tar.gz) = edb2814b8eccf3de8d0719f24ddf12d9c7b76a414279fc193670da2b49af6d84
-SIZE (perl_plugin-0.9.20.tar.gz) = 343772
diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile
index 6ea6375ecc67..830ac7c83c44 100644
--- a/mail/claws-mail-python/Makefile
+++ b/mail/claws-mail-python/Makefile
@@ -2,37 +2,13 @@
# $FreeBSD$
PORTNAME= python
-PORTVERSION= 0.11
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= python_plugin-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Python scripting plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
USE_GNOME= pygtk2
-USE_GMAKE= yes
-USE_XORG= x11
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= python
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-python/distinfo b/mail/claws-mail-python/distinfo
deleted file mode 100644
index 48d49d6f24c2..000000000000
--- a/mail/claws-mail-python/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (python_plugin-0.11.tar.gz) = 15e577c4212ab3631aeff5a5814b8be79e6818e44fe3a6bed365976495fd8aa4
-SIZE (python_plugin-0.11.tar.gz) = 406917
diff --git a/mail/claws-mail-python/pkg-plist b/mail/claws-mail-python/pkg-plist
deleted file mode 100644
index 90739fe01840..000000000000
--- a/mail/claws-mail-python/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-lib/claws-mail/plugins/python_plugin.a
-lib/claws-mail/plugins/python_plugin.la
-lib/claws-mail/plugins/python_plugin.so
-%%NLS%%share/locale/es/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/python_plugin.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 6ea8e6afe907..743fa2652820 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -2,39 +2,12 @@
# $FreeBSD$
PORTNAME= rssyl
-PORTVERSION= 0.34
+PORTREVISION= 0
PORTEPOCH= 4
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-MAINTAINER= pawel@FreeBSD.org
COMMENT= RSS/Atom feed reader plugin for Claws Mail
-LICENSE= GPLv3
-
-LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_AUTOTOOLS= autoconf
-USES= iconv
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
- --with-libintl-prefix=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= rssyl
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-rssyl/distinfo b/mail/claws-mail-rssyl/distinfo
deleted file mode 100644
index 08ff92ca78f0..000000000000
--- a/mail/claws-mail-rssyl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rssyl-0.34.tar.gz) = 2e96a1cd6a1a5bb7f86cd2eb48f6e174665957fafe1f3b1e8361aac3bb967f79
-SIZE (rssyl-0.34.tar.gz) = 509269
diff --git a/mail/claws-mail-rssyl/pkg-plist b/mail/claws-mail-rssyl/pkg-plist
deleted file mode 100644
index dde091e68610..000000000000
--- a/mail/claws-mail-rssyl/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-lib/claws-mail/plugins/rssyl.a
-lib/claws-mail/plugins/rssyl.la
-lib/claws-mail/plugins/rssyl.so
-%%NLS%%share/locale/ca/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/de/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/es/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/it/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/rssyl.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 299f69069694..d912f8983094 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -2,40 +2,12 @@
# $FreeBSD$
PORTNAME= spamreport
-PORTVERSION= 0.3.17
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= spam_report-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= Spam report plugin for Claws Mail
-LICENSE= GPLv3
-
-LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_XORG= x11
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
- --with-libintl-prefix=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= spam_report
+.include "../claws-mail/Makefile.claws"
+PLIST_FILES:= ${PLIST_FILES:S|spam_report|spamreport|g}
.include <bsd.port.mk>
diff --git a/mail/claws-mail-spamreport/distinfo b/mail/claws-mail-spamreport/distinfo
deleted file mode 100644
index 0a7048b7c4a3..000000000000
--- a/mail/claws-mail-spamreport/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (spam_report-0.3.17.tar.gz) = 0213ee699ff0bf589f08dfeecb351a32ca1554dd2c1b7ef7e6ad7253d4f4debe
-SIZE (spam_report-0.3.17.tar.gz) = 381326
diff --git a/mail/claws-mail-spamreport/pkg-plist b/mail/claws-mail-spamreport/pkg-plist
deleted file mode 100644
index 441342ad773b..000000000000
--- a/mail/claws-mail-spamreport/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-lib/claws-mail/plugins/spamreport.a
-lib/claws-mail/plugins/spamreport.la
-lib/claws-mail/plugins/spamreport.so
-%%NLS%%share/locale/ca/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/es/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/it/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/spam_report.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index 4910c535fc0e..1e8027e4494d 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -2,39 +2,11 @@
# $FreeBSD$
PORTNAME= tnef
-PORTVERSION= 0.3.14
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
-PKGNAMEPREFIX= claws-mail-
-DISTNAME= tnef_parse-${PORTVERSION}
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= TNEF attachment format parser plugin for Claws Mail
-LICENSE= GPLv3
-
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USE_XORG= x11
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
- --with-libintl-prefix=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= tnef_parse
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-tnef/distinfo b/mail/claws-mail-tnef/distinfo
deleted file mode 100644
index 9cd5556ecf3f..000000000000
--- a/mail/claws-mail-tnef/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (tnef_parse-0.3.14.tar.gz) = 41e4b3c45896bc20359bec007b7ee83961510d50e957defb92fd315a6b7d6a75
-SIZE (tnef_parse-0.3.14.tar.gz) = 411136
diff --git a/mail/claws-mail-tnef/pkg-plist b/mail/claws-mail-tnef/pkg-plist
deleted file mode 100644
index 457f7fcdeed4..000000000000
--- a/mail/claws-mail-tnef/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-lib/claws-mail/plugins/tnef_parse.a
-lib/claws-mail/plugins/tnef_parse.la
-lib/claws-mail/plugins/tnef_parse.so
-%%NLS%%share/locale/ca/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/es/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/it/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/tnef_parse.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 49946ca013eb..bd32936bfbdf 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -2,41 +2,11 @@
# $FreeBSD$
PORTNAME= vcalendar
-PORTVERSION= 2.0.14
-CATEGORIES= mail
-MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= miwi
-PKGNAMEPREFIX= claws-mail-
+PORTREVISION= 0
-MAINTAINER= pawel@FreeBSD.org
COMMENT= vCalendar plugin for Claws Mail
-LICENSE= GPLv3
-
-LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
-
-USE_GMAKE= yes
-USES= iconv
-USE_AUTOTOOLS= autoconf
-MAKE_JOBS_SAFE= yes
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
- --with-libintl-prefix=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
+CLAWS_PLUGINS_BUILD= vcalendar
+.include "../claws-mail/Makefile.claws"
.include <bsd.port.mk>
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
deleted file mode 100644
index 9abf214faa37..000000000000
--- a/mail/claws-mail-vcalendar/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (vcalendar-2.0.14.tar.gz) = 95e03f3a6df772deb2a091fb905166047cc986c46bf76dd9c8a9309d8b192130
-SIZE (vcalendar-2.0.14.tar.gz) = 859883
diff --git a/mail/claws-mail-vcalendar/pkg-plist b/mail/claws-mail-vcalendar/pkg-plist
deleted file mode 100644
index 7537a0934db5..000000000000
--- a/mail/claws-mail-vcalendar/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-include/claws-mail/plugins/vcalendar/ical.h
-include/claws-mail/plugins/vcalendar/vcal_interface.h
-lib/claws-mail/plugins/vcalendar.a
-lib/claws-mail/plugins/vcalendar.la
-lib/claws-mail/plugins/vcalendar.so
-%%NLS%%share/locale/ca/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/de/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/es/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/id_ID/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/it/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/vcalendar.mo
-%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id_ID
-@dirrmtry lib/claws-mail/plugins
-@dirrmtry lib/claws-mail
-@dirrmtry include/claws-mail/plugins/vcalendar
-@dirrmtry include/claws-mail/plugins
-@dirrmtry include/claws-mail
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