diff options
author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2004-11-28 18:46:54 +0000 |
---|---|---|
committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2004-11-28 18:46:54 +0000 |
commit | caf4fbd3dd563194930ab071b40443571c9e82f5 (patch) | |
tree | 38005d5100b08d525ba9868a3766f53e7d7aff4f /net-p2p | |
parent | 2c6ac14ece8f283f2b920a1d9e5567b985518edf (diff) | |
download | ports-caf4fbd3dd563194930ab071b40443571c9e82f5.tar.gz ports-caf4fbd3dd563194930ab071b40443571c9e82f5.zip |
o Update to Freenet Stable build 5100 released 20041122 snapshot [1]
o Update FILESDIR/wrapper.sh wrapper script to new javavmwrapper
behavior
PR: 74479 [1]
Submitted by: Francis GUDIN <fgudin@nerim.net> <fgudin@nerim.net> [1]
Notes
Notes:
svn path=/head/; revision=122681
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/freenet/Makefile | 7 | ||||
-rw-r--r-- | net-p2p/freenet/distinfo | 4 | ||||
-rw-r--r-- | net-p2p/freenet/files/wrapper.sh | 3 | ||||
-rw-r--r-- | net-p2p/freenet05/Makefile | 7 | ||||
-rw-r--r-- | net-p2p/freenet05/distinfo | 4 | ||||
-rw-r--r-- | net-p2p/freenet05/files/wrapper.sh | 3 |
6 files changed, 18 insertions, 10 deletions
diff --git a/net-p2p/freenet/Makefile b/net-p2p/freenet/Makefile index d6a30739de0f..937e84c2d2f1 100644 --- a/net-p2p/freenet/Makefile +++ b/net-p2p/freenet/Makefile @@ -6,10 +6,10 @@ # PORTNAME= freenet -PORTVERSION= 0.5.2.1.5099 +PORTVERSION= 0.5.2.1.5100 CATEGORIES= net java security MASTER_SITES= http://freenetproject.org/snapshots/ -DISTNAME= ${PORTNAME}-20041026 +DISTNAME= ${PORTNAME}-20041122 EXTRACT_SUFX= .tgz MAINTAINER= lioux@FreeBSD.org @@ -22,7 +22,7 @@ NO_BUILD_DEPENDS_JAVA= yes WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_SUB= JAR_DIR=${JAR_DIR} -JAVAVM= ${LOCALBASE}/bin/javavm +JAVAVM= ${LOCALBASE}/bin/java JAR_DIR= share/java/jar/${PORTNAME} # DATA_FILES= seednodes.ref @@ -38,6 +38,7 @@ PORTDOCS= ${DOC_FILES} post-patch: @${SED} -e "s|%%PREFIX%%|${PREFIX}|; \ s|%%DATA_DIR%%|${DATADIR:S,^${PREFIX}/,,}|; \ + s|%%JAVA_VERSION%%|${USE_JAVA}|; \ s|%%JAVAVM%%|${JAVAVM}|; \ s|%%JAR_DIR%%|${JAR_DIR}|; \ s|%%JAR_FILES%%|${JAR_FILES}|; \ diff --git a/net-p2p/freenet/distinfo b/net-p2p/freenet/distinfo index 8d1de8ef4989..668489a64ef6 100644 --- a/net-p2p/freenet/distinfo +++ b/net-p2p/freenet/distinfo @@ -1,2 +1,2 @@ -MD5 (freenet-20041026.tgz) = 3bf75dbc0c3de4a224f559ff3fae03d2 -SIZE (freenet-20041026.tgz) = 6086605 +MD5 (freenet-20041122.tgz) = f069d7cf46465ae6a10edaec014e124d +SIZE (freenet-20041122.tgz) = 5975450 diff --git a/net-p2p/freenet/files/wrapper.sh b/net-p2p/freenet/files/wrapper.sh index 7b1a3b3b5659..8d57ff0b023a 100644 --- a/net-p2p/freenet/files/wrapper.sh +++ b/net-p2p/freenet/files/wrapper.sh @@ -3,8 +3,11 @@ # Under a BSDL license. Copyright by Mario S F Ferreira <lioux@FreeBSD.org> # $FreeBSD$ +export JAVA_VERSION + PREFIX="%%PREFIX%%" # java +JAVA_VERSION="%%JAVA_VERSION%%" JAVAVM_CALL="%%JAVAVM%%" JAR_DIR="%%JAR_DIR%%" JAR_FILES="%%JAR_FILES%%" diff --git a/net-p2p/freenet05/Makefile b/net-p2p/freenet05/Makefile index d6a30739de0f..937e84c2d2f1 100644 --- a/net-p2p/freenet05/Makefile +++ b/net-p2p/freenet05/Makefile @@ -6,10 +6,10 @@ # PORTNAME= freenet -PORTVERSION= 0.5.2.1.5099 +PORTVERSION= 0.5.2.1.5100 CATEGORIES= net java security MASTER_SITES= http://freenetproject.org/snapshots/ -DISTNAME= ${PORTNAME}-20041026 +DISTNAME= ${PORTNAME}-20041122 EXTRACT_SUFX= .tgz MAINTAINER= lioux@FreeBSD.org @@ -22,7 +22,7 @@ NO_BUILD_DEPENDS_JAVA= yes WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_SUB= JAR_DIR=${JAR_DIR} -JAVAVM= ${LOCALBASE}/bin/javavm +JAVAVM= ${LOCALBASE}/bin/java JAR_DIR= share/java/jar/${PORTNAME} # DATA_FILES= seednodes.ref @@ -38,6 +38,7 @@ PORTDOCS= ${DOC_FILES} post-patch: @${SED} -e "s|%%PREFIX%%|${PREFIX}|; \ s|%%DATA_DIR%%|${DATADIR:S,^${PREFIX}/,,}|; \ + s|%%JAVA_VERSION%%|${USE_JAVA}|; \ s|%%JAVAVM%%|${JAVAVM}|; \ s|%%JAR_DIR%%|${JAR_DIR}|; \ s|%%JAR_FILES%%|${JAR_FILES}|; \ diff --git a/net-p2p/freenet05/distinfo b/net-p2p/freenet05/distinfo index 8d1de8ef4989..668489a64ef6 100644 --- a/net-p2p/freenet05/distinfo +++ b/net-p2p/freenet05/distinfo @@ -1,2 +1,2 @@ -MD5 (freenet-20041026.tgz) = 3bf75dbc0c3de4a224f559ff3fae03d2 -SIZE (freenet-20041026.tgz) = 6086605 +MD5 (freenet-20041122.tgz) = f069d7cf46465ae6a10edaec014e124d +SIZE (freenet-20041122.tgz) = 5975450 diff --git a/net-p2p/freenet05/files/wrapper.sh b/net-p2p/freenet05/files/wrapper.sh index 7b1a3b3b5659..8d57ff0b023a 100644 --- a/net-p2p/freenet05/files/wrapper.sh +++ b/net-p2p/freenet05/files/wrapper.sh @@ -3,8 +3,11 @@ # Under a BSDL license. Copyright by Mario S F Ferreira <lioux@FreeBSD.org> # $FreeBSD$ +export JAVA_VERSION + PREFIX="%%PREFIX%%" # java +JAVA_VERSION="%%JAVA_VERSION%%" JAVAVM_CALL="%%JAVAVM%%" JAR_DIR="%%JAR_DIR%%" JAR_FILES="%%JAR_FILES%%" |