diff options
| -rw-r--r-- | net/freenet6/Makefile | 8 | ||||
| -rw-r--r-- | net/freenet6/distinfo | 2 | ||||
| -rw-r--r-- | net/freenet6/files/patch-src-Makefile | 20 | ||||
| -rw-r--r-- | net/freenet6/files/patch-src-tspc.c | 18 | ||||
| -rw-r--r-- | net/freenet6/files/patch-tspc.conf.in | 13 | ||||
| -rw-r--r-- | net/freenet6/files/pkg-message.in | 5 | ||||
| -rw-r--r-- | net/freenet6/pkg-descr | 1 |
7 files changed, 38 insertions, 29 deletions
diff --git a/net/freenet6/Makefile b/net/freenet6/Makefile index b7ce394e438f..d8ff6a71e60d 100644 --- a/net/freenet6/Makefile +++ b/net/freenet6/Makefile @@ -6,9 +6,10 @@ # PORTNAME= freenet6 -PORTVERSION= 0.9.7 +PORTVERSION= 1.0 CATEGORIES= net ipv6 MASTER_SITES= # fetch manually +DISTNAME= ${PORTNAME}-client-${PORTVERSION} EXTRACT_SUFX= .tgz MAINTAINER= edwin@mavetju.org @@ -39,12 +40,9 @@ IGNORE= May not be automatically fetched due to licensing\ 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/cgi-bin/new_account.pl + http://www.freenet6.net/register.shtml .endif -NO_CDROM= "Redistribution not allowed" -NO_PACKAGE= "Redistribution not allowed" - .if ${OSVERSION} >= 440000 MAKE_ARGS= target=freebsd44 installdir=${PREFIX} .else diff --git a/net/freenet6/distinfo b/net/freenet6/distinfo index 6cf3d0e95181..01a225f4fcc5 100644 --- a/net/freenet6/distinfo +++ b/net/freenet6/distinfo @@ -1 +1 @@ -MD5 (freenet6-0.9.7.tgz) = 0489d5d893089c5b8a19c3b47718dab7 +MD5 (freenet6-client-1.0.tgz) = a2b4edb1d52b874587533b4cf40de1ba diff --git a/net/freenet6/files/patch-src-Makefile b/net/freenet6/files/patch-src-Makefile index cfe5bc04e43c..c799f69f57b4 100644 --- a/net/freenet6/files/patch-src-Makefile +++ b/net/freenet6/files/patch-src-Makefile @@ -1,5 +1,5 @@ ---- src/Makefile.orig Thu Dec 6 06:06:55 2001 -+++ src/Makefile Tue Oct 22 22:50:38 2002 +--- 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 @@ -7,14 +7,18 @@ -CC=gcc -g -I$(INC) -Wall +CC+=$(CFLAGS) -g -I$(INC) -Wall - pre-clean: - @if [ -f $(BIN)/tspc.conf ]; then rm -f $(BIN)/tspc.conf; fi -@@ -22,7 +22,7 @@ + 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 $(install_bin)/tspc.conf -+ $(COPY) $(BIN)/tspc.conf $(install_etc)/tspc.conf +- $(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 - $(BIN)/tspc.conf: diff --git a/net/freenet6/files/patch-src-tspc.c b/net/freenet6/files/patch-src-tspc.c index 6abc77ce6752..267384a20844 100644 --- a/net/freenet6/files/patch-src-tspc.c +++ b/net/freenet6/files/patch-src-tspc.c @@ -1,21 +1,11 @@ ---- src/tspc.c.orig Tue Sep 11 23:41:05 2001 -+++ src/tspc.c Thu Oct 11 13:27:31 2001 -@@ -178,7 +178,7 @@ +--- 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"; - extern int ReadConfigFile(char *File, tConf *Conf); Conf->tsp_dir = NULL; -@@ -554,7 +554,7 @@ - SetEnv("TSP_VERBOSE", buf, 1); - SetEnv("TSP_HOME_DIR", TspHomeDir, 1); - -- snprintf(buf, sizeof buf, "%s%s%c%s.%s", ScriptInterpretor, ScriptDir, DirSeparator, Conf.template, ScriptExtension); -+ snprintf(buf, sizeof buf, "%s%s%ctspc-%s.%s", ScriptInterpretor, ScriptDir, DirSeparator, Conf.template, ScriptExtension); - - Display(2, ELInfo, "SetUpInterface", "Executing configuration script.\n"); - Display(2, ELInfo, "SetUpInterface", buf); - + Conf->server = ""; diff --git a/net/freenet6/files/patch-tspc.conf.in b/net/freenet6/files/patch-tspc.conf.in new file mode 100644 index 000000000000..912834d7c03e --- /dev/null +++ b/net/freenet6/files/patch-tspc.conf.in @@ -0,0 +1,13 @@ +--- 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/pkg-message.in b/net/freenet6/files/pkg-message.in index 9f34dd547a16..a6810d48767e 100644 --- a/net/freenet6/files/pkg-message.in +++ b/net/freenet6/files/pkg-message.in @@ -6,8 +6,11 @@ Now that the package is installed, please finish it with the following steps: - 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: +*** 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 b56c93725784..0a6d79791f89 100644 --- a/net/freenet6/pkg-descr +++ b/net/freenet6/pkg-descr @@ -18,6 +18,7 @@ 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 |