Attachment #36443 for bug #58418

View | Details | Raw Unified | Return to bug 58418
Collapse All | Expand All




#

PORTNAME=	freenet6
PORTVERSION=	1.0
CATEGORIES=	net ipv6
MASTER_SITES=	# fetch manually
DISTNAME=	${PORTNAME}-client-${PORTVERSION}
EXTRACT_SUFX=	.tgz

MAINTAINER=	edwin@mavetju.org

		You also can register to use this service at\
		http://www.freenet6.net/cgi-bin/new_account.pl
.endif

NO_CDROM=	"Redistribution not allowed"
NO_PACKAGE=	"Redistribution not allowed"

.if ${OSVERSION} >= 440000
MAKE_ARGS=	target=freebsd44 installdir=${PREFIX}

Line 1 Link Here

(-)freenet6/distinfo (-1 / +1 lines)
1	MD5 (freenet6-0.9.7.tgz) = 0489d5d893089c5b8a19c3b47718dab7	1	MD5 (freenet6-client-1.0.tgz) = a2b4edb1d52b874587533b4cf40de1ba




--- 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
 
 $(BIN)/tspc.conf:




--- 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;
   Conf->server       = "";
   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);





--- 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

Return to bug 58418

Lines 6-14 Link Here

(-)freenet6/Makefile (-4 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= freenet6	8	PORTNAME= freenet6
9	PORTVERSION= 0.9.7	9	PORTVERSION= 1.0
10	CATEGORIES= net ipv6	10	CATEGORIES= net ipv6
11	MASTER_SITES= # fetch manually	11	MASTER_SITES= # fetch manually
		12	DISTNAME= ${PORTNAME}-client-${PORTVERSION}
12	EXTRACT_SUFX= .tgz	13	EXTRACT_SUFX= .tgz
13		14
14	MAINTAINER= edwin@mavetju.org	15	MAINTAINER= edwin@mavetju.org
Lines 41-49 Link Here
41	You also can register to use this service at\	42	You also can register to use this service at\
42	http://www.freenet6.net/cgi-bin/new_account.pl	43	http://www.freenet6.net/cgi-bin/new_account.pl
43	.endif	44	.endif
44
45	NO_CDROM= "Redistribution not allowed"
46	NO_PACKAGE= "Redistribution not allowed"
47		45
48	.if ${OSVERSION} >= 440000	46	.if ${OSVERSION} >= 440000
49	MAKE_ARGS= target=freebsd44 installdir=${PREFIX}	47	MAKE_ARGS= target=freebsd44 installdir=${PREFIX}

Lines 1-5 Link Here

(-)freenet6/files/patch-src-Makefile (-8 / +12 lines)
1	--- src/Makefile.orig Thu Dec 6 06:06:55 2001	1	--- src/Makefile.orig Mon Aug 11 17:18:21 2003
2	+++ src/Makefile Tue Oct 22 22:50:38 2002	2	+++ src/Makefile Thu Oct 23 11:12:02 2003
3	@@ -11,7 +11,7 @@	3	@@ -11,7 +11,7 @@
4	INC=.	4	INC=.
5	BIN=../bin	5	BIN=../bin
Lines 7-20 Link Here
7	-CC=gcc -g -I$(INC) -Wall	7	-CC=gcc -g -I$(INC) -Wall
8	+CC+=$(CFLAGS) -g -I$(INC) -Wall	8	+CC+=$(CFLAGS) -g -I$(INC) -Wall
9		9
10	pre-clean:	10	all: tspc tspc.conf.sample
11	@if [ -f $(BIN)/tspc.conf ]; then rm -f $(BIN)/tspc.conf; fi	11
12	@@ -22,7 +22,7 @@	12	@@ -19,9 +19,9 @@
13	@echo Installing tspc	13	@echo Installing tspc
14	mkdir -p $(install_bin)	14	mkdir -p $(install_bin)
15	$(COPY) $(BIN)/$(TSPC) $(install_bin)/$(TSPC)	15	$(COPY) $(BIN)/$(TSPC) $(install_bin)/$(TSPC)
16	- $(COPY) $(BIN)/tspc.conf $(install_bin)/tspc.conf	16	- $(COPY) $(BIN)/tspc.conf.sample $(install_bin)/tspc.conf.sample
17	+ $(COPY) $(BIN)/tspc.conf $(install_etc)/tspc.conf	17	- @if [ ! -e "$(install_bin)/tspc.conf" ]; then \
		18	- $(COPY) $(BIN)/tspc.conf.sample $(install_bin)/tspc.conf; \
		19	+ $(COPY) $(BIN)/tspc.conf.sample $(install_etc)/tspc.conf.sample
		20	+ @if [ ! -e "$(install_etc)/tspc.conf" ]; then \
		21	+ $(COPY) $(BIN)/tspc.conf.sample $(install_etc)/tspc.conf; \
		22	fi
18	@echo End of tspc installation	23	@echo End of tspc installation
19		24
20	$(BIN)/tspc.conf:

Lines 1-21 Link Here

(-)freenet6/files/patch-src-tspc.c (-14 / +4 lines)
1	--- src/tspc.c.orig Tue Sep 11 23:41:05 2001	1	--- src/tspc.c.orig Wed Sep 10 07:44:23 2003
2	+++ src/tspc.c Thu Oct 11 13:27:31 2001	2	+++ src/tspc.c Thu Oct 23 11:13:55 2003
3	@@ -178,7 +178,7 @@	3	@@ -205,7 +205,7 @@
4	int Initialise(int argc, char argv[], tConf Conf)	4	int Initialise(int argc, char argv[], tConf Conf)
5	{	5	{
6	tConf CmdLine;	6	tConf CmdLine;
7	- char *Templ = "template";	7	- char *Templ = "template";
8	+ char *Templ = "bin";	8	+ char *Templ = "bin";
9	extern int ReadConfigFile(char File, tConf Conf);
10		9
11	Conf->tsp_dir = NULL;	10	Conf->tsp_dir = NULL;
12	@@ -554,7 +554,7 @@	11	Conf->server = "";
13	SetEnv("TSP_VERBOSE", buf, 1);
14	SetEnv("TSP_HOME_DIR", TspHomeDir, 1);
15
16	- snprintf(buf, sizeof buf, "%s%s%c%s.%s", ScriptInterpretor, ScriptDir, DirSeparator, Conf.template, ScriptExtension);
17	+ snprintf(buf, sizeof buf, "%s%s%ctspc-%s.%s", ScriptInterpretor, ScriptDir, DirSeparator, Conf.template, ScriptExtension);
18
19	Display(2, ELInfo, "SetUpInterface", "Executing configuration script.\n");
20	Display(2, ELInfo, "SetUpInterface", buf);
21

Line 0 Link Here

(-)freenet6/files/patch-tspc.conf.in (+13 lines)
	1	--- src/tspc.conf.in.orig Thu Oct 23 11:34:40 2003
	2	+++ src/tspc.conf.in Thu Oct 23 11:35:02 2003
	3	@@ -37,8 +37,8 @@
	4	# You can also use "checktunnel" if you only want the tunnel info print out.
	5	# Possible templates are:
	6	# template=checktunnel
	7	-# template=freebsd4
	8	-# template=freebsd44
	9	+# template=tspc-freebsd4
	10	+# template=tspc-freebsd44
	11	# template=netbsd
	12	# template=openbsd
	13	# template=solaris8