From 0430ea81cb43e51177f844f275ae00d472f330e1 Mon Sep 17 00:00:00 2001
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Wed, 16 Sep 2015 19:10:16 +0000
Subject: [PATCH] - Fix shebangs in additional scripts [1] - Don't install
 desktop file second time

PR:		203132 [1] (based on)
Submitted by:	amdmi3 [1]
---
 mail/claws-mail-perl/Makefile | 7 ++++---
 mail/claws-mail/Makefile      | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index 7455a2a91d79..184914432d1d 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -2,11 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	perl
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	Perl filtering plugin for Claws Mail
 
-USES+=		perl5
+USES+=		perl5 shebangfix
+SHEBANG_FILES=	src/plugins/perl/tools/matcherrc2perlfilter.pl
 
 PLIST_FILES+=	share/claws-mail/matcherrc2perlfilter.pl
 
@@ -15,7 +16,7 @@ CLAWS_PLUGINS_BUILD=	perl
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/claws-mail
 	${INSTALL_SCRIPT} ${WRKSRC}/src/plugins/perl/tools/matcherrc2perlfilter.pl \
-		${STAGEDIR}${PREFIX}/share/claws-mail/
+		${STAGEDIR}${PREFIX}/share/claws-mail
 
 .include "../claws-mail/Makefile.claws"
 .include <bsd.port.mk>
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 8dded5fff201..c4758c1bd44c 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	claws-mail
 CATEGORIES=	mail news ipv6
+PORTREVISION=	1
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
 
@@ -13,7 +14,7 @@ RUN_DEPENDS=	mime-support>0:${PORTSDIR}/misc/mime-support
 
 USE_GNOME=	gtk20
 USES=		cpe desktop-file-utils execinfo pathfix shebangfix
-SHEBANG_FILES=	tools/*.pl tools/tb2claws-mail
+SHEBANG_FILES=	tools/*.pl tools/*.py tools/tb2claws-mail
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	COMPFACE DEBUG DOCS ENCHANT IPV6 JPILOT LDAP \
@@ -79,6 +80,5 @@ post-install:
 		tbird2claws.py textviewer.pl textviewer.sh \
 		thunderbird-filters-convertor.pl uudec uuooffice vcard2xml.py \
 		${STAGEDIR}${DATADIR})
-	${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>