aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorbeat <beat@FreeBSD.org>2010-03-27 18:20:39 +0800
committerbeat <beat@FreeBSD.org>2010-03-27 18:20:39 +0800
commit3f26e48ecc84f599b629add2dc865f81ba8b3c57 (patch)
treef76b75b569a445dc7dd5becc359e1ba679538aa7 /emulators
parent9e7d10fca241b00c50c79b06ffcaf0f44e62dc26 (diff)
downloadfreebsd-ports-gnome-3f26e48ecc84f599b629add2dc865f81ba8b3c57.tar.gz
freebsd-ports-gnome-3f26e48ecc84f599b629add2dc865f81ba8b3c57.tar.zst
freebsd-ports-gnome-3f26e48ecc84f599b629add2dc865f81ba8b3c57.zip
- Update to 3.1.6
- Fix ioctl warnings in /var/log/messages [1] - Fix build with QT4 support disabled [2] Obtained from: http://www.virtualbox.org/changeset/25953 [1] Reported by: William DiNoia <william.dinoia AT gmail.com> [2] On behalf of: vbox@ (decke, dhn, itetcu, miwi, nox)
Diffstat (limited to 'emulators')
-rw-r--r--emulators/virtualbox-ose-kmod-legacy/Makefile2
-rw-r--r--emulators/virtualbox-ose-kmod-legacy/distinfo6
-rw-r--r--emulators/virtualbox-ose-kmod/Makefile2
-rw-r--r--emulators/virtualbox-ose-kmod/distinfo6
-rw-r--r--emulators/virtualbox-ose-legacy/Makefile8
-rw-r--r--emulators/virtualbox-ose-legacy/distinfo12
-rw-r--r--emulators/virtualbox-ose-legacy/files/patch-include-iprt-file.h13
-rw-r--r--emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp16
-rw-r--r--emulators/virtualbox-ose-legacy/pkg-plist4
-rw-r--r--emulators/virtualbox-ose/Makefile8
-rw-r--r--emulators/virtualbox-ose/distinfo12
-rw-r--r--emulators/virtualbox-ose/files/patch-include-iprt-file.h13
-rw-r--r--emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp16
-rw-r--r--emulators/virtualbox-ose/pkg-plist4
14 files changed, 90 insertions, 32 deletions
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile
index f5c99e36580b..e40783e615bf 100644
--- a/emulators/virtualbox-ose-kmod-legacy/Makefile
+++ b/emulators/virtualbox-ose-kmod-legacy/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= virtualbox-ose
-DISTVERSION= 3.1.4
+DISTVERSION= 3.1.6
CATEGORIES= emulators kld
MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \
diff --git a/emulators/virtualbox-ose-kmod-legacy/distinfo b/emulators/virtualbox-ose-kmod-legacy/distinfo
index 8704130cd8c6..5a957842baa9 100644
--- a/emulators/virtualbox-ose-kmod-legacy/distinfo
+++ b/emulators/virtualbox-ose-kmod-legacy/distinfo
@@ -1,3 +1,3 @@
-MD5 (VirtualBox-3.1.4-OSE.tar.bz2) = d32066cb9ebfa4930a2c5ad6227de26f
-SHA256 (VirtualBox-3.1.4-OSE.tar.bz2) = 6ea10abae86b8777366f66ec4a1d68e033fe5d97f4bb0f551f83737ba58cdb70
-SIZE (VirtualBox-3.1.4-OSE.tar.bz2) = 55850055
+MD5 (VirtualBox-3.1.6-OSE.tar.bz2) = 6cb3c8161ad878c2a2732137c1621dc4
+SHA256 (VirtualBox-3.1.6-OSE.tar.bz2) = 840148f879c8ef1e6d2a54586fdddf3df389e9de91ada4c6d10ebc0da37ea016
+SIZE (VirtualBox-3.1.6-OSE.tar.bz2) = 55871561
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index f5c99e36580b..e40783e615bf 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= virtualbox-ose
-DISTVERSION= 3.1.4
+DISTVERSION= 3.1.6
CATEGORIES= emulators kld
MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index 8704130cd8c6..5a957842baa9 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,3 +1,3 @@
-MD5 (VirtualBox-3.1.4-OSE.tar.bz2) = d32066cb9ebfa4930a2c5ad6227de26f
-SHA256 (VirtualBox-3.1.4-OSE.tar.bz2) = 6ea10abae86b8777366f66ec4a1d68e033fe5d97f4bb0f551f83737ba58cdb70
-SIZE (VirtualBox-3.1.4-OSE.tar.bz2) = 55850055
+MD5 (VirtualBox-3.1.6-OSE.tar.bz2) = 6cb3c8161ad878c2a2732137c1621dc4
+SHA256 (VirtualBox-3.1.6-OSE.tar.bz2) = 840148f879c8ef1e6d2a54586fdddf3df389e9de91ada4c6d10ebc0da37ea016
+SIZE (VirtualBox-3.1.6-OSE.tar.bz2) = 55871561
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 2f40e0d12050..f91e560c9cbc 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= virtualbox-ose
-DISTVERSION= 3.1.4
+DISTVERSION= 3.1.6
CATEGORIES= emulators
MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \
@@ -84,8 +84,8 @@ BROKEN= QT4 frontend requires X11 support. Run 'make config' again!
.if !defined(WITHOUT_X11)
USE_SDL= sdl
-USE_XORG= xcursor xmu
-VBOX_FRONTENDS+=VBoxBFE VBoxSDL VBoxTestOGL
+USE_XORG= xcursor xmu inputproto
+VBOX_FRONTENDS+=VBoxBFE VBoxSDL
PLIST_SUB+= X11=""
.else
CONFIGURE_ARGS+=--build-headless
@@ -97,7 +97,7 @@ USE_QT_VER= 4
QT_NONSTANDARD= yes
QT_COMPONENTS= gui network moc_build uic_build rcc_build linguist
INSTALLS_ICONS= yes
-VBOX_FRONTENDS+=VirtualBox
+VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
PLIST_SUB+= QT4=""
.else
CONFIGURE_ARGS+=--disable-qt4
diff --git a/emulators/virtualbox-ose-legacy/distinfo b/emulators/virtualbox-ose-legacy/distinfo
index e8f71b53a0e7..54429b3956d0 100644
--- a/emulators/virtualbox-ose-legacy/distinfo
+++ b/emulators/virtualbox-ose-legacy/distinfo
@@ -1,6 +1,6 @@
-MD5 (VirtualBox-3.1.4-OSE.tar.bz2) = d32066cb9ebfa4930a2c5ad6227de26f
-SHA256 (VirtualBox-3.1.4-OSE.tar.bz2) = 6ea10abae86b8777366f66ec4a1d68e033fe5d97f4bb0f551f83737ba58cdb70
-SIZE (VirtualBox-3.1.4-OSE.tar.bz2) = 55850055
-MD5 (VBoxGuestAdditions_3.1.4.iso) = 2f203836d5168d391ca2fae81e1c52fc
-SHA256 (VBoxGuestAdditions_3.1.4.iso) = a6f35be6317d15abe103f841420fcb96ee1e36e2458414999fb0c2bd073427f5
-SIZE (VBoxGuestAdditions_3.1.4.iso) = 29765632
+MD5 (VirtualBox-3.1.6-OSE.tar.bz2) = 6cb3c8161ad878c2a2732137c1621dc4
+SHA256 (VirtualBox-3.1.6-OSE.tar.bz2) = 840148f879c8ef1e6d2a54586fdddf3df389e9de91ada4c6d10ebc0da37ea016
+SIZE (VirtualBox-3.1.6-OSE.tar.bz2) = 55871561
+MD5 (VBoxGuestAdditions_3.1.6.iso) = f924e3a75c0d2d78f587b2ac89482074
+SHA256 (VBoxGuestAdditions_3.1.6.iso) = 1a810ca86b271a740fb5db20b1661d11689861d3a75826fec31e98a4a5a67e1f
+SIZE (VBoxGuestAdditions_3.1.6.iso) = 29829120
diff --git a/emulators/virtualbox-ose-legacy/files/patch-include-iprt-file.h b/emulators/virtualbox-ose-legacy/files/patch-include-iprt-file.h
new file mode 100644
index 000000000000..bdb10f31e295
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/patch-include-iprt-file.h
@@ -0,0 +1,13 @@
+Index: include/iprt/file.h
+===================================================================
+--- include/iprt/file.h (Revision 25952)
++++ include/iprt/file.h (Revision 25953)
+@@ -743,7 +743,7 @@
+ * @param cbData Size of the IOCTL data.
+ * @param piRet Return value of the IOCTL request.
+ */
+-RTR3DECL(int) RTFileIoCtl(RTFILE File, int iRequest, void *pvData, unsigned cbData, int *piRet);
++RTR3DECL(int) RTFileIoCtl(RTFILE File, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet);
+
+ /**
+ * Query the sizes of a filesystem.
diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp
new file mode 100644
index 000000000000..9dd1452fc6d2
--- /dev/null
+++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp
@@ -0,0 +1,16 @@
+Index: src/VBox/Runtime/r3/posix/fileio-posix.cpp
+===================================================================
+--- src/VBox/Runtime/r3/posix/fileio-posix.cpp (Revision 25952)
++++ src/VBox/Runtime/r3/posix/fileio-posix.cpp (Revision 25953)
+@@ -586,9 +586,9 @@
+ }
+
+
+-RTR3DECL(int) RTFileIoCtl(RTFILE File, int iRequest, void *pvData, unsigned cbData, int *piRet)
++RTR3DECL(int) RTFileIoCtl(RTFILE File, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet)
+ {
+- int rc = ioctl((int)File, iRequest, pvData);
++ int rc = ioctl((int)File, ulRequest, pvData);
+ if (piRet)
+ *piRet = rc;
+ return rc >= 0 ? VINF_SUCCESS : RTErrConvertFromErrno(errno);
diff --git a/emulators/virtualbox-ose-legacy/pkg-plist b/emulators/virtualbox-ose-legacy/pkg-plist
index b79d9aee860e..ea6fa2682bb5 100644
--- a/emulators/virtualbox-ose-legacy/pkg-plist
+++ b/emulators/virtualbox-ose-legacy/pkg-plist
@@ -5,7 +5,7 @@ bin/VBoxNetAdpCtl
bin/VBoxNetDHCP
%%X11%%bin/VBoxSDL
bin/VBoxSVC
-%%X11%%bin/VBoxTestOGL
+%%QT4%%bin/VBoxTestOGL
bin/VBoxXPCOMIPCD
%%QT4%%bin/VirtualBox
%%X11%%lib/virtualbox/VBoxBFE
@@ -26,7 +26,7 @@ lib/virtualbox/VBoxNetDHCP.so
%%X11%%lib/virtualbox/VBoxOGLrenderspu.so
lib/virtualbox/VBoxPython.so
lib/virtualbox/VBoxREM.so
-%%X11%%lib/virtualbox/VBoxTestOGL
+%%QT4%%lib/virtualbox/VBoxTestOGL
%%I386%%lib/virtualbox/VBoxREM32.so
%%I386%%lib/virtualbox/VBoxREM64.so
lib/virtualbox/VBoxRT.so
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 2f40e0d12050..f91e560c9cbc 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= virtualbox-ose
-DISTVERSION= 3.1.4
+DISTVERSION= 3.1.6
CATEGORIES= emulators
MASTER_SITES= http://tmp.chruetertee.ch/ \
http://freebsd.unixfreunde.de/sources/ \
@@ -84,8 +84,8 @@ BROKEN= QT4 frontend requires X11 support. Run 'make config' again!
.if !defined(WITHOUT_X11)
USE_SDL= sdl
-USE_XORG= xcursor xmu
-VBOX_FRONTENDS+=VBoxBFE VBoxSDL VBoxTestOGL
+USE_XORG= xcursor xmu inputproto
+VBOX_FRONTENDS+=VBoxBFE VBoxSDL
PLIST_SUB+= X11=""
.else
CONFIGURE_ARGS+=--build-headless
@@ -97,7 +97,7 @@ USE_QT_VER= 4
QT_NONSTANDARD= yes
QT_COMPONENTS= gui network moc_build uic_build rcc_build linguist
INSTALLS_ICONS= yes
-VBOX_FRONTENDS+=VirtualBox
+VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
PLIST_SUB+= QT4=""
.else
CONFIGURE_ARGS+=--disable-qt4
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index e8f71b53a0e7..54429b3956d0 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,6 +1,6 @@
-MD5 (VirtualBox-3.1.4-OSE.tar.bz2) = d32066cb9ebfa4930a2c5ad6227de26f
-SHA256 (VirtualBox-3.1.4-OSE.tar.bz2) = 6ea10abae86b8777366f66ec4a1d68e033fe5d97f4bb0f551f83737ba58cdb70
-SIZE (VirtualBox-3.1.4-OSE.tar.bz2) = 55850055
-MD5 (VBoxGuestAdditions_3.1.4.iso) = 2f203836d5168d391ca2fae81e1c52fc
-SHA256 (VBoxGuestAdditions_3.1.4.iso) = a6f35be6317d15abe103f841420fcb96ee1e36e2458414999fb0c2bd073427f5
-SIZE (VBoxGuestAdditions_3.1.4.iso) = 29765632
+MD5 (VirtualBox-3.1.6-OSE.tar.bz2) = 6cb3c8161ad878c2a2732137c1621dc4
+SHA256 (VirtualBox-3.1.6-OSE.tar.bz2) = 840148f879c8ef1e6d2a54586fdddf3df389e9de91ada4c6d10ebc0da37ea016
+SIZE (VirtualBox-3.1.6-OSE.tar.bz2) = 55871561
+MD5 (VBoxGuestAdditions_3.1.6.iso) = f924e3a75c0d2d78f587b2ac89482074
+SHA256 (VBoxGuestAdditions_3.1.6.iso) = 1a810ca86b271a740fb5db20b1661d11689861d3a75826fec31e98a4a5a67e1f
+SIZE (VBoxGuestAdditions_3.1.6.iso) = 29829120
diff --git a/emulators/virtualbox-ose/files/patch-include-iprt-file.h b/emulators/virtualbox-ose/files/patch-include-iprt-file.h
new file mode 100644
index 000000000000..bdb10f31e295
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-include-iprt-file.h
@@ -0,0 +1,13 @@
+Index: include/iprt/file.h
+===================================================================
+--- include/iprt/file.h (Revision 25952)
++++ include/iprt/file.h (Revision 25953)
+@@ -743,7 +743,7 @@
+ * @param cbData Size of the IOCTL data.
+ * @param piRet Return value of the IOCTL request.
+ */
+-RTR3DECL(int) RTFileIoCtl(RTFILE File, int iRequest, void *pvData, unsigned cbData, int *piRet);
++RTR3DECL(int) RTFileIoCtl(RTFILE File, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet);
+
+ /**
+ * Query the sizes of a filesystem.
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp
new file mode 100644
index 000000000000..9dd1452fc6d2
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-fileio-posix.cpp
@@ -0,0 +1,16 @@
+Index: src/VBox/Runtime/r3/posix/fileio-posix.cpp
+===================================================================
+--- src/VBox/Runtime/r3/posix/fileio-posix.cpp (Revision 25952)
++++ src/VBox/Runtime/r3/posix/fileio-posix.cpp (Revision 25953)
+@@ -586,9 +586,9 @@
+ }
+
+
+-RTR3DECL(int) RTFileIoCtl(RTFILE File, int iRequest, void *pvData, unsigned cbData, int *piRet)
++RTR3DECL(int) RTFileIoCtl(RTFILE File, unsigned long ulRequest, void *pvData, unsigned cbData, int *piRet)
+ {
+- int rc = ioctl((int)File, iRequest, pvData);
++ int rc = ioctl((int)File, ulRequest, pvData);
+ if (piRet)
+ *piRet = rc;
+ return rc >= 0 ? VINF_SUCCESS : RTErrConvertFromErrno(errno);
diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist
index b79d9aee860e..ea6fa2682bb5 100644
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@@ -5,7 +5,7 @@ bin/VBoxNetAdpCtl
bin/VBoxNetDHCP
%%X11%%bin/VBoxSDL
bin/VBoxSVC
-%%X11%%bin/VBoxTestOGL
+%%QT4%%bin/VBoxTestOGL
bin/VBoxXPCOMIPCD
%%QT4%%bin/VirtualBox
%%X11%%lib/virtualbox/VBoxBFE
@@ -26,7 +26,7 @@ lib/virtualbox/VBoxNetDHCP.so
%%X11%%lib/virtualbox/VBoxOGLrenderspu.so
lib/virtualbox/VBoxPython.so
lib/virtualbox/VBoxREM.so
-%%X11%%lib/virtualbox/VBoxTestOGL
+%%QT4%%lib/virtualbox/VBoxTestOGL
%%I386%%lib/virtualbox/VBoxREM32.so
%%I386%%lib/virtualbox/VBoxREM64.so
lib/virtualbox/VBoxRT.so
generated by cgit (git 2.34.1) at 2024-11-16 15:40:34 +0800