Big cleanup after a little update for the rc-script

9 files changed, 3 insertions, 41 deletions

diff --git a/net-p2p/freenet/files/digest-freenet-0.5 b/net-p2p/freenet/files/digest-freenet-0.5
deleted file mode 100644
index 9620cb66ba30..000000000000
--- a/net-p2p/freenet/files/digest-freenet-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a45affea456a8a1d0d6d27b2922e9692 freenet-0.5.tgz 1425586
diff --git a/net-p2p/freenet/files/digest-freenet-0.5.0.5 b/net-p2p/freenet/files/digest-freenet-0.5.0.5
deleted file mode 100644
index 4e05c6745a10..000000000000
--- a/net-p2p/freenet/files/digest-freenet-0.5.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e687bb9b772277ad7d06bf1bfc8e8ed freenet-0.5.0.5.tar.gz 1461536
diff --git a/net-p2p/freenet/files/digest-freenet-0.5.0.6 b/net-p2p/freenet/files/digest-freenet-0.5.0.6
deleted file mode 100644
index f0280ac53a0a..000000000000
--- a/net-p2p/freenet/files/digest-freenet-0.5.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 202b1a54b8bdba2732e39f277785c454 freenet-0.5.0.6.tar.gz 1438063
diff --git a/net-p2p/freenet/files/digest-freenet-0.5.1 b/net-p2p/freenet/files/digest-freenet-0.5.1
deleted file mode 100644
index 3cb14de55374..000000000000
--- a/net-p2p/freenet/files/digest-freenet-0.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79752570c8e02f0d11a6f1dc4a750e95 freenet-0.5.1.tar.gz 1819392
diff --git a/net-p2p/freenet/files/digest-freenet-0.5.2.1-r1 b/net-p2p/freenet/files/digest-freenet-0.5.2.1-r1
deleted file mode 100644
index a9b4651be0e9..000000000000
--- a/net-p2p/freenet/files/digest-freenet-0.5.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59270ee48d889e0be9cae584b67d2743 freenet-0.5.2.1.tar.gz 2118774
diff --git a/net-p2p/freenet/files/digest-freenet-0.5.2.1 b/net-p2p/freenet/files/digest-freenet-0.5.2.1-r2
index a9b4651be0e9..a9b4651be0e9 100644
--- a/net-p2p/freenet/files/digest-freenet-0.5.2.1
+++ b/net-p2p/freenet/files/digest-freenet-0.5.2.1-r2
diff --git a/net-p2p/freenet/files/digest-freenet-0.5.2_rc3 b/net-p2p/freenet/files/digest-freenet-0.5.2_rc3
deleted file mode 100644
index a9af4043ca24..000000000000
--- a/net-p2p/freenet/files/digest-freenet-0.5.2_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5144a69f0189273a02322d131f604200 freenet-0.5.2-rc3.tar.gz 2077830
diff --git a/net-p2p/freenet/files/freenet b/net-p2p/freenet/files/freenet
deleted file mode 100644
index d3d402f03870..000000000000
--- a/net-p2p/freenet/files/freenet
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Freenet init.d-script by Per Wigren <wigren@home.se>
-
-depend() {
-	need net
-}
-
-SEEDNODES_REF="http://freenetproject.org/snapshots/seednodes.ref"
-FREENET_JAR="http://freenetproject.org/snapshots/freenet-latest.jar"
-
-start() {
-	einfo "Fetching latest seednodes.ref..."
-	mv -f /var/freenet/seednodes.ref /var/freenet/seednodes.ref.old &>/dev/null
-	wget -O /var/freenet/seednodes.ref -q $SEEDNODES_REF || \
-		mv -f /var/freenet/seednodes.ref.old /var/freenet/seednodes.ref
-
-	einfo "Fetching latest freenet.jar..."
-	mv -f /usr/lib/freenet/freenet.jar /usr/lib/freenet/freenet.jar.old &>/dev/null
-	wget -O /usr/lib/freenet/freenet.jar -q $FREENET_JAR || \
-		mv -f /usr/lib/freenet/freenet.jar.old /usr/lib/freenet/freenet.jar
-
-	ebegin "Starting Freenet"
-	export CLASSPATH=/usr/lib/freenet/freenet.jar:/usr/lib/freenet/freenet-ext.jar:$CLASSPATH
-	start-stop-daemon --start --quiet --pidfile /var/run/freenet.pid -m \
-		--background \
-		--exec $(java-config --java) -- freenet.node.Main -p /etc/freenet.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Freenet"
-	start-stop-daemon --stop --quiet --pidfile /var/run/freenet.pid
-	rm -f /var/run/freenet.pid
-	eend $?
-}
diff --git a/net-p2p/freenet/files/rc.freenet b/net-p2p/freenet/files/rc.freenet
index acda2b819d60..3bd803a56712 100644
--- a/net-p2p/freenet/files/rc.freenet
+++ b/net-p2p/freenet/files/rc.freenet
@@ -22,6 +22,9 @@ check_config() {
 
 start() {
 	JAVA="$(java-config --java)"
+	#The JVMs don't support NPTL yet, so this is necessary
+	export LD_ASSUME_KERNEL=2.4.1
+
 	check_config || return 1
 
 	ebegin "Starting Freenet now"