mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

- Update to 0.5

Browse Source 
- Remove patches already included upstream

Approved by:	beat (co-mentor)
This commit is contained in:
Bernhard Froehlich 2010-09-28 12:57:09 +00:00
parent 290fbd321c
commit 9ffa6f4195
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=262028
5 changed files with 6 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/phpvirtualbox/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= phpvirtualbox
PORTVERSION= 0.4
PORTVERSION= 0.5
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
@ -22,8 +22,6 @@ NO_BUILD= yes
USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*\.(php|txt|js|css|html)
EXTRACT_AFTER_ARGS= -d ${WRKSRC}
do-install:
@${MKDIR} ${WWWDIR}
@${CP} ${WRKSRC}/config.php ${WWWDIR}/config.php.sample

6
www/phpvirtualbox/distinfo
View File

@ -1,3 +1,3 @@
MD5 (phpvirtualbox-0.4.zip) = c965e99d842d5749b3cd37dde0367d3c
SHA256 (phpvirtualbox-0.4.zip) = 910b9a53caf3b3ae090347f78f2427cc362816f8025713144bc4f7d5768999f0
SIZE (phpvirtualbox-0.4.zip) = 2749143
MD5 (phpvirtualbox-0.5.zip) = e7dd53c7dcd6bb90e7215f36c20232aa
SHA256 (phpvirtualbox-0.5.zip) = 574b4d37a5dd45c9fc850a060c47750c73564784510bf2e251cae836b31c9585
SIZE (phpvirtualbox-0.5.zip) = 2786393

76
www/phpvirtualbox/files/patch-lib-vboxconnector.php
View File

@ -1,76 +0,0 @@
--- lib/vboxconnector.php (revision 31)
+++ lib/vboxconnector.php (revision 32)
@@ -1257,7 +1257,12 @@
if($states[$state]['session'] == 'direct') {
$this->vbox->openSession($this->session, $vm);
} else {
- $this->vbox->openExistingSession($this->session, $vm, 'vrdp', '');
+
+ // VRDP is not supported in OSE
+ $version = $this->getVersion();
+ $sessionType = ($version['ose'] ? 'headless' : 'vrdp');
+
+ $this->vbox->openExistingSession($this->session, $vm, $sessionType, '');
}
// If this operation returns a progress object save progress
@@ -1335,7 +1340,13 @@
try {
// create session
$this->session = &$this->websessionManager->getSessionObject($this->vbox);
- $progress = $this->vbox->openRemoteSession($this->session, $vm, 'vrdp', '');
+
+ // VRDP is not supported in OSE
+ $version = $this->getVersion();
+ $sessionType = ($version['ose'] ? 'headless' : 'vrdp');
+
+ $progress = $this->vbox->openRemoteSession($this->session, $vm, $sessionType, '');
+
} catch (Exception $e) {
// Error opening session
$this->errors[] = $e;
@@ -2132,10 +2143,15 @@
$progress = $session = null;
try {
+
+ // VRDP is not supported in OSE
+ $version = $this->getVersion();
+ $sessionType = ($version['ose'] ? 'headless' : 'vrdp');
+
// Open session to machine
$session = &$this->websessionManager->getSessionObject($this->vbox);
if($state == 'Closed') $this->vbox->openSession($session, $args['vm']);
- else $this->vbox->openExistingSession($session, $args['vm'], 'vrdp', '');
+ else $this->vbox->openExistingSession($session, $args['vm'], $sessionType, '');
$progress = $session->console->takeSnapshot($args['name'],$args['description']);
@@ -2414,7 +2430,12 @@
if($args['type'] == 'HardDisk' || $state == 'Closed') {
$this->vbox->openSession($this->session, $uuid);
} else {
- $this->vbox->openExistingSession($this->session, $uuid, 'vrdp', '');
+
+ // VRDP is not supported in OSE
+ $version = $this->getVersion();
+ $sessionType = ($version['ose'] ? 'headless' : 'vrdp');
+
+ $this->vbox->openExistingSession($this->session, $uuid, $sessionType, '');
}
foreach($remove as $r) {
@@ -2502,7 +2523,12 @@
$this->vbox->openSession($this->session, $args['vm']);
$save = true; // force save on closed session as it is not a "run-time" change
} else {
- $this->vbox->openExistingSession($this->session, $args['vm'], 'vrdp', '');
+
+ // VRDP is not supported in OSE
+ $version = $this->getVersion();
+ $sessionType = ($version['ose'] ? 'headless' : 'vrdp');
+
+ $this->vbox->openExistingSession($this->session, $args['vm'], $sessionType, '');
}
$this->session->machine->mountMedium($args['controller'],$args['port'],$args['device'],$args['medium'],true);

25
www/phpvirtualbox/files/patch-panes-tabs.html
View File

@ -1,25 +0,0 @@
--- panes/tabs.html (revision 31)
+++ panes/tabs.html (revision 32)
@@ -26,6 +26,11 @@
if($('#vboxIndex').data('vboxConfig')['disable' + tabs[i].name.substring(4)])
continue;
+ // Hide Console tab if OSE is detected
+ if(tabs[i].name == 'vboxTabVMConsole' && $('#vboxIndex').data('vboxConfig').version.ose)
+ continue;
+
+
// Tab link
var li = document.createElement('li');
li.innerHTML = '<a href="#'+tabs[i].name+'"><span><img style="vertical-align: middle" src="images/vbox/'+tabs[i].icon+'_16px.png" border="0" /> <span id="'+tabs[i].name+'Title">'+trans(tabs[i].label)+'</span></span></a>';
@@ -48,6 +53,10 @@
// Tab disabled?
if($('#vboxIndex').data('vboxConfig')['disable' + tabs[i].name.substring(4)])
continue;
+
+ // Hide Console tab if OSE is detected
+ if(tabs[i].name == 'vboxTabVMConsole' && $('#vboxIndex').data('vboxConfig').version.ose)
+ continue;
tabsMain.addTab(tabs[i]);

2
www/phpvirtualbox/pkg-plist
View File

@ -481,7 +481,9 @@
%%WWWDIR%%/js/phpvirtualbox.js
%%WWWDIR%%/js/utils.js
%%WWWDIR%%/js/vboxweb.js
%%WWWDIR%%/languages/de_de.php
%%WWWDIR%%/languages/en_us.php
%%WWWDIR%%/languages/fr_fr.php
%%WWWDIR%%/lib/ajax.php
%%WWWDIR%%/lib/cache.php
%%WWWDIR%%/lib/jqueryFileTree.php