[src/trunk]: src/usr.sbin/pkg_install/lib sync with pkgsrc version.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ae445fba69c
branches:  trunk
changeset: 586900:5ae445fba69c
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jan 04 23:36:14 2006 +0000

description:
sync with pkgsrc version.

diffstat:

 usr.sbin/pkg_install/lib/pkgdb.c   |  21 ++++++++++++++-------
 usr.sbin/pkg_install/lib/version.h |   4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diffs (92 lines):

diff -r e4e15321fe58 -r 5ae445fba69c usr.sbin/pkg_install/lib/pkgdb.c
--- a/usr.sbin/pkg_install/lib/pkgdb.c  Wed Jan 04 22:32:06 2006 +0000
+++ b/usr.sbin/pkg_install/lib/pkgdb.c  Wed Jan 04 23:36:14 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkgdb.c,v 1.22 2005/11/05 13:11:02 wiz Exp $   */
+/*     $NetBSD: pkgdb.c,v 1.23 2006/01/04 23:36:14 christos Exp $      */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: pkgdb.c,v 1.22 2005/11/05 13:11:02 wiz Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.23 2006/01/04 23:36:14 christos Exp $");
 #endif
 
 /*
@@ -41,7 +41,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if HAVE_DB1_DB_H
+#if HAVE_DB_185_H
+#include <db_185.h>
+#elif HAVE_DB1_DB_H
 #include <db1/db.h>
 #elif HAVE_DB_H
 #include <db.h>
@@ -64,6 +66,11 @@
 #if HAVE_STRING_H
 #include <string.h>
 #endif
+#if defined(HAVE_DBOPEN) || (defined(HAVE___DB185_OPEN) && defined(HAVE_DB_185_H))
+#define        HAVE_DBLIB      1
+#else
+#define        HAVE_DBLIB      0
+#endif
 
 #include "lib.h"
 
@@ -79,13 +86,13 @@
 /* just in case we change the environment variable name */
 #define PKG_DBDIR              "PKG_DBDIR"
 
-#if HAVE_DBOPEN
+#if HAVE_DBLIB
 static DB   *pkgdbp;
 #endif
 static char *pkgdb_dir = NULL;
 static char  pkgdb_cache[MaxPathSize];
 
-#if HAVE_DBOPEN
+#if HAVE_DBLIB
 /*
  *  Open the pkg-database
  *  Return value:
@@ -265,7 +272,7 @@
        return ret;
 }
 
-#else /* !HAVE_DBOPEN */
+#else /* !HAVE_DBLIB */
 
 int    pkgdb_open(int mode) { return 1; }
 void   pkgdb_close(void) {}
@@ -275,7 +282,7 @@
 int    pkgdb_remove(const char *key) { return 0; }
 int    pkgdb_remove_pkg(const char *pkg) { return 1; }
 
-#endif /* HAVE_DBOPEN */
+#endif /* HAVE_DBLIB */
 
 /*
  *  Return the location of the package reference counts database directory.
diff -r e4e15321fe58 -r 5ae445fba69c usr.sbin/pkg_install/lib/version.h
--- a/usr.sbin/pkg_install/lib/version.h        Wed Jan 04 22:32:06 2006 +0000
+++ b/usr.sbin/pkg_install/lib/version.h        Wed Jan 04 23:36:14 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.73 2005/11/23 04:59:14 ben Exp $ */
+/*     $NetBSD: version.h,v 1.74 2006/01/04 23:36:14 christos Exp $    */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20051122"
+#define PKGTOOLS_VERSION "20060104"
 
 #endif /* _INST_LIB_VERSION_H_ */