- Remove support for xfree86-3

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

13 files changed, 23 insertions, 129 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 45d1c24831c8..909e681c9d14 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -16,6 +16,7 @@ PKGNAMESUFFIX?=	${GNOME_SUFFIX}${PKGNAMESUFFIX2}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
 .if !defined(VICE_WITH_GNOME)
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
@@ -89,10 +90,6 @@ CFLAGS+=		-DHAVE_LIBESD=1 -DHAVE_SDL_SDL_AUDIO_H=1
 CONFIGURE_ARGS+=	--without-esd
 .endif
 
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
-BUILD_DEPENDS+=	bdftopcf:${X_CLIENTS_PORT}
-.endif
-
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
 # ../src/resid/libresid.a(wave.o)(.rodata+0x0): relocation truncated to fit: GPREL32 *UND*
 BROKEN=		"GPREL relocation truncated"
diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile
index f3795778c479..4b09ed1105b3 100644
--- a/emulators/vmware-guestd4/Makefile
+++ b/emulators/vmware-guestd4/Makefile
@@ -52,17 +52,7 @@ MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
 
-.if defined(VMWARE_X_PORTS)
-
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PLIST_SUB+=	INSTALLXSERVER3:=""
-PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-.else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
-PLIST_SUB+=	INSTALLXSERVER4:=""
-.endif
-
-.else
+.if !defined(VMWARE_X_PORTS)
 
 .if !defined(WITHOUT_VMWARE_VMMEMCTL)
 .if exists(/usr/src/sys/Makefile)
