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.

6 files changed, 27 insertions, 87 deletions

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
 
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 610ffd41bb4..1afbdfdd7ab 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.158 2007/08/14 19:04:56 jlam Exp $
+# $NetBSD: mk.conf,v 1.159 2007/08/17 20:27:31 joerg Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -255,7 +255,7 @@ VARBASE?=	/var
 
 #X11_TYPE?=    native
 # Used to set the X11 implementation used to build X11 packages.
-# Possible: xorg (uses x11/xorg-libs), or
+# Possible: modular (uses x11/libX11 and friends), or
 # native (uses pkgtools/x11-links to use the native, non-pkgsrc-managed X11).
 # Default: native
 # The default is defined in bsd.prefs.mk to allow platform specific overrides.
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index e7158d462d0..e7609cc24e2 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -396,39 +396,6 @@ xlockmore-allow-root	Allow root to get access.
 xlockmore-dpms		Use DPMS.
 xml			Enable XML support.
 xmms-eq	
-xorg-server-apm	
-xorg-server-ark	
-xorg-server-ati	
-xorg-server-chips	
-xorg-server-cirrus	
-xorg-server-cyrix	
-xorg-server-dummy	
-xorg-server-fbdev	
-xorg-server-glint	
-xorg-server-i128	
-xorg-server-i740	
-xorg-server-i810	
-xorg-server-imstt	
-xorg-server-mga	
-xorg-server-neomagic	
-xorg-server-newport	
-xorg-server-nsc	
-xorg-server-nv	
-xorg-server-rendition	
-xorg-server-s3	
-xorg-server-s3virge	
-xorg-server-savage	
-xorg-server-siliconmotion	
-xorg-server-sis	
-xorg-server-tdfx	
-xorg-server-tga	
-xorg-server-trident	
-xorg-server-tseng	
-xorg-server-v4l	
-xorg-server-vesa	
-xorg-server-vga	
-xorg-server-via	
-xorg-server-vmware	
 xrender			Enable Xrender support.
 xscreensaver-webcollage	Install webcollage screensaver.
 xterm-256color		Enable 256 color support.
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 940c0d613df..da626317829 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.195 2007/08/13 02:30:04 jlam Exp $
+# $NetBSD: replace.mk,v 1.196 2007/08/17 20:27:32 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -988,10 +988,11 @@ TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
 
 # For modular Xorg, these are individual packages.
 #
-.if ${X11_TYPE} == "modular"
 .if !defined(TOOLS_IGNORE.iceauth) && !empty(_USE_TOOLS:Miceauth)
 .  if !empty(PKGPATH:Mx11/iceauth)
 MAKEFLAGS+=		TOOLS_IGNORE.iceauth=
+.  elif !empty(X11_TYPE:Mnative)
+TOOLS_PATH.${_t_}=	${X11BASE}/bin/iceauth
 .  else
 TOOLS_DEPENDS.iceauth?=		iceauth-[0-9]*:../../x11/iceauth
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.iceauth=iceauth
@@ -1003,6 +1004,8 @@ TOOLS_CREATE.iceauth=		iceauth
 .if !defined(TOOLS_IGNORE.mkfontdir) && !empty(_USE_TOOLS:Mmkfontdir)
 .  if !empty(PKGPATH:Mfonts/mkfontdir)
 MAKEFLAGS+=		TOOLS_IGNORE.mkfontdir=
+.  elif !empty(X11_TYPE:Mnative)
+TOOLS_PATH.${_t_}=	${X11BASE}/bin/mkfontdir
 .  else
 TOOLS_DEPENDS.mkfontdir?=	mkfontdir-[0-9]*:../../fonts/mkfontdir
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mkfontdir=mkfontdir
@@ -1014,6 +1017,8 @@ TOOLS_CREATE.mkfontdir=		mkfontdir
 .if !defined(TOOLS_IGNORE.mkfontscale) && !empty(_USE_TOOLS:Mmkfontscale)
 .  if !empty(PKGPATH:Mfonts/mkfontscale)
 MAKEFLAGS+=		TOOLS_IGNORE.mkfontscale=
