From a1d121c8861f3760f58c07dcc9afaf644042a6fb Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 18 Jun 2001 19:54:14 +0000 Subject: Unify NetBSD and Solaris package lists and use dynamic modification. --- security/openssh/Makefile | 16 ++++++++++++++-- security/openssh/pkg/PLIST | 5 ++++- security/openssh/pkg/PLIST.SunOS | 26 -------------------------- 3 files changed, 18 insertions(+), 29 deletions(-) delete mode 100644 security/openssh/pkg/PLIST.SunOS (limited to 'security') diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 2240ac659f3..d6950dc30bb 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2001/06/18 09:56:26 itojun Exp $ +# $NetBSD: Makefile,v 1.52 2001/06/18 19:54:14 tron Exp $ DISTNAME= openssh-2.9p2 CATEGORIES= security @@ -78,11 +78,14 @@ MAKE_ENV+= ASKPASS_LOCATION=${X11BASE}/bin MAKE_ENV+= ASKPASS_LOCATION=${X11PREFIX}/bin .endif +CHECK_FILES= bin/slogin man/man1/slogin.1 \ + share/examples/openssh/ssh_prng_cmds +PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC + .if (${OPSYS} == SunOS) DEPENDS+= zlib-*:../../devel/zlib INSTALL_FILE= ${WRKDIR}/INSTALL.SunOS -PLIST_SRC= ${PKGDIR}/PLIST.SunOS .endif pre-configure: @@ -107,5 +110,14 @@ pre-install: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/sshd.sh ${PREFIX}/etc/rc.d/sshd PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL + ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} + cd ${PREFIX}; \ + for FILE in ${CHECK_FILES}; do \ + if [ ! -f $${FILE} ]; then \ + ${MV} ${PLIST_SRC} ${PLIST_SRC}.old; \ + ${GREP} -v "^$${FILE}" ${PLIST_SRC}.old >${PLIST_SRC}; \ + ${RM} ${PLIST_SRC}.old; \ + fi; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/security/openssh/pkg/PLIST b/security/openssh/pkg/PLIST index 54041cb6cac..8e83aaa8785 100644 --- a/security/openssh/pkg/PLIST +++ b/security/openssh/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.7 2001/02/20 16:33:15 itojun Exp $ +@comment $NetBSD: PLIST,v 1.8 2001/06/18 19:54:15 tron Exp $ bin/scp bin/sftp +bin/slogin bin/ssh bin/ssh-add bin/ssh-agent @@ -10,6 +11,7 @@ etc/rc.d/sshd libexec/sftp-server man/man1/scp.1 man/man1/sftp.1 +man/man1/slogin.1 man/man1/ssh-add.1 man/man1/ssh-agent.1 man/man1/ssh-keygen.1 @@ -19,5 +21,6 @@ man/man8/sftp-server.8 man/man8/sshd.8 sbin/sshd share/examples/openssh/ssh_config +share/examples/openssh/ssh_prng_cmds share/examples/openssh/sshd_config @dirrm share/examples/openssh diff --git a/security/openssh/pkg/PLIST.SunOS b/security/openssh/pkg/PLIST.SunOS deleted file mode 100644 index 3854065b14d..00000000000 --- a/security/openssh/pkg/PLIST.SunOS +++ /dev/null @@ -1,26 +0,0 @@ -@comment $NetBSD: PLIST.SunOS,v 1.4 2001/03/23 10:02:57 tron Exp $ -bin/scp -bin/sftp -bin/slogin -bin/ssh -bin/ssh-add -bin/ssh-agent -bin/ssh-keygen -bin/ssh-keyscan -etc/rc.d/sshd -libexec/sftp-server -man/man1/scp.1 -man/man1/sftp.1 -man/man1/slogin.1 -man/man1/ssh-add.1 -man/man1/ssh-agent.1 -man/man1/ssh-keygen.1 -man/man1/ssh-keyscan.1 -man/man1/ssh.1 -man/man8/sftp-server.8 -man/man8/sshd.8 -sbin/sshd -share/examples/openssh/ssh_config -share/examples/openssh/ssh_prng_cmds -share/examples/openssh/sshd_config -@dirrm share/examples/openssh -- cgit v1.2.3