From fb3f4ed7b71e1c568367353af78a6dbe4b3b2d0a Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
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.
---
 meta-pkgs/XFree86/Makefile.common | 6 ++----
 meta-pkgs/xorg/Makefile.common    | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'meta-pkgs')

diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common
index dcd18ba5f47..12b2213e9e8 100644
--- a/meta-pkgs/XFree86/Makefile.common
+++ b/meta-pkgs/XFree86/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2004/07/29 08:59:15 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.15 2004/07/30 07:48:56 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -111,10 +111,8 @@ PKG_FAIL_REASON+=       "X11_TYPE=XFree86 is mandatory."
 
 NO_MTREE=		# defined
 
-X11ROOT_PREFIX?=	X11R6
 WRKSRC?=		${WRKDIR}/xc
-X11ROOT?=		${PREFIX}/${X11ROOT_PREFIX}
-X11BASE=		${X11ROOT}
+X11ROOT?=		${LOCALBASE}/${X11ROOT_PREFIX}
 PREPEND_PATH=		${X11ROOT}/bin # Make sure we have this in PATH :)
 
 PLIST_SUBST+=		X11ROOT_PREFIX=${X11ROOT_PREFIX}
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 287a9842b2c..daffb69e260 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/07/29 08:59:15 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/07/30 07:48:56 xtraeme Exp $
 #
 # XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
 #   be built in.
@@ -103,9 +103,8 @@ PKG_FAIL_REASON+=       "X11_TYPE=xorg is mandatory."
 
 NO_MTREE=		# defined
 
-X11ROOT_PREFIX?=	xorg
 WRKSRC?=		${WRKDIR}/xc
-X11ROOT?=		${PREFIX}/${X11ROOT_PREFIX}
+X11ROOT?=		${LOCALBASE}/${X11ROOT_PREFIX}
 PREPEND_PATH+=		${X11ROOT}/bin # Make sure we have this in PATH :)
 
 PLIST_SUBST+=		X11ROOT_PREFIX=${X11ROOT_PREFIX}
-- 
cgit v1.2.3