(virtualbox-ose) Add more patch for @PREFIX@, fix typo.

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Wed Sep 23 19:05:34 2015 +0900
Changeset:	2a092109106a0606867516d1f86ae1ef58642660

Modified Files:
	virtualbox-ose/Makefile
	virtualbox-ose/distinfo
	virtualbox-ose/patches/patch-src-VBox-Installer-freebsd-VBox.sh
Added Files:
	virtualbox-ose/patches/patch-kBuild_header.kmk

Log Message:
(virtualbox-ose) Add more patch for @PREFIX@, fix typo.

  - Add new patch-kBuild_header.kmk
  - Fix typo patch-src-VBox-Installer-freebsd-VBox.sh

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2a092109106a0606867516d1f86ae1ef58642660

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 virtualbox-ose/Makefile                            |  1 +
 virtualbox-ose/distinfo                            |  3 +-
 virtualbox-ose/patches/patch-kBuild_header.kmk     | 39 ++++++++++++++++++++++
 .../patch-src-VBox-Installer-freebsd-VBox.sh       |  2 +-
 4 files changed, 43 insertions(+), 2 deletions(-)

diffs:
diff --git a/virtualbox-ose/Makefile b/virtualbox-ose/Makefile
index 8c296e6..ea4b1ef 100644
--- a/virtualbox-ose/Makefile
+++ b/virtualbox-ose/Makefile
@@ -41,6 +41,7 @@ SUBST_FILES.prefix+=	configure
 SUBST_FILES.prefix+=	src/VBox/Additions/x11/Installer/98vboxadd-xclient
 SUBST_FILES.prefix+=	src/VBox/Installer/freebsd/VBox.sh
 SUBST_FILES.prefix+=	src/VBox/Additions/x11/Installer/vboxclient.desktop
+SUBST_FILES.prefix+=	kBuild/header.kmk
 
 SUBST_MESSAGE.prefix+=	Configure prefix to ${PREFIX}
 SUBST_STAGE.prefix+=	pre-configure
diff --git a/virtualbox-ose/distinfo b/virtualbox-ose/distinfo
index ff64e5d..ebff868 100644
--- a/virtualbox-ose/distinfo
+++ b/virtualbox-ose/distinfo
@@ -8,6 +8,7 @@ SHA1 (patch-configure) = 949f32c43fdd44dbfdd60312b7a088b2bb25af4a
 SHA1 (patch-include-VBox-com-array.h) = 3df9650bd11f2e21bdcb40d2b68d28121c3e01ea
 SHA1 (patch-include-VBox-vmm-cpumctx.h) = de663f58a60b79ba071457ffb001ff56580aa2ea
 SHA1 (patch-include-iprt-x86.h) = 09a66d29203ff7afa0a21be73bbf381243047d4f
+SHA1 (patch-kBuild_header.kmk) = ac077be822b751acea3103b1a90f3d4a826ff02b
 SHA1 (patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c) = b476d84a307cd50b3988a91636127e1c33a36770
 SHA1 (patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile) = 0a27940fa1270ce6f32ce56a4537988c378de59b
 SHA1 (patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest) = c431ea5ad26fbf5415ee71a482d6150cc603d1f3
@@ -40,7 +41,7 @@ SHA1 (patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk) = ad975823a6e88babb214
 SHA1 (patch-src-VBox-HostDrivers-VBoxNetAdp-freebsd-VBoxNetAdp-freebsd.c) = 99bcd5bfd419065d87610730e5f5178f50dde664
 SHA1 (patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c) = c1f97103511e8b0e2ed75666e27a4117b2826702
 SHA1 (patch-src-VBox-Installer-Makefile.kmk) = 7fa3024aa4f6b4d439e70f813e4bb51924610dad
-SHA1 (patch-src-VBox-Installer-freebsd-VBox.sh) = 38f9b95e5de2758bc2b0b081938c959bd6612bc6
+SHA1 (patch-src-VBox-Installer-freebsd-VBox.sh) = e52bdfbd30b45cef1fd072a96a2c6b7fcc7ab51e
 SHA1 (patch-src-VBox-Installer-freebsd-virtualbox.desktop) = 4a36818a51a6f49da3433beda9c28b242025cdee
 SHA1 (patch-src-VBox-Main-Makefile.kmk) = 4cdba772fb94ee64624754ed2ecbba2edac17145
 SHA1 (patch-src-VBox-Main-src-client-ConsoleImpl2.cpp) = 780b0201662db38c079790ea496e2b3da8823063
diff --git a/virtualbox-ose/patches/patch-kBuild_header.kmk b/virtualbox-ose/patches/patch-kBuild_header.kmk
new file mode 100644
index 0000000..400f6a7
--- /dev/null
+++ b/virtualbox-ose/patches/patch-kBuild_header.kmk
@@ -0,0 +1,39 @@
+$NetBSD$
+
+Convert /usr/local to @PREFIX@, see SUBST in Makefile
+
+--- kBuild/header.kmk.orig	2015-01-29 03:25:31.000000000 +0900
++++ kBuild/header.kmk	2015-09-23 18:50:49.000000000 +0900
+@@ -1285,7 +1285,7 @@ else if1of ($(KBUILD_TARGET), freebsd ne
+  KBUILD_LIB_SEARCH_ROOTS := \
+ 	/ \
+ 	/usr/ \
+-	/usr/local/
++	@PREFIX@/
+  KBUILD_LIB_SEARCH_SUBS := lib/
+ 
+ else ifeq ($(KBUILD_TARGET),linux)
+@@ -1293,12 +1293,12 @@ else ifeq ($(KBUILD_TARGET),linux)
+   KBUILD_LIB_SEARCH_ROOTS := \
+   	/usr/ \
+   	/ \
+-  	/usr/local/
++  	@PREFIX@/
+  else
+   KBUILD_LIB_SEARCH_ROOTS := \
+   	/ \
+   	/usr/ \
+-  	/usr/local/
++  	@PREFIX@/
+  endif
+  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+   KBUILD_LIB_SEARCH_SUBS := \
+@@ -1320,7 +1320,7 @@ else ifeq ($(KBUILD_TARGET),solaris)
+ 	/ \
+ 	/usr/ \
+ 	/usr/sfw/ \
+-	/usr/local/ \
++	@PREFIX@/ \
+ 	/sw/
+  ifeq ($(KBUILD_TARGET_ARCH),amd64)
+   KBUILD_LIB_SEARCH_SUBS := lib/amd64/ lib/
diff --git a/virtualbox-ose/patches/patch-src-VBox-Installer-freebsd-VBox.sh b/virtualbox-ose/patches/patch-src-VBox-Installer-freebsd-VBox.sh
index e736cd5..61de7e2 100644
--- a/virtualbox-ose/patches/patch-src-VBox-Installer-freebsd-VBox.sh
+++ b/virtualbox-ose/patches/patch-src-VBox-Installer-freebsd-VBox.sh
@@ -19,7 +19,7 @@ $NetBSD$
 +#
 +
 +PATH="/usr/bin:/bin:/usr/sbin:/sbin"
-+CONFIG="@PREIFX@/etc/vbox/vbox.cfg"
++CONFIG="@PREFIX@/etc/vbox/vbox.cfg"
 +
 +test -r "${CONFIG}" &&
 +    . "${CONFIG}"