Move SASL conditionals to options.mk.

NetBSD · Jan 25, 2008 · 5054753 · 5054753
1 parent 2be2f86
commit 5054753
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
@@ -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=	# 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-current/options.mk b/mail/postfix-current/options.mk
@@ -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 @@ 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\"

diff --git 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
@@ -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\"