4 files changed, 36 insertions, 47 deletions

diff --git a/net-p2p/bitflu/Makefile b/net-p2p/bitflu/Makefile
index da51fd4efbac..28b96cf71100 100644
--- a/net-p2p/bitflu/Makefile
+++ b/net-p2p/bitflu/Makefile
@@ -2,59 +2,47 @@
 # $FreeBSD$
 
 PORTNAME=	bitflu
-PORTVERSION=	1.35
+PORTVERSION=	1.51
 CATEGORIES=	net-p2p
-MASTER_SITES=	http://bitflu.workaround.ch/bitflu/ CENKES
+MASTER_SITES=	http://bitflu.workaround.ch/bitflu/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BitTorrent client written in Perl
 
+LICENSE=	ART20
+LICENSE_FILE=	${WRKSRC}/Documentation/artistic-2_0.txt
+
 RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+		p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket
 
-PLUGINSDIR_BASE=lib/perl5
-PLUGINSDIR=	${PLUGINSDIR_BASE}/Bitflu
-USES=		perl5 tar:tgz
+USES=		perl5 shebangfix tar:tgz
 NO_BUILD=	yes
 
+SHEBANG_FILES=	bitflu.pl
 SUB_FILES=	pkg-message
-SUB_LIST=	DOCSDIR=${DOCSDIR} PLUGINSDIR=${PLUGINSDIR}
-PLIST_SUB=	PLUGINSDIR=${PLUGINSDIR}
 
 PORTDOCS=	ChangeLog.txt README.txt README_IPv6.txt
 
-OPTIONS_DEFINE=	IPV6 EXAMPLES DOCS
+OPTIONS_DEFINE=		DOCS EXAMPLES IPV6
 OPTIONS_DEFAULT=	IPV6
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIPV6}
-RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
-.endif
+IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|'\''.bitflu.config'\''|"$$ENV{HOME}/.bitflu.config"|; \
-		s|\./plugins|${PREFIX}/${PLUGINSDIR_BASE}|; \
-		s|/usr/bin/perl|${PERL}|; \
-		s|\./workdir|$$ENV{HOME}/.bitflu.workdir|; \
-		s|--config=\.bitflu.config|--config=~/.bitflu.config|' \
+		s|\./plugins|${DATADIR}/plugins|; \
+		s|\./workdir|$$ENV{HOME}/.bitflu.workdir|' \
 		${WRKSRC}/bitflu.pl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}
-	${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/*.pm ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}/
+	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/Bitflu
+	${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/*.pm ${STAGEDIR}${DATADIR}/plugins/Bitflu
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.config.example \
 		${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}.config
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/bitflu/distinfo b/net-p2p/bitflu/distinfo
index df0af2dbbc4b..e90258d25971 100644
--- a/net-p2p/bitflu/distinfo
+++ b/net-p2p/bitflu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bitflu-1.35.tgz) = cf4255c4589ee66b35f674b9e6587b60380d9755fb776868dc4e420638cd2cf1
-SIZE (bitflu-1.35.tgz) = 154628
+SHA256 (bitflu-1.51.tgz) = 7b7c360e9818892bec21cc9cf6ef2ea95e0affff8ca6afb58fa18f788d998dd5
+SIZE (bitflu-1.51.tgz) = 161963
diff --git a/net-p2p/bitflu/files/pkg-message.in b/net-p2p/bitflu/files/pkg-message.in
index c5cfb45fb5b3..c1161c0a8e66 100644
--- a/net-p2p/bitflu/files/pkg-message.in
+++ b/net-p2p/bitflu/files/pkg-message.in
@@ -1,8 +1,8 @@
 *************************************************************************
-* To use bitflu with the plugins installed by this package, configure	*
-* your ~/.bitflu.config to search for plugins here (instead of the	*
-* default ./plugins):							*
-*									*
-*   %%PREFIX%%/lib/perl5		(New location as of 0.80)	*
-*									*
+ To use Bitflu with the plugins installed by this package, configure
+ your ~/.bitflu.config to search for plugins here (instead of the
+ default ./plugins):
+
+   %%DATADIR%%/plugins
+
 *************************************************************************
diff --git a/net-p2p/bitflu/pkg-plist b/net-p2p/bitflu/pkg-plist
index 65d8cd56a6ea..6c0f0662e86b 100644
--- a/net-p2p/bitflu/pkg-plist
+++ b/net-p2p/bitflu/pkg-plist
@@ -1,13 +1,14 @@
 bin/bitflu
+%%DATADIR%%/plugins/Bitflu/00_StorageVFS.pm
+%%DATADIR%%/plugins/Bitflu/10_AdminHTTP.pm
+%%DATADIR%%/plugins/Bitflu/10_AdminTelnet.pm
+%%DATADIR%%/plugins/Bitflu/20_DownloadBitTorrent.pm
+%%DATADIR%%/plugins/Bitflu/20_DownloadHTTP.pm
+%%DATADIR%%/plugins/Bitflu/30_SourcesBitTorrent.pm
+%%DATADIR%%/plugins/Bitflu/30_SourcesBitTorrentKademlia.pm
+%%DATADIR%%/plugins/Bitflu/99_Cron.pm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bitflu.config
-%%PLUGINSDIR%%/00_StorageVFS.pm
-%%PLUGINSDIR%%/10_AdminHTTP.pm
-%%PLUGINSDIR%%/10_AdminTelnet.pm
-%%PLUGINSDIR%%/20_DownloadBitTorrent.pm
-%%PLUGINSDIR%%/20_DownloadHTTP.pm
-%%PLUGINSDIR%%/30_SourcesBitTorrent.pm
-%%PLUGINSDIR%%/30_SourcesBitTorrentKademlia.pm
-%%PLUGINSDIR%%/99_Cron.pm
-%%PLUGINSDIR%%/99_Rss.pm
-@dirrm %%PLUGINSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrmtry %%DATADIR%%/plugins/Bitflu
+@dirrmtry %%DATADIR%%/plugins
+@dirrmtry %%DATADIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%