diff options
| author | dholland <dholland> | 2016-06-11 21:26:19 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2016-06-11 21:26:19 +0000 |
| commit | fce6b8ae1ca7e338a5c99b5bea24efcdd7eb1144 (patch) | |
| tree | 91364ac6d4f58e2804f58cae4b4a57113eec1b78 /pkgtools | |
| parent | 0d4c7452f334ad2eef73e50723e8914dc56a344d (diff) | |
| download | pkgsrc-fce6b8ae1ca7e338a5c99b5bea24efcdd7eb1144.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_filecheck/Makefile | 11 | ||||
| -rw-r--r-- | pkgtools/pkg_filecheck/files/pkg_filecheck.c | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile index 2c69a6e1460..a55c62420d5 100644 --- a/pkgtools/pkg_filecheck/Makefile +++ b/pkgtools/pkg_filecheck/Makefile @@ -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 @@ -14,6 +14,9 @@ WRKSRC= ${WRKDIR} 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 @@ do-install: ${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 --git a/pkgtools/pkg_filecheck/files/pkg_filecheck.c b/pkgtools/pkg_filecheck/files/pkg_filecheck.c index 149dc4f053b..a8cff5bfc53 100644 --- a/pkgtools/pkg_filecheck/files/pkg_filecheck.c +++ b/pkgtools/pkg_filecheck/files/pkg_filecheck.c @@ -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> |