Install rc.d control script as "sshd" instead of "sshd.sh" to comply with

how NetBSD's rc.d interprets script names.  Also add REQUIRE and PROVIDE
sections to control scripts so they can be used directly in NetBSD's rc.d
system.

9 files changed, 21 insertions, 15 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 89813319de1..d2e714b5a69 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2000/09/09 19:40:21 fredb Exp $
+# $NetBSD: Makefile,v 1.29 2000/09/20 04:49:19 jlam Exp $
 #
 
 DISTNAME=		openssh-2.2.0p1
@@ -91,7 +91,7 @@ post-build:
 	done
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd
 	PKG_PREFIX=${PREFIX} ${SH} ${REQ_FILE} ${PKGNAME} INSTALL
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
diff --git a/security/openssh/files/sshd.sh b/security/openssh/files/sshd.sh
index 3e777c8a157..acb43fca99c 100644
--- a/security/openssh/files/sshd.sh
+++ b/security/openssh/files/sshd.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 #
-# $NetBSD: sshd.sh,v 1.4 2000/09/01 20:40:10 jlam Exp $
+# $NetBSD: sshd.sh,v 1.5 2000/09/20 04:49:19 jlam Exp $
 #
+# PROVIDE: sshd
+# REQUIRE: DAEMON LOGIN
 
 name="sshd"
 pidfile="/var/run/${name}.pid"
diff --git a/security/openssh/pkg/PLIST b/security/openssh/pkg/PLIST
index 64d2495fa08..c9f27721648 100644
--- a/security/openssh/pkg/PLIST
+++ b/security/openssh/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2000/07/22 08:22:03 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/09/20 04:49:19 jlam Exp $
 bin/scp
 bin/slogin
 bin/ssh
 bin/ssh-add
 bin/ssh-agent
 bin/ssh-keygen
-etc/rc.d/sshd.sh
+etc/rc.d/sshd
 man/man1/ssh.1
 man/man1/scp.1
 man/man1/slogin.1
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index a09bc16e786..c53acd4829b 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2000/09/09 19:40:24 fredb Exp $
+# $NetBSD: Makefile,v 1.83 2000/09/20 04:49:19 jlam Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -200,7 +200,7 @@ post-install:
 		${PREFIX}/bin/ssh-keygen \
 			-f ${SSH_CONF_DIR}/ssh_host_key -N ""; \
 	fi
-	${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd
 
 BUILD_DEFS+=		USE_IDEA SSH_CONF_DIR SSH_SUID USE_RSAREF2
 BUILD_DEFS+=		LIBWRAP_FWD M68060 USE_SOCKS
diff --git a/security/ssh/files/sshd.sh b/security/ssh/files/sshd.sh
index cacbcdb885f..85177bf55df 100644
--- a/security/ssh/files/sshd.sh
+++ b/security/ssh/files/sshd.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 #
-# $NetBSD: sshd.sh,v 1.4 2000/08/28 08:52:59 abs Exp $
+# $NetBSD: sshd.sh,v 1.5 2000/09/20 04:49:20 jlam Exp $
 #
+# PROVIDE: sshd
+# REQUIRE: DAEMON LOGIN
 
 name="sshd"
 pidfile="/var/run/${name}.pid"
diff --git a/security/ssh/pkg/PLIST b/security/ssh/pkg/PLIST
index 709eb454e5b..8b522eb7f59 100644
--- a/security/ssh/pkg/PLIST
+++ b/security/ssh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/07/17 11:57:33 veego Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/09/20 04:49:20 jlam Exp $
 bin/ssh
 bin/ssh1
 bin/scp
@@ -12,7 +12,7 @@ bin/ssh-keygen
 bin/ssh-keygen1
 bin/make-ssh-known-hosts
 bin/make-ssh-known-hosts1
-etc/rc.d/sshd.sh
+etc/rc.d/sshd
 man/man1/make-ssh-known-hosts1.1
 man/man1/make-ssh-known-hosts.1
 man/man1/scp.1
diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile
index 904c11ec070..fc5add8c2bf 100644
--- a/security/ssh6/Makefile
+++ b/security/ssh6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/09/09 19:40:24 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2000/09/20 04:49:20 jlam Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -196,7 +196,7 @@ post-install:
 		${PREFIX}/bin/ssh-keygen \
 			-f ${SSH_CONF_DIR}/ssh_host_key -N ""; \
 	fi
-	${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd
 
 BUILD_DEFS+=		USE_IDEA SSH_CONF_DIR SSH_SUID USE_RSAREF2
 BUILD_DEFS+=		LIBWRAP_FWD M68060 USE_SOCKS USE_INET6
diff --git a/security/ssh6/files/sshd.sh b/security/ssh6/files/sshd.sh
index b8beb89cc0d..96fd93cf133 100644
--- a/security/ssh6/files/sshd.sh
+++ b/security/ssh6/files/sshd.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 #
-# $NetBSD: sshd.sh,v 1.2 2000/07/24 16:44:53 jlam Exp $
+# $NetBSD: sshd.sh,v 1.3 2000/09/20 04:49:20 jlam Exp $
 #
+# PROVIDE: sshd
+# REQUIRE: DAEMON LOGIN
 
 name="sshd"
 pidfile="/var/run/${name}.pid"
diff --git a/security/ssh6/pkg/PLIST b/security/ssh6/pkg/PLIST
index 4aa3393b9cf..aaf2a4a812d 100644
--- a/security/ssh6/pkg/PLIST
+++ b/security/ssh6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2000/03/20 02:25:48 itojun Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/09/20 04:49:20 jlam Exp $
 bin/ssh
 bin/ssh1
 bin/scp
@@ -12,7 +12,7 @@ bin/ssh-keygen
 bin/ssh-keygen1
 bin/make-ssh-known-hosts
 bin/make-ssh-known-hosts1
-etc/rc.d/sshd.sh
+etc/rc.d/sshd
 man/man1/make-ssh-known-hosts1.1
 man/man1/make-ssh-known-hosts.1
 man/man1/scp.1