From e09f68cb6b28ba299da00e48be3e72b20fc9c046 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 17 Aug 2007 20:27:30 +0000
Subject: Remove infrastructure side of Xorg 6.9 support. Begin to simplify
 some of the cases of X11_TYPE usage -- it will stay with modular|native, so
 don't bother with keeping the separation in the tool list.

---
 mk/bsd.prefs.mk | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'mk/bsd.prefs.mk')

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index e6d26526e05..0c3a0201343 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.264 2007/08/15 13:25:47 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.265 2007/08/17 20:27:30 joerg Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -497,16 +497,7 @@ USE_XPKGWEDGE=	no
 USE_XPKGWEDGE?=	yes
 .endif
 
-# Default installation prefix for meta-pkgs/xorg.
-.if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
-X11ROOT_PREFIX?=	xorg
-.else
-X11ROOT_PREFIX?=	# empty
-.endif
-
-.if ${X11_TYPE} == "xorg"
-X11BASE?=		${LOCALBASE}/${X11ROOT_PREFIX}
-.elif ${X11_TYPE} == "modular"
+.if ${X11_TYPE} == "modular"
 X11BASE=		${LOCALBASE}
 .endif
 
-- 
cgit v1.2.3