diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /mail/postfix | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'mail/postfix')
| -rw-r--r-- | mail/postfix/PLIST | 4 | ||||
| -rw-r--r-- | mail/postfix/options.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST index 56bb5a406bc..5dcfaa313dc 100644 --- a/mail/postfix/PLIST +++ b/mail/postfix/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2008/02/18 17:45:34 ghen Exp $ +@comment $NetBSD: PLIST,v 1.20 2008/04/12 22:43:04 jlam Exp $ bin/mailq bin/newaliases libexec/postfix/anvil @@ -165,7 +165,7 @@ share/examples/postfix/post-install share/examples/postfix/postfix-files share/examples/postfix/postfix-script share/examples/postfix/relocated -${SASL}share/examples/postfix/smtpd.conf +${PLIST.csasl}share/examples/postfix/smtpd.conf share/examples/postfix/transport share/examples/postfix/virtual share/examples/rc.d/postfix diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk index 34a0f4bc7e6..367f82c080e 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.30 2008/02/18 17:45:34 ghen Exp $ +# $NetBSD: options.mk,v 1.31 2008/04/12 22:43:04 jlam Exp $ # Global and legacy options @@ -86,6 +86,7 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ ### Cyrus SASL support for SMTP authentication. ### (Dovecot SASL support is built in by default.) ### +PLIST_VARS+= csasl .if !empty(PKG_OPTIONS:Msasl) . include "../../security/cyrus-sasl/buildlink3.mk" BUILDLINK_INCDIRS.cyrus-sasl= include/sasl @@ -95,13 +96,12 @@ CCARGS+= -DUSE_CYRUS_SASL AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ -lsasl2 -PLIST_SUBST+= SASL= +PLIST.csasl= yes MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} MAKE_DIRS+= ${SASLLIBDIR} CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf .else -PLIST_SUBST+= SASL="@comment " CCARGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\" .endif |