[pkgsrc/trunk]: pkgsrc/mail/exim Fix exim build on NetBSD (support for bdb 1....

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e442fc8448f9
branches:  trunk
changeset: 381659:e442fc8448f9
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Jul 11 10:52:29 2022 +0000

description:
Fix exim build on NetBSD (support for bdb 1.x dropped)

Bump PKGREVISION

diffstat:

 mail/exim/Makefile   |   3 ++-
 mail/exim/options.mk |  11 +++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diffs (41 lines):

diff -r 0d2831306ea6 -r e442fc8448f9 mail/exim/Makefile
--- a/mail/exim/Makefile        Mon Jul 11 10:27:40 2022 +0000
+++ b/mail/exim/Makefile        Mon Jul 11 10:52:29 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.193 2022/07/02 09:24:34 adam Exp $
+# $NetBSD: Makefile,v 1.194 2022/07/11 10:52:29 abs Exp $
 
 DISTNAME=      exim-4.96
+PKGREVISION=   1
 CATEGORIES=    mail net
 MASTER_SITES=  https://ftp.exim.org/pub/exim/exim4/
 MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/fixes/
diff -r 0d2831306ea6 -r e442fc8448f9 mail/exim/options.mk
--- a/mail/exim/options.mk      Mon Jul 11 10:27:40 2022 +0000
+++ b/mail/exim/options.mk      Mon Jul 11 10:52:29 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.25 2019/12/09 18:46:00 adam Exp $
+# $NetBSD: options.mk,v 1.26 2022/07/11 10:52:29 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.exim
 PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
@@ -136,17 +136,12 @@
 EXIM_USE_DB_CONFIG=    USE_GDBM=yes
 EXIM_DBMLIB=           DBMLIB=${LDFLAGS} -lgdbm
 EXIM_INCLUDE=          -I${PREFIX}/include
-.else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
+.else # use Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
+BDB_ACCEPTED?=db2 db3 db4 db5 db6
 .  include "../../mk/bdb.buildlink3.mk"
 EXIM_USE_DB_CONFIG=    USE_DB=yes      # the default
-.  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
 
 .if !empty(PKG_OPTIONS:Msaslauthd)