@@ -125,18 +115,9 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${X11BASE}/bin
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-3/XF86Config ${X11BASE}/etc/XF86Config_VMware
-	@${ECHO} ""
-	@${ECHO} "You have installed XFree86 3.x X Server for VMware."
-	@${ECHO} "${X11BASE}/etc/XF86Config_VMware is a sample XF86Config file."
-	@${ECHO} "Copy this file to /etc/XF86Config before starting X."
-.else
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
 	${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
-.endif
 	-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
 
 .else
diff --git a/emulators/vmware-guestd4/pkg-descr.tools b/emulators/vmware-guestd4/pkg-descr.tools
index 68165f70e46f..ff7b3d266147 100644
--- a/emulators/vmware-guestd4/pkg-descr.tools
+++ b/emulators/vmware-guestd4/pkg-descr.tools
@@ -7,9 +7,7 @@ configulation files, and special XFree86 3.x server for Guest OS.
 However, we cannot install dual-boot configuration since it requires
 to modify /etc files.
 
-This ports will install vmware-toolbox to your computer, and
-XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, 
-If you already use XFree86 4.1.0 or later, you may use 'vmware'
+This ports will install vmware-toolbox to your computer.  You may use 'vmware'
 driver for X server.  Vmware-guestd is installed as a separate port,
 ports/emulators/vmware-guestd4, but this port install guestd automatically.
 
diff --git a/emulators/vmware-guestd4/pkg-plist.tools b/emulators/vmware-guestd4/pkg-plist.tools
index acc0046b6340..b06f3832af6d 100644
--- a/emulators/vmware-guestd4/pkg-plist.tools
+++ b/emulators/vmware-guestd4/pkg-plist.tools
@@ -1,6 +1,4 @@
 bin/vmware-toolbox
-%%INSTALLXSERVER3:%%bin/XF86_VMware
-%%INSTALLXSERVER3:%%etc/XF86Config_VMware
-%%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
-%%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
-%%INSTALLXSERVER4:%%lib/modules/input/vmmouse_drv.o_VMware
+etc/XF86Config-4_VMware
+lib/modules/drivers/vmware_drv.o_VMware
+lib/modules/input/vmmouse_drv.o_VMware
diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile
index c0362691e13e..bdabbe499ee9 100644
--- a/emulators/vmware-guestd5/Makefile
+++ b/emulators/vmware-guestd5/Makefile
@@ -69,22 +69,10 @@ BITS?=		64
 
 .if defined(VMWARE_X_PORTS)
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-.if ${BITS} == 32
-PLIST_SUB+=	INSTALLXSERVER3:=""
-.else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
-.endif
-PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-PLIST_SUB+=	INSTALLXVMMOUSE:="@comment "
-.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
 PLIST_SUB+=	INSTALLXSERVER4:=""
-PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
 PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .endif
 
 .else
@@ -174,24 +162,10 @@ do-install:
 .if defined(WITH_VMWARE_GTK)
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin
 .endif
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 	if [ ! -d ${X11BASE}/lib/modules/input ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/input ; \
 	fi
-.endif
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-.if ${BITS} == 32
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-3/XF86Config ${X11BASE}/etc/XF86Config_VMware
-	@${ECHO} ""
-	@${ECHO} "You have installed XFree86 3.x X Server for VMware."
-	@${ECHO} "${X11BASE}/etc/XF86Config_VMware is a sample XF86Config file."
-	@${ECHO} "Copy this file to /etc/XF86Config before starting X."
-.else
-	@${ECHO} "There is no XFree86 3.x X server for your system."
-	@${ECHO} "Consider upgrading your X to XFree86 4.x or switch to X.Org."
-.endif
-.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
+.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 ; \
diff --git a/emulators/vmware-guestd5/pkg-descr.tools b/emulators/vmware-guestd5/pkg-descr.tools
index 2027da8571ce..cccff5433821 100644
--- a/emulators/vmware-guestd5/pkg-descr.tools
+++ b/emulators/vmware-guestd5/pkg-descr.tools
@@ -2,14 +2,11 @@ VMware tools support FreeBSD _guest_ OS running on VMware Workstation.
 Beware, this port is _not_ for FreeBSD _host_ OS.
 
 VMware tools for FreeBSD consist of vmware-toolbox which supports
-seamless operation between the Host and the Guest OS, dual-boot
-configulation files, and special XFree86 3.x server for Guest OS.
-However, we cannot install dual-boot configuration since it requires
-to modify /etc files.
+seamless operation between the Host and the Guest OS and dual-boot
+configulation files.  However, we cannot install dual-boot configuration
+since it requires to modify /etc files.
 
-This ports will install vmware-toolbox to your computer, and
-XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, 
-If you already use XFree86 4.1.0 or later, you may use 'vmware'
+This ports will install vmware-toolbox to your computer.  You may use 'vmware'
 driver for X server.  Vmware-guestd is installed as a separate port,
 ports/emulators/vmware-guestd4, but this port install guestd automatically.
 
diff --git a/emulators/vmware-guestd5/pkg-plist.tools b/emulators/vmware-guestd5/pkg-plist.tools
index 01dff9975c77..c9e1f6501362 100644
--- a/emulators/vmware-guestd5/pkg-plist.tools
+++ b/emulators/vmware-guestd5/pkg-plist.tools
@@ -1,10 +1,8 @@
 bin/vmware-toolbox
 bin/vmware-toolbox-tcl
 %%INSTALLXGTKTOOL:%%bin/vmware-toolbox-gtk
-%%INSTALLXSERVER3:%%bin/XF86_VMware
-%%INSTALLXSERVER3:%%etc/XF86Config_VMware
 %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
 %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
-%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
+lib/modules/input/vmmouse_drv.o_VMware
 %%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
-%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input
+dirrmtry lib/modules/input
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index c0362691e13e..bdabbe499ee9 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -69,22 +69,10 @@ BITS?=		64
 
 .if defined(VMWARE_X_PORTS)
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-.if ${BITS} == 32
-PLIST_SUB+=	INSTALLXSERVER3:=""
-.else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
-.endif
-PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-PLIST_SUB+=	INSTALLXVMMOUSE:="@comment "
-.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
+.if ${X_WINDOW_SYSTEM:L} == xfree86-4
 PLIST_SUB+=	INSTALLXSERVER4:=""
-PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .else
-PLIST_SUB+=	INSTALLXSERVER3:="@comment "
 PLIST_SUB+=	INSTALLXSERVER4:="@comment "
-PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .endif
 
 .else
@@ -174,24 +162,10 @@ do-install:
 .if defined(WITH_VMWARE_GTK)
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin
 .endif
-.if ${X_WINDOW_SYSTEM:L} != xfree86-3
 	if [ ! -d ${X11BASE}/lib/modules/input ] ; then \
 		${MKDIR} ${X11BASE}/lib/modules/input ; \
 	fi
-.endif
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-.if ${BITS} == 32
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-3/XF86Config ${X11BASE}/etc/XF86Config_VMware
-	@${ECHO} ""
-	@${ECHO} "You have installed XFree86 3.x X Server for VMware."
-	@${ECHO} "${X11BASE}/etc/XF86Config_VMware is a sample XF86Config file."
-	@${ECHO} "Copy this file to /etc/XF86Config before starting X."
-.else
-	@${ECHO} "There is no XFree86 3.x X server for your system."
-	@${ECHO} "Consider upgrading your X to XFree86 4.x or switch to X.Org."
-.endif
-.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
+.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 ; \
diff --git a/emulators/vmware-guestd6/pkg-descr.tools b/emulators/vmware-guestd6/pkg-descr.tools
index 2027da8571ce..cccff5433821 100644
--- a/emulators/vmware-guestd6/pkg-descr.tools
+++ b/emulators/vmware-guestd6/pkg-descr.tools
@@ -2,14 +2,11 @@ VMware tools support FreeBSD _guest_ OS running on VMware Workstation.
 Beware, this port is _not_ for FreeBSD _host_ OS.
 
 VMware tools for FreeBSD consist of vmware-toolbox which supports
-seamless operation between the Host and the Guest OS, dual-boot
-configulation files, and special XFree86 3.x server for Guest OS.
-However, we cannot install dual-boot configuration since it requires
-to modify /etc files.
+seamless operation between the Host and the Guest OS and dual-boot
+configulation files.  However, we cannot install dual-boot configuration
+since it requires to modify /etc files.
 
-This ports will install vmware-toolbox to your computer, and
-XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, 
-If you already use XFree86 4.1.0 or later, you may use 'vmware'
+This ports will install vmware-toolbox to your computer.  You may use 'vmware'
 driver for X server.  Vmware-guestd is installed as a separate port,
 ports/emulators/vmware-guestd4, but this port install guestd automatically.
 
diff --git a/emulators/vmware-guestd6/pkg-plist.tools b/emulators/vmware-guestd6/pkg-plist.tools
index 01dff9975c77..c9e1f6501362 100644
--- a/emulators/vmware-guestd6/pkg-plist.tools
+++ b/emulators/vmware-guestd6/pkg-plist.tools
@@ -1,10 +1,8 @@
 bin/vmware-toolbox
 bin/vmware-toolbox-tcl
 %%INSTALLXGTKTOOL:%%bin/vmware-toolbox-gtk
-%%INSTALLXSERVER3:%%bin/XF86_VMware
-%%INSTALLXSERVER3:%%etc/XF86Config_VMware
 %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
 %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
-%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
+lib/modules/input/vmmouse_drv.o_VMware
 %%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
-%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input
+dirrmtry lib/modules/input
diff --git a/emulators/vmware-tools3/Makefile b/emulators/vmware-tools3/Makefile
index 7710dd232680..1b81f5ced6f6 100644
--- a/emulators/vmware-tools3/Makefile
+++ b/emulators/vmware-tools3/Makefile
@@ -46,12 +46,6 @@ MOUNT_PT?=	/mnt
 MOUNT=		/sbin/mount
 UMOUNT=		/sbin/umount
 
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-PLIST_SUB+=	INSTALLXSERVER:=""
-.else
-PLIST_SUB+=	INSTALLXSERVER:="@comment "
-.endif
-
 do-fetch:
 	@${DO_NADA}
 fetch-list:
@@ -86,14 +80,6 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vmware-toolbox ${PREFIX}/bin
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-	${INSTALL_PROGRAM} ${WRKSRC}/XF86_VMware ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/XF86Config.dist ${PREFIX}/etc/XF86Config_VMware
-	@${ECHO} ""
-	@${ECHO} "You have installed XFree86 3.x X Server for VMware."
-	@${ECHO} "${PREFIX}/etc/XF86Config_VMware is a sample XF86Config file."
-	@${ECHO} "Copy this file to /etc/XF86Config before starting X."
-.endif
 	-${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end
 
 .include <bsd.port.post.mk>
diff --git a/emulators/vmware-tools3/pkg-descr b/emulators/vmware-tools3/pkg-descr
index 07e884cac2bd..1b1b6c212f25 100644
--- a/emulators/vmware-tools3/pkg-descr
+++ b/emulators/vmware-tools3/pkg-descr
@@ -7,9 +7,7 @@ configulation files, and special XFree86 3.x server for Guest OS.
 However, we cannot install dual-boot configuration since it requires
 to modify /etc files.
 
-This ports will install vmware-toolbox to your computer, and
-XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, 
-If you already use XFree86 4.1.0 or later, you may use 'vmware'
+This ports will install vmware-toolbox to your computer.  You may use 'vmware'
 driver for X server.  Vmware-guestd is installed as a separate port,
 ports/emulators/vmware-guestd3, but this port install guestd automatically.
 
diff --git a/emulators/vmware-tools3/pkg-plist b/emulators/vmware-tools3/pkg-plist
index 51edd7fd6855..a3ee170075eb 100644
--- a/emulators/vmware-tools3/pkg-plist
+++ b/emulators/vmware-tools3/pkg-plist
@@ -1,3 +1 @@
 bin/vmware-toolbox
-%%INSTALLXSERVER:%%bin/XF86_VMware
-%%INSTALLXSERVER:%%etc/XF86Config_VMware