summaryrefslogtreecommitdiff
path: root/mail/postfix-current
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2008-04-12 22:42:57 +0000
committerjlam <jlam@pkgsrc.org>2008-04-12 22:42:57 +0000
commit841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch)
treefdd67c81079412bf94013749a954125434a9baca /mail/postfix-current
parent6874584eae20f517f70816571f6d4ac696db16b3 (diff)
downloadpkgsrc-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-current')
-rw-r--r--mail/postfix-current/PLIST4
-rw-r--r--mail/postfix-current/options.mk6
2 files changed, 5 insertions, 5 deletions
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index a5b6051ca7c..ffd1b3be8eb 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2008/02/18 17:46:22 ghen Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:04 jlam Exp $
bin/mailq
bin/newaliases
libexec/postfix/anvil
@@ -167,7 +167,7 @@ share/examples/postfix/master.cf
share/examples/postfix/post-install
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-current/options.mk b/mail/postfix-current/options.mk
index fa2e7e0f01f..33190db67d1 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2008/02/04 13:07:54 ghen Exp $
+# $NetBSD: options.mk,v 1.22 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