CVS commit: pkgsrc/mail/exim

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Mon Jul 11 10:52:29 UTC 2022

Modified Files:
        pkgsrc/mail/exim: Makefile options.mk

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

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 pkgsrc/mail/exim/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mail/exim/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/exim/Makefile
diff -u pkgsrc/mail/exim/Makefile:1.193 pkgsrc/mail/exim/Makefile:1.194
--- pkgsrc/mail/exim/Makefile:1.193     Sat Jul  2 09:24:34 2022
+++ pkgsrc/mail/exim/Makefile   Mon Jul 11 10:52:29 2022
@@ -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/

Index: pkgsrc/mail/exim/options.mk
diff -u pkgsrc/mail/exim/options.mk:1.25 pkgsrc/mail/exim/options.mk:1.26
--- pkgsrc/mail/exim/options.mk:1.25    Mon Dec  9 18:46:00 2019
+++ pkgsrc/mail/exim/options.mk Mon Jul 11 10:52:29 2022
@@ -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 @@ LOOKUP_LIBS+=             -lopendmarc
 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)