From f376e7e23486c7fec81330efa4bca792e9015154 Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Fri, 23 Apr 2004 22:07:52 +0000
Subject: 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.
---
 security/openssh+gssapi/Makefile | 4 +---
 security/openssh+gssapi/PLIST    | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'security/openssh+gssapi')

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
-- 
cgit v1.2.3