- Add dependency on devel/icu

- Split startup rc files, start vmware-kmod.sh earlier
- Bump portrevision

Submitted by:   jkim

5 files changed, 98 insertions, 73 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 84849084acca..e2904bba9749 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		emulators
 DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
 MASTER_SITES=		SF
@@ -40,7 +40,13 @@ CONFIGURE_ARGS+=	--without-dnet
 BUILD_DEPENDS=		${LOCALBASE}/lib/libdnet.so:${PORTSDIR}/net/libdnet
 .endif
 
-USE_RC_SUBR=		vmware-guestd.sh
+.if defined(WITHOUT_ICU)
+CONFIGURE_ARGS+=	--without-icu
+.else
+BUILD_DEPENDS=		${LOCALBASE}/lib/libicuuc.so:${PORTSDIR}/devel/icu
+.endif
+
+USE_RC_SUBR=		vmware-guestd.sh vmware-kmod.sh
 
 .include <bsd.port.pre.mk>
 
@@ -68,6 +74,7 @@ post-install:
 .if ${OSREL} >= 6
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmhgfs.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko
 	${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko
+	@-kldxref ${PREFIX}/lib/vmware-tools/modules/drivers 2>/dev/null
 .endif
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/poweroff-vm-default ${PREFIX}/share/vmware-tools/poweroff-vm-default
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/poweron-vm-default ${PREFIX}/share/vmware-tools/poweron-vm-default
diff --git a/emulators/open-vm-tools/files/vmware-guestd.sh.in b/emulators/open-vm-tools/files/vmware-guestd.sh.in
index 93a95c0cef68..d103d830263c 100644
--- a/emulators/open-vm-tools/files/vmware-guestd.sh.in
+++ b/emulators/open-vm-tools/files/vmware-guestd.sh.in
@@ -13,77 +13,6 @@ PREFIX=%%PREFIX%%
 # Global
 checkvm_cmd="${PREFIX}/sbin/vmware-checkvm > /dev/null"
 
-# Functions
-vmware_guest_vmmemctl_start()
-{
-	echo 'Loading vmmemctl kernel module.'
-	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
-}
-vmware_guest_vmxnet_start()
-{
-	echo 'Loading vmxnet kernel module.'
-	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
-}
-vmware_guest_vmblock_start()
-{
-	echo 'Loading vmblock kernel module.'
-	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
-}
-vmware_guest_vmhgfs_start()
-{
-	echo 'Loading vmhgfs kernel module.'
-	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
-}
-
-# VMware kernel module: vmmemctl
-name="vmware_guest_vmmemctl"
-rcvar=`set_rcvar`
-start_precmd="${checkvm_cmd}"
-start_cmd="vmware_guest_vmmemctl_start"
-stop_precmd="${checkvm_cmd}"
-stop_cmd=":"
-
-load_rc_config $name
-[ -z "$vmware_guest_vmmemctl_enable" ] && vmware_guest_vmmemctl_enable="NO"
-[ -n "$vmware_guest_kmod_enable" ] && vmware_guest_vmmemctl_enable="$vmware_guest_kmod_enable"
-run_rc_command "$1"
-
-# VMware kernel module: vmxnet
-name="vmware_guest_vmxnet"
-rcvar=`set_rcvar`
-start_precmd="${checkvm_cmd}"
-start_cmd="vmware_guest_vmxnet_start"
-stop_precmd="${checkvm_cmd}"
-stop_cmd=":"
-
-load_rc_config $name
-[ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO"
-run_rc_command "$1"
-
-# VMware kernel module: vmblock
-name="vmware_guest_vmblock"
-rcvar=`set_rcvar`
-start_precmd="${checkvm_cmd}"
-start_cmd="vmware_guest_vmblock_start"
-stop_precmd="${checkvm_cmd}"
-stop_cmd=":"
-
-load_rc_config $name
-[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO"
-run_rc_command "$1"
-
-# VMware kernel module: vmhgfs
-name="vmware_guest_vmhgfs"
-rcvar=`set_rcvar`
-start_precmd="${checkvm_cmd}"
-start_cmd="vmware_guest_vmhgfs_start"
-stop_precmd="${checkvm_cmd}"
-stop_cmd=":"
-
-load_rc_config $name
-[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO"
-run_rc_command "$1"
-
 # VMware guest daemon
 name="vmware_guestd"
 rcvar=`set_rcvar`
diff --git a/emulators/open-vm-tools/files/vmware-kmod.sh.in b/emulators/open-vm-tools/files/vmware-kmod.sh.in
new file mode 100644
index 000000000000..15b93faf6fb8
--- /dev/null
+++ b/emulators/open-vm-tools/files/vmware-kmod.sh.in
@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: vmware-kmod
+# REQUIRE: FILESYSTEMS
+# BEFORE: netif
+
+PREFIX=%%PREFIX%%
+. %%RC_SUBR%%
+
+# Global
+checkvm_cmd="${PREFIX}/sbin/vmware-checkvm > /dev/null"
+
+# Functions
+vmware_guest_vmmemctl_start()
+{
+	echo 'Loading vmmemctl kernel module.'
+	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
+}
+vmware_guest_vmxnet_start()
+{
+	echo 'Loading vmxnet kernel module.'
+	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
+}
+vmware_guest_vmblock_start()
+{
+	echo 'Loading vmblock kernel module.'
+	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
+}
+vmware_guest_vmhgfs_start()
+{
+	echo 'Loading vmhgfs kernel module.'
+	kldload ${PREFIX}/lib/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
+}
+
+# VMware kernel module: vmmemctl
+name="vmware_guest_vmmemctl"
+rcvar=`set_rcvar`
+start_precmd="${checkvm_cmd}"
+start_cmd="vmware_guest_vmmemctl_start"
+stop_precmd="${checkvm_cmd}"
+stop_cmd=":"
+
+load_rc_config $name
+[ -z "$vmware_guest_vmmemctl_enable" ] && vmware_guest_vmmemctl_enable="NO"
+[ -n "$vmware_guest_kmod_enable" ] && vmware_guest_vmmemctl_enable="$vmware_guest_kmod_enable"
+run_rc_command "$1"
+
+# VMware kernel module: vmxnet
+name="vmware_guest_vmxnet"
+rcvar=`set_rcvar`
+start_precmd="${checkvm_cmd}"
+start_cmd="vmware_guest_vmxnet_start"
+stop_precmd="${checkvm_cmd}"
+stop_cmd=":"
+
+load_rc_config $name
+[ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO"
+run_rc_command "$1"
+
+# VMware kernel module: vmblock
+name="vmware_guest_vmblock"
+rcvar=`set_rcvar`
+start_precmd="${checkvm_cmd}"
+start_cmd="vmware_guest_vmblock_start"
+stop_precmd="${checkvm_cmd}"
+stop_cmd=":"
+
+load_rc_config $name
+[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO"
+run_rc_command "$1"
+
+# VMware kernel module: vmhgfs
+name="vmware_guest_vmhgfs"
+rcvar=`set_rcvar`
+start_precmd="${checkvm_cmd}"
+start_cmd="vmware_guest_vmhgfs_start"
+stop_precmd="${checkvm_cmd}"
+stop_cmd=":"
+
+load_rc_config $name
+[ -z "$vmware_guest_vmhgfs_enable" ] && vmware_guest_vmhgfs_enable="NO"
+run_rc_command "$1"
diff --git a/emulators/open-vm-tools/pkg-plist b/emulators/open-vm-tools/pkg-plist
index 09021eb428aa..2c16bfb77fb2 100644
--- a/emulators/open-vm-tools/pkg-plist
+++ b/emulators/open-vm-tools/pkg-plist
@@ -6,6 +6,7 @@ lib/vmware-tools/modules/drivers/vmmemctl.ko
 lib/vmware-tools/modules/drivers/vmxnet.ko
 %%FIVEONLY%%lib/vmware-tools/modules/drivers/vmhgfs.ko
 %%FIVEONLY%%lib/vmware-tools/modules/drivers/vmblock.ko
+@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
 share/vmware-tools/poweroff-vm-default
 share/vmware-tools/poweron-vm-default
 share/vmware-tools/resume-vm-default
@@ -15,6 +16,7 @@ sbin/vmware-checkvm
 %%FIVEONLY%%sbin/vmware-hgfsmounter
 sbin/vmware-xferlogs
 @dirrm share/vmware-tools
+@unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
 @dirrmtry lib/vmware-tools/modules/drivers
 @dirrmtry lib/vmware-tools/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/open-vm-tools/pkg-plist-x11 b/emulators/open-vm-tools/pkg-plist-x11
index 6c9737420fe1..bf00202c82a0 100644
--- a/emulators/open-vm-tools/pkg-plist-x11
+++ b/emulators/open-vm-tools/pkg-plist-x11
@@ -6,6 +6,7 @@ lib/vmware-tools/modules/drivers/vmmemctl.ko
 lib/vmware-tools/modules/drivers/vmxnet.ko
 %%FIVEONLY%%lib/vmware-tools/modules/drivers/vmhgfs.ko
 %%FIVEONLY%%lib/vmware-tools/modules/drivers/vmblock.ko
+@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
 share/vmware-tools/poweroff-vm-default
 share/vmware-tools/poweron-vm-default
 share/vmware-tools/resume-vm-default
@@ -17,6 +18,7 @@ sbin/vmware-xferlogs
 %%X11%%sbin/vmware-toolbox
 %%X11%%sbin/vmware-user
 @dirrm share/vmware-tools
+@unexec if test -f %D/lib/vmware-tools/modules/drivers/linker.hints; then rm -f %D/lib/vmware-tools/modules/drivers/linker.hints; fi
 @dirrmtry lib/vmware-tools/modules/drivers
 @dirrmtry lib/vmware-tools/modules/input
 @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi