Solaris' test binary (test/[) doesn't grok "-e". Replace with "-f".

Noted by Stoned Elipot <seb@netbsd.org> in private email.

26 files changed, 78 insertions, 78 deletions

diff --git a/audio/rplay/files/rplayd.sh b/audio/rplay/files/rplayd.sh
index 933bce055bb..0dbb1bf8536 100644
--- a/audio/rplay/files/rplayd.sh
+++ b/audio/rplay/files/rplayd.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: rplayd.sh,v 1.4 2001/11/26 07:30:44 jlam Exp $
+# $NetBSD: rplayd.sh,v 1.5 2002/02/05 06:04:36 jlam Exp $
 #
 # PROVIDE: rplayd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -15,7 +15,7 @@ rcvar=$name
 command="@PREFIX@/sbin/${name}"
 required_files="@PKG_SYSCONFDIR@/rplay.conf"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/databases/openldap/files/slapd.sh b/databases/openldap/files/slapd.sh
index 1e762c7caaf..19eef4e9473 100644
--- a/databases/openldap/files/slapd.sh
+++ b/databases/openldap/files/slapd.sh
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: slapd.sh,v 1.1 2002/01/30 07:34:01 jlam Exp $
+# $NetBSD: slapd.sh,v 1.2 2002/02/05 06:04:37 jlam Exp $
 #
 # OpenLDAP standalone LDAP daemon
 #
 # PROVIDE: slapd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -19,7 +19,7 @@ pidfile="/var/openldap/slapd.pid"
 required_files="@PKG_SYSCONFDIR@/${name}.conf"
 extra_commands="reload"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/mail/courier-auth/files/authdaemond.sh b/mail/courier-auth/files/authdaemond.sh
index 4f373ff67df..f5e0798b431 100644
--- a/mail/courier-auth/files/authdaemond.sh
+++ b/mail/courier-auth/files/authdaemond.sh
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: authdaemond.sh,v 1.2 2002/01/27 00:04:41 jlam Exp $
+# $NetBSD: authdaemond.sh,v 1.3 2002/02/05 06:04:37 jlam Exp $
 #
 # Courier user authentication daemon
 #
 # PROVIDE: authdaemond
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
         . /etc/rc.subr
 fi
@@ -51,7 +51,7 @@ courier_doit()
         @SETENV@ - ${daemon} ${action}
 }
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
         load_rc_config $name
         run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierimap.sh b/mail/courier-imap/files/courierimap.sh
index 4b5670edc9b..c140b4f19a7 100755
--- a/mail/courier-imap/files/courierimap.sh
+++ b/mail/courier-imap/files/courierimap.sh
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: courierimap.sh,v 1.4 2002/01/22 22:08:52 jlam Exp $
+# $NetBSD: courierimap.sh,v 1.5 2002/02/05 06:04:38 jlam Exp $
 #
 # Courier IMAP services daemon
 #
 # PROVIDE: courierimap
 # REQUIRE: authdaemond
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -33,7 +33,7 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierimaps.sh b/mail/courier-imap/files/courierimaps.sh
index 2645cc22bcd..a4ae67f7673 100755
--- a/mail/courier-imap/files/courierimaps.sh
+++ b/mail/courier-imap/files/courierimaps.sh
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: courierimaps.sh,v 1.4 2002/01/22 22:08:52 jlam Exp $
+# $NetBSD: courierimaps.sh,v 1.5 2002/02/05 06:04:38 jlam Exp $
 #
 # Courier IMAP/SSL services daemon
 #
 # PROVIDE: courierimaps
 # REQUIRE: authdaemond
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -34,7 +34,7 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpop.sh b/mail/courier-imap/files/courierpop.sh
index fa12e202f1e..c8bdf6e87dd 100755
--- a/mail/courier-imap/files/courierpop.sh
+++ b/mail/courier-imap/files/courierpop.sh
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: courierpop.sh,v 1.4 2002/01/22 22:08:53 jlam Exp $
+# $NetBSD: courierpop.sh,v 1.5 2002/02/05 06:04:38 jlam Exp $
 #
 # Courier POP services daemon
 #
 # PROVIDE: courierpop
 # REQUIRE: authdaemond
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -33,7 +33,7 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/mail/courier-imap/files/courierpops.sh b/mail/courier-imap/files/courierpops.sh
index 9477bef2fff..abc7ddd9c06 100755
--- a/mail/courier-imap/files/courierpops.sh
+++ b/mail/courier-imap/files/courierpops.sh
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: courierpops.sh,v 1.4 2002/01/22 22:08:53 jlam Exp $
+# $NetBSD: courierpops.sh,v 1.5 2002/02/05 06:04:38 jlam Exp $
 #
 # Courier POP3/SSL services daemon
 #
 # PROVIDE: courierpops
 # REQUIRE: authdaemond
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -34,7 +34,7 @@ courier_doit()
 	${ctl_command} ${action}
 }
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/net/ddclient/files/ddclient.sh b/net/ddclient/files/ddclient.sh
index 8453f43e1fc..be3529bbdb6 100644
--- a/net/ddclient/files/ddclient.sh
+++ b/net/ddclient/files/ddclient.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: ddclient.sh,v 1.2 2001/12/09 21:44:52 jlam Exp $
+# $NetBSD: ddclient.sh,v 1.3 2002/02/05 06:04:38 jlam Exp $
 #
 # Dynamic DNS update client
 #
 # PROVIDE: ddclient
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -27,7 +27,7 @@ ddclient_start()
 	${daemon} ${ddclient_flags} ${command_args}
 }
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/net/openslp/files/slpd.sh b/net/openslp/files/slpd.sh
index 868b8524c52..f48c79f0ce9 100644
--- a/net/openslp/files/slpd.sh
+++ b/net/openslp/files/slpd.sh
@@ -5,7 +5,7 @@
 # PROVIDE: slpd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -16,7 +16,7 @@ command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="/etc/slp.conf"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/net/samba/files/nmbd.sh b/net/samba/files/nmbd.sh
index 3e076e3d10a..34041cbe1c9 100755
--- a/net/samba/files/nmbd.sh
+++ b/net/samba/files/nmbd.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: nmbd.sh,v 1.6 2001/11/21 21:38:53 jlam Exp $
+# $NetBSD: nmbd.sh,v 1.7 2002/02/05 06:04:39 jlam Exp $
 #
 # PROVIDE: nmbd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -20,7 +20,7 @@ command_args="-D"		# _must_ start as daemon from rc.d;
 
 reload_cmd=":"			# avoid dumping debug output on SIGHUP
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh
index e7641771a81..905aa19a0f6 100644
--- a/net/samba/files/samba.sh
+++ b/net/samba/files/samba.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: samba.sh,v 1.9 2002/01/10 12:01:37 jlam Exp $
+# $NetBSD: samba.sh,v 1.10 2002/02/05 06:04:39 jlam Exp $
 #
 # KEYWORD: nostart
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -40,7 +40,7 @@ reload_cmd="forward_commands"
 status_cmd="forward_commands"
 extra_commands="reload status"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	run_rc_command "$1"
 else
diff --git a/net/samba/files/smbd.sh b/net/samba/files/smbd.sh
index 1ff02b39102..f17887e91b2 100755
--- a/net/samba/files/smbd.sh
+++ b/net/samba/files/smbd.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: smbd.sh,v 1.7 2001/11/21 21:38:53 jlam Exp $
+# $NetBSD: smbd.sh,v 1.8 2002/02/05 06:04:39 jlam Exp $
 #
 # PROVIDE: smbd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -18,7 +18,7 @@ extra_commands="reload"
 command_args="-D"		# _must_ start as daemon from rc.d;
 				# add more flags through ${${name}_flags}
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/net/samba20/files/nmbd.sh b/net/samba20/files/nmbd.sh
index 03fdca260dc..a947515e1df 100755
--- a/net/samba20/files/nmbd.sh
+++ b/net/samba20/files/nmbd.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: nmbd.sh,v 1.4 2001/11/21 21:38:53 jlam Exp $
+# $NetBSD: nmbd.sh,v 1.5 2002/02/05 06:04:39 jlam Exp $
 #
 # PROVIDE: nmbd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -20,7 +20,7 @@ command_args="-D"		# _must_ start as daemon from rc.d;
 
 reload_cmd=":"			# avoid dumping debug output on SIGHUP
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/net/samba20/files/samba.sh b/net/samba20/files/samba.sh
index 9cccc3161d6..5b10e76a6ec 100644
--- a/net/samba20/files/samba.sh
+++ b/net/samba20/files/samba.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: samba.sh,v 1.5 2002/01/12 00:22:40 jlam Exp $
+# $NetBSD: samba.sh,v 1.6 2002/02/05 06:04:39 jlam Exp $
 #
 # KEYWORD: nostart
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -40,7 +40,7 @@ reload_cmd="forward_commands"
 status_cmd="forward_commands"
 extra_commands="reload status"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	run_rc_command "$1"
 else
