pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/exim Instead of checking every BDB type, just use...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9cd1b76310f
branches:  trunk
changeset: 483685:a9cd1b76310f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Nov 17 14:23:54 2004 +0000

description:
Instead of checking every BDB type, just use the *.${BDB_TYPE} variables
that contain the correct values of CPPFLAGS, LDFLAGS, and LIBS.

diffstat:

 mail/exim/Makefile.common |  18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diffs (32 lines):

diff -r 4f8e8cf439d8 -r a9cd1b76310f mail/exim/Makefile.common
--- a/mail/exim/Makefile.common Wed Nov 17 13:26:17 2004 +0000
+++ b/mail/exim/Makefile.common Wed Nov 17 14:23:54 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2004/11/01 17:25:25 abs Exp $
+# $NetBSD: Makefile.common,v 1.20 2004/11/17 14:23:54 jlam Exp $
 
 MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/ \
                ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -46,20 +46,8 @@
 .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=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -ldb4
-EXIM_INCLUDE=          -I${PREFIX}/${BUILDLINK_INCDIRS.db4}
-.  elif ${BDB_TYPE} == "db3"
-EXIM_DBMLIB=           DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -ldb3
-EXIM_INCLUDE=          -I${PREFIX}/${BUILDLINK_INCDIRS.db3}
-.  elif ${BDB_TYPE} == "db2"
-EXIM_DBMLIB=           DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -ldb2
-EXIM_INCLUDE=          -I${PREFIX}/${BUILDLINK_INCDIRS.db2}
-.  else # using native
-EXIM_DBMLIB=           # empty so use defaults
-EXIM_USE_DB_CONFIG=    # empty so use defaults
-EXIM_INCLUDE=          -I/usr/${BUILDLINK_INCDIRS.db-native}
-.  endif
+EXIM_DBMLIB=           DBMLIB=${COMPILER_RPATH_FLAG}${BDBBASE}/${BUILDLINK_LIBDIRS.${BDB_TYPE}} -L${BDBBASE}/${BUILDLINK_LIBDIRS.${BDB_TYPE}} ${BDB_LIBS}
+EXIM_INCLUDE=          -I${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
 .endif
 
 pre-patch:



Home | Main Index | Thread Index | Old Index