diff options
| author | adam <adam@pkgsrc.org> | 2010-06-02 12:53:49 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-06-02 12:53:49 +0000 |
| commit | c97d1d21b6beac110cac730675a1765d1cfecb4f (patch) | |
| tree | 43f861e5ca2050a7a7202bbf4c2c50f614be9c58 /mail/exim | |
| parent | f3501d7ad9dfab51356497034f813432609cd6a3 (diff) | |
| download | pkgsrc-c97d1d21b6beac110cac730675a1765d1cfecb4f.tar.gz | |
Fix building with db5; revision bump for db4 update
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 4 | ||||
| -rw-r--r-- | mail/exim/options.mk | 16 |
2 files changed, 7 insertions, 13 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 09106c572e3..1acc766d9c1 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.100 2010/01/31 21:06:29 heinz Exp $ +# $NetBSD: Makefile,v 1.101 2010/06/02 13:04:04 adam Exp $ DISTNAME= exim-4.71 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail net MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/ diff --git a/mail/exim/options.mk b/mail/exim/options.mk index cce6b7bef1a..c96eae1df76 100644 --- a/mail/exim/options.mk +++ b/mail/exim/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.15 2007/12/15 16:04:41 adam Exp $ +# $NetBSD: options.mk,v 1.16 2010/06/02 13:04:04 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.exim PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore @@ -128,19 +128,13 @@ EXIM_INCLUDE= -I${PREFIX}/include .else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED . include "../../mk/bdb.buildlink3.mk" EXIM_USE_DB_CONFIG= USE_DB=yes # the default -. if ${BDB_TYPE} == "db4" -EXIM_DBMLIB= DBMLIB=${LDFLAGS} ${BDB_LIBS} -EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db4} -. elif ${BDB_TYPE} == "db3" -EXIM_DBMLIB= DBMLIB=${LDFLAGS} ${BDB_LIBS} -EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db3} -. elif ${BDB_TYPE} == "db2" -EXIM_DBMLIB= DBMLIB=${LDFLAGS} ${BDB_LIBS} -EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db2} -. else # using native +. if ${BDB_TYPE} == "db1" EXIM_DBMLIB= # empty so use defaults EXIM_USE_DB_CONFIG= # empty so use defaults EXIM_INCLUDE= -I/usr/${BUILDLINK_INCDIRS.db-native} +. else +EXIM_DBMLIB= DBMLIB=${LDFLAGS} ${BDB_LIBS} +EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.${BDB_TYPE}} . endif .endif |