mk/bsd.pkg.install.mk now automatically registers

the RCD_SCRIPTS rc.d script(s) to the PLIST.

This GENERATE_PLIST idea is part of Greg A. Woods'
PR #22954.

This helps when the RC_SCRIPTS are installed to
a different ${RCD_SCRIPTS_EXAMPLEDIR}. (Later,
the default RCD_SCRIPTS_EXAMPLEDIR will be changed
to be more clear that they are the examples.)

These patches also remove the etc/rc.d/ scripts from PLISTs
(of packages that use RCD_SCRIPTS). (This also removes
now unused references from openssh* makefiles. Note that
qmail package has not been changed yet.)

I have been doing automatic PLIST registration for RC_SCRIPTS
for over a year. Not all of these packages have been tested,
but many have been tested and used.

Somethings maybe to do:
- a few packages still manually install the rc.d scripts to
  hard-coded etc/rc.d. These need to be fixed.
- maybe  remove from mk/${OPSYS}.pkg.dist mtree specifications too.

19 files changed, 19 insertions, 43 deletions

diff --git a/security/cfs/PLIST b/security/cfs/PLIST
index 6c09bec94f2..c2cce64d727 100644
--- a/security/cfs/PLIST
+++ b/security/cfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:16:34 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:57 reed Exp $
 bin/cfs_attach
 bin/cfs_cat
 bin/cfs_detach
@@ -7,7 +7,6 @@ bin/cfs_mkkey
 bin/cfs_name
 bin/cfs_passwd
 bin/cfssh
-etc/rc.d/cfsd
 man/man1/cfs_attach.1
 man/man1/cfs_detach.1
 man/man1/cfs_mkdir.1
diff --git a/security/cyrus-sasl/PLIST.common b/security/cyrus-sasl/PLIST.common
index 0854e1e0a21..761fa92d0e2 100644
--- a/security/cyrus-sasl/PLIST.common
+++ b/security/cyrus-sasl/PLIST.common
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST.common,v 1.4 2002/08/25 18:39:50 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2004/04/23 22:07:58 reed Exp $
 bin/sasl-config
-etc/rc.d/sasl_pwcheck
-etc/rc.d/saslauthd
 include/hmac-md5.h
 include/sasl.h
 include/saslplug.h
diff --git a/security/cyrus-saslauthd/PLIST b/security/cyrus-saslauthd/PLIST
index 31d237342c2..578a945e3b2 100644
--- a/security/cyrus-saslauthd/PLIST
+++ b/security/cyrus-saslauthd/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2004/01/13 09:03:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/23 22:07:58 reed Exp $
 bin/saslcache
 bin/testsaslauthd
-etc/rc.d/saslauthd
 man/man8/saslauthd.8
 sbin/saslauthd
diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST
index 92eacf24269..6251eef47d9 100644
--- a/security/heimdal/PLIST
+++ b/security/heimdal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/04/01 18:42:25 joda Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/23 22:07:58 reed Exp $
 bin/afslog
 bin/compile_et
 bin/kauth
@@ -22,7 +22,6 @@ bin/string2key
 bin/${KRB5_PREFIX}su
 bin/${KRB5_PREFIX}telnet
 bin/verify_krb5_conf
-etc/rc.d/kdc
 include/krb5/asn1_err.h
 include/krb5/base64.h
 include/krb5/com_err.h
diff --git a/security/honeyd-arpd/PLIST b/security/honeyd-arpd/PLIST
index cc4042c8fac..779451b3773 100644
--- a/security/honeyd-arpd/PLIST
+++ b/security/honeyd-arpd/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/20 09:15:52 xtraeme Exp $
-etc/rc.d/honeydarpd
+@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:58 reed Exp $
 man/man8/honeyd-arpd.8
 sbin/honeyd-arpd
diff --git a/security/honeyd/PLIST b/security/honeyd/PLIST
index acfacca4824..e0508bc4aa1 100644
--- a/security/honeyd/PLIST
+++ b/security/honeyd/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/20 09:14:43 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:58 reed Exp $
 bin/honeyd
 bin/honeydctl
-etc/rc.d/honeyd
 include/honeyd/debug.h
 include/honeyd/hooks.h
 include/honeyd/plugins.h
diff --git a/security/isakmpd/PLIST b/security/isakmpd/PLIST
index bf8aa542be2..9fafd30f532 100644
--- a/security/isakmpd/PLIST
+++ b/security/isakmpd/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/04 09:46:03 martti Exp $
-etc/rc.d/isakmpd
+@comment $NetBSD: PLIST,v 1.3 2004/04/23 22:07:58 reed Exp $
 sbin/certpatch
 sbin/isakmpd
 man/cat5/isakmpd.conf.0
diff --git a/security/mit-krb5/PLIST b/security/mit-krb5/PLIST
index bb2afae8609..a64a1815953 100644
--- a/security/mit-krb5/PLIST
+++ b/security/mit-krb5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:58 reed Exp $
 bin/compile_et
 bin/gss-client
 bin/kdestroy
@@ -17,8 +17,6 @@ bin/sclient
 bin/sim_client
 bin/uuclient
 bin/v5passwd
-etc/rc.d/kadmind
-etc/rc.d/kdc
 include/com_err.h
 include/gssapi/gssapi.h
 include/gssapi/gssapi_generic.h
diff --git a/security/nessus-core/PLIST b/security/nessus-core/PLIST
index f6d2446d7df..0ba0cab1808 100644
--- a/security/nessus-core/PLIST
+++ b/security/nessus-core/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2003/06/09 17:01:25 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/04/23 22:07:58 reed Exp $
 bin/nessus
 bin/nessus-mkcert-client
 bin/nessus-mkrand
-etc/rc.d/nessusd
 include/nessus/config.h
 include/nessus/includes.h
 include/nessus/nessus-devel.h
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index a37fe8f58cb..ef82702014c 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/23 22:07:58 reed Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -52,10 +52,8 @@ SSH_PID_DIR=		/var/run	# default directory for PID files
 
 PKG_SYSCONFSUBDIR=	ssh
 MANDIR=			man
-RCD_SCRIPTS_EGDIR=	etc/rc.d
 
 PLIST_SUBST+=		MANDIR=${MANDIR}
-PLIST_SUBST+=		RCD_SCRIPTS_EGDIR=${RCD_SCRIPTS_EGDIR}
 
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
diff --git a/security/openssh+gssapi/PLIST b/security/openssh+gssapi/PLIST
index ce179a879ef..53634976bc4 100644
--- a/security/openssh+gssapi/PLIST
+++ b/security/openssh+gssapi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/24 21:01:23 jwise Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:58 reed Exp $
 bin/scp
 bin/sftp
 bin/slogin
@@ -7,7 +7,6 @@ bin/ssh-add
 bin/ssh-agent
 bin/ssh-keygen
 bin/ssh-keyscan
-${RCD_SCRIPTS_EGDIR}/sshd
 libexec/sftp-server
 libexec/ssh-keysign
 ${MANDIR}/man1/scp.1
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 5605a83edad..0f9d500170d 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2004/03/26 02:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.125 2004/04/23 22:07:58 reed Exp $
 
 DISTNAME=		openssh-3.8p1
 PKGNAME=		openssh-3.8.1
@@ -43,10 +43,8 @@ SSH_PID_DIR=		/var/run	# default directory for PID files
 
 PKG_SYSCONFSUBDIR=	ssh
 MANDIR=			man
-RCD_SCRIPTS_EGDIR=	etc/rc.d
 
 PLIST_SUBST+=		MANDIR=${MANDIR}
-PLIST_SUBST+=		RCD_SCRIPTS_EGDIR=${RCD_SCRIPTS_EGDIR}
 
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
diff --git a/security/openssh/PLIST b/security/openssh/PLIST
index fc87e722312..c9fe7a63ff1 100644
--- a/security/openssh/PLIST
+++ b/security/openssh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/06/28 17:10:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/23 22:07:58 reed Exp $
 bin/scp
 bin/sftp
 bin/slogin
@@ -7,7 +7,6 @@ bin/ssh-add
 bin/ssh-agent
 bin/ssh-keygen
 bin/ssh-keyscan
-${RCD_SCRIPTS_EGDIR}/sshd
 libexec/sftp-server
 libexec/ssh-keysign
 ${MANDIR}/man1/scp.1
diff --git a/security/pks/PLIST b/security/pks/PLIST
index 7f60b960c6b..2d81653f8f7 100644
--- a/security/pks/PLIST
+++ b/security/pks/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:58 reed Exp $
 bin/pgpsplit
 bin/pks-mail.sh
 bin/pks-queue-run.sh
 bin/pksclient
 bin/pksd
 bin/pksdctl
-etc/rc.d/pksd
 man/man5/pksd.conf.5
 man/man8/pks-intro.8
 man/man8/pksclient.8
diff --git a/security/racoon/PLIST b/security/racoon/PLIST
index 66ecf0585c6..bbf30544c70 100644
--- a/security/racoon/PLIST
+++ b/security/racoon/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/22 11:00:17 jmmv Exp $
-etc/rc.d/racoon
+@comment $NetBSD: PLIST,v 1.4 2004/04/23 22:07:58 reed Exp $
 sbin/racoon
 man/man8/racoon.8
 man/man5/racoon.conf.5
diff --git a/security/sfs/PLIST b/security/sfs/PLIST
index 4a98a11488a..8fff00afabe 100644
--- a/security/sfs/PLIST
+++ b/security/sfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/03/10 00:56:54 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/23 22:07:58 reed Exp $
 bin/dirsearch
 bin/newaid
 bin/rex
@@ -8,8 +8,6 @@ bin/sfsdeclog
 bin/sfskey
 bin/sfsproac
 bin/ssu
-etc/rc.d/sfscd
-etc/rc.d/sfssd
 include/sfs
 include/${PKGNAME}/aclnt.h
 include/${PKGNAME}/aes.h
diff --git a/security/ssh2/PLIST b/security/ssh2/PLIST
index 690b7c3437f..3a4d785af48 100644
--- a/security/ssh2/PLIST
+++ b/security/ssh2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/08/12 19:08:55 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/23 22:07:59 reed Exp $
 bin/scp
 bin/scp2
 bin/sftp
@@ -20,7 +20,6 @@ bin/ssh-probe2
 bin/ssh-signer
 bin/ssh-signer2
 bin/ssh2
-etc/rc.d/ssh2_secure_shell
 man/man1/scp.1
 man/man1/scp2.1
 man/man1/sftp.1
diff --git a/security/winbind/PLIST b/security/winbind/PLIST
index 3e3994ab0ba..0f19e3be808 100644
--- a/security/winbind/PLIST
+++ b/security/winbind/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/29 04:19:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:59 reed Exp $
 bin/wbinfo
-etc/rc.d/winbindd
 lib/libnss_winbind.so
 lib/security/pam_winbind.so
 sbin/winbindd
diff --git a/security/xdm-krb4/PLIST b/security/xdm-krb4/PLIST
index 0c0e5bb9ef1..a3dc1790e80 100644
--- a/security/xdm-krb4/PLIST
+++ b/security/xdm-krb4/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/03 02:53:07 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/23 22:07:59 reed Exp $
 bin/xdm-krb4
-etc/rc.d/xdm_krb4
 ${IMAKE_MAN_DIR}/xdm-krb4.${IMAKE_MANNEWSUFFIX}
 share/examples/xdm-krb4/GiveConsole
 share/examples/xdm-krb4/TakeConsole