Remove XFree86.

5 files changed, 14 insertions, 35 deletions

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index a1f9e8e76db..b6f8c9d22ba 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.236 2006/09/22 21:53:57 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.237 2006/09/27 15:18:15 joerg Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -391,19 +391,15 @@ 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)
+# Default installation prefix for meta-pkgs/xorg.
+.if 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))
+.if (defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)) && \
+    (defined(X11_TYPE) && empty(X11_TYPE:Mnative))
 X11BASE?=		${LOCALBASE}/${X11ROOT_PREFIX}
 .endif
 
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 02d962c4c6f..ebe7a1b0c53 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.130 2006/09/24 16:23:04 salo Exp $
+# $NetBSD: mk.conf,v 1.131 2006/09/27 15:18:15 joerg Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -184,7 +184,7 @@ VARBASE?=	/var
 
 #X11_TYPE?=    native
 # Used to set the X11 implementation used to build X11 packages.
-# Possible: xorg (uses x11/xorg-libs), XFree86 (uses x11/XFree86-libs), or
+# Possible: xorg (uses x11/xorg-libs), 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/dirs.mk b/mk/dirs.mk
index 0b9f6202c95..60676724e17 100644
--- a/mk/dirs.mk
+++ b/mk/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.7 2006/04/06 23:09:06 minskim Exp $
+# $NetBSD: dirs.mk,v 1.8 2006/09/27 15:18:15 joerg Exp $
 #
 
 .if !defined(DIRS_MK)
@@ -30,8 +30,6 @@ _USE_XDG_DIRS:=		${ver}
 .  elif ${pkg} == "xdg-x11" && ${_USE_XDG_X11_DIRS} < ${ver} && \
 	defined(USE_X11BASE)
 _USE_XDG_X11_DIRS:=	${ver}
-.  elif ${pkg} == "XFree86" && ${_USE_XFREE86_DIRS} < ${ver}
-_USE_XFREE86_DIRS:=	${ver}
 .  elif ${pkg} == "xorg" && ${_USE_XORG_DIRS} < ${ver}
 _USE_XORG_DIRS:=	${ver}
 .  endif
@@ -65,10 +63,6 @@ _USE_XORG_DIRS:=	${ver}
 .  include "../../misc/xdg-x11-dirs/dirs.mk"
 .endif
 
-.if !empty(_USE_XFREE86_DIRS)
-.  include "../../misc/XFree86-dirs/dirs.mk"
-.endif
-
 .if !empty(_USE_XORG_DIRS)
 .  include "../../misc/xorg-dirs/dirs.mk"
 .endif
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 35d712cdfc2..94cc251d008 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.175 2006/08/07 14:54:14 cube Exp $
+# $NetBSD: replace.mk,v 1.176 2006/09/27 15:18:15 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -957,16 +957,11 @@ _TOOLS.x11-clients=	bdftopcf iceauth mkfontdir mkfontscale \
 
 .for _t_ in ${_TOOLS.x11-clients}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
-.    if !empty(PKGPATH:Mx11/XFree86-clients) || \
-        !empty(PKGPATH:Mx11/xorg-clients)
+.    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:MXFree86)
-TOOLS_DEPENDS.${_t_}?=	XFree86-clients>=4.4.0:../../x11/XFree86-clients
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=XFree86-clients
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
-.      elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
+.      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_}
@@ -987,7 +982,6 @@ _TOOLS.x11-imake=	imake makedepend mkdirhier xmkmf
 .for _t_ in ${_TOOLS.x11-imake}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
 .    if !empty(PKGPATH:Mdevel/nbitools) || \
-	!empty(PKGPATH:Mx11/XFree86-imake) || \
 	!empty(PKGPATH:Mx11/xorg-imake)
 MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
@@ -996,10 +990,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:MXFree86)
-TOOLS_DEPENDS.${_t_}?=	XFree86-imake>=4.4.0:../../x11/XFree86-imake
-TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=imake
-TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_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
diff --git a/mk/x11.version.mk b/mk/x11.version.mk
index 0f55ca61740..90fe3f2abd7 100644
--- a/mk/x11.version.mk
+++ b/mk/x11.version.mk
@@ -1,10 +1,10 @@
-# $NetBSD: x11.version.mk,v 1.4 2006/06/05 17:11:37 joerg Exp $
+# $NetBSD: x11.version.mk,v 1.5 2006/09/27 15:18:15 joerg Exp $
 #
 # The following variables may be set in /etc/mk.conf:
 #
 #    X11_TYPE sets the X11 distribution used when building X11 packages.
-#	Possible values are "xorg" (use x11/xorg-libs), "XFree86" (use
-#	x11/XFree86-libs), or "native" (use the native X11 distribution).
+#	Possible values are "xorg" (use x11/xorg-libs), or "native"
+#	(use the native X11 distribution).
 #	The default X11_TYPE is "native" unless defined for a specific
 #	operating system in mk/platform/${OPSYS}.mk.
 #
@@ -25,7 +25,6 @@
 #
 
 X11_PKGSRCDIR.native=	../../pkgtools/x11-links
-X11_PKGSRCDIR.XFree86=	../../x11/XFree86-libs
 X11_PKGSRCDIR.xorg=	../../x11/xorg-libs
 
 # Makefiles that include this file can access the version of the X11