Index: files/patch-Config.kmk =================================================================== --- files/patch-Config.kmk (revision 488264) +++ files/patch-Config.kmk (working copy) @@ -1,6 +1,6 @@ ---- Config.kmk.orig 2017-10-18 07:06:30 UTC +--- Config.kmk.orig 2018-11-08 19:35:51 UTC +++ Config.kmk -@@ -424,11 +424,11 @@ ifn1of ($(KBUILD_TARGET), win darwin) +@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin) # Enable OSS audio support. VBOX_WITH_AUDIO_OSS = 1 endif @@ -14,7 +14,7 @@ # Enable PulseAudio audio support. VBOX_WITH_AUDIO_PULSE = 1 endif -@@ -440,11 +440,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1 +@@ -464,11 +464,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1 # Enable PCI passthrough support. VBOX_WITH_PCI_PASSTHROUGH = 1 # Enable statically linked dbus support. @@ -28,7 +28,7 @@ VBOX_WITH_PAM = 1 endif # Enable internal networking. -@@ -648,7 +648,7 @@ VBOX_WITH_TESTCASES = 1 +@@ -668,7 +668,7 @@ VBOX_WITH_TESTCASES = 1 VBOX_WITH_VDITOOL = # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled VBOX_WITH_VBOX_IMG = @@ -37,7 +37,7 @@ # Enables the video capturing support. VBOX_WITH_VIDEOREC = 1 # Enable VPX (VP8 / VP9 codec), used for video capturing. -@@ -978,10 +978,6 @@ ifeq ($(KBUILD_TARGET),darwin) +@@ -996,10 +996,6 @@ ifeq ($(KBUILD_TARGET),darwin) VBOX_WITH_VBOXSDL= endif @@ -48,7 +48,7 @@ ifeq ($(KBUILD_TARGET),haiku) # Don't bother with SDL ttf for now. VBOX_WITH_SECURELABEL= -@@ -1141,7 +1137,7 @@ ifdef VBOX_OSE +@@ -1159,7 +1155,7 @@ ifdef VBOX_OSE VBOX_WITH_KCHMVIEWER= VBOX_WITH_PLUGIN_CRYPT= VBOX_WITH_DRAG_AND_DROP_PROMISES= @@ -57,7 +57,7 @@ VBOX_WITH_DOCS= VBOX_WITH_DOCS_PACKING= endif -@@ -4360,7 +4356,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \ +@@ -4538,7 +4534,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \ -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc -std=c99 @@ -66,7 +66,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \ -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \ -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef -@@ -4689,12 +4685,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic +@@ -4875,12 +4871,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic TEMPLATE_VBOXR3EXE_TOOL = GXX3 TEMPLATE_VBOXR3EXE_LIBS = pthread TEMPLATE_VBOXR3EXE_INCS += \ @@ -79,7 +79,18 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),netbsd) TEMPLATE_VBOXR3EXE_TOOL = GXX3 -@@ -4984,7 +4976,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! +@@ -5033,8 +5025,8 @@ ifeq ($(KBUILD_TARGET),win) + $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \ + $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \ + $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib +-else ifn1of ($(KBUILD_TARGET), darwin linux solaris) +- # The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there) ++else ifn1of ($(KBUILD_TARGET), darwin freebsd linux solaris) ++ # The gcc guys sans darwin, freebsd, linux and solaris (don't depend on statically compiled system libs there) + TEMPLATE_VBOXR3STATIC_CFLAGS = $(TEMPLATE_VBOXR3EXE_CFLAGS) -static + TEMPLATE_VBOXR3STATIC_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -static + TEMPLATE_VBOXR3STATIC_OBJCFLAGS = $(TEMPLATE_VBOXR3EXE_OBJCFLAGS) -static +@@ -5170,7 +5162,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE) TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE) @@ -88,7 +99,7 @@ # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH) 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)) -@@ -5515,12 +5507,8 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI +@@ -5701,12 +5693,8 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI TEMPLATE_VBOXMAINEXE_TOOL = GXX3 TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) TEMPLATE_VBOXMAINEXE_INCS += \ @@ -101,7 +112,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),netbsd) TEMPLATE_VBOXMAINEXE_TOOL = GXX3 -@@ -6054,12 +6042,8 @@ ifdef VBOX_WITH_QTGUI +@@ -6240,12 +6228,8 @@ ifdef VBOX_WITH_QTGUI $(VBOX_LIBPATH_X11) ifeq ($(KBUILD_TARGET),freebsd) TEMPLATE_VBOXQTGUIEXE_INCS += \ @@ -114,7 +125,7 @@ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -6282,12 +6266,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \ +@@ -6468,12 +6452,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \ TEMPLATE_VBoxBldProg_TOOL = GXX3 TEMPLATE_VBoxBldProg_LIBS = pthread TEMPLATE_VBoxBldProg_INCS += \ @@ -127,7 +138,7 @@ /usr/local/lib else ifeq ($(KBUILD_HOST),netbsd) TEMPLATE_VBoxBldProg_TOOL = GXX3 -@@ -6707,6 +6687,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \ +@@ -6878,6 +6858,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \ -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \ -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed Index: files/patch-src_VBox_RDP_client-1.8.3_Makefile.kmk =================================================================== --- files/patch-src_VBox_RDP_client-1.8.3_Makefile.kmk (nonexistent) +++ files/patch-src_VBox_RDP_client-1.8.3_Makefile.kmk (working copy) @@ -0,0 +1,10 @@ +--- src/VBox/RDP/client-1.8.3/Makefile.kmk.orig 2018-11-08 19:42:08 UTC ++++ src/VBox/RDP/client-1.8.3/Makefile.kmk +@@ -117,7 +117,6 @@ rdesktop-vrdp_SOURCES.solaris = \ + rdesktop-vrdp_SOURCES.freebsd = \ + rdpsnd_oss.c + rdesktop-vrdp_LIBPATH = \ +- /usr/lib \ + $(VBOX_LIBPATH_X11) + rdesktop-vrdp_LIBS = \ + X11 \ Property changes on: files/patch-src_VBox_RDP_client-1.8.3_Makefile.kmk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property