diff --git a/net/samba20/files/smbd.sh b/net/samba20/files/smbd.sh
index dad6f156057..0bb43e98644 100755
--- a/net/samba20/files/smbd.sh
+++ b/net/samba20/files/smbd.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: smbd.sh,v 1.5 2001/11/21 21:38:54 jlam Exp $
+# $NetBSD: smbd.sh,v 1.6 2002/02/05 06:04:40 jlam Exp $
 #
 # PROVIDE: smbd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -18,7 +18,7 @@ extra_commands="reload"
 command_args="-D"		# _must_ start as daemon from rc.d;
 				# add more flags through ${${name}_flags}
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh
index 0fd5089ad80..b7052cccfec 100644
--- a/print/cups/files/cupsd.sh
+++ b/print/cups/files/cupsd.sh
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: cupsd.sh,v 1.8 2001/11/26 07:34:05 jlam Exp $
+# $NetBSD: cupsd.sh,v 1.9 2002/02/05 06:04:40 jlam Exp $
 #
 # Common UNIX Printing System daemon
 #
 # PROVIDE: cupsd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -18,7 +18,7 @@ command="@PREFIX@/sbin/${name}"
 required_files="@PKG_SYSCONFDIR@/cups/${name}.conf"
 extra_commands="reload"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/security/cyrus-sasl/files/sasl_pwcheck.sh b/security/cyrus-sasl/files/sasl_pwcheck.sh
index f57d061c591..6415442cfe8 100644
--- a/security/cyrus-sasl/files/sasl_pwcheck.sh
+++ b/security/cyrus-sasl/files/sasl_pwcheck.sh
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: sasl_pwcheck.sh,v 1.6 2002/01/31 21:41:18 jlam Exp $
+# $NetBSD: sasl_pwcheck.sh,v 1.7 2002/02/05 06:04:40 jlam Exp $
 #
 # The pwcheck daemon allows UNIX password authentication with Cyrus SASL.
 #
 # PROVIDE: sasl_pwcheck
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -17,7 +17,7 @@ rcvar="${name}"
 command="@PREFIX@/sbin/pwcheck"
 command_args="& sleep 2"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/security/pks/files/pksd.sh b/security/pks/files/pksd.sh
index f584ab0708d..3f7c5239bd9 100644
--- a/security/pks/files/pksd.sh
+++ b/security/pks/files/pksd.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: pksd.sh,v 1.5 2001/11/26 07:34:06 jlam Exp $
+# $NetBSD: pksd.sh,v 1.6 2002/02/05 06:04:41 jlam Exp $
 #
 # PROVIDE: pksd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -67,7 +67,7 @@ start_precmd=pksd_dbinit
 start_cmd=pksd_start
 stop_cmd=pksd_stop
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/sysutils/ups-nut/files/ups.sh b/sysutils/ups-nut/files/ups.sh
index d87cf7df128..f4185b24e3a 100644
--- a/sysutils/ups-nut/files/ups.sh
+++ b/sysutils/ups-nut/files/ups.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: ups.sh,v 1.6 2002/01/10 12:01:38 jlam Exp $
+# $NetBSD: ups.sh,v 1.7 2002/02/05 06:04:41 jlam Exp $
 #
 # KEYWORD: nostart
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -39,7 +39,7 @@ stop_cmd="reverse_commands"
 status_cmd="forward_commands"
 extra_commands="status"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
         run_rc_command "$1"
 else
diff --git a/sysutils/ups-nut/files/upsd.sh b/sysutils/ups-nut/files/upsd.sh
index 29ef15c9ff0..4ff7babc204 100644
--- a/sysutils/ups-nut/files/upsd.sh
+++ b/sysutils/ups-nut/files/upsd.sh
@@ -1,11 +1,11 @@
 #! /bin/sh
 #
-# $NetBSD: upsd.sh,v 1.2 2001/11/21 21:38:55 jlam Exp $
+# $NetBSD: upsd.sh,v 1.3 2002/02/05 06:04:41 jlam Exp $
 #
 # PROVIDE: upsd
 # REQUIRE: upsdriver
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -16,7 +16,7 @@ command="@PREFIX@/sbin/${name}"
 required_files="@NUT_CONFDIR@/${name}.conf"
 pidfile="@NUT_STATEDIR@/${name}.pid"
 
