summaryrefslogtreecommitdiff
path: root/mail/postfix
diff options
context:
space:
mode:
authorghen <ghen@pkgsrc.org>2008-01-25 09:42:54 +0000
committerghen <ghen@pkgsrc.org>2008-01-25 09:42:54 +0000
commit9385d343d3fc69c171d3b18d2b276c4035608267 (patch)
treea36d797a7e66fa6134ff20e61a278ac21a51da0b /mail/postfix
parent8a540a3b6abcbe4e18689620fef311da68a8fd51 (diff)
downloadpkgsrc-9385d343d3fc69c171d3b18d2b276c4035608267.tar.gz
Move SASL conditionals to options.mk.
Diffstat (limited to 'mail/postfix')
-rw-r--r--mail/postfix/Makefile6
-rw-r--r--mail/postfix/options.mk4
2 files changed, 4 insertions, 6 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 4a3b258964b..90b26109f07 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.213 2008/01/18 05:08:29 tnn Exp $
+# $NetBSD: Makefile,v 1.214 2008/01/25 09:44:24 ghen Exp $
DISTNAME= postfix-2.4.6
PKGREVISION= 2
@@ -117,10 +117,6 @@ CONF_FILES_PERMS= # empty
CONF_FILES_PERMS+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \
${ROOT_USER} ${ROOT_GROUP} 755
.endfor
-.if !empty(PKG_OPTIONS:Msasl)
-MAKE_DIRS+= ${SASLLIBDIR}
-CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
-.endif
MAKE_ENV+= DEBUG= # empty
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index d8a518119b2..b219ab92bec 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.28 2008/01/17 13:47:01 martti Exp $
+# $NetBSD: options.mk,v 1.29 2008/01/25 09:44:24 ghen Exp $
# Global and legacy options
@@ -99,6 +99,8 @@ PLIST_SUBST+= SASL=
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\"