Date: Wed, 25 Apr 2007 21:01:19 -0300 From: "Alejandro Pulver" <alepulver@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/112150: [PATCH] net-p2p/limewire: unbreak and update Message-ID: <1177545679.6611@deimos.mars.bsd> Resent-Message-ID: <200704260030.l3Q0UBrE072866@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 112150
>Category: ports
>Synopsis: [PATCH] net-p2p/limewire: unbreak and update
>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: Thu Apr 26 00:30:11 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007
root@dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP
>Description:
- Update to latest stable version (is minor than the port version so use PORTEPOCH).
- Remove BROKEN.
- Remove RESTRICTED (also needs to be removed from LEGAL) since it's distributed under GPL.
- Use pkg-plist (static).
- Preserve command line arguments in the wrapper script.
>How-To-Repeat:
>Fix:
--- limewire.diff begins here ---
Index: limewire/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/limewire/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- limewire/Makefile 25 Mar 2007 04:04:20 -0000 1.28
+++ limewire/Makefile 25 Apr 2007 23:57:30 -0000
@@ -6,53 +6,39 @@
#
PORTNAME= limewire
-PORTVERSION= 4.12.13
+PORTVERSION= 4.12.11
+PORTEPOCH= 1
CATEGORIES= net-p2p java
-MASTER_SITES= http://maverick.limewire.com/download/
+MASTER_SITES= http://www10.limewire.com/download/
DISTNAME= LimeWireOther
MAINTAINER= armitage@smartwifi.com.ph
-COMMENT= A Java based gnutella client
+COMMENT= A Java based Gnutella client
RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
-BROKEN= Size mismatch
-
USE_ZIP= yes
USE_JAVA= yes
JAVA_VERSION= 1.3+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/LimeWire
-RESTRICTED= License does not allow redistribution of any kind
-
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
-DATAFILES= LimeWire.jar MessagesBundles.jar ProgressTabs.jar \
- clink.jar commons-httpclient.jar commons-logging.jar \
- daap.jar i18n.jar icu4j.jar id3v2.jar jcraft.jar \
- jdic.jar jl011.jar jmdns.jar log4j.jar \
- looks.jar mp3sp14.jar themes.jar tritonus.jar \
- vorbis.jar xerces.jar xml-apis.jar xml.war update.ver \
- hashes libtray.so data.ser runLime.sh \
- MessagesBundle.properties spacer.gif donotremove.htm \
- root COPYING README.txt SOURCE \
- commons-net.jar log4j.properties
-SUB_FILES= limewire.sh
-PLIST_FILES= bin/limewire
+SUB_FILES= ${PORTNAME}.sh
+
+post-extract:
+ @cd ${WRKSRC} && \
+ ${RM} -f *.exe *.dll *.so *.sh cygwin.* COPYING SOURCE && \
+ ${MV} README.txt ..
do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/limewire.sh ${PREFIX}/bin/limewire
- cd ${WRKSRC} \
- && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \;
- cd ${WRKSRC} \
- && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-
-post-install:
- @cd ${WRKSRC} \
- && ${FIND} -s ${DATAFILES} -type f | ${SED} 's,^,${DATADIR:S,^${PREFIX}/,,}/,' >>${TMPPLIST}
- @cd ${WRKSRC} \
- && ${FIND} -s -d ${DATAFILES} -type d | ${SED} 's,^,@dirrm ${DATADIR:S,^${PREFIX}/,,}/,' >>${TMPPLIST}
- @${ECHO_CMD} "@dirrm ${DATADIR:S,^${PREFIX}/,,}" >>${TMPPLIST}
+ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+ ${MKDIR} ${DATADIR}
+ ${CP} -R ${WRKSRC}/* ${DATADIR}
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/README.txt ${DOCSDIR}
+.endif
.include <bsd.port.mk>
Index: limewire/distinfo
===================================================================
RCS file: /home/pcvs/ports/net-p2p/limewire/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- limewire/distinfo 26 Sep 2006 22:20:35 -0000 1.16
+++ limewire/distinfo 25 Apr 2007 23:57:30 -0000
@@ -1,3 +1,3 @@
-MD5 (LimeWireOther.zip) = 4b2c2f228205f6277170bacfb152305d
-SHA256 (LimeWireOther.zip) = e72fb5aca3edd580d28772b3985196e2d6dcb5b4b833c90d09c9d7adf69c1237
-SIZE (LimeWireOther.zip) = 6665140
+MD5 (LimeWireOther.zip) = f6d3c2e3f8b732fca75208b39b3d5a9f
+SHA256 (LimeWireOther.zip) = b80a06e4b133971e8354fe4dbe3d460b2ed482ede2618c91d42d82fae27aeb16
+SIZE (LimeWireOther.zip) = 8902576
Index: limewire/pkg-plist
===================================================================
RCS file: limewire/pkg-plist
diff -N limewire/pkg-plist
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ limewire/pkg-plist 25 Apr 2007 23:57:30 -0000
@@ -0,0 +1,44 @@
+bin/limewire
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%DATADIR%%/LimeWire.ico
+%%DATADIR%%/LimeWire.jar
+%%DATADIR%%/MessagesBundle.properties
+%%DATADIR%%/MessagesBundles.jar
+%%DATADIR%%/ProgressTabs.jar
+%%DATADIR%%/clink.jar
+%%DATADIR%%/commons-httpclient.jar
+%%DATADIR%%/commons-logging.jar
+%%DATADIR%%/commons-net.jar
+%%DATADIR%%/daap.jar
+%%DATADIR%%/data.ser
+%%DATADIR%%/donotremove.htm
+%%DATADIR%%/hashes
+%%DATADIR%%/i18n.jar
+%%DATADIR%%/icu4j.jar
+%%DATADIR%%/id3v2.jar
+%%DATADIR%%/jcraft.jar
+%%DATADIR%%/jdic.jar
+%%DATADIR%%/jl011.jar
+%%DATADIR%%/jmdns.jar
+%%DATADIR%%/log4j.jar
+%%DATADIR%%/log4j.properties
+%%DATADIR%%/looks.jar
+%%DATADIR%%/mp3sp14.jar
+%%DATADIR%%/pmf.ico
+%%DATADIR%%/root/magnet10/badge.img
+%%DATADIR%%/root/magnet10/canHandle.img
+%%DATADIR%%/root/magnet10/limewire.gif
+%%DATADIR%%/root/magnet10/options.js
+%%DATADIR%%/root/magnet10/silentdetect.js
+%%DATADIR%%/spacer.gif
+%%DATADIR%%/themes.jar
+%%DATADIR%%/tritonus.jar
+%%DATADIR%%/update.ver
+%%DATADIR%%/vorbis.jar
+%%DATADIR%%/xerces.jar
+%%DATADIR%%/xml-apis.jar
+%%DATADIR%%/xml.war
+@dirrm %%DATADIR%%/root/magnet10
+@dirrm %%DATADIR%%/root
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: limewire/files/limewire.sh.in
===================================================================
RCS file: /home/pcvs/ports/net-p2p/limewire/files/limewire.sh.in,v
retrieving revision 1.1
diff -u -r1.1 limewire.sh.in
--- limewire/files/limewire.sh.in 12 Feb 2005 23:47:48 -0000 1.1
+++ limewire/files/limewire.sh.in 25 Apr 2007 23:57:30 -0000
@@ -5,4 +5,4 @@
export J2SE_PREEMPTCLOSE=1
export JAVA_VERSION="1.3+"
-cd "%%DATADIR%%" && "%%LOCALBASE%%/bin/java" -jar LimeWire.jar
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar LimeWire.jar "$@"
--- limewire.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1177545679.6611>