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 /misc/jitterbug | |
| 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 'misc/jitterbug')
| -rw-r--r-- | misc/jitterbug/Makefile | 6 | ||||
| -rw-r--r-- | misc/jitterbug/pkg/DEINSTALL | 5 | ||||
| -rw-r--r-- | misc/jitterbug/pkg/INSTALL | 5 |
3 files changed, 6 insertions, 10 deletions
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index 350f91fb5a1..fdf081c80e8 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/02/25 04:18:02 hubertf Exp $ +# $NetBSD: Makefile,v 1.18 2001/03/01 19:07:52 jlam Exp $ DISTNAME= jitterbug-1.6.2 WRKSRC= ${WRKDIR}/${PKGNAME}/source @@ -127,7 +127,6 @@ pre-install: -e 's|@JB_USERID@|${JB_USERID}|g' \ -e 's|@JB_GROUP@|${JB_GROUP}|g' \ -e 's|@JB_GROUPID@|${JB_GROUPID}|g' \ - -e 's|@PREFIX@|${PREFIX}|g' \ -e 's|@ADDUSER@|${ADDUSER}|g' \ -e 's|@ADDGROUP@|${ADDGROUP}|g' \ -e 's|@CHGRP@|${CHGRP}|g' \ @@ -158,7 +157,6 @@ pre-install: -e 's|@JB_USER@|${JB_USER}|g' \ -e 's|@JB_GROUP@|${JB_GROUP}|g' \ -e 's|@JB_PACKAGE@|${JB_PACKAGE}|g' \ - -e 's|@PREFIX@|${PREFIX}|g' \ <${PKGDIR}/DEINSTALL \ >${DEINSTALL_FILE} @${SED} \ @@ -167,7 +165,7 @@ pre-install: -e 's|@PREFIX@|${PREFIX}|g' \ < ${FILESDIR}/httpd.conf \ > ${WRKDIR}/httpd.conf - ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${JB_CONFIGDIR} diff --git a/misc/jitterbug/pkg/DEINSTALL b/misc/jitterbug/pkg/DEINSTALL index 737a7105c84..9c1cf480707 100644 --- a/misc/jitterbug/pkg/DEINSTALL +++ b/misc/jitterbug/pkg/DEINSTALL @@ -1,11 +1,10 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.2 2000/09/12 17:23:02 wennmach Exp $ +# $NetBSD: DEINSTALL,v 1.3 2001/03/01 19:07:52 jlam Exp $ JB_USER=@JB_USER@ JB_GROUP=@JB_GROUP@ JB_PACKAGE=@JB_PACKAGE@ -PREFIX=@PREFIX@ PKG=$1 STAGE=$2 @@ -18,7 +17,7 @@ fi echo "If you are removing jitterbug permanently, you may wish to" echo " - remove user ${JB_USER}" echo " - remove group ${JB_GROUP}" -echo " - remove entries in your httpd.conf (usually ${PREFIX}/etc/httpd/httpd.conf)" +echo " - remove entries in your httpd.conf (usually ${PKG_PREFIX}/etc/httpd/httpd.conf)" echo " - remove mail alias for ${JB_PACKAGE}-bugs in your mail aliases" echo " (typically /etc/aliases or /etc/mail/aliases)" echo " and run \`newaliases' (if you use sendmail)" diff --git a/misc/jitterbug/pkg/INSTALL b/misc/jitterbug/pkg/INSTALL index d3bf6b19937..c2b9764fd41 100644 --- a/misc/jitterbug/pkg/INSTALL +++ b/misc/jitterbug/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1 2000/12/08 09:43:06 wiz Exp $ +# $NetBSD: INSTALL,v 1.2 2001/03/01 19:07:52 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -9,7 +9,6 @@ JB_USER=@JB_USER@ JB_USERID=@JB_USERID@ JB_GROUP=@JB_GROUP@ JB_GROUPID=@JB_GROUPID@ -PREFIX=@PREFIX@ ADDUSER=@ADDUSER@ ADDGROUP=@ADDGROUP@ CHGRP=@CHGRP@ @@ -47,7 +46,7 @@ if [ $? -eq 0 ]; then else echo "Creating '${JB_USER}' user..." ${ADDUSER} -c "Jitterbug Administrator" -g ${JB_GROUP} \ - -b ${PREFIX} -u ${JB_USERID} ${JB_USER} + -b ${PKG_PREFIX} -u ${JB_USERID} ${JB_USER} echo "Done." fi |