[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_filecheck Add patch from Tim Zingelman in...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/96ab2884ac40
branches:  trunk
changeset: 348313:96ab2884ac40
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sat Jun 11 21:26:19 2016 +0000

description:
Add patch from Tim Zingelman in PR 46421 to make it work on machines
whose libdb is not the db-1.85 that's in the libc of 4.4 derivates.

Since this program reads the package database it must use the same
libdb as pkg_install, and that's the one in libnbcompat rather than
the one you get from bdb.buildlink3.mk.

Bump PKGREVISION to 5.

diffstat:

 pkgtools/pkg_filecheck/Makefile              |  11 +++++++----
 pkgtools/pkg_filecheck/files/pkg_filecheck.c |   4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 9ae175734bb7 -r 96ab2884ac40 pkgtools/pkg_filecheck/Makefile
--- a/pkgtools/pkg_filecheck/Makefile   Sat Jun 11 21:23:28 2016 +0000
+++ b/pkgtools/pkg_filecheck/Makefile   Sat Jun 11 21:26:19 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2015/07/04 16:18:39 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2016/06/11 21:26:19 dholland Exp $
 #
 
 PKGNAME=               pkg_filecheck-0.4
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            pkgtools devel
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -14,6 +14,9 @@
 USE_TOOLS+=    perl:run
 USE_FEATURES=  fts_open
 
+USE_FEATURES+=                nbcompat      
+NBCOMPAT_CONFIGURE_ARGS+=      --enable-db   
+                                             
 FILES_SUBST+=  PKG_DBDIR=${PKG_DBDIR:Q}
 CONF_FILES=    ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \
                ${PKG_SYSCONFDIR}/pkg_filecheck.conf
@@ -50,6 +53,6 @@
        ${INSTALL_DATA} ${WRKSRC}/pkg_filecheck.conf \
                ${DESTDIR}${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf
 
-
-.include "../../mk/bdb.buildlink3.mk"
+# Must use the same libdb as pkg_install, which means the nbcompat one.
+#.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9ae175734bb7 -r 96ab2884ac40 pkgtools/pkg_filecheck/files/pkg_filecheck.c
--- a/pkgtools/pkg_filecheck/files/pkg_filecheck.c      Sat Jun 11 21:23:28 2016 +0000
+++ b/pkgtools/pkg_filecheck/files/pkg_filecheck.c      Sat Jun 11 21:26:19 2016 +0000
@@ -1,5 +1,5 @@
 /*
-  $NetBSD: pkg_filecheck.c,v 1.6 2007/09/08 21:57:59 jlam Exp $
+  $NetBSD: pkg_filecheck.c,v 1.7 2016/06/11 21:26:19 dholland Exp $
 
   pkg_filecheck.c -- check for files not owned by any package
   Copyright (C) 2001 Dieter Baron
@@ -32,7 +32,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <db_185.h>
+#include <nbcompat/db.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fts.h>