sync claws-mail plugins with base pkg

22 files changed, 86 insertions, 306 deletions

diff --git a/mail/claws-mail-archive/Makefile b/mail/claws-mail-archive/Makefile
index 682525b26b3..4406026f478 100644
--- a/mail/claws-mail-archive/Makefile
+++ b/mail/claws-mail-archive/Makefile
@@ -1,28 +1,16 @@
-# $NetBSD: Makefile,v 1.29 2013/06/06 12:54:40 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/07/24 15:29:21 drochner Exp $
 #
 
-DISTNAME=	archive-0.6.12
-PKGNAME=	claws-mail-archive-0.6.12
-PKGREVISION=	8
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    archive
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Adds archiving to Claws-Mail
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
 
-.include "../../mk/bsd.prefs.mk"
+PLIST_SRC+=	PLIST
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-.include "../../archivers/libarchive/buildlink3.mk"
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-archive/PLIST b/mail/claws-mail-archive/PLIST
index 1efb1a49f56..ca4dd289caf 100644
--- a/mail/claws-mail-archive/PLIST
+++ b/mail/claws-mail-archive/PLIST
@@ -1,19 +1,3 @@
-@comment $NetBSD: PLIST,v 1.8 2012/07/02 19:08:42 drochner Exp $
-include/claws-mail/plugins/archive/archiver.h
-include/claws-mail/plugins/archive/archiver_prefs.h
-lib/claws-mail/plugins/archive.la
-share/locale/ca/LC_MESSAGES/archive.mo
-share/locale/cs/LC_MESSAGES/archive.mo
-share/locale/es/LC_MESSAGES/archive.mo
-share/locale/fi/LC_MESSAGES/archive.mo
-share/locale/fr/LC_MESSAGES/archive.mo
-share/locale/hu/LC_MESSAGES/archive.mo
-share/locale/id_ID/LC_MESSAGES/archive.mo
-share/locale/it/LC_MESSAGES/archive.mo
-share/locale/ja/LC_MESSAGES/archive.mo
-share/locale/lt/LC_MESSAGES/archive.mo
-share/locale/nl/LC_MESSAGES/archive.mo
-share/locale/pt_BR/LC_MESSAGES/archive.mo
-share/locale/ru/LC_MESSAGES/archive.mo
-share/locale/sk/LC_MESSAGES/archive.mo
-share/locale/uk/LC_MESSAGES/archive.mo
+@comment $NetBSD: PLIST,v 1.9 2013/07/24 15:29:21 drochner Exp $
+include/claws-mail/plugins/claws-mail/archiver.h
+include/claws-mail/plugins/claws-mail/archiver_prefs.h
diff --git a/mail/claws-mail-attachwarner/Makefile b/mail/claws-mail-attachwarner/Makefile
index dea6064c37b..6c45ee3250e 100644
--- a/mail/claws-mail-attachwarner/Makefile
+++ b/mail/claws-mail-attachwarner/Makefile
@@ -1,28 +1,14 @@
-# $NetBSD: Makefile,v 1.36 2013/06/06 12:54:40 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/07/24 15:29:21 drochner Exp $
 #
 
-DISTNAME=	attachwarner-0.2.24
-PKGNAME=	claws-mail-attachwarner-0.2.24
-PKGREVISION=	8
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    attachwarner
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Warns if a message mentions an attachment without attaching files
 
-PLIST_SRC+=	PLIST
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
 
 DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
-
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile
index 905db061670..fd4d475a3e4 100644
--- a/mail/claws-mail-attremover/Makefile
+++ b/mail/claws-mail-attremover/Makefile
@@ -1,26 +1,14 @@
-# $NetBSD: Makefile,v 1.35 2013/06/06 12:54:40 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2013/07/24 15:29:22 drochner Exp $
 #
 
-DISTNAME=	att_remover-1.0.14
-PKGNAME=	claws-mail-att_remover-1.0.14
-PKGREVISION=	8
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    att_remover
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Permanently deletes attachments from mail
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
-
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-bogofilter/Makefile b/mail/claws-mail-bogofilter/Makefile
index 55b74bbdcb9..8aa58dda76d 100644
--- a/mail/claws-mail-bogofilter/Makefile
+++ b/mail/claws-mail-bogofilter/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/06/04 22:16:34 tron Exp $
+# $NetBSD: Makefile,v 1.28 2013/07/24 15:29:22 drochner Exp $
 #
 
 PLUGIN_NAME=	bogofilter
-PKGREVISION=	4
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 958e4edfe71..fef8fb55729 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -1,26 +1,14 @@
-# $NetBSD: Makefile,v 1.36 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/07/24 15:29:22 drochner Exp $
 #
 
