Bug 188048 - emulators/virtualbox-ose-additions: VBoxClient-all not completely patched for $PREFIX
Summary: emulators/virtualbox-ose-additions: VBoxClient-all not completely patched for...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Virtualbox Team (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-03-29 13:20 UTC by Matthias Andree
Modified: 2014-04-01 19:00 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Matthias Andree freebsd_committer freebsd_triage 2014-03-29 13:20:00 UTC
VBoxClient-all complains on my computer that it cannot find
/usr/bin/VBoxClient.  Apparently the VBoxClient-all script is not fully
patched, this is the end of it:

/usr/local/bin/VBoxClient --clipboard
/usr/local/bin/VBoxClient --checkhostversion
test -z "$no_display" &&
    /usr/local/bin/VBoxClient --display
test -z "$no_display" &&
    /usr/local/bin/VBoxClient --seamless
test -z "$no_display" &&
    /usr/bin/VBoxClient --draganddrop

This is with virtualbox-ose-additions-4.3.10 as of Makefile r349473.

Could this be remedied please?
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-03-29 13:20:07 UTC
Responsible Changed
From-To: freebsd-ports-bugs->vbox

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Matthias Andree freebsd_committer freebsd_triage 2014-03-29 13:25:03 UTC
I just figured that --draganddrop is not supported by my VBoxClient, so
perhaps the last two lines need to be removed instead.
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-04-01 18:52:17 UTC
Author: jkim
Date: Tue Apr  1 17:52:14 2014
New Revision: 349868
URL: http://svnweb.freebsd.org/changeset/ports/349868
QAT: https://qat.redports.org/buildarchive/r349868/

Log:
  Fix VBoxClient-all to properly set VBoxClient path.
  
  PR:		ports/188048

Modified:
  head/emulators/virtualbox-ose-additions/Makefile
  head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
  head/emulators/virtualbox-ose/files/vboxheadless.in

Modified: head/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-additions/Makefile	Tue Apr  1 17:41:29 2014	(r349867)
+++ head/emulators/virtualbox-ose-additions/Makefile	Tue Apr  1 17:52:14 2014	(r349868)
@@ -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/ \

Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
==============================================================================
--- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient	Tue Apr  1 17:41:29 2014	(r349867)
+++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient	Tue Apr  1 17:52:14 2014	(r349868)
@@ -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

Modified: head/emulators/virtualbox-ose/files/vboxheadless.in
==============================================================================
--- head/emulators/virtualbox-ose/files/vboxheadless.in	Tue Apr  1 17:41:29 2014	(r349867)
+++ head/emulators/virtualbox-ose/files/vboxheadless.in	Tue Apr  1 17:52:14 2014	(r349868)
@@ -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"
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Jung-uk Kim freebsd_committer freebsd_triage 2014-04-01 18:57:43 UTC
State Changed
From-To: open->closed

Committed (r349868), thanks!