Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 May 2013 14:10:28 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317877 - in head/mail: claws-mail claws-mail-address_keeper claws-mail-archiver claws-mail-att_remover claws-mail-attach_warner claws-mail-bsfilter claws-mail-cachesaver claws-mail-cla...
Message-ID:  <201305111410.r4BEAS5L015483@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Sat May 11 14:10:28 2013
New Revision: 317877
URL: http://svnweb.freebsd.org/changeset/ports/317877

Log:
  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

Added:
  head/mail/claws-mail/Makefile.claws   (contents, props changed)
  head/mail/claws-mail/files/patch-configure   (contents, props changed)
Deleted:
  head/mail/claws-mail-address_keeper/distinfo
  head/mail/claws-mail-address_keeper/pkg-plist
  head/mail/claws-mail-archiver/distinfo
  head/mail/claws-mail-archiver/pkg-plist
  head/mail/claws-mail-att_remover/distinfo
  head/mail/claws-mail-attach_warner/distinfo
  head/mail/claws-mail-attach_warner/pkg-plist
  head/mail/claws-mail-bsfilter/distinfo
  head/mail/claws-mail-bsfilter/pkg-plist
  head/mail/claws-mail-clamd/distinfo
  head/mail/claws-mail-clamd/pkg-plist
  head/mail/claws-mail-fancy/distinfo
  head/mail/claws-mail-fancy/pkg-plist
  head/mail/claws-mail-fetchinfo/distinfo
  head/mail/claws-mail-fetchinfo/pkg-plist
  head/mail/claws-mail-gdata/distinfo
  head/mail/claws-mail-gdata/pkg-plist
  head/mail/claws-mail-mailmbox/distinfo
  head/mail/claws-mail-newmail/distinfo
  head/mail/claws-mail-notification/distinfo
  head/mail/claws-mail-notification/pkg-plist
  head/mail/claws-mail-pdf_viewer/distinfo
  head/mail/claws-mail-pdf_viewer/pkg-plist
  head/mail/claws-mail-perl/distinfo
  head/mail/claws-mail-python/distinfo
  head/mail/claws-mail-python/pkg-plist
  head/mail/claws-mail-rssyl/distinfo
  head/mail/claws-mail-rssyl/pkg-plist
  head/mail/claws-mail-spamreport/distinfo
  head/mail/claws-mail-spamreport/pkg-plist
  head/mail/claws-mail-tnef/distinfo
  head/mail/claws-mail-tnef/pkg-plist
  head/mail/claws-mail-vcalendar/distinfo
  head/mail/claws-mail-vcalendar/pkg-plist
Modified:
  head/mail/claws-mail-address_keeper/Makefile
  head/mail/claws-mail-archiver/Makefile   (contents, props changed)
  head/mail/claws-mail-att_remover/Makefile   (contents, props changed)
  head/mail/claws-mail-attach_warner/Makefile
  head/mail/claws-mail-bsfilter/Makefile
  head/mail/claws-mail-cachesaver/Makefile   (contents, props changed)
  head/mail/claws-mail-clamd/Makefile
  head/mail/claws-mail-fancy/Makefile
  head/mail/claws-mail-fetchinfo/Makefile
  head/mail/claws-mail-gdata/Makefile
  head/mail/claws-mail-gtkhtml2_viewer/Makefile
  head/mail/claws-mail-mailmbox/Makefile   (contents, props changed)
  head/mail/claws-mail-newmail/Makefile   (contents, props changed)
  head/mail/claws-mail-notification/Makefile
  head/mail/claws-mail-pdf_viewer/Makefile
  head/mail/claws-mail-perl/Makefile   (contents, props changed)
  head/mail/claws-mail-python/Makefile
  head/mail/claws-mail-rssyl/Makefile
  head/mail/claws-mail-spamreport/Makefile
  head/mail/claws-mail-tnef/Makefile
  head/mail/claws-mail-vcalendar/Makefile
  head/mail/claws-mail/Makefile
  head/mail/claws-mail/distinfo   (contents, props changed)
  head/mail/claws-mail/files/patch-Makefile.in   (contents, props changed)
  head/mail/claws-mail/pkg-plist   (contents, props changed)

Modified: head/mail/claws-mail-address_keeper/Makefile
==============================================================================
--- head/mail/claws-mail-address_keeper/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-address_keeper/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-archiver/Makefile
==============================================================================
--- head/mail/claws-mail-archiver/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-archiver/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-att_remover/Makefile
==============================================================================
--- head/mail/claws-mail-att_remover/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-att_remover/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-attach_warner/Makefile
==============================================================================
--- head/mail/claws-mail-attach_warner/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-attach_warner/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-bsfilter/Makefile
==============================================================================
--- head/mail/claws-mail-bsfilter/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-bsfilter/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-cachesaver/Makefile
==============================================================================
--- head/mail/claws-mail-cachesaver/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-cachesaver/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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

Modified: head/mail/claws-mail-clamd/Makefile
==============================================================================
--- head/mail/claws-mail-clamd/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-clamd/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-fancy/Makefile
==============================================================================
--- head/mail/claws-mail-fancy/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-fancy/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-fetchinfo/Makefile
==============================================================================
--- head/mail/claws-mail-fetchinfo/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-fetchinfo/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-gdata/Makefile
==============================================================================
--- head/mail/claws-mail-gdata/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-gdata/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-gtkhtml2_viewer/Makefile
==============================================================================
--- head/mail/claws-mail-gtkhtml2_viewer/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-gtkhtml2_viewer/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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
 

Modified: head/mail/claws-mail-mailmbox/Makefile
==============================================================================
--- head/mail/claws-mail-mailmbox/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-mailmbox/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-newmail/Makefile
==============================================================================
--- head/mail/claws-mail-newmail/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-newmail/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-notification/Makefile
==============================================================================
--- head/mail/claws-mail-notification/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-notification/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-pdf_viewer/Makefile
==============================================================================
--- head/mail/claws-mail-pdf_viewer/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-pdf_viewer/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-perl/Makefile
==============================================================================
--- head/mail/claws-mail-perl/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-perl/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-python/Makefile
==============================================================================
--- head/mail/claws-mail-python/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-python/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-rssyl/Makefile
==============================================================================
--- head/mail/claws-mail-rssyl/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-rssyl/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-spamreport/Makefile
==============================================================================
--- head/mail/claws-mail-spamreport/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-spamreport/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-tnef/Makefile
==============================================================================
--- head/mail/claws-mail-tnef/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-tnef/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail-vcalendar/Makefile
==============================================================================
--- head/mail/claws-mail-vcalendar/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail-vcalendar/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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>

Modified: head/mail/claws-mail/Makefile
==============================================================================
--- head/mail/claws-mail/Makefile	Sat May 11 13:49:05 2013	(r317876)
+++ head/mail/claws-mail/Makefile	Sat May 11 14:10:28 2013	(r317877)
@@ -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=	COMPFACE DEBUG DOCS ENCHANT IPV6 JPILOT LDAP \
+		MANUAL NLS STARTUP THEMES
 
-OPTIONS_DEFINE=	BOGOFILTER COMPFACE DEBUG DILLO ENCHANT GPGME IPV6 JPILOT LDAP \
-		MANUAL SPAMASSASSIN 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-m
 .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
 

Added: head/mail/claws-mail/Makefile.claws
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/claws-mail/Makefile.claws	Sat May 11 14:10:28 2013	(r317877)
@@ -0,0 +1,80 @@
+# $FreeBSD$

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305111410.r4BEAS5L015483>