+.  elif !empty(X11_TYPE:Mnative)
+TOOLS_PATH.${_t_}=	${X11BASE}/bin/mkfontscale
 .  else
 TOOLS_DEPENDS.mkfontscale?=	mkfontscale-[0-9]*:../../fonts/mkfontscale
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mkfontscale=mkfontscale
@@ -1025,6 +1030,8 @@ TOOLS_CREATE.mkfontscale=	mkfontscale
 .if !defined(TOOLS_IGNORE.bdftopcf) && !empty(_USE_TOOLS:Mbdftopcf)
 .  if !empty(PKGPATH:Mfonts/bdftopcf)
 MAKEFLAGS+=		TOOLS_IGNORE.bdftopcf=
+.  elif !empty(X11_TYPE:Mnative)
+TOOLS_PATH.${_t_}=	${X11BASE}/bin/bdftopcf
 .  else
 TOOLS_DEPENDS.bdftopcf?=	bdftopcf-[0-9]*:../../fonts/bdftopcf
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bdftopcf=bdftopcf
@@ -1036,6 +1043,8 @@ TOOLS_CREATE.bdftopcf=		bdftopcf
 .if !defined(TOOLS_IGNORE.ucs2any) && !empty(_USE_TOOLS:Mucs2any)
 .  if !empty(PKGPATH:Mfonts/font-util)
 MAKEFLAGS+=		TOOLS_IGNORE.ucs2any=
+.  elif !empty(X11_TYPE:Mnative)
+TOOLS_PATH.${_t_}=	${X11BASE}/bin/ucs2any
 .  else
 TOOLS_DEPENDS.ucs2any?=		font-util-[0-9]*:../../fonts/font-util
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ucs2any=ucs2any
@@ -1047,6 +1056,8 @@ TOOLS_CREATE.ucs2any=		ucs2any
 .if !defined(TOOLS_IGNORE.bdftruncate) && !empty(_USE_TOOLS:Mbdftruncate)
 .  if !empty(PKGPATH:Mfonts/font-util)
 MAKEFLAGS+=		TOOLS_IGNORE.bdftruncate=
+.  elif !empty(X11_TYPE:Mnative)
+TOOLS_PATH.${_t_}=	${X11BASE}/bin/bdftruncate
 .  else
 TOOLS_DEPENDS.bdftruncate?=	font-util-[0-9]*:../../fonts/font-util
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bdftruncate=bdftruncate
@@ -1058,6 +1069,8 @@ TOOLS_CREATE.bdftruncate=	bdftruncate
 .if !defined(TOOLS_IGNORE.xauth) && !empty(_USE_TOOLS:Mxauth)
 .  if !empty(PKGPATH:Mx11/xauth)
 MAKEFLAGS+=		TOOLS_IGNORE.xauth=
+.  elif !empty(X11_TYPE:Mnative)
+TOOLS_PATH.${_t_}=	${X11BASE}/bin/xauth
 .  else
 TOOLS_DEPENDS.xauth?=		xauth-[0-9]*:../../x11/xauth
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xauth=xauth
@@ -1069,6 +1082,8 @@ TOOLS_CREATE.xauth=		xauth
 .if !defined(TOOLS_IGNORE.xinit) && !empty(_USE_TOOLS:Mxinit)
 .  if !empty(PKGPATH:Mx11/xinit)
 MAKEFLAGS+=		TOOLS_IGNORE.xinit=
+.  elif !empty(X11_TYPE:Mnative)
+TOOLS_PATH.${_t_}=	${X11BASE}/bin/xinit
 .  else
 TOOLS_DEPENDS.xinit?=		xinit-[0-9]*:../../x11/xinit
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xinit=xinit
@@ -1080,6 +1095,8 @@ TOOLS_CREATE.xinit=		xinit
 .if !defined(TOOLS_IGNORE.xmessage) && !empty(_USE_TOOLS:Mxmessage)
 .  if !empty(PKGPATH:Mx11/xmessage)
 MAKEFLAGS+=		TOOLS_IGNORE.xmessage=
+.  elif !empty(X11_TYPE:Mnative)
+TOOLS_PATH.${_t_}=	${X11BASE}/bin/xmessage
 .  else
 TOOLS_DEPENDS.xmessage?=		xmessage-[0-9]*:../../x11/xmessage
 TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xmessage=xmessage
@@ -1088,32 +1105,6 @@ TOOLS_CREATE.xmessage=		xmessage
 .   endif
 .endif
 
-.endif
-
-# Otherwise these tools are all supplied by an X11 clients package if there is no
-# native tool available.
-#
-.if ${X11_TYPE} != "modular"
-_TOOLS.x11-clients=	bdftopcf iceauth mkfontdir mkfontscale xauth xinit xmessage
-
-.for _t_ in ${_TOOLS.x11-clients}
-.  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
-.    if !empty(PKGPATH:Mx11/xorg-clients)
-MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
-.    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
-TOOLS_CREATE+=		${_t_}
-.      if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
-TOOLS_DEPENDS.${_t_}?=	xorg-clients>=6.8:../../x11/xorg-clients
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=xorg-clients
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
-.      else # !empty(X11_TYPE:Mnative)
-TOOLS_PATH.${_t_}=	${X11BASE}/bin/${_t_}
-.      endif
-.    endif
-.  endif
-.endfor
-.endif
-
 ######################################################################
 
 # These tools are all supplied by an X11 imake package if there is no
@@ -1132,10 +1123,6 @@ TOOLS_CREATE+=		${_t_}
 TOOLS_DEPENDS.${_t_}?=	nbitools>=6.3nb4:../../devel/nbitools
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=nbitools
 TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/libexec/itools/${_t_}
-.      elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
-TOOLS_DEPENDS.${_t_}?=	xorg-imake>=6.8:../../x11/xorg-imake
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=xorg-imake
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
 .      elif defined(X11_TYPE) && !empty(X11_TYPE:Mmodular)
 TOOLS_DEPENDS.${_t_}?=	imake-[0-9]*:../../devel/imake
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=imake
@@ -1157,10 +1144,6 @@ TOOLS_CREATE+=		makedepend
 TOOLS_DEPENDS.makedepend?=	nbitools>=6.3nb4:../../devel/nbitools
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.makedepend=nbitools
 TOOLS_PATH.makedepend=	${TOOLS_PREFIX.makedepend}/libexec/itools/makedepend
-.    elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
-TOOLS_DEPENDS.makedepend?=	xorg-imake>=6.8:../../x11/xorg-imake
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.makedepend=xorg-imake
-TOOLS_PATH.makedepend=	${TOOLS_PREFIX.makedepend}/${X11ROOT_PREFIX}/bin/makedepend
 .    elif defined(X11_TYPE) && !empty(X11_TYPE:Mmodular)
 TOOLS_DEPENDS.makedepend?=	makedepend-[0-9]*:../../devel/makedepend
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.makedepend=makedepend
diff --git a/mk/x11.buildlink3.mk b/mk/x11.buildlink3.mk
index 52c4c638522..e197c0a268c 100644
--- a/mk/x11.buildlink3.mk
+++ b/mk/x11.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink3.mk,v 1.7 2006/12/01 13:05:53 joerg Exp $
+# $NetBSD: x11.buildlink3.mk,v 1.8 2007/08/17 20:27:30 joerg Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require an X11 distribution.  x11.buildlink3.mk will include the
@@ -18,9 +18,9 @@ USE_X11=	yes
 # Sanity checks.
 #
 
-.  if ${X11_TYPE} != "native" && ${X11_TYPE} != "xorg"
+.  if ${X11_TYPE} != "native" 
 _WRONG_X11_TYPE:=	${X11_TYPE}
-PKG_FAIL_REASON+=	"[x11.version.mk] X11_TYPE must either be \"xorg\" or \"native\", but not \"${_WRONG_X11_TYPE:Q}\"."
+PKG_FAIL_REASON+=	"Do not include x11.version.mk for X11_TYPE != \"native\"."
 X11_TYPE:=		native
 X11BASE:=		/usr
 .  endif
diff --git a/mk/x11.version.mk b/mk/x11.version.mk
index 03a8e211908..9c09a83f88e 100644
--- a/mk/x11.version.mk
+++ b/mk/x11.version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.version.mk,v 1.6 2006/10/26 17:08:08 rillig Exp $
+# $NetBSD: x11.version.mk,v 1.7 2007/08/17 20:27:31 joerg Exp $
 #
 # The following variables may be set in /etc/mk.conf:
 #
@@ -25,7 +25,6 @@
 #
 
 X11_PKGSRCDIR.native=	../../pkgtools/x11-links
-X11_PKGSRCDIR.xorg=	../../x11/xorg-libs
 
 # Makefiles that include this file can access the version of the X11
 # distribution as ${BUILTIN_X11_VERSION.${X11_TYPE}}.