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)

3 files changed, 0 insertions, 42 deletions

diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index ff0e370eee6b..c4b36f58ecdc 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -89,8 +89,6 @@ IGNORE="Please get a ROM dump from your AtariST and save it as"\
 "\"${TOSIMG}\" in \"${DISTDIR}\" manually, and then make install again"
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} == xorg
 BUILD_DEPENDS+=		${X11BASE}/lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile
index 6bf25215a4cc..4d53d96c8fbc 100644
--- a/emulators/vmware-guestd5/Makefile
+++ b/emulators/vmware-guestd5/Makefile
@@ -66,11 +66,7 @@ BITS?=		64
 
 .if defined(VMWARE_X_PORTS)
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	INSTALLXSERVER4:=""
-.else
 PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-.endif
 
 .else
 
@@ -159,25 +155,11 @@ do-install:
 	if [ ! -d ${X11BASE}/lib/modules/input ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/input ; \
 	fi
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
-	if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \
-		${MKDIR} ${X11BASE}/lib/modules/drivers ; \
-	fi
-.if ${BITS} == 32
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
-.else
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
-.endif
-.else
 .if ${BITS} == 32
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
 .else
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
 .endif
-.endif
 	-${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end
 
 .else
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index b5e0121e2d2d..093d299639c7 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -75,14 +75,8 @@ OSSFX?=		-6
 
 .if defined(VMWARE_X_PORTS)
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	INSTALLXSERVER4=""
-PLIST_SUB+=	INSTALLXMODULES=""
-VMWARE_XMODDIR=	${X11BASE}/lib/modules
-.else
 PLIST_SUB+=	INSTALLXSERVER4="@comment "
 PLIST_SUB+=	INSTALLXMODULES="@comment "
-.endif
 
 .else
 
@@ -183,22 +177,6 @@ do-install:
 .if defined(WITH_VMWARE_GTK)
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-gtk ${X11BASE}/bin
 .endif
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
-	if [ ! -d ${VMWARE_XMODDIR}/input ] ; then \
-		${MKDIR} ${VMWARE_XMODDIR}/input ; \
-	fi
-	if [ ! -d ${VMWARE_XMODDIR}/drivers ] ; then \
-		${MKDIR} ${VMWARE_XMODDIR}/drivers ; \
-	fi
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
-.if ${BITS} == 32
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${VMWARE_XMODDIR}/drivers/vmware_drv.o_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${VMWARE_XMODDIR}/input/vmmouse_drv.o_VMware
-.else
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmware_drv.o ${VMWARE_XMODDIR}/drivers/vmware_drv.o_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmmouse_drv.o ${VMWARE_XMODDIR}/input/vmmouse_drv.o_VMware
-.endif
-.endif
 	-${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd --cmd toolinstall.end 2>&1
 
 .else