6 files changed, 14 insertions, 16 deletions

diff --git a/net-p2p/freenet/Makefile b/net-p2p/freenet/Makefile
index 094ac006133a..5e2bda12acc7 100644
--- a/net-p2p/freenet/Makefile
+++ b/net-p2p/freenet/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	freenet
-PORTVERSION=	0.5.2.r1
+PORTVERSION=	0.5.2.1
 CATEGORIES=	net java security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	peer-to-peer network aiming at anonymity and freedom of speech
+COMMENT=	Peer-to-peer network aiming at anonymity and freedom of speech
 
-USE_JAVA=	1.3+
+USE_JAVA=	1.4+
 NO_BUILD=	yes
 NO_BUILD_DEPENDS_JAVA=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net-p2p/freenet/distinfo b/net-p2p/freenet/distinfo
index 1e62a8b34b26..310734742317 100644
--- a/net-p2p/freenet/distinfo
+++ b/net-p2p/freenet/distinfo
@@ -1 +1 @@
-MD5 (freenet-0.5.2-rc1.tar.gz) = 4fa988b915517a44def233760662f420
+MD5 (freenet-0.5.2.1.tar.gz) = 59270ee48d889e0be9cae584b67d2743
diff --git a/net-p2p/freenet/files/wrapper.sh b/net-p2p/freenet/files/wrapper.sh
index a7c9b0d96c68..e03358a34409 100644
--- a/net-p2p/freenet/files/wrapper.sh
+++ b/net-p2p/freenet/files/wrapper.sh
@@ -5,7 +5,7 @@
 
 PREFIX="%%PREFIX%%"
 # java
-JAVAVM="%%JAVAVM%%"
+JAVAVM_CALL="%%JAVAVM%%"
 JAR_DIR="%%JAR_DIR%%"
 JAR_FILES="%%JAR_FILES%%"
 JAR_START="%%JAR_START%%"
@@ -19,7 +19,7 @@ CONFIG_FILE=freenet.conf
 configure_freenet () {
   echo "Configuring FreeNet node"
   cd ${HOME_DIR} &&
-  	${JAVAVM} -jar ./${JAR_START} freenet.node.Main --config "${@}" 
+  	${JAVAVM_CALL} -jar ./${JAR_START} freenet.node.Main --config "${@}" 
 }
 
 configure_java_classpath () {
@@ -91,7 +91,7 @@ prepare_home_dir () {
 start_freenet () {
   echo "Starting FreeNet node"
   cd ${HOME_DIR} &&
-	nice -10 ${JAVAVM} -jar ./${JAR_START} "${@}" &
+	nice -10 ${JAVAVM_CALL} -jar ./${JAR_START} "${@}" &
   echo $! > ${HOME_DIR}/freenet.pid
   exit 0
 }
diff --git a/net-p2p/freenet05/Makefile b/net-p2p/freenet05/Makefile
index 094ac006133a..5e2bda12acc7 100644
--- a/net-p2p/freenet05/Makefile
+++ b/net-p2p/freenet05/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	freenet
-PORTVERSION=	0.5.2.r1
+PORTVERSION=	0.5.2.1
 CATEGORIES=	net java security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	peer-to-peer network aiming at anonymity and freedom of speech
+COMMENT=	Peer-to-peer network aiming at anonymity and freedom of speech
 
-USE_JAVA=	1.3+
+USE_JAVA=	1.4+
 NO_BUILD=	yes
 NO_BUILD_DEPENDS_JAVA=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net-p2p/freenet05/distinfo b/net-p2p/freenet05/distinfo
index 1e62a8b34b26..310734742317 100644
--- a/net-p2p/freenet05/distinfo
+++ b/net-p2p/freenet05/distinfo
@@ -1 +1 @@
-MD5 (freenet-0.5.2-rc1.tar.gz) = 4fa988b915517a44def233760662f420
+MD5 (freenet-0.5.2.1.tar.gz) = 59270ee48d889e0be9cae584b67d2743
diff --git a/net-p2p/freenet05/files/wrapper.sh b/net-p2p/freenet05/files/wrapper.sh
index a7c9b0d96c68..e03358a34409 100644
--- a/net-p2p/freenet05/files/wrapper.sh
+++ b/net-p2p/freenet05/files/wrapper.sh
@@ -5,7 +5,7 @@
 
 PREFIX="%%PREFIX%%"
 # java
-JAVAVM="%%JAVAVM%%"
+JAVAVM_CALL="%%JAVAVM%%"
 JAR_DIR="%%JAR_DIR%%"
 JAR_FILES="%%JAR_FILES%%"
 JAR_START="%%JAR_START%%"
@@ -19,7 +19,7 @@ CONFIG_FILE=freenet.conf
 configure_freenet () {
   echo "Configuring FreeNet node"
   cd ${HOME_DIR} &&
-  	${JAVAVM} -jar ./${JAR_START} freenet.node.Main --config "${@}" 
+  	${JAVAVM_CALL} -jar ./${JAR_START} freenet.node.Main --config "${@}" 
 }
 
 configure_java_classpath () {
@@ -91,7 +91,7 @@ prepare_home_dir () {
 start_freenet () {
   echo "Starting FreeNet node"
   cd ${HOME_DIR} &&
-	nice -10 ${JAVAVM} -jar ./${JAR_START} "${@}" &
+	nice -10 ${JAVAVM_CALL} -jar ./${JAR_START} "${@}" &
   echo $! > ${HOME_DIR}/freenet.pid
   exit 0
 }