From 4e29ca0c96f90eb15b77c85cbea66a2a26e681be Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 13 Sep 2003 04:08:12 +0000
Subject: Build pkg_install without dependencies by pulling in the libnbcompat
 source files and building it locally.  By removing dependencies from
 pkg_install, we avoid the circularity of invoking the dependency targets in
 bsd.pkg.mk that may in turn invoke the pkg_* tools.

---
 pkgtools/pkg_install/Makefile | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile
index eda6ae89b3e..ff09a0bb286 100644
--- a/pkgtools/pkg_install/Makefile
+++ b/pkgtools/pkg_install/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2003/09/11 07:14:42 reed Exp $
+# $NetBSD: Makefile,v 1.83 2003/09/13 04:08:12 jlam Exp $
 
 # Notes to package maintainers:
 #
@@ -22,12 +22,20 @@ GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-pkgdbdir=${PKG_DBDIR}
 
 NO_PKGTOOLS_REQD_CHECK=	# defined
+NO_BUILDLINK=		# defined
 NO_CHECKSUM=		# defined
 NO_MTREE=		# defined
 NO_PKG_REGISTER=	# defined
 NO_PACKAGE=		Deinstallation is not permitted
 PKG_PRESERVE=		# defined
 
+LIBNBCOMPAT_FILESDIR=	${.CURDIR}/../../pkgtools/libnbcompat/files
+LIBNBCOMPAT_SRCDIR=	${WRKDIR}/libnbcompat
+
+CFLAGS+=		-I${LIBNBCOMPAT_SRCDIR}
+LDFLAGS+=		-L${LIBNBCOMPAT_SRCDIR}
+LIBS+=			-lnbcompat
+
 .include "../../mk/bsd.prefs.mk"
 
 VERSION!=		${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \
@@ -37,8 +45,12 @@ PKG_DBDIR?=		/var/db/pkg
 PKG_INFO=		PKG_DBDIR=${PKG_DBDIR} ${PKG_INFO_CMD}
 
 do-extract:
+	@${CP} -Rp ${LIBNBCOMPAT_FILESDIR} ${LIBNBCOMPAT_SRCDIR}
 	@${CP} -Rp ${FILESDIR} ${WRKSRC}
 
+pre-configure:
+	cd ${LIBNBCOMPAT_SRCDIR} && ./configure && ${MAKE_PROGRAM}
+
 post-install:
 	if [ ! -f ${PKG_DBDIR}/pkgdb.byfile.db ]; then			\
 		if [ ! -d ${PKG_DBDIR} ]; then				\
@@ -47,7 +59,6 @@ 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