ports/126200: [PATCH] net-p2p/bitflu: update to 0.50

Sat Aug 2 19:20:02 UTC 2008

>Number:         126200
>Category:       ports
>Synopsis:       [PATCH] net-p2p/bitflu: update to 0.50
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 02 19:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     peter.schuller at infidyne.com
>Release:        FreeBSD 7.0-RELEASE-p1 amd64
>Organization:
>Environment:
System: FreeBSD prometheus.scode.org 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #1: Sun Jul 27 18:56:49 CEST 2008
>Description:
- Update to 0.50

bitflu was totally re-written for 0.4, and has been updated several
times since. There is a compatibility issue with upgrades due to a
change data store plugin; pkg-message will include a hint about this
and a pointer to the upstream instructions for using bitflu.

Issues:

* Although I have used bitflu sporadically in the past, I have not
  personally used it lately and I haven't had any old stuff to
  try the fluconvert procedure on for upgrading from older versions.
  The instructions are strictly from upstream.

* I could not get it to honor PREFIX with SITE_PERL. I could not see
  a way to do it, and Googling gave me, among other things,
  http://www.mavetju.org/mail/view_message.php?list=freebsd-ports&id=2343672
  which indicates this is expected.

* The user has to configure bitflu to pick up the port-installed
  plugins, as documented in pkg-message. Probably better to do this by
  patching the appropriate places. However, since bitflu is oriented
  towards keeping config files on a per-directory basis, lots of users
  are likely to manage their own configuration file anyway. So even
  patching the source for other defaults, and patching the example, it
  is likely to not "just work" for many pre-existing users.

Added file(s):
- files/pkg-message.in
- pkg-plist

Port maintainer (infofarmer at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- bitflu-0.50.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-p2p/bitflu.orig/Makefile /usr/ports/net-p2p/bitflu/Makefile
--- /usr/ports/net-p2p/bitflu.orig/Makefile	2007-04-06 22:17:54.000000000 +0200
+++ /usr/ports/net-p2p/bitflu/Makefile	2008-08-02 21:18:29.630687962 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bitflu
-PORTVERSION=	0.33
+PORTVERSION=	0.50
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://bitflu.workaround.ch/bitflu/ CENKES
 EXTRACT_SUFX=	.tgz
@@ -17,14 +17,33 @@
 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}
+SUB_FILES=	pkg-message
+SUB_LIST+=	SITE_PERL=${SITE_PERL}
+SUB_LIST+=	DOCSDIR=${DOCSDIR}
+USE_PERL5=	yes
 NO_BUILD=	yes
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_SCRIPT} ${WRKSRC}/tools/fluconvert.pl ${PREFIX}/bin/fluconvert.pl
+	@${INSTALL} -d ${SITE_PERL}/Bitflu
+	@${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/00_StorageFarabDb.pm ${SITE_PERL}/Bitflu/00_StorageFarabDb.pm
+	@${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/00_StorageVFS.pm ${SITE_PERL}/Bitflu/00_StorageVFS.pm
+	@${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/10_AdminHTTP.pm ${SITE_PERL}/Bitflu/10_AdminHTTP.pm
+	@${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/10_AdminTelnet.pm ${SITE_PERL}/Bitflu/10_AdminTelnet.pm
+	@${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/20_DownloadBitTorrent.pm ${SITE_PERL}/Bitflu/20_DownloadBitTorrent.pm
+	@${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/20_DownloadHTTP.pm ${SITE_PERL}/Bitflu/20_DownloadHTTP.pm
+	@${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/30_SourcesBitTorrent.pm ${SITE_PERL}/Bitflu/30_SourcesBitTorrent.pm
+	@${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/30_SourcesBitTorrentKademlia.pm ${SITE_PERL}/Bitflu/30_SourcesBitTorrentKademlia.pm
+	@${INSTALL_DATA} ${WRKSRC}/plugins/Bitflu/99_Cron.pm ${SITE_PERL}/Bitflu/99_Cron.pm
 	@${INSTALL} -d ${EXAMPLESDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.config.example ${EXAMPLESDIR}/${PORTNAME}.config
 
+.if !defined(NOPORTDOCS)
+post-install:
+	@${INSTALL} -d ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/tools/fluconvert-README.txt ${DOCSDIR}/fluconvert-README.txt
+	@${CAT} ${PKGMESSAGE}
+.endif
+
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/net-p2p/bitflu.orig/distinfo /usr/ports/net-p2p/bitflu/distinfo
--- /usr/ports/net-p2p/bitflu.orig/distinfo	2007-04-06 22:17:54.000000000 +0200
+++ /usr/ports/net-p2p/bitflu/distinfo	2008-08-02 15:47:20.851816626 +0200
@@ -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.50.tgz) = 19eaff69274857a4d6cefd85f7590c0d
+SHA256 (bitflu-0.50.tgz) = 602603e4d0c48cbf6f001562af941f81f11a35446c14c6f16a33b023318de47c
+SIZE (bitflu-0.50.tgz) = 106930
diff -ruN --exclude=CVS /usr/ports/net-p2p/bitflu.orig/files/pkg-message.in /usr/ports/net-p2p/bitflu/files/pkg-message.in
--- /usr/ports/net-p2p/bitflu.orig/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/bitflu/files/pkg-message.in	2008-08-02 21:11:21.295079666 +0200
@@ -0,0 +1,14 @@
+To use bitflu with the plugins installed by this package, configure
+your .bitflu.config to search for plugins here (instead of the default
+./plugins):
+
+  %%SITE_PERL%%
+
+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
diff -ruN --exclude=CVS /usr/ports/net-p2p/bitflu.orig/pkg-plist /usr/ports/net-p2p/bitflu/pkg-plist
--- /usr/ports/net-p2p/bitflu.orig/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-p2p/bitflu/pkg-plist	2008-08-02 21:05:21.574405949 +0200
@@ -0,0 +1,16 @@
+%%EXAMPLESDIR%%/bitflu.config
+%%PORTDOCS%%%%DOCSDIR%%/fluconvert-README.txt
+%%SITE_PERL%%/Bitflu/00_StorageFarabDb.pm
+%%SITE_PERL%%/Bitflu/00_StorageVFS.pm
+%%SITE_PERL%%/Bitflu/10_AdminHTTP.pm
+%%SITE_PERL%%/Bitflu/10_AdminTelnet.pm
+%%SITE_PERL%%/Bitflu/20_DownloadBitTorrent.pm
+%%SITE_PERL%%/Bitflu/20_DownloadHTTP.pm
+%%SITE_PERL%%/Bitflu/30_SourcesBitTorrent.pm
+%%SITE_PERL%%/Bitflu/30_SourcesBitTorrentKademlia.pm
+%%SITE_PERL%%/Bitflu/99_Cron.pm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+bin/bitflu
+bin/fluconvert.pl
+ at dirrm %%EXAMPLESDIR%%
+ at dirrm %%SITE_PERL%%/Bitflu
--- bitflu-0.50.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

