From a37f1f4f135336a44d09244c38d59660ceb3d31f Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 1 Sep 2003 16:27:07 +0000 Subject: Update pkg_install to 20030823, which has the changes to support package views. Pkgsrc changes include: * Convert to use pkgtools/libnbcompat so that it's easier to keep this in sync with src/usr.sbin/pkg_install. * Add a src2nbcompat script that converts src/usr.sbin/pkg_install into an appropriate start for pkgtools/pkg_install. The script removes the Makefiles, adds CPP inclusion guards around each #include <...> line, and includes at the top of each *.c file. This should make it even easier to keep sources in sync with the HEAD. --- pkgtools/pkg_install/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgtools/pkg_install/Makefile') diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index a315ed7b584..efc2c64f6a9 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2003/08/31 11:55:09 jlam Exp $ +# $NetBSD: Makefile,v 1.78 2003/09/01 16:27:09 jlam Exp $ # Notes to package maintainers: # @@ -33,8 +33,10 @@ PKG_PRESERVE= # defined VERSION!= ${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \ ${FILESDIR}/lib/version.h +CPPFLAGS+= ${BUILDLINK_CPPFLAGS.libnbcompat} + PKG_DBDIR?= /var/db/pkg -PKG_ADMIN= ${SETENV} PKG_DBDIR=${PKG_DBDIR} ${PKG_ADMIN_CMD} +PKG_INFO= PKG_DBDIR=${PKG_DBDIR} ${PKG_INFO_CMD} .if ${OPSYS} == "NetBSD" && !exists(/usr/share/tmac/tmac.andoc) PKG_FAIL_REASON+= "You need to have the 'text' set installed to build this package!" @@ -51,6 +53,7 @@ post-install: ${PKG_ADMIN} rebuild; \ fi +.include "../../pkgtools/libnbcompat/buildlink2.mk" .include "../../mk/bsd.pkg.mk" PREFIX:= ${PKG_TOOLS_BIN:C|/[^/]?bin$||} -- cgit v1.2.3