[pkgsrc/trunk]: pkgsrc/mk Change the order of libraries looked for, and start...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/63604b9255df
branches:  trunk
changeset: 498077:63604b9255df
user:      cube <cube%pkgsrc.org@localhost>
date:      Thu Aug 11 20:25:20 2005 +0000

description:
Change the order of libraries looked for, and start with libdb1 instead of
libdb.  A (obviously braindead) system might ship with a correct libdb1 and
a frivolous libdb.  I'm speaking of RedHat, of course.

But anyway, it makes more sense, libdb1 just can't be anything but a db1
library.

OK'd by jlam@.

diffstat:

 mk/db1.builtin.mk |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (32 lines):

diff -r 57a88d301b16 -r 63604b9255df mk/db1.builtin.mk
--- a/mk/db1.builtin.mk Thu Aug 11 20:10:01 2005 +0000
+++ b/mk/db1.builtin.mk Thu Aug 11 20:25:20 2005 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: db1.builtin.mk,v 1.13 2005/06/30 12:52:12 adam Exp $
+# $NetBSD: db1.builtin.mk,v 1.14 2005/08/11 20:25:20 cube Exp $
 
 BUILTIN_PKG:=  db1
 
-BUILTIN_FIND_LIBS:=            db db1
+BUILTIN_FIND_LIBS:=            db1 db
 BUILTIN_FIND_FILES_VAR:=       H_DB
-BUILTIN_FIND_FILES.H_DB=       /usr/include/db.h /usr/include/db1/db.h
+BUILTIN_FIND_FILES.H_DB=       /usr/include/db1/db.h /usr/include/db.h
 #
 # The builtin Berkeley database library must support hash version 2 or
 # else it doesn't support db-1.85 databases.
@@ -68,11 +68,11 @@
 .    if exists(${H_DB})
 BUILDLINK_INCDIRS.db1?=        ${H_DB:H:S/^${BUILDLINK_PREFIX.db1}\///}
 .    endif
-.    if !empty(BUILTIN_LIB_FOUND.db:M[yY][eE][sS])
-BUILDLINK_LDADD.db1=   -ldb
-.    elif !empty(BUILTIN_LIB_FOUND.db1:M[yY][eE][sS])
+.    if !empty(BUILTIN_LIB_FOUND.db1:M[yY][eE][sS])
 BUILDLINK_LDADD.db1=   -ldb1
 BUILDLINK_TRANSFORM+=  l:db:db1
+.    elif !empty(BUILTIN_LIB_FOUND.db:M[yY][eE][sS])
+BUILDLINK_LDADD.db1=   -ldb
 .    else
 BUILDLINK_LDADD.db1=   # empty
 .    endif