19 files changed, 61 insertions, 242 deletions

diff --git a/net/freenet6/Makefile b/net/freenet6/Makefile
index c8cf4a93f885..4d507bb18e8f 100644
--- a/net/freenet6/Makefile
+++ b/net/freenet6/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	freenet6
-PORTVERSION=	1.0
+PORTVERSION=	2.1.1
 PORTREVISION=	1
 CATEGORIES=	net ipv6
-MASTER_SITES=	# fetch manually
-DISTNAME=	${PORTNAME}-client-${PORTVERSION}
+MASTER_SITES=	http://www.hexago.com/files/
+DISTNAME=	tspc-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Freenet6 Tunnel Setup Protocol Client - Free IPv6 tunnel
 
-RESTRICTED=	"Must Agree to License at http://www.freenet6.net/ on the download page for FreeBSD"
-NO_CDROM=	${RESTRICTED}
-NO_PACKAGE=	${RESTRICTED}
-
 USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/tspc2
 
 MAN8=		tspc.8
 MAN5=		tspc.conf.5
@@ -33,50 +30,41 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 IGNORE=		This program might not be working on FreeBSD version below 4.0
 .endif
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=		May not be automatically fetched due to licensing\
-		restrictions. You MUST manually fetch the version\
-		after reading and agreeing to the license at:\
-		http://www.freenet6.net/cgi-bin/download.cgi?fn=${DISTFILES} \
-		Once it has been downloaded, move it to\
-		${DISTDIR} and then restart this build.\
-		You also can register to use this service at\
-		http://www.freenet6.net/register.shtml
-.endif
-
-.if ${OSVERSION} >= 440000
-MAKE_ARGS=	target=freebsd44 installdir=${PREFIX}
-.else
-MAKE_ARGS=	target=freebsd4 installdir=${PREFIX}
-.endif
+MAKE_ARGS=	target=freebsd installdir=${PREFIX}
 
 do-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/bin/tspc.conf.sample ${EXAMPLESDIR}
+
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/tspc ${PREFIX}/bin/tspc
-	@${INSTALL_DATA} ${WRKSRC}/bin/tspc.conf ${PREFIX}/etc/tspc.conf.sample
 	@${INSTALL_SCRIPT} ${WRKSRC}/template/checktunnel.sh ${PREFIX}/bin/checktunnel.sh
-	@${INSTALL_SCRIPT} ${WRKSRC}/template/freebsd44.sh ${PREFIX}/bin/tspc-freebsd44.sh
-	@${INSTALL_SCRIPT} ${WRKSRC}/template/freebsd4.sh ${PREFIX}/bin/tspc-freebsd4.sh
+	@${INSTALL_SCRIPT} ${WRKSRC}/template/freebsd.sh ${PREFIX}/bin/tspc-freebsd.sh
 	@${INSTALL_MAN} ${WRKSRC}/man/man8/tspc.8 ${PREFIX}/man/man8
 	@${INSTALL_MAN} ${WRKSRC}/man/man5/tspc.conf.5 ${PREFIX}/man/man5
-	@${INSTALL_SCRIPT} ${WRKSRC}/freenet6.sh ${PREFIX}/etc/rc.d/
+	@${INSTALL_SCRIPT} ${WRKDIR}/freenet6.sh ${PREFIX}/etc/rc.d/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|tspc.conf|${PREFIX}/etc/tspc.conf|" \
-		${WRKSRC}/src/tspc.c
-
-	@${CP} ${FILESDIR}/freenet6.sh.in ${WRKSRC}/freenet6.sh
-	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" ${WRKSRC}/freenet6.sh
+	@${CP} ${FILESDIR}/freenet6.sh.in ${WRKDIR}/freenet6.sh
+	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" ${WRKDIR}/freenet6.sh
 
 	@${CP} ${FILESDIR}/pkg-message.in ${WRKDIR}/pkg-message
-	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" ${WRKDIR}/pkg-message
+	@${REINPLACE_CMD} \
+		-e "s|@@PREFIX@@|${PREFIX}|g" \
+		-e "s|@@EXAMPLESDIR@@|${EXAMPLESDIR}|g" \
+		${WRKDIR}/pkg-message
 
