[pkgsrc/trunk]: pkgsrc/mail/exim3 Replace another bunch of FILES_SUBST_SED us...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8e3ecdf534d
branches:  trunk
changeset: 506720:e8e3ecdf534d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jan 21 00:22:58 2006 +0000

description:
Replace another bunch of FILES_SUBST_SED uses, don't hardcode
/bin/sh in exim_newaliases.

diffstat:

 mail/exim3/Makefile              |  16 +++++++---------
 mail/exim3/files/exim_newaliases |   4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diffs (60 lines):

diff -r fd4dea88ddde -r e8e3ecdf534d mail/exim3/Makefile
--- a/mail/exim3/Makefile       Fri Jan 20 23:58:49 2006 +0000
+++ b/mail/exim3/Makefile       Sat Jan 21 00:22:58 2006 +0000
@@ -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_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-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 -r fd4dea88ddde -r e8e3ecdf534d mail/exim3/files/exim_newaliases
--- a/mail/exim3/files/exim_newaliases  Fri Jan 20 23:58:49 2006 +0000
+++ b/mail/exim3/files/exim_newaliases  Sat Jan 21 00:22:58 2006 +0000
@@ -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