From a7961779d5253a3c9a03b934a2e7e1ef4c8588d6 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 22 Aug 2001 17:45:57 +0000
Subject: Update buildlink-x11 to 0.8.  Changes from version 0.7 include
 looking for the X11 headers and libraries in ${BUILDLINK_X11_DIR} in
 constructing the header and library search paths for the compiler.

---
 pkgtools/buildlink-x11/Makefile                 | 4 ++--
 pkgtools/buildlink-x11/files/buildlinkX11.def   | 8 +++++---
 pkgtools/buildlink-x11/files/buildlinkX11.rules | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/buildlink-x11/Makefile b/pkgtools/buildlink-x11/Makefile
index 32d6fa33457..a4e4b02e60e 100644
--- a/pkgtools/buildlink-x11/Makefile
+++ b/pkgtools/buildlink-x11/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2001/08/19 16:22:25 tron Exp $
+# $NetBSD: Makefile,v 1.7 2001/08/22 17:45:57 jlam Exp $
 
-DISTNAME=	buildlink-x11-0.7
+DISTNAME=	buildlink-x11-0.8
 CATEGORIES=	pkgtools devel x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/buildlink-x11/files/buildlinkX11.def b/pkgtools/buildlink-x11/files/buildlinkX11.def
index 706da4f2d53..fb75c9b9590 100644
--- a/pkgtools/buildlink-x11/files/buildlinkX11.def
+++ b/pkgtools/buildlink-x11/files/buildlinkX11.def
@@ -1,4 +1,4 @@
-/*	$NetBSD: buildlinkX11.def,v 1.2 2001/08/08 07:23:28 jlam Exp $	*/
+/*	$NetBSD: buildlinkX11.def,v 1.3 2001/08/22 17:45:57 jlam Exp $	*/
 
 #ifdef AfterVendorCF
 
@@ -9,8 +9,10 @@
  * Force the buildlink include and lib directories to the head of the
  * compiler search paths.  The include directory is added through the
  * C{,plusplus}DebugFlags, which are the first options given to the
- * compiler.  It is _required_ that BUILDLINK_DIR be defined in the
- * environment.
+ * compiler.  The following variables should be defined in the environment:
+ *
+ *	BUILDLINK_DIR		the location of 3rd-party software
+ *	BUILDLINK_X11_DIR	the location of the X11R6 hierarchy
  */
 
 #  ifndef BuildLinkCppFlags
diff --git a/pkgtools/buildlink-x11/files/buildlinkX11.rules b/pkgtools/buildlink-x11/files/buildlinkX11.rules
index a8545f1e5d0..accda298593 100644
--- a/pkgtools/buildlink-x11/files/buildlinkX11.rules
+++ b/pkgtools/buildlink-x11/files/buildlinkX11.rules
@@ -1,4 +1,4 @@
-/*	$NetBSD: buildlinkX11.rules,v 1.3 2001/08/08 07:23:28 jlam Exp $	*/
+/*	$NetBSD: buildlinkX11.rules,v 1.4 2001/08/22 17:45:57 jlam Exp $	*/
 
 #include <X11.dist.rules>
 
@@ -12,11 +12,11 @@
 #   ifdef TopXInclude
 #    undef TopXInclude
 #   endif
-#   define TopXInclude	-I$(BUILDLINK_DIR)/include
+#   define TopXInclude	-I$(BUILDLINK_X11_DIR)/include
 #   ifdef XLdPreLibs
 #    undef XLdPreLibs
 #   endif
-#   define XLdPreLibs	-L$(BUILDLINK_DIR)/lib
+#   define XLdPreLibs	-L$(BUILDLINK_X11_DIR)/lib
 #   ifdef LdPreLibs
 #    undef LdPreLibs
 #   endif
@@ -24,7 +24,7 @@
 #   ifdef XLdPostLibs
 #    undef XLdPostLibs
 #   endif
-#   define XLdPostLibs	-L$(BUILDLINK_DIR)/lib
+#   define XLdPostLibs	-L$(BUILDLINK_X11_DIR)/lib
 #   ifdef LdPostLibs
 #    undef LdPostLibs
 #   endif
-- 
cgit v1.2.3