-	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" \
+	@${REINPLACE_CMD} \
+		-e "s|/installdir/bin|${PREFIX}/etc|g" \
 		${WRKSRC}/man/man8/tspc.8
 
-	@${REINPLACE_CMD} -e "s|@@PREFIX@@|${PREFIX}|g" \
+	@${REINPLACE_CMD} \
+		-e "s|/usr/local/tsp|${PREFIX}|g" \
+		-e "s|/install/dir/bin/tspc.conf.sample|${EXAMPLESDIR}/tspc.conf.sample|g" \
+		-e "s|/install/dir/bin/tspc.conf|${PREFIX}/etc/tspc.conf|g" \
+		-e "s|template=linux|template=tspc-freebsd|g" \
 		${WRKSRC}/man/man5/tspc.conf.5
 
 .include <bsd.port.post.mk>
diff --git a/net/freenet6/distinfo b/net/freenet6/distinfo
index 01a225f4fcc5..474a7b71a2a1 100644
--- a/net/freenet6/distinfo
+++ b/net/freenet6/distinfo
@@ -1 +1,2 @@
-MD5 (freenet6-client-1.0.tgz) = a2b4edb1d52b874587533b4cf40de1ba
+MD5 (tspc-2.1.1-src.tgz) = 65183cae002feaacd8bc92d6a5404cc2
+SIZE (tspc-2.1.1-src.tgz) = 1745514
diff --git a/net/freenet6/files/freenet6.sh.in b/net/freenet6/files/freenet6.sh.in
deleted file mode 100644
index cc23ffa382a4..000000000000
--- a/net/freenet6/files/freenet6.sh.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Start or stop the IPv6 tunnel to Freenet6.net
-#
-
-case "$1" in
-	start)
-		echo -n " freenet6"
-		if [ -f @@PREFIX@@/etc/tspc.conf ]; then
-			@@PREFIX@@/bin/tspc
-		fi
-		;;
-
-	stop)
-		if [ ! -f /var/run/tspc.if ]; then
-			echo "TSPC not running"
-			exit 64
-		fi
-		/sbin/ifconfig `cat /var/run/tspc.if` destroy
-		;;
-
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/net/freenet6/files/patch-conf::tspc.conf.in b/net/freenet6/files/patch-conf::tspc.conf.in
new file mode 100644
index 000000000000..9d6954203dc2
--- /dev/null
+++ b/net/freenet6/files/patch-conf::tspc.conf.in
@@ -0,0 +1,11 @@
+--- conf/tspc.conf.in.orig	Sat Nov 20 14:57:43 2004
++++ conf/tspc.conf.in	Sat Nov 20 14:57:53 2004
+@@ -87,7 +87,7 @@
+ # on unix, '.sh' is added to the name of the script. 
+ # on windows, '.bat' is added to the name of the script.
+ # 
+-template=@target@
++template=tspc-@target@
+ 
+ #
+ # 'server' is the tunnel broker identifier
diff --git a/net/freenet6/files/patch-log.c b/net/freenet6/files/patch-log.c
deleted file mode 100644
index 52c5c085c1ad..000000000000
--- a/net/freenet6/files/patch-log.c
+++ /dev/null
@@ -1,12 +0,0 @@
-*** src/log.c.org	Sun Mar 23 16:41:11 2003
---- src/log.c	Sun Mar 23 16:42:54 2003
-***************
-*** 32,37 ****
---- 32,38 ----
-  #include <stdio.h>
-  #include <time.h>
-  #include <syslog.h>
-+ #include <string.h>
-  
-  #define LOG_IT
-  
diff --git a/net/freenet6/files/patch-man-man5-tspc.conf.5 b/net/freenet6/files/patch-man-man5-tspc.conf.5
deleted file mode 100644
index 25bee6d8575b..000000000000
--- a/net/freenet6/files/patch-man-man5-tspc.conf.5
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/man5/tspc.conf.5.orig	Thu Oct 11 16:10:36 2001
-+++ man/man5/tspc.conf.5	Thu Oct 11 16:09:07 2001
-@@ -96,7 +96,7 @@
- The current directory where tspc programs and templates are located. This
- variable might look something like this:
- .Pp
--tsp_dir=/usr/local/tsp
-+tsp_dir=@@PREFIX@@
- .Pp
- This variable is MANDATORY.
- .It Sy client_v4
diff --git a/net/freenet6/files/patch-man-man8-tspc.8 b/net/freenet6/files/patch-man-man8-tspc.8
deleted file mode 100644
index 781fc9263994..000000000000
--- a/net/freenet6/files/patch-man-man8-tspc.8
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/man8/tspc.8.orig	Thu Oct 11 16:07:07 2001
-+++ man/man8/tspc.8	Thu Oct 11 16:07:22 2001
-@@ -85,7 +85,7 @@
- .Pp
- .It Fl f Ar configuration_file
- Specifies a different configuration file to be used in placed of
--the default file /usr/local/tsp/etc/tspc.conf. The file format is
-+the default file @@PREFIX@@/etc/tspc.conf. The file format is
- detailed in 
- .Xr tspc.conf 5
-  and lists the options available to customize the client.
diff --git a/net/freenet6/files/patch-src-Makefile b/net/freenet6/files/patch-src-Makefile
deleted file mode 100644
index c799f69f57b4..000000000000
--- a/net/freenet6/files/patch-src-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/Makefile.orig	Mon Aug 11 17:18:21 2003
-+++ src/Makefile	Thu Oct 23 11:12:02 2003
-@@ -11,7 +11,7 @@
- INC=.
- BIN=../bin
- 
--CC=gcc -g -I$(INC) -Wall
-+CC+=$(CFLAGS) -g -I$(INC) -Wall
- 
- all: tspc tspc.conf.sample
- 
-@@ -19,9 +19,9 @@
- 	@echo Installing tspc
- 	mkdir -p $(install_bin)
- 	$(COPY) $(BIN)/$(TSPC) $(install_bin)/$(TSPC)
--	$(COPY) $(BIN)/tspc.conf.sample $(install_bin)/tspc.conf.sample
--	@if [ ! -e "$(install_bin)/tspc.conf" ]; then \
--	   $(COPY) $(BIN)/tspc.conf.sample $(install_bin)/tspc.conf; \
-+	$(COPY) $(BIN)/tspc.conf.sample $(install_etc)/tspc.conf.sample
-+	@if [ ! -e "$(install_etc)/tspc.conf" ]; then \
-+	   $(COPY) $(BIN)/tspc.conf.sample $(install_etc)/tspc.conf; \
- 	fi
- 	@echo End of tspc installation
- 
diff --git a/net/freenet6/files/patch-src-tspc.c b/net/freenet6/files/patch-src-tspc.c
deleted file mode 100644
index 267384a20844..000000000000
--- a/net/freenet6/files/patch-src-tspc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tspc.c.orig	Wed Sep 10 07:44:23 2003
-+++ src/tspc.c	Thu Oct 23 11:13:55 2003
-@@ -205,7 +205,7 @@
- int Initialise(int argc, char *argv[], tConf *Conf)
- {
-   tConf CmdLine;
--  char *Templ = "template";
-+  char *Templ = "bin";
- 
-   Conf->tsp_dir      = NULL;
-   Conf->server       = "";
diff --git a/net/freenet6/files/patch-src::lib::config.c b/net/freenet6/files/patch-src::lib::config.c
new file mode 100644
index 000000000000..235cf1186313
--- /dev/null
+++ b/net/freenet6/files/patch-src::lib::config.c
@@ -0,0 +1,11 @@
+--- src/lib/config.c.orig	Wed Jun 30 01:06:13 2004
++++ src/lib/config.c	Sat Nov 20 14:44:44 2004
+@@ -270,7 +270,7 @@
+ int tspInitialize(int argc, char *argv[], tConf *Conf)
+ {
+   tConf CmdLine;
+-  char *Templ = "template";
++  char *Templ = "bin";
+ 
+   Conf->tsp_dir      = NULL;
+   Conf->server       = "";
diff --git a/net/freenet6/files/patch-src::tsp::tsp_setup.c b/net/freenet6/files/patch-src::tsp::tsp_setup.c
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/net/freenet6/files/patch-src::tsp::tsp_setup.c
diff --git a/net/freenet6/files/patch-template-freebsd4.sh b/net/freenet6/files/patch-template-freebsd4.sh
deleted file mode 100644
index d2c5d2696062..000000000000
--- a/net/freenet6/files/patch-template-freebsd4.sh
+++ /dev/null
@@ -1,21 +0,0 @@
---- template/freebsd4.sh.orig	Thu Oct 11 16:40:29 2001
-+++ template/freebsd4.sh	Thu Oct 11 16:40:48 2001
-@@ -92,7 +92,7 @@
- fi
- 
- #change to upper case
--TSP_HOST_TYPE=`echo $TSP_HOST_TYPE | tr a-z A-Z`
-+TSP_HOST_TYPE=`echo $TSP_HOST_TYPE | tr [:lower:] [:upper:]`
-
- if [ X"${TSP_HOST_TYPE}" = X"HOST" ] || [ X"${TSP_HOST_TYPE}" = X"ROUTER" ]; then
-    #
-@@ -122,6 +122,9 @@
-    # Delete any default IPv6 route first
-    ExecNoCheck $route delete -inet6 default
-    Exec $route add -inet6 default  -interface $TSP_TUNNEL_INTERFACE
-+
-+   # Save interface for later
-+   echo $TSP_TUNNEL_INTERFACE > /var/run/tspc.if
- fi
- 
- # Router configuration if required
diff --git a/net/freenet6/files/patch-template-freebsd44.sh b/net/freenet6/files/patch-template-freebsd44.sh
deleted file mode 100644
index 290c6647693e..000000000000
--- a/net/freenet6/files/patch-template-freebsd44.sh
+++ /dev/null
@@ -1,38 +0,0 @@
---- template/freebsd44.sh.orig	Sat Feb 23 06:32:37 2002
-+++ template/freebsd44.sh	Fri Jan  3 22:13:35 2003
-@@ -64,7 +64,6 @@
- Display 1 '--- Start of configuration script. ---'
- Display 1 "Script: " `basename $0`
- 
--gifconfig=/usr/sbin/gifconfig
- ifconfig=/sbin/ifconfig
- route=/sbin/route
- rtadvd=/usr/sbin/rtadvd
-@@ -89,7 +88,7 @@
- fi
-
- #change to upper case
--TSP_HOST_TYPE=`echo $TSP_HOST_TYPE | tr a-z A-Z`
-+TSP_HOST_TYPE=`echo $TSP_HOST_TYPE | tr [:lower:] [:upper:]`
-
- if [ X"${TSP_HOST_TYPE}" = X"HOST" ] || [ X"${TSP_HOST_TYPE}" = X"ROUTER" ]; then
-    #
-@@ -103,7 +102,7 @@
-       Exec $ifconfig $TSP_TUNNEL_INTERFACE destroy
-    fi
-    Exec $ifconfig $TSP_TUNNEL_INTERFACE create
--   Exec $gifconfig $TSP_TUNNEL_INTERFACE $TSP_CLIENT_ADDRESS_IPV4 $TSP_SERVER_ADDRESS_IPV4
-+   Exec $ifconfig $TSP_TUNNEL_INTERFACE tunnel $TSP_CLIENT_ADDRESS_IPV4 $TSP_SERVER_ADDRESS_IPV4
- 
-    #
-    # Configured tunnel config (IPv6) 
-@@ -117,6 +116,9 @@
-    # Delete any default IPv6 route first
-    ExecNoCheck $route delete -inet6 default
-    Exec $route add -inet6 default $TSP_SERVER_ADDRESS_IPV6
-+
-+   # Save interface for later
-+   echo $TSP_TUNNEL_INTERFACE > /var/run/tspc.if
- fi
- 
- # Router configuration if required
diff --git a/net/freenet6/files/patch-template::freebsd.sh b/net/freenet6/files/patch-template::freebsd.sh
new file mode 100644
index 000000000000..4b0c23d9e681
--- /dev/null
+++ b/net/freenet6/files/patch-template::freebsd.sh
@@ -0,0 +1,11 @@
+--- template/freebsd.sh.orig	Fri Jun 11 12:41:18 2004
++++ template/freebsd.sh	Sat Nov 20 14:56:36 2004
+@@ -80,7 +80,7 @@
+ Display 1 '--- Start of configuration script. ---'
+ Display 1 "Script: " `basename $0`
+ 
+-gifconfig=/usr/sbin/gifconfig
++gifconfig=/usr/sbin/ifconfig
+ ifconfig=/sbin/ifconfig
+ route=/sbin/route
+ rtadvd=/usr/sbin/rtadvd
diff --git a/net/freenet6/files/patch-tspc.conf.in b/net/freenet6/files/patch-tspc.conf.in
deleted file mode 100644
index 912834d7c03e..000000000000
--- a/net/freenet6/files/patch-tspc.conf.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/tspc.conf.in.orig	Thu Oct 23 11:34:40 2003
-+++ src/tspc.conf.in	Thu Oct 23 11:35:02 2003
-@@ -37,8 +37,8 @@
- # You can also use "checktunnel" if you only want the tunnel info print out.
- # Possible templates are:
- # template=checktunnel
--# template=freebsd4
--# template=freebsd44
-+# template=tspc-freebsd4
-+# template=tspc-freebsd44
- # template=netbsd
- # template=openbsd
- # template=solaris8
diff --git a/net/freenet6/files/patch-xmltsp.c b/net/freenet6/files/patch-xmltsp.c
deleted file mode 100644
index 863e1ba86d81..000000000000
--- a/net/freenet6/files/patch-xmltsp.c
+++ /dev/null
@@ -1,12 +0,0 @@
-*** src/xmltsp.c.org	Sun Mar 23 16:41:06 2003
---- src/xmltsp.c	Sun Mar 23 16:41:29 2003
-***************
-*** 29,34 ****
---- 29,35 ----
-  */
-  #include <stdio.h>
-  #include <stdlib.h>
-+ #include <string.h>
-  
-  #include "xmlparse.h"
-  
diff --git a/net/freenet6/files/pkg-message.in b/net/freenet6/files/pkg-message.in
deleted file mode 100644
index a6810d48767e..000000000000
--- a/net/freenet6/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-Now that the package is installed, please finish it with the following steps:
-
-- Copy @@PREFIX@@/etc/tspc.conf.sample to @@PREFIX@@/etc/tspc.conf
-- Check the values of @@PREFIX@@/etc/tspc.conf. If you have registered at
-  the website, fill in your userid and password there.
-- Run @@PREFIX@@/etc/rc.d/freenet6.sh to start the tunnel.
-- Try to ping a IPv6 host, for example: ping6 www.jp.freebsd.org
-
-*** NOTE FOR UPGRADERS to version 0.97:
-The configuration file has changed, please change "tsp_version" to
-"1.0.1" and add "retry_delay=1800" to it. See tspc.conf.sample for
-more information. If you don't add this, the tunnel will not be
-setup.
-*** NOTE FOR UPGRADERS to version 1.0
-- servername could be have been changed to 'tsps2.freenet6.net'
-- template has changed to 'tspc-freebsd44'
diff --git a/net/freenet6/pkg-descr b/net/freenet6/pkg-descr
index 0a6d79791f89..16a258c030df 100644
--- a/net/freenet6/pkg-descr
+++ b/net/freenet6/pkg-descr
@@ -18,7 +18,3 @@ another very important step to accelerate the deployment at large
 scale of IPv6 to everyone on the net.
 
 WWW: http://www.freenet6.net/
-WWW: http://www.freenet6.net/register.shtml
-
-- Edwin Groothuis
-edwin@mavetju.org
diff --git a/net/freenet6/pkg-plist b/net/freenet6/pkg-plist
index ef39e79cb1c6..1abd114f5f46 100644
--- a/net/freenet6/pkg-plist
+++ b/net/freenet6/pkg-plist
@@ -1,6 +1,6 @@
 bin/tspc
-etc/tspc.conf.sample
-bin/tspc-freebsd4.sh
-bin/tspc-freebsd44.sh
+%%EXAMPLESDIR%%/tspc.conf.sample
+bin/tspc-freebsd.sh
 bin/checktunnel.sh
 etc/rc.d/freenet6.sh
+@dirrm %%EXAMPLESDIR%%