>Number: 83379
>Category: ports
>Synopsis: [patch] net/tspc2 now respects PREFIX
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 13 12:00:28 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Linas Valiukas
>Release: FreeBSD 5.4-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD shirshegsm.lan13.satnet.lt 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #0: Wed Jun 1 00:11:23 EEST 2005 root@shirshegsm.lan13.satnet.lt:/usr/obj/usr/src/sys/HUBBLE i386
>Description:
Patches have been updated to use PREFIX instead of /usr/local.
>How-To-Repeat:
>Fix:
diff -ruN tspc2.bak/Makefile tspc2/Makefile
--- tspc2.bak/Makefile Wed Jul 13 14:28:32 2005
+++ tspc2/Makefile Wed Jul 13 14:41:41 2005
@@ -7,6 +7,7 @@
PORTNAME= tspc2
PORTVERSION= 2.1.1
+PORTREVISION= 1
CATEGORIES= net ipv6
MASTER_SITES= http://www.hexago.com/files/
DISTNAME= tspc-${PORTVERSION}-src
@@ -19,7 +20,12 @@
MAN5= tspc.conf.5
MAN8= tspc.8
USE_RC_SUBR= tspc2.sh
+USE_REINPLACE= yes
MAKE_ARGS= target=freebsd installdir=${PREFIX}
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|g' ${WRKSRC}/conf/tspc.conf.in
+ @${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|g' ${WRKSRC}/platform/freebsd/tsp_local.c
.include <bsd.port.mk>
diff -ruN tspc2.bak/files/patch-conf-tspc.conf.in tspc2/files/patch-conf-tspc.conf.in
--- tspc2.bak/files/patch-conf-tspc.conf.in Wed Jul 13 14:28:32 2005
+++ tspc2/files/patch-conf-tspc.conf.in Wed Jul 13 14:29:10 2005
@@ -5,7 +5,7 @@
# from $tsp_dir/template
#
-tsp_dir=@tsp_dir@
-+tsp_dir=/usr/local/share/tspc2
++tsp_dir=PREFIX/share/tspc2
#
# authentication method:
diff -ruN tspc2.bak/files/patch-platform-freebsd-tsp_local.c tspc2/files/patch-platform-freebsd-tsp_local.c
--- tspc2.bak/files/patch-platform-freebsd-tsp_local.c Wed Jul 13 14:28:32 2005
+++ tspc2/files/patch-platform-freebsd-tsp_local.c Wed Jul 13 14:37:45 2005
@@ -6,14 +6,14 @@
-char *FileName = "tspc.conf";
-char *LogFile = "tspc.log";
-+char *FileName = "/usr/local/etc/tspc.conf";
++char *FileName = "PREFIX/etc/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 = "/usr/local/share/tspc2";
++char *TspHomeDir = "PREFIX/share/tspc2";
char DirSeparator = '/';
int Verbose = 0;
>Release-Note:
>Audit-Trail:
>Unformatted: