Subject: Re: pkg/32637 (tspc doesn't install correctly)
To: None <ghen@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org,>
From: Geert Hendrickx <ghen@netbsd.org>
List: pkgsrc-bugs
Date: 01/30/2006 12:15:03
The following reply was made to PR pkg/32637; it has been noted by GNATS.
From: Geert Hendrickx <ghen@netbsd.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/32637 (tspc doesn't install correctly)
Date: Mon, 30 Jan 2006 13:11:49 +0100
--x+6KMIRAuhnl3hBn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Good point. The attached patch should fix it. Please let me know if it
works for you.
Geert
--x+6KMIRAuhnl3hBn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="tspc.diff"
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tspc/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 15 Jan 2006 11:36:50 -0000 1.13
+++ Makefile 30 Jan 2006 12:07:58 -0000
@@ -26,6 +26,7 @@
.endif
MAKE_ENV+= target=${TARGET:Q}
+MAKE_ENV+= configdir=${PREFIX}/share/tspc
WRKSRC= ${WRKDIR}/tspc2
@@ -34,11 +35,18 @@
RCD_SCRIPTS= tspc
+PLIST_SUBST+= TARGET=${TARGET}
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/tspc ${PREFIX}/sbin/
${INSTALL_MAN} ${WRKSRC}/man/man5/tspc.conf.5 ${PREFIX}/${PKGMANDIR}/man5/
${INSTALL_MAN} ${WRKSRC}/man/man8/tspc.8 ${PREFIX}/${PKGMANDIR}/man8/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tspc/
${INSTALL_DATA} ${WRKSRC}/bin/tspc.conf.sample ${PREFIX}/share/examples/tspc/tspc.conf
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/tspc/ ${PREFIX}/share/tspc/template/
+ ${INSTALL_SCRIPT} ${WRKSRC}/template/${TARGET}.sh ${PREFIX}/share/tspc/template/
+ ${INSTALL_SCRIPT} ${WRKSRC}/template/checktunnel.sh ${PREFIX}/share/tspc/template/
+ ${INSTALL_DATA} ${WRKSRC}/template/README ${PREFIX}/share/tspc/template/
+ ${INSTALL_DATA} ${WRKSRC}/template/variables_environ ${PREFIX}/share/tspc/template/
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/tspc/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST 28 Dec 2005 12:10:44 -0000 1.4
+++ PLIST 30 Jan 2006 12:07:58 -0000
@@ -1,7 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2005/12/28 12:10:44 ghen Exp $
+@comment $NetBSD$
man/man5/tspc.conf.5
man/man8/tspc.8
sbin/tspc
share/examples/rc.d/tspc
share/examples/tspc/tspc.conf
+share/tspc/template/README
+share/tspc/template/checktunnel.sh
+share/tspc/template/${TARGET}.sh
+share/tspc/template/variables_environ
+@dirrm share/tspc/template
+@dirrm share/tspc
@dirrm share/examples/tspc
--x+6KMIRAuhnl3hBn--