diff options
| author | reed <reed@pkgsrc.org> | 2004-04-23 22:07:52 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2004-04-23 22:07:52 +0000 |
| commit | 912cb390cd14f54d2a354201c57069381e94236b (patch) | |
| tree | 99ee0ae766efaa16bbe63c3e83f5df60ff8f8454 /security/openssh | |
| parent | df568dee918af12e56bf45fc547292f8190cf51b (diff) | |
| download | pkgsrc-912cb390cd14f54d2a354201c57069381e94236b.tar.gz | |
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.
Diffstat (limited to 'security/openssh')
| -rw-r--r-- | security/openssh/Makefile | 4 | ||||
| -rw-r--r-- | security/openssh/PLIST | 3 |
2 files changed, 2 insertions, 5 deletions
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 |