diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-21 00:22:58 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-21 00:22:58 +0000 |
| commit | 1c6b343c89d7759c570468bf0fee693cbb9d8e5e (patch) | |
| tree | 4c5c7a1e850ca0d3fbb1791eb0e38f96098ab116 /mail | |
| parent | 6f807e3cce9c5b72a7bfcf6e710d9e15b1193aa2 (diff) | |
| download | pkgsrc-1c6b343c89d7759c570468bf0fee693cbb9d8e5e.tar.gz | |
Replace another bunch of FILES_SUBST_SED uses, don't hardcode
/bin/sh in exim_newaliases.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/exim3/Makefile | 16 | ||||
| -rw-r--r-- | mail/exim3/files/exim_newaliases | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile index 258a8d854ad..3c7c2285ba0 100644 --- a/mail/exim3/Makefile +++ b/mail/exim3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/01/20 23:09:42 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2006/01/21 00:22:58 joerg Exp $ DISTNAME= exim-3.36 PKGREVISION= 5 @@ -64,17 +64,21 @@ MAKE_ENV+= LOOKUP_INCLUDE=${LOOKUP_INCLUDE:Q} MAKE_ENV+= LOOKUP_LIBS=${LOOKUP_LIBS:Q} SUBST_CLASSES+= paths -SUBST_FILES.paths= Local/Makefile.pkgsrc +SUBST_FILES.paths= Local/Makefile.pkgsrc ${WRKDIR}/mailer.conf +SUBST_FILES.paths+= ${WRKDIR}/exim_newaliases SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' SUBST_SED.paths+= -e 's,@GZIP_CMD@,${GZIP_CMD},g' SUBST_SED.paths+= -e 's,@GZCAT@,${GZCAT},g' SUBST_SED.paths+= -e 's,@PERL5@,${PERL5},g' +SUBST_SED.paths+= -e 's,@SH@,${SH},g' SUBST_STAGE.paths= post-patch post-extract: ${CP} ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \ ${WRKSRC}/OS/ + ${CP} ${FILESDIR}/mailer.conf.exim ${WRKDIR}/mailer.conf + ${CP} ${FILESDIR}/exim_newaliases ${WRKDIR}/exim_newaliases pre-patch: ${MKDIR} ${WRKSRC}/Local @@ -91,14 +95,8 @@ pre-configure: pre-install: ${INSTALL_DATA_DIR} ${EGDIR} -post-build: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf.exim \ - > ${WRKDIR}/mailer.conf - post-install: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/exim_newaliases \ - > ${PREFIX}/sbin/exim_newaliases - ${CHMOD} ugo+x ${PREFIX}/sbin/exim_newaliases + ${INSTALL_SCRIPT} ${WRKDIR}/exim_newaliases ${PREFIX}/sbin/exim_newaliases ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR} ${CP} ${FILESDIR}/exim.8 ${PREFIX}/man/man8/exim.8 diff --git a/mail/exim3/files/exim_newaliases b/mail/exim3/files/exim_newaliases index ecbfeadda5e..ecbb6176a59 100644 --- a/mail/exim3/files/exim_newaliases +++ b/mail/exim3/files/exim_newaliases @@ -1,6 +1,6 @@ -#!/bin/sh +#!@SH@ # -# $NetBSD: exim_newaliases,v 1.1.1.1 2003/12/04 04:24:51 grant Exp $ +# $NetBSD: exim_newaliases,v 1.2 2006/01/21 00:22:58 joerg Exp $ # if [ -f /etc/mail/aliases ]; then ALIASDIR=/etc/mail |