From 2761568ac280270d3e97f7e38922103a7a4ff840 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 8 Sep 2007 21:57:57 +0000 Subject: Convert to use the features framework. --- pkgtools/pkgfind/Makefile | 16 +++++----------- pkgtools/pkgfind/files/pkgfind.c | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'pkgtools/pkgfind') diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile index 125d6b8efaf..654205e41d8 100644 --- a/pkgtools/pkgfind/Makefile +++ b/pkgtools/pkgfind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/09/06 21:51:54 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2007/09/08 21:57:59 jlam Exp $ DISTNAME= pkgfind-20050804 CATEGORIES= pkgtools @@ -13,13 +13,16 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews NO_CONFIGURE= yes NO_CHECKSUM= yes +USE_FEATURES= err getprogname setprogname snprintf warn + INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} do-build: - ${LINK.c} -o ${WRKSRC}/pkgfind ${WRKSRC}/pkgfind.c + ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${WRKSRC}/pkgfind \ + ${WRKSRC}/pkgfind.c ${LIBS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pkgfind ${PREFIX}/bin/pkgfind @@ -31,13 +34,4 @@ SUBST_FILES.path= pkgfind.c pkgfind.1 SUBST_SED.path= -e "s,/usr/pkgsrc,${PKGSRCDIR},g" SUBST_MESSAGE.path= Adjusting pkgsrc directory. -.include "../../mk/bsd.prefs.mk" - -# need err(1), warn(1), set/getprogname(1) -.if ${OPSYS} != "NetBSD" && ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly" -CFLAGS+= -DNEED_LIBNBCOMPAT -LDFLAGS+= -lnbcompat -. include "../../pkgtools/libnbcompat/inplace.mk" -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/pkgfind/files/pkgfind.c b/pkgtools/pkgfind/files/pkgfind.c index 0704594f39c..8fa0e92c43e 100644 --- a/pkgtools/pkgfind/files/pkgfind.c +++ b/pkgtools/pkgfind/files/pkgfind.c @@ -38,7 +38,7 @@ #include #include -#ifdef NEED_LIBNBCOMPAT +#if HAVE_NBCOMPAT_H #include #else #include -- cgit v1.2.3