diff options
author | jlam <jlam> | 2000-09-20 05:14:10 +0000 |
---|---|---|
committer | jlam <jlam> | 2000-09-20 05:14:10 +0000 |
commit | e94279dc18e11a0fe9cfbca14ca112773f7dcb26 (patch) | |
tree | 7a9e5bc09df1c0b7f00e130e375ea67861dddb42 | |
parent | 14daacfece1d3945d3d305600fd8325685ed14ee (diff) | |
download | pkgsrc-e94279dc18e11a0fe9cfbca14ca112773f7dcb26.tar.gz |
Install rc.d control script as "foo" instead of "foo.sh" to comply with
how NetBSD's rc.d system interprets script names. Also add appropriate
REQUIRE and PROVIDE sections to allow direct use in NetBSD's rc.d system.
-rw-r--r-- | comms/hylafax/Makefile | 4 | ||||
-rwxr-xr-x | comms/hylafax/files/hylafax.sh | 4 | ||||
-rw-r--r-- | comms/hylafax/pkg/PLIST | 4 | ||||
-rw-r--r-- | net/dhid/files/dhid.sh | 5 | ||||
-rw-r--r-- | security/pks/Makefile | 4 | ||||
-rw-r--r-- | security/pks/files/pksd.sh | 4 | ||||
-rw-r--r-- | security/pks/pkg/PLIST | 4 | ||||
-rw-r--r-- | www/apache/Makefile | 4 | ||||
-rw-r--r-- | www/apache/pkg/PLIST | 4 | ||||
-rw-r--r-- | www/apache6/Makefile | 4 | ||||
-rw-r--r-- | www/apache6/files/apache.sh | 4 | ||||
-rw-r--r-- | www/apache6/pkg/PLIST | 4 | ||||
-rw-r--r-- | www/thttpd/Makefile | 4 | ||||
-rw-r--r-- | www/thttpd/files/thttpd.sh | 4 | ||||
-rw-r--r-- | www/thttpd/pkg/PLIST | 4 |
15 files changed, 36 insertions, 25 deletions
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index 0d54e961e4d..c2fd53477ed 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/09/05 12:50:52 rh Exp $ +# $NetBSD: Makefile,v 1.14 2000/09/20 05:14:10 jlam Exp $ # DISTNAME= hylafax-4.1beta2 @@ -44,6 +44,6 @@ post-build: <${FILESDIR}/hylafax.sh >${WRKDIR}/hylafax.sh; \ post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/hylafax.sh ${PREFIX}/etc/rc.d/hylafax.sh + ${INSTALL_SCRIPT} ${WRKDIR}/hylafax.sh ${PREFIX}/etc/rc.d/hylafax .include "../../mk/bsd.pkg.mk" diff --git a/comms/hylafax/files/hylafax.sh b/comms/hylafax/files/hylafax.sh index 1199028f413..db5413924ca 100755 --- a/comms/hylafax/files/hylafax.sh +++ b/comms/hylafax/files/hylafax.sh @@ -1,7 +1,9 @@ #!/bin/sh # -# $NetBSD: hylafax.sh,v 1.1 2000/08/30 09:50:45 abs Exp $ +# $NetBSD: hylafax.sh,v 1.2 2000/09/20 05:14:11 jlam Exp $ # +# PROVIDE: hylafax +# REQUIRE: DAEMON command=${1:-start} diff --git a/comms/hylafax/pkg/PLIST b/comms/hylafax/pkg/PLIST index 46c23c9e9bd..58a2c1752e3 100644 --- a/comms/hylafax/pkg/PLIST +++ b/comms/hylafax/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2000/09/20 05:05:53 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2000/09/20 05:14:11 jlam Exp $ bin/faxalter bin/faxcover bin/faxmail @@ -6,7 +6,7 @@ bin/faxrm bin/faxstat bin/sendfax bin/sendpage -etc/rc.d/hylafax.sh +etc/rc.d/hylafax libdata/hylafax/faxcover.ps libdata/hylafax/faxmail.ps libdata/hylafax/hfaxd.conf diff --git a/net/dhid/files/dhid.sh b/net/dhid/files/dhid.sh index 7f03868a1b4..9720f185f36 100644 --- a/net/dhid/files/dhid.sh +++ b/net/dhid/files/dhid.sh @@ -1,6 +1,9 @@ #!/bin/sh # -# $NetBSD: dhid.sh,v 1.2 2000/08/09 21:00:10 hubertf Exp $ +# $NetBSD: dhid.sh,v 1.3 2000/09/20 05:14:11 jlam Exp $ +# +# PROVIDE: dhid +# REQUIRE: NETWORK DHID=@PREFIX@/sbin/dhid diff --git a/security/pks/Makefile b/security/pks/Makefile index 3ab70063d3d..91fde52af26 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2000/09/03 13:19:56 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2000/09/20 05:14:11 jlam Exp $ DISTNAME= pks-0.9.4 CATEGORIES= security www @@ -26,7 +26,7 @@ post-build: < ${FILESDIR}/pksd.sh > ${WRKDIR}/pksd.sh post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/pksd.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKDIR}/pksd.sh ${PREFIX}/etc/rc.d/pksd PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/security/pks/files/pksd.sh b/security/pks/files/pksd.sh index c178dba2755..6c5849446bf 100644 --- a/security/pks/files/pksd.sh +++ b/security/pks/files/pksd.sh @@ -1,7 +1,9 @@ #!/bin/sh # -# $NetBSD: pksd.sh,v 1.1.1.1 2000/07/27 16:10:24 jlam Exp $ +# $NetBSD: pksd.sh,v 1.2 2000/09/20 05:14:12 jlam Exp $ # +# PROVIDE: pksd +# REQUIRE: DAEMON name="pksd" command=${1:-start} diff --git a/security/pks/pkg/PLIST b/security/pks/pkg/PLIST index 03c0ae19eb0..56453eae8d3 100644 --- a/security/pks/pkg/PLIST +++ b/security/pks/pkg/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2000/09/03 13:19:39 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2000/09/20 05:14:12 jlam Exp $ bin/pgpsplit bin/pks-mail.sh bin/pks-queue-run.sh bin/pksclient bin/pksd bin/pksdctl -etc/rc.d/pksd.sh +etc/rc.d/pksd man/man5/pksd.conf.5 man/man8/pks-intro.8 man/man8/pksclient.8 diff --git a/www/apache/Makefile b/www/apache/Makefile index a05f77692cb..7b632c93667 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2000/09/12 19:39:02 thorpej Exp $ +# $NetBSD: Makefile,v 1.51 2000/09/20 05:14:12 jlam Exp $ # # The fourth number in the PKGNAME version indicates a NetBSD pkg revision # (to indicate changes in the shipped third party patches such as the mod_ssl @@ -106,7 +106,7 @@ post-install: cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so .endif ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs - ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh + ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST index eae2c78e2c5..be0bd45a7ef 100644 --- a/www/apache/pkg/PLIST +++ b/www/apache/pkg/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.15 2000/09/06 06:17:57 jlam Exp $ +@comment $NetBSD: PLIST,v 1.16 2000/09/20 05:14:12 jlam Exp $ bin/dbmmanage bin/htdigest bin/htpasswd etc/httpd/httpd.conf.default etc/httpd/magic.default etc/httpd/mime.types.default -etc/rc.d/apache.sh +etc/rc.d/apache include/httpd/alloc.h include/httpd/ap.h include/httpd/ap_compat.h diff --git a/www/apache6/Makefile b/www/apache6/Makefile index c8f2715347c..dec25b1befd 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2000/09/08 11:42:43 itojun Exp $ +# $NetBSD: Makefile,v 1.18 2000/09/20 05:14:12 jlam Exp $ # # The fourth number in the PKGNAME version indicates a NetBSD pkg revision # (to indicate changes in the shipped third party patches such as the mod_ssl @@ -108,7 +108,7 @@ post-build: post-install: ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif \ ${PREFIX}/share/httpd/htdocs - ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache.sh + ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache @${MV} ${PREFIX}/lib/httpd/libproxy.so \ ${PREFIX}/lib/httpd/mod_proxy.so 2>/dev/null || \ ${MKDIR} ${PREFIX}/lib/httpd diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh index 8c09bea64c3..95df689a22a 100644 --- a/www/apache6/files/apache.sh +++ b/www/apache6/files/apache.sh @@ -1,7 +1,9 @@ #!/bin/sh # -# $NetBSD: apache.sh,v 1.2 2000/07/10 12:22:30 hubertf Exp $ +# $NetBSD: apache.sh,v 1.3 2000/09/20 05:14:12 jlam Exp $ # +# PROVIDE: apache +# REQUIRE: DAEMON CMD=${1:-start} diff --git a/www/apache6/pkg/PLIST b/www/apache6/pkg/PLIST index 05342fc4019..fa0ca8653e2 100644 --- a/www/apache6/pkg/PLIST +++ b/www/apache6/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2000/08/15 10:31:25 itojun Exp $ +@comment $NetBSD: PLIST,v 1.6 2000/09/20 05:14:13 jlam Exp $ bin/dbmmanage bin/htdigest bin/htpasswd @@ -8,7 +8,7 @@ etc/httpd/magic.default @exec if [ ! -f %D/etc/httpd/magic ]; then cp -p %D/etc/httpd/magic.default %D/etc/httpd/magic; fi etc/httpd/mime.types.default @exec if [ ! -f %D/etc/httpd/mime.types ]; then cp -p %D/etc/httpd/mime.types.default %D/etc/httpd/mime.types; fi -etc/rc.d/apache.sh +etc/rc.d/apache include/httpd/alloc.h include/httpd/ap.h include/httpd/ap_compat.h diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 757382d157e..4c26236b7f5 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/27 12:47:33 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2000/09/20 05:14:13 jlam Exp $ DISTNAME= thttpd-2.19 CATEGORIES= www @@ -35,7 +35,7 @@ pre-install: post-install: ${INSTALL_DATA} ${WRKDIR}/thttpd.conf ${PREFIX}/share/examples - ${INSTALL_SCRIPT} ${WRKDIR}/thttpd.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKDIR}/thttpd.sh ${PREFIX}/etc/rc.d/thttpd ${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/thttpd ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/thttpd PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL diff --git a/www/thttpd/files/thttpd.sh b/www/thttpd/files/thttpd.sh index 3a8bcd26ba6..d941b96cdb6 100644 --- a/www/thttpd/files/thttpd.sh +++ b/www/thttpd/files/thttpd.sh @@ -1,7 +1,9 @@ #!/bin/sh # -# $NetBSD: thttpd.sh,v 1.2 2000/08/06 02:51:59 jlam Exp $ +# $NetBSD: thttpd.sh,v 1.3 2000/09/20 05:14:13 jlam Exp $ # +# PROVIDE: thttpd +# REQUIRE: DAEMON name="thttpd" command=@PREFIX@/sbin/${name} diff --git a/www/thttpd/pkg/PLIST b/www/thttpd/pkg/PLIST index 0dc40dad219..689071fb49c 100644 --- a/www/thttpd/pkg/PLIST +++ b/www/thttpd/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.11 2000/08/06 02:48:35 jlam Exp $ -etc/rc.d/thttpd.sh +@comment $NetBSD: PLIST,v 1.12 2000/09/20 05:14:13 jlam Exp $ +etc/rc.d/thttpd libexec/cgi-bin/redirect libexec/cgi-bin/phf libexec/cgi-bin/ssi |