[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Put back several includ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28e9e8e503d5
branches:  trunk
changeset: 460716:28e9e8e503d5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Sep 03 12:32:50 2003 +0000

description:
Put back several includes lost in the update that should fix builds on
Solaris and Linux.

diffstat:

 pkgtools/pkg_install/files/lib/pen.c   |  7 +++++--
 pkgtools/pkg_install/files/lib/pkgdb.c |  8 +++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r bb1560c886c7 -r 28e9e8e503d5 pkgtools/pkg_install/files/lib/pen.c
--- a/pkgtools/pkg_install/files/lib/pen.c      Wed Sep 03 12:25:07 2003 +0000
+++ b/pkgtools/pkg_install/files/lib/pen.c      Wed Sep 03 12:32:50 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pen.c,v 1.8 2003/09/02 08:28:34 jlam Exp $     */
+/*     $NetBSD: pen.c,v 1.9 2003/09/03 12:32:50 jlam Exp $     */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: pen.c,v 1.25 1997/10/08 07:48:12 charnier Exp";
 #else
-__RCSID("$NetBSD: pen.c,v 1.8 2003/09/02 08:28:34 jlam Exp $");
+__RCSID("$NetBSD: pen.c,v 1.9 2003/09/03 12:32:50 jlam Exp $");
 #endif
 #endif
 
@@ -48,6 +48,9 @@
 #if HAVE_SYS_MOUNT_H
 #include <sys/mount.h>
 #endif
+#if HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
 
 /* For keeping track of where we are */
 static char Current[FILENAME_MAX];
diff -r bb1560c886c7 -r 28e9e8e503d5 pkgtools/pkg_install/files/lib/pkgdb.c
--- a/pkgtools/pkg_install/files/lib/pkgdb.c    Wed Sep 03 12:25:07 2003 +0000
+++ b/pkgtools/pkg_install/files/lib/pkgdb.c    Wed Sep 03 12:32:50 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkgdb.c,v 1.13 2003/09/02 08:28:35 jlam Exp $  */
+/*     $NetBSD: pkgdb.c,v 1.14 2003/09/03 12:32:50 jlam 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.13 2003/09/02 08:28:35 jlam Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.14 2003/09/03 12:32:50 jlam Exp $");
 #endif
 
 /*
@@ -41,7 +41,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if HAVE_DB_H
+#if HAVE_DB1_DB_H
+#include <db1/db.h>
+#elif HAVE_DB_H
 #include <db.h>
 #endif
 #if HAVE_ERR_H