pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Accept /usr/include/db.h as a valid db-1.85 header ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/70f83b6f1dc8
branches:  trunk
changeset: 474111:70f83b6f1dc8
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Apr 25 15:06:10 2004 +0000

description:
Accept /usr/include/db.h as a valid db-1.85 header file only when
"^\#define.*HASHVERSION.*2$" is found.

diffstat:

 mk/bdb.buildlink3.mk |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 8e5b199c79e0 -r 70f83b6f1dc8 mk/bdb.buildlink3.mk
--- a/mk/bdb.buildlink3.mk      Sun Apr 25 14:01:01 2004 +0000
+++ b/mk/bdb.buildlink3.mk      Sun Apr 25 15:06:10 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.6 2004/04/15 11:11:57 wiz Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.7 2004/04/25 15:06:10 minskim Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Berkeley DB implementation.  db.buildlink3.mk will:
@@ -56,11 +56,19 @@
 _BDB_OK.native?=       no
 _BDB_INSTALLED.native?=        no
 .  if exists(/usr/include/db.h)
-_BDB_OK.native=                yes
+_BDB_OK.native!=       \
+       if ${GREP} -q "^\#define.*HASHVERSION.*2$$" /usr/include/db.h; then \
+               ${ECHO} "yes";                                          \
+       else                                                            \
+               ${ECHO} "no";                                           \
+       fi
+.    if !empty(_BDB_OK.native:M[yY][eE][sS])
 _BDB_INSTALLED.native= yes
 _BDB_INCDIRS=          include
 _BDB_TRANSFORM=                # empty
-.  elif exists(/usr/include/db1/db.h)
+.    endif
+.  endif
+.  if !empty(_BDB_OK.native:M[nN][oO]) && exists(/usr/include/db1/db.h)
 _BDB_OK.native=                yes
 _BDB_INSTALLED.native= yes
 _BDB_INCDIRS=          include/db1



Home | Main Index | Thread Index | Old Index