Take advantage of the auto-generation and installation of rc.d scripts.

5 files changed, 5 insertions, 38 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index f480d74aae9..5068d294d24 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/09/18 21:15:16 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2002/09/19 09:04:21 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.27
 SVR4_PKGNAME=		csasl
@@ -80,17 +80,7 @@ post-extract:
 	cd ${WRKSRC}; ${RM} -f include/md5.h
 	${CP} ${FILESDIR}/sasl-config.in ${WRKSRC}/plugins
 
-pre-install:
-	@for script in ${RCD_SCRIPTS}; do				\
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
-			> ${WRKDIR}/$${script};				\
-	done
-
 post-install:
-	for script in ${RCD_SCRIPTS}; do				\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
-			${PREFIX}/etc/rc.d/$${script};			\
-	done
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
 
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 150b6311494..bacd45d0440 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2002/09/18 21:15:17 jlam Exp $
+# $NetBSD: Makefile,v 1.91 2002/09/19 09:04:22 jlam Exp $
 
 DISTNAME=		openssh-3.4p1
 PKGNAME=		openssh-3.4.0.1
@@ -130,9 +130,6 @@ MESSAGE_SUBST+=		OPENSSH_GROUP=${OPENSSH_GROUP}
 .  include "Makefile.intree"
 .endif
 
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/sshd.sh > ${WRKDIR}/sshd
-
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}; for file in ${CONFS} ${SUPPS}; do			\
@@ -141,7 +138,6 @@ post-install:
 #.if defined(USE_PAM)
 #	${INSTALL_DATA} ${WRKSRC}/contrib/sshd.pam.freebsd ${EGDIR}/sshd.pam
 #.endif
-	${INSTALL_SCRIPT} ${WRKDIR}/sshd ${PREFIX}/${RCD_SCRIPTS_EGDIR}/sshd
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 7f8224c79cc..51aa2afc0c1 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/08/25 21:50:41 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/19 09:04:25 jlam Exp $
 
 DISTNAME=		pks-0.9.4
 CATEGORIES=		security www
@@ -31,12 +31,6 @@ CONF_FILES=	${EGDIR}/pksd.conf ${PKG_SYSCONFDIR}/pksd.conf
 RCD_SCRIPTS=	pksd
 OWN_DIRS=	/var/pks /var/pks/db /var/pks/incoming
 
-pre-install:
-	${SED} ${FILES_SUBST_SED} ${FILESDIR}/pksd.sh > ${WRKDIR}/pksd.sh
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/pksd.sh ${PREFIX}/etc/rc.d/pksd
-
 .include "../../databases/db/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 7bece464bf9..d2bc8ecd8a7 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/06 00:48:09 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/19 09:04:26 jlam Exp $
 #
 
 DISTNAME=	ssh-3.2.0
@@ -67,10 +67,6 @@ DOCS=			CHANGES FAQ HOWTO.anonymous.sftp INSTALL LICENSE \
 			RFC.authorization_program_protocol \
 			RFC.kbdint_plugin_protocol
 
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/ssh2_secure_shell.sh \
-	   > ${WRKDIR}/ssh2_secure_shell
-
 post-install:
 	${INSTALL_DATA_DIR} ${DOCSDIR}
 .for FILE in ${DOCS}
@@ -79,7 +75,6 @@ post-install:
 .for FILE in ${EGFILES}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${EGDIR}
 .endfor
-	${INSTALL_SCRIPT} ${WRKDIR}/ssh2_secure_shell ${PREFIX}/etc/rc.d/ssh2_secure_shell
 
 .include "../../security/tcp_wrappers/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
diff --git a/security/winbind/Makefile b/security/winbind/Makefile
index 4b780f1addf..bfa4ef6a26e 100644
--- a/security/winbind/Makefile
+++ b/security/winbind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/30 23:05:14 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/19 09:04:26 jlam Exp $
 
 PKGNAME=		winbind-${SAMBA_DIST_VERS}
 CATEGORIES=		security
@@ -35,14 +35,6 @@ do-install:
 	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/pam_winbind.so ${PAMDIR}
 	${INSTALL_LIBRARY} ${WRKSRC}/nsswitch/libnss_winbind.so ${PREFIX}/lib
 
-post-install:
-	@for file in ${RCD_SCRIPTS}; do					\
-		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${file}.sh	\
-			> ${WRKDIR}/$${file}.sh;			\
-		${INSTALL_SCRIPT} ${WRKDIR}/$${file}.sh			\
-			${PREFIX}/etc/rc.d/$${file};			\
-	done
-
 .include "../../security/PAM/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"