More fix on X modules.

The X server modules (display driver and mouse driver) bundled with
VMware Tools doesn't work with X.Org 7.2 server.  So install these
modules if and only if X is actually XFree86 4.x.

Also fix pkg-plist (sorry the last commit makes plist broken.)

Bump vmware-tools6 PORTREVISION to note the changes above.

For X.Org 7.2 users:
	x11-drivers/xf86-video-vmware is the video driver for VMs, that
	is installed by default.

	x11-drivers/xf86-input-vmmouse is the mouse driver for VMs.
	However, it doesn't need if vmware-toolbox runs.

3 files changed, 6 insertions, 13 deletions

diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index 659f687a702b..ceb647ffaba9 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -82,10 +82,11 @@ OSSFX?=		-6
 
 .if ${X_WINDOW_SYSTEM:L} == xfree86-4
 PLIST_SUB+=	INSTALLXSERVER4=""
+PLIST_SUB+=	INSTALLXMODULES=""
 VMWARE_XMODDIR=	${X11BASE}/lib/modules
 .else
 PLIST_SUB+=	INSTALLXSERVER4="@comment "
-VMWARE_XMODDIR=	${X11BASE}/lib/xorg/modules
+PLIST_SUB+=	INSTALLXMODULES="@comment "
 .endif
 
 .else
@@ -196,13 +197,13 @@ 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
-.if ${X_WINDOW_SYSTEM:L} == xfree86-4
 	${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
@@ -211,14 +212,6 @@ do-install:
 	${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
-.else
-.if ${BITS} == 32
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmware_drv.o ${VMWARE_XMODDIR}/drivers/vmware_drv.o_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${VMWARE_XMODDIR}/input/vmmouse_drv.o_VMware
-.else
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmware_drv.o ${VMWARE_XMODDIR}/drivers/vmware_drv.o_VMware
-	${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.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
 
diff --git a/emulators/vmware-guestd6/pkg-plist.tools b/emulators/vmware-guestd6/pkg-plist.tools
index 27e9f68924b1..acae0a27e991 100644
--- a/emulators/vmware-guestd6/pkg-plist.tools
+++ b/emulators/vmware-guestd6/pkg-plist.tools
@@ -2,8 +2,8 @@ bin/vmware-toolbox
 bin/vmware-toolbox-tcl
 %%INSTALLXGTKTOOL%%bin/vmware-toolbox-gtk
 %%INSTALLXSERVER4%%etc/XF86Config-4_VMware
-lib/modules/drivers/vmware_drv.o_VMware
-lib/modules/input/vmmouse_drv.o_VMware
+%%INSTALLXMODULES%%lib/modules/drivers/vmware_drv.o_VMware
+%%INSTALLXMODULES%%lib/modules/input/vmmouse_drv.o_VMware
 @dirrmtry lib/modules/drivers
 @dirrmtry lib/modules/input
 @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
diff --git a/emulators/vmware-tools6/Makefile b/emulators/vmware-tools6/Makefile
index 357bf1bc0288..c7a77bd853ee 100644
--- a/emulators/vmware-tools6/Makefile
+++ b/emulators/vmware-tools6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vmware
-PORTREVISION?=	1
+PORTREVISION?=	2
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-tools