Attachment 36443 Details for Bug 58418 – file.diff

[patch] file.diff

file.diff (text/plain), 4.12 KB, created by stolz on 2003-10-23 11:00:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: stolz

Created: 2003-10-23 11:00:32 UTC

Size: 4.12 KB

patch

obsolete

>diff -urN /usr/ports/net/freenet6/Makefile freenet6/Makefile
>--- /usr/ports/net/freenet6/Makefile	Tue Mar  4 23:09:43 2003
>+++ freenet6/Makefile	Thu Oct 23 11:41:43 2003
>@@ -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
>@@ -41,9 +42,6 @@
> 		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}
>diff -urN /usr/ports/net/freenet6/distinfo freenet6/distinfo
>--- /usr/ports/net/freenet6/distinfo	Thu Jan 23 12:05:45 2003
>+++ freenet6/distinfo	Thu Oct 23 11:10:19 2003
>@@ -1 +1 @@
>-MD5 (freenet6-0.9.7.tgz) = 0489d5d893089c5b8a19c3b47718dab7
>+MD5 (freenet6-client-1.0.tgz) = a2b4edb1d52b874587533b4cf40de1ba
>diff -urN /usr/ports/net/freenet6/files/patch-src-Makefile freenet6/files/patch-src-Makefile
>--- /usr/ports/net/freenet6/files/patch-src-Makefile	Thu Jan 23 12:05:45 2003
>+++ freenet6/files/patch-src-Makefile	Thu Oct 23 11:12:20 2003
>@@ -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 -urN /usr/ports/net/freenet6/files/patch-src-tspc.c freenet6/files/patch-src-tspc.c
>--- /usr/ports/net/freenet6/files/patch-src-tspc.c	Thu Nov  8 16:24:26 2001
>+++ freenet6/files/patch-src-tspc.c	Thu Oct 23 11:14:37 2003
>@@ -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 -urN /usr/ports/net/freenet6/files/patch-tspc.conf.in freenet6/files/patch-tspc.conf.in
>--- /usr/ports/net/freenet6/files/patch-tspc.conf.in	Thu Jan  1 01:00:00 1970
>+++ freenet6/files/patch-tspc.conf.in	Thu Oct 23 11:35:39 2003
>@@ -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

Actions: View | Diff

Attachments on bug 58418: 36443