sys-freebsd: 10.3_beta2 was compiled to be able to fix.

author: Yuta SATOH <nigoro.dev@gmail.com> 2016-02-20 10:18:14 +0900
committer: Yuta SATOH <nigoro.dev@gmail.com> 2016-02-20 10:18:14 +0900
commit: 644c3def85a145229a4652dd0f34eca3045cae18 (patch)
tree: abccec2e24967cae641e87eba69fc705a9390644 /sys-freebsd
parent: sys-freebsd: rename *10.2*ebuild to 10.3_beta2.ebuild (diff)
download: gentoo-bsd-644c3def85a145229a4652dd0f34eca3045cae18.tar.gz
gentoo-bsd-644c3def85a145229a4652dd0f34eca3045cae18.tar.bz2
gentoo-bsd-644c3def85a145229a4652dd0f34eca3045cae18.zip
37 files changed, 596 insertions, 117 deletions
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 281a50a..0132ede 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,8 +1,11 @@
 AUX boot0-10.1-drop-unsupport-cflags.patch 893 SHA256 7d58c67b73ed6ae7326b03e7a4c1204d17808328de0ac904973604658bc1804c SHA512 c4d441c9538489585f27f292fa0acd921496cdd10e06a7de45f4db7f6a6300f41401a387c9e65bf909790e7755fb92001131d668c6246a2505756b8e9e10eeea WHIRLPOOL 9ce41efe802fc181fac9026eb310d3d48173df7db585f4ddb5424ced43f5e7081a8baefc12370588ba2979e0ef6234fa5718457e3e854f66c7d1309778d863f4
 AUX boot0-10.1-gcc46.patch 2180 SHA256 a664f792660fe1dc25b6e54a973ad6d8ac6c19ef309954f5bb7973b52832cc82 SHA512 a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6 WHIRLPOOL 2d5ba9602c93ab02aef29838478b578603b39e7d26dbf688e3fccd1cdd7e5fec3aec729db81b4548b69841ab330e8898eb445ee09d06ccd8500fb0f7387c3fc8
+AUX boot0-10.3-clang.patch 847 SHA256 6687fa92439ec0813a61221f5acfc6fe4588432c6660f9e6962437d2589f5a1c SHA512 74a64f9853dc28e5354d1d3d1a97c9543b6f80d48568d264874a23355c4bcab9e6a90a22630b2c7afea4b51c906db4745cb2773feaf42979a9192b8f995d7405 WHIRLPOOL 3a299ffc554ad91a763a974268978755dc7819a6e4c21736efca6df1c0e5a95b07184103724634af3eb634fb2da77abb40d6bfb493cb6effb7463abe2c339905
+AUX boot0-10.3-drop-unsupport-cflags.patch 971 SHA256 26a7aef66e0b436201698f0df262d8af50061da203f90e1bc8babd79815f62b9 SHA512 ca2d36c332515c0c7b89bae24213e5dd21065e7bdd689726e1777d4439dfc850918ad4312751cdc69a417f05724f484f14a8254895e673844245e69133b8cf46 WHIRLPOOL 6ff2f96c33857433ed3160241a7137aef9375d15533f7fd3db979ac8294ee28f21fc9e1c292450fac6a3dd515e86f5969b7b517d36636712ef921af5956faa0f
+AUX boot0-10.3-uefi-support.patch 762 SHA256 5089401accfd622091253ec652b0e86edaf00021ec7372829bec56d08ba4d83c SHA512 6ff9b34969475f9580b364c6fca591901554107ac0eacb7e19888a05411fc4e9928ec632525dba30449678bb14f22cef23605ca5843370f882ca90bb1dc32a1a WHIRLPOOL cb83d397f0a1660b6ee0154b1c2d6e7807e2c6e61d92790e5be37233fa6f8bec3947f9c49d5046329486654a648e758f0e4d9f6d2ce7b2cf448c181059745281
 AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4
 AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
 AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD boot0-10.2_beta1.ebuild 2114 SHA256 b21f575403fa249f5aa173d5775b6cfcdd89676656e531f2be4ab96428a9dde2 SHA512 290d71d57e1e997f2594a9ba1caaa88d76d33cf7974b92a3dd6bc452b6350cdb0dccde65b399b800000f90fab0b6f71376f1537b96dca4b522551b7ca32b3dc2 WHIRLPOOL 0fd915db36574bb05538e9f0aaf92df40eb1cbe5440ba35a63f830358790b895aaa4f25cdd1dc17681a8b3e6f4502fc6ab14e7d46e4105f06bd367fd0a3a25e6
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD boot0-10.3_beta2.ebuild 1888 SHA256 b553cfceb8f08ff8821b386cdde80c01d48cc3ffc249783b91ed5646ab1a8ef4 SHA512 e010a3bc9a461390dbd5e00e081fdf827fd83996f9064558ba0bdd749902a9cdd17f2da9bbe42829a7b2ec18b081944ece831c80c0a22da7e1f2b2ca8111037b WHIRLPOOL 8cf81b00701b410a7f17c735c86c18ffad3576cb8032d90503bd99e3fed0a494c4d0cfe8a0f1ee4f7c1c218da86c9e968995de00d6b1966afd64916a7258cb5c
 MISC metadata.xml 295 SHA256 922f6d4e6468957777d39f1f596b0770e5bae7372d0bf3165e0cff93a838b644 SHA512 5543bbaf2b1d8532edb50462c17ff024af0f34466ed075888742ea0408a3518788684c74738bc2037ebadcace35d5018390dc81f08a2b29a127b2bbce98d73c1 WHIRLPOOL 26819d164c3bdad8c1bea131f5031165f8135b40faf0f2df40bc9b92201eed989975d021309c739f09c753a42ea3ebd31ac203ed32e1ba09df8f8d5b2d27c8d9
