8 files changed, 74 insertions, 43 deletions

diff --git a/net/freenet6/Makefile b/net/freenet6/Makefile
index f9bdb2093420..d6c3358039b9 100644
--- a/net/freenet6/Makefile
+++ b/net/freenet6/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	freenet6
-PORTVERSION=	5.1
-PORTREVISION=	11
+PORTVERSION=	6.0.1
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://go6.net/4105/file.asp?file_id=150&
+MASTER_SITES=	http://go6.net/4105/file.asp?file_id=166&
 DISTNAME=	tspc-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
@@ -17,35 +16,25 @@ MAINTAINER=	edwin@mavetju.org
 COMMENT=	Hexago Freenet6 Tunnel Setup Protocol Client - Free IPv6 tunnel
 
 USE_RC_SUBR=	yes
-WRKSRC=		${WRKDIR}/tspc-advanced
+WRKSRC=		${WRKDIR}/gw6c-6_0_1/tspc-advanced
 
 MAN8=		gw6c.8
 MAN5=		gw6c.conf.5
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
 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
+USE_GMAKE=	yes
+MAKE_ARGS=	target=freebsd installdir=${PREFIX} ETCDIR=${ETCDIR}
 
 .include <bsd.port.pre.mk>
 
 post-fetch:
 	if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
-		${MV} ${DISTDIR}/file.asp*file_id*150* \
+		${MV} ${DISTDIR}/file.asp*file_id*166* \
 		    ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \
 	fi
 
-do-install:
-	${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}
 
diff --git a/net/freenet6/distinfo b/net/freenet6/distinfo
index 14bef37cffed..c88d17ae1528 100644
--- a/net/freenet6/distinfo
+++ b/net/freenet6/distinfo
@@ -1,3 +1,3 @@
-MD5 (tspc-5.1-src.tgz) = 5c5205dc58e82454a5d55a3efb4bf786
-SHA256 (tspc-5.1-src.tgz) = 960a6eceebc685c0b36d75a28d3ac576424837e34ddb7d6ee43334c5c3e15b1f
-SIZE (tspc-5.1-src.tgz) = 1055230
+MD5 (tspc-6.0.1-src.tgz) = 0851184a08605e0a2b7395899e55c433
+SHA256 (tspc-6.0.1-src.tgz) = e6b345f11398026c8be17e0c26fc22632a6a1053bbf18b5303e514cf44b52c4a
+SIZE (tspc-6.0.1-src.tgz) = 2873856
diff --git a/net/freenet6/files/freenet6.in b/net/freenet6/files/freenet6.in
index ee544e898472..b2100548ea49 100644
--- a/net/freenet6/files/freenet6.in
+++ b/net/freenet6/files/freenet6.in
@@ -25,12 +25,12 @@ name=freenet6
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/bin/gw6c
-required_files=%%PREFIX%%/etc/gw6c.conf
+required_files=%%PREFIX%%/etc/freenet6/gw6c.conf
 
 # set defaults
 
 freenet6_enable=${freenet6_enable:-"NO"}
