5 files changed, 28 insertions, 49 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 615c7f3bc9e3..f1a2d35c6b0d 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -2,44 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	claws-mail
-PORTREVISION=	5
 CATEGORIES=	mail news ipv6
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
 
-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libetpan.so:${PORTSDIR}/mail/libetpan \
+LIB_DEPENDS=	libetpan.so:${PORTSDIR}/mail/libetpan \
 		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
+RUN_DEPENDS=	mime-support>0:${PORTSDIR}/misc/mime-support
 
 USE_GNOME=	gtk20
-USES=		desktop-file-utils pathfix
+USES=		desktop-file-utils execinfo pathfix shebangfix
+SHEBANG_FILES=	tools/*.pl tools/tb2claws-mail
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	COMPFACE DEBUG DOCS ENCHANT IPV6 JPILOT LDAP \
 		MANUAL NLS STARTUP THEMES
+OPTIONS_DEFAULT=COMPFACE ENCHANT MANUAL STARTUP THEMES
 OPTIONS_SUB=	yes
 
 COMPFACE_DESC=		X-Face support
-ENCHANT_DESC=		Spell checking support
-JPILOT_DESC=		JPilot support
-MANUAL_DESC=		User manual
-STARTUP_DESC=		Startup notification support
-THEMES_DESC=		Additional themes
-
-OPTIONS_DEFAULT=	COMPFACE ENCHANT MANUAL STARTUP THEMES
-
 COMPFACE_CONFIGURE_ENABLE=	compface
 COMPFACE_LIB_DEPENDS=	libcompface.so:${PORTSDIR}/mail/faces
 
 DEBUG_CONFIGURE_ON=	--enable-maintainer-mode
 
+ENCHANT_DESC=		Spell checking support
 ENCHANT_CONFIGURE_ENABLE=	enchant
 ENCHANT_LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
+JPILOT_DESC=		JPilot support
 JPILOT_CONFIGURE_ENABLE=	jpilot
 JPILOT_LIB_DEPENDS=	libpisock.so:${PORTSDIR}/palm/pilot-link
 JPILOT_RUN_DEPENDS=	jpilot:${PORTSDIR}/palm/jpilot
@@ -47,17 +41,20 @@ JPILOT_RUN_DEPENDS=	jpilot:${PORTSDIR}/palm/jpilot
 LDAP_CONFIGURE_ENABLE=	ldap
 LDAP_USE=		openldap=yes
 
+MANUAL_DESC=		User manual
 MANUAL_CONFIGURE_ON=	--enable-manual --with-manualdir=${DOCSDIR}/manual
 MANUAL_CONFIGURE_OFF=	--disable-manual
-MANUAL_BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2html:${PORTSDIR}/textproc/docbook-utils
+MANUAL_BUILD_DEPENDS=	docbook-utils>0:${PORTSDIR}/textproc/docbook-utils
 
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext
 
+STARTUP_DESC=		Startup notification support
 STARTUP_CONFIGURE_ENABLE=	startup-notification
 STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 
-THEMES_RUN_DEPENDS=	${LOCALBASE}/share/claws-mail/themes/ZX-0_1.1/down_arrow.xpm:${PORTSDIR}/x11-themes/claws-mail-themes
+THEMES_DESC=		Additional themes
+THEMES_RUN_DEPENDS=	claws-mail-themes>0:${PORTSDIR}/x11-themes/claws-mail-themes
 
 .include "Makefile.claws"
 
@@ -68,17 +65,14 @@ post-patch:
 		${WRKSRC}/src/procmime.c
 	@${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
+	@${REINPLACE_CMD} '/^itlocaledir/ s|prefix)/$$(DATADIRNAME|datarootdir|' \
+		${WRKSRC}/po/Makefile.in.in
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in NEWS RELEASE_NOTES README TODO
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS README TODO ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/tools/README ${STAGEDIR}${DOCSDIR}/README.tools
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	cd ${WRKSRC}/tools && \
+	(cd ${WRKSRC}/tools && \
 		${INSTALL_SCRIPT} OOo2claws-mail.pl acroread2claws-mail.pl \
 		calypso_convert.pl convert_mbox.pl eud2gc.py filter_conv.pl \
 		filter_conv_new.pl fix_date.sh freshmeat_search.pl \
@@ -88,6 +82,6 @@ post-install:
 		nautilus2claws-mail.sh outlook2claws-mail.pl tb2claws-mail \
 		tbird2claws.py textviewer.pl textviewer.sh \
 		thunderbird-filters-convertor.pl uudec uuooffice vcard2xml.py \
-		${STAGEDIR}${DATADIR}
+		${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index afc07c7c400a..d5278939a3c6 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTVERSION=	3.10.1
+PORTVERSION=	3.11.0
 CATEGORIES?=	mail
 MASTER_SITES=	SF/claws-mail/Claws%20Mail/${PORTVERSION}
 
@@ -59,19 +59,24 @@ FILESDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
+CONFIGURE_ARGS+=	--disable-nls
+
 .  for p in ${CLAWS_PLUGINS_BUILD}
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S|--disable-${p}-plugin||}
-PLIST_FILES+=	lib/claws-mail/plugins/${p}.so
+PLIST_FILES+=	lib/claws-mail/plugins/${p:S|spam_|spam|}.so
 .  endfor
 
 do-build:
 .  for p in ${CLAWS_PLUGINS_BUILD}
-	cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD}
+	(cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD})
 .  endfor
 
 do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/claws-mail/plugins
 .  for p in ${CLAWS_PLUGINS_BUILD}
-	cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD} install DESTDIR="${STAGEDIR}"
+	(cd ${WRKSRC}/src/plugins/${p} && \
+		${INSTALL_LIB} .libs/${p:S|spam_|spam|}.so \
+		${STAGEDIR}${PREFIX}/lib/claws-mail/plugins)
 .  endfor
 
 .endif
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 34bbbd722371..ebcf278e05cd 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (claws-mail-3.10.1.tar.xz) = 4cb7c42995b1a5d7567a0909ce2080c05eec74a4d966da7a7a872f5eba018459
-SIZE (claws-mail-3.10.1.tar.xz) = 6669376
+SHA256 (claws-mail-3.11.0.tar.xz) = bf953c3448a711c31a83ef3d0b469f59b02124a26ab3aa964113f728eb2a61c4
+SIZE (claws-mail-3.11.0.tar.xz) = 5902048
diff --git a/mail/claws-mail/files/patch-Makefile.in b/mail/claws-mail/files/patch-Makefile.in
deleted file mode 100644
index 9ffe4cb22ab1..000000000000
--- a/mail/claws-mail/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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 \
-@@ -458,8 +457,6 @@
- clawsinclude_HEADERS = \
- 	claws-features.h
- 
--relnotesdir = $(docdir)
--relnotes_DATA = RELEASE_NOTES
- all: config.h claws-features.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index a8e2024e6b01..16555a958a3d 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -247,7 +247,6 @@ lib/claws-mail/plugins/pgpmime.deps
 lib/claws-mail/plugins/smime.deps
 libdata/pkgconfig/claws-mail.pc
 man/man1/claws-mail.1.gz
-share/appdata/claws-mail.appdata.xml
 share/applications/claws-mail.desktop
 %%DATADIR%%/OOo2claws-mail.pl
 %%DATADIR%%/acroread2claws-mail.pl