diff options
| author | jlam <jlam@pkgsrc.org> | 2001-03-01 19:07:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-03-01 19:07:51 +0000 |
| commit | a4827ab0564f9f658aaaf188620dabee9b6e0f0d (patch) | |
| tree | 8c75cb691a81d82bdd8cb966e72c0edff08c628f /net/6to4 | |
| parent | 428e23fdff80a18c2f60240b75fda6ac8349dc25 (diff) | |
| download | pkgsrc-a4827ab0564f9f658aaaf188620dabee9b6e0f0d.tar.gz | |
Mechanical changes to use ${PKG_PREFIX} instead of substituting for
@PREFIX@ in DEINSTALL/INSTALL scripts.
Diffstat (limited to 'net/6to4')
| -rw-r--r-- | net/6to4/Makefile | 6 | ||||
| -rw-r--r-- | net/6to4/pkg/DEINSTALL | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/net/6to4/Makefile b/net/6to4/Makefile index c5985cf4441..cc758246f07 100644 --- a/net/6to4/Makefile +++ b/net/6to4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/18 15:32:18 hubertf Exp $ +# $NetBSD: Makefile,v 1.4 2001/03/01 19:07:53 jlam Exp $ # DISTNAME= 6to4-1.1 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.netbsd.org/packages/net/6to4/files/6to4.html COMMENT= Enables 6to4 IPv6 automatic tunnels USE_PERL5= YES -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL EXTRACT_ONLY= # empty NO_WRKSUBDIR= yes @@ -26,9 +25,6 @@ do-build: < ${FILESDIR}/${FILE} \ > ${WRKSRC}/${FILE} .endfor - ${SED} \ - -e 's,@PREFIX@,${PREFIX},' \ - <${PKGDIR}/DEINSTALL >${DEINSTALL_FILE} do-install: ${INSTALL_SCRIPT} ${WRKSRC}/6to4 ${PREFIX}/sbin/6to4 diff --git a/net/6to4/pkg/DEINSTALL b/net/6to4/pkg/DEINSTALL index 7d573d8b752..adffbe269bc 100644 --- a/net/6to4/pkg/DEINSTALL +++ b/net/6to4/pkg/DEINSTALL @@ -1,15 +1,15 @@ #! /bin/sh # -# $NetBSD: DEINSTALL,v 1.1.1.1 2001/02/11 05:24:29 hubertf Exp $ +# $NetBSD: DEINSTALL,v 1.2 2001/03/01 19:07:53 jlam Exp $ # case "$2" in DEINSTALL) - if [ -f @PREFIX@/etc/6to4.conf ]; then + if [ -f ${PKG_PREFIX}/etc/6to4.conf ]; then cat <<EOF ============================================================= -Note that the 6to4 configuration file (@PREFIX@/etc/6to4.conf) +Note that the 6to4 configuration file (${PKG_PREFIX}/etc/6to4.conf) was not removed in the deinstallation process. You should remove it by hand, if you no longer need it. ============================================================= |