-DISTNAME=	fetchinfo-plugin-0.4.25
-PKGNAME=	claws-mail-fetchinfo-plugin-0.4.25
-PKGREVISION=	8
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    fetchinfo
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Inserts headers containing some download information
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
-
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 6e413199ab7..e8bf7b39314 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -1,26 +1,14 @@
-# $NetBSD: Makefile,v 1.35 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2013/07/24 15:29:22 drochner Exp $
 #
 
-DISTNAME=	mailmbox-1.14.7
-PKGNAME=	claws-mail-mailmbox-1.14.7
-PKGREVISION=	8
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    mailmbox
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Handles mailboxes in mbox format
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
-
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 55804f5f447..c0d13be1b57 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -1,28 +1,14 @@
-# $NetBSD: Makefile,v 1.37 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2013/07/24 15:29:22 drochner Exp $
 #
 
-DISTNAME=	newmail-0.0.15
-PKGNAME=	claws-mail-newmail-0.0.15
-PKGREVISION=	23
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    newmail
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Write log file info on arriving email
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
-
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
-
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 516b6b28176..a929da1cb14 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -1,27 +1,16 @@
-# $NetBSD: Makefile,v 1.38 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2013/07/24 15:29:22 drochner Exp $
 #
 
-DISTNAME=	notification_plugin-0.30
-PKGNAME=	claws-mail-notification-0.30
-PKGREVISION=	8
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    notification
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Provides various ways to notify the user of new and unread email
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
 
-.include "../../mk/bsd.prefs.mk"
+PLIST_SRC+=	PLIST
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-notification/PLIST b/mail/claws-mail-notification/PLIST
index 0f861d14996..c898cd85309 100644
--- a/mail/claws-mail-notification/PLIST
+++ b/mail/claws-mail-notification/PLIST
@@ -1,28 +1,12 @@
-@comment $NetBSD: PLIST,v 1.8 2012/07/02 19:08:44 drochner Exp $
-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.la
-share/locale/ca/LC_MESSAGES/notification_plugin.mo
-share/locale/cs/LC_MESSAGES/notification_plugin.mo
-share/locale/es/LC_MESSAGES/notification_plugin.mo
-share/locale/fi/LC_MESSAGES/notification_plugin.mo
-share/locale/fr/LC_MESSAGES/notification_plugin.mo
-share/locale/hu/LC_MESSAGES/notification_plugin.mo
-share/locale/id_ID/LC_MESSAGES/notification_plugin.mo
-share/locale/it/LC_MESSAGES/notification_plugin.mo
-share/locale/ja/LC_MESSAGES/notification_plugin.mo
-share/locale/lt/LC_MESSAGES/notification_plugin.mo
-share/locale/nl/LC_MESSAGES/notification_plugin.mo
-share/locale/pt_BR/LC_MESSAGES/notification_plugin.mo
-share/locale/ru/LC_MESSAGES/notification_plugin.mo
-share/locale/sk/LC_MESSAGES/notification_plugin.mo
-share/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
+@comment $NetBSD: PLIST,v 1.9 2013/07/24 15:29:22 drochner Exp $
+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
diff --git a/mail/claws-mail-pgpcore/Makefile b/mail/claws-mail-pgpcore/Makefile
index 2ce3ec180ec..fa998b19ab7 100644
--- a/mail/claws-mail-pgpcore/Makefile
+++ b/mail/claws-mail-pgpcore/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2013/06/06 12:53:53 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2013/07/24 15:29:22 drochner Exp $
 #
 
 PLUGIN_NAME=	pgpcore
-PKGREVISION=	8
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,7 +11,6 @@ PLIST_SRC+=	PLIST
 
 PLIST_SRC+=	PLIST
 
-CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
diff --git a/mail/claws-mail-pgpinline/Makefile b/mail/claws-mail-pgpinline/Makefile
index ba73c057ac8..6eabaa6d1b1 100644
--- a/mail/claws-mail-pgpinline/Makefile
+++ b/mail/claws-mail-pgpinline/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.34 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2013/07/24 15:29:22 drochner Exp $
 #
 
 PLUGIN_NAME=	pgpinline
-PKGREVISION=	8
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Handles PGP/Inline signed and/or encrypted mails
 
-CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpinline-plugin
 
@@ -17,7 +15,6 @@ DEPENDS+=	claws-mail-pgpcore-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail-p
 PLIST_SRC+=	PLIST
 
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-pgpmime/Makefile b/mail/claws-mail-pgpmime/Makefile
index 8dfebe4bcad..b914f2eefce 100644
--- a/mail/claws-mail-pgpmime/Makefile
+++ b/mail/claws-mail-pgpmime/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.33 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/07/24 15:29:22 drochner Exp $
 #
 
 PLUGIN_NAME=	pgpmime
-PKGREVISION=	8
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Handles PGP/MIME signed and/or encrypted mails
 
-CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 CONFIGURE_ARGS+=	--enable-pgpmime-plugin
 
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 123cf01e29c..ed5797ba681 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -1,33 +1,16 @@
-# $NetBSD: Makefile,v 1.42 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2013/07/24 15:29:22 drochner Exp $
 #
 
-DISTNAME=	rssyl-0.33
-PKGNAME=	claws-mail-rssyl-0.33
-PKGREVISION=	10
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    rssyl
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Read RSS 1.0, 2.0 and Atom feeds in Claws-Mail
 
-PLIST_SRC+=	PLIST
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+#PLIST_SRC+=	PLIST
 
 DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-PLIST_SRC+=	PLIST
-
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
-
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-smime/Makefile b/mail/claws-mail-smime/Makefile
index 3db1c6650e3..2f23c968ecf 100644
--- a/mail/claws-mail-smime/Makefile
+++ b/mail/claws-mail-smime/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2013/07/24 15:29:22 drochner Exp $
 #
 
 PLUGIN_NAME=	smime
-PKGREVISION=	8
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -10,7 +9,6 @@ COMMENT=	This plugin handles S/MIME signed and/or encrypted mails
 
 PLIST_SRC+=	PLIST
 
-CONFIGURE_ARGS+=	--enable-gpgme
 CONFIGURE_ARGS+=	--enable-smime-plugin
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 
diff --git a/mail/claws-mail-spamassassin/Makefile b/mail/claws-mail-spamassassin/Makefile
index a9609e69952..400d86077e0 100644
--- a/mail/claws-mail-spamassassin/Makefile
+++ b/mail/claws-mail-spamassassin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2013/06/04 22:16:35 tron Exp $
+# $NetBSD: Makefile,v 1.27 2013/07/24 15:29:22 drochner Exp $
 #
 
 PLUGIN_NAME=	spamassassin
-PKGREVISION=	4
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -13,6 +12,4 @@ CONFIGURE_ARGS+=	--enable-${PLUGIN_NAME}-plugin
 DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 DEPENDS+=	spamassassin>=3.2.5:../../mail/spamassassin
 
-.include "../../mail/claws-mail/Makefile.vers"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 93877cf1e6b..f018c127ba5 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -1,27 +1,16 @@
-# $NetBSD: Makefile,v 1.40 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2013/07/24 15:29:22 drochner Exp $
 #
 
-DISTNAME=	spam_report-0.3.16
-PKGNAME=	claws-mail-spam_report-0.3.16
-PKGREVISION=	10
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    spam_report
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Report spam to various places
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
 
-.include "../../mk/bsd.prefs.mk"
+PLIST_SRC=	PLIST
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-spamreport/PLIST b/mail/claws-mail-spamreport/PLIST
index 4f7fd229a65..f340a6084ec 100644
--- a/mail/claws-mail-spamreport/PLIST
+++ b/mail/claws-mail-spamreport/PLIST
@@ -1,17 +1,2 @@
-@comment $NetBSD: PLIST,v 1.10 2012/07/02 19:08:45 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/07/24 15:29:22 drochner Exp $
 lib/claws-mail/plugins/spamreport.la
-share/locale/ca/LC_MESSAGES/spam_report.mo
-share/locale/cs/LC_MESSAGES/spam_report.mo
-share/locale/es/LC_MESSAGES/spam_report.mo
-share/locale/fi/LC_MESSAGES/spam_report.mo
-share/locale/fr/LC_MESSAGES/spam_report.mo
-share/locale/hu/LC_MESSAGES/spam_report.mo
-share/locale/id_ID/LC_MESSAGES/spam_report.mo
-share/locale/it/LC_MESSAGES/spam_report.mo
-share/locale/ja/LC_MESSAGES/spam_report.mo
-share/locale/lt/LC_MESSAGES/spam_report.mo
-share/locale/nl/LC_MESSAGES/spam_report.mo
-share/locale/pt_BR/LC_MESSAGES/spam_report.mo
-share/locale/ru/LC_MESSAGES/spam_report.mo
-share/locale/sk/LC_MESSAGES/spam_report.mo
-share/locale/uk/LC_MESSAGES/spam_report.mo
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index cebc898fe9d..da35c4930e3 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -1,30 +1,16 @@
-# $NetBSD: Makefile,v 1.33 2013/06/06 12:54:41 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/07/24 15:29:22 drochner Exp $
 #
 
