Fri Apr 17 02:22:52 2015 UTC ()
Move Berkeley DB compilation definition from options.mk to Makefile
and remove "bdb" option.

Because Berkeley DB is always mandatory, it does not make sense to
force users to enable "bdb" option to use Berkeley DB.


(hiramatsu)
diff -r1.280 -r1.281 pkgsrc/mail/postfix/Makefile
diff -r1.37 -r1.38 pkgsrc/mail/postfix/options.mk
cvs diff -r1.280 -r1.281 pkgsrc/mail/postfix/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/postfix/Makefile 2015/04/06 08:17:31 1.280
+++ pkgsrc/mail/postfix/Makefile 2015/04/17 02:22:52 1.281
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.280 2015/04/06 08:17:31 adam Exp $ 1# $NetBSD: Makefile,v 1.281 2015/04/17 02:22:52 hiramatsu Exp $
2 2
3DISTNAME= postfix-2.11.4 3DISTNAME= postfix-2.11.4
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ 6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
7MASTER_SITES+= http://postfix.it-austria.net/releases/official/ 7MASTER_SITES+= http://postfix.it-austria.net/releases/official/
8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/official/ 8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/official/
9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/official/ 9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/official/
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.postfix.org/ 12HOMEPAGE= http://www.postfix.org/
13COMMENT= Postfix SMTP server and tools 13COMMENT= Postfix SMTP server and tools
14# The postfix license has only very minor diffs from cpl-1.0. 14# The postfix license has only very minor diffs from cpl-1.0.
@@ -26,30 +26,35 @@ CHECK_HEADERS_SKIP+= src/global/mail_par @@ -26,30 +26,35 @@ CHECK_HEADERS_SKIP+= src/global/mail_par
26SPECIAL_PERMS+= sbin/postdrop postfix maildrop 2555 26SPECIAL_PERMS+= sbin/postdrop postfix maildrop 2555
27SPECIAL_PERMS+= sbin/postqueue postfix maildrop 2555 27SPECIAL_PERMS+= sbin/postqueue postfix maildrop 2555
28 28
29# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is 29# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is
30# merely a default, and may be changed by setting "queue_directory" in 30# merely a default, and may be changed by setting "queue_directory" in
31# ${PKG_SYSCONFDIR}/main.cf. 31# ${PKG_SYSCONFDIR}/main.cf.
32# 32#
33POSTFIX_DATA_DIR?= ${VARBASE}/db/postfix 33POSTFIX_DATA_DIR?= ${VARBASE}/db/postfix
34POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix 34POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix
35BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR 35BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR
36 36
37# CCARGS is a list of options to pass to the preprocessor/compiler. 37# CCARGS is a list of options to pass to the preprocessor/compiler.
38# AUXLIBS is a list of options to pass to the linker. 38# AUXLIBS is a list of options to pass to the linker.
39# 39CCARGS= #defined
40CCARGS= -DUSE_SASL_AUTH 
41AUXLIBS= ${LDFLAGS} 40AUXLIBS= ${LDFLAGS}
42 41
 42# Enable Dovecot SASL
 43CCARGS+= -DUSE_SASL_AUTH
 44# Enable Berkeley DB map type. BDB_LIBS is defined in mk/bdb.buildlink3.mk.
 45CCARGS+= -DHAS_DB
 46AUXLIBS+= ${BDB_LIBS}
 47
43# Set some default paths to override ${WRKSRC}/src/global/mail_params.h. 48# Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
44CCARGS+= -DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\" 49CCARGS+= -DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\"
45CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\" 50CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
46CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\" 51CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
47CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\" 52CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
48CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\" 53CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
49CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\" 54CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
50CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\" 55CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
51CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\" 56CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
52CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\" 57CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\"
53CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\" 58CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
54CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\" 59CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\"
55 60
@@ -165,14 +170,15 @@ do-install: @@ -165,14 +170,15 @@ do-install:
165 rm -f ${WRKSRC}/conf/*.orig 170 rm -f ${WRKSRC}/conf/*.orig
166.if !empty(PKG_OPTIONS:Msasl) 171.if !empty(PKG_OPTIONS:Msasl)
167 ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR} 172 ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR}
168.endif 173.endif
169 cd ${WRKSRC} && sh ./postfix-install -non-interactive \ 174 cd ${WRKSRC} && sh ./postfix-install -non-interactive \
170 ${DESTDIR_INSTALLOPTIONS} config_directory="${EXAMPLEDIR}" 175 ${DESTDIR_INSTALLOPTIONS} config_directory="${EXAMPLEDIR}"
171 ${INSTALL_DATA} ${WRKDIR}/mailer.conf \ 176 ${INSTALL_DATA} ${WRKDIR}/mailer.conf \
172 ${DESTDIR}${EXAMPLEDIR}/mailer.conf 177 ${DESTDIR}${EXAMPLEDIR}/mailer.conf
173 ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \ 178 ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
174 ${DESTDIR}${PREFIX}/sbin/qshape 179 ${DESTDIR}${PREFIX}/sbin/qshape
175 ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \ 180 ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \
176 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 181 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
177 182
 183.include "../../mk/bdb.buildlink3.mk"
178.include "../../mk/bsd.pkg.mk" 184.include "../../mk/bsd.pkg.mk"
cvs diff -r1.37 -r1.38 pkgsrc/mail/postfix/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/postfix/options.mk 2015/04/03 01:15:24 1.37
+++ pkgsrc/mail/postfix/options.mk 2015/04/17 02:22:52 1.38
@@ -1,36 +1,24 @@ @@ -1,36 +1,24 @@
1# $NetBSD: options.mk,v 1.37 2015/04/03 01:15:24 hiramatsu Exp $ 1# $NetBSD: options.mk,v 1.38 2015/04/17 02:22:52 hiramatsu 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 pcre pgsql sasl sqlite tls cdb 6PKG_SUPPORTED_OPTIONS= ldap mysql pcre pgsql sasl sqlite tls cdb
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. 
13### 
14.if empty(PKG_OPTIONS:Mbdb) 
15PKG_OPTIONS+= bdb # "hash" map type is mandatory 
16.endif 
17.if !empty(PKG_OPTIONS:Mbdb) 
18. include "../../mk/bdb.buildlink3.mk" 
19CCARGS+= -DHAS_DB 
20AUXLIBS+= ${BDB_LIBS} 
21.endif 
22 
23### 
24### STARTTLS support 12### STARTTLS support
25### 13###
26.if !empty(PKG_OPTIONS:Mtls) 14.if !empty(PKG_OPTIONS:Mtls)
27. include "../../security/openssl/buildlink3.mk" 15. include "../../security/openssl/buildlink3.mk"
28CCARGS+= -DUSE_TLS 16CCARGS+= -DUSE_TLS
29AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \ 17AUXLIBS+= -L${BUILDLINK_PREFIX.openssl}/lib \
30 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \ 18 ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
31 -lssl -lcrypto 19 -lssl -lcrypto
32.endif 20.endif
33 21
34### 22###
35### Support "pcre" map type for regular expressions. 23### Support "pcre" map type for regular expressions.
36### 24###