Index: head/net-p2p/bitflu/Makefile
===================================================================
--- head/net-p2p/bitflu/Makefile	(revision 221510)
+++ head/net-p2p/bitflu/Makefile	(revision 221511)
@@ -1,30 +1,53 @@
 # New ports collection makefile for:	bitflu
 # Date created:		28 January 2007
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bitflu
-PORTVERSION=	0.33
+PORTVERSION=	0.52
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://bitflu.workaround.ch/bitflu/ CENKES
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	peter.schuller@infidyne.com
 COMMENT=	BitTorrent client written in Perl
 
 RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI
 
-PLIST_FILES=	bin/bitflu %%EXAMPLESDIR%%/bitflu.config
-PLIST_DIRS=	%%EXAMPLESDIR%%
-WRKSRC=		${WRKDIR}/${PORTNAME}
+PLUGINSDIR=	${PREFIX}/lib/${PORTNAME}
+USE_PERL5=	yes
 NO_BUILD=	yes
 
+SUB_FILES=	pkg-message
+SUB_LIST=	DOCSDIR=${DOCSDIR} PLUGINSDIR=${PLUGINSDIR}
+PLIST_SUB=	PLUGINSDIR=lib/${PORTNAME}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|'\''.bitflu.config'\''|"$$ENV{HOME}/.bitflu.config"|; \
+		s|\./plugins|${PLUGINSDIR}|; s|\./workdir|$$ENV{HOME}/.bitflu.workdir|; \
+		s|--config=\.bitflu.config|--config=~/.bitflu.config|' \
+		${WRKSRC}/bitflu.pl
+
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
-	@${INSTALL} -d ${EXAMPLESDIR}/
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.config.example ${EXAMPLESDIR}/${PORTNAME}.config
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
+		${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/fluconvert.pl \
+		${PREFIX}/bin/fluconvert.pl
+	${INSTALL} -d ${PLUGINSDIR}/Bitflu
+	${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/*.pm ${PLUGINSDIR}/Bitflu/
+.if !defined(NOPORTEXAMPLES)
+	${INSTALL} -d ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.config.example \
+		${EXAMPLESDIR}/${PORTNAME}.config
+.endif
+.if !defined(NOPORTDOCS)
+	${INSTALL} -d ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/tools/fluconvert-README.txt \
+		${DOCSDIR}/fluconvert-README.txt
+.endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Property changes on: head/net-p2p/bitflu/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/net-p2p/bitflu/distinfo
===================================================================
--- head/net-p2p/bitflu/distinfo	(revision 221510)
+++ head/net-p2p/bitflu/distinfo	(revision 221511)
@@ -1,3 +1,3 @@
-MD5 (bitflu-0.33.tgz) = fe04d4b58bfef780b635d99bab4383c4
-SHA256 (bitflu-0.33.tgz) = 26c9b3fa99c4d67384018d2ce3b12326ed5cf25596e30f3a29d40b9e9446b3bd
-SIZE (bitflu-0.33.tgz) = 55433
+MD5 (bitflu-0.52.tgz) = f75f5362aacd05ebbd25f01bc4ac11dd
+SHA256 (bitflu-0.52.tgz) = fa252d7d1fb35bae5ef29ccfa130b2162c6d514f2ed72772fce9a7327eeee69f
+SIZE (bitflu-0.52.tgz) = 112440

Property changes on: head/net-p2p/bitflu/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-p2p/bitflu/files/pkg-message.in
===================================================================
--- head/net-p2p/bitflu/files/pkg-message.in	(nonexistent)
+++ head/net-p2p/bitflu/files/pkg-message.in	(revision 221511)
@@ -0,0 +1,19 @@
+To use bitflu with the plugins installed by this package, configure
+your ~/.bitflu.config to search for plugins here (instead of the
+default ./plugins):
+
+  %%PLUGINSDIR%%
+
+If you have previously used a version of bitflu prior to 0.4x, you may
+want to convert your data to the new storage plugin (which was
+introduced along with the upstream bitflu re-write). Such conversions
+can be done using fluconvert. If the package is build with
+documentation, the upstream instructions for using fluconvert is
+installed at:
+
+  %%DOCSDIR%%/fluconvert-README.txt
+
+When installed by this port, the bitflu workdir is located under
+~/.bitflu.workdir by default rather than ./bitflu.workdir (you may
+want to use --config=./bitflu.workdir to produce the behavior used by
+the upstream version).

Property changes on: head/net-p2p/bitflu/files/pkg-message.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/net-p2p/bitflu/pkg-plist
===================================================================
--- head/net-p2p/bitflu/pkg-plist	(nonexistent)
+++ head/net-p2p/bitflu/pkg-plist	(revision 221511)
@@ -0,0 +1,17 @@
+bin/bitflu
+bin/fluconvert.pl
+%%PORTDOCS%%%%DOCSDIR%%/fluconvert-README.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bitflu.config
+%%PLUGINSDIR%%/Bitflu/00_StorageFarabDb.pm
+%%PLUGINSDIR%%/Bitflu/00_StorageVFS.pm
+%%PLUGINSDIR%%/Bitflu/10_AdminHTTP.pm
+%%PLUGINSDIR%%/Bitflu/10_AdminTelnet.pm
+%%PLUGINSDIR%%/Bitflu/20_DownloadBitTorrent.pm
+%%PLUGINSDIR%%/Bitflu/20_DownloadHTTP.pm
+%%PLUGINSDIR%%/Bitflu/30_SourcesBitTorrent.pm
+%%PLUGINSDIR%%/Bitflu/30_SourcesBitTorrentKademlia.pm
+%%PLUGINSDIR%%/Bitflu/99_Cron.pm
+@dirrm %%PLUGINSDIR%%/Bitflu
+@dirrm %%PLUGINSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Property changes on: head/net-p2p/bitflu/pkg-plist
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property