diff options
| author | beat <beat@FreeBSD.org> | 2010-01-25 07:18:38 +0800 |
|---|---|---|
| committer | beat <beat@FreeBSD.org> | 2010-01-25 07:18:38 +0800 |
| commit | 7c94cf5af5814262dcd7562ccac2b316d67a7e86 (patch) | |
| tree | ef230a8af3880c8786286e9947cd88a2f0343de5 | |
| parent | 490c338990c19cd2108c550623f8ee5e018e2b07 (diff) | |
| download | freebsd-ports-gnome-7c94cf5af5814262dcd7562ccac2b316d67a7e86.tar.gz freebsd-ports-gnome-7c94cf5af5814262dcd7562ccac2b316d67a7e86.tar.zst freebsd-ports-gnome-7c94cf5af5814262dcd7562ccac2b316d67a7e86.zip | |
- Add CONFLICT with virtualbox-ose-additions.
- Re-apply fix for ports/140171: Disable testcases to fix possible
breakage with non default options set. [1]
- Removed inclusion of utmp.h to fix build on recent CURRENT. [2]
- Bump PORTREVISION.
PR: ports/142855 [2]
Reported by: Lanny Baron <lbaron AT servaris.com> [1]
Submitted by: YAMAMOTO Shigeru <shigeru AT iij.ad.jp> [2], ed@ [2]
On behalf of: vbox@ (decke, dhn, itetcu, miwi, nox)
8 files changed, 52 insertions, 4 deletions
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 8b12ae5b785f..e8e9f4994189 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -7,6 +7,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ @@ -43,7 +44,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" USE_LDCONFIG= ${PREFIX}/lib/virtualbox -CONFLICTS= bcc-[0-9]* +CONFLICTS= bcc-[0-9]* virtualbox-ose-additions-3* VBOXGROUP?= vboxusers VBOXGID?= 920 @@ -171,6 +172,7 @@ post-patch: @${ECHO} 'VBOX_WITH_VBOXDRV = ' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_NETADP = ' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_TESTCASES=' >> ${WRKSRC}/LocalConfig.kmk .if defined(WITHOUT_X11) @${ECHO} 'VBOX_WITH_X11_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk .endif diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp new file mode 100644 index 000000000000..408d858c1f13 --- /dev/null +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp @@ -0,0 +1,10 @@ +--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2010-01-18 10:53:11.000000000 +0100 ++++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp 2010-01-18 10:53:18.000000000 +0100 +@@ -38,7 +38,6 @@ + # include <sys/socket.h> + # include <net/if.h> + # include <unistd.h> +-# include <utmp.h> + # ifdef RT_OS_SOLARIS + # include <sys/sockio.h> + # endif diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk index b76f318af457..f263810ad398 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Devices-Makefile.kmk @@ -1,5 +1,18 @@ --- src/VBox/Devices/Makefile.kmk.orig 2009-12-17 15:27:43.000000000 +0100 +++ src/VBox/Devices/Makefile.kmk 2009-12-21 14:29:56.000000000 +0100 +@@ -31,8 +31,10 @@ + include $(PATH_SUB_CURRENT)/PC/VMI/Makefile.kmk + endif + include $(PATH_SUB_CURRENT)/Graphics/BIOS/Makefile.kmk +-include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk +-include $(PATH_SUB_CURRENT)/Storage/testcase/Makefile.kmk ++ifdef VBOX_WITH_TESTCASES ++ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk ++ include $(PATH_SUB_CURRENT)/Storage/testcase/Makefile.kmk ++endif + ifndef VBOX_OSE + include $(PATH_SUB_CURRENT)/Storage/VBoxHDDFormats/Makefile.kmk + endif @@ -970,6 +970,10 @@ Drivers_SOURCES.linux+= \ Audio/pulseaudio.c \ diff --git a/emulators/virtualbox-ose-legacy/pkg-plist b/emulators/virtualbox-ose-legacy/pkg-plist index 797ae3012595..8d1ad96f4e61 100644 --- a/emulators/virtualbox-ose-legacy/pkg-plist +++ b/emulators/virtualbox-ose-legacy/pkg-plist @@ -45,7 +45,6 @@ lib/virtualbox/VBoxXPCOMIPCD lib/virtualbox/VBoxDD2GC.gc lib/virtualbox/VBoxDDGC.gc lib/virtualbox/VMMGC.gc -lib/virtualbox/tstMicroGC.gc lib/virtualbox/VBoxDD2R0.r0 lib/virtualbox/VBoxDDR0.r0 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 8b12ae5b785f..e8e9f4994189 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -7,6 +7,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ @@ -43,7 +44,7 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" USE_LDCONFIG= ${PREFIX}/lib/virtualbox -CONFLICTS= bcc-[0-9]* +CONFLICTS= bcc-[0-9]* virtualbox-ose-additions-3* VBOXGROUP?= vboxusers VBOXGID?= 920 @@ -171,6 +172,7 @@ post-patch: @${ECHO} 'VBOX_WITH_VBOXDRV = ' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_NETADP = ' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_TESTCASES=' >> ${WRKSRC}/LocalConfig.kmk .if defined(WITHOUT_X11) @${ECHO} 'VBOX_WITH_X11_ADDITIONS=' >> ${WRKSRC}/LocalConfig.kmk .endif diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp new file mode 100644 index 000000000000..408d858c1f13 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp @@ -0,0 +1,10 @@ +--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2010-01-18 10:53:11.000000000 +0100 ++++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp 2010-01-18 10:53:18.000000000 +0100 +@@ -38,7 +38,6 @@ + # include <sys/socket.h> + # include <net/if.h> + # include <unistd.h> +-# include <utmp.h> + # ifdef RT_OS_SOLARIS + # include <sys/sockio.h> + # endif diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk index b76f318af457..f263810ad398 100644 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk @@ -1,5 +1,18 @@ --- src/VBox/Devices/Makefile.kmk.orig 2009-12-17 15:27:43.000000000 +0100 +++ src/VBox/Devices/Makefile.kmk 2009-12-21 14:29:56.000000000 +0100 +@@ -31,8 +31,10 @@ + include $(PATH_SUB_CURRENT)/PC/VMI/Makefile.kmk + endif + include $(PATH_SUB_CURRENT)/Graphics/BIOS/Makefile.kmk +-include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk +-include $(PATH_SUB_CURRENT)/Storage/testcase/Makefile.kmk ++ifdef VBOX_WITH_TESTCASES ++ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk ++ include $(PATH_SUB_CURRENT)/Storage/testcase/Makefile.kmk ++endif + ifndef VBOX_OSE + include $(PATH_SUB_CURRENT)/Storage/VBoxHDDFormats/Makefile.kmk + endif @@ -970,6 +970,10 @@ Drivers_SOURCES.linux+= \ Audio/pulseaudio.c \ diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist index 797ae3012595..8d1ad96f4e61 100644 --- a/emulators/virtualbox-ose/pkg-plist +++ b/emulators/virtualbox-ose/pkg-plist @@ -45,7 +45,6 @@ lib/virtualbox/VBoxXPCOMIPCD lib/virtualbox/VBoxDD2GC.gc lib/virtualbox/VBoxDDGC.gc lib/virtualbox/VMMGC.gc -lib/virtualbox/tstMicroGC.gc lib/virtualbox/VBoxDD2R0.r0 lib/virtualbox/VBoxDDR0.r0 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso |