diff options
| author | zuntum <zuntum@pkgsrc.org> | 2001-10-22 19:03:42 +0000 |
|---|---|---|
| committer | zuntum <zuntum@pkgsrc.org> | 2001-10-22 19:03:42 +0000 |
| commit | 02999f8714e07a528bea4dc49e092a0b3934844f (patch) | |
| tree | 9b4977835158465ec8310f9633f15b17a12a49e0 /sysutils/daemontools | |
| parent | 04a975cdc28be44bf7fa0ba4727057f7329bcdad (diff) | |
| download | pkgsrc-02999f8714e07a528bea4dc49e092a0b3934844f.tar.gz | |
Minor changes:
o use @@SERVICEDIR@@ instead of /service as substitution imput,
same with /usr/local/ ( -> @@PREFIX@@ )
o fit in 80 columns
o rewrite pkg/DEINSTALL
Diffstat (limited to 'sysutils/daemontools')
| -rw-r--r-- | sysutils/daemontools/Makefile | 19 | ||||
| -rw-r--r-- | sysutils/daemontools/files/svscan.sh.sample | 4 | ||||
| -rw-r--r-- | sysutils/daemontools/pkg/DEINSTALL | 9 |
3 files changed, 14 insertions, 18 deletions
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 114deca3471..335baafac3f 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/22 13:42:28 zuntum Exp $ +# $NetBSD: Makefile,v 1.9 2001/10/22 19:03:42 zuntum Exp $ # FreeBSD Id: ports/sysutils/daemontools/Makefile,v 1.8 2000/12/03 05:16:41 steve Exp DISTNAME= daemontools-0.70 @@ -31,22 +31,19 @@ post-patch: @${ECHO} ${PREFIX} > ${WRKSRC}/conf-home post-build: - @${SED} \ - -e "s!/usr/local/!${PREFIX}/!" \ - -e "s!/service!${SERVICEDIR}!g" \ + ${SED} -e "s,@@PREFIX@@,${PREFIX}," \ + -e "s,@@SERVICEDIR@@,${SERVICEDIR},g" \ ${FILESDIR}/${SAMPLERC} > ${WRKDIR}/${SAMPLERC} - @${SED} \ - -e "s!/service!${SERVICEDIR}!g" \ + ${SED} "s,@@SERVICEDIR@@,${SERVICEDIR},g" \ ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/daemontools - ${INSTALL_DATA} ${WRKDIR}/${SAMPLERC} ${PREFIX}/share/examples/daemontools + ${INSTALL_DATA} ${WRKDIR}/${SAMPLERC} \ + ${PREFIX}/share/examples/daemontools ${INSTALL_DATA_DIR} ${SERVICEDIR} - cd ${WRKDIR}/${DISTNAME}-man && ${INSTALL_MAN} envdir.8 envuidgid.8 \ - fghack.8 multilog.8 setlock.8 setuidgid.8 softlimit.8 \ - supervise.8 svc.8 svok.8 svscan.8 svstat.8 tai64n.8 \ - tai64nlocal.8 ${PREFIX}/man/man8 + cd ${WRKDIR}/${DISTNAME}-man && \ + ${INSTALL_MAN} *.8 ${PREFIX}/man/man8 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/daemontools/files/svscan.sh.sample b/sysutils/daemontools/files/svscan.sh.sample index 1baa156e60e..7060aafd3ad 100644 --- a/sysutils/daemontools/files/svscan.sh.sample +++ b/sysutils/daemontools/files/svscan.sh.sample @@ -8,7 +8,7 @@ # Or, check login.conf(5) for a suitable # alternative # -# I really do suggest you use /service as your +# I really do suggest you use @@SERVICEDIR@@ as your # service spool directory. Check hier(7) for # reasons. @@ -31,4 +31,4 @@ #ulimit -s ${MINSEGMENT} #ulimit -u ${MAXCHILD} -exec /bin/csh -cf '/usr/local/bin/svscan /service &' +exec /bin/csh -cf '@@PREFIX@@/bin/svscan @@SERVICEDIR@@ &' diff --git a/sysutils/daemontools/pkg/DEINSTALL b/sysutils/daemontools/pkg/DEINSTALL index 31909757eaf..60317a6a284 100644 --- a/sysutils/daemontools/pkg/DEINSTALL +++ b/sysutils/daemontools/pkg/DEINSTALL @@ -1,15 +1,14 @@ #! /bin/sh # -# $NetBSD: DEINSTALL,v 1.2 2001/02/26 03:41:29 hubertf Exp $ +# $NetBSD: DEINSTALL,v 1.3 2001/10/22 19:03:42 zuntum Exp $ # case "$2" in - DEINSTALL) rmdir 2>/dev/null /service || cat <<EOF + DEINSTALL) rmdir 2>/dev/null @@SERVICEDIR@@ || cat <<EOF ============================================================= -Note that the config files for this package under -/service are not removed in the deinstallation process. -You should remove those by hand, if you no longer need them. +Note that /service directory was not removed. If you +no longer need it, remove it by hand. ============================================================= EOF |