-DISTNAME=	tnef_parse-0.3.13
-PKGNAME=	claws-mail-tnef-0.3.13
-PKGREVISION=	8
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    tnef_parse
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Handles TNEF attachments from Outlook
 
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
 #PLIST_SRC+=	PLIST
 
 DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../mail/libytnef/buildlink3.mk"
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 79a2994b805..5e8104b4fe7 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,29 +1,17 @@
-# $NetBSD: Makefile,v 1.43 2013/06/06 12:54:42 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2013/07/24 15:29:22 drochner Exp $
 #
 
-DISTNAME=	vcalendar-2.0.13
-PKGNAME=	claws-mail-vcalendar-2.0.13
-PKGREVISION=	11
-CATEGORIES=	mail
-MASTER_SITES=	http://claws-mail.org/downloads/plugins/
+PLUGIN_NAME=    vcalendar
+.include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Enable vCalendar message handling
 
-#PLIST_SRC+=	PLIST
+USE_TOOLS+=	perl
 
-DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
-
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --enable-${PLUGIN_NAME}-plugin
+PLIST_SRC+=	PLIST
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake
-USE_LANGUAGES+=	c
+DEPENDS+=	claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
 
-.include "../../mail/claws-mail/Makefile.vers"
-.include "../../mail/claws-mail/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/claws-mail-vcalendar/PLIST b/mail/claws-mail-vcalendar/PLIST
index 96b4f69a3e7..6464e6e4713 100644
--- a/mail/claws-mail-vcalendar/PLIST
+++ b/mail/claws-mail-vcalendar/PLIST
@@ -1,22 +1,3 @@
-@comment $NetBSD: PLIST,v 1.8 2012/07/02 19:08:45 drochner Exp $
-include/claws-mail/plugins/vcalendar/ical.h
+@comment $NetBSD: PLIST,v 1.9 2013/07/24 15:29:22 drochner Exp $
+include/claws-mail/plugins/claws-mail/ical.h
 include/claws-mail/plugins/vcalendar/vcal_interface.h
-lib/claws-mail/plugins/vcalendar.la
-share/locale/ca/LC_MESSAGES/vcalendar.mo
-share/locale/cs/LC_MESSAGES/vcalendar.mo
-share/locale/de/LC_MESSAGES/vcalendar.mo
-share/locale/es/LC_MESSAGES/vcalendar.mo
-share/locale/fi/LC_MESSAGES/vcalendar.mo
-share/locale/fr/LC_MESSAGES/vcalendar.mo
-share/locale/hu/LC_MESSAGES/vcalendar.mo
-share/locale/id_ID/LC_MESSAGES/vcalendar.mo
-share/locale/it/LC_MESSAGES/vcalendar.mo
-share/locale/ja/LC_MESSAGES/vcalendar.mo
-share/locale/lt/LC_MESSAGES/vcalendar.mo
-share/locale/nl/LC_MESSAGES/vcalendar.mo
-share/locale/pl/LC_MESSAGES/vcalendar.mo
-share/locale/pt_BR/LC_MESSAGES/vcalendar.mo
-share/locale/ru/LC_MESSAGES/vcalendar.mo
-share/locale/sk/LC_MESSAGES/vcalendar.mo
-share/locale/sr/LC_MESSAGES/vcalendar.mo
-share/locale/zh_CN/LC_MESSAGES/vcalendar.mo
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
index f103b634e36..2075e11765c 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2012/11/29 11:01:16 drochner Exp $
+$NetBSD: distinfo,v 1.16 2013/07/24 15:29:22 drochner Exp $
 
-SHA1 (vcalendar-2.0.13.tar.gz) = 082fde227e6cb3514bab53423718331174e6617c
-RMD160 (vcalendar-2.0.13.tar.gz) = a34846aa714f076792934bd8ea794f5d0db72ba2
-Size (vcalendar-2.0.13.tar.gz) = 861524 bytes
+SHA1 (vcalendar-2.0.14.tar.gz) = e6e98a6e9566fe86c716142f355f6a1f881f5c11
+RMD160 (vcalendar-2.0.14.tar.gz) = aa75447bb194951ef119298aa82caf7e76eecd57
+Size (vcalendar-2.0.14.tar.gz) = 859883 bytes
 SHA1 (patch-CVE-2012-5527_1) = 221b291b5fd879a95f156a2482c6f8a8fd7c1fd1
 SHA1 (patch-CVE-2012-5527_2) = 24b15b3bde4f70103cf2def205d1c7994dcc8b67
 SHA1 (patch-CVE-2012-5527_3) = a4d5df429262b681e67599b0377ba9b8107ea201