-freenet6_flags=${freenet6_flags:-"-f %%PREFIX%%/etc/gw6c.conf"}
+freenet6_flags=${freenet6_flags:-"-f %%PREFIX%%/etc/freenet6/gw6c.conf"}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/net/freenet6/files/patch-Makefiles-etcdir.patch b/net/freenet6/files/patch-Makefiles-etcdir.patch
new file mode 100644
index 000000000000..98b5237f81ec
--- /dev/null
+++ b/net/freenet6/files/patch-Makefiles-etcdir.patch
@@ -0,0 +1,37 @@
+--- template/Makefile.orig	2009-11-15 19:42:51.000000000 +0100
++++ template/Makefile	2009-11-15 19:43:01.000000000 +0100
+@@ -17,8 +17,10 @@
+ 
+ install:
+ 	@echo "Installing templates ..."
+-	@for template_var in README $(PLATFORM).sh; do \
+-            cp $${template_var} $(INSTALL_TEMPL)/$${template_var}; \
++	@for template_var in $(PLATFORM).sh; do \
++            cp $${template_var} $(INSTALL_BIN)/gw6c-$${template_var}; \
+         done
++	@mkdir -p $(ETCDIR)
++	@cp README $(ETCDIR)
+ 
+ clean: 
+--- Makefile.orig	2009-11-15 19:50:40.000000000 +0100
++++ Makefile	2009-11-15 19:50:57.000000000 +0100
+@@ -167,17 +167,14 @@
+ 	@mkdir -p $(INSTALL_DIR)
+ 	@mkdir -p $(INSTALL_BIN)
+ 	@mkdir -p $(INSTALL_MAN)
+-	@mkdir -p $(INSTALL_TEMPL)
+ 
+ 	@for dir in ${SUBDIRS}; do \
+ 	    $(MAKE) -C $$dir install || exit 1; \
+ 	done
+ 
+ 	@cp $(TARGET) $(INSTALL_BIN)
+-	@cp $(BIN_DIR)/gw6c.conf.sample $(INSTALL_BIN)
+-	@[ -f $(INSTALL_BIN)/gw6c.conf ] || { \
+-	    cp $(INSTALL_BIN)/gw6c.conf.sample $(INSTALL_BIN)/gw6c.conf; \
+-	}
++	@mkdir -p $(ETCDIR)
++	@cp $(BIN_DIR)/gw6c.conf.sample $(ETCDIR)
+ 
+ 
+ # This makefile target will clean the build tree of the Gateway6 Client.
diff --git a/net/freenet6/files/patch-src__tsp__tsp_setup.c b/net/freenet6/files/patch-src__tsp__tsp_setup.c
index 5b7d2ca84de5..a948b5dbb1e7 100644
--- a/net/freenet6/files/patch-src__tsp__tsp_setup.c
+++ b/net/freenet6/files/patch-src__tsp__tsp_setup.c
@@ -1,27 +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 @@
+--- src/tsp/tsp_setup.c.orig	2009-11-15 20:06:20.000000000 +0100
++++ src/tsp/tsp_setup.c	2009-11-15 20:07:10.000000000 +0100
+@@ -262,7 +262,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);
+-    pal_snprintf( buffer, sizeof buffer, "%s%c%s.%s", ScriptDir, DirSeparator, pConfig->template, ScriptExtension);
++    pal_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 @@
+@@ -279,13 +279,13 @@
      if( ScriptInterpretor != NULL )
      {
-       snprintf( buffer, sizeof buffer, 
--               "%s \"%s%c%s.%s\"", 
-+               "%s \"%s%cgw6c-%s.%s\"", 
+       pal_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\"",  
+       pal_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
index 87f5e1c39cea..cca41389a4e8 100644
--- a/net/freenet6/files/patch-src_lib_config.c
+++ b/net/freenet6/files/patch-src_lib_config.c
@@ -1,11 +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 @@
+--- src/lib/config.c.orig	2009-05-19 18:22:06.000000000 +0200
++++ src/lib/config.c	2009-11-15 17:57:52.000000000 +0100
+@@ -264,7 +264,7 @@
+ {
    tConf CmdLine;
-   int status = NO_ERROR;
-   struct in_addr addr;
+   gw6c_status status = STATUS_SUCCESS_INIT;
 -  const char* cszTemplDir = "template";
 +  const char* cszTemplDir = "bin";
- #ifdef V4V6_SUPPORT
-   struct in6_addr addr6;
- #endif
+ 
+ 
+   // Hard-coded parameters. Not configurable anymore.
diff --git a/net/freenet6/files/pkg-message.in b/net/freenet6/files/pkg-message.in
index 835029612ef6..d900c33dcbea 100644
--- a/net/freenet6/files/pkg-message.in
+++ b/net/freenet6/files/pkg-message.in
@@ -1,6 +1,6 @@
 Now that the package is installed, please finish it with the following steps:
 
-- Copy %%EXAMPLESDIR%%/gw5c.conf to %%PREFIX%%/etc/gw6c.conf
+- Copy %%PREFIX%%/etc/gw6c.conf.example 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.
 - Add 'freenet6_enable="YES"' to your /etc/rc.conf to make it start
diff --git a/net/freenet6/pkg-plist b/net/freenet6/pkg-plist
new file mode 100644
index 000000000000..9962ea7ad976
--- /dev/null
+++ b/net/freenet6/pkg-plist
@@ -0,0 +1,5 @@
+bin/gw6c
+bin/gw6c-freebsd.sh
+etc/freenet6/README
+etc/freenet6/gw6c.conf.sample
+@dirrmtry etc/freenet6