svn commit: r353371 - in head/emulators/virtualbox-ose: . files

Jung-uk Kim jkim at FreeBSD.org
Thu May 8 23:58:01 UTC 2014 

Author: jkim
Date: Thu May  8 23:58:00 2014
New Revision: 353371
URL: http://svnweb.freebsd.org/changeset/ports/353371
QAT: https://qat.redports.org/buildarchive/r353371/

Log:
  - Fix dependencies.  devel/qt4-linguist is not needed at run-time. [1]
  - Fix VPX option to actually enable video capture for FreeBSD. [2]
  
  PR:		ports/189417 [1]
  PR:		ports/189430 [2]

Modified:
  head/emulators/virtualbox-ose/Makefile
  head/emulators/virtualbox-ose/files/extrapatch-Config.kmk
  head/emulators/virtualbox-ose/files/patch-Config.kmk

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Thu May  8 23:41:36 2014	(r353370)
+++ head/emulators/virtualbox-ose/Makefile	Thu May  8 23:58:00 2014	(r353371)
@@ -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/ \
@@ -116,7 +117,8 @@ CONFIGURE_ARGS+=--build-headless
 
 .if ${PORT_OPTIONS:MQT4}
 QT_NONSTANDARD=	yes
-USE_QT4=	gui network moc_build opengl uic_build rcc_build linguist
+USE_QT4=	linguist_build moc_build rcc_build uic_build
+USE_QT4+=	gui network opengl
 INSTALLS_ICONS=	yes
 VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
 .else

Modified: head/emulators/virtualbox-ose/files/extrapatch-Config.kmk
==============================================================================
--- head/emulators/virtualbox-ose/files/extrapatch-Config.kmk	Thu May  8 23:41:36 2014	(r353370)
+++ head/emulators/virtualbox-ose/files/extrapatch-Config.kmk	Thu May  8 23:58:00 2014	(r353371)
@@ -1,6 +1,6 @@
---- Config.kmk.orig	2013-11-29 14:20:04.000000000 -0500
-+++ Config.kmk	2013-12-18 18:40:34.000000000 -0500
-@@ -3036,6 +3036,7 @@
+--- Config.kmk.orig	2014-03-26 15:12:14.000000000 -0400
++++ Config.kmk	2014-05-07 16:07:36.000000000 -0400
+@@ -3042,6 +3042,7 @@
   ifeq ($(VBOX_LDR_FMT32),elf)
   TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
   TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
@@ -8,7 +8,7 @@
   TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
    ifeq ($(KBUILD_TARGET),solaris)
     TEMPLATE_VBoxRc_LDFLAGS           = -r
-@@ -3167,6 +3168,7 @@
+@@ -3170,6 +3171,7 @@
  TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
  TEMPLATE_VBoxR0_CFLAGS              = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99
  TEMPLATE_VBoxR0_CXXFLAGS            = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti
@@ -16,7 +16,7 @@
  TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
  TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
  ifeq ($(KBUILD_TARGET),solaris)
-@@ -3188,7 +3190,7 @@
+@@ -3435,7 +3437,7 @@
  		| xargs -J% objcopy % $(out)
  
  ## Strip debug info (comment out if debugging or something).

Modified: head/emulators/virtualbox-ose/files/patch-Config.kmk
==============================================================================
--- head/emulators/virtualbox-ose/files/patch-Config.kmk	Thu May  8 23:41:36 2014	(r353370)
+++ head/emulators/virtualbox-ose/files/patch-Config.kmk	Thu May  8 23:58:00 2014	(r353371)
@@ -1,6 +1,15 @@
---- Config.kmk.orig	2013-11-28 19:29:52.000000000 +0100
-+++ Config.kmk	2013-12-17 20:15:54.000000000 +0100
-@@ -3260,16 +3260,16 @@
+--- Config.kmk.orig	2014-03-26 15:12:14.000000000 -0400
++++ Config.kmk	2014-05-07 16:05:51.000000000 -0400
+@@ -584,7 +584,7 @@
+ # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled
+ VBOX_WITH_VBOX_IMG =
+ # Enables the VPX module for VM video capturing
+-if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
++if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
+  VBOX_WITH_VPX = 1
+ endif
+ # Enable shared folders
+@@ -3399,16 +3399,16 @@
  	$(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \
  	-Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \
  	-Wimplicit-function-declaration -Werror-implicit-function-declaration \
@@ -20,7 +29,7 @@
  	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
  	-nostdinc
  TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
-@@ -3486,8 +3486,6 @@
+@@ -3642,8 +3642,6 @@
  	/usr/X11R6/include \
  	/usr/local/include
  TEMPLATE_VBOXR3EXE_LIBPATH            += \
@@ -29,7 +38,7 @@
  	/usr/local/lib
   else ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBOXR3EXE_TOOL                = GXX3PLAIN
-@@ -3670,7 +3668,7 @@
+@@ -3880,7 +3878,7 @@
  # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp
  # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap
  endif
@@ -38,7 +47,7 @@
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
   TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
  endif
-@@ -3976,8 +3974,6 @@
+@@ -4221,8 +4219,6 @@
  	/usr/X11R6/include \
  	/usr/local/include
  TEMPLATE_VBOXMAINEXE_LIBPATH            += \
@@ -47,7 +56,7 @@
  	/usr/local/lib
  else ifeq ($(KBUILD_TARGET),solaris)
  TEMPLATE_VBOXMAINEXE_TOOL                = GXX3PLAIN
-@@ -4392,8 +4388,6 @@
+@@ -4688,8 +4684,6 @@
  	/usr/X11R6/include \
  	/usr/local/include
      TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
@@ -56,7 +65,7 @@
  	/usr/local/lib
     endif
     ifeq ($(KBUILD_TARGET),solaris)
-@@ -4576,8 +4570,6 @@
+@@ -4884,8 +4878,6 @@
  	/usr/X11R6/include \
  	/usr/local/include
  TEMPLATE_VBOXBLDPROG_LIBPATH            += \

More information about the svn-ports-all mailing list