Remove support for XFree8-4.

From now on, X_WINDOW_SYSTEM != "xorg" is not supported anymore.

PR:		ports/119418
Submitted by:	flz
Approved by:	portmgr (pav)

10 files changed, 1 insertions, 155 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index fc78e618623d..65be6b1b8994 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -760,7 +760,6 @@
     SUBDIR += xfig-devel
     SUBDIR += xfpovray
     SUBDIR += xfractint
-    SUBDIR += xfree86-dri
     SUBDIR += xglurbules
     SUBDIR += xgrasp
     SUBDIR += xli
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 2ae09d9b6337..41a2d12ac840 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -54,10 +54,4 @@ do-install:
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	requires libGL from X.Org
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 59db8cb633fd..0eb898d210a4 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -40,12 +40,8 @@ PLIST_SUB+=	NLS="@comment "
 BROKEN=		Does not compile on alpha
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} == "xfree86-4"
-BUILD_DEPENDS+=	pswrap:${PORTSDIR}/devel/imake-4
-.else
 BUILD_DEPENDS+=	pswrap:${PORTSDIR}/x11/dgs
 LIB_DEPENDS+=	dpstk.0:${PORTSDIR}/x11/dgs
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index c8424d2b0171..43e604456236 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -91,10 +91,6 @@ do-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=		does not build with XFree86
-.endif
-
 .if defined(WITH_NVIDIA_GL)
 CFLAGS+=	-DWITH_NVIDIA_GL=1
 .endif
diff --git a/graphics/xfree86-dri/Makefile b/graphics/xfree86-dri/Makefile
deleted file mode 100644
index 632ac950316e..000000000000
--- a/graphics/xfree86-dri/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for:    dri
-# Date created:		8 Nov 2003
-# Whom:			anholt@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xfree86-dri
-PORTVERSION=	4.5.0
-PORTREVISION=	1
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES=	XFree86-${PORTVERSION}-src-1.tgz \
-		XFree86-${PORTVERSION}-src-2.tgz \
-		XFree86-${PORTVERSION}-src-3.tgz
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	OpenGL hardware acceleration drivers for XFree86
-
-CONFLICTS=	dri-[5-9].*
-
-EXTRA_PATCHES+=		${FILESDIR}/patch-GL-Imakefile
-
-ONLY_FOR_ARCHS=		i386 alpha amd64
-
-XBUILD_DIRS=		lib/GL
-XINSTALL_DIRS=		lib/GL/mesa/drivers/dri
-
-.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xfree86-4
-IGNORE=	is part of XFree86 and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-
-.if ${ARCH} == i386
-PLIST_SUB+=	I386=""
-.else
-PLIST_SUB+=	I386="@comment "
-.endif
-.if ${ARCH} == alpha
-PLIST_SUB+=	ALPHA_NA="@comment "
-.else
-PLIST_SUB+=	ALPHA_NA=""
-.endif
-.if ${ARCH} == amd64
-PLIST_SUB+=	AMD64_NA="@comment "
-.else
-PLIST_SUB+=	AMD64_NA=""
-.endif
-.include <bsd.port.post.mk>
diff --git a/graphics/xfree86-dri/distinfo b/graphics/xfree86-dri/distinfo
deleted file mode 100644
index a439d4854378..000000000000
--- a/graphics/xfree86-dri/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712
-SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae
-SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331
-MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c
-SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09
-SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556
-MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb
-SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df
-SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763
diff --git a/graphics/xfree86-dri/files/patch-GL-Imakefile b/graphics/xfree86-dri/files/patch-GL-Imakefile
deleted file mode 100644
index 94e8b7e8875a..000000000000
--- a/graphics/xfree86-dri/files/patch-GL-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/Imakefile.orig	Sat Nov  8 23:54:33 2003
-+++ lib/GL/Imakefile	Sat Nov  8 23:55:05 2003
-@@ -106,7 +106,7 @@
- #if BuildXF86DRI && GlxUseBuiltInDRIDriver
- SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #else
--SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
-+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(DRIVERDIRS)
- #endif
- 
- MakeSubdirs($(SUBDIRS))
diff --git a/graphics/xfree86-dri/pkg-descr b/graphics/xfree86-dri/pkg-descr
deleted file mode 100644
index cae2b2e00e06..000000000000
--- a/graphics/xfree86-dri/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This package contains the client drivers for the DRI, included with XFree86.
-With an X Server configured for the DRI they allow direct rendering of
-hardware-accelerated OpenGL.
-
-WWW: http://www.xfree86.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/graphics/xfree86-dri/pkg-plist b/graphics/xfree86-dri/pkg-plist
deleted file mode 100644
index 559430917d63..000000000000
--- a/graphics/xfree86-dri/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-lib/modules/dri/gamma_dri.so
-%%ALPHA_NA%%lib/modules/dri/i810_dri.so
-%%I386%%lib/modules/dri/i915_dri.so
-lib/modules/dri/mga_dri.so
-lib/modules/dri/r128_dri.so
-lib/modules/dri/r200_dri.so
-lib/modules/dri/radeon_dri.so
-%%I386%%lib/modules/dri/sis_dri.so
-%%AMD64_NA%%lib/modules/dri/tdfx_dri.so
-@dirrm lib/modules/dri
-@dirrmtry lib/modules
diff --git a/graphics/xfree86-dri/scripts/configure b/graphics/xfree86-dri/scripts/configure
deleted file mode 100644
index 609c55af6fe5..000000000000
--- a/graphics/xfree86-dri/scripts/configure
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# This script does the following:
-# (1) cp xf86site.def, installed by imake-4 port,
-#       to ${WRKDIR}/xc/config/cf.
-#     this provides settings for the ports system.
-# (2) Create a host.def for this specific port, using 
-#     host.def as a base.
-
-ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
-DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
-ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
-LOCALDEF=$WRKDIR/.config
-HOSTDEF=$WRKDIR/xc/config/cf/host.def
-
-# Use original host.def as initial config file
-rm -f $LOCALDEF
-grep -v '#define.*ProjectRoot' $ORIGHOSTDEF	>> $LOCALDEF
-echo "#define ProjectRoot $PREFIX"		>> $LOCALDEF
-echo "#define X11ProjectRoot $PREFIX"		>> $LOCALDEF
-
-# This is also defined in xf86site.def, but doesn't get
-# picked up for some reason.
-echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF
-
-echo "#define BuildXF86DRI YES"			>> $LOCALDEF
-echo "#define BuildXF86DRM NO"			>> $LOCALDEF
-echo "#define HasGlide3 YES"			>> $LOCALDEF
-
-echo "#define BuildGLXLibrary YES"		>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define UseInstalled YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-
-echo "#define FreeBSDCC	${CC}"			>> $LOCALDEF
-echo "#define FreeBSDCXX ${CXX}"		>> $LOCALDEF
-echo "#define FreeBSDCFLAGS ${CFLAGS}"		>> $LOCALDEF
-
-# Copy ORIGDEF to DESTDEF
-rm -f $DESTDEF
-cp -f $ORIGDEF $DESTDEF
-
-# copy generated config to host.def
-cp -f $LOCALDEF $HOSTDEF
-
-exit 0