diff options
| -rw-r--r-- | pkgtools/pkg_filecheck/Makefile | 13 | ||||
| -rw-r--r-- | pkgtools/pkg_filecheck/files/pkg_filecheck.c | 6 | ||||
| -rw-r--r-- | pkgtools/pkg_filecheck/files/pkg_filecheck.conf | 4 |
3 files changed, 16 insertions, 7 deletions
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile index 6826b39d5f9..223290cd698 100644 --- a/pkgtools/pkg_filecheck/Makefile +++ b/pkgtools/pkg_filecheck/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2006/01/06 17:10:58 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2006/07/02 10:32:09 rillig Exp $ # -DISTNAME= pkg_filecheck-0.1 -PKGREVISION= 1 +DISTNAME= pkg_filecheck-0.2 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty @@ -58,5 +57,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/pkg_filecheck.conf \ ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf -.include "../../pkgtools/libnbcompat/buildlink3.mk" +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} != "NetBSD" +CPPFLAGS+= -DUSE_LIBNBCOMPAT +. include "../../pkgtools/libnbcompat/buildlink3.mk" +.endif + .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkg_filecheck/files/pkg_filecheck.c b/pkgtools/pkg_filecheck/files/pkg_filecheck.c index 0a5923f2ce2..46e45b13582 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.2 2005/11/17 17:02:04 rillig Exp $ + $NetBSD: pkg_filecheck.c,v 1.3 2006/07/02 10:32:09 rillig Exp $ pkg_filecheck.c -- check for files not owned by any package Copyright (C) 2001 Dieter Baron @@ -30,14 +30,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if defined(USE_LIBNBCOMPAT) #include <nbcompat.h> +#endif #include <sys/types.h> #include <sys/stat.h> #include <db.h> #include <errno.h> #include <fcntl.h> -#ifdef HAVE_FTS_H +#if !defined(USE_LIBNBCOMPAT) || defined(HAVE_FTS_H) #include <fts.h> #endif #include <limits.h> diff --git a/pkgtools/pkg_filecheck/files/pkg_filecheck.conf b/pkgtools/pkg_filecheck/files/pkg_filecheck.conf index d6f9b752851..07308a43c15 100644 --- a/pkgtools/pkg_filecheck/files/pkg_filecheck.conf +++ b/pkgtools/pkg_filecheck/files/pkg_filecheck.conf @@ -1,4 +1,4 @@ -# $NetBSD: pkg_filecheck.conf,v 1.2 2003/12/18 14:32:01 grant Exp $ +# $NetBSD: pkg_filecheck.conf,v 1.3 2006/07/02 10:32:09 rillig Exp $ # location of package database dir @PKG_DBDIR@ @@ -15,3 +15,5 @@ check @PREFIX@ ignore @PREFIX@/etc ignore @PREFIX@/var/scrollkeeper +ignore @PKG_DBDIR@ +ignore @PKG_DBDIR@.refcount |