Fix some errors, including:

- Build fix when WITH_VMWARE_GTK is set.
- Reorder pkg-plist so that @unexec vmware-guestd.sh successfully done.
- Create directories for server modules, since xserver may not be installed.

Even though this makes no "installed" content change, but bump
PORTREVISION since pkg-plist/pkg-plist.tools are changed.

PR:		93100
Submitted by:	Scot Hetzel, swhetzel at gmail dotcom

8 files changed, 48 insertions, 30 deletions

diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile
index 94024a9cfbce..d53b7636a684 100644
--- a/emulators/vmware-guestd5/Makefile
+++ b/emulators/vmware-guestd5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vmware
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	emulators
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-guestd
@@ -35,6 +35,16 @@ IS_INTERACTIVE=	yes
 .if defined(VMWARE_X_PORTS)
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
+.if defined(WITH_VMWARE_GTK)
+PLIST_SUB+=	INSTALLXGTKTOOL:=""
+USE_ICONV=	yes
+USE_GETTEXT=	yes
+USE_XLIB=	yes
+USE_GNOME=	glib12 gtk12
+LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
+.else
+PLIST_SUB+=	INSTALLXGTKTOOL:="@comment "
+.endif
 .endif
 
 RESTRICTED=	"Not sure if we can redistribute this."
@@ -80,17 +90,6 @@ PLIST_SUB+=	INSTALLXSERVER4:="@comment "
 PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .endif
 
-.if defined(WITH_VMWARE_GTK)
-PLIST_SUB+=	INSTALLXGTKTOOL:=""
-USE_ICONV=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-USE_GNOME=	glib12 gtk12
-LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
-.else
-PLIST_SUB+=	INSTALLXGTKTOOL:="@comment "
-.endif
-
 .else
 
 VMWARE_KMODDIR=	${PREFIX}/lib/vmware-tools/modules
@@ -178,6 +177,11 @@ 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
@@ -192,6 +196,9 @@ do-install:
 .endif
 .elif ${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
diff --git a/emulators/vmware-guestd5/pkg-plist b/emulators/vmware-guestd5/pkg-plist
index ae9bba61ccc1..4f377fe95b86 100644
--- a/emulators/vmware-guestd5/pkg-plist
+++ b/emulators/vmware-guestd5/pkg-plist
@@ -1,7 +1,7 @@
-sbin/vmware-checkvm
-sbin/vmware-guestd
 @unexec %D/etc/rc.d/vmware-guestd.sh forcestop 2>/dev/null || true
 etc/rc.d/vmware-guestd.sh
+sbin/vmware-checkvm
+sbin/vmware-guestd
 %%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
 %%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko
 %%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules
diff --git a/emulators/vmware-guestd5/pkg-plist.tools b/emulators/vmware-guestd5/pkg-plist.tools
index 4d53df227c91..01dff9975c77 100644
--- a/emulators/vmware-guestd5/pkg-plist.tools
+++ b/emulators/vmware-guestd5/pkg-plist.tools
@@ -6,3 +6,5 @@ bin/vmware-toolbox-tcl
 %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
 %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
 %%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
+%%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
+%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile
index 94024a9cfbce..d53b7636a684 100644
--- a/emulators/vmware-guestd6/Makefile
+++ b/emulators/vmware-guestd6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vmware
 PORTVERSION=	${VMWARE_VER}.${BUILD_VER}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	emulators
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-guestd
@@ -35,6 +35,16 @@ IS_INTERACTIVE=	yes
 .if defined(VMWARE_X_PORTS)
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
+.if defined(WITH_VMWARE_GTK)
+PLIST_SUB+=	INSTALLXGTKTOOL:=""
+USE_ICONV=	yes
+USE_GETTEXT=	yes
+USE_XLIB=	yes
+USE_GNOME=	glib12 gtk12
+LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
+.else
+PLIST_SUB+=	INSTALLXGTKTOOL:="@comment "
+.endif
 .endif
 
 RESTRICTED=	"Not sure if we can redistribute this."
@@ -80,17 +90,6 @@ PLIST_SUB+=	INSTALLXSERVER4:="@comment "
 PLIST_SUB+=	INSTALLXVMMOUSE:=""
 .endif
 
-.if defined(WITH_VMWARE_GTK)
-PLIST_SUB+=	INSTALLXGTKTOOL:=""
-USE_ICONV=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-USE_GNOME=	glib12 gtk12
-LIB_DEPENDS+=	c.5:${PORTSDIR}/misc/compat5x
-.else
-PLIST_SUB+=	INSTALLXGTKTOOL:="@comment "
-.endif
-
 .else
 
 VMWARE_KMODDIR=	${PREFIX}/lib/vmware-tools/modules
@@ -178,6 +177,11 @@ 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
@@ -192,6 +196,9 @@ do-install:
 .endif
 .elif ${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
diff --git a/emulators/vmware-guestd6/pkg-plist b/emulators/vmware-guestd6/pkg-plist
index ae9bba61ccc1..4f377fe95b86 100644
--- a/emulators/vmware-guestd6/pkg-plist
+++ b/emulators/vmware-guestd6/pkg-plist
@@ -1,7 +1,7 @@
-sbin/vmware-checkvm
-sbin/vmware-guestd
 @unexec %D/etc/rc.d/vmware-guestd.sh forcestop 2>/dev/null || true
 etc/rc.d/vmware-guestd.sh
+sbin/vmware-checkvm
+sbin/vmware-guestd
 %%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
 %%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko
 %%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules
diff --git a/emulators/vmware-guestd6/pkg-plist.tools b/emulators/vmware-guestd6/pkg-plist.tools
index 4d53df227c91..01dff9975c77 100644
--- a/emulators/vmware-guestd6/pkg-plist.tools
+++ b/emulators/vmware-guestd6/pkg-plist.tools
@@ -6,3 +6,5 @@ bin/vmware-toolbox-tcl
 %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
 %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
 %%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
+%%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
+%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input
diff --git a/emulators/vmware-tools5/Makefile b/emulators/vmware-tools5/Makefile
index cfa067eccb0c..c2d5ba4d1517 100644
--- a/emulators/vmware-tools5/Makefile
+++ b/emulators/vmware-tools5/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vmware
-PORTREVISION?=	0
+PORTREVISION?=	1
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-tools
 
diff --git a/emulators/vmware-tools6/Makefile b/emulators/vmware-tools6/Makefile
index cfa067eccb0c..c2d5ba4d1517 100644
--- a/emulators/vmware-tools6/Makefile
+++ b/emulators/vmware-tools6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vmware
-PORTREVISION?=	0
+PORTREVISION?=	1
 MASTER_SITES=	# bundled with VMware Workstation
 PKGNAMESUFFIX?=	-tools