diff options
31 files changed, 40 insertions, 223 deletions
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 6f7b10fb0aa..988502308d9 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2002/08/31 14:46:21 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2002/09/19 09:04:02 jlam Exp $ # DISTNAME= rplay-3.3.2 @@ -27,13 +27,10 @@ pre-configure: ${MV} -f $${manpage}.pdone $${manpage}; \ done -post-install: - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/rplayd.sh > ${WRKDIR}/rplayd - ${INSTALL_SCRIPT} ${WRKDIR}/rplayd ${PREFIX}/etc/rc.d/rplayd - .include "../../audio/gsm/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" .include "../../devel/rx/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 52e1a0316d9..bfe37b977a0 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/09/18 21:15:07 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2002/09/19 09:04:04 jlam Exp $ DISTNAME= silc-server-0.9.5 CATEGORIES= chat security @@ -39,12 +39,14 @@ CONF_FILES+= ${PREFIX}/share/examples/silcd/silcalgs.conf.default \ CONF_FILES_PERMS+= ${PREFIX}/share/examples/silcd/motd.txt.default \ ${PKG_SYSCONFDIR}/motd.txt \ ${ROOT_USER} ${ROOT_GROUP} 0644 -SUPPORT_FILES_PERMS+= ${PREFIX}/share/examples/silcd/silcd.default \ - ${PREFIX}/etc/rc.d/silcd \ - ${ROOT_USER} ${ROOT_GROUP} 0555 RCD_SCRIPTS= silcd -RCD_SCRIPTS_MODE= 0555 + +.if ${OPSYS} == "NetBSD" +RCD_SCRIPT_SRC.silcd= ${FILESDIR}/silcd.sh +.else +RCD_SCRIPT_SRC.silcd= ${FILESDIR}/silcd.generic +.endif OWN_DIRS_PERMS+= /var/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700 @@ -69,13 +71,6 @@ CONFIGURE_ARGS+= --disable-asm .endif post-install: -.if (${OPSYS} == "NetBSD") - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.sh \ - > ${PREFIX}/share/examples/silcd/silcd.default -.else - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.generic \ - > ${PREFIX}/share/examples/silcd/silcd.default -.endif @${SED} ${FILES_SUBST_SED} ${FILESDIR}/motd.txt \ > ${PREFIX}/share/examples/silcd/motd.txt.default diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile index fa45795787a..9540f4be03f 100644 --- a/comms/conserver/Makefile +++ b/comms/conserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/09 20:37:53 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/19 09:04:05 jlam Exp $ # FreeBSD Id: ports/comms/conserver-com/Makefile,v 1.1 2001/12/09 14:40:12 kur iyama Exp DISTNAME= conserver-7.2.1 @@ -28,18 +28,8 @@ CONF_FILES+= ${EGDIR}/conserver.passwd.example ${PKG_SYSCONFDIR}/conserver.passw OWN_DIRS= /var/consoles pre-install: - @for script in ${RCD_SCRIPTS}; do \ - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh \ - > ${WRKDIR}/$${script}; \ - done ${INSTALL_DATA_DIR} ${EGDIR} -post-install: - for script in ${RCD_SCRIPTS}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ - ${PREFIX}/etc/rc.d/$${script}; \ - done - .include "../../security/tcp_wrappers/buildlink.mk" .include "../../mk/bsd.pkg.install.mk" diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index 53b6a683ea2..20a326b62ad 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2002/09/13 06:53:32 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2002/09/19 09:04:06 jlam Exp $ # DISTNAME= hylafax-4.1 @@ -31,15 +31,9 @@ MANCOMPRESSED= yes SUID_EXES= ${PREFIX}/libexec/faxgetty ${PREFIX}/sbin/faxq \ ${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter -post-build: - ${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \ - -e 's#@PREFIX@#${PREFIX}#g' \ - <${FILESDIR}/hylafax.sh >${WRKDIR}/hylafax.sh; \ - post-install: ${CHOWN} ${FAXUSER} ${SUID_EXES} ${CHMOD} 4555 ${SUID_EXES} - ${INSTALL_SCRIPT} ${WRKDIR}/hylafax.sh ${PREFIX}/etc/rc.d/hylafax .include "../../mk/ghostscript.mk" .include "../../mk/bsd.pkg.install.mk" diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 0eba60899c4..a180a5931b9 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2002/08/25 18:38:23 jlam Exp $ +# $NetBSD: Makefile,v 1.47 2002/09/19 09:04:07 jlam Exp $ DISTNAME= openldap-2.0.25 SVR4_PKGNAME= oldap @@ -81,17 +81,7 @@ SUPPORT_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} .endfor RCD_SCRIPTS= slapd -post-build: - @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} ${EGDIR}/schema for file in ${CNFS} ${CNFS_PERMS} ${SUPPS}; do \ if [ ! -e ${PKG_SYSCONFDIR}/$${file}.default ]; then \ diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index e05e183ca81..27d987e0849 100644 --- a/databases/postgresql-server/Makefile +++ b/databases/postgresql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/09/18 21:15:09 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2002/09/19 09:04:08 jlam Exp $ PKGNAME= postgresql-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -63,7 +63,6 @@ pre-install: ${FALSE}; \ ;; \ esac - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/pgsql.sh > ${WRKDIR}/pgsql.sh do-install: .for DIR in ${DIRS_TO_BUILD} @@ -74,7 +73,6 @@ do-install: post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|^#.*||" ${FILESDIR}/man.server` - ${INSTALL_SCRIPT} ${WRKDIR}/pgsql.sh ${PREFIX}/etc/rc.d/pgsql .include "../../databases/postgresql-lib/buildlink2.mk" .include "../../mk/bsd.pkg.install.mk" diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile index 8bfdff24866..90d65fdc573 100644 --- a/devel/p4d/Makefile +++ b/devel/p4d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/09/01 05:00:27 schmonz Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/19 09:04:09 jlam Exp $ # DISTNAME= p4d @@ -29,8 +29,6 @@ P4JOURNAL?= journal do-install: ${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${PREFIX}/sbin - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/p4d.sh > ${WRKDIR}/p4d - ${INSTALL_SCRIPT} ${WRKDIR}/p4d ${RCD_SCRIPTS_EXAMPLEDIR} .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile index 428cc8d8bb9..83e2ebc0767 100644 --- a/mail/courier-auth/Makefile +++ b/mail/courier-auth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/09/18 21:15:10 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/09/19 09:04:10 jlam Exp $ PKGNAME= courier-auth-${BASE_VERS} PKGREVISION?= 1 @@ -37,12 +37,6 @@ do-install: .endfor 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 ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL} for file in authdaemonrc.dist; do \ diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 3c92c35d555..6307d2883c4 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/09/18 21:15:10 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/09/19 09:04:11 jlam Exp $ DISTNAME= courier-imap-1.4.2 PKGREVISION= 1 @@ -60,12 +60,6 @@ pre-configure: done 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 ${INSTALL_DATA_DIR} ${EGDIR} ${DOCDIR} ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL} ${INSTALL_DATA} ${WRKSRC}/imap/BUGS \ diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 205ee09befb..7d2b2755bd0 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2002/09/18 21:15:11 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2002/09/19 09:04:11 jlam Exp $ DISTNAME= cyrus-imapd-2.0.16 PKGREVISION= 1 @@ -98,17 +98,7 @@ post-patch: ${MV} -f $${file}.fixed $${file}; \ done -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_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR} diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 5fc1abafdc2..3865574aa46 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2002/09/18 21:15:12 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2002/09/19 09:04:12 jlam Exp $ # DISTNAME= qmail-1.03 @@ -43,8 +43,6 @@ do-configure: ${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail pre-install: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/qmail.sh \ - > ${WRKDIR}/qmail @${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf \ > ${WRKDIR}/mailer.conf.qmail @@ -52,9 +50,6 @@ post-install: ${INSTALL_DATA_DIR} ${QMAILDIR}/etc ${INSTALL_DATA} ${WRKDIR}/mailer.conf.qmail ${QMAILDIR}/etc - ${INSTALL_SCRIPT_DIR} ${RCD_SCRIPTS_EXAMPLEDIR} - ${INSTALL_SCRIPT} ${WRKDIR}/qmail ${RCD_SCRIPTS_EXAMPLEDIR} - ${INSTALL_DATA_DIR} ${QMAILDIR}/alias cd ${QMAILDIR}/alias && \ ${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 0fe94296caa..1ff5093fdb8 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2002/09/08 23:30:38 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2002/09/19 09:04:13 jlam Exp $ DISTNAME= Mail-SpamAssassin-2.31 PKGNAME= spamassassin-2.31 @@ -33,8 +33,6 @@ do-configure: @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL post-install: - ${SED} -e 's:@PREFIX@:${PREFIX}:' ${FILESDIR}/spamd.sh \ - > ${PREFIX}/etc/rc.d/spamd .for d in spamassassin spamassassin/sql spamassassin/spamd ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/$d .endfor diff --git a/net/chrony/Makefile b/net/chrony/Makefile index 78b26ab1969..ff52565ffa0 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/09/19 08:41:50 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/19 09:04:14 jlam Exp $ DISTNAME= chrony-1.17 CATEGORIES= net @@ -9,15 +9,13 @@ HOMEPAGE= http://go.to/chrony COMMENT= Daemon for maintaining the accuracy of computer clocks HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --prefix=${LOCALBASE} +CONFIGURE_ARGS+= --prefix=${PREFIX} EGDIR= ${LOCALBASE}/share/examples/chrony EGFILES= chrony.conf.example chrony.keys.example RCD_SCRIPTS= chronyd pre-install: - ${SED} ${FILES_SUBST_SED} \ - ${FILESDIR}/chronyd.sh > ${WRKDIR}/chronyd for file in ${EGFILES}; do \ ${SED} ${FILES_SUBST_SED} \ ${WRKSRC}/examples/$${file} > \ @@ -25,10 +23,6 @@ pre-install: done post-install: - for script in ${RCD_SCRIPTS}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ - ${LOCALBASE}/etc/rc.d/$${script}; \ - done ${INSTALL_DATA_DIR} ${EGDIR} for file in ${EGFILES}; do \ ${INSTALL_DATA} ${WRKDIR}/$${file} \ diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile index 22d9aa4fbbd..7a77235170c 100644 --- a/net/ddclient/Makefile +++ b/net/ddclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2002/09/18 21:15:14 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2002/09/19 09:04:15 jlam Exp $ DISTNAME= ddclient-3.6.2 CATEGORIES= net @@ -30,17 +30,7 @@ do-configure: do-build: # empty -pre-install: - @for script in ${RCD_SCRIPTS}; do \ - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh \ - > ${WRKDIR}/$${script}; \ - done - do-install: - for script in ${RCD_SCRIPTS}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ - ${PREFIX}/etc/rc.d/$${script}; \ - done ${INSTALL_SCRIPT} ${WRKSRC}/ddclient ${PREFIX}/sbin ${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR} diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index 7896d47d95b..96281b49819 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/09/18 21:15:14 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/09/19 09:04:16 jlam Exp $ DISTNAME= samba-${SAMBA_BASE_VERSION}-ja-${SAMBA_JA_VERSION} PKGNAME= ja-samba-${SAMBA_BASE_VERSION}.${SAMBA_JA_VERSION} @@ -124,12 +124,6 @@ post-extract: ${RM} -r ${WRKDIR}/${DISTNAME}/examples/smbchartool ${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup -pre-install: - @for script in ${RCD_SCRIPTS}; do \ - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh \ - > ${WRKDIR}/$${script}; \ - done - post-install: # Install Samba documentation. ${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR} @@ -144,10 +138,6 @@ post-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} ${CHMOD} -R ugo-w ${EXAMPLESDIR} - for script in ${RCD_SCRIPTS}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ - ${PREFIX}/etc/rc.d/$${script}; \ - done ${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd \ ${EXAMPLESDIR}/misc ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ diff --git a/net/openslp/Makefile b/net/openslp/Makefile index 02c1c16203c..cbc718229bc 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/09/16 21:00:56 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/19 09:04:16 jlam Exp $ DISTNAME= openslp-1.0.9a CATEGORIES= net @@ -30,17 +30,7 @@ RCD_SCRIPTS= slpd post-extract: ${FIND} ${WRKSRC} -name "CVS" -print | ${XARGS} ${RM} -rf -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} ${DOCDIR} ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA_DIR} ${HTMLDIR} diff --git a/net/samba/Makefile b/net/samba/Makefile index 5c721c2d3fd..43bf4d908e2 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2002/09/18 21:15:15 jlam Exp $ +# $NetBSD: Makefile,v 1.89 2002/09/19 09:04:17 jlam Exp $ .include "Makefile.common" @@ -65,12 +65,6 @@ post-extract: ${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient ${RM} -r ${WRKDIR}/${DISTNAME}/examples/svr4-startup -pre-install: - @for script in ${RCD_SCRIPTS}; do \ - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh \ - > ${WRKDIR}/$${script}; \ - done - post-install: # Install Samba documentation. ${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR} @@ -85,10 +79,6 @@ post-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} ${CHMOD} -R ugo-w ${EXAMPLESDIR} - for script in ${RCD_SCRIPTS}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ - ${PREFIX}/etc/rc.d/$${script}; \ - done ${INSTALL_SCRIPT} ${WRKSRC}/script/convert_smbpasswd \ ${EXAMPLESDIR}/misc ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ diff --git a/net/samba20/Makefile b/net/samba20/Makefile index 70987a6af4f..9a3b05e9a2a 100644 --- a/net/samba20/Makefile +++ b/net/samba20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/09/18 21:15:16 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/09/19 09:04:18 jlam Exp $ DISTNAME= samba-2.0.10 WRKSRC= ${WRKDIR}/${DISTNAME}/source @@ -66,12 +66,6 @@ RCD_SCRIPTS= samba nmbd smbd MAKE_DIRS= ${SAMBA_LOCKDIR} OWN_DIRS= ${SAMBA_ETCDIR} ${SAMBA_PRIVATE} -pre-install: - for script in ${RCD_SCRIPTS}; do \ - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh \ - > ${WRKDIR}/$${script}; \ - done - post-install: # Install Samba documentation. ${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR} @@ -85,10 +79,6 @@ post-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} ${CHMOD} -R ugo-w ${EXAMPLESDIR} - for script in ${RCD_SCRIPTS}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${script} \ - ${PREFIX}/etc/rc.d/$${script}; \ - done ${MV} ${PREFIX}/bin/convert_smbpasswd ${PREFIX}/sbin/convert_smbpasswd ${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \ ${PREFIX}/sbin/mksmbpasswd diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile index 5108aef87f3..1981eb247fd 100644 --- a/net/speedtouch/Makefile +++ b/net/speedtouch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/07/18 00:10:07 abs Exp $ +# $NetBSD: Makefile,v 1.4 2002/09/19 09:04:19 jlam Exp $ # DISTNAME= speedtouch-1.1 @@ -17,12 +17,8 @@ GNU_CONFIGURE= yes RCD_SCRIPTS= adsl -pre-install: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/adsl.sh > ${WRKDIR}/adsl.sh - post-install: ${INSTALL_DATA} ${WRKDIR}/mgmt/mgmt.o ${PREFIX}/libdata/alcaudsl.sys - ${INSTALL_SCRIPT} ${WRKDIR}/adsl.sh ${PREFIX}/etc/rc.d/adsl .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/Makefile b/print/cups/Makefile index 33469d93781..9c709287e66 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2002/09/18 22:58:46 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2002/09/19 09:04:20 jlam Exp $ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} @@ -90,10 +90,8 @@ OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${CUPS_USER} ${CUPS_GROUP} 1700 pre-install: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/cupsd.sh > ${WRKDIR}/cupsd.sh post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/cupsd.sh ${PREFIX}/etc/rc.d/cupsd ${INSTALL_DATA_DIR} ${DOCDIR} for file in ENCRYPTION.txt LICENSE.txt README.txt; do \ ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}/$${file}; \ 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" diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 6b092b46284..c6329512f8f 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/08/25 21:51:04 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2002/09/19 09:04:27 jlam Exp $ # DISTNAME= nut-0.50.0 @@ -63,16 +63,8 @@ pre-configure: pre-install: @${INSTALL_DATA_DIR} ${NUT_EGDIR} - @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} ${NUT_DOCDIR} ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers ${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR} diff --git a/www/apache/Makefile b/www/apache/Makefile index 82ef0c96559..bbb54ea8236 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2002/08/25 18:40:16 jlam Exp $ +# $NetBSD: Makefile,v 1.105 2002/09/19 09:04:28 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -172,7 +172,6 @@ pre-configure: pre-install: ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh post-install: .if !defined(NOPIC) @@ -185,7 +184,6 @@ post-install: ${RM} -f ${PKG_SYSCONFDIR}/$${file}.default; \ done ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs - ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache .include "../../devel/libmm/buildlink2.mk" .include "../../textproc/expat/buildlink2.mk" diff --git a/www/apache2/Makefile b/www/apache2/Makefile index a702a7f87d8..a83883a023d 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/08/29 14:12:27 martti Exp $ +# $NetBSD: Makefile,v 1.13 2002/09/19 09:04:29 jlam Exp $ DISTNAME= httpd-${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} @@ -115,9 +115,6 @@ CONFIGURE_ARGS+= ${_AP_CFG_ARGS.${_ap_mod}} . endif .endfor -post-build: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh - AP_CONF_FILE_SED= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g" AP_CONF_FILE_SED+= -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g" AP_CONF_FILE_SED+= -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g" @@ -152,7 +149,6 @@ post-install: ' >> $${file}.new; \ ${MV} -f $${file}.new $${file}; \ done - ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache .include "../../lang/perl5/buildlink2.mk" .include "../../textproc/expat/buildlink2.mk" diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 40687be9ab9..210dde42760 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2002/08/25 21:51:58 jlam Exp $ +# $NetBSD: Makefile,v 1.57 2002/09/19 09:04:30 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -154,7 +154,6 @@ pre-configure: pre-install: ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd @@ -164,7 +163,6 @@ post-install: ${RM} -f ${PKG_SYSCONFDIR}/$${file}.default; \ done ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs - ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache .include "../../textproc/expat/buildlink2.mk" diff --git a/www/squid/Makefile b/www/squid/Makefile index 2ff5ced077a..6c9c20053dd 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2002/09/15 14:39:51 grant Exp $ +# $NetBSD: Makefile,v 1.68 2002/09/19 09:04:32 jlam Exp $ DISTNAME= squid-2.4.STABLE7-src PKGNAME= squid-2.4.7 @@ -48,9 +48,6 @@ SQUID_CONFIGURE_ARGS?= --disable-internal-dns \ OPTIONAL_FILES= libexec/diskd libexec/dnsserver libexec/pinger libexec/unlinkd -post-build: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/squid.sh > ${WRKDIR}/squid - pre-install: @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/squid @${INSTALL_DATA_DIR} ${PREFIX}/share/squid @@ -59,7 +56,6 @@ pre-install: post-install: cd ${WRKSRC}/src; ${TEST} ! -x pinger || ${MAKE} install-pinger - ${INSTALL_SCRIPT} ${WRKDIR}/squid ${RCD_SCRIPTS_EXAMPLEDIR}/squid @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} @( \ for FILE in ${OPTIONAL_FILES}; do \ diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 6a2d64ab9d4..f8b77252dd7 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/06/16 19:12:13 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2002/09/19 09:04:34 jlam Exp $ DISTNAME= thttpd-2.23beta1 PKGNAME= thttpd-2.23.0.1 @@ -31,7 +31,7 @@ pre-configure: done post-build: - for FILE in thttpd.conf thttpd.sh; do \ + for FILE in thttpd.conf; do \ ${SED} ${FILES_SUBST_SED} \ ${FILESDIR}/$${FILE} > ${WRKDIR}/$${FILE}; \ done @@ -41,7 +41,6 @@ pre-install: post-install: ${INSTALL_DATA} ${WRKDIR}/thttpd.conf ${PREFIX}/share/examples - ${INSTALL_SCRIPT} ${WRKDIR}/thttpd.sh ${PREFIX}/etc/rc.d/thttpd ${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/thttpd ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/thttpd |