From 0cfedd6db1de31e305042a822f479dcbd5a73ceb Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Fri, 30 Jul 2004 07:48:56 +0000
Subject: Add a new variable to specify the installation prefix for X11
 packages (currently XFree86 and xorg), X11ROOT_PREFIX.

Defaults:

xorg: X11ROOT_PREFIX = xorg.
XFree86: X11ROOT_PREFIX = XFree86.

Otherwise it's undefined.

With this modification we don't have to specify X11BASE anymore,
because it's assigned automatically via bsd.pkg.defaults.mk.

If you want to change the defaults, specify X11ROOT_PREFIX in mk.conf.

Update Packages.txt now that we don't need X11BASE.
---
 x11/XFree86-libs/MESSAGE       | 10 ----------
 x11/XFree86-libs/buildlink3.mk |  6 ++++--
 2 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 x11/XFree86-libs/MESSAGE

(limited to 'x11/XFree86-libs')

diff --git a/x11/XFree86-libs/MESSAGE b/x11/XFree86-libs/MESSAGE
deleted file mode 100644
index 98843a9c78c..00000000000
--- a/x11/XFree86-libs/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2004/07/21 23:55:19 xtraeme Exp $
-
-Make sure you have defined X11BASE in /etc/mk.conf before try to install 
-any package that uses X11 headers/libraries. Then you can just add the 
-following:
-
-	X11BASE=${X11ROOT}
-
-===========================================================================
diff --git a/x11/XFree86-libs/buildlink3.mk b/x11/XFree86-libs/buildlink3.mk
index 7a70a5dccea..a6f46f9d998 100644
--- a/x11/XFree86-libs/buildlink3.mk
+++ b/x11/XFree86-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/28 23:36:27 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/07/30 07:48:56 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFREE86_LIBS_BUILDLINK3_MK:=	${XFREE86_LIBS_BUILDLINK3_MK}+
@@ -14,11 +14,13 @@ BUILDLINK_DEPENDS+=	XFree86-libs
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NXFree86-libs}
 BUILDLINK_PACKAGES:=	XFree86-libs ${BUILDLINK_PACKAGES}
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(XFREE86_LIBS_BUILDLINK3_MK:M+)
 
 BUILDLINK_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0
 BUILDLINK_PKGSRCDIR.XFree86-libs?=	../../x11/XFree86-libs
-BUILDLINK_TRANSFORM.XFree86-libs+=	-e "s|/X11R6/|/|"
+BUILDLINK_TRANSFORM.XFree86-libs+=	-e "s|/${X11ROOT_PREFIX}/|/|"
 
 .endif  # XFREE86_LIBS_BUILDLINK3_MK
 
-- 
cgit v1.2.3