[pkgsrc/trunk]: pkgsrc/mail Split SUBST_SED.postfix

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/acb30bbef2da
branches:  trunk
changeset: 520157:acb30bbef2da
user:      martti <martti%pkgsrc.org@localhost>
date:      Mon Oct 16 10:58:24 2006 +0000

description:
Split SUBST_SED.postfix

diffstat:

 mail/postfix-current/Makefile |  32 +++++++++++++++++++++-----------
 mail/postfix/Makefile         |  32 +++++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 22 deletions(-)

diffs (92 lines):

diff -r d13e4a58d857 -r acb30bbef2da mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Mon Oct 16 10:55:50 2006 +0000
+++ b/mail/postfix-current/Makefile     Mon Oct 16 10:58:24 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2006/10/16 10:43:33 martti Exp $
+# $NetBSD: Makefile,v 1.71 2006/10/16 10:58:24 martti Exp $
 
 DISTNAME=      postfix-2.4-20061015
 #PKGREVISION=  1
@@ -51,16 +51,26 @@
 SUBST_STAGE.postfix=   post-configure
 SUBST_FILES.postfix=   conf/main.cf src/global/mail_params.h
 SUBST_SED.postfix=     \
-       -e "s|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|"      \
-       -e "s|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|"          \
-       -e "s|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|"            \
-       -e "s|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|"     \
-       -e "s|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|"  \
-       -e "s|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|"            \
-       -e "s|^\(setgid_group\) =.*|\1 = maildrop|"                     \
-       -e "s|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|"           \
-       -e "s|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|"            \
-       -e "s|^\(readme_directory\) =.*|\1 = ${DOCDIR}|"                \
+       -e "s|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(setgid_group\) =.*|\1 = maildrop|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(readme_directory\) =.*|\1 = ${DOCDIR}|"
+SUBST_SED.postfix+=    \
        -e "/^\#define DEF_SGID_GROUP[  ]/s,postdrop,maildrop,g"
 
 # options.mk appends to CCARGS and AUXLIBS the options needed to build
diff -r d13e4a58d857 -r acb30bbef2da mail/postfix/Makefile
--- a/mail/postfix/Makefile     Mon Oct 16 10:55:50 2006 +0000
+++ b/mail/postfix/Makefile     Mon Oct 16 10:58:24 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.190 2006/10/16 10:43:32 martti Exp $
+# $NetBSD: Makefile,v 1.191 2006/10/16 10:58:24 martti Exp $
 
 DISTNAME=      postfix-2.3.3
 #PKGREVISION=  1
@@ -51,16 +51,26 @@
 SUBST_STAGE.postfix=   post-configure
 SUBST_FILES.postfix=   conf/main.cf src/global/mail_params.h
 SUBST_SED.postfix=     \
-       -e "s|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|"      \
-       -e "s|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|"          \
-       -e "s|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|"            \
-       -e "s|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|"     \
-       -e "s|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|"  \
-       -e "s|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|"            \
-       -e "s|^\(setgid_group\) =.*|\1 = maildrop|"                     \
-       -e "s|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|"           \
-       -e "s|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|"            \
-       -e "s|^\(readme_directory\) =.*|\1 = ${DOCDIR}|"                \
+       -e "s|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(setgid_group\) =.*|\1 = maildrop|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|"
+SUBST_SED.postfix+=    \
+       -e "s|^\(readme_directory\) =.*|\1 = ${DOCDIR}|"
+SUBST_SED.postfix+=    \
        -e "/^\#define DEF_SGID_GROUP[  ]/s,postdrop,maildrop,g"
 
 # options.mk appends to CCARGS and AUXLIBS the options needed to build