diff options
| author | martti <martti> | 2006-10-16 10:58:24 +0000 |
|---|---|---|
| committer | martti <martti> | 2006-10-16 10:58:24 +0000 |
| commit | 43c1f6e488073e0bf6a5f024c8d309a13d12bc1b (patch) | |
| tree | f27d06a379f8a9443ae4fb99a5c15cfbf5b87102 /mail | |
| parent | d94d177aef9d74ea849f1abd60ac0d0acfaed0f0 (diff) | |
| download | pkgsrc-43c1f6e488073e0bf6a5f024c8d309a13d12bc1b.tar.gz | |
Split SUBST_SED.postfix
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/postfix-current/Makefile | 32 | ||||
| -rw-r--r-- | mail/postfix/Makefile | 32 |
2 files changed, 42 insertions, 22 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 5451d3baf9d..78b38f73e31 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -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_CLASSES+= postfix 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 --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 2a3cf3ba044..a4829a92d25 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -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_CLASSES+= postfix 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 |