-if [ -e /etc/rc.d ]
+if [ -f /etc/rc.d ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/sysutils/ups-nut/files/upsdriver.sh b/sysutils/ups-nut/files/upsdriver.sh
index aade6a5f877..485fa6a9214 100644
--- a/sysutils/ups-nut/files/upsdriver.sh
+++ b/sysutils/ups-nut/files/upsdriver.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: upsdriver.sh,v 1.4 2002/01/08 18:33:36 jlam Exp $
+# $NetBSD: upsdriver.sh,v 1.5 2002/02/05 06:04:41 jlam Exp $
 #
 # PROVIDE: upsdriver
 # REQUIRE: NETWORK syslogd mountcritremote
@@ -16,7 +16,7 @@
 # drivers.  Please refer to nutupsdrv(8) for more information about the
 # arguments to pass to the UPS drivers.
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -24,7 +24,7 @@ fi
 name="upsdriver"
 rcvar=$name
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 fi
@@ -44,7 +44,7 @@ else
 	#pidfile="@NUT_STATEDIR@/${upsdriver_type}-${tty}.pid"
 fi
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	run_rc_command "$1"
 else
diff --git a/sysutils/ups-nut/files/upslog.sh b/sysutils/ups-nut/files/upslog.sh
index 56023203b43..e3ba90f0798 100644
--- a/sysutils/ups-nut/files/upslog.sh
+++ b/sysutils/ups-nut/files/upslog.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: upslog.sh,v 1.3 2002/01/08 18:33:17 jlam Exp $
+# $NetBSD: upslog.sh,v 1.4 2002/02/05 06:04:41 jlam Exp $
 #
 # PROVIDE: upslog
 # REQUIRE: upsd
@@ -14,7 +14,7 @@
 # Please refer to upslog(8) for more information about the arguments to pass
 # to upslog.
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -24,7 +24,7 @@ rcvar="${name}"
 command="@PREFIX@/bin/${name}"
 pidfile="/var/run/${name}.pid"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/sysutils/ups-nut/files/upsmon.sh b/sysutils/ups-nut/files/upsmon.sh
index 338fcbba5c2..8d4c946c938 100644
--- a/sysutils/ups-nut/files/upsmon.sh
+++ b/sysutils/ups-nut/files/upsmon.sh
@@ -1,11 +1,11 @@
 #! /bin/sh
 #
-# $NetBSD: upsmon.sh,v 1.2 2001/11/21 21:38:55 jlam Exp $
+# $NetBSD: upsmon.sh,v 1.3 2002/02/05 06:04:42 jlam Exp $
 #
 # PROVIDE: upsmon
 # REQUIRE: upsd
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -16,7 +16,7 @@ command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 required_files="@NUT_CONFDIR@/${name}.conf"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index 7e5db5799bc..3b69568e607 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apache.sh,v 1.15 2001/12/26 22:03:38 jlam Exp $
+# $NetBSD: apache.sh,v 1.16 2002/02/05 06:04:42 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -9,7 +9,7 @@
 # To start apache at startup, copy this script to /etc/rc.d and set
 # apache=YES in /etc/rc.conf.
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -31,7 +31,7 @@ start_cmd="${ctl_command} ${apache_start}"
 stop_cmd="${ctl_command} stop"
 restart_cmd="${ctl_command} restart"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/www/apache6/files/apache.sh b/www/apache6/files/apache.sh
index 5c56ae0dd06..74d2fa9abec 100644
--- a/www/apache6/files/apache.sh
+++ b/www/apache6/files/apache.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: apache.sh,v 1.11 2001/12/26 22:03:38 jlam Exp $
+# $NetBSD: apache.sh,v 1.12 2002/02/05 06:04:42 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -9,7 +9,7 @@
 # To start apache at startup, copy this script to /etc/rc.d and set
 # apache=YES in /etc/rc.conf.
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -31,7 +31,7 @@ start_cmd="${ctl_command} ${apache_start}"
 stop_cmd="${ctl_command} stop"
 restart_cmd="${ctl_command} restart"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
diff --git a/www/thttpd/files/thttpd.sh b/www/thttpd/files/thttpd.sh
index cb2a13f612f..bd5fb502b4e 100644
--- a/www/thttpd/files/thttpd.sh
+++ b/www/thttpd/files/thttpd.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: thttpd.sh,v 1.7 2001/11/26 07:34:08 jlam Exp $
+# $NetBSD: thttpd.sh,v 1.8 2002/02/05 06:04:43 jlam Exp $
 #
 # PROVIDE: thttpd
 # REQUIRE: DAEMON
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
@@ -16,7 +16,7 @@ command=@PREFIX@/sbin/${name}
 command_args="-C @PKG_SYSCONFDIR@/${name}.conf"
 required_files="@PKG_SYSCONFDIR@/${name}.conf"
 
-if [ -e /etc/rc.subr ]
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"