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.

4 files changed, 10 insertions, 18 deletions

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
 
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index eb297105ca9..ed4baaed3b6 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/30 07:48:56 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
@@ -15,7 +15,7 @@ CONFLICTS+=		xextensions-[0-9]*
 CONFLICTS+=		libX11-[0-9]*
 CONFLICTS+=		libXau-[0-9]*
 
-BUILD_DEPENDS=		xorg-imake>=6.7.0:../../x11/xorg-imake
+BUILD_DEPENDS=		xorg-imake>=${XORG_VER}:../../x11/xorg-imake
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,8 +25,6 @@ BUILD_DEPENDS=		xorg-imake>=6.7.0:../../x11/xorg-imake
 CONFLICTS+=		MesaLib-[0-9]* glu-[0-9]*
 .endif
 
-MESSAGE_SRC=		${_PKGSRCDIR}/x11/XFree86-libs/MESSAGE
-
 USE_BUILDLINK3=			yes
 BUILDLINK_PASSTHRU_DIRS+=	${X11ROOT}/lib
 
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index 6a3e74e9beb..079c02dbc36 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/07/29 07:12:33 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/07/30 07:48:56 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XORG_LIBS_BUILDLINK3_MK:=	${XORG_LIBS_BUILDLINK3_MK}+
@@ -14,11 +14,13 @@ BUILDLINK_DEPENDS+=	xorg-libs
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxorg-libs}
 BUILDLINK_PACKAGES:=	xorg-libs ${BUILDLINK_PACKAGES}
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
 
 BUILDLINK_DEPENDS.xorg-libs+=	xorg-libs>=6.7.0
 BUILDLINK_PKGSRCDIR.xorg-libs?=	../../x11/xorg-libs
-BUILDLINK_TRANSFORM.xorg-libs+=	-e "s|/xorg/|/|"
+BUILDLINK_TRANSFORM.xorg-libs+=	-e "s|/${X11ROOT_PREFIX}/|/|"
 
 .endif  # XORG_LIBS_BUILDLINK3_MK