Update to 5.1

Please note that the name of the program and the configuration files
has changed dramatically.

11 files changed, 92 insertions, 125 deletions

diff --git a/net/freenet6/Makefile b/net/freenet6/Makefile
index 76fb2dde1b51..5a27915f2dd3 100644
--- a/net/freenet6/Makefile
+++ b/net/freenet6/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	freenet6
-PORTVERSION=	2.1.1
+PORTVERSION=	5.1
 PORTREVISION=	10
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.go6.net/4105/file.asp?file_id=80&foo=/
+MASTER_SITES=	http://go6.net/4105/file.asp?file_id=150&
 DISTNAME=	tspc-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
@@ -17,46 +17,35 @@ MAINTAINER=	edwin@mavetju.org
 COMMENT=	Freenet6 Tunnel Setup Protocol Client - Free IPv6 tunnel
 
 USE_RC_SUBR=	yes
-WRKSRC=		${WRKDIR}/tspc2
+WRKSRC=		${WRKDIR}/tspc-advanced
 
-MAN8=		tspc.8
-MAN5=		tspc.conf.5
+MAN8=		gw6c.8
+MAN5=		gw6c.conf.5
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	freenet6.sh pkg-message
-EXTRA_PATCHES=	${FILESDIR}/patch5-template::freebsd.sh
+USE_RC_SUBR=	freenet6
+SUB_FILES=	pkg-message
 MAKE_ARGS=	target=freebsd installdir=${PREFIX}
 
+PLIST_FILES=	bin/gw6c bin/gw6c-freebsd.sh share/examples/freenet6/gw6c.conf
+PLIST_DIRS=	share/examples/freenet6
+
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 700000
-EXTRA_PATCHES+=	${FILESDIR}/patch7-plstform__freebsd__tsp_local.c
+post-fetch:
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+	${MV} ${DISTDIR}/file.asp*file_id*150* ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 .endif
 
 do-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/bin/tspc.conf.sample ${EXAMPLESDIR}
-
-	@${INSTALL_PROGRAM} ${WRKSRC}/bin/tspc ${PREFIX}/bin/tspc
-	@${INSTALL_SCRIPT} ${WRKSRC}/template/checktunnel.sh ${PREFIX}/bin/checktunnel.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} ${WRKDIR}/freenet6.sh ${PREFIX}/etc/rc.d/
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/gw6c ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/template/freebsd.sh ${PREFIX}/bin/gw6c-freebsd.sh
+	${MKDIR} ${PREFIX}/share/examples/freenet6
+	${INSTALL_DATA} ${WRKSRC}/bin/gw6c.conf.sample ${PREFIX}/share/examples/freenet6/gw6c.conf
+	${INSTALL_MAN} ${WRKSRC}/man/man5/gw6c.conf.5 ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/man/man8/gw6c.8 ${PREFIX}/man/man8
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e "s|/installdir/bin|${PREFIX}/etc|g" \
-		${WRKSRC}/man/man8/tspc.8
-
-	@${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 271947226e61..14bef37cffed 100644
--- a/net/freenet6/distinfo
+++ b/net/freenet6/distinfo
@@ -1,3 +1,3 @@
-MD5 (tspc-2.1.1-src.tgz) = 65183cae002feaacd8bc92d6a5404cc2
-SHA256 (tspc-2.1.1-src.tgz) = 1fc6aa77a0badc567914c13700baacb84ca01e972b946ae6efb78cdf4eac1433
-SIZE (tspc-2.1.1-src.tgz) = 1745514
+MD5 (tspc-5.1-src.tgz) = 5c5205dc58e82454a5d55a3efb4bf786
+SHA256 (tspc-5.1-src.tgz) = 960a6eceebc685c0b36d75a28d3ac576424837e34ddb7d6ee43334c5c3e15b1f
+SIZE (tspc-5.1-src.tgz) = 1055230
diff --git a/net/freenet6/files/freenet6.sh.in b/net/freenet6/files/freenet6.in
index a7f9ffe50d9a..ee544e898472 100644
--- a/net/freenet6/files/freenet6.sh.in
+++ b/net/freenet6/files/freenet6.in
@@ -16,7 +16,7 @@
 # Add the following lines to /etc/rc.conf to enable freenet6:
 #
 # freenet6_enable="YES"
-# freenet6_flags="-f %%PREFIX%%/etc/tspc.conf"
+# freenet6_flags="-f %%PREFIX%%/etc/gw6c.conf"
 #
 
 . %%RC_SUBR%%
@@ -24,13 +24,13 @@
 name=freenet6
 rcvar=`set_rcvar`
 
-command=%%PREFIX%%/bin/tspc
-required_files=%%PREFIX%%/etc/tspc.conf
+command=%%PREFIX%%/bin/gw6c
+required_files=%%PREFIX%%/etc/gw6c.conf
 
 # set defaults
 
 freenet6_enable=${freenet6_enable:-"NO"}
-freenet6_flags=${freenet6_flags:-"-f %%PREFIX%%/etc/tspc.conf"}
+freenet6_flags=${freenet6_flags:-"-f %%PREFIX%%/etc/gw6c.conf"}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/net/freenet6/files/patch-conf::tspc.conf.in b/net/freenet6/files/patch-conf::tspc.conf.in
deleted file mode 100644
index 9d6954203dc2..000000000000
--- a/net/freenet6/files/patch-conf::tspc.conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-src::lib::config.c b/net/freenet6/files/patch-src::lib::config.c
deleted file mode 100644
index 235cf1186313..000000000000
--- a/net/freenet6/files/patch-src::lib::config.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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..5b7d2ca84de5
--- /dev/null
+++ b/net/freenet6/files/patch-src__tsp__tsp_setup.c
@@ -0,0 +1,27 @@
+--- src/tsp/tsp_setup.c.orig	2008-07-20 23:56:23.000000000 +1000
++++ src/tsp/tsp_setup.c	2008-07-20 23:57:19.000000000 +1000
+@@ -273,7 +273,7 @@
+   //
+   if( buffer[0] == 0x00 )
+   {
+-    snprintf( buffer, sizeof buffer, "%s%c%s.%s", ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
++    snprintf( buffer, sizeof buffer, "%s%cgw6c-%s.%s", ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
+ 
+     f_test = fopen( buffer, "r" );
+     if( f_test == NULL )
+@@ -290,13 +290,13 @@
+     if( ScriptInterpretor != NULL )
+     {
+       snprintf( buffer, sizeof buffer, 
+-               "%s \"%s%c%s.%s\"", 
++               "%s \"%s%cgw6c-%s.%s\"", 
+                ScriptInterpretor, ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
+     }
+     else
+     {
+       snprintf( buffer, sizeof buffer, 
+-                "\"%s%c%s.%s\"",  
++                "\"%s%cgw6c-%s.%s\"",  
+                 ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
+     }
+   }
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..87f5e1c39cea
--- /dev/null
+++ b/net/freenet6/files/patch-src_lib_config.c
@@ -0,0 +1,11 @@
+--- src/lib/config.c.orig	2007-11-29 04:27:29.000000000 +1100
++++ src/lib/config.c	2008-07-20 23:56:02.000000000 +1000
+@@ -284,7 +284,7 @@
+   tConf CmdLine;
+   int status = NO_ERROR;
+   struct in_addr addr;
+-  const char* cszTemplDir = "template";
++  const char* cszTemplDir = "bin";
+ #ifdef V4V6_SUPPORT
+   struct in6_addr addr6;
+ #endif
diff --git a/net/freenet6/files/patch5-template::freebsd.sh b/net/freenet6/files/patch5-template::freebsd.sh
deleted file mode 100644
index 4b0c23d9e681..000000000000
--- a/net/freenet6/files/patch5-template::freebsd.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/patch7-plstform__freebsd__tsp_local.c b/net/freenet6/files/patch7-plstform__freebsd__tsp_local.c
deleted file mode 100644
index e6b9ddb5849f..000000000000
--- a/net/freenet6/files/patch7-plstform__freebsd__tsp_local.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- platform/freebsd/tsp_local.c.orig	2004-03-30 23:27:35.000000000 +0200
-+++ platform/freebsd/tsp_local.c	2007-07-11 13:40:26.000000000 +0200
-@@ -74,21 +74,16 @@
- /* freebsd specific to setup an env variable */
- 
- void
- tspSetEnv(char *Variable, char *Value, int Flag)
- {
--	char *buf;
- 	if(Value) {
--		int size=(strlen(Variable) + strlen(Value) + 2);
--		if((buf=malloc(size)) == NULL) {
-+	        if(setenv(Variable, Value, Flag) == -1) {
- 			Display(1, ELError, "SetEnv", "Not enough memory!");
- 			return;
- 		}
--		snprintf(buf, size, "%s=%s", Variable, Value);
--		putenv(buf);
--		Display(2, ELNotice, "tspSetEnv", "%s", buf);
--		free(buf);
-+		Display(2, ELNotice, "tspSetEnv", "%s=%s", Variable, Value);
- 	}
- }
- 
- 
- /* tspSetupTunnel() will callback here */
-
-
diff --git a/net/freenet6/files/pkg-message.in b/net/freenet6/files/pkg-message.in
index 67aae6f922db..835029612ef6 100644
--- a/net/freenet6/files/pkg-message.in
+++ b/net/freenet6/files/pkg-message.in
@@ -1,14 +1,9 @@
 Now that the package is installed, please finish it with the following steps:
 
-- Copy %%EXAMPLESDIR%%/tspc.conf.sample to %%PREFIX%%/etc/tspc.conf
-- Check the values of %%PREFIX%%/etc/tspc.conf. If you have registered at
+- Copy %%EXAMPLESDIR%%/gw5c.conf to %%PREFIX%%/etc/gw6c.conf
+- Check the values of %%PREFIX%%/etc/gw6c.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
-
-Please note that tsps[12].freenet6.net are not in service anymore,
-please use broker.freenet6.net instead.
-
-Net/freenet6 now supports rc.subr.
-Please add 'freenet6_enable="YES"' to your /etc/rc.conf to make it
-start autoamtically at startup.
+- Add 'freenet6_enable="YES"' to your /etc/rc.conf to make it start
+  automatically.
+- Run %%PREFIX%%/etc/rc.d/freenet6 to start the tunnel.
+- Try to ping a IPv6 host, for example: ping6 www.freebsd.org
diff --git a/net/freenet6/pkg-descr b/net/freenet6/pkg-descr
index 2151913bf402..0029f0cbc0a0 100644
--- a/net/freenet6/pkg-descr
+++ b/net/freenet6/pkg-descr
@@ -1,20 +1,26 @@
-Freenet6's TSP is a new initiative launched by Viagenie, a private
-company in Canada involved in IPv6 since 1996, to facilitate a
-faster deployment of an Internet IPv6. Internet is world-wide
-deployed over IPv4, therefore this project has the main goal of
-deploying IPv6 at a larger scale by using configured tunnels.
+What is Freenet6?
 
-Configured tunnel is a transitional method standardized by the IETF
-to use IPv6 in coexistence with IPv4 by encapsulating IPv6 packets
-over IPv4. Any host already connected to Internet with IPv4 and
-having an IPv6 stack could establish link to Internet IPv6.
+Freenet6 is an IPv6 access service offered for free to the community.
+This service enables thousands of people from all over the world
+to experience the best solution for a smooth and incremental
+deployment of IPv6. Freenet6 users can get IPv6 connectivity from
+anywhere, including from behind any NAT device or from outside of
+their home network.
 
-Freenet6, developed by Viagenie in 1999-2000, was the first public
-tunnel server service and one of the most used in the world to
-delegate automatically one single IPv6 address to any host already
-connected to an IPv4 network over configured tunnel simply by
-filling a Web form and running a script. Freenet6's TSP is representing
-another very important step to accelerate the deployment at large
-scale of IPv6 to everyone on the net.
+On Freenet6, a single, permanent IPv6 address and a DNS name are
+assigned to each user, making their PC reachable from anywhere on
+the IPv6 internet. A full /48 prefix may also be assigned to a
+router, enabling the distribution of IPv6 connectivity to an entire
+network.  Freenet 6 - Get Connected For Free!
+
+Instead of a Web interface, which is usually offered by traditional
+tunnel brokers, Freenet6 uses an innovative model based on a
+client/server architecture. The Gateway6 Client is software that
+usually runs on a PC and that implements the Tunnel Setup Protocol
+(TSP). The Gateway6 Client is used to automatically negotiate a
+configured tunnel between a PC or router and the Freenet6 tunnel
+broker, making IPv6 easy to install and maintain. The Gateway6
+Client source code is licensed under the GPL. A commercial license
+is also available.
 
 WWW: http://www.go6.net/4105/freenet.asp