- Remove support for xfree86-3

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

3 files changed, 5 insertions, 28 deletions

diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile
index f3795778c47..4b09ed1105b 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 68165f70e46..ff7b3d26614 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 acc0046b634..b06f3832af6 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