aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2004-11-29 02:46:54 +0800
committerlioux <lioux@FreeBSD.org>2004-11-29 02:46:54 +0800
commitac296f56015cfd54a181f2a11930e10da2e96abe (patch)
tree46c741965e44f60e63841c746bf24f4997776e61
parenta7bb1c14d4fb40ce0c7775bc736daa33a9f1facc (diff)
downloadfreebsd-ports-gnome-ac296f56015cfd54a181f2a11930e10da2e96abe.tar.gz
freebsd-ports-gnome-ac296f56015cfd54a181f2a11930e10da2e96abe.tar.zst
freebsd-ports-gnome-ac296f56015cfd54a181f2a11930e10da2e96abe.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]
-rw-r--r--net-p2p/freenet/Makefile7
-rw-r--r--net-p2p/freenet/distinfo4
-rw-r--r--net-p2p/freenet/files/wrapper.sh3
-rw-r--r--net-p2p/freenet05/Makefile7
-rw-r--r--net-p2p/freenet05/distinfo4
-rw-r--r--net-p2p/freenet05/files/wrapper.sh3
-rw-r--r--net/freenet/Makefile7
-rw-r--r--net/freenet/distinfo4
-rw-r--r--net/freenet/files/wrapper.sh3
9 files changed, 27 insertions, 15 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%%"
diff --git a/net/freenet/Makefile b/net/freenet/Makefile
index d6a30739de0f..937e84c2d2f1 100644
--- a/net/freenet/Makefile
+++ b/net/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/freenet/distinfo b/net/freenet/distinfo
index 8d1de8ef4989..668489a64ef6 100644
--- a/net/freenet/distinfo
+++ b/net/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/freenet/files/wrapper.sh b/net/freenet/files/wrapper.sh
index 7b1a3b3b5659..8d57ff0b023a 100644
--- a/net/freenet/files/wrapper.sh
+++ b/net/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%%"