Subject: Re: pkg/32093: net/tspc
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Daniel Eggert <eggert@macvaerk.dtu.dk>
List: pkgsrc-bugs
Date: 11/17/2005 01:30:02
The following reply was made to PR pkg/32093; it has been noted by GNATS.
From: Daniel Eggert <eggert@macvaerk.dtu.dk>
To: gnats-bugs@netbsd.org
Cc: grant@NetBSD.org
Subject: Re: pkg/32093: net/tspc
Date: Thu, 17 Nov 2005 02:28:24 +0100
This seems to be related to pkg/31410
This patch for the Makefile and the new patch files do most of what
has to be done, but I'm no expert when it comes to pkgsrc.
/Daniel
--- Makefile.old 2005-11-17 00:28:22.000000000 +0000
+++ Makefile 2005-11-17 01:27:12.000000000 +0000
@@ -1,21 +1,21 @@
# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:28 jlam Exp $
#
-DISTNAME= freenet6-client-1.0
-PKGNAME= ${DISTNAME:S/freenet6-client/tspc/}
+DISTNAME= tspc-2.1.1-src
+PKGNAME= ${DISTNAME:S/-src//}
CATEGORIES= net
MASTER_SITES= # empty
EXTRACT_SUFX= .tgz
MAINTAINER= grant@NetBSD.org
-HOMEPAGE= http://www.freenet6.net/
-COMMENT= Freenet6 IPv6 tunnel server protocol client
+HOMEPAGE= http://www.hexago.com/
+COMMENT= Hexago IPv6 tunnel server protocol client
USE_PKGINSTALL= yes
NO_CONFIGURE= yes
INTERACTIVE_STAGE= fetch
ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-5.[8-9]-* Darwin-*-*
-
+WRKSRC= ${WRKDIR}/tspc2
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
TARGET= ${LOWER_OPSYS}8
@@ -26,12 +26,12 @@
BUILD_TARGET= all target="${TARGET}"
INSTALL_TARGET= ${ALL_TARGET}
-DOWNLOAD= http://www.freenet6.net/cgi-bin/download.cgi?fn=$
{DISTNAME}${EXTRACT_SUFX}
+DOWNLOAD= http://www.hexago.com/files/${DISTNAME}${EXTRACT_SUFX}
_FETCH_MESSAGE= \
${ECHO}
"==============================================================="; \
- ${ECHO} " The Freenet6 client must be fetched"; \
- ${ECHO} " into ${DISTDIR} from"; \
+ ${ECHO} " The Hexago client must be fetched manually "; \
+ ${ECHO} " into ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} from"; \
${ECHO} " ${DOWNLOAD}."; \
${ECHO}
"==============================================================="
@@ -42,8 +42,8 @@
INSTALLATION_DIRS= man/man5 man/man8 sbin
pre-build:
-.for f in man/man5/tspc.conf.5 man/man8/tspc.8 src/Makefile \
- src/tspc.c src/tspc.c src/tspc.conf.in
+.for f in man/man5/tspc.conf.5 man/man8/tspc.8 platform/netbsd/
Makefile \
+ platform/netbsd/tsp_local.c conf/tspc.conf.in
@${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}.orig
@${SED} ${FILES_SUBST_SED} ${WRKSRC}/${f}.orig > ${WRKSRC}/${f}
.endfor
patches/patch-aa :
--- conf/tspc.conf.in.orig 2005-11-17 00:42:32.000000000 +0000
+++ conf/tspc.conf.in 2005-11-17 00:42:56.000000000 +0000
@@ -24,7 +24,7 @@
# the only use is for the OS scripts which will be taken
# from $tsp_dir/template
#
-tsp_dir=@tsp_dir@
+tsp_dir=@TSP_DIR@
#
# authentication method:
patches/patch-ab :
--- platform/netbsd/tsp_local.c.orig 2005-11-17 00:57:30.000000000
+0000
+++ platform/netbsd/tsp_local.c 2005-11-17 00:58:41.000000000 +0000
@@ -63,13 +63,13 @@
/* these globals are defined by US used by alot of things in */
-char *FileName = "tspc.conf";
-char *LogFile = "tspc.log";
+char *FileName = "@PKG_SYSCONFDIR@/tspc.conf";
+char *LogFile = "/var/log/tspc.log";
char *LogFileName = NULL;
char *ScriptInterpretor = "/bin/sh";
char *ScriptExtension = "sh";
char *ScriptDir = NULL;
-char *TspHomeDir = "/usr/local/etc/tsp";
+char *TspHomeDir = "@TSP_DIR@";
char DirSeparator = '/';
int Verbose = 0;
patches/patch-ac :
--- man/man8/tspc.8.orig 2005-11-17 01:01:25.000000000 +0000
+++ man/man8/tspc.8 2005-11-17 01:02:35.000000000 +0000
@@ -67,7 +67,7 @@
.It Fl f Ar configuration_file
Specifies a different configuration file.
.br
-Default is /installdir/bin/tspc.conf.
+Default is @PKG_SYSCONFDIR@/tspc.conf.
.Pp
.It Fl s Ar interface_name
Overrides
patches/patch-ad :
--- man/man5/tspc.conf.5.orig 2005-11-17 01:03:50.000000000 +0000
+++ man/man5/tspc.conf.5 2005-11-17 01:17:32.000000000 +0000
@@ -45,7 +45,7 @@
The current directory where tspc programs and templates are located.
This
variable might look something like this:
.Pp
-tsp_dir=/usr/local/tsp
+tsp_dir=@TSP_DIR@
.Pp
This variable is MANDATORY.
.It Sy auth_method
@@ -237,9 +237,9 @@
.Pp
.El
.Sh FILES
-.Bl -tag -width /install/dir/bin/tspc.conf -compact
-.It Pa /install/dir/bin/tspc.conf
-.It Pa /install/dir/bin/tspc.conf.sample
+.Bl -tag -width @PKG_SYSCONFDIR@/tspc.conf -compact
+.It Pa @PKG_SYSCONFDIR@/tspc.conf
+.It Pa @prefix@/share/examples/tspc/tspc.conf.sample
.El
.Sh SEE ALSO
.Xr tcpc 8 ,