- Remove support for xfree86-3

PR:		ports/106666
Submitted by:	vd
With hat:	portmgr

9 files changed, 2 insertions, 39 deletions

diff --git a/games/atitd/Makefile b/games/atitd/Makefile
index 570eae34cc7e..10ca373f3322 100644
--- a/games/atitd/Makefile
+++ b/games/atitd/Makefile
@@ -21,15 +21,11 @@ RUN_DEPENDS=	${X11BASE}/bin/xhost:${X_CLIENTS_PORT}
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .ifdef(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so:${PORTSDIR}/graphics/linux_glx
-.endif
 
 PLIST_FILES=	bin/atitd
 USE_LINUX=	yes
diff --git a/games/linux-doom3-demo/Makefile b/games/linux-doom3-demo/Makefile
index 9995c4be7162..1ae94ee7b3c7 100644
--- a/games/linux-doom3-demo/Makefile
+++ b/games/linux-doom3-demo/Makefile
@@ -35,15 +35,11 @@ SUB_LIST=	DOOMDIR="${DOOMDIR}"
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index a04c7314233f..327b5e9c77d7 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -32,15 +32,11 @@ SUB_FILES=	doom3 doom3-ded pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 .if defined(WITH_NO_CDKEY)
 PORTVERSION=	1.1.1286
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index a1054ded0a2d..f99d34f908f3 100644
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -49,17 +49,12 @@ do-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-.   ifdef(WITH_NVIDIA_GL)
+.ifdef(WITH_NVIDIA_GL)
 GL_LIB=		${LINUXBASE}/usr/lib/libGL.so.1
 GL_PORT=	x11/nvidia-driver
-.   else
+.else
 GL_LIB=		${LINUXBASE}/usr/X11R6/lib/libGL.so.1
 GL_PORT=	graphics/linux_dri
-.   endif
-.else
-GL_LIB=		${LINUXBASE}/lib/libGL.so
-GL_PORT=	graphics/linux_glx
 .endif
 
 RUN_DEPENDS+=	${GL_LIB}:${PORTSDIR}/${GL_PORT}
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index bb194f5cd62d..cbe1b464e358 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -42,15 +42,11 @@ LIBDIRS=	Animations Benchmark ForceFeedback KarmaData Maps Music \
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-ut2004-demo/Makefile b/games/linux-ut2004-demo/Makefile
index c835d2572716..92450a292870 100644
--- a/games/linux-ut2004-demo/Makefile
+++ b/games/linux-ut2004-demo/Makefile
@@ -44,15 +44,11 @@ LIBDIRS=	Animations Benchmark ForceFeedback KarmaData Maps Music \
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-virtual-jay-peak/Makefile b/games/linux-virtual-jay-peak/Makefile
index 3f53e94f1bc2..3a00767e8aa4 100644
--- a/games/linux-virtual-jay-peak/Makefile
+++ b/games/linux-virtual-jay-peak/Makefile
@@ -44,14 +44,10 @@ do-install:
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/linux-x-plane-net-installer/Makefile b/games/linux-x-plane-net-installer/Makefile
index af5a1f9b82b8..94f466f76f89 100644
--- a/games/linux-x-plane-net-installer/Makefile
+++ b/games/linux-x-plane-net-installer/Makefile
@@ -30,15 +30,11 @@ PLIST_FILES=	bin/X-Plane-Net-Install
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-x-plane/Makefile b/games/linux-x-plane/Makefile
index bc4594d8a895..c56492f4db52 100644
--- a/games/linux-x-plane/Makefile
+++ b/games/linux-x-plane/Makefile
@@ -76,15 +76,11 @@ DESKTOP_ENTRIES="X-Plane Airfoil Maker" \
 
 .include <bsd.port.pre.mk>
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
 .else
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .endif
-.else
-RUN_DEPENDS+=	${LINUXBASE}/lib/libGL.so.1:${PORTSDIR}/graphics/linux_glx
-.endif
 
 do-fetch:
 	@if ! [ -e ${DISTDIR}/${DISTFILES} ]; then \