diff options
| author | jkim <jkim@FreeBSD.org> | 2014-04-02 01:52:14 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-04-02 01:52:14 +0800 |
| commit | 812b69d35c5c3ecc0a5a3dfefc959462ae2938b9 (patch) | |
| tree | 4d16f765b1b1d888468c4576a4c2720bb4d12c04 /emulators | |
| parent | 1e6d09f1d5c488cfc6e3013f189c5c5df323a061 (diff) | |
| download | freebsd-ports-gnome-812b69d35c5c3ecc0a5a3dfefc959462ae2938b9.tar.gz freebsd-ports-gnome-812b69d35c5c3ecc0a5a3dfefc959462ae2938b9.tar.zst freebsd-ports-gnome-812b69d35c5c3ecc0a5a3dfefc959462ae2938b9.zip | |
Fix VBoxClient-all to properly set VBoxClient path.
PR: ports/188048
Diffstat (limited to 'emulators')
3 files changed, 9 insertions, 5 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 2b7e2b8bc683..0b12ac18d733 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.3.10 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient index edb9514f95c5..c5da5f97aa81 100644 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient @@ -1,6 +1,6 @@ ---- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2010-09-10 14:24:55.000000000 +0200 -+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient 2010-12-29 20:42:00.000000000 +0100 -@@ -28,8 +28,8 @@ +--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2014-03-26 15:12:42.000000000 -0400 ++++ src/VBox/Additions/x11/Installer/98vboxadd-xclient 2014-04-01 13:38:20.000000000 -0400 +@@ -30,8 +30,8 @@ xorgbin=Xorg found=`which Xorg | grep "no Xorg"` if test ! -z "$found"; then @@ -11,7 +11,7 @@ else exit 1 fi -@@ -40,9 +40,9 @@ +@@ -42,11 +42,11 @@ no_display=1 fi @@ -25,3 +25,6 @@ test -z "$no_display" && - /usr/bin/VBoxClient --seamless + /usr/local/bin/VBoxClient --seamless + test -z "$no_display" && +- /usr/bin/VBoxClient --draganddrop ++ /usr/local/bin/VBoxClient --draganddrop diff --git a/emulators/virtualbox-ose/files/vboxheadless.in b/emulators/virtualbox-ose/files/vboxheadless.in index 544b5912814f..c952889943a6 100644 --- a/emulators/virtualbox-ose/files/vboxheadless.in +++ b/emulators/virtualbox-ose/files/vboxheadless.in @@ -110,7 +110,7 @@ vboxheadless_status() eval vmname="\${vboxheadless_${machine}_name:-${machine}}" eval vmuser="\${vboxheadless_${machine}_user:-${vboxheadless_user}}" - /usr/bin/su ${vmuser} -c "/usr/local/bin/VBoxManage showvminfo '${vmname}' >/dev/null" 2>/dev/null + /usr/bin/su ${vmuser} -c "%%PREFIX%%/bin/VBoxManage showvminfo '${vmname}' >/dev/null" 2>/dev/null if [ $? != 0 ]; then /usr/bin/printf "%20s %s\n" "${vmname}" "Unknown Machine" |