ports/54580: Update/fix net/freenet: 0.5.2rc1 -> 0.5.2 (obsoletes ports/54430)

[Stefan Walter]

>Number:         54580
>Category:       ports
>Synopsis:       Update/fix net/freenet: 0.5.2rc1 -> 0.5.2 (obsoletes ports/54430)
>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 Jul 17 06:00:31 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Walter
>Release:        FreeBSD 5.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD kyuzo.dunkelkammer.void 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Tue Jul 8 23:17:56 CEST 2003 root at kyuzo.dunkelkammer.void:/usr/src/sys/i386/compile/KYUZO i386

>Description:
	- Update of net/freenet to the new release. Both performance and
	  resource usage have improved noticably. The port now depends on a
	  1.4.x JVM - tested with FreeBSD's native JDK.
	- Rename the $JAVAVM variable in the wrapper script as it lead to an
	  infinite loop in javavmwrapper.
	(This patch obsoletes ports/54430 and the patch attached to that PR.)
>How-To-Repeat:
	Install the port.
>Fix:
diff -ruN freenet.old/Makefile freenet/Makefile
--- freenet.old/Makefile	Thu Jul 17 14:23:25 2003
+++ freenet/Makefile	Thu Jul 17 14:25:50 2003
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	freenet
-PORTVERSION=	0.5.2.r1
+PORTVERSION=	0.5.2
 CATEGORIES=	net java security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
 
 MAINTAINER=	lioux at FreeBSD.org
 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 -ruN freenet.old/distinfo freenet/distinfo
--- freenet.old/distinfo	Thu Jul 17 14:23:25 2003
+++ freenet/distinfo	Thu Jul 17 14:26:27 2003
@@ -1 +1 @@
-MD5 (freenet-0.5.2-rc1.tar.gz) = 4fa988b915517a44def233760662f420
+MD5 (freenet-0.5.2.tar.gz) = a599510a9c9b8675240f434632f5931f
diff -ruN freenet.old/files/wrapper.sh freenet/files/wrapper.sh
--- freenet.old/files/wrapper.sh	Thu Jul 17 14:23:25 2003
+++ freenet/files/wrapper.sh	Thu Jul 17 14:23:56 2003
@@ -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 @@
 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 @@
 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
 }
>Release-Note:
>Audit-Trail:
>Unformatted: