[pkgsrc/trunk]: pkgsrc/mail Move SASL conditionals to options.mk.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e9b5b3a5e214
branches:  trunk
changeset: 538031:e9b5b3a5e214
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Fri Jan 25 09:42:54 2008 +0000

description:
Move SASL conditionals to options.mk.

diffstat:

 mail/postfix-current/Makefile   |  6 +-----
 mail/postfix-current/options.mk |  4 +++-
 mail/postfix/Makefile           |  6 +-----
 mail/postfix/options.mk         |  4 +++-
 4 files changed, 8 insertions(+), 12 deletions(-)

diffs (76 lines):

diff -r a4d358859c67 -r e9b5b3a5e214 mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Fri Jan 25 09:41:28 2008 +0000
+++ b/mail/postfix-current/Makefile     Fri Jan 25 09:42:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2008/01/25 09:41:28 ghen Exp $
+# $NetBSD: Makefile,v 1.93 2008/01/25 09:42:54 ghen Exp $
 
 DISTNAME=      postfix-2.5.0
 CATEGORIES=    mail
@@ -116,10 +116,6 @@
 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 -r a4d358859c67 -r e9b5b3a5e214 mail/postfix-current/options.mk
--- a/mail/postfix-current/options.mk   Fri Jan 25 09:41:28 2008 +0000
+++ b/mail/postfix-current/options.mk   Fri Jan 25 09:42:54 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2008/01/17 13:56:37 martti Exp $
+# $NetBSD: options.mk,v 1.19 2008/01/25 09:42:54 ghen Exp $
 
 # Global and legacy options
 
@@ -99,6 +99,8 @@
 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\"
diff -r a4d358859c67 -r e9b5b3a5e214 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Fri Jan 25 09:41:28 2008 +0000
+++ b/mail/postfix/Makefile     Fri Jan 25 09:42:54 2008 +0000
@@ -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+=     ${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 -r a4d358859c67 -r e9b5b3a5e214 mail/postfix/options.mk
--- a/mail/postfix/options.mk   Fri Jan 25 09:41:28 2008 +0000
+++ b/mail/postfix/options.mk   Fri Jan 25 09:42:54 2008 +0000
@@ -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 @@
 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\"