Fri Jan 25 09:44:24 2008 UTC ()
Move SASL conditionals to options.mk.


(ghen)
diff -r1.213 -r1.214 pkgsrc/mail/postfix/Makefile
diff -r1.28 -r1.29 pkgsrc/mail/postfix/options.mk
cvs diff -r1.213 -r1.214 pkgsrc/mail/postfix/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/postfix/Makefile 2008/01/18 05:08:29 1.213
+++ pkgsrc/mail/postfix/Makefile 2008/01/25 09:44:24 1.214
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.213 2008/01/18 05:08:29 tnn Exp $ 1# $NetBSD: Makefile,v 1.214 2008/01/25 09:44:24 ghen Exp $
2 2
3DISTNAME= postfix-2.4.6 3DISTNAME= postfix-2.4.6
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ 6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
7DIST_SUBDIR= postfix 7DIST_SUBDIR= postfix
8 8
9MAINTAINER= martti@NetBSD.org 9MAINTAINER= martti@NetBSD.org
10HOMEPAGE= http://www.postfix.org/ 10HOMEPAGE= http://www.postfix.org/
11COMMENT= Postfix SMTP server and tools 11COMMENT= Postfix SMTP server and tools
12#LICENSE= postfix-license 12#LICENSE= postfix-license
13 13
14CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* 14CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
@@ -107,30 +107,26 @@ PKG_GROUPS?= postfix maildrop @@ -107,30 +107,26 @@ PKG_GROUPS?= postfix maildrop
107PKG_USERS?= postfix:postfix 107PKG_USERS?= postfix:postfix
108PKG_GECOS.postfix= Postfix User 108PKG_GECOS.postfix= Postfix User
109PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR} 109PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR}
110 110
111CONF_FILES= # empty 111CONF_FILES= # empty
112.for i in main.cf master.cf postfix-files 112.for i in main.cf master.cf postfix-files
113CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} 113CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
114.endfor 114.endfor
115CONF_FILES_PERMS= # empty 115CONF_FILES_PERMS= # empty
116.for i in post-install postfix-script 116.for i in post-install postfix-script
117CONF_FILES_PERMS+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \ 117CONF_FILES_PERMS+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \
118 ${ROOT_USER} ${ROOT_GROUP} 755 118 ${ROOT_USER} ${ROOT_GROUP} 755
119.endfor 119.endfor
120.if !empty(PKG_OPTIONS:Msasl) 
121MAKE_DIRS+= ${SASLLIBDIR} 
122CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf 
123.endif 
124 120
125MAKE_ENV+= DEBUG= # empty 121MAKE_ENV+= DEBUG= # empty
126 122
127SUBST_CLASSES+= paths 123SUBST_CLASSES+= paths
128SUBST_FILES.paths= ${WRKDIR}/mailer.conf 124SUBST_FILES.paths= ${WRKDIR}/mailer.conf
129SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 125SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
130SUBST_STAGE.paths= post-patch 126SUBST_STAGE.paths= post-patch
131 127
132post-extract: 128post-extract:
133 cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf 129 cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
134 rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix 130 rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
135 131
136do-configure: 132do-configure:
cvs diff -r1.28 -r1.29 pkgsrc/mail/postfix/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/postfix/options.mk 2008/01/17 13:47:01 1.28
+++ pkgsrc/mail/postfix/options.mk 2008/01/25 09:44:24 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.28 2008/01/17 13:47:01 martti Exp $ 1# $NetBSD: options.mk,v 1.29 2008/01/25 09:44:24 ghen Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.postfix 5PKG_OPTIONS_VAR= PKG_OPTIONS.postfix
6PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls postfix-stress 6PKG_SUPPORTED_OPTIONS= bdb ldap mysql mysql4 pcre pgsql sasl tls postfix-stress
7PKG_SUGGESTED_OPTIONS= tls 7PKG_SUGGESTED_OPTIONS= tls
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Support "hash" (Berkeley DB) map type. 12### Support "hash" (Berkeley DB) map type.
13### 13###
14.if empty(PKG_OPTIONS:Mbdb) 14.if empty(PKG_OPTIONS:Mbdb)
@@ -89,26 +89,28 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ @@ -89,26 +89,28 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \
89.if !empty(PKG_OPTIONS:Msasl) 89.if !empty(PKG_OPTIONS:Msasl)
90. include "../../security/cyrus-sasl/buildlink3.mk" 90. include "../../security/cyrus-sasl/buildlink3.mk"
91BUILDLINK_INCDIRS.cyrus-sasl= include/sasl 91BUILDLINK_INCDIRS.cyrus-sasl= include/sasl
92SASLLIBDIR= ${PREFIX}/lib/sasl2 92SASLLIBDIR= ${PREFIX}/lib/sasl2
93PWCHECK_METHOD= auxprop 93PWCHECK_METHOD= auxprop
94CCARGS+= -DUSE_CYRUS_SASL 94CCARGS+= -DUSE_CYRUS_SASL
95AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ 95AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \
96 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ 96 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
97 -lsasl2 97 -lsasl2
98PLIST_SUBST+= SASL= 98PLIST_SUBST+= SASL=
99MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl 99MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl
100MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 100MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
101MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} 101MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR}
 102MAKE_DIRS+= ${SASLLIBDIR}
 103CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
102.else 104.else
103PLIST_SUBST+= SASL="@comment " 105PLIST_SUBST+= SASL="@comment "
104CCARGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\" 106CCARGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\"
105.endif 107.endif
106 108
107### 109###
108### Postfix stress-adaptive behaviour, back-ported from Postfix 2.5 110### Postfix stress-adaptive behaviour, back-ported from Postfix 2.5
109### See http://www.postfix.org/STRESS_README.html#adapt 111### See http://www.postfix.org/STRESS_README.html#adapt
110### 112###
111.if !empty(PKG_OPTIONS:Mpostfix-stress) 113.if !empty(PKG_OPTIONS:Mpostfix-stress)
112PATCHFILES= postfix-2.4-stress-patch.gz 114PATCHFILES= postfix-2.4-stress-patch.gz
113PATCH_SITES= ${MASTER_SITES} 115PATCH_SITES= ${MASTER_SITES}
114.endif 116.endif