aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--emulators/open-vm-tools/Makefile6
-rw-r--r--emulators/open-vm-tools/files/vmware-guestd.sh.in5
-rw-r--r--emulators/open-vm-tools/files/vmware-kmod.sh.in11
3 files changed, 10 insertions, 12 deletions
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 455429ac9046..81ffe77b9335 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= 6
+PORTREVISION= 7
CATEGORIES= emulators kld
MASTER_SITES= SF
DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
@@ -61,9 +61,9 @@ NOTON5= ""
NOTON5= "@comment "
.endif
-PLIST_SUB+= NOTON5=${NOTON5}
+PLIST_SUB+= NOTON5=${NOTON5} LIB32DIR=${LIB32DIR}
-SUB_LIST+= NOTON5=${NOTON5}
+SUB_LIST+= NOTON5=${NOTON5} LIB32DIR=${LIB32DIR}
post-patch:
.if defined(WITHOUT_X11)
diff --git a/emulators/open-vm-tools/files/vmware-guestd.sh.in b/emulators/open-vm-tools/files/vmware-guestd.sh.in
index 9a95a5e3f0be..043a14b828c1 100644
--- a/emulators/open-vm-tools/files/vmware-guestd.sh.in
+++ b/emulators/open-vm-tools/files/vmware-guestd.sh.in
@@ -7,11 +7,10 @@
# REQUIRE: DAEMON
# BEFORE: LOGIN
-PREFIX=%%PREFIX%%
. %%RC_SUBR%%
# Global
-checkvm_cmd="${PREFIX}/bin/vmware-checkvm > /dev/null"
+checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null"
# VMware guest daemon
name="vmware_guestd"
@@ -20,7 +19,7 @@ start_precmd="${checkvm_cmd}"
unset start_cmd
stop_precmd="${checkvm_cmd}"
unset stop_cmd
-command="${PREFIX}/sbin/vmware-guestd"
+command="%%PREFIX%%/sbin/vmware-guestd"
command_args="--halt-command '/sbin/shutdown -p now' >/dev/null 2>&1"
pidfile="/var/run/${name}.pid"
diff --git a/emulators/open-vm-tools/files/vmware-kmod.sh.in b/emulators/open-vm-tools/files/vmware-kmod.sh.in
index 31c8cfb95da3..6839a023b547 100644
--- a/emulators/open-vm-tools/files/vmware-kmod.sh.in
+++ b/emulators/open-vm-tools/files/vmware-kmod.sh.in
@@ -7,32 +7,31 @@
# REQUIRE: FILESYSTEMS
# BEFORE: netif
-PREFIX=%%PREFIX%%
. %%RC_SUBR%%
# Global
-checkvm_cmd="${PREFIX}/bin/vmware-checkvm > /dev/null"
+checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null"
# Functions
vmware_guest_vmmemctl_start()
{
echo 'Loading vmmemctl kernel module.'
- kldload ${PREFIX}/%%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
+ kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
}
vmware_guest_vmxnet_start()
{
echo 'Loading vmxnet kernel module.'
- kldload ${PREFIX}/%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
+ kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
}
%%NOTON5%%vmware_guest_vmblock_start()
%%NOTON5%%{
%%NOTON5%% echo 'Loading vmblock kernel module.'
-%%NOTON5%% kldload ${PREFIX}/%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
+%%NOTON5%% kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmblock.ko >/dev/null 2>&1
%%NOTON5%%}
%%NOTON5%%vmware_guest_vmhgfs_start()
%%NOTON5%%{
%%NOTON5%% echo 'Loading vmhgfs kernel module.'
-%%NOTON5%% kldload ${PREFIX}/%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
+%%NOTON5%% kldload %%PREFIX%%/%%LIB32DIR%%/vmware-tools/modules/drivers/vmhgfs.ko >/dev/null 2>&1
%%NOTON5%%}
# VMware kernel module: vmmemctl