Make these scripts more portable by taking advantage of automatic rc.d

script handling and using @RCD_SCRIPTS_SHELL@.

as discussed with jlam.

45 files changed, 91 insertions, 91 deletions

diff --git a/audio/rplay/files/rplayd.sh b/audio/rplay/files/rplayd.sh
index 0dbb1bf8536..a5588b245c7 100644
--- a/audio/rplay/files/rplayd.sh
+++ b/audio/rplay/files/rplayd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: rplayd.sh,v 1.5 2002/02/05 06:04:36 jlam Exp $
+# $NetBSD: rplayd.sh,v 1.6 2002/09/20 02:01:54 grant Exp $
 #
 # PROVIDE: rplayd
 # REQUIRE: DAEMON
diff --git a/chat/silc-server/files/silcd.sh b/chat/silc-server/files/silcd.sh
index 774b79fb015..f0202cbe4dc 100644
--- a/chat/silc-server/files/silcd.sh
+++ b/chat/silc-server/files/silcd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: silcd.sh,v 1.5 2002/05/24 22:15:36 hubertf Exp $
+# $NetBSD: silcd.sh,v 1.6 2002/09/20 02:01:55 grant Exp $
 #
 # PROVIDE: silcd
 # REQUIRE: DAEMON
diff --git a/comms/conserver/files/conserver.sh b/comms/conserver/files/conserver.sh
index a86aaf1761f..4fe88a4e2bf 100644
--- a/comms/conserver/files/conserver.sh
+++ b/comms/conserver/files/conserver.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: conserver.sh,v 1.2 2002/06/09 20:37:54 jlam Exp $
+# $NetBSD: conserver.sh,v 1.3 2002/09/20 02:01:55 grant Exp $
 #
 # PROVIDE: conserver
 # REQUIRE: DAEMON
diff --git a/comms/hylafax/files/hylafax.sh b/comms/hylafax/files/hylafax.sh
index eaa6e33f232..b364e70e4b9 100755
--- a/comms/hylafax/files/hylafax.sh
+++ b/comms/hylafax/files/hylafax.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: hylafax.sh,v 1.3 2002/03/20 12:28:55 abs Exp $
+# $NetBSD: hylafax.sh,v 1.4 2002/09/20 02:01:55 grant Exp $
 #
 # PROVIDE: hylafax
 # REQUIRE: DAEMON
diff --git a/databases/openldap/files/slapd.sh b/databases/openldap/files/slapd.sh
index 9dd6f25a1e9..a30d5aa0d5a 100644
--- a/databases/openldap/files/slapd.sh
+++ b/databases/openldap/files/slapd.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: slapd.sh,v 1.3 2002/09/12 10:19:11 jlam Exp $
+# $NetBSD: slapd.sh,v 1.4 2002/09/20 02:01:55 grant Exp $
 #
 # OpenLDAP standalone LDAP daemon
 #
diff --git a/databases/postgresql-server/files/pgsql.sh b/databases/postgresql-server/files/pgsql.sh
index fbc5cc99384..f1f09d68cf5 100644
--- a/databases/postgresql-server/files/pgsql.sh
+++ b/databases/postgresql-server/files/pgsql.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgsql.sh,v 1.12 2002/09/10 23:20:04 jlam Exp $
+# $NetBSD: pgsql.sh,v 1.13 2002/09/20 02:01:56 grant Exp $
 #
 # PostgreSQL database rc.d control script
 #
diff --git a/devel/p4d/files/p4d.sh b/devel/p4d/files/p4d.sh
index 7df60e5ce2a..bf02d872c3e 100644
--- a/devel/p4d/files/p4d.sh
+++ b/devel/p4d/files/p4d.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: p4d.sh,v 1.1.1.1 2002/09/01 02:26:09 schmonz Exp $
+# $NetBSD: p4d.sh,v 1.2 2002/09/20 02:01:56 grant Exp $
 #
 # Perforce SCM server
 #
diff --git a/mail/courier-auth/files/authdaemond.sh b/mail/courier-auth/files/authdaemond.sh
index 671c5380c6e..42f4b4549c0 100644
--- a/mail/courier-auth/files/authdaemond.sh
+++ b/mail/courier-auth/files/authdaemond.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: authdaemond.sh,v 1.5 2002/07/18 01:48:09 lukem Exp $
+# $NetBSD: authdaemond.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
 #
 # Courier user authentication daemon
 #
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index c140b4f19a7..c201d3c1e85 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimap.sh,v 1.5 2002/02/05 06:04:38 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
 #
 # Courier IMAP services daemon
 #
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index a4ae67f7673..9c1f698c3b8 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierimaps.sh,v 1.5 2002/02/05 06:04:38 jlam Exp $
+# $NetBSD: courierimaps.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
 #
 # Courier IMAP/SSL services daemon
 #
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index c8bdf6e87dd..38868508836 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpop.sh,v 1.5 2002/02/05 06:04:38 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
 #
 # Courier POP services daemon
 #
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index abc7ddd9c06..79e114865a7 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: courierpops.sh,v 1.5 2002/02/05 06:04:38 jlam Exp $
+# $NetBSD: courierpops.sh,v 1.6 2002/09/20 02:01:56 grant Exp $
 #
 # Courier POP3/SSL services daemon
 #
diff --git a/mail/cyrus-imapd/files/cyrus.sh b/mail/cyrus-imapd/files/cyrus.sh
index 1f22318315b..9f0ec360804 100644
--- a/mail/cyrus-imapd/files/cyrus.sh
+++ b/mail/cyrus-imapd/files/cyrus.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: cyrus.sh,v 1.1 2002/07/31 15:48:32 jlam Exp $
+# $NetBSD: cyrus.sh,v 1.2 2002/09/20 02:01:57 grant Exp $
 #
 # PROVIDE: cyrus
 # REQUIRE: DAEMON
diff --git a/mail/qmail/files/qmail.sh b/mail/qmail/files/qmail.sh
index fd39ac811b8..6ef9458980e 100644
--- a/mail/qmail/files/qmail.sh
+++ b/mail/qmail/files/qmail.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qmail.sh,v 1.1 2002/07/28 01:54:37 schmonz Exp $
+# $NetBSD: qmail.sh,v 1.2 2002/09/20 02:01:57 grant Exp $
 #
 
 # PROVIDE: mail
diff --git a/mail/spamassassin/files/spamd.sh b/mail/spamassassin/files/spamd.sh
index 9dcaf1530c6..47f9fe698f7 100755
--- a/mail/spamassassin/files/spamd.sh
+++ b/mail/spamassassin/files/spamd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-#	$NetBSD: spamd.sh,v 1.4 2002/09/20 01:38:38 grant Exp $
+#	$NetBSD: spamd.sh,v 1.5 2002/09/20 02:01:57 grant Exp $
 #
 # PROVIDE: spamd
 # REQUIRE: DAEMON
diff --git a/net/chrony/files/chronyd.sh b/net/chrony/files/chronyd.sh
index 8fe9f171fb6..ac27a7773f9 100644
--- a/net/chrony/files/chronyd.sh
+++ b/net/chrony/files/chronyd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: chronyd.sh,v 1.2 2002/09/20 01:41:56 grant Exp $
+# $NetBSD: chronyd.sh,v 1.3 2002/09/20 02:01:57 grant Exp $
 #
 # PROVIDE: chronyd
 # REQUIRE: DAEMON
diff --git a/net/ddclient/files/ddclient.sh b/net/ddclient/files/ddclient.sh
index be3529bbdb6..26ecc94f0c6 100644
--- a/net/ddclient/files/ddclient.sh
+++ b/net/ddclient/files/ddclient.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: ddclient.sh,v 1.3 2002/02/05 06:04:38 jlam Exp $
+# $NetBSD: ddclient.sh,v 1.4 2002/09/20 02:01:57 grant Exp $
 #
 # Dynamic DNS update client
 #
diff --git a/net/ja-samba/files/nmbd.sh b/net/ja-samba/files/nmbd.sh
index 3106e14d5d1..d92a5601c41 100755
--- a/net/ja-samba/files/nmbd.sh
+++ b/net/ja-samba/files/nmbd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: nmbd.sh,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
+# $NetBSD: nmbd.sh,v 1.2 2002/09/20 02:01:58 grant Exp $
 #
 # PROVIDE: nmbd
 # REQUIRE: DAEMON
diff --git a/net/ja-samba/files/samba.sh b/net/ja-samba/files/samba.sh
index 2f597a10fca..13338605d17 100644
--- a/net/ja-samba/files/samba.sh
+++ b/net/ja-samba/files/samba.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: samba.sh,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
+# $NetBSD: samba.sh,v 1.2 2002/09/20 02:01:58 grant Exp $
 #
 # KEYWORD: nostart
 
diff --git a/net/ja-samba/files/smbd.sh b/net/ja-samba/files/smbd.sh
index 0927fa7aa3a..4cf457670e3 100755
--- a/net/ja-samba/files/smbd.sh
+++ b/net/ja-samba/files/smbd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: smbd.sh,v 1.1.1.1 2002/06/25 15:31:34 taca Exp $
+# $NetBSD: smbd.sh,v 1.2 2002/09/20 02:01:58 grant Exp $
 #
 # PROVIDE: smbd
 # REQUIRE: DAEMON
diff --git a/net/openslp/files/slpd.sh b/net/openslp/files/slpd.sh
index 67c362583ab..13a209c9459 100644
--- a/net/openslp/files/slpd.sh
+++ b/net/openslp/files/slpd.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: slpd.sh,v 1.6 2002/09/20 01:43:22 grant Exp $
+# $NetBSD: slpd.sh,v 1.7 2002/09/20 02:01:58 grant Exp $
 #
 # Service Location Protocol daemon
 #
diff --git a/net/samba/files/nmbd.sh b/net/samba/files/nmbd.sh
index 34041cbe1c9..f595fa36457 100755
--- a/net/samba/files/nmbd.sh
+++ b/net/samba/files/nmbd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: nmbd.sh,v 1.7 2002/02/05 06:04:39 jlam Exp $
+# $NetBSD: nmbd.sh,v 1.8 2002/09/20 02:01:58 grant Exp $
 #
 # PROVIDE: nmbd
 # REQUIRE: DAEMON
diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh
index ce2d3eaaa88..51d4a1a855e 100644
--- a/net/samba/files/samba.sh
+++ b/net/samba/files/samba.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: samba.sh,v 1.12 2002/08/25 21:50:12 jlam Exp $
+# $NetBSD: samba.sh,v 1.13 2002/09/20 02:01:58 grant Exp $
 #
 # KEYWORD: nostart
 
diff --git a/net/samba/files/smbd.sh b/net/samba/files/smbd.sh
index f17887e91b2..aaf45474ea4 100755
--- a/net/samba/files/smbd.sh
+++ b/net/samba/files/smbd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: smbd.sh,v 1.8 2002/02/05 06:04:39 jlam Exp $
+# $NetBSD: smbd.sh,v 1.9 2002/09/20 02:01:58 grant Exp $
 #
 # PROVIDE: smbd
 # REQUIRE: DAEMON
diff --git a/net/samba20/files/nmbd.sh b/net/samba20/files/nmbd.sh
index a947515e1df..0b77b2a7645 100755
--- a/net/samba20/files/nmbd.sh
+++ b/net/samba20/files/nmbd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: nmbd.sh,v 1.5 2002/02/05 06:04:39 jlam Exp $
+# $NetBSD: nmbd.sh,v 1.6 2002/09/20 02:01:59 grant Exp $
 #
 # PROVIDE: nmbd
 # REQUIRE: DAEMON
diff --git a/net/samba20/files/samba.sh b/net/samba20/files/samba.sh
index ad0ab1cba7a..949a3598b12 100644
--- a/net/samba20/files/samba.sh
+++ b/net/samba20/files/samba.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: samba.sh,v 1.8 2002/08/25 21:50:15 jlam Exp $
+# $NetBSD: samba.sh,v 1.9 2002/09/20 02:01:59 grant Exp $
 #
 # KEYWORD: nostart
 
diff --git a/net/samba20/files/smbd.sh b/net/samba20/files/smbd.sh
index 0bb43e98644..2d77e85f897 100755
--- a/net/samba20/files/smbd.sh
+++ b/net/samba20/files/smbd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: smbd.sh,v 1.6 2002/02/05 06:04:40 jlam Exp $
+# $NetBSD: smbd.sh,v 1.7 2002/09/20 02:01:59 grant Exp $
 #
 # PROVIDE: smbd
 # REQUIRE: DAEMON
diff --git a/net/speedtouch/files/adsl.sh b/net/speedtouch/files/adsl.sh
index 846fd4c7c83..02c7fcfaaf4 100644
--- a/net/speedtouch/files/adsl.sh
+++ b/net/speedtouch/files/adsl.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: adsl.sh,v 1.3 2002/08/21 14:11:43 abs Exp $
+# $NetBSD: adsl.sh,v 1.4 2002/09/20 02:01:59 grant Exp $
 #
 # PROVIDE: adsl
 # REQUIRE: ipnat
diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh
index 84eae65cad9..12feaed7eff 100644
--- a/print/cups/files/cupsd.sh
+++ b/print/cups/files/cupsd.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: cupsd.sh,v 1.11 2002/09/18 22:58:47 jlam Exp $
+# $NetBSD: cupsd.sh,v 1.12 2002/09/20 02:01:59 grant Exp $
 #
 # Common UNIX Printing System daemon
 #
diff --git a/security/cyrus-sasl/files/sasl_pwcheck.sh b/security/cyrus-sasl/files/sasl_pwcheck.sh
index 32ea60034f9..77f421ae0ff 100644
--- a/security/cyrus-sasl/files/sasl_pwcheck.sh
+++ b/security/cyrus-sasl/files/sasl_pwcheck.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sasl_pwcheck.sh,v 1.9 2002/08/25 18:39:51 jlam Exp $
+# $NetBSD: sasl_pwcheck.sh,v 1.10 2002/09/20 02:02:00 grant Exp $
 #
 # The pwcheck daemon allows UNIX password authentication with Cyrus SASL.
 #
diff --git a/security/cyrus-sasl/files/saslauthd.sh b/security/cyrus-sasl/files/saslauthd.sh
index 16b77de72df..f9d3bc93629 100644
--- a/security/cyrus-sasl/files/saslauthd.sh
+++ b/security/cyrus-sasl/files/saslauthd.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: saslauthd.sh,v 1.2 2002/08/25 18:39:51 jlam Exp $
+# $NetBSD: saslauthd.sh,v 1.3 2002/09/20 02:02:00 grant Exp $
 #
 # The saslauthd daemon allows cleartext UNIX password authentication via
 # several authentication mechanisms with Cyrus SASL.
diff --git a/security/openssh/files/sshd.sh b/security/openssh/files/sshd.sh
index 69612516b67..aba871be2ee 100644
--- a/security/openssh/files/sshd.sh
+++ b/security/openssh/files/sshd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: sshd.sh,v 1.9 2002/08/19 17:30:05 wiz Exp $
+# $NetBSD: sshd.sh,v 1.10 2002/09/20 02:02:00 grant Exp $
 #
 # PROVIDE: sshd
 # REQUIRE: DAEMON LOGIN
diff --git a/security/pks/files/pksd.sh b/security/pks/files/pksd.sh
index 3f7c5239bd9..21d9334d45f 100644
--- a/security/pks/files/pksd.sh
+++ b/security/pks/files/pksd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pksd.sh,v 1.6 2002/02/05 06:04:41 jlam Exp $
+# $NetBSD: pksd.sh,v 1.7 2002/09/20 02:02:00 grant Exp $
 #
 # PROVIDE: pksd
 # REQUIRE: DAEMON
diff --git a/security/ssh2/files/ssh2_secure_shell.sh b/security/ssh2/files/ssh2_secure_shell.sh
index 21f1db631da..5af794cecb6 100644
--- a/security/ssh2/files/ssh2_secure_shell.sh
+++ b/security/ssh2/files/ssh2_secure_shell.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: ssh2_secure_shell.sh,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
+# $NetBSD: ssh2_secure_shell.sh,v 1.2 2002/09/20 02:02:00 grant Exp $
 #
 # PROVIDE: ssh2_secure_shell
 # REQUIRE: DAEMON LOGIN
diff --git a/security/winbind/files/winbindd.sh b/security/winbind/files/winbindd.sh
index 382bdb5af32..4e0e43ca0ba 100755
--- a/security/winbind/files/winbindd.sh
+++ b/security/winbind/files/winbindd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: winbindd.sh,v 1.1.1.1 2002/07/29 04:19:00 jlam Exp $
+# $NetBSD: winbindd.sh,v 1.2 2002/09/20 02:02:01 grant Exp $
 #
 # PROVIDE: winbindd
 # REQUIRE: nmbd
diff --git a/sysutils/ups-nut/files/ups.sh b/sysutils/ups-nut/files/ups.sh
index 99371f31e32..0f3bce8fa89 100644
--- a/sysutils/ups-nut/files/ups.sh
+++ b/sysutils/ups-nut/files/ups.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: ups.sh,v 1.9 2002/08/25 21:51:05 jlam Exp $
+# $NetBSD: ups.sh,v 1.10 2002/09/20 02:02:01 grant Exp $
 #
 # KEYWORD: nostart
 
diff --git a/sysutils/ups-nut/files/upsd.sh b/sysutils/ups-nut/files/upsd.sh
index 62ca4d9883c..d2e23d55590 100644
--- a/sysutils/ups-nut/files/upsd.sh
+++ b/sysutils/ups-nut/files/upsd.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: upsd.sh,v 1.4 2002/02/15 08:55:59 seb Exp $
+# $NetBSD: upsd.sh,v 1.5 2002/09/20 02:02:01 grant Exp $
 #
 # PROVIDE: upsd
 # REQUIRE: upsdriver
diff --git a/sysutils/ups-nut/files/upsdriver.sh b/sysutils/ups-nut/files/upsdriver.sh
index 485fa6a9214..feb36fa9b2f 100644
--- a/sysutils/ups-nut/files/upsdriver.sh
+++ b/sysutils/ups-nut/files/upsdriver.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: upsdriver.sh,v 1.5 2002/02/05 06:04:41 jlam Exp $
+# $NetBSD: upsdriver.sh,v 1.6 2002/09/20 02:02:01 grant Exp $
 #
 # PROVIDE: upsdriver
 # REQUIRE: NETWORK syslogd mountcritremote
diff --git a/sysutils/ups-nut/files/upslog.sh b/sysutils/ups-nut/files/upslog.sh
index e3ba90f0798..2c9a0f9aaea 100644
--- a/sysutils/ups-nut/files/upslog.sh
+++ b/sysutils/ups-nut/files/upslog.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: upslog.sh,v 1.4 2002/02/05 06:04:41 jlam Exp $
+# $NetBSD: upslog.sh,v 1.5 2002/09/20 02:02:01 grant Exp $
 #
 # PROVIDE: upslog
 # REQUIRE: upsd
diff --git a/sysutils/ups-nut/files/upsmon.sh b/sysutils/ups-nut/files/upsmon.sh
index 8d4c946c938..94d104a7f47 100644
--- a/sysutils/ups-nut/files/upsmon.sh
+++ b/sysutils/ups-nut/files/upsmon.sh
@@ -1,6 +1,6 @@
-#! /bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: upsmon.sh,v 1.3 2002/02/05 06:04:42 jlam Exp $
+# $NetBSD: upsmon.sh,v 1.4 2002/09/20 02:02:01 grant Exp $
 #
 # PROVIDE: upsmon
 # REQUIRE: upsd
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index 67879c0f02f..80b5954bed2 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.21 2002/08/25 18:40:18 jlam Exp $
+# $NetBSD: apache.sh,v 1.22 2002/09/20 02:02:01 grant Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
diff --git a/www/apache2/files/apache.sh b/www/apache2/files/apache.sh
index 22e29461d57..bc32b4c0c17 100644
--- a/www/apache2/files/apache.sh
+++ b/www/apache2/files/apache.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.5 2002/08/25 21:51:55 jlam Exp $
+# $NetBSD: apache.sh,v 1.6 2002/09/20 02:02:01 grant Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
index 3d98771f53d..9ec71f1908a 100644
--- a/www/apache6/files/apache.sh
+++ b/www/apache6/files/apache.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: apache.sh,v 1.15 2002/08/25 21:51:59 jlam Exp $
+# $NetBSD: apache.sh,v 1.16 2002/09/20 02:02:01 grant Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
diff --git a/www/squid/files/squid.sh b/www/squid/files/squid.sh
index b54d9e98946..210682a759e 100644
--- a/www/squid/files/squid.sh
+++ b/www/squid/files/squid.sh
@@ -1,6 +1,6 @@
-#!@SH@
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: squid.sh,v 1.14 2002/09/15 14:39:51 grant Exp $
+# $NetBSD: squid.sh,v 1.15 2002/09/20 02:02:02 grant Exp $
 #
 
 # PROVIDE: squid
diff --git a/www/thttpd/files/thttpd.sh b/www/thttpd/files/thttpd.sh
index bd5fb502b4e..f4ec02c8991 100644
--- a/www/thttpd/files/thttpd.sh
+++ b/www/thttpd/files/thttpd.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: thttpd.sh,v 1.8 2002/02/05 06:04:43 jlam Exp $
+# $NetBSD: thttpd.sh,v 1.9 2002/09/20 02:02:02 grant Exp $
 #
 # PROVIDE: thttpd
 # REQUIRE: DAEMON
@@ -12,7 +12,7 @@ fi
 
 name="thttpd"
 rcvar=$name
-command=@PREFIX@/sbin/${name}
+command="@PREFIX@/sbin/${name}"
 command_args="-C @PKG_SYSCONFDIR@/${name}.conf"
 required_files="@PKG_SYSCONFDIR@/${name}.conf"