diff options
| author | hiramatsu <hiramatsu> | 2015-04-17 02:22:52 +0000 |
|---|---|---|
| committer | hiramatsu <hiramatsu> | 2015-04-17 02:22:52 +0000 |
| commit | 85c3c736796979a70db0dbccafdff98c73e1ba0f (patch) | |
| tree | 4c23070289f05ef6a0686df7f70331ccea8ecdef | |
| parent | a9e9fe09c98f2e90b197d3d81c74360f7e6a346e (diff) | |
| download | pkgsrc-85c3c736796979a70db0dbccafdff98c73e1ba0f.tar.gz | |
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.
| -rw-r--r-- | mail/postfix/Makefile | 12 | ||||
| -rw-r--r-- | mail/postfix/options.mk | 16 |
2 files changed, 11 insertions, 17 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 658efe8a0ea..95bfb83fb84 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.280 2015/04/06 08:17:31 adam Exp $ +# $NetBSD: Makefile,v 1.281 2015/04/17 02:22:52 hiramatsu Exp $ DISTNAME= postfix-2.11.4 PKGREVISION= 1 @@ -36,10 +36,15 @@ BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR # CCARGS is a list of options to pass to the preprocessor/compiler. # AUXLIBS is a list of options to pass to the linker. -# -CCARGS= -DUSE_SASL_AUTH +CCARGS= #defined AUXLIBS= ${LDFLAGS} +# Enable Dovecot SASL +CCARGS+= -DUSE_SASL_AUTH +# Enable Berkeley DB map type. BDB_LIBS is defined in mk/bdb.buildlink3.mk. +CCARGS+= -DHAS_DB +AUXLIBS+= ${BDB_LIBS} + # Set some default paths to override ${WRKSRC}/src/global/mail_params.h. CCARGS+= -DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\" CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\" @@ -175,4 +180,5 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +.include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk index 5e472ec778f..72575ba6274 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -1,26 +1,14 @@ -# $NetBSD: options.mk,v 1.37 2015/04/03 01:15:24 hiramatsu Exp $ +# $NetBSD: options.mk,v 1.38 2015/04/17 02:22:52 hiramatsu Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.postfix -PKG_SUPPORTED_OPTIONS= bdb ldap mysql pcre pgsql sasl sqlite tls cdb +PKG_SUPPORTED_OPTIONS= ldap mysql pcre pgsql sasl sqlite tls cdb PKG_SUGGESTED_OPTIONS= tls .include "../../mk/bsd.options.mk" ### -### Support "hash" (Berkeley DB) map type. -### -.if empty(PKG_OPTIONS:Mbdb) -PKG_OPTIONS+= bdb # "hash" map type is mandatory -.endif -.if !empty(PKG_OPTIONS:Mbdb) -. include "../../mk/bdb.buildlink3.mk" -CCARGS+= -DHAS_DB -AUXLIBS+= ${BDB_LIBS} -.endif - -### ### STARTTLS support ### .if !empty(PKG_OPTIONS:Mtls) |