From bdcb094048c45950a03b9a81528f48bbac24c118 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 29 Jun 2001 18:29:27 +0000
Subject: Bump build dependency on xpkgwedge to >=1.3 to handle buildlink.mk
 files properly for imake-using packages, and cause pass -DBuildLink to xmkmf
 (and thus to imake) if USE_BUILDLINK_ONLY is defined.

---
 mk/bsd.pkg.mk | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 5e9e67f958c..9782a51330d 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.771 2001/06/28 16:54:07 wiz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.772 2001/06/29 18:29:27 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -98,11 +98,15 @@ SCRIPTS_ENV+=		CLASSPATH=${CLASSPATH} JAVA_HOME=${JAVA_HOME}
     exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
 X11PREFIX=		${LOCALBASE}
 XMKMF_CMD?=		${X11PREFIX}/bin/pkgxmkmf
+XMKMF_FLAGS?=		-a
+.if defined(USE_BUILDLINK_ONLY)
+XMKMF_FLAGS+=		-DBuildLink
+.endif
 .else
 X11PREFIX=		${X11BASE}
 XMKMF_CMD?=		${X11PREFIX}/bin/xmkmf
-.endif
 XMKMF_FLAGS?=		-a
+.endif
 XMKMF?=			${XMKMF_CMD} ${XMKMF_FLAGS}
 
 .if defined(USE_MOTIF12)
@@ -128,7 +132,10 @@ MOTIFBASE?=		${X11PREFIX}
 .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE)
 .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \
     exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
-BUILD_DEPENDS+=		xpkgwedge>=1.0:../../pkgtools/xpkgwedge
+BUILD_DEPENDS+=		xpkgwedge>=1.3:../../pkgtools/xpkgwedge
+MAKE_ENV+=		PKGSRC_CPPFLAGS="${CPPFLAGS}"
+MAKE_ENV+=		PKGSRC_CFLAGS="${CFLAGS}"
+MAKE_ENV+=		PKGSRC_CXXFLAGS="${CXXFLAGS}"
 .endif
 PREFIX=			${X11PREFIX}
 .elif defined(USE_CROSSBASE)
-- 
cgit v1.2.3