From 841668497e1f0ff52b0f9b5134c43ded8cab07f0 Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Wed, 9 Nov 2005 01:06:48 +0000
Subject: Moved the X11ROOT_PREFIX and X11BASE setting to mk/bsd.prefs.mk;
 removed from mk/defaults/mk.conf.

This was needed in parts of tests of allowing a platform/${OPSYS}.mk
define is X11_TYPE.
---
 mk/bsd.prefs.mk     | 18 +++++++++++++++++-
 mk/defaults/mk.conf | 17 +----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 3f1ca3102d9..7aa101dadb1 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.203 2005/11/01 16:30:05 tv Exp $
+# $NetBSD: bsd.prefs.mk,v 1.204 2005/11/09 01:06:48 reed Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -396,6 +396,22 @@ USE_XPKGWEDGE=	yes
 USE_XPKGWEDGE=		yes
 .endif
 
+# Default installation prefix for meta-pkgs/XFree86 and
+# meta-pkgs/xorg.
+.if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
+X11ROOT_PREFIX?=	XFree86
+.elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
+X11ROOT_PREFIX?=	xorg
+.else
+X11ROOT_PREFIX?=	# empty
+.endif
+
+.if ((defined(X11_TYPE) && !empty(X11_TYPE:MXFree86) || \
+     defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)) && \
+     defined(X11_TYPE) && empty(X11_TYPE:Mnative))
+X11BASE?=		${LOCALBASE}/${X11ROOT_PREFIX}
+.endif
+
 # Set X11PREFIX to reflect the install directory of X11 packages.
 # Set XMKMF_CMD properly if xpkgwedge is installed.
 #
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index b0733ecc46a..b38c5adca69 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.84 2005/11/01 03:58:42 dmcmahill Exp $
+# $NetBSD: mk.conf,v 1.85 2005/11/09 01:06:48 reed Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -189,21 +189,6 @@ VARBASE?=	/var
 # native (uses pkgtools/x11-links to use the native, non-pkgsrc-managed X11).
 # Default: native
 
-# Default installation prefix for meta-pkgs/XFree86 and
-# meta-pkgs/xorg.
-.if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
-X11ROOT_PREFIX?=	XFree86
-.elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
-X11ROOT_PREFIX?=	xorg
-.else
-X11ROOT_PREFIX?=	# empty
-.endif
-
-.if ((defined(X11_TYPE) && !empty(X11_TYPE:MXFree86) || \
-     defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)) && \
-     defined(X11_TYPE) && empty(X11_TYPE:Mnative))
-X11BASE?=		${LOCALBASE}/${X11ROOT_PREFIX}
-.endif
 #X11BASE?=	/usr/X11R6
 # Where X11 is installed on the system.
 # (and the default install path of X11 pkgs)
-- 
cgit v1.2.3