diff --git a/sys-freebsd/boot0/boot0-10.3_beta2.ebuild b/sys-freebsd/boot0/boot0-10.3_beta2.ebuild
index ad1175e..7d49e80 100644
--- a/sys-freebsd/boot0/boot0-10.3_beta2.ebuild
+++ b/sys-freebsd/boot0/boot0-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,7 +28,9 @@ DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
 S="${WORKDIR}/sys/boot"
 
 PATCHES=( "${FILESDIR}/${PN}-10.1-gcc46.patch"
-	"${FILESDIR}/${PN}-10.1-drop-unsupport-cflags.patch"
+	"${FILESDIR}/${PN}-10.3-clang.patch"
+	"${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch"
+	"${FILESDIR}/${PN}-10.3-uefi-support.patch"
 	"${FILESDIR}/${PN}-add-nossp-cflags.patch" )
 
 boot0_use_enable() {
@@ -49,37 +51,22 @@ src_prepare() {
 		-i "${S}"/i386/gptboot/Makefile \
 		-i "${S}"/i386/gptzfsboot/Makefile \
 		-i "${S}"/i386/zfsboot/Makefile || die
+
+	export MAKEOBJDIRPREFIX="${WORKDIR}/build"
 }
 
 src_compile() {
 	strip-flags
 	append-flags "-fno-strict-aliasing"
 
-	if use amd64-fbsd; then
-		cd "${S}/userboot/libstand" || die
-		freebsd_src_compile
-		cd "${S}/userboot/zfs" || die
-		freebsd_src_compile
-	fi
-
-	cd "${S}/libstand32" || die
-	freebsd_src_compile
-
-	# bug542676
-	if [[ $(tc-getCC) == *clang* ]]; then
-		cd "${S}/i386/btx" || die
-		freebsd_src_compile
-		cd "${S}/i386/boot2" || die
-		CC=${CHOST}-gcc freebsd_src_compile
-	fi
-
 	cd "${WORKDIR}/lib/libstand" || die
 	freebsd_src_compile
 
-	cd "${S}"
 	CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
 	LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
-	export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a"
+	export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a"
+
+	cd "${S}"
 	NOFLAGSTRIP="yes" freebsd_src_compile
 }
 
diff --git a/sys-freebsd/boot0/files/boot0-10.3-clang.patch b/sys-freebsd/boot0/files/boot0-10.3-clang.patch
new file mode 100644
index 0000000..4245e21
--- /dev/null
+++ b/sys-freebsd/boot0/files/boot0-10.3-clang.patch
@@ -0,0 +1,30 @@
+Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=542676
+
+https://svnweb.freebsd.org/base/head/sys/boot/i386/boot2/Makefile?r1=272249&r2=276479
+
+diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
+index 8a6e771..c030853 100644
+--- a/sys/boot/i386/boot2/Makefile
++++ b/sys/boot/i386/boot2/Makefile
+@@ -22,8 +22,7 @@ BOOT2_UFS?=	UFS1_AND_UFS2
+ #BOOT2_UFS?=	UFS2_ONLY
+ #BOOT2_UFS?=	UFS1_ONLY
+ 
+-CFLAGS=	-Os \
+-	-fomit-frame-pointer \
++CFLAGS= -fomit-frame-pointer \
+ 	-mrtd \
+ 	-mregparm=3 \
+ 	-DUSE_XREAD \
+@@ -40,7 +39,10 @@ CFLAGS=	-Os \
+ 	-Winline \
+ 	${CLANG_OPT_SMALL}
+ 
+-CFLAGS.gcc+=	-fno-guess-branch-probability \
++CFLAGS.clang+=	-Oz
++
++CFLAGS.gcc+=	-Os \
++		-fno-guess-branch-probability \
+ 		-fno-unit-at-a-time \
+ 		--param max-inline-insns-single=100
+ .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201
diff --git a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch
new file mode 100644
index 0000000..af1d351
--- /dev/null
+++ b/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch
@@ -0,0 +1,28 @@
+diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
+index fc66e01..470453d 100644
+--- a/sys/boot/efi/libefi/Makefile
++++ b/sys/boot/efi/libefi/Makefile
+@@ -17,9 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
+ # Pick up the bootstrap header for some interface items
+ CFLAGS+= -I${.CURDIR}/../../common
+ 
+- 
+-# Suppress warning from clang for FreeBSD %b and %D formats
+-CFLAGS+= -fformat-extensions
+ CFLAGS+= -DTERM_EMU
+ 
+ .include <bsd.lib.mk>
+diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
+index 24cc4c1..e5d2bae 100644
+--- a/sys/boot/i386/libi386/Makefile
++++ b/sys/boot/i386/libi386/Makefile
+@@ -55,9 +55,6 @@ CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../common \
+ # the location of libstand
+ CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
+ 
+-# Suppress warning from clang for FreeBSD %b and %D formats
+-CFLAGS+= -fformat-extensions
+-
+ .if ${MACHINE_CPUARCH} == "amd64"
+ CLEANFILES+=	machine
+ machine:
diff --git a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch
new file mode 100644
index 0000000..fdafe74
--- /dev/null
+++ b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch
@@ -0,0 +1,33 @@
+diff --git a/efi/Makefile b/efi/Makefile
+index 30024e3..a33efb2 100644
+--- a/efi/Makefile
++++ b/efi/Makefile
+@@ -2,15 +2,10 @@
+ 
+ .include <bsd.own.mk>
+ 
+-# In-tree GCC does not support __attribute__((ms_abi)).
+-.if ${COMPILER_TYPE} != "gcc"
+-
+ .if ${MACHINE_CPUARCH} == "amd64"
+ SUBDIR+=	libefi loader boot1
+ .endif
+ 
+-.endif # ${COMPILER_TYPE} != "gcc"
+-
+ .if ${MACHINE_CPUARCH} == "ia64"
+ SUBDIR+=	libefi
+ .endif
+diff --git a/efi/boot1/Makefile b/efi/boot1/Makefile
+index 4ffdfda..8ec0e00 100644
+--- a/efi/boot1/Makefile
++++ b/efi/boot1/Makefile
+@@ -64,7 +64,7 @@ LDFLAGS+=	-Wl,-znocombreloc
+ # Add libstand for required string and memory functions for all platforms.
+ #
+ DPADD+=		${LIBSTAND}
+-LDADD+=		-lstand
++LDADD+=		${LIBSTAND}
+ 
+ DPADD+=		${LDSCRIPT}
+ 
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index d060380..7c0a533 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -1,3 +1,3 @@
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-bin-10.2_beta1.ebuild 803 SHA256 f32dadbc217a7e7bb2a598afca787929a9a760cc87348573b2d9b7c0b0c60614 SHA512 7c696cc2c30268dfb9258950b3f33fafbe177631040bbdde5cba00cb8a28518de6dcb2f4936f47fabfdfe0998ad15d335d960959d3afd546f4b25d7a5edebc9b WHIRLPOOL abee6721768e0e085fd22a2299fd2ae27f197ea0b0b4586b57ee501286b0dc26dfd6ba39528e5e0b98572049d5086eb20f53f12df3e367569338aa534afb1f01
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-bin-10.3_beta2.ebuild 797 SHA256 3745de8aada88406b72412db6782e468a6fbaaa1d4a50d2401f127c4cac02ac9 SHA512 16a111a780b22c95cf2542ad45ef6c9d1f31636186fced2e7386afb7c65ce050ed3fb2a5c2a4a146f4b074e66d4c90ffa0e3f9c4aab6d07b895066f93acb9f92 WHIRLPOOL 9f98f68860f0a0127597c833143874d088653004f490ab4e09bca0a903b0427f7f1d0cab33cba92f0395ffd9419a84b0e06861c1d53b51e1e1bf3a77759ad1b0
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.3_beta2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.3_beta2.ebuild
index 31f008b..745b14c 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index a9f8717..af552a6 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,15 +1,16 @@
 AUX freebsd-cddl-10.1-underlink.patch 942 SHA256 f5a0139191b98584832075f22880e6ea9212a835cbb1e9aa15fa4e9364758a15 SHA512 67777ff41978c4e90c6e73f6cd2736732b838f42cc4e86f3d47bc5928f7ff4fcedfab84d599156255d243f81fc5a00daa0534ec6704ff820478fab39ce8dafbd WHIRLPOOL a7640e2be2a4fa97932a86a1f4dd68709f83d57a8bf5d043fa4f413474560c73960264fa3687b0154c568365c97d1a928511e207135be53f08acf65845dd6b99
 AUX freebsd-cddl-10.2-libpaths.patch 9569 SHA256 80350e3493fd667840555d06e453769e02604da8362d6e76280573a30dd9185b SHA512 615caa713eee62030a9f4630578f8f7ae8c4a2df71307237083115e2226734646ba1923f5de46aaf1523ffaa6b4c83b5fc64ceee552b15cb0244583408736ed4 WHIRLPOOL 3fd3f8d42057ab01965b4314f4565009076ea54da83401efdedd838299cf554092717d7795ba7a4dca22420c993d521411021dc4f521a273af4ff894bb938353
 AUX freebsd-cddl-10.2-underlink.patch 433 SHA256 2f6cbfc524f01b18496a1fe2c7abe7af611875e8fc23a6d801cd7871d1c1a304 SHA512 6a8448fcac3fc7d602890f2c197d285c3e2c6a018c26fc857ff14b74fb7b571200f14f425507f4cafcc3b714ad063735529dc4e96690d3012fedd060c986c620 WHIRLPOOL d3647e02d170cb69c9e598e47c3e680432887665905e5186c34edd359d92a543c3a4156175a04bb461bfc633fd0341d2d5410dcb7e7bec044b51bdb352ab8cf0
+AUX freebsd-cddl-10.3-underlink.patch 437 SHA256 ac486d44bf8ed4dd1b30d6200c59446e552e9e21f30535077533a080a28280ef SHA512 9ef6768be960a0c08cef094ba220e045b434aef6cfdb0be4631a63ea0b233158e927ca32c4f1d47a2f9a1e4a568f3850e61f56dcab35bd26cf1cea49035240fd WHIRLPOOL 8d5de341ceeca0e4a6c22b3bde9ddfdd611b1508344e837d34b926a3f8ac411a9daebaf30198fb323197d0860f102dc5b76172b7213a4cd4d41e623b79111393
 AUX freebsd-cddl-8.0-libpaths.patch 4418 SHA256 3fa5555254ae38a0e6d4e1385e2dd2b4ea0f84ae326f3941c69726cdcbe3a05c SHA512 dac14bcac23d16ee8acc7a3adfe7de896f6595d98dd3d0c93e39205aa5bdf1a0fc35adf338e05df66b18186da4b10f578cfe2d084b446aeb84eb49d07f5736d5 WHIRLPOOL 0ed3869833b9606ce325b30874f01106c2d288c6bff703398f63abe00602c6d3adf1d2faf2dc629a220dcfeb4c3d819f672875ce3b7bb4ab969977b5ce6920fd
 AUX freebsd-cddl-8.2-libpaths.patch 822 SHA256 f6884f9c471f2d1bf522c26b2f2607e9506d7fea9612c24b4392f1e861a1a5db SHA512 1d335eb70592436941b093c76ad2e7573cb317333f81b11be7a2ef9cc0b3e57e21d797bf43c5ac9154d9817aa136851640f2b7b67bdd66b8abde7a589fd9f567 WHIRLPOOL 3ecdb9ea5050d4309b2561dd37082982450180e6eb8b77373ca3949f62ccd7719e5178a3c3a61346b2820fa827e0bc13075d2266d5500a5f80d8efab16adb414
 AUX freebsd-cddl-9.0-bsdxml.patch 1419 SHA256 0a5c5f5b242e17d0a378778ec39ff43d410e1efed144dd14a46cbd2cf4a44542 SHA512 8ea86f6918b2629c33286c2396226bb4944e373069a423104d96f65e387162e0da94707458fd5caebcab08b9305b435ac66f4207aa6b15ce9571a5fa5878f3c5 WHIRLPOOL 5af01d3ba6e1e4a038de1f3274bf3bd241264db05b021fa374c5a56c805901320a4c30c2234013902eb2f5ca879a4972d3468e0157315dd98e73ce1ee4359e0a
 AUX freebsd-cddl-9.0-libpaths.patch 7621 SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278 WHIRLPOOL 1f6798ac319bba9dedb0a0776e09cbce01637e057e38f77d59410c942f68c7051b7ccc10bfed748b72eeabf9254bc52262b5c9cc3fa3a4187f8698ede2d27d4f
 AUX freebsd-cddl-9.0-underlink.patch 755 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9 WHIRLPOOL c6403e8e56f2c2e9d67387137eab77eae0f6e1a8c4c4d595c1950ee3ab3bff8d0d8a0f15ca83a7b65aa05d35dafa86ff75ff8fec7ce8f320a2e1d44be38c0995
 AUX freebsd-cddl-9.2-libpaths.patch 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643
-AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
-AUX zvol.initd 955 SHA256 6252345dca575d479621de99e4b19a384d76d0db1490fc1048ce742a065e9467 SHA512 606f74338087cb08591fdb3ff78a1de4cf0e4ee97af7ee301f7ce0b4028b980edc78601d745ec0a9865360d308b90a52f3603b5043f135be8ffc0f4380e9023c WHIRLPOOL 88e7534ad74518e7684775e202f63dfed3c41aa51314572af412aa87a8a060b4ada918643793ac2333b46b37e469d56227559dcfbadbd0bc023d21a683c6e165
-AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-cddl-10.2_beta1.ebuild 1353 SHA256 d28076ebb023d583ee97e05aadb77f5c96f0ad7b923288e08ed88681b63d81aa SHA512 7807072415a5df560f19bcaabc6cd4bd75f8b417c7de1e9a1b54cb66376cb11c7fa2079e960a35d064ae66d18f1d21773531badeecb2b38669d6c903b8e9b7e7 WHIRLPOOL aa657d8dd3fa8072439fdefe02774b69588962167d4b8633215f692497bac6b520dad4c4739604c3ab7ca82c3e04f33c9c7072e1d398a118efc603bb4bde6e15
+AUX zfs.initd 374 SHA256 2257ad345b4db70da768dd637b3c7b98f5ca23901bca8ac550d7332e97dc7930 SHA512 53976b601b1baa52576268910433bc7725b5de6ea45d928c64726d16fe4a2050f9ba120802d45c9991561bd33a998b6b998ac3da83a1fc4aef5898a5989c0f34 WHIRLPOOL 4048d257497d994dad564953bff6ae90f8d1907b24016c70ceeec27391acce223a7ea72a520265c2fed4d70f4371700f0c1f0127509a2cc24ca24383f83be6f5
+AUX zvol.initd 844 SHA256 831023b84fe6deda1451e645e19fa5e8e8efccaf6bcbcf1f28f276084635a89e SHA512 7ed02b0ca1b3bb6416daa21e60263af86f0d4a42688880fa5d3e0bc8ce8775dabb8db968a80604e16acb72ed4f4f767a3c3b2350134dfed9a6eaa671589bb314 WHIRLPOOL 044afd17baa49dfce73bea951e62577d50e886cee8eacfb50d25a47aacfab3ae508afef1054e5571f74d4c8661ab67ccc1b00fc2a152f47389c2e6a440eedb16
+AUX zvol.initd-9.0 818 SHA256 8d46f8fa90d9e8126382913072de8a256b7975328d7dc8de26fe87a487938f5e SHA512 749a11c6eccc356398803f7d282198f509ef7f73bbcd83edee736124e58f4a1b59d3fa3a218e167a8d031478eeae1f5b1939074a45e3c781ad499fa58b174371 WHIRLPOOL 71a77d38454119c424b2b911814330b964836e739d4e07e436b4d6e403ec9dda722563ce98989b588f59594e76ed1db6d8e9277ec89a01cd0719d9ad4cd72823
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-cddl-10.3_beta2.ebuild 1470 SHA256 f010709a1fba8f37f7087051db8182b2f7318cc0d381879f6d0ade743587693f SHA512 577a9f2350b0a9623d37b00b84e16988c4cfff896957a2d639aa671a80e24df6e0c351657aebfd67e0edcd976e46ed62beeb86806be3c60d63a926f7e601c3a7 WHIRLPOOL deb931a65798785ad8f21797b96163cdf823b6d6ecc83b3323e98df57a52cb19ff929006ad39d594a1a62862f4180b760a2b5bc0b36023ef9d862416a36c0f56
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch
new file mode 100644
index 0000000..c8ce8e1
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch
@@ -0,0 +1,12 @@
+diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
+index 2a66337..04988d7 100644
+--- a/cddl/lib/libzfs/Makefile
++++ b/cddl/lib/libzfs/Makefile
+@@ -12,6 +12,7 @@ DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
+ 
+ LDADD=	-lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
+ 	-lbsdxml -lgeom -lnvpair -lz -lzfs_core
++LDFLAGS+= -L${.CURDIR}/../../lib/libavl
+ 
+ SRCS=	deviceid.c \
+ 	fsshare.c \
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3_beta2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3_beta2.ebuild
index 7da5b2f..afc5c8d 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,7 +38,7 @@ S="${WORKDIR}/cddl"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-10.2-libpaths.patch"
-	"${FILESDIR}/${PN}-10.2-underlink.patch"
+	"${FILESDIR}/${PN}-10.3-underlink.patch"
 	)
 
 pkg_setup() {
@@ -53,6 +53,11 @@ src_prepare() {
 	fi
 }
 
+src_compile() {
+	# Disable parallel make.
+	freebsd_src_compile -j1
+}
+
 src_install() {
 	# Install libraries proper place
 	local mylibdir=$(get_libdir)
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 1131c43..aa49670 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -4,6 +4,7 @@ AUX freebsd-lib-10.0-libproc-libcxx.patch 393 SHA256 da065c458716e8a56a3c3aab87c
 AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
 AUX freebsd-lib-10.2-bsdxml2expat.patch 982 SHA256 0dab6d4525cee88eb1d6ce6c1176100ff9271222d6c6cde20f894781c02eb075 SHA512 b65fd732825e2813d499bd519bc5ef69b4c603ad57b047d2716405cc47a221c6e137a1f2e890b79a23bc26036834f7696dc9ac5953400f26975a0139fedad7c5 WHIRLPOOL dd2bd2384e12ee5e978dfb284ecdee73ce07f32d16dd67302a8cfc0ca324d078ab8b6153e170753a2fbe22993e07a4240e848d7b00aad78b58a4fa5cd27d0c26
 AUX freebsd-lib-10.2-liblink.patch 653 SHA256 a252201ec74f0cf0940b28b626e72f909cfab04addcb86b8f9abe984265c074e SHA512 c75c1fd81bd826685db5258ce0cd2407e385990dd576973fad361206271eda678d1fbe95a406909904bfee22890c79eb0f4cbfab09ddbee579552d003df2e6b1 WHIRLPOOL 3a579e65e07d7b8b558004eae9923c249d9dbd13983e3e263cb5384734d4e8c739440baa95a67953a56d2c6b7ff0a2cb8d2d7d8f7a0fbb4366001d0ea990cc4d
+AUX freebsd-lib-10.3-libusb.patch 339 SHA256 64c737051839e430108c96914485bc200e83ea951832033ace683470da823791 SHA512 15ad67c805c34e5a67f21de0db9ec3826aa96fadb880f2cca8110d4b26ed3722eea8aa9ee2c8e1976288b5e9be5e6046e4bd60d515305fff283ad50cc01d3d0f WHIRLPOOL 59ad6cb93295a95f8bb94fb7d2b13e1a8bd83267a96bc816142f9254bbdf494fd17670a0e8634eaeebe93f7535467c1b388f044eb459e222eecb84a7e21745bc
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0
 AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e
 AUX freebsd-lib-6.0-pmc.patch 338 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327 WHIRLPOOL 1744ed829c1775c01b5d1b827b5677b6b5d731cff376da4d8e7ab8facbb0c465131a34157d77186bfcf1a1097f515e3909d1e753aa2b8e72efaf7feae319361f
@@ -32,6 +33,6 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-lib-10.2_beta1.ebuild 18965 SHA256 6594144aa4ed9dad602497577e420b21b6875a68e16ddc0adbef07a1541e6973 SHA512 c3cb8b7abdfbb1431edd14771216eea2c0c479f8b1b8b7ea777f84055e20d1c04a2f194ee65e68471d58c0b016ffd4f6af810abe251142f6ff782bc8c420aac1 WHIRLPOOL deebfece2929e8bdb30f4f208a256e2feeb1f8faca60c1e61ef1e36db631d31bae6fb5312217fb59fdb5f3cc386ecb804eb5eec4229521e513f683d1caef8032
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-lib-10.3_beta2.ebuild 18999 SHA256 2291eceea80d212aa8bd57fa556934fdfb76accf0283710d4ca0fe2c88cbcba0 SHA512 e6a3e95d7308033a947e9ad7d5f88cef655f354efcb3203ff8ea574fe223a12c88a990b779b339735d7cba55efb47e498c48b8e2f2b5db3553ac913cfb9df3fb WHIRLPOOL 9733dcdd133072298715c5d8766a369541c8d84c18ae326cef6ec837e1104bc29a4f97487a65d2a2a7c69eb7ebadd04b770f0987d3bca2a2c62b78841e7f1f98
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch
new file mode 100644
index 0000000..813a42b
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
+index 88ec3fe..076b8d4 100644
+--- a/lib/libusb/Makefile
++++ b/lib/libusb/Makefile
+@@ -38,7 +38,7 @@ SRCS+=		libusb10_io.c
+ CFLAGS+=	-DCOMPAT_32BIT
+ .else
+ FILES=		libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
+-FILESDIR=	${LIBDATADIR}/pkgconfig
++FILESDIR=	${LIBDIR}/pkgconfig
+ .endif
+ 
+ #
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta2.ebuild
index e5d7309..1bbdcb8 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,10 +9,6 @@ inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild mu
 DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
 
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-15:17/libc.patch"
-	"EN-16:03/yplib.patch" )
-
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
 # extracting the whole tarball
@@ -111,7 +107,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-10.0-liblink.patch"
 	"${FILESDIR}/${PN}-10.2-liblink.patch"
 	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
-	"${FILESDIR}/${PN}-10.0-libusb.patch"
+	"${FILESDIR}/${PN}-10.3-libusb.patch"
 	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
 	"${FILESDIR}/${PN}-10.2-bsdxml2expat.patch"
 	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 8900882..0625ff7 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -11,6 +11,6 @@ AUX rstatd.xinetd 218 SHA256 7bf526babdd46f03a6ea9ed12b5df16e5c2abc8aeb567214c8e
 AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e99181408067a49cd3 SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd WHIRLPOOL 7517089e5ab5b3925b46908c22a929cb04c8390387ad075f17c2fa0213ab38cae833d9280cfe289915afe4c2ee0b3e0299cee42daa871c23507f5f96cc22f227
 AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f
 AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-libexec-10.2_beta1.ebuild 3144 SHA256 c69f9439f99438777adec1994a0b0f89a4c21e6bcdb013ee0598527ed196e5b8 SHA512 28581030fe73ac615510480d24304365afd5de99e636101b78261f2bf532ea779d6acf5951ad1b3f630a3f8ab366416d3dc9d6512f1b15498affe6b45b7d04cd WHIRLPOOL 2d23cf33beda789ae9dbda89d770c81cced63be28e611e02948b04602e1f88323dfca971783328b9d129774521f6fc3c01e996a8f34fcedef47d4cb6e4d2105d
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-libexec-10.3_beta2.ebuild 3284 SHA256 4f31ead40c1c6b24465e6ee43e4160e061df8321455e6cf393a2ca8a8cce0acd SHA512 b5a788836a995d93e37e14d30c4b7bc1b5044be7c28815f120850f9392a922e10f8cd79c79739002d6707a2bb772be522292f9f51a9d08804232c0f4f65c5917 WHIRLPOOL ffee504bc508af78fe9012cec7e192955dd9500d578d4e40b45446ee97f465f2eddba12fb73657a785047d5b3b10cc1240e915164d4e306a69788a706e3d497d
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta2.ebuild
index 89c29a0..7ca8c49 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 97be4e6..03b2d33 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -2,11 +2,12 @@ AUX freebsd-mk-defs-10.0-gentoo.patch 12183 SHA256 7e859440386e4b7047507a279fa6e
 AUX freebsd-mk-defs-10.1-gnu.patch 2320 SHA256 7b73dd0076eff45f71345dda0b4dd8e2a1a05f40101f559f52ab938813ef4ce1 SHA512 a8b82220f30c7b9ae369876339ff3e7431d3bbcb2c2a0fd8cb4e4c1c17188563c3d4d29938ef3b2b5480acf42f7d71a08ca8ade4f55968da17e82ceafc703981 WHIRLPOOL f0d56fc3065258b25e64a966470f4941e1f4cf6f0558cd3083102961d84acdbeb17c3469a5ab6a3c591e62a72e9c1c06d336ca854c607b40780f8e80f9157e4e
 AUX freebsd-mk-defs-10.2-gentoo.patch 11855 SHA256 cb528d3843c3927eac7dd85eb66b2a864980eb8a5626f8c81af8293f7e52b974 SHA512 e76c5a600ba7376a9fd2533fb6e4825074ce9f782b007440c4fc0a584d85e8858f4763824c6ea9a949544b742d9c01db22f033091d27b43819c6bab3c31a95f2 WHIRLPOOL 7b64044b73c39b927542fd53ca6c013959d2520e09f7f8f53ae77eaeca5435888f74345167f43efbdda39d895fc70e4bb606e1f6ed9859b0c129e2e4f5d5f755
 AUX freebsd-mk-defs-10.2-gnu.patch 1853 SHA256 acc69cba0617496e6dcef543198bf5023fb1799b81a458451f58ea2fe63e46a1 SHA512 3913287e294a09bf17a06b8878de40995c27e63c64e79711112c8fc60bb1630e757e8df2ba4ee41720270776ed5df06d7f1cfb9c09e20b566653023466e01a1e WHIRLPOOL 1db20b2a7e39da3b86a4fb09c42980c6c028b1b46baac55c334abccea87f8c6c59f1c3aaa753bcbc2c08e9bad17d342410ca882a75e37edcf9bdfd26ac7ec1ba
+AUX freebsd-mk-defs-10.3-gentoo.patch 11845 SHA256 2298f4bead99ffed440d92c7b0d5ff81542bce0cbf07a3fe99f920201297d010 SHA512 05d0366b58e02ff11e6fa34cd3f731a06e5d4464eee92f05128e2b68bf6b2539e792489a44ff9e224bb994fcdc6807c19be7aaa459163bb900c8ee130b6a4c11 WHIRLPOOL 3bfdda2ebfa3ba81ad7464845c9ca9c81c438a0becf848e960d2a30171d506ae868aa5b5151cfce6f5390a5d487e423112c56eb8a4be24885e1df28a256c2da7
 AUX freebsd-mk-defs-8.0-gentoo.patch 11076 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5 SHA512 3b3e828ac0f5cafdd3f3ef84ae2e0ea5eb36d9c3d465800d1234d8b405b727628b82ca691513bb47c609dbb7767cfb8f16be05f7eefa361a96cb8f282569e480 WHIRLPOOL ae4a0110d88e584ee650fdb04847a29c285e40f4a5a931fbbc21fefeccd4a3a7b948a15f0a9b09b9672e662de55dd4e293d3745c12eacb0dac3ec7d7f433b973
 AUX freebsd-mk-defs-8.0-gnu.patch 4074 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0 SHA512 8196f6f01059dd7890af9e0e0be654ad264938f4e8c9a209543b995baf6be43d841417ba8b8340c3c092c8d5f14ad76d578ddcd9267c372999b857ca9a566f03 WHIRLPOOL 28a4600e93855aba192d326beb479743890814c68999290d65a94e7cfa636db897c2c2a2c4ac177a87f8af12ff0a51c1b8ba5a8bb22802e0ef695e7418469d70
 AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
 AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
 AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-mk-defs-10.2_beta1.ebuild 801 SHA256 f5ab3d11ef1659989c79cba93501f6d010218fd5791bc0492371b0269b027a91 SHA512 7d9371b6ac8270a07c04bd4e36ac11817a14c2811d7b77776903756bd05f8321c748bb9deb1c30dbc0156cd210f339316673733a668aa2c1fade2ba88a39e41d WHIRLPOOL bc95af96014bcec3e8ede7c1a5ce55bf81daf131db0f49a31b21dbc7ab2919e1e31cf3cf0fb5391e270832aaea1186d1121c09b234a5dc4a4cfabfcb01cfdc08
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-mk-defs-10.3_beta2.ebuild 795 SHA256 0b899c21899afe4e27c6783e766c1a07f032ef4ba1b6fe0b2d9d0d180b704821 SHA512 1bc652eadc222e87e131d3d11f0f9ddb2413b07403e4a08111a7306bec98273977b0c4f4989c82ca07c208bd67dbae3a1567b7110ad7aad157f8def197fd8a02 WHIRLPOOL e696b94b54a4ca14f065ba516c66d9e1466d1860c67919285430c2c7ccb4ba62c03e6bf947ace6b234406da64881f9eb1808eb129ff879aad062da07beaf1f00
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch
new file mode 100644
index 0000000..cdc244d
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch
@@ -0,0 +1,337 @@
+diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
+index a8aa595..476b33b 100644
+--- a/share/mk/bsd.doc.mk
++++ b/share/mk/bsd.doc.mk
+@@ -135,10 +135,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
+ realinstall:
+ .if ${PRINTERDEVICE:Mhtml}
+ 	cd ${SRCDIR}; \
++	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
+ 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
+ .endif
+ .for _dev in ${PRINTERDEVICE:Nhtml}
++	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
+ 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
+ .endfor
+diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
+index 183cb1c..5b57594 100644
+--- a/share/mk/bsd.files.mk
++++ b/share/mk/bsd.files.mk
+@@ -40,6 +40,7 @@ ${group}NAME_${file:T}?=	${file:T}
+ .endif
+ installfiles-${group}: _${group}INS_${file:T}
+ _${group}INS_${file:T}: ${file}
++	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
+ 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
+ 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
+ 	    ${.ALLSRC} \
+@@ -52,10 +53,12 @@ _${group}FILES+= ${file}
+ installfiles-${group}: _${group}INS
+ _${group}INS: ${_${group}FILES}
+ .if defined(${group}NAME)
++	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
+ 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
+ 	    -m ${${group}MODE} ${.ALLSRC} \
+ 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
+ .else
++	${INSTALL} -d ${DESTDIR}${${group}DIR}
+ 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
+ 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
+ .endif
+diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
+index b938221..6b98e72 100644
+--- a/share/mk/bsd.incs.mk
++++ b/share/mk/bsd.incs.mk
+@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?=	${header:T}
+ .endif
+ installincludes: _${group}INS_${header:T}
+ _${group}INS_${header:T}: ${header}
++	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
++		 -g ${${group}GRP_${.ALLSRC:T}} \
++		 ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
+ 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
+ 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
+ 	    ${.ALLSRC} \
+@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
+ installincludes: _${group}INS
+ _${group}INS: ${_${group}INCS}
+ .if defined(${group}NAME)
++	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
++		${DESTDIR}${${group}DIR}
+ 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
+ .else
++	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
++		${DESTDIR}${${group}DIR}
+ 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
+ .endif
+diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
+index 6275ce3..8d32289 100644
+--- a/share/mk/bsd.info.mk
++++ b/share/mk/bsd.info.mk
+@@ -83,6 +83,7 @@ INFO2HTML?=	info2html
+ TEX?=		tex
+ DVIPS?=		dvips
+ DVIPS2ASCII?=	dvips2ascii
++INSTALL?=	install
+ 
+ .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
+ 
+@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
+ INSTALLINFODIRS+= ${x:S/$/-install/}
+ ${x:S/$/-install/}:
+ .if !empty(.MAKEFLAGS:M-j)
++	${INSTALL} -d ${DESTDIR}${INFODIR}
+ 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
+ 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
+-	    --defsection=${INFOSECTION} \
+-	    --defentry=${INFOENTRY_${x}} \
++	    --section=${INFOSECTION} \
++	    --entry=${INFOENTRY_${x}} \
+ 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+ .else
++	${INSTALL} -d ${DESTDIR}${INFODIR}
+ 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
+-	    --defsection=${INFOSECTION} \
+-	    --defentry=${INFOENTRY_${x}} \
++	    --section=${INFOSECTION} \
++	    --entry=${INFOENTRY_${x}} \
+ 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+ .endif
+ .endfor
+diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
+index c753afe..14f74aa 100644
+--- a/share/mk/bsd.lib.mk
++++ b/share/mk/bsd.lib.mk
+@@ -46,8 +46,6 @@ CFLAGS+= ${DEBUG_FLAGS}
+ .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
+ CTFFLAGS+= -g
+ .endif
+-.else
+-STRIP?=	-s
+ .endif
+ 
+ .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
+@@ -296,14 +294,17 @@ realinstall: _libinstall
+ .ORDER: beforeinstall _libinstall
+ _libinstall:
+ .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
++	${INSTALL} -d ${DESTDIR}${_LIBDIR}
+ 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
+ .endif
+ .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
++	${INSTALL} -d ${DESTDIR}${_LIBDIR}
+ 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
+ .endif
+ .if defined(SHLIB_NAME)
++	${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
+ 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
+ 	    ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
+@@ -357,10 +358,12 @@ _libinstall:
+ .endif # SHLIB_LINK
+ .endif # SHIB_NAME
+ .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
++	${INSTALL} -d ${DESTDIR}${_LIBDIR}
+ 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
+ .endif
+ .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
++	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
+ 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
+ .endif
+diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
+index c097c77..c2994d8 100644
+--- a/share/mk/bsd.libnames.mk
++++ b/share/mk/bsd.libnames.mk
+@@ -51,7 +51,7 @@ LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
+ LIBEXECINFO?=	${DESTDIR}${LIBDIR}/libexecinfo.a
+ LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
+ LIBFIGPAR?=	${DESTDIR}${LIBDIR}/libfigpar.a
+-LIBFL?=		"don't use LIBFL, use LIBL"
++LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
+ LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
+ LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
+ LIBGCC?=	${DESTDIR}${LIBDIR}/libgcc.a
+@@ -81,7 +81,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
+ LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
+ LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
+ LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
+-LIBL?=		${DESTDIR}${LIBDIR}/libl.a
++LIBL?=		${DESTDIR}${LIBDIR}/libfl.a
+ .if ${MK_LDNS} != "no"
+ LIBLDNS?=	${DESTDIR}${LIBPRIVATEDIR}/libldns.a
+ .endif
+diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
+index 574f0f5..b63b117 100644
+--- a/share/mk/bsd.links.mk
++++ b/share/mk/bsd.links.mk
+@@ -15,6 +15,8 @@ _installlinks:
+ 		t=${DESTDIR}$$1; \
+ 		shift; \
+ 		${ECHO} $$t -\> $$l; \
++		d=`dirname $$t`; \
++		test -d $$d || mkdir $$d; \
+ 		${INSTALL_LINK} $$l $$t; \
+ 	done; true
+ .endif
+@@ -26,6 +28,8 @@ _installlinks:
+ 		t=${DESTDIR}$$1; \
+ 		shift; \
+ 		${ECHO} $$t -\> $$l; \
++		d=`dirname $$t`; \
++		test -d $$d || mkdir $$d; \
+ 		${INSTALL_SYMLINK} $$l $$t; \
+ 	done; true
+ .endif
+diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
+index 0212d3a..6435936 100644
+--- a/share/mk/bsd.man.mk
++++ b/share/mk/bsd.man.mk
+@@ -165,9 +165,11 @@ _maninstall: ${MAN}
+ .if defined(NO_MANCOMPRESS)
+ .if defined(MANFILTER)
+ .for __page in ${MAN}
++	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
+ 	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
+ 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
++	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
+ 	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
+ 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
+ .endif
+@@ -181,11 +183,14 @@ _maninstall: ${MAN}
+ 		esac; \
+ 		page=$$1; shift; sect=$$1; shift; \
+ 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
++		${ECHO} ${INSTALL} -d $${d}; \
++		${INSTALL} -d $${d}; \
+ 		${ECHO} ${MINSTALL} $${page} $${d}; \
+ 		${MINSTALL} $${page} $${d}; \
+ 	done
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
+ .for __page in ${MAN}
++	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
+ 	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
+ 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
+ .endfor
+@@ -193,9 +198,11 @@ _maninstall: ${MAN}
+ .endif
+ .else
+ .for __page in ${MAN}
++	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
+ 	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
+ 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
+ .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
++	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
+ 	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
+ 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
+ .endif
+diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
+index 28255ea..2bc6546 100644
+--- a/share/mk/bsd.nls.mk
++++ b/share/mk/bsd.nls.mk
+@@ -62,7 +62,8 @@ NLSDIR?=	${SHAREDIR}/nls
+ # installation rules
+ #
+ .for file in ${NLS}
+-NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
++NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
++NLSNAME_${file:T}= ${NLSNAME}.cat
+ .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
+ NLSLINKS+=	${file:R}
+ .endif
+diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
+index 73de02d..c6c30ca 100644
+--- a/share/mk/bsd.own.mk
++++ b/share/mk/bsd.own.mk
+@@ -206,9 +206,6 @@ INSTALL_LINK?=		${INSTALL} ${HRDLINK}
+ INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
+ 
+ # Common variables
+-.if !defined(DEBUG_FLAGS)
+-STRIP?=		-s
+-.endif
+ 
+ COMPRESS_CMD?=	gzip -cn
+ COMPRESS_EXT?=	.gz
+diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
+index d6d0fa5..93a9046 100644
+--- a/share/mk/bsd.prog.mk
++++ b/share/mk/bsd.prog.mk
+@@ -42,10 +42,6 @@ CTFFLAGS+= -g
+ .endif
+ .endif
+ 
+-.if !defined(DEBUG_FLAGS)
+-STRIP?=	-s
+-.endif
+-
+ .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
+ LDFLAGS+= -static
+ .endif
+@@ -200,6 +196,7 @@ realinstall: _proginstall
+ .ORDER: beforeinstall _proginstall
+ _proginstall:
+ .if defined(PROG)
++	${INSTALL} -d ${DESTDIR}${BINDIR}
+ 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
+ .if ${MK_DEBUG_FILES} != "no"
+@@ -233,6 +230,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
+ SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
+ _scriptsinstall: _SCRIPTSINS_${script:T}
+ _SCRIPTSINS_${script:T}: ${script}
++	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
+ 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
+ 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
+ 	    ${.ALLSRC} \
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
+index fee6ccc..c2fe39a 100644
+--- a/share/mk/bsd.sys.mk
++++ b/share/mk/bsd.sys.mk
+@@ -30,10 +30,6 @@ CFLAGS+=	-std=${CSTD}
+ .if defined(WARNS)
+ .if ${WARNS} >= 1
+ CWARNFLAGS+=	-Wsystem-headers
+-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
+-    || !defined(NO_WERROR.clang))
+-CWARNFLAGS+=	-Werror
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+ .endif # WARNS >= 1
+ .if ${WARNS} >= 2
+ CWARNFLAGS+=	-Wall -Wno-format-y2k
+@@ -102,10 +98,6 @@ CWARNFLAGS+=	-Wformat=2 -Wno-format-extra-args
+ CWARNFLAGS+=	-Wno-format-nonliteral
+ .endif # WARNS <= 3
+ .endif # CLANG
+-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
+-    || !defined(NO_WERROR.clang))
+-CWARNFLAGS+=	-Werror
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+ .endif # WFORMAT > 0
+ .endif # WFORMAT
+ .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
+diff --git a/share/mk/sys.mk b/share/mk/sys.mk
+index c270260..68491ce 100644
+--- a/share/mk/sys.mk
++++ b/share/mk/sys.mk
+@@ -327,12 +327,6 @@ YFLAGS		?=	-d
+ 	rm -f ${.PREFIX}.tmp.c
+ 	${CTFCONVERT_CMD}
+ 
+-# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
+-__MAKE_CONF?=/etc/make.conf
+-.if exists(${__MAKE_CONF})
+-.include "${__MAKE_CONF}"
+-.endif
+-
+ .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
+ SHELL=	${__MAKE_SHELL}
+ .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta2.ebuild
index 1dc6575..571e0f8 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,7 +25,7 @@ RESTRICT="strip"
 S="${WORKDIR}/share/mk"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-10.2-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-10.3-gentoo.patch"
 	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
 	use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch"
 }
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 3efee1d..193d7f7 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,6 +1,6 @@
-AUX README.pamd 2965 SHA256 2d3cea2b59ddee2ca6639ca7d14068e1499acee4194181c255bdfea81964d5ac SHA512 e278fd0a5056ae8c1de2f6104bfb4766adc89c7c357a4b965cb08ee555a071b326462c937fd63cd8fc7bd7e2a880f939cecdf2997a3d2c33c1b962afee12d38e WHIRLPOOL 8ee79582595a2b79f3936863bd5fdb144930380a4073a74ec81967b3a11d61a40ca0becaf36dfa760c0c6110efa2041a4acd6041615e0d006f032e1d9c819aff
+AUX README.pamd 2846 SHA256 cc15a45d85590c1c1267a6083048e410b0175d863f1685b51e26745672cd1b44 SHA512 155b5ba68ffcdff57b9bc5822eb3affd01cba9dcc5ae8095c91aa5048d61f7b550cb8f4c7a0b508055f4300a1a6295770f6075cd6c0df84ce6782088c84c7f6a WHIRLPOOL 080a3c562a81986289992a8a43a8f41a6e4161ff5ff72d96ca6b76ba3182e94a949944fca1342acdf75ac4bd0e03940cbfba22390d5da7c4d150a880ace2f201
 AUX freebsd-pam-modules-6.0-gentoo.patch 701 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d SHA512 7adba1261547c11bb1a0b0d3c8cc800bba9aca4a878c9fa63f8b68e270a3a0d54388eb1e156aadcba54d9dd23a2817232b3f287522d820da15abb7dd9c8cd995 WHIRLPOOL 2b02611fce484145fe62468826bbdb8f1dedfb1c4a7a14b01234c99f13daefe9597d08a23e0836f5804f92c26cc1b950180f7fcbd1698af360b23e06c143621c
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-pam-modules-10.2_beta1.ebuild 1102 SHA256 10a9bacb5604fa90de5bfa22269f0f98162ba62614280c6b1c99e518ec72d9e7 SHA512 d5c98888fe095b574ea3b8d33c70f5ef3a743f3be043f002b56b6a25323bb7594e9c8f5902d6cfdd791523a52a23c703d0e6d1dcb10a33e7199addb97d825fb3 WHIRLPOOL e20b67dc96b9973f88deca7dfa135d85a540ac887d9d9cc61b1be1b31eb9dfa0d7832cdd7422119ca4db99d657a5a46ffdf2fa4da46818be2b69ece69acaa9ca
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-pam-modules-10.3_beta2.ebuild 1096 SHA256 0077f4f4cb836ac70f74bb7dadb430abe3651a5e5bcce2aeb65e492214fca113 SHA512 840087e548241b1333599b3195e6e4cf74b2340a389f1fa6de6be7a93ff05330798a027929c49f2d822a70a3e4d7b3ca9ff1e4f72124bb954e26c82e1a1f62f7 WHIRLPOOL 7a8ce799922aa804c2feb475d447a5ee05bb76141d2efc4d09c95110809d04e46af0929ef9476f23761f8d414391ef50d4c58dac8c216cd2f887244f2bc42fee
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta2.ebuild
index 9b3f992..788158a 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index 5d80858..80181a9 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -8,7 +8,7 @@ AUX freebsd-pf-9.0-libevent.patch 384 SHA256 e1331cdc64d5d135f3cf33bea70031cba78
 AUX freebsd-pf-9.0-pcap_pollution.patch 450 SHA256 d6ec6b1952e22f621b33d85956837bae26fd06a79cd3daf5e073b889d4650276 SHA512 262d23f74449f75d628dcda09a7c7e0d501b61899c0a2a1ca71179989803f5c5f70fd4f8908f06ce998aca994d54b43efe03578892ff121c0a27e7fa36e4f1dd WHIRLPOOL 9dd4be7cf9741a8cbb0395346a79656233532b10762551d04c85a36637bd95e5d1aed0024ba1ee4259d41d1b5d26777524353787d3c13ad12e4dfb21f12955cf
 AUX freebsd-pf-9.0-pflogd.patch 332 SHA256 fc832fdfa406603a2cb185b8f0f746b13f7673742578913ba635849e1fd778f6 SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073 WHIRLPOOL b90b5e454e96cc6f243e99358b78d45b6a13a46810a3683d837f03721052e7b4fc3f8733ac2c96cabed204435a9be93a0652da5311f6552ece294031b0b663df
 AUX pf.confd 274 SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5 WHIRLPOOL fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc
-AUX pf.initd 916 SHA256 b0cf7dadb825a1133fb52069e63eda10042aa62e3fa702bfbee53cd455837ac9 SHA512 cd55eccc9735f5a9e41297049a12c23b3fb4ef0987236b25bbfeeb01e7e0be697ff60fe8c9827dbb6a3da93211d6534e018a9693a6d1d48d60723738a21e7485 WHIRLPOOL babaa4fdcb885262ec9e89b9bd076aa4fec0c82764025d3192dda6986366b2f0169235c4c771510ea742444deb0c7bccf56f4ab23fb592351decae445b9cc158
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-pf-10.2_beta1.ebuild 1585 SHA256 d26fabbae58ad080c7628dc06628a0df15973ee97f44f8163113c67cad7e2bbd SHA512 791ef5dc4a6e003a625a21e6aa120224d5f124c7f88b5e656890fa6d3b983224a9fa36a86c16fef99d1ab84fc58a78d6d924440fc62227439641edcca41ffe34 WHIRLPOOL 21348edf7f3b281f136b025a13671b0ab4fd12555ae31513d10ee61d6d338209b1618ba979e22aba317d6482b19c0258f3ef1a6463295f62d3f6c0508e9daad5
+AUX pf.initd 809 SHA256 d22b84e3400582bfcc1363871f21911617ae61502e2fc2ed7e86cf50505b530f SHA512 9c5135e1f86caccabf7f0440a5747a17e488f60891a822024b1908945781e0957f6ec61cae46f7d0a09aa90815e4e7dc58e064b5137b3f8207e3e5a90fd30118 WHIRLPOOL 4716aeb605e14f78010f3a68dd98dd9c217f29e012d14ed6e3a951ba973fccc9ca7314f6588ab5d4dbd8ee635a7eda47eefd484215dd5282d456ea7b031ca9f2
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-pf-10.3_beta2.ebuild 1579 SHA256 153dd2c2aa0f731db7c4d48ca07be49148820b9c299bd0b93bed34fff8f3d0c8 SHA512 f76d9dcce90d3c668705e066432fb9cfa8680782ee1549be1d3d68498a44ec04bc36f58fda9a19b9e9ba733cce8a2ee37bd44487095f3ed35c29d6393e0573e3 WHIRLPOOL ed6da438dbc0b3c7337399685ae8a752738def36afb42d4cf5a79d09c7dc586aa123ac4fbf24363f95db33db7a298697f8bbd03600f1ceaad250d67a9da7b4d4
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta2.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta2.ebuild
index 237bb73..823906a 100644
--- a/sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index 43fb04c..654b00a 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -6,6 +6,6 @@ AUX freebsd-rescue-9.1-bsdtar.patch 404 SHA256 0e71e3e370b33318bbb167e82d6507589
 AUX freebsd-rescue-9.1-libcleverlink.patch 801 SHA256 53794263aabaf55cd570adbbfdb68e86a9e9b17557e8ca223d424a5c2f4f6831 SHA512 556bb68f3307dc7fb10096080db2d336ba4096ba6bebc6a1fe9449ab5298ce2c66fb53f11f0702ee75c2208b45a6e2cb366a3d774bedb65bcdb2a49f51c08fa3 WHIRLPOOL 88125b9143113b1f7049bf63a20a0c6d82fbe2c722198405830092b0a183f4bf7744420e6a82b601c8fb25911556c8f3a9088949798c7f66caf7843a5f9b2347
 AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b
 AUX freebsd-ubin-10.2-bsdxml.patch 367 SHA256 3bedd2e3efc7817c446395866e3ec2ca65430624dd4958bc91296d77cfc4fb90 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d WHIRLPOOL 4946a71b63b05691ede60f15573356d98ef62b44cab40ba40a24d2be11e9655c95c660b62e898ff15ff9cdd8c006402c0dbe43a82d913b7707c1f30a55720863
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-rescue-10.2_beta1.ebuild 1784 SHA256 5616c673155ec7f5110ffd8b0047387ebac4dc0266152bc461d03e7e3d1d5ab1 SHA512 46db9d99eb139ee0ec15ffe62c4aeecfa44a1d93f23baf2dce846dcd80315105e75c107861c9a696a24e33bec6138c765a73c10a849ac995b80b02caa2d7b872 WHIRLPOOL 389db94554ee9a32e3527ac8e9df43ec1813d9b97467046379bb67b283ca217d292e7581c3689d0440158c1d46c8de4fac1c7d6dda8eb2e459da947437cb1c22
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-rescue-10.3_beta2.ebuild 1815 SHA256 91d0e56e62021b6326de439e7776ae2e46e932801b6f6485c96cae89978e746f SHA512 cfe5887798a19a0270221a0ba33f4c8cff3e8167430fdd8e945377a09c7cc89d38a6ec29025478268eee2cebb7302b3c4f25a5ec171c0cb9a9b9f6be25960760 WHIRLPOOL f1cf2218d9453541684db51eb2faf744d55825be25247f4053f37049326faff8c6c5c6aa7f3e1a99e29f73754f215533dd9e956930b21aa64d8630c08a27ac35
 MISC metadata.xml 312 SHA256 957f4b12031fc0ad63ba3709a92dc8440874022d1c917e0c788583add1eacc48 SHA512 c0580fc77c25021bf7cf5284d6f40c0b5a254be8ab5294fc7d2259a4d85ed68a78a29f1f6b1ed4308646b471236ed0dd194a4449d46ccb4322fc27eea2108129 WHIRLPOOL 0e5713d6a650cbfe595f121286aead777a842178dc74d6f3557ccbad1fbe520933cafd46c9a002a15b102a3e556db5da26cfadccd89407c49d14c0900d130c30
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta2.ebuild
index 54182da..f14c4e9 100644
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 04cce52..2abef41 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -11,7 +11,7 @@ AUX freebsd-sbin-setXid.patch 541 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f3
 AUX idmapd.initd 440 SHA256 e89050097731f658825b4a7215023e1c5070f0e31cfdf79eaf299ede9c9f9e39 SHA512 d76f1ed5b6cb0624359f0e1018b1decee80fec6e201393500656a2001034b042dde4299c2768ea8bfd1aa65813c86a5f9c06b5dd2e41ab74f954b8310d55259a WHIRLPOOL eeb04173b61c7e60883bd51e07be5f69aa67d6f4e506c3b3e07604e86cb43d81b5722e23e21ec189d83f2549a8827256216f45025ea5fd427b4874f2723c7a16
 AUX ipfw.confd 364 SHA256 97911a2f003e2108c1f5da04b84a3b73fbccbde48fe58af0f056d8a9effbb3d3 SHA512 6bb923386c40e7bfcc2d9a122ee3e942fe30cb49715d1cfb122923416d2dcf63fd6f61cb93510a245eb8bbd767e33f029726bb277cb0e16e98d2e856ef33ff2f WHIRLPOOL e1de6e7f8807f7079b856197d9e7a650491a0a0f7b9fab703befed7bc24ccedb3be1ff758194c70cfa4e86f0930b6f30bc03342edd8de55795621ceb5be471f0
 AUX ipfw.initd 2911 SHA256 45789a2e51c8eb164247d08c58d47ab52798bfbd19b4ddb6cc87acb5684e4eb5 SHA512 56776597170cf3549d7560fbb13ebb81cf608eb6f16d5ea440d38d4f3edbd06d56bc3fe104f9114e099d622cff1cd8e1a65529ebb4a7ecbf75ee6759e7bdc190 WHIRLPOOL f82edd7d971946637451519a78bcd0da73344944e2002fddca2b1fe22012d9a74dabec644937833e3f9250ea6d81fbd002569dc64b11db04c83e57c18ec508fe
-AUX sysctl.initd 671 SHA256 fde293d294c8985663c3a3685cd27ede3b1cdedbd042102546dd844b93456e69 SHA512 0a0fe7b4e9a07c537a498a1cec17e76f191aeef8ab12795df77eaf92d9273569aa981674f1ff35122be3bcef51f96ea20f860138bd0241b4695b31ebc5fba79a WHIRLPOOL a3ba842f4cf2522dd7e0a6a0e6e7b1d12ed54a4a02d5c39362f8c8cb97a4eeb3058d0c6d8e102cb11c5af0186bd1fbb1eb2c5990ae14abad0441d2293018a1b5
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-sbin-10.2_beta1.ebuild 2527 SHA256 6d1e6793aaf65ba4634d0e11c3020a5b21f48ead65b1ab9e580862282857db70 SHA512 733efd2b35c7041ff2ac37d4e72991b3fc16f234e42cd2f6e4382e58a491182f9c69e7c4d0c12384f56d77a46ea436bdb032db1cbab0bbe163ab86346213f0bc WHIRLPOOL 1ab49d7b6954270001ea4b4b04ac9b13689bc0fb32eb6534889dba86a1b20542739960840a3a1c8c74d05a77f76f952bef6702e3a0c52d6ff1c4d4b2bbbecd86
+AUX sysctl.initd 557 SHA256 49b93a918e66a7464284d5d5cfb7bc969b88f8cfb43921cc0b5859d8f63ea693 SHA512 7de60d317542b912fecaeb29323bded3be579df7b231bc7326ef9978b9985e180b812a847c5707900f4683b46389d19d393c2474fbbc5a1573beacda85a590e9 WHIRLPOOL 29e983847ce0b925ed2bd168241e89f1052c5353b2863750ae0c3f1c6133635b800a54787b5838e3d3f30dab2d9f2b62bc382ec2e30ccaa6fcd6e3d37df392d6
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-sbin-10.3_beta2.ebuild 2558 SHA256 104b27902edd010c2c5f6be35f14a9a610aea9a29fbf4c3719182dd0e33313f0 SHA512 4d2e8344f584199264f8e75a1309dd3b12601bf1c0c31cc8a24a602d36457377b1e638322b1f712cb48240c6bee4b18dc695fd4d41646614785d4b2785b653cc WHIRLPOOL fea16356daa2598b6792b194d6e74a431f884120cc3200b34121b78d3524d4f7e33912fff144e3be388761960f948e5e14dd551abbe74977e51fd95ddd575fd1
 MISC metadata.xml 473 SHA256 b13f1868fdc53bc53952bb41f6b68a5f320d36c493329ddf1b940f0fd5bafa8e SHA512 bf69dfade6ba52de900634d131d0aacfd36f9bb94a11f81c7256b144b2a90daa9b5f5bfa1a6c028314c8bb763fc59a4c0a9e8332a24d6732995fdebb3964b6dc WHIRLPOOL 32e9ac1cbaac74edd43d97d8d8069f61f29179f93904d126c32e4cb3504683f118c5027e1a42b1b456bb31dd68ffbdb0ce23c7b84806edcd03b80af9a34db96a
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta2.ebuild
index 5f5589a..168eed4 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index b468b37..a2d0c2d 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -1,9 +1,10 @@
 AUX freebsd-share-10.0-gentoo-eapi3.patch 475 SHA256 504841c762c1fa82ac14c22e16b84543e88927608f3fb972d995caa89449e487 SHA512 b7fe870aafe1cf9029c1d1d9de16413b5be8354b1c2ba0d0eab6f0fe3076ab03da08ff764c923c087e246b90355a48d55acef9b9b5a29238ddf8c92bdb3ca0f8 WHIRLPOOL 58dd84d64cea1c149b0126d7e9567caf7dbe6f238b1434eb4ffde08496e45e268691ba8604ea80da863d06d3f6ac6aeff4e9f7a01d558a28a31f347ed6c0c4c9
 AUX freebsd-share-10.2-gnu-miscfiles.patch 913 SHA256 e2a7e8221753dabf78380b9820991ee067670b9593e3dc9d8ecc8bf487b1ebc8 SHA512 fa792f15e325117e4448b344ab3dbf64d3880719698d88d8dda60c8cc4afea8c11cb845f44fa3b78ddc98fc6b021ef9edac639f649e8d166d79bf2c0e4f654f5 WHIRLPOOL 3c9e15340a71a85f44df3cbc41a6bc46eba7f790410d1aa70266a342038c39dff2b3ec887c210afdde559fecc7c51fb5c0e1484db86d3fff1d5851c21d3f6f8d
+AUX freebsd-share-10.3-gentoo-skel.patch 600 SHA256 6860f0376babafbc0367bfde0d348fac1e4f95f42cdfd2931c3d7a027cd62536 SHA512 338eb369c50b11835f00474be5363bf6af43d8391a28a6e78e1517afc686b168fd0bfc32d45a78e79515c3d89a35b097548117cb2838b751d3d41330939c7dc2 WHIRLPOOL 1a833bc8e2376b25275d5be27dcc403cb8f7b498be08ab1532da1b27e77af32779a38b9a8d54b03d80f36b0ec398425269b58a04d9eea74fd2af5d91fec4d8b9
 AUX freebsd-share-5.3-doc-locations.patch 608 SHA256 d949e9081a181ab9443a18e56949905a77eff2cbd16d09d37b8abb5771cee3b6 SHA512 2156f679683b8a02fd01fa71268f13f342d282b1885095e48611d9a94bdf99f03bad71f5c22253425c09ad5ae1ea544d1db3d0d40361f3b814f7e10f0061f2a6 WHIRLPOOL bac15f5c439ffa81b83dfac5dce981e346e2815b6a035e9b9791db16df77d7f2e9fb6706f7b5315c65d18f209176866b23a34b311c56847f543f1257fa5e9634
 AUX freebsd-share-5.4-gentoo-skel.patch 621 SHA256 5480127971c2a5df5faf44355d5ed6a8586923577d37e6cff10805626726c767 SHA512 608e108bcfdc1eaa1f45f4115f460e26fa89211aaefea9602d1943dfa51e34f721526ef5e71d7e44f019d31b43efbd8f9f937e71d71074b0c3b48a33329281af WHIRLPOOL 8fabb340e4fcb1a174e3870a2ebe737f89b892586fed61a239e96bb34fb508daaef1e8e80811634e2075dbf6a161a236bca10a589340fbc609382f685b0697a9
 AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853 WHIRLPOOL f8d6675121ac43d2672f77d7ea4215073ff213c311fc1c09fe367f2d86f7dc1791a95f31b6def6f5bb757a5cd682de4c373c91465aa05acd38acfb537e781a6a
 AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256 0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512 b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e WHIRLPOOL ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-share-10.2_beta1.ebuild 3069 SHA256 d43a108a64193603cedced249a7d439a8c7b478974c351f0218471444ee1f75c SHA512 4c4432a5bf80a04f0988008b9fcbac58a4340f72ee027501f76cac5633ade3963e8e3f6b01c42cd5e6de2b0e7a1f5a99851c93deef10405105dbb8b6ad5d7c43 WHIRLPOOL 9f17549b9602f05111b7ea895498bbbe7f7459319eca5d12105c2bafb565bb35e4cc38dc46c5026ceafa55627df03533339a8d29312602d914bea2586a402cc3
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-share-10.3_beta2.ebuild 3056 SHA256 de95f86abcd2eb01c376b1543551a3be3e3e10625d5c941739fb02cf12f67385 SHA512 3eedbc57e03cda34e0b5253a47fba3ab59d06439bf94530b7bab5b80941fc97ebd6266a4845ed7100bbe9737cc611187d8ca443b157d7d62376c5ba22f48a4e8 WHIRLPOOL 8474a0a702759f65ae94c2c2b8be0205b588f46aee44616ec3296c044c5568245ba6d61d0e90f8212980e202a95c21c0a01004300731bda79ae4910ae0d4689c
 MISC metadata.xml 269 SHA256 2afafb02d7d4a5e81c04ccb660f5d0f0317b453d08d9d9d742f9d901a21ee096 SHA512 93c9f1dc528cbc6071792b0f9a26a1f3116067409d14bd9593829ef40d513f85e72ced99b36494ffd94bd405e4e6d941a23b0ca78c6ff8df428853ecd2a675ad WHIRLPOOL 0c206ebfef419ed5d25e36eb06253c054f6b2c293a5fea9117a8bd1849fe6f3306c21bffd4165c14cbe71b81129a4de1e45bbaca13191f49f57447a5281df4b0
diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch
new file mode 100644
index 0000000..79e29e9
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch
@@ -0,0 +1,20 @@
+diff --git a/share/skel/Makefile b/share/skel/Makefile
+index 024985c..6f6e563 100644
+--- a/share/skel/Makefile
++++ b/share/skel/Makefile
+@@ -2,11 +2,11 @@
+ # $FreeBSD: stable/10/share/skel/Makefile 291794 2015-12-04 18:21:05Z bdrewery $
+ 
+ FILESGROUPS=	FILES1 FILES2
+-FILES1=		dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
++FILES1=		dot.login_conf dot.mailrc \
+ 		dot.shrc
+-FILES2=		dot.mail_aliases dot.rhosts 
+-FILES1DIR=	${SHAREDIR}/skel
+-FILES2DIR=	${SHAREDIR}/skel
++FILES2=		dot.mail_aliases
++FILES1DIR=	/etc/skel
++FILES2DIR=	/etc/skel
+ FILES1MODE=	0644
+ FILES2MODE=	0600
+ NO_OBJ=
diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.3_beta2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.3_beta2.ebuild
index 0d25fb6..244d1c1 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -49,8 +49,7 @@ pkg_setup() {
 
 REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
 
-PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
-	"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
+PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch"
 	"${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch"
 	"${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" )
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 8ffcf01..12b3485 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -31,6 +31,6 @@ AUX freebsd-sources-9.1-random.patch 792 SHA256 46d4035d31e8a64531e1893c08b8235e
 AUX freebsd-sources-9.1-tcp.patch 1249 SHA256 a51412349a8724931cfc749150e3c07802126382a6ce5dbbc6617e4f81188e7a SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e WHIRLPOOL 6e81938c55e2a40f4d75a53f4bfeac1c4183feebf023bcc320c0179dbf802151cc5f04dde9302e233eff86c33fdca8a6e80dda70d47d0d762da61e22782b1b0d
 AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218
 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-sources-10.2_beta1.ebuild 4372 SHA256 5fddad17b733185f4c33c42319f2bf1b924d50290077c602f5dbcac05027640c SHA512 469f5299bd48d5fbc7c035096f293aa45a54dde7bfe583f35a9237b204c08ea7cac17e199b337c716855c6527b1c2270f1583c44815c373353f493c9c31d853e WHIRLPOOL 2b03e36bbe24a6215960cf7e318440a59a1057cbc3e8229f1de2a8e236e6eebcf898bb350298197a2d0b7b1138822cfcf2433d07d8ba2cbe716e8b5a911782ac
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-sources-10.3_beta2.ebuild 4403 SHA256 3695e402c6c77602d0180910b29dbe1c7897d1ae7fb70f328b14d01702d698f7 SHA512 f74cca3bedf3edd431c96a8f0971bf488ff32ff1bbd84f94875f8bfa1c7d522a9cadee7f5f60872dfd89fa9fa961d42f7bef4ffe2c663918f75f3b38f29cb3fc WHIRLPOOL bcc620a441f9a0720e41f16f6f4769b5bd8bf9c80f0c10c9c4755309d772ee6412862ac337fa22ac5795a1d8728b7ff2ccb954a9b31192560e68039b4a643e1c
 MISC metadata.xml 354 SHA256 1febde9432e112ae9f645a26ede3cea3720e5784b444c1b83425dd3288f5e729 SHA512 430631962f1640984e674082d12d2f59fdf1bb5013c9c75e73b47a7d499f1bb1b5e8eca3ba168d19f378c85f5bc599e5ffc8cb80a314115fba1307867076ab6a WHIRLPOOL 483f77a75637d9117fe55656e32c7295352fb484bdd735e6e530ad87b453b860bad26716f5e99cb8ea78248e0f7f8e4d3d869d9073689d72fec1cdf26d04f7fc
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta2.ebuild
index d68c8f9..d5542a7 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,17 +11,6 @@ SLOT="0"
 
 IUSE="+build-kernel debug dtrace zfs"
 
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-16:01/sctp.patch"
-	"SA-16:03/linux.patch"
-	"SA-16:04/linux.patch"
-	"SA-16:05/tcp.patch"
-	"SA-16:10/linux.patch"
-	"EN-15:19/kqueue.patch"
-	"EN-15:20/vm.patch"
-	"EN-16:01/filemon.patch"
-	"EN-16:02/pf-10.2.patch" )
-
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 68d12e6..ecae62e 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -5,6 +5,7 @@ AUX freebsd-ubin-10.0-mandoc.patch 375 SHA256 c4d14aabe0a39bc2c12ca87b6c83628ea1
 AUX freebsd-ubin-10.1-kdump-workaround.patch 415 SHA256 a2812aaacae36bfab6703f72fde31e705f9ebe952d1d394eb91e4e05d06c4c60 SHA512 9ee3e9a8c508f36326e24463b1bdfc5a511d6c994b8fb0da8bd1a0fa30b9eafe968c228825ad6b25849c47d800f17866e4667dc9ae8c76cff6f8181b37148d70 WHIRLPOOL 5f4f2ab4b72bae236d0c34c65404f351520869ea6a083590239f38ab0fe95f74108a4b7cbd7f84dfc5fb22f2140ded334999c492adb3fddc5dcd81ddeed8b6e5
 AUX freebsd-ubin-10.2-bsdxml.patch 367 SHA256 3bedd2e3efc7817c446395866e3ec2ca65430624dd4958bc91296d77cfc4fb90 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d WHIRLPOOL 4946a71b63b05691ede60f15573356d98ef62b44cab40ba40a24d2be11e9655c95c660b62e898ff15ff9cdd8c006402c0dbe43a82d913b7707c1f30a55720863
 AUX freebsd-ubin-10.2-talk-workaround.patch 349 SHA256 8882326b5048b2c2acef041c82f2830ad0eb68684c6773163c6beacae65b12d7 SHA512 5eb04f1769fd4e04a26b9ff69865a6188269d971b83b7e93a5c41def44c9152e5262a192c866e3949cb3aae3b8e0a13663b8e1a438e796b0b923d9171a3e6b27 WHIRLPOOL 3be00db5ef76a3bcf615038cad6a5bd36fdfd349be6b8938a9236fb0ed2a0df6a05b04d73343206905b88ddcbd3c2d1b39928a35f62838f719b28c368adc5770
+AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae
 AUX freebsd-ubin-6.0-bsdcmp.patch 413 SHA256 a0a99a602538d95ddae2fc4b823150ea58862def87c8196806a379233e3ddb2c SHA512 1516d984e7e17e8a3474ce519c9e5d6fefaee244ad27f1ed21af73335a6a25275e842007e71a60d6b18aa049f84c87b349f3350664cea03885cd55a846a73d50 WHIRLPOOL 7a23988970695ccdeaadfce96a0bf05e986736d0c93079cddf0101c0b17b7e5f3421e5da6c1e2b6e0c96ff025dd8d80effc392064ce9ff1cb2e0bce0e8d90b35
 AUX freebsd-ubin-6.0-fixmakefiles.patch 1457 SHA256 318406fa003c5188163e0dac551d4cc5fed7653cc3ff0f6baa64f23572de6d7b SHA512 65009d59ba9739627afb04f7abf5a55395d7585d2c9c201faf8f7b849ea462b61fee407accfe4460aa33a231d151c9d2aa29be7a0ccd71e969f5235a2635442d WHIRLPOOL f01e4257b06159c18f64960eb5d55a595f357bd0c6fd6974c6db942b6b0cbd6fff9ca7151cffd67bb8dec23d855975c7ab9c39cd28ba9dae098acd6773fb4c79
 AUX freebsd-ubin-6.0-kdump-ioctl.patch 1111 SHA256 71f41de71568dd819e39c871dd5e570141f243dbabb23d855505c38bec4e9de9 SHA512 53f2decb5a695b8daa4db10ac4f72b5a1d4fa58bd151314211f0ce230de5247a64e360855cef10b9e0c195146a704acb7f4cec623501516dfb9dcce09946262e WHIRLPOOL 48d2be90273b6ce1a0b4701a77d5a10e7e26f9f595b54b35cc410d81266c104c67c1fd1d735b659d41e4c3e02261cc79a85f3fe61c45ce79e4dadd1cf17b877a
@@ -21,11 +22,11 @@ AUX freebsd-ubin-lint-stdarg.patch 792 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198
 AUX freebsd-ubin-setXid.patch 3723 SHA256 961ac8dcd9efa4f1aab18f56b26c6210d1d5bf441410aae392160e7c0242d16d SHA512 9edaac765405e28b123fa40b708b1ab05af3e151726e6f2b75ab1c0fd17b6c2a428a58726da999f7a63e9550bdd3e0d274ce63517717137872a7e9c77a591501 WHIRLPOOL 36fff3ad1577981b157e4311226540ee9a0eca7f5d623e27b3fbc585bc5585158c21f27c2355ac773ff190817aee2056293d3a1c0306e7743ae72a3a49d1e670
 AUX locate-updatedb-cron 122 SHA256 63cceb90a3abb02e806af6940542f12d397e7600df37f1b7305104f78694cce9 SHA512 c3127d2ebb837d7fd6edc640604ce31c1639c036703b1e923e84b79f9840e13e28327eb7a5d655546ade8efb9188b041434552bcd0b4b76308c0e66132ad7985 WHIRLPOOL a040f971f7406f2dc022aee9e6b4cbfd4bb37931afabcdb58dcbe82539500bf7ae7fdfdf8651113ae3cea5ffa73771bb57a2a0a0e749701563664ccbf87285ca
 AUX login.1.pamd 145 SHA256 c8b81b422104b58afa8b6bb478b1eda77f97c3037030ac09889b7c3bf3de9fcc SHA512 2308d818de388be2973b59fad5a21ffe5a9c9d302b47ccf1a148182ccaf082421c5a277acf0c85649874fd607a8da20222e7a05c15606ee36f6e74d0968a1397 WHIRLPOOL a562ee1210568bdf2339df413ec69eed066738d0d2929c8965f6bfc2b05d60075b23176ca8f744bee2c6a7cfa8448adf4e08a531d36477f78aac78da47f3209c
-AUX login.pamd 421 SHA256 986aad109b31d055c52b55fd04be1a8f434da4b355e1a84b7d8b666b7a63fcb6 SHA512 ecebbaefb29380263074dc70545c2d3d529a1853c4317d860c51b8176a0afe00768d0d9a82ed05cba8abc6a2ec5cbef4a52f825a5a9de706ac4f7fba71d6fea4 WHIRLPOOL 0706c86180640ae8ebb7f7eca1a1e369aac18353f67301f04cb53c496f7848e5797900a19d32557ed1b9e4af5ee924a148710841426d7800a746e1ac3a1313f0
-AUX passwd.1.pamd 269 SHA256 a00b23b70388075f20c0e6535b6f4a1bebacb72726dc3c20ed1d468ecc68f334 SHA512 cb2f0fa05057947ac63031853e14c1867f7f330296548d924b8350dee27e00ec4b08daaab2a8c5704e09a70ed823dbe9b074fef07b648bc43cd56a78f7edb790 WHIRLPOOL e4080d8a9ec81a07b37c779dec2e04ad1fe23eecb2d08cfe1f25e00c305fb9aec59424c1e9693d0c31d1f9cc9f6a76b22b31840bf35a059e31f82238fcdb68b9
-AUX passwd.pamd 360 SHA256 ff964fd309462cac711422be051122f8a60b570da9b13756e9012b18b1864f79 SHA512 f7b4accac065a41d453aacb63222bb9da8183ad5a3ba699530a6cd5fecb5e54ee308fd0a58e00a95cc394402aab7dfd9cded1bae58483d826ced5b20b0d14c27 WHIRLPOOL e46ecd4f2945f6121c89daf8c1640e868508d85fb10c4d9bc3ccc1e04999097f226d5b7d3cb1605ffe2544f4da0127bc9ebce985d086bf96e06a659981e9a4ee
-AUX su.1.pamd 432 SHA256 a231f9cbe5b9e03aa0aaa1520657332771f15d5e5cd69890ce49d02bb34e21c3 SHA512 7d7d8ef2a5b1b52b1b5aa5de86a8767a0aa217fb2658c9bb13bce09e3c68c1a4e15f287d2063a3f18615b9d7dc1eba1ebefb95c1510f9a4c7b7de810a5bcfa40 WHIRLPOOL 635fd8294abf9e8948032ab2b6d50565f2f9f72ea64c18799a6337776bdf2a7859e17bb58e3e1ab3558d74a10611225c31ac4b6cb26f1c5462bf855b02dc9e07
-AUX su.pamd 420 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 SHA512 25ac749209c05733d0c9978c8ef1712961a3bd863bb2f5615844ed9b44e98dcf7795c02dfc84d58703eca35331701f1fff06a13904792e634256675af5444a48 WHIRLPOOL c97d3314cd58edff9c05b8286e2a377ae928752197dec0d380fa68867a9e8ce5366cc97e8038c21c3f50f527957b6ecc6c723960e28e39a7e8fef1cf7f3caad1
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-ubin-10.2_beta1.ebuild 5827 SHA256 1968b00573710139aacd0676fc01a32e923b135260418fc33bc5ce3b44773091 SHA512 f11caaa3167db75691716033bcbd37fd94a34360c5f04a1a6eff5d70e478fac998c4f5f7fa37275280bcb21403eca250ab25057163495a7ce07ef2d785ff77c5 WHIRLPOOL 18c63b028c5c472840ef6abfa3af0d97590598372d8af37ba13465de288ccb46308a9487f5bf6b6028bf11183734498fc1e0cbab2a519f9589c0a47a02a7f723
+AUX login.pamd 309 SHA256 4680e4682c95faeb879e4cf4cc83280e91ec53870a19fc7dd67079ff5eb97c38 SHA512 a5fc8fc6c1ca597f194f1fc801185bc69020c8055211d20b1712cc8c9c3cfd27b3eb2031823771d73c1c2814a0dee29bf14c32319c6831732246800256e38a26 WHIRLPOOL c8df5d4d0f1ad85e42762c30dfecb3bdf84c4593d98ef7a71ca31674c28400b5014c2bb543919cd3741bfcb642e2490dd7f4f9850e743d5c89e8bbbd7b23a2ba
+AUX passwd.1.pamd 154 SHA256 39706dd518995631a8eb6a48498685db9a777124bb84f217e2045f0162357081 SHA512 b89b339facf74c3fb2f68f38cb76d4104f8e497312140e76778ce4673f9a039afe22df78991e7625e1488e6dd1e679ca9cd9953dffb483db9b0bd106755b0a5f WHIRLPOOL cb683ae69af9fc5d1344c40a26e6518941d6ee241b11d2efb53b93ddabd69d9a2c53df8e33d4e68a20ceef4fef27372b5fb93eb653c461217091dd0c3872c0eb
+AUX passwd.pamd 247 SHA256 df5babb31578b5fd56629dac06656a981cffd2e1ef4987e075c0e95029d40399 SHA512 db179adff0d3211b9409cd4efdc09c14212192ab24549acd1d2ecd7788947117d58c991899750530f80fb87b66bc6a7e08a863d0f37f57105af23db86bf278ee WHIRLPOOL 287de39190e8e377503d4a494c5b114af6a6feaff06129832054c9685ced1f127f784fa2f8ddf9a31b0603ca8d999ae0856feb28c82e406a5b830ecc8b218c8b
+AUX su.1.pamd 321 SHA256 18ed54492632b231ca9074fe08aa5343a5dd7049834a7eda3aa45d42d313c779 SHA512 fa27233d99c70c3b968b5aff430cdbd55a3d795a1a4430143f863d3dae7bf7b6b1564d58f82431fe2e8e4a2b1bcc2f12714abf7d48ff75c08c1a65f22cd74d6c WHIRLPOOL 7b82c775ec138873b2754c101fa14c09e87bf052f2497b0bba12fee2cfa80f970b27041febb7fd22c3291977f942363ab558d52a92833fcd4cfdf7ece829c713
+AUX su.pamd 311 SHA256 5090fbcd2807019255062cacf3816e2e28088c0084c6e9f34a3cceda31e08e27 SHA512 d7c7eaf776aace61f2a534e5a8c2f65879fe27311859e6e8bd309f1425693e4effe8867a1a7ecc3f1d5a478989139f1731c1863c4509da49318c3cead5c8b0dd WHIRLPOOL 055d4b0b9f0645a4ee33170f3a69de0f8733dc972330bb3182400cdae54711f82f85536aa5b6b8ccbd66f1d2ab547780fa0198e2134466f6fa5782ff4b02a77d
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-ubin-10.3_beta2.ebuild 5912 SHA256 6b9a51efd669182f3686af191e96363eee29aa3060d92cc2351d9798e9d7b663 SHA512 786e5e406f1781db1f1dfc925ef861ee99a8651a5c77a52268dbada52b207d1ce9d752bbd9ca885c1d949d40b29207e63b69b0acc4619358b2ca2c46a87cbace WHIRLPOOL 8c8e01eff6b31bef32f53aebb876d2adcab54ab124a1999ec1e4552f745c3c56ca654a664a4c9ceaac7ca92f0050dddcd02435f8eef4f6684fade78399ab0c7a
 MISC metadata.xml 692 SHA256 9d7a61c414fb50713568dc2782c2de6460bac1eff7ca6a9f8a2d25979b48e811 SHA512 8bc469bb79edb0c34e5fb03f4a53c12b0f3741f06a20e1fc1b58772e594f259cc91368157ced396f8843b6e4398bffd1e5b5b8c694d5bec324e89966e4e618d6 WHIRLPOOL 026491842e88460c5fb80acdf7b26e274c74c6d0ced8c23e16382b82a9b99d9657b96a5ecbca2d95ecd0dfef463dfa012f7aeb3acd8e655df859ab6aada0d312
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch
new file mode 100644
index 0000000..c0ca444
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch
@@ -0,0 +1,13 @@
+diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
+index 6c6d8c2..22fec7a 100644
+--- a/usr.bin/bmake/Makefile
++++ b/usr.bin/bmake/Makefile
+@@ -5,7 +5,7 @@
+ 
+ .sinclude "Makefile.inc"
+ 
+-SRCTOP?= ${.CURDIR:H:H}
++SRCTOP= ${.CURDIR:H:H}
+ 
+ # look here first for config.h
+ CFLAGS+= -I${.CURDIR}
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta2.ebuild
index ebaf8a0..a0d69a4 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,9 +11,6 @@ SLOT="0"
 IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
 LICENSE="BSD zfs? ( CDDL )"
 
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-15:12/netstat.patch" )
-
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
@@ -64,9 +61,9 @@ PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
 	"${FILESDIR}/${PN}-10.0-dtc-gcc46.patch"
 	"${FILESDIR}/${PN}-10.0-kdump-ioctl.patch"
 	"${FILESDIR}/${PN}-10.0-mandoc.patch"
-	"${FILESDIR}/${PN}-10.1-kdump-workaround.patch"
 	"${FILESDIR}/${PN}-10.2-bsdxml.patch"
-	"${FILESDIR}/${PN}-10.2-talk-workaround.patch" )
+	"${FILESDIR}/${PN}-10.2-talk-workaround.patch"
+	"${FILESDIR}/${PN}-10.3-bmake-workaround.patch" )
 
 # Here we remove some sources we don't need because they are already
 # provided by portage's packages or similar. In order:
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 8fb047d..59ec4d0 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,4 +1,5 @@
 AUX freebsd-usbin-10.0-bsdxml2expat.patch 835 SHA256 765ab05ef6d5d828d2cc54e78e0676dc2b6caac7193788524a7dd4cc5a983c8c SHA512 23bcfdc1657c1dd7fdb59c3717af5a5560c8f3c10d498aaae539e1779838a0a33cf247ae806c72c09d298fc9be3c02b5c3d1d9f1a879493c0e5d1aeb4dbf3509 WHIRLPOOL 2342438a26ef915f29d487aecedfd0920baa6c2130b3efd6fbd64d7a2bf81f74444e7409ceaceb29d4c5ad210af4cee0a4d98b0935131ff577a6103023f83f44
+AUX freebsd-usbin-10.3-bsdxml2expat.patch 406 SHA256 ddf45cbb311c6b1ba49617db48c54eac1f4d5279a40f038e64aef52732a04049 SHA512 91a2323b5007e2381fb58d608dd19dcc010afb398a4b2285b53cae4157268fb6aa232323280cec72cccdb2010610f73e048b06bae76418b7db8cd1f34b7ad8dd WHIRLPOOL fad08c17acc523e240a6ef9c0fbf79e12bd048d9bf4e688cad58ebd5f5b7ec69a39b8786e67f73c5baee4d606abae48a204b94a5b7753e25bc7d137e614a890b
 AUX freebsd-usbin-7.0-nowrap.patch 1185 SHA256 a3c35cd997a22f4d212c3fe08d20fa7552b6de64527fee0166249ae76a3e49c8 SHA512 4374954aecddaf51acc8121b58ea28a4b411652c1deaea05cb600dac3d27a7e42bae1b2ad6f90ffc503d40f296ce627106545c8ad0f2dd23231d454e71f83fee WHIRLPOOL 7049020fc9383c374ca33b4b4ad5d8eb8b9f014922362fe67be1423da649c6ae2afbfeb6e8e0a13e5f77cc4b8f214b8e60d1ddb848a96213e65a2a77220db66b
 AUX freebsd-usbin-8.2-newsyslog.patch 400 SHA256 f13d5ea43531f42ff0cb42438b58875afce4046c650a7459fd2eac62dc11696e SHA512 f013a8911aaf1da759fae307276c482480d3938183f583d1c78c2711bf81e8cb9ebefa004112d4eb1fe7d9620527a49326e49186f0dfd9a9af9e0ff29d4aad56 WHIRLPOOL eb011fcc84e20873e8e86a0bbd101e4651c087b2f22716599bccd55b7ba28607520a450a2c98461ea7d78b2b52f233e6bfc4bf44cb11ec002ad7db631273ca24
 AUX freebsd-usbin-9.0-libarchive.patch 409 SHA256 105ce2534fdcf17bdbda21154a4679aba76e75b541ae06f9783333f8b7acd30a SHA512 f30851631a7a181b12f7e749d0bf8d3ce1a93d9cfa74e0ae0b8a96d7278192bb5569f100d9c9bc423a7dc9d37dcbebdc69ac993ff11c6aa19f49eaf83bd3b4f1 WHIRLPOOL c1a5a32cb070ebbd94f4a6b30ca79d0b75525c4a04e52b565e60e94aa22b533e26d038f3757d2a4aee4e2893ed6a729482aee6a933fd1f34193bcff1ee05b3b6
@@ -8,24 +9,24 @@ AUX freebsd-usbin-9.1-kldxref.patch 756 SHA256 b9021def1c9e1a6ffcd66cc86e4086e75
 AUX freebsd-usbin-adduser.patch 428 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af SHA512 51720e3db9bf3728afc0dc370a469746cb1bf61623c44a20c58e27d647e5a5d0360145b1d174382176d803f2558afa2f2a29eca6c85c638529d0e11e2859c0c3 WHIRLPOOL 15a5a7e2c123a3103546134a27baad0a459758ec66bb0a7011684f367c7dd46435688f837d9d5fb5a9a51e95a58d6ce0e672c57a9dc2ef16a1e094a4b6e78931
 AUX iscsid.initd 428 SHA256 6cff138e8987dc1bad2047bdb598a4ef3d1e67a96f471fcb23fe352d85a2834f SHA512 b16ce5fdfbb697c6097701696b52033e347bb0446559faae01cadd5f9b44a12604914e07f7e0c7aa806f6b8992e97fd01e116e36c1c5ae1dfbde146bb2d62bde WHIRLPOOL 36118b63a06a26ef82c75f93f0498dd35920582526f713d563b3d4c51347562b784fa598a0d4f146f589337135cba6e7df5a45b7adbb9a3c6c357a07e1288a72
 AUX mountd.patch 542 SHA256 da895dabdb52c63d876c13605aa1ef446f8babb47100932b5b451155181a759f SHA512 c7a77ea1df0bd9c0a75b899a306aeb7fbee5ed4fb67a230d6348edbd238dc176267f19cd345f51b26ceef11b4657821ab752b333da5b03fc973bce3253e036e5 WHIRLPOOL a57f31ff146950d5aba5998dbd163f98321373dde5f731584c81bb841a8594422bb2ec44c63bd9e2742dbed3a03e200497948777a12b471d6dd7af9998578ad3
-AUX moused.confd 827 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e SHA512 88919d638fe67ce8c8a43e470851eafd3ff8185a44e67b175d43107fa030721c91d7ac4e2959326aa3910e6788f59d851598edfda593515e3571ba42df564a4f WHIRLPOOL bf2065b2d39ae534349c4186b1d7e254ed7bbf96bddcaf92453f79265f73de6e09a0f9a55a3eadd31f57e110dbfbe380cf51930136ea3eec6f6b80761ec6d3bb
-AUX moused.initd 1783 SHA256 84f2d221ce16f5ffce43170fdcf86675dae79a776e1f2abf3b1b490b585f6d0e SHA512 eb5465ab4f9fc94bfb70c56ad144fed79cbe604d1970ea1c56f050afc42fe9fb8e605e58c7924e82de1ffc0f32994a94e23a11cdb75db4e855bb7f67dc81b499 WHIRLPOOL 9f37fcef86e2a9797090e2e4d62f0a73f8cf20736b5b798f1f4435734f067b3cb298f25f2d0581b23f5bd6e92c1944dbf566f5828608040691f4ad547a687d36
+AUX moused.confd 713 SHA256 c85c4c59e7e23a3ac98c3a4beebbe452506bcb6614315810c0f79c7b2f335715 SHA512 247bd942e83a211f953b0bfae8f4cc7db517a1b53231557f652526b5440a173ec4e8b7e3207ad7c0765fa949c91c170edb4771329fa2d9921f60595cbdec0dd7 WHIRLPOOL 797dbaa3d90d1a3e62a0c4492207e0ef90612a44a972b590c42040d9aeb554d41ced104a61ea5e9f44d948c8bc88b144deb202af588eb06c7b59e5f5f0e1e9a9
+AUX moused.initd 1669 SHA256 39b9d38bbbbc1bfbc96829aefa12c28f356b4d2cbedfbebd2e0a96dd7f533ed9 SHA512 997ae72e052fdba31619c02f4aadf326116f52d9ba4223ee2ce65a86d39b1d0d412fb91cadef88ab5d5cb412ba7746b54b982d46707d64a7b2039f824eb9da75 WHIRLPOOL 1b08abff403e87004829589add2596d57328695dbce5623678bb8839b634ca5291aa6cdd91d23a8bdaa764ae3ee1dcdb41a3757219c74c6f0cf17e89fafcce4a
 AUX nfs.confd 303 SHA256 5714e0cbcc45a077ab2348ee4fea521ce9f739927094dccb4b91817f1edaccb8 SHA512 4224c7f525e39b105b8d80caa7db0f3e0b07d6c521970b2aacfd707ef524262cbdb9ed8aa5151022d571a759151dd25a280fc765a38e67864b0c446ee9fd6b5a WHIRLPOOL 70bfff7d5288c692ed767c1e09d48db6c8546d90955a1957de87fd67cb42ed5b1efa0101cf2eea71e4702e1170eadeed9cc45937b742e51cee42c9edd00a1ee9
 AUX nfs.initd 1423 SHA256 304047cc48ab6923b5d492c84417b5fcdae441fe0536830f1c75f6de58bba1ff SHA512 83326ec4cc35beeacfd640f582b6bc3001fd274a46f690cc04b1774db16b22ce74d993c92cd62d37d37eb8c421f5f386f95088a3204d045370d07206d06aa895 WHIRLPOOL ee29e0df0b1792a5368ebf036129b434e3b697c85c5bcee9b8d62d8568feaede64a74bd8efcc1f97aebb63aeb9a0c1e32a372dfacc7f13bfdd8d91e61cafa987
-AUX nfsmount.initd 1596 SHA256 0cea497d66d41d093792f8bb2590c45b6b8f965cef9c148b835b362f2a172cbe SHA512 741e61dc32728adcb41efa64181cc6b2c768b35f0cbcee1cd0144882373b308c8a592ba7c45f6745fff511b8fd91a38f3a4c970b6224414ba533d2e902fbe656 WHIRLPOOL 5767e45c081146130416c8f46f2db966ef25cb94ee1dcb1db68718e6a41497f7478869af6923d937fd6a5d6d2ae9d8393c683dc1ea0f4657bdd366175932364d
+AUX nfsmount.initd 1480 SHA256 3b092f86099ee2284cbc6e53c6ad29f24cb757b152ce1635995b7c77fb34146c SHA512 6f3ad628937da47aa723f4289fc4d7c8528dbdab221800a7eab9250bc4a8db6b795d61c0a1cbbb5993b42ff4a59a752b9186630f6d0e3ad6f0c4b9bc4afc52f5 WHIRLPOOL bcb454d2b22262bfbd888478898b8e3ae595120e6c03d4a5b0870e4476329dc83c2cbd2c79696e2547222fd529f29d1e9d182de3db31754d674357cc2eab2214
 AUX nfsuserd.confd 153 SHA256 9575adaba684100f78ff1d60ca5e7b6f5be6fcda9e2d8fac2a1ab4aaf8944a59 SHA512 47bf885dc80a61c9f8aab5890a360063fc2e846ce8abefb84e9d504f62c455cd759af753c7a5ab8cdd624842200f6b0ec7d177ddfdc1e7564460764eb4d4d073 WHIRLPOOL 4e4aabc4c936c067d99133620a117d9c1fc539e23acfe9b15b4a7ebb57e3cb55b4ffab34b2af93fcfdf7fe81e4372e3afa38994ee999093aa1ec0a80c3c12175
 AUX nfsuserd.initd 446 SHA256 e3fe4e31b746f092064b2f2c5b4a7185ef00bd5f2b14b5591531ab7d9c688c2b SHA512 e1fa87b7b5d332c235e6b47e2963c943a646d783cac7a378a352e49ea8b299f931ddc83425ba9e221cc1d742f7f0c1331212315fb51c7d82ba3885b1e4a1e557 WHIRLPOOL 8c6e2eddc20209ce58b9140e57c22b089eafc91bd608ac8fbe5aa4b54ff4184dc1bf845bf976e3802de4e2a06356e04aa9b8c3213b08bee9377003d8bb1aa3b5
-AUX powerd.confd 368 SHA256 989e31b98daacb3d6ecddf8788ee496f3c100d549e7a210e387f03d69c3c8e98 SHA512 77cc956ddc806383c465b71b352813c71f001cd908b740d92a12059eb9606133a57d9585e03c514108d81aa17e56245e512e0d741f0c0eb8464568977f4b3e44 WHIRLPOOL 2ae3ec637011befda90c83fa55b532e2b3704e4eccd1f5b78ef871e160ec4e5f8573603f63b863251dbb600ebb15821181391881860259b5b8c877e6c7174e36
-AUX powerd.initd 774 SHA256 2ee95ad25206716b6043407c6fbb412513fcbd0893d7f2faf2c927c55990fb03 SHA512 13798d2f4c0c002775eb506158b111c3645c19dde86d934c9bd74147d836ac3c1433d426bc54bf257636c75127edc567961c42c994171831cc610395762b3121 WHIRLPOOL 22ce78d84d9b1e9a6f0ab095e0624567d8c6471117f04603d4aa0ebea590025fcacf4472cb09265eaa75a4a3e67613864bd462a751350ec026706b546a1f9236
+AUX powerd.confd 254 SHA256 39dc617f9aafc732762302120aa686ef8694591b0a2ec0cca79e7dc46ee9cfbc SHA512 c3e449561450e3579f93f5bda1c93f01a68ede2e9b6da56a7cb2f4eecf1313993fb4a384a2e65a1fd04e78b80732fab31349ee309368e28034f9467296cd1e0d WHIRLPOOL c1b07fd7ebf4231b9986850fdb41704b434c37f2b5f4b2d3517217f4195f38449bc0724d8fac736801f10cc67feabc6fa49d9ee86e793f05178f9328c9ae6acb
+AUX powerd.initd 660 SHA256 071f3e4140343a8df2402f728897b7ca2207260068577999310322296682fd73 SHA512 ab932526c53ab429d984587ad5fab696aeed9bf0dfb0198a81648efa5d76f1b20ef7160fade9cdfaf8e3a89ff50acf4fe33d5cdfd0bfa59b092df60f035fad5a WHIRLPOOL 1dc0f558edd7594f1b57501fd34f6c467488e35b0371480b070ea9f6de4c1ff7a7a16ba1b6ad081319b14e88a2d275aec1968811966d622ce3d3af6c0fbd0008
 AUX pw.conf 179 SHA256 0aa508e3911a80ccd1dc5005ec6f2e86e7c4fc5c99ca127f4d7e479d133c69ef SHA512 042b7c7805d891f453da58f607edb3174fddc8443d6995ebe833185ab313328c131bae87dbbc9db95bf69a9ee71548d350191b34a8b2bf41a56416aff03c3891 WHIRLPOOL 4edd4ba1aa0c2255fbd38dc9120a673d8e0b5a8fea50d95aa13c08df448c3fc584adfe8330cfce5bb5b06385d5855c2fed9beb210f8fb5f8e4d695bdedb6909c
-AUX rarpd.confd 269 SHA256 aa45f3085267be17d6549e05c5fbe21c4035b41c620023d76e38537fc82594cb SHA512 7ee467bb3430233011364e9dfd5cc24d273c7f81b4feda51b71c221cc8f8fb206df3be024397923084c3ad64d72fd298211b165f594c8012045da6b242077e4b WHIRLPOOL b4e22fec96adae80c1549d6ff140fe6cdc8c0dab52e9ab3011d6442f4ba53275319dfe551938accb7274bd3917616e47357ff9a6b1cfc49b5024b9554fc9793e
-AUX rarpd.initd 866 SHA256 3484f19992ae773a43ffad50477072c3bd288fea5f9a5c22a98c323129df49f7 SHA512 45a6a70f3a68d8fa5c7e72a96e8e33f585e3528fc73668782215033e4c16db563efc48c68aa1bfccc43109012562b721ec3b3c4049670ec3e7ae10e892a56f8a WHIRLPOOL 67c22419fd600ba69bc5aad8770af2b7b6fa1c65424da3bb657a6a394f14d7b2417268238944f53b2d2dd80af71c721b0e48607b46da8399198803517463e5a9
+AUX rarpd.confd 155 SHA256 0c0f02cddf4ddfb2c2e01276f93f2d3470a75dc83e396209d6cbeff52e9b424b SHA512 95fb1b2ecc60f5cc434d949957dbd49a02afa7eee860e5b13fcc110c705560ea519f491e530de8fa9cbeb2577b9f0835ac98b762f6fa1c5cdb8292322821566d WHIRLPOOL 4641c548e2a5f0300138038032c472ffc12140ef7b4f1010166386a75fa1fb637ab8a735aeaa863b341b724970b0a45ba8ec0207d023846bfa09099b0fb98bd8
+AUX rarpd.initd 753 SHA256 6c0e6e0a52640b17f6618e786761edffb525e692b1b6182b45e5e7c1a0459367 SHA512 d690abb8cce2d1564d32af1c5febd7c93263f7d5eb83b35bbd15c92c4446c9f519dbe2a5f78bc9fdc63fe28e6b4585239e5aedc5ed432140590bd242f3dbe37f WHIRLPOOL 5d99b06f479379fc6671762dc6a92ca7d4f646aaf9a67b16445b5a1de3634b4949345dc84ca563f85fa7a4d025faa04b8f0b85f9095b883eb53838c963628e06
 AUX rpc.lockd.initd 529 SHA256 cce3495d04cae9141ea4f27ebc853b47c00fdad0a468292e128efad627e2992a SHA512 85301f3e7bb7bbb027654d5c95556ae0994e96cf12050e789c6859cd186fc07af8172f713e251e8db1dc7225545acf2001ee30fe53499f8d7c8a0817493df112 WHIRLPOOL e72e342aad839bcf4b4cabdedc3124da73fc5409fe1c5884575ddca9994348d1d93438354b95b6660d8747e30413d76eace485c463c8b0461499109c394db2f9
 AUX rpc.statd.initd 519 SHA256 3674fcff99faec3f3d16ac67fc91aee9449f06aac42498ae8c9d26336e103ef2 SHA512 168e58b2ed7ff5047495f3d1efb2d648c1b69b278af9d4c167365db631b5d85e07d7a975459183b42017bf46dc218f78c7a7d3215592acaaef90a7874161774a WHIRLPOOL c08aef9a68e15959eafb2bdb311d8674d2d0318b2d5d2f3d31b46a38194ddc98ae8e86ea3836deba875abacb8f11155de5d79dded1c68fda4d0ff490526a9610
-AUX rpcbind.initd 716 SHA256 2f14334ba584acd31306060bd134c0eccd3afa24c61531f93f884ad70a9ee96a SHA512 f3af704433ea0c370fa28442e942d9c254662b27d96ce046857bc493b3f04bc5fa99f18cfd0afe40c2759cf9769a00088eef175f7a7ddf83b443a1085f1026b0 WHIRLPOOL 649556408bcc0b72dce47b26e1f6ba7ab471e0ad4e9c5abb0a7a7be29b81e22f46b095d3f237a1b153698db9769be3e242a80ad7bd058d4e58349781fb9d608e
-AUX syscons.confd 464 SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b1013ce02e44ee SHA512 c505aac9328557d344c64a5615f53a3b87faa39daf94169a652cd0a6447b3173b347f90bf87ba3806978dc57eaf46fac2301c10015397e25c070f5a21a760c61 WHIRLPOOL 02fc5189f82aad4e1052831d3d4d394a65161e241fe7714fa7af193f929af08889e43aa2f1088660935da5a14291bd4ed3a566218262ac8bfccb33ee637c2bfa
-AUX syscons.initd 1711 SHA256 16f5ab3ceb67accc10350d21527321c1e559c432f0b52e7b3adf08b67d9f62aa SHA512 41fef393e1fe732de065cb9ac3fdb4bbe73158a86f7c8b6175b496d0a65b9c682d888ce7b34c8a43732909c12626a2f5783457607e4b9bf6b4210589c3397d76 WHIRLPOOL 7a11eed37860db8dce71ad09299bd48427cf2beb349da3799189ef93d4d5c618b4c33b51e60f17cb485989dd3e0480458f5559c61deaa3f542f920df43f89801
-AUX syslogd.initd 571 SHA256 3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005 SHA512 0c67138b2461ba3629a7aa87dca35357ee17f2a1c1c13e1951417f4c05054ad006efb7f98dcf7fa24f0b90e0c0331e6fb7d1e3459c1db17f1bc82baa63b3beeb WHIRLPOOL e8dc6a0f402a474bb98c5d4a9a21b331a2a55726d517411c2b7c7adec28219e5a538ebb448c6c27dd1540affb914e935e91160cb0795ca6eb624f4ee163b0e9d
-DIST freebsd-src-10.2_beta1.tar.xz 120084960 SHA256 ab1008ce4a7f720e55d493cdb934b6d71ff94a5fa7016dc6d0ae57e542fbfbca SHA512 c500531839529a4534b67c3d0cdc46c68f96a85e2ccfefc032612a7103c0dcf7d03f5d485448fdf8cadf016c24e6fc564c39e13af92df9d25339cf910799242c WHIRLPOOL 62d2523df8dd817e4956860ef57da5b5be4d5bd661d00607e040dc34bb7d9490ef97afc85ba4ce10283f2a71947e1a4df358d108a7537483d2887114f4c94c3b
-EBUILD freebsd-usbin-10.2_beta1.ebuild 5192 SHA256 6bc37de614f3d44ec9a90fbd38d523f56cdfcb747dcd5e38716c7db675aeee24 SHA512 dab78c4dcad75e1a32af29527951889df7e855e90978a99de216f9aaa485117a60157a05383665f2e6f67ba896e505804cc306e55e4288d7ff2047ceb286d0b9 WHIRLPOOL 1de002fcc02a9d6a31f5ece1b511f5ba0539970533da1b9d0098824d4b6df3bb7ab6952f4712bcb2feaa3c910e18e9379c3baa5e9e01eba70c7a8b9af0af3fab
+AUX rpcbind.initd 601 SHA256 dbeb5e51aa52d53742715a3bcc48dd8a28d6f5f7af88b4f05e73541a3962ca70 SHA512 bcbc974b16010cc942cad14226d9edaf000d1012717cad64b2cbef7584262b802d5017638ab0bba99d3a1c4613a21a63b5a5b4ae2d3bd90c1110be79910330f9 WHIRLPOOL e245d6f26d6741dcdc7f6962a01bfc451dd3d39d79722edbcbd1ffd22d36cc6b10c82eadc24a5cf7bb476170e934af739d7f48298d25fdefa1ee7f75361f6c84
+AUX syscons.confd 348 SHA256 8d963ed1d6b63eed6b9f8bc1492c1e589458051e99f601e1ee0a8131890b0e70 SHA512 3dd50c0f223a93c0b0544fc9e85624fa78e045d2b6846242f431ea1ce4f121a33c1f3a0a2ef0763f45230dac0033d04c0d397e268f633d809e2466c269c22993 WHIRLPOOL a1ddfccb0aeb448e8d5086f9ba0554c0ff9fdd52003bf98bc2a1efbc7e2d835a79ea52886ac58e3818f9b5bc1d705658d2c8c1f05bad4bd7e5ef916ffe542451
+AUX syscons.initd 1598 SHA256 187055f4395438ad54ab339b6bf3a42ab02ed3bac0bc259a25b151ed7c7fa14a SHA512 7933c4484ae52da4f1f5af3f3853292faa794add22991bd0c01613daa35e7b9f5121cf5e9d6a2db1f6dc0b02350c6a8b202678631dbb44dc3638c024ff2f5599 WHIRLPOOL b10117fe41245263aa17ef3e4151f2456846499db3e370b043cd654b56665a7e3f2ddab86e1d2786606e1ae3a11121ece1f98f1b0c48eb5526433be9dad1f8b7
+AUX syslogd.initd 456 SHA256 3654435b79efdeab6d8c496670d31bf576fe81a51a8d1dd91584454f2ec34e3a SHA512 c3e3247301475a689759f52a376af11704d8a0ab23ff6e9522fad9738b19306aa881f3acc13a9296dabbe70699cce8b524975e5134264a2a398205f2e46ed68e WHIRLPOOL 61043039b6bd4e9c8c7a51f43f89c69ec8b4d23480663c54628059fa10d2bac80ed303dc03267b0970237254729ebf736966b8172547d3a3e7998ac7da815395
+DIST freebsd-src-10.3_beta2.tar.xz 127282972 SHA256 83841ae9dce5af8a1e2c097ccb0464ce7aa329cf3d944a2ae6e7d9134862ef7c SHA512 2b387046863c3cd4a81bb368aa3000f0631a31d2eb289175188f35877bc031ed26dbe927cb430ed04a7f21fdf9594ffd8ab62ec3480774243cada9799320a37d WHIRLPOOL e95d9762e9742474211acf73c30a934e4b7b65ac935baf47c1d0f1e80213d9e4d0cff0e3280c6b4ebeb67f7647b35059a443fc4eb0d7d6329955df16d43afdc0
+EBUILD freebsd-usbin-10.3_beta2.ebuild 5441 SHA256 4b4f2519cb4df44c35165dfa291657a74d29684e4d7dcd82b828394e0c3d08fc SHA512 88e8f58ce3461363ea6599cb76e915159f331f734b99e32da5546fa36546ebbb22611ef1cbdbf98a1c69c90bf96ae56a78cdb252fb3003279e7e3c4810c38461 WHIRLPOOL 4e0dbc9065e033b1b514bacabb9d739ed4f4b0eaf7b65efbe4f4dee902233d72206b64025068e9e0ea42ba6c24313821f47cbebbcac64e43d758c3b7c957e833
 MISC metadata.xml 461 SHA256 fd2d6bce2b50c4fc19752eb8e94b8770f1c94186698c3358b8b906cfde2c5302 SHA512 58cf153c795ea258951d25190723aa5706d48741775a3547b54c35ba67507b652089ceeb2b4da9b9bf8b7e2cdbb9163cbdbe673e5240f30164e10560cbae4e50 WHIRLPOOL 828545f7bc374fd8e22b68d2980fa14b5d8fe92a160582bb7f49f00594e5de91449345eed5dd626b641d77efb3bd45f92f345b9262c080b7649d31e24481e36d
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch
new file mode 100644
index 0000000..207b6ab
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch
@@ -0,0 +1,13 @@
+diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c
+index 88c648e..edf9c8b 100644
+--- a/usr.sbin/camdd/camdd.c
++++ b/usr.sbin/camdd/camdd.c
+@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD: stable/10/usr.sbin/camdd/camdd.c 293409 2016-01-08 02:56:21Z
+ #include <libutil.h>
+ #include <pthread.h>
+ #include <assert.h>
+-#include <bsdxml.h>
++#include <expat.h>
+ 
+ #include <cam/cam.h>
+ #include <cam/cam_debug.h>
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_beta2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_beta2.ebuild
index ddbe6c2..82b1af5 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_beta2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,12 +9,6 @@ inherit bsdmk freebsd flag-o-matic eutils
 DESCRIPTION="FreeBSD /usr/sbin tools"
 SLOT="0"
 
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-15:13/vidcontrol.patch"
-	"EN-15:16/pw.patch"
-	"SA-15:24/rpcbind.patch"
-	"SA-15:24/rpcbind-00.patch" )
-
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
@@ -44,18 +38,20 @@ RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
 DEPEND="${RDEPEND}
 	=sys-freebsd/freebsd-mk-defs-${RV}*
 	=sys-freebsd/freebsd-ubin-${RV}*
+	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
 	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
 	sys-apps/texinfo
 	sys-devel/flex"
 
 S="${WORKDIR}/usr.sbin"
 
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build"
+IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs"
 
 pkg_setup() {
 	# Add the required source files.
 	use nis && EXTRACTONLY+="libexec/ "
 	use build && EXTRACTONLY+="sys/ include/ "
+	use zfs && EXTRACTONLY+="cddl/ "
 
 	# Release crunch is something like minimal. It seems to remove everything
 	# which is not needed to work.
@@ -73,6 +69,7 @@ pkg_setup() {
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
 	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
 	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
 
 	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
 
@@ -83,6 +80,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-adduser.patch"
 	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
 	"${FILESDIR}/${PN}-10.0-bsdxml2expat.patch"
+	"${FILESDIR}/${PN}-10.3-bsdxml2expat.patch"
 	)
 
 REMOVE_SUBDIRS="
author	Yuta SATOH <nigoro.dev@gmail.com>	2016-02-20 10:18:14 +0900
committer	Yuta SATOH <nigoro.dev@gmail.com>	2016-02-20 10:18:14 +0900
commit	644c3def85a145229a4652dd0f34eca3045cae18 (patch)
tree	abccec2e24967cae641e87eba69fc705a9390644 /sys-freebsd
parent	sys-freebsd: rename 10.2ebuild to 10.3_beta2.ebuild (diff)
download	gentoo-bsd-644c3def85a145229a4652dd0f34eca3045cae18.tar.gz gentoo-bsd-644c3def85a145229a4652dd0f34eca3045cae18.tar.bz2 gentoo-bsd-644c3def85a145229a4652dd0f34eca3045cae18.zip