[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-bin/, ...

[Yuta SATOH]

commit:     754a9164237d230d73521806e8f8172f08ed6a97
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Jul  4 13:31:51 2015 +0000
Commit:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Sat Jul  4 13:31:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=754a9164

remove freebsd-10.1 ebuilds.

 sys-freebsd/boot0/Manifest                         |   5 -
 sys-freebsd/boot0/boot0-10.1.0.9999.ebuild         |  85 ---
 .../files/boot0-10.1-drop-unsupport-cflags.patch   |  26 -
 sys-freebsd/boot0/files/boot0-9.2-gcc46.patch      |  66 ---
 sys-freebsd/boot0/files/boot0-9.3-gcc46.patch      |  67 ---
 .../boot0/files/boot0-add-nossp-cflags.patch       |  11 -
 sys-freebsd/freebsd-bin/Manifest                   |   1 -
 .../freebsd-bin/freebsd-bin-10.1.0.9999.ebuild     |  39 --
 sys-freebsd/freebsd-cddl/Manifest                  |   9 -
 .../files/freebsd-cddl-9.0-bsdxml.patch            |  28 -
 .../files/freebsd-cddl-9.0-libpaths.patch          | 167 ------
 .../files/freebsd-cddl-9.0-underlink.patch         |  22 -
 .../files/freebsd-cddl-9.2-libpaths.patch          | 220 -------
 .../files/freebsd-cddl-9.2-underlink.patch         |  26 -
 .../files/freebsd-cddl-9.3-underlink.patch         |  27 -
 sys-freebsd/freebsd-cddl/files/zfs.initd           |  24 -
 sys-freebsd/freebsd-cddl/files/zvol.initd-9.0      |  45 --
 .../freebsd-cddl/freebsd-cddl-10.1.0.9999.ebuild   |  64 ---
 sys-freebsd/freebsd-contrib/Manifest               |   1 -
 sys-freebsd/freebsd-lib/Manifest                   |  31 -
 .../files/freebsd-lib-10.0-atfcxx.patch            |  49 --
 .../files/freebsd-lib-10.0-clang34.patch           |  22 -
 .../files/freebsd-lib-10.0-cve-2014-3951.patch     | 175 ------
 .../files/freebsd-lib-10.0-libiconv_modules.patch  |  24 -
 .../files/freebsd-lib-10.0-liblink.patch           |  98 ----
 .../files/freebsd-lib-10.0-libproc-libcxx.patch    |  16 -
 .../files/freebsd-lib-10.0-libusb.patch            |  19 -
 .../files/freebsd-lib-10.1-cve-2014-8611.patch     |  22 -
 .../files/freebsd-lib-6.0-flex-2.5.31.patch        |  13 -
 .../files/freebsd-lib-6.0-gccfloat.patch           |  16 -
 .../freebsd-lib/files/freebsd-lib-6.0-pmc.patch    |  13 -
 .../freebsd-lib/files/freebsd-lib-6.1-csu.patch    |  20 -
 .../files/freebsd-lib-7.1-types.h-fix.patch        |  15 -
 .../freebsd-lib/files/freebsd-lib-8.0-gcc45.patch  |  28 -
 .../files/freebsd-lib-8.0-rpcsec_gss.patch         |  12 -
 .../files/freebsd-lib-9.0-bluetooth.patch          |  12 -
 .../files/freebsd-lib-9.0-liblink.patch            |  21 -
 .../files/freebsd-lib-9.0-netware.patch            |  11 -
 .../files/freebsd-lib-9.0-opieincludes.patch       | 122 ----
 .../files/freebsd-lib-9.0-trylock-adaptive.patch   |  14 -
 .../files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch  |  17 -
 .../files/freebsd-lib-9.1-rmgssapi.patch           |  16 -
 .../files/freebsd-lib-9.2-liblink.patch            |  80 ---
 .../files/freebsd-lib-add-nossp-cflags.patch       |  30 -
 .../files/freebsd-lib-bsdxml2expat.patch           |  26 -
 .../freebsd-lib/files/freebsd-lib-includes.patch   |  13 -
 .../files/freebsd-sources-9.0-sysctluint.patch     |  13 -
 sys-freebsd/freebsd-lib/files/libmap.conf          |   8 -
 sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in     |  11 -
 sys-freebsd/freebsd-lib/files/libusb.pc.in         |  11 -
 .../freebsd-lib/freebsd-lib-10.1.0.9999-r1.ebuild  | 632 ---------------------
 sys-freebsd/freebsd-libexec/Manifest               |  10 -
 sys-freebsd/freebsd-libexec/files/bootpd.confd     |   7 -
 sys-freebsd/freebsd-libexec/files/bootpd.initd     |  27 -
 .../files/freebsd-libexec-10.0-atf-check.patch     |  25 -
 .../files/freebsd-libexec-9.2-no_ld32.patch        |  15 -
 sys-freebsd/freebsd-libexec/files/rquotad.xinetd   |  11 -
 sys-freebsd/freebsd-libexec/files/rstatd.xinetd    |  11 -
 sys-freebsd/freebsd-libexec/files/rusersd.xinetd   |  11 -
 sys-freebsd/freebsd-libexec/files/sprayd.xinetd    |  11 -
 sys-freebsd/freebsd-libexec/files/walld.xinetd     |  11 -
 .../freebsd-libexec-10.1.0.9999.ebuild             | 101 ----
 sys-freebsd/freebsd-mk-defs/Manifest               |  11 -
 .../files/freebsd-mk-defs-10.0-gentoo.patch        | 352 ------------
 .../files/freebsd-mk-defs-10.0-gnu.patch           |  79 ---
 .../files/freebsd-mk-defs-9.0-gentoo.patch         | 326 -----------
 .../files/freebsd-mk-defs-9.0-gnu.patch            |  79 ---
 .../files/freebsd-mk-defs-9.1-gentoo.patch         | 326 -----------
 .../files/freebsd-mk-defs-9.1-gnu.patch            |  77 ---
 .../files/freebsd-mk-defs-9.2-gentoo.patch         | 352 ------------
 .../files/freebsd-mk-defs-9.2-gnu.patch            |  79 ---
 .../files/freebsd-mk-defs-9.3-gentoo.patch         | 352 ------------
 .../files/freebsd-mk-defs-add-nossp-cflags.patch   |  28 -
 .../freebsd-mk-defs-10.1.0.9999.ebuild             |  41 --
 sys-freebsd/freebsd-pam-modules/Manifest           |   3 -
 sys-freebsd/freebsd-pam-modules/files/README.pamd  |  63 --
 .../files/freebsd-pam-modules-9.0-gentoo.patch     |  22 -
 .../freebsd-pam-modules-10.1.0.9999.ebuild         |  47 --
 sys-freebsd/freebsd-pf/Manifest                    |  10 -
 .../files/freebsd-pf-10.0-libevent.patch           |  16 -
 .../freebsd-pf/files/freebsd-pf-10.0-pflogd.patch  |  15 -
 .../freebsd-pf/files/freebsd-pf-9.0-bpf.patch      |  10 -
 .../freebsd-pf/files/freebsd-pf-9.0-getline.patch  |  38 --
 .../freebsd-pf/files/freebsd-pf-9.0-libevent.patch |  15 -
 .../files/freebsd-pf-9.0-pcap_pollution.patch      |  17 -
 .../freebsd-pf/files/freebsd-pf-9.0-pflogd.patch   |  13 -
 sys-freebsd/freebsd-pf/files/pf.confd              |   9 -
 sys-freebsd/freebsd-pf/files/pf.initd              |  50 --
 .../freebsd-pf/freebsd-pf-10.1.0.9999.ebuild       |  70 ---
 sys-freebsd/freebsd-rescue/Manifest                |   8 -
 .../files/freebsd-rescue-10.0-zlib.patch           |  22 -
 .../files/freebsd-rescue-7.1-zlib.patch            |  21 -
 ...sd-rescue-8.0-pkgconfig_static_libarchive.patch |  11 -
 .../files/freebsd-rescue-8.2-libzcleverlink.patch  |  20 -
 .../files/freebsd-rescue-9.1-bsdtar.patch          |  12 -
 .../files/freebsd-rescue-9.1-libcleverlink.patch   |  21 -
 .../files/freebsd-sbin-bsdxml2expat.patch          |  13 -
 .../freebsd-rescue-10.1.0.9999.ebuild              |  76 ---
 sys-freebsd/freebsd-sbin/Manifest                  |   9 -
 sys-freebsd/freebsd-sbin/files/adjkerntz-crontab   |   4 -
 .../files/freebsd-sbin-10.0-zlib.patch             |  22 -
 .../files/freebsd-sbin-6.1-pr102701.patch          |  17 -
 .../files/freebsd-sbin-6.2-ldconfig.patch          |  13 -
 .../freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch |  21 -
 .../files/freebsd-sbin-bsdxml2expat.patch          |  13 -
 .../freebsd-sbin/files/freebsd-sbin-setXid.patch   |  20 -
 sys-freebsd/freebsd-sbin/files/idmapd.initd        |  20 -
 .../freebsd-sbin/freebsd-sbin-10.1.0.9999.ebuild   |  96 ----
 sys-freebsd/freebsd-share/Manifest                 |   8 -
 .../files/freebsd-share-10.0-gentoo-eapi3.patch    |  17 -
 .../files/freebsd-share-5.3-doc-locations.patch    |  20 -
 .../files/freebsd-share-5.4-gentoo-skel.patch      |  20 -
 .../files/freebsd-share-8.0-gnu-miscfiles.patch    |  26 -
 .../files/freebsd-share-9.0-gentoowaydir.patch     |  16 -
 .../files/freebsd-share-9.2-gnu-miscfiles.patch    |  28 -
 .../freebsd-share/freebsd-share-10.1.0.9999.ebuild | 107 ----
 sys-freebsd/freebsd-share/metadata.xml             |   8 -
 sys-freebsd/freebsd-sources/Manifest               |  29 -
 sys-freebsd/freebsd-sources/files/config-GENTOO    |   4 -
 .../files/freebsd-sources-10.0-EN-1407-pmap.patch  |  13 -
 .../files/freebsd-sources-10.0-SA-1417-kmem.patch  | 263 ---------
 .../files/freebsd-sources-10.0-clang34.patch       |  26 -
 .../files/freebsd-sources-10.0-gentoo.patch        |  22 -
 .../files/freebsd-sources-10.1-cve-2014-8612.patch |  45 --
 .../files/freebsd-sources-10.1-cve-2014-8613.patch | 119 ----
 .../files/freebsd-sources-10.1-cve-2015-1414.patch |  15 -
 .../files/freebsd-sources-6.0-flex-2.5.31.patch    |  22 -
 .../files/freebsd-sources-6.1-ntfs.patch           |  32 --
 .../freebsd-sources-7.0-tmpfs_whiteout_stub.patch  |  44 --
 .../files/freebsd-sources-7.1-includes.patch       |  13 -
 .../files/freebsd-sources-7.1-types.h-fix.patch    |  15 -
 .../freebsd-sources-8.0-subnet-route-pr40133.patch |  21 -
 .../freebsd-sources-9.0-disable-optimization.patch |  32 --
 .../files/freebsd-sources-9.0-gentoo.patch         |  33 --
 .../files/freebsd-sources-9.0-ipv6refcount.patch   | 128 -----
 .../files/freebsd-sources-9.0-sysctluint.patch     |  13 -
 .../files/freebsd-sources-9.1-MFC-r239588.patch    | 122 ----
 .../files/freebsd-sources-9.1-ciss.patch           |  65 ---
 .../files/freebsd-sources-9.1-cve-2014-1453.patch  |  70 ---
 .../files/freebsd-sources-9.1-gentoo.patch         |  21 -
 .../files/freebsd-sources-9.1-tcp.patch            |  32 --
 .../files/freebsd-sources-9.2-gentoo-gcc.patch     |  13 -
 .../files/freebsd-sources-9.2-gentoo.patch         |  21 -
 .../files/freebsd-sources-cve-2012-0217.patch      |  26 -
 .../files/freebsd-sources-cve-2012-4576.patch      |  16 -
 .../freebsd-sources-10.1.0.9999-r2.ebuild          | 139 -----
 sys-freebsd/freebsd-sources/metadata.xml           |  11 -
 sys-freebsd/freebsd-ubin/Manifest                  |  25 -
 .../freebsd-ubin/files/freebsd-ubin-10.0-atf.patch |  15 -
 .../files/freebsd-ubin-10.0-dtc-gcc46.patch        |  25 -
 .../files/freebsd-ubin-10.0-kdump-ioctl.patch      |  26 -
 .../files/freebsd-ubin-10.0-mandoc.patch           |  13 -
 .../files/freebsd-ubin-6.0-bsdcmp.patch            |  13 -
 .../files/freebsd-ubin-6.0-kdump-ioctl.patch       |  28 -
 .../files/freebsd-ubin-8.0-bsdar.patch             |  21 -
 .../files/freebsd-ubin-8.0-xinstall.patch          |  26 -
 .../files/freebsd-ubin-9.0-fixmakefiles.patch      |  11 -
 .../files/freebsd-ubin-9.1-ar-libarchive3.patch    |  19 -
 .../files/freebsd-ubin-9.1-bsdar.patch             |  25 -
 .../freebsd-ubin/files/freebsd-ubin-9.1-grep.patch |  17 -
 .../files/freebsd-ubin-9.1-kdump-ioctl.patch       |  24 -
 .../files/freebsd-ubin-9.1-minigzip.patch          |  10 -
 .../files/freebsd-ubin-9.3-kdump-workaround.patch  |  13 -
 .../files/freebsd-ubin-lint-stdarg.patch           |  24 -
 .../freebsd-ubin/files/freebsd-ubin-setXid.patch   | 129 -----
 .../freebsd-ubin/files/locate-updatedb-cron        |   6 -
 sys-freebsd/freebsd-ubin/files/login.1.pamd        |   4 -
 sys-freebsd/freebsd-ubin/files/login.pamd          |  20 -
 sys-freebsd/freebsd-ubin/files/passwd.1.pamd       |   9 -
 sys-freebsd/freebsd-ubin/files/passwd.pamd         |  11 -
 sys-freebsd/freebsd-ubin/files/su.1.pamd           |  17 -
 sys-freebsd/freebsd-ubin/files/su.pamd             |  17 -
 .../freebsd-ubin/freebsd-ubin-10.1.0.9999.ebuild   | 197 -------
 sys-freebsd/freebsd-usbin/Manifest                 |  24 -
 .../files/freebsd-usbin-10.0-bsdxml2expat.patch    |  24 -
 .../files/freebsd-usbin-9.0-newsyslog.patch        |  12 -
 .../files/freebsd-usbin-9.1-bsdxml2expat.patch     |  12 -
 .../files/freebsd-usbin-adduser.patch              |  20 -
 sys-freebsd/freebsd-usbin/files/iscsid.initd       |  20 -
 sys-freebsd/freebsd-usbin/files/moused.confd       |  20 -
 sys-freebsd/freebsd-usbin/files/moused.initd       |  66 ---
 sys-freebsd/freebsd-usbin/files/nfs.confd          |  10 -
 sys-freebsd/freebsd-usbin/files/nfs.initd          |  54 --
 sys-freebsd/freebsd-usbin/files/nfsmount.initd     |  63 --
 sys-freebsd/freebsd-usbin/files/nfsuserd.confd     |   5 -
 sys-freebsd/freebsd-usbin/files/nfsuserd.initd     |  20 -
 sys-freebsd/freebsd-usbin/files/powerd.confd       |  14 -
 sys-freebsd/freebsd-usbin/files/powerd.initd       |  27 -
 sys-freebsd/freebsd-usbin/files/pw.conf            |   5 -
 sys-freebsd/freebsd-usbin/files/rarpd.confd        |   7 -
 sys-freebsd/freebsd-usbin/files/rarpd.initd        |  35 --
 sys-freebsd/freebsd-usbin/files/rpc.lockd.initd    |  20 -
 sys-freebsd/freebsd-usbin/files/rpc.statd.initd    |  20 -
 sys-freebsd/freebsd-usbin/files/rpcbind.initd      |  30 -
 sys-freebsd/freebsd-usbin/files/syscons.confd      |  14 -
 sys-freebsd/freebsd-usbin/files/syscons.initd      |  78 ---
 sys-freebsd/freebsd-usbin/files/syslogd.initd      |  25 -
 .../freebsd-usbin/freebsd-usbin-10.1.0.9999.ebuild | 176 ------
 198 files changed, 8943 deletions(-)

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
deleted file mode 100644
index 19831d8..0000000
--- a/sys-freebsd/boot0/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX boot0-10.1-drop-unsupport-cflags.patch 893 SHA256 7d58c67b73ed6ae7326b03e7a4c1204d17808328de0ac904973604658bc1804c SHA512 c4d441c9538489585f27f292fa0acd921496cdd10e06a7de45f4db7f6a6300f41401a387c9e65bf909790e7755fb92001131d668c6246a2505756b8e9e10eeea WHIRLPOOL 9ce41efe802fc181fac9026eb310d3d48173df7db585f4ddb5424ced43f5e7081a8baefc12370588ba2979e0ef6234fa5718457e3e854f66c7d1309778d863f4
-AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
-AUX boot0-9.3-gcc46.patch 2180 SHA256 a664f792660fe1dc25b6e54a973ad6d8ac6c19ef309954f5bb7973b52832cc82 SHA512 a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6 WHIRLPOOL 2d5ba9602c93ab02aef29838478b578603b39e7d26dbf688e3fccd1cdd7e5fec3aec729db81b4548b69841ab330e8898eb445ee09d06ccd8500fb0f7387c3fc8
-AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe
-EBUILD boot0-10.1.0.9999.ebuild 2071 SHA256 5ffcfadd17923a607a3608c1eb66b9e59a03e86ec2aefaaf1dd643326540b14d SHA512 f302d65a701b7be93b8168282dd78127e9907af9739fe616f1bf372136b25a963164552efda873d18742926f9c121f839dfc1e06cfee90cc9d59fb946e5581fd WHIRLPOOL 1d89621e63ef51832f26aa2c7d3c0e9fd0aaaf7d02e9e340d57bcb13974da528adf254ca56c3ece0449fe20b741c6bd3f501cdd4866712ecc1a5b7bd8da20d3b

diff --git a/sys-freebsd/boot0/boot0-10.1.0.9999.ebuild b/sys-freebsd/boot0/boot0-10.1.0.9999.ebuild
deleted file mode 100644
index 171af67..0000000
--- a/sys-freebsd/boot0/boot0-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${SYS}.tar.xz
-		mirror://gentoo/${LIB}.tar.xz
-		mirror://gentoo/${CONTRIB}.tar.xz"
-fi
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*
-	!sparc-fbsd? ( sys-devel/clang )"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}/${PN}-9.3-gcc46.patch"
-	"${FILESDIR}/${PN}-10.1-drop-unsupport-cflags.patch"
-	"${FILESDIR}/${PN}-add-nossp-cflags.patch" )
-
-boot0_use_enable() {
-	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
-	use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= "
-}
-
-pkg_setup() {
-	boot0_use_enable ieee1394 FIREWIRE
-	boot0_use_enable zfs ZFS
-	boot0_use_enable tftp TFTP
-	boot0_use_enable bzip2 BZIP2
-}
-
-src_prepare() {
-	use sparc-fbsd || export CC=clang
-	sed -e '/-mno-align-long-strings/d' \
-		-i "${S}"/i386/boot2/Makefile \
-		-i "${S}"/i386/gptboot/Makefile \
-		-i "${S}"/i386/gptzfsboot/Makefile \
-		-i "${S}"/i386/zfsboot/Makefile || die
-}
-
-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
-		cd "${S}/libstand32" || die
-		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"
-	NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
-	dodir /boot/defaults
-	mkinstall FILESDIR=/boot || die "mkinstall failed"
-
-	cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
-	insinto /boot
-	newins GENERIC.hints device.hints
-
-	echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
-	doenvd "${T}"/50boot0
-}

diff --git a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch
deleted file mode 100644
index 4ab415b..0000000
--- a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
-index 76ed0ca..2d1d39d 100644
---- a/sys/boot/efi/libefi/Makefile
-+++ b/sys/boot/efi/libefi/Makefile
-@@ -17,7 +17,4 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
- CFLAGS+= -I${.CURDIR}/../../common
- 
-  
--# Suppress warning from clang for FreeBSD %b and %D formats
--CFLAGS+= -fformat-extensions
--
- .include <bsd.lib.mk>
-diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
-index d714c74..a5cfa3c 100644
---- a/sys/boot/i386/libi386/Makefile
-+++ b/sys/boot/i386/libi386/Makefile
-@@ -52,9 +52,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-9.2-gcc46.patch b/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch
deleted file mode 100644
index ffd9f43..0000000
--- a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
-index f5faec7..a9cf593 100644
---- a/sys/boot/i386/Makefile.inc
-+++ b/sys/boot/i386/Makefile.inc
-@@ -12,7 +12,6 @@ LDFLAGS+=	-nostdlib
- .if ${MACHINE_CPUARCH} == "amd64"
- CFLAGS+=	-m32
- ACFLAGS+=	-m32
--LDFLAGS+=	-m elf_i386_fbsd
- AFLAGS+=	--32
- .endif
- 
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
-index 65815a5..61840dd 100644
---- a/sys/boot/i386/boot2/Makefile
-+++ b/sys/boot/i386/boot2/Makefile
-@@ -109,3 +109,10 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.boot1.S=		${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build.
-+CFLAGS+=		-fno-asynchronous-unwind-tables
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LDFLAGS+=		-m elf_i386_fbsd
-+.endif
-diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
-index e1a640a..29886cc 100644
---- a/sys/boot/i386/gptboot/Makefile
-+++ b/sys/boot/i386/gptboot/Makefile
-@@ -78,3 +78,8 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.gptldr.S=	${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LDFLAGS+=		-m elf_i386_fbsd
-+.endif
-+
-diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
-index a2b8fcc..107f531 100644
---- a/sys/boot/i386/gptzfsboot/Makefile
-+++ b/sys/boot/i386/gptzfsboot/Makefile
-@@ -76,3 +76,8 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.gptldr.S=	${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LDFLAGS+=		-m elf_i386_fbsd
-+.endif
-+
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
-index b2db778..252dc62 100644
---- a/sys/boot/i386/zfsboot/Makefile
-+++ b/sys/boot/i386/zfsboot/Makefile
-@@ -89,3 +89,8 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.zfsldr.S=	${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LDFLAGS+=		-m elf_i386_fbsd
-+.endif
-+

diff --git a/sys-freebsd/boot0/files/boot0-9.3-gcc46.patch b/sys-freebsd/boot0/files/boot0-9.3-gcc46.patch
deleted file mode 100644
index 9b31e7c..0000000
--- a/sys-freebsd/boot0/files/boot0-9.3-gcc46.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
-index 472b275..0c9409d 100644
---- a/sys/boot/i386/Makefile.inc
-+++ b/sys/boot/i386/Makefile.inc
-@@ -13,8 +13,6 @@ LDFLAGS+=	-nostdlib
- .if ${MACHINE_CPUARCH} == "amd64"
- CFLAGS+=	-m32
- ACFLAGS+=	-m32
--# LD_FLAGS is passed directly to ${LD}, not via ${CC}:
--LD_FLAGS+=	-m elf_i386_fbsd
- AFLAGS+=	--32
- .endif
- 
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
-index 428950e..6a15450 100644
---- a/sys/boot/i386/boot2/Makefile
-+++ b/sys/boot/i386/boot2/Makefile
-@@ -113,3 +113,10 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.boot1.S=		${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build.
-+CFLAGS+=		-fno-asynchronous-unwind-tables
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LD_FLAGS+=		-m elf_i386_fbsd
-+.endif
-diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
-index a90e712..d60ae00 100644
---- a/sys/boot/i386/gptboot/Makefile
-+++ b/sys/boot/i386/gptboot/Makefile
-@@ -81,3 +81,8 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.gptldr.S=	${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LD_FLAGS+=		-m elf_i386_fbsd
-+.endif
-+
-diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
-index 5eb2383..c10a917 100644
---- a/sys/boot/i386/gptzfsboot/Makefile
-+++ b/sys/boot/i386/gptzfsboot/Makefile
-@@ -78,3 +78,8 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.gptldr.S=	${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LD_FLAGS+=		-m elf_i386_fbsd
-+.endif
-+
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
-index 149f43a..be1e46a 100644
---- a/sys/boot/i386/zfsboot/Makefile
-+++ b/sys/boot/i386/zfsboot/Makefile
-@@ -91,3 +91,8 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.zfsldr.S=	${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LD_FLAGS+=		-m elf_i386_fbsd
-+.endif
-+

diff --git a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch b/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch
deleted file mode 100644
index abc6a57..0000000
--- a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=511698
-
-diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc
-index e0039b9..533dea0 100644
---- a/sys/boot/Makefile.inc
-+++ b/sys/boot/Makefile.inc
-@@ -1,3 +1,3 @@
- # $FreeBSD: release/10.0.0/sys/boot/Makefile.inc 188895 2009-02-21 15:04:31Z ru $
- 
--SSP_CFLAGS=
-+SSP_CFLAGS= -fno-stack-protector

diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
deleted file mode 100644
index f6358e1..0000000
--- a/sys-freebsd/freebsd-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD freebsd-bin-10.1.0.9999.ebuild 899 SHA256 50597db60e48c9c12b3bbc5b27af2b5b50c5e02fc810ddecf341b99f9d867934 SHA512 ba96121a11bf381525a1eacfc55bc3aaf867c79d4666fa050a4f3143e7a5a82eb0916dbe62d5dc29b146adc336b0b44101144bd1784179f8f3d204f18687f4ab WHIRLPOOL acd5685ba8fedaca0b8abfdae789d33bb11d32c1cba46c34f8b049b3b5b7207d1ef0c8b0f8ba9c55233159426cef7a43ce5abf72f328bd8241fff17d02cd1d79

diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.1.0.9999.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.1.0.9999.ebuild
deleted file mode 100644
index abefd05..0000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-
-IUSE=""
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${BIN}.tar.xz
-			mirror://gentoo/${UBIN}.tar.xz
-			mirror://gentoo/${SBIN}.tar.xz
-			mirror://gentoo/${LIB}.tar.xz"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/ncurses
-	sys-apps/ed
-	!app-misc/realpath
-	!<sys-freebsd/freebsd-ubin-8"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	>=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed freebsd-version"
-
-pkg_setup() {
-	mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
-}

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
deleted file mode 100644
index 32d0187..0000000
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-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 freebsd-cddl-9.2-underlink.patch 967 SHA256 43ede354a9e0e3db0496eeccaf64a9746ea19bc2ba141be2ad6fc1b493f34e42 SHA512 8b26c0937abf9a2811d6d7842f9b236ba19435b1ea2d6f028b77bcb397cf395b555c3d5d23afeec000143709e56154d167b2acb89941bdb70d068516ec9c462b WHIRLPOOL a89f3599eac2893c01f3143f25aff8cdc1bb1f9149b33ab7b9d87aaf1a1d6df99df29d601941d3285ed51c34d3c303a59bd033e904aca53605e8b33839f88d66
-AUX freebsd-cddl-9.3-underlink.patch 942 SHA256 f5a0139191b98584832075f22880e6ea9212a835cbb1e9aa15fa4e9364758a15 SHA512 67777ff41978c4e90c6e73f6cd2736732b838f42cc4e86f3d47bc5928f7ff4fcedfab84d599156255d243f81fc5a00daa0534ec6704ff820478fab39ce8dafbd WHIRLPOOL a7640e2be2a4fa97932a86a1f4dd68709f83d57a8bf5d043fa4f413474560c73960264fa3687b0154c568365c97d1a928511e207135be53f08acf65845dd6b99
-AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
-AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
-EBUILD freebsd-cddl-10.1.0.9999.ebuild 1510 SHA256 0a692e2b3d328d4576f6d10496a959d82633ca7b3a9636d0f26534621a6195ff SHA512 49528b35daf65bea806793757aaa7e7f589e280be75887e56763f80f31bb6305ad36a92af63e3063768ba878a9ae20a32156e5648b647f1a800d49867cef3cff WHIRLPOOL 05e7d521e0035377ed3f0be8c3e30efc7927778a731e58008ba30b61b7e7ce6c76a5b0fd082bb847343d204f9caffe8518cc984a87ab1691e467e792c8afd4eb

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch
deleted file mode 100644
index b3d95bb..0000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur cddl.old/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
---- cddl.old/sbin/zfs/Makefile	2011-11-04 10:01:46.000000000 +0000
-+++ cddl/sbin/zfs/Makefile	2011-11-04 10:07:15.000000000 +0000
-@@ -21,8 +21,8 @@
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- 
--DPADD=	${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
-+DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
- 	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD=	-lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-+LDADD=	-lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
- 
- .include <bsd.prog.mk>
-diff -ur cddl.old/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
---- cddl.old/sbin/zpool/Makefile	2011-11-04 10:01:46.000000000 +0000
-+++ cddl/sbin/zpool/Makefile	2011-11-04 10:06:38.000000000 +0000
-@@ -26,8 +26,8 @@
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
- 
--DPADD=	${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
-+DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
- 	${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD=	-lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-+LDADD=	-lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
- 
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch
deleted file mode 100644
index c81a2c3..0000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-diff -upNr a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
---- a/cddl/lib/libzfs/Makefile	2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/lib/libzfs/Makefile	2012-03-30 19:04:39.904906253 +0000
-@@ -54,4 +54,8 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/cont
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+
- .include <bsd.lib.mk>
-diff -upNr a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
---- a/cddl/lib/libzpool/Makefile	2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/lib/libzpool/Makefile	2012-03-30 19:04:55.839233753 +0000
-@@ -56,6 +56,10 @@ CFLAGS+=	-I${.CURDIR}/../../../lib/libpt
- CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/sys
- CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+
- DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
- LDADD=		-lmd -lpthread -lz -lumem -lnvpair -lavl
- 
-diff -upNr a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
---- a/cddl/sbin/zfs/Makefile	2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/sbin/zfs/Makefile	2012-03-30 19:05:11.094859502 +0000
-@@ -21,6 +21,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+
- DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
- 	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
- LDADD=	-lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-diff -upNr a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
---- a/cddl/sbin/zpool/Makefile	2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/sbin/zpool/Makefile	2012-03-30 19:05:24.830721002 +0000
-@@ -26,6 +26,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
- 	${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
- LDADD=	-lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-diff -upNr a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
---- a/cddl/usr.bin/ctfconvert/Makefile	2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/ctfconvert/Makefile	2012-03-30 19:05:49.454897012 +0000
-@@ -36,6 +36,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
- 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
- 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
- LDADD=		-lctf -ldwarf -lelf -lz -lpthread
- 
-diff -upNr a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
---- a/cddl/usr.bin/ctfmerge/Makefile	2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/ctfmerge/Makefile	2012-03-30 19:06:08.084858412 +0000
-@@ -33,6 +33,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
- 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
- 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
- LDADD=		-lctf -ldwarf -lelf -lz -lpthread
- 
-diff -upNr a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
---- a/cddl/usr.bin/zinject/Makefile	2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/zinject/Makefile	2012-03-30 19:06:25.084865592 +0000
-@@ -19,6 +19,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- 	${LIBZFS} ${LIBZPOOL}
- LDADD=	-lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-diff -upNr a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile
---- a/cddl/usr.bin/zstreamdump/Makefile	2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/zstreamdump/Makefile	2012-03-30 19:06:44.544860132 +0000
-@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-diff -upNr a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
---- a/cddl/usr.bin/ztest/Makefile	2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/ztest/Makefile	2012-03-30 19:06:58.344895642 +0000
-@@ -17,6 +17,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-diff -upNr a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
---- a/cddl/usr.sbin/zdb/Makefile	2012-03-30 18:58:53.164736000 +0000
-+++ b/cddl/usr.sbin/zdb/Makefile	2012-03-30 19:07:17.454861002 +0000
-@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- 	${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
- LDADD=	-lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
---- a/cddl/usr.sbin/dtrace/Makefile.old	2011-07-06 00:09:01.000000000 +0000
-+++ b/cddl/usr.sbin/dtrace/Makefile	2011-07-06 00:09:48.000000000 +0000
-@@ -24,6 +24,8 @@
- #CFLAGS+=	-DNEED_ERRLOC
- #YFLAGS+=	-d
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
- 		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
- LDADD=		-lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
---- a/cddl/usr.sbin/lockstat/Makefile.old	2011-07-06 00:10:33.000000000 +0000
-+++ b/cddl/usr.sbin/lockstat/Makefile	2011-07-06 00:10:57.000000000 +0000
-@@ -23,6 +23,8 @@
- 
- CFLAGS+=	-DNEED_ERRLOC -g
- 
-+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- #YFLAGS+=	-d
- 
- DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch
deleted file mode 100644
index ff87d2c..0000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cddl/lib/libzfs/Makefile.old	2011-11-04 10:27:30.000000000 +0000
-+++ cddl/lib/libzfs/Makefile	2011-11-04 10:28:59.000000000 +0000
-@@ -7,7 +7,7 @@
- 
- LIB=	zfs
- DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL}
--LDADD=	-lmd -lpthread -lumem -lutil
-+LDADD=	-lmd -lpthread -lumem -lutil -luutil -lnvpair -lm -lgeom
- 
- SRCS=	deviceid.c \
- 	fsshare.c \
---- cddl/lib/libzpool/Makefile.old	2011-11-04 18:22:28.000000000 +0000
-+++ cddl/lib/libzpool/Makefile	2011-11-04 18:24:01.000000000 +0000
-@@ -57,7 +57,7 @@
- CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
- 
- DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
--LDADD=		-lmd -lpthread -lz
-+LDADD=		-lmd -lpthread -lz -lumem -lnvpair -lavl
- 
- # atomic.S doesn't like profiling.
- NO_PROFILE=

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch
deleted file mode 100644
index 36eb570..0000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff --git a/lib/libzfs/Makefile b/lib/libzfs/Makefile
-index 5b6b47d..c8549b4 100644
---- a/lib/libzfs/Makefile
-+++ b/lib/libzfs/Makefile
-@@ -55,6 +55,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
- 
-diff --git a/lib/libzfs_core/Makefile b/lib/libzfs_core/Makefile
-index a470fbc..ae8c649 100644
---- a/lib/libzfs_core/Makefile
-+++ b/lib/libzfs_core/Makefile
-@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+
- .include <bsd.lib.mk>
-diff --git a/lib/libzpool/Makefile b/lib/libzpool/Makefile
-index 417c1cc..838cdb5 100644
---- a/lib/libzpool/Makefile
-+++ b/lib/libzpool/Makefile
-@@ -56,6 +56,10 @@ CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/thread
- CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/sys
- CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libavl
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libumem
-+
- DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
- LDADD=		-lmd -lpthread -lz
- 
-diff --git a/sbin/zfs/Makefile b/sbin/zfs/Makefile
-index a49d278..b22442e 100644
---- a/sbin/zfs/Makefile
-+++ b/sbin/zfs/Makefile
-@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
- 	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
- LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-diff --git a/sbin/zpool/Makefile b/sbin/zpool/Makefile
-index 1884d24..5f06d5f 100644
---- a/sbin/zpool/Makefile
-+++ b/sbin/zpool/Makefile
-@@ -26,6 +26,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
- 	${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
- LDADD=	-lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-diff --git a/usr.bin/ctfconvert/Makefile b/usr.bin/ctfconvert/Makefile
-index 7e4a05a..72327ad 100644
---- a/usr.bin/ctfconvert/Makefile
-+++ b/usr.bin/ctfconvert/Makefile
-@@ -36,6 +36,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
- 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
- LDADD=		-lctf -ldwarf -lelf -lz -lpthread
- 
-diff --git a/usr.bin/ctfmerge/Makefile b/usr.bin/ctfmerge/Makefile
-index ba4840e..845d28c 100644
---- a/usr.bin/ctfmerge/Makefile
-+++ b/usr.bin/ctfmerge/Makefile
-@@ -33,6 +33,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
- 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
- LDADD=		-lctf -ldwarf -lelf -lz -lpthread
- 
-diff --git a/usr.bin/zinject/Makefile b/usr.bin/zinject/Makefile
-index 8c5c141..3db2b29 100644
---- a/usr.bin/zinject/Makefile
-+++ b/usr.bin/zinject/Makefile
-@@ -19,6 +19,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- 	${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
- LDADD=	-lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool
-diff --git a/usr.bin/zstreamdump/Makefile b/usr.bin/zstreamdump/Makefile
-index 304ff7c..5f0b00e 100644
---- a/usr.bin/zstreamdump/Makefile
-+++ b/usr.bin/zstreamdump/Makefile
-@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-diff --git a/usr.bin/ztest/Makefile b/usr.bin/ztest/Makefile
-index 965300e..ad40a92 100644
---- a/usr.bin/ztest/Makefile
-+++ b/usr.bin/ztest/Makefile
-@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
- LDADD=	-lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \
-diff --git a/usr.sbin/dtrace/Makefile b/usr.sbin/dtrace/Makefile
-index 3930f01..4bdbd1a 100644
---- a/usr.sbin/dtrace/Makefile
-+++ b/usr.sbin/dtrace/Makefile
-@@ -25,4 +25,7 @@ DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
- LDADD=		-lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \
- 		-lrtld_db
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libdtrace
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- .include <bsd.prog.mk>
-diff --git a/usr.sbin/lockstat/Makefile b/usr.sbin/lockstat/Makefile
-index 70515ef..d65e4c3 100644
---- a/usr.sbin/lockstat/Makefile
-+++ b/usr.sbin/lockstat/Makefile
-@@ -20,6 +20,9 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- 
- CFLAGS+=	-DNEED_ERRLOC -g
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libdtrace
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- #YFLAGS+=	-d
- 
- DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
-diff --git a/usr.sbin/zdb/Makefile b/usr.sbin/zdb/Makefile
-index 8068385..337e324 100644
---- a/usr.sbin/zdb/Makefile
-+++ b/usr.sbin/zdb/Makefile
-@@ -23,6 +23,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- 	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
- LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
-diff --git a/usr.sbin/zhack/Makefile b/usr.sbin/zhack/Makefile
-index f09d2d8..fc3d7a4 100644
---- a/usr.sbin/zhack/Makefile
-+++ b/usr.sbin/zhack/Makefile
-@@ -22,6 +22,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- 	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
- LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch
deleted file mode 100644
index be1ff9f..0000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -uNr cddl.old/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
---- cddl.old/lib/libzfs/Makefile	2013-08-09 17:37:00.000000000 -0400
-+++ cddl/lib/libzfs/Makefile	2013-08-09 17:44:08.000000000 -0400
-@@ -8,7 +8,9 @@
- LIB=	zfs
- DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- 	${LIBZFS_CORE}
--LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core
-+LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core -lgeom -luutil -lavl
-+
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
- 
- SRCS=	deviceid.c \
- 	fsshare.c \
-diff -uNr cddl.old/lib/libzpool/Makefile cddl/lib/libzpool/Makefile
---- cddl.old/lib/libzpool/Makefile	2013-08-09 17:46:23.000000000 -0400
-+++ cddl/lib/libzpool/Makefile	2013-08-09 17:50:39.000000000 -0400
-@@ -61,7 +61,7 @@
- LDFLAGS+=	-L${.CURDIR}/../../lib/libumem
- 
- DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
--LDADD=		-lmd -lpthread -lz
-+LDADD=		-lmd -lpthread -lz -lumem -lavl
- 
- # atomic.S doesn't like profiling.
- NO_PROFILE=

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.3-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.3-underlink.patch
deleted file mode 100644
index 62d5326..0000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.3-underlink.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
-index cc0f363..065281f 100644
---- a/cddl/lib/libzfs/Makefile
-+++ b/cddl/lib/libzfs/Makefile
-@@ -8,7 +8,8 @@
- LIB=	zfs
- DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- 	${LIBAVL} ${LIBZFS_CORE}
--LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
-+LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core -lgeom -luutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
- 
- SRCS=	deviceid.c \
- 	fsshare.c \
-diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
-index 61c4788..4888cc7 100644
---- a/cddl/lib/libzpool/Makefile
-+++ b/cddl/lib/libzpool/Makefile
-@@ -61,7 +61,7 @@ LDFLAGS+=	-L${.CURDIR}/../../lib/libnvpair
- LDFLAGS+=	-L${.CURDIR}/../../lib/libumem
- 
- DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
--LDADD=		-lmd -lpthread -lz
-+LDADD=		-lmd -lpthread -lz -lumem -lavl
- 
- # atomic.S doesn't like profiling.
- NO_PROFILE=

diff --git a/sys-freebsd/freebsd-cddl/files/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd
deleted file mode 100644
index a2b0f97..0000000
--- a/sys-freebsd/freebsd-cddl/files/zfs.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zfs.initd,v 1.1 2012/05/27 06:23:07 naota Exp $
-
-depend() {
-	need hostid
-	before fsck
-}
-
-start() {
-	einfo "Starting zfs ..."
-	zfs mount -a
-	zfs share -a
-	if [ ! -r /etc/zfs/exports ]; then
-		touch /etc/zfs/exports
-	fi
-}
-
-stop() {
-	einfo "Stopping zfs ..."
-	zfs unshare -a
-	zfs unmount -a
-}

diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
deleted file mode 100755
index 5086680..0000000
--- a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0,v 1.1 2012/05/12 07:57:13 naota Exp $
-
-depend() {
-	need hostid
-	before fsck
-}
-
-start() {
-	einfo "Starting zfs volumes..."
-	eend $?
-	# Enable swap on ZVOLs that have org.freebsd:swap=on.
-	zfs list -H -o org.freebsd:swap,name -t volume | \
-	while read state name; do
-		case "${state}" in
-		[oO][nN])
-			einfo "Enabling swap on zvol ${name}"
-			swapon /dev/zvol/${name} 
-			eend $?
-			;;
-		esac
-	done
-}
-
-stop() {
-	# Disable what we had enabled before.
-	zfs list -H -o org.freebsd:swap,name -t volume | \
-	while read state name; do
-		case "${state}" in
-		[oO][nN])
-			einfo "Disabling swap on zvol ${name}"
-			swapoff /dev/zvol/${name}
-			eend $?
-			;;
-		esac
-	done
-	einfo "Stopping zfs volumes..."
-	eend $?
-}
-
-restart() {
-	:
-}

diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.0.9999.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.0.9999.ebuild
deleted file mode 100644
index add1c63..0000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit bsdmk freebsd toolchain-funcs multilib
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-			mirror://gentoo/${CONTRIB}.tar.xz
-			mirror://gentoo/${UBIN}.tar.xz
-			mirror://gentoo/${LIB}.tar.xz
-			mirror://gentoo/${SBIN}.tar.xz
-			mirror://gentoo/${SYS}.tar.xz
-			build? ( mirror://gentoo/${INCLUDE}.tar.xz )"
-fi
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.2-libpaths.patch"
-	"${FILESDIR}/${PN}-9.3-underlink.patch"
-	)
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		# Link in include headers.
-		ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-}
-
-src_install() {
-	# Install libraries proper place
-	local mylibdir=$(get_libdir)
-	mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
-
-	gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
-
-	# Install zfs volinit script.
-	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
-	# Install zfs script
-	newinitd "${FILESDIR}"/zfs.initd zfs
-
-	keepdir /etc/zfs
-}

diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
deleted file mode 100644
index 06ac278..0000000
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD freebsd-contrib-9.3.0.9999.ebuild 1099 SHA256 5e2dc87d3b9fae1d2281c3240bd26978cedb6b58b2bfbbec7a60a5f10677205e SHA512 9390856aab1deff79b94e1cae028e0ba91ba3d6a4b0bbb570cd6613398fb4131b32851741b00043d407e7bb5a8a4b6b55ccf04947b2d2cb2429b8a8624a826cc WHIRLPOOL a17fa78123166db11fcdb753052fc80d5ffbbca304f16fd4282a796bfe3367a32e8d457158e0d531b50b8fa0841a8afa5b91bcf20867013002276b49cea1d998

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
deleted file mode 100644
index 344fad4..0000000
--- a/sys-freebsd/freebsd-lib/Manifest
+++ /dev/null
@@ -1,31 +0,0 @@
-AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
-AUX freebsd-lib-10.0-clang34.patch 939 SHA256 c8755730fb0cf7bd7d7deed870550a36cada5dadef06390b8dabba824129af4e SHA512 5252167e5d938edf43fb71eb3bb41f87844809abe230efc88f9697bb1f69388e6cc71a9682fb89db1cd6ad45a8987df9eb251444f638eaaa750640ab3bcc9ae8 WHIRLPOOL e68346ae50163021c72a0baa234cda74020796aa4e6375ba60342e83ee8127944ad82c71306c967a8548c2e0a4ace13be08349866d0833167e5477dd02c855e0
-AUX freebsd-lib-10.0-cve-2014-3951.patch 5795 SHA256 0babc677e0af00828a3203fb55e05c23d46a7c5e56179d187d9753f38dd87849 SHA512 27c08aacc0e33f80ea6164bdd29acd6134393c002a6e544ce2b2d5893b24766dbed96e2b7216ef714f5f77fd197e93dac6ef2f909272483aa3ecdafaa5f0e42c WHIRLPOOL 188c0fd6880353c78985e76fe59626dfaa366159e67aeaa9b170331aad5394a5e1dad959b9cb3cb572e79d41b4660ab97f78067410cba10eefd15ece04cbf498
-AUX freebsd-lib-10.0-libiconv_modules.patch 645 SHA256 eeaf5e8dd482935982f4c232c227eadae4258e63a8dd9631cb59140ec21cbe08 SHA512 6d07c28a92985a8de517bd0eee5bf4a9ca60eee214c7111cda74d2eb6b2cfac1105b2673b09f64d9da2e54ecddf77bc27890a42a4d4f79243778f14fed8a4fdd WHIRLPOOL 27383421a4a7ee3c275db4f82ccedd3004c24d1ef5408db31f5647a06c8d31dc47b0ad3d3a202b8598676229953854656c8bc9f74febc76792dd085894c8d31b
-AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf
-AUX freebsd-lib-10.0-libproc-libcxx.patch 393 SHA256 da065c458716e8a56a3c3aab87c9e5135287d6c8fa46eb26092c197e167b7acd SHA512 086d71467dcaccefdb2d9d31deab1905407aadca625853ff222610ea713e80dd8dd61caae3765107045b376f4162f73d12407d1d27aad29603b45b108c09cd8f WHIRLPOOL 3bed09ac5887736dcb15583b4d6cde50419d156bc12f1e1a55668ed85bfb0f502c79c760e8cde3db7172b72775786bb8968df811980ad046c677ff0aff176b33
-AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
-AUX freebsd-lib-10.1-cve-2014-8611.patch 605 SHA256 f8e3556e82a9d256bd42be796dd1a8672b84259087369087ecf8fb2ddcdbdbd7 SHA512 9462e5e4a8a04999b0d434e47bd6891e638281d13f2aba1ff7e2fd6f2b3a698f1339aac2b257404eb52498b14bcdb7b512b82ea203b176a0cb42891da292e691 WHIRLPOOL 942287e5fe27452d1c5c046d00d1e33cf57052ad3429a81ef5da2b4eb93d96aad734d31f0e1c196278a9ab232ec6efc4217c2ff28b271ed63878c6677f4753dc
-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
-AUX freebsd-lib-6.1-csu.patch 655 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1 SHA512 926d8aafd6f517a0fb97af61746d53bafab7fe7003f71181c43b4f9b31e7652624d060a350cc23d83ca7da7c1be2dcc048bb00a581c3524f0f2b7b06de6100b4 WHIRLPOOL fada1ac622c48e1e5af34245bdb17507b2b317938265f722c8cbdbbce3d14bbe76f39a231c0e7237bd229a8c0687952643c6f56e65ffc56b18508969fad837f7
-AUX freebsd-lib-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3
-AUX freebsd-lib-8.0-gcc45.patch 1264 SHA256 5288e313beffa0e50fc0301e859c59f1a95302d546d27eae50b97c4a98c81c4d SHA512 12b81def4e7690cf5b910f31466b06c3fdf58f38a41f63dd359582d8f480e8081b54fd4997c6595e9e1a8912f991ba1b8d04989e270f242dd547d72c9ad5ea57 WHIRLPOOL 0cb37d909a02492a1ca700a5b990e4b6ce42a7f7d55e14a5a3fe685d28f360a10e95d97bd489f1dae0b152e168e9d901bfc13bf08bc91d8dfa1d263d4dba9abf
-AUX freebsd-lib-8.0-rpcsec_gss.patch 298 SHA256 775ec2ee12c49f134938fa8264c04c6b2bf95f8001371f20b85058c25ff1c472 SHA512 2dd63be1a31a1e78fff38a3061469148b673423d958223a459d157accd3a2d1b1f4e568910c49979b0a214322c4e7371f2710ef78fab7d161545fec2a78dc702 WHIRLPOOL 884b76cd6d5d01f801b2fb13f53cfa6ed26dd0b9b2a5062ac9dbe63a6813bfe737e4c3f98b3d94c32dfb6ce3cc19cd5c8760c81250f4b2d5980a4f084d7dc54b
-AUX freebsd-lib-9.0-bluetooth.patch 318 SHA256 5b8810471bd57e1100cc7ee6eee3ed92799e1a5c0244f5ae42f3715189fb06c3 SHA512 71cba168c1530407840dde9e25ce374abb7e0d69800e85bf6f5aff28d1a777ff31f47a84ab763e1518d3492f604d1c09ca95cf8ec5b4e05e8bd5b85267ca4488 WHIRLPOOL eccb54dd10a01358aa7e8267e64f103b89c2981ab2475f27282d5ea0bfe8adb8a106c869ca661553c3d2eda0c1d3d9dec669da6cfe61c23d5749535bdcc8c28b
-AUX freebsd-lib-9.0-liblink.patch 627 SHA256 41f0b7f92f2a8f0a3e422447b830d7dec70a068573086484d5efd6826b7c4c3c SHA512 0c570fea9cc386afe4b742985cf7de4d49370be3f34b2059dee76869d8e64bd52db0a07e61fac8924848d12d0e6d510ad6a266ce8ef76e2be885d81d909ab616 WHIRLPOOL b59e3bb0aaede34492d1940a77b11c7e5192643122f18ee6ad363053f9dec2600218ca416dd153e1d0b3bb6621d6f9e2ec50621e6e7f4b610abbd69993dc428a
-AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041b765c79eef392970665740411c382 SHA512 07ebde5797480f37502e60db2a8c9ce9459bd55b176e79c0f20a859cf737f619559cb27706fb0e83fb501493677a3ffeaa9a98d45db3c0c539b71d2f18140246 WHIRLPOOL 2d78565fe0bc0dcdd61d028ba24b20d2db94f32b40536e7e8e1d5e7f485e0e2f3125807dbb6607d26e4366a6aa8ee89a8f0af7c9498f1fba9431f652c181a8f1
-AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
-AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
-AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
-AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
-AUX freebsd-lib-9.2-liblink.patch 2012 SHA256 065522cabf7dca8062f41c7c9154931864ec3304a2c1f59d44f88b894bf55afc SHA512 97f2f326f431337da5d14a4a37b6fced3224c85bb25ea1f0fcd121790d94dbfb27c98c7b15eb92b1967634be15db96653d5bc6fc458de63a4c988e9e650d965d WHIRLPOOL 45392c571d0f05130836d6d4f0d6b3503f58e4f4d8907d07e1011329b9285d6a010bc35606ff74d529906f6c8f240336bc265eef105196cd3e26390b3bac6d77
-AUX freebsd-lib-add-nossp-cflags.patch 1193 SHA256 53a844511feca44a9db4ac19de336320398335d18617b39cbc4e66db3f88e861 SHA512 fcb290527381df5b91355ca7f36bb4c770378b014890e7a4d129b7cc28e7c18cb1f87ef9e1b308e0de61b54d767677865969c77a9877d8874f2bec223331f9f8 WHIRLPOOL 20e4a0cd017f9aee59f0e4fa809ae74c855fcb7c7a794e1e71b1e5900390d08a9bdfaf5a36a45b057d6211c056a5fb69adfc688fa2adb0586f115be0aea40219
-AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
-AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
-AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
-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
-EBUILD freebsd-lib-10.1.0.9999-r1.ebuild 19164 SHA256 f3b1271d7f2f93e7c231040bffd375e737d880ff6aaf4f0e93b994e5bc565afc SHA512 8957e68211b6591280c019f3603fe9bf9aa1fcf25a3d3edb5dcf4e43987fa70eaa914126a53438012f9cd5d8aa27cbc21b14bf75a19d0921cf72708347a931bd WHIRLPOOL 5abc6a28d96239d86bd3fe085b3bf01192b4fc99a64dd134bf64f097113fe6e868bc54ecbf3835fd3460c3e4e3f2edfdbf85a2f929431d68b916026844a2bd60

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch
deleted file mode 100644
index 42b64b5..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
-index 937187a..d5277f3 100644
---- a/lib/atf/Makefile.inc
-+++ b/lib/atf/Makefile.inc
-@@ -49,6 +49,24 @@ CFLAGS+=	-DATF_PKGDATADIR='"${SHAREDIR}/atf"'
- CFLAGS+=	-DATF_SHELL='"/bin/sh"'
- CFLAGS+=	-DATF_WORKDIR='"/tmp"'
- 
-+CXXFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-DATF_ARCH='"${MACHINE}"'
-+CXXFLAGS+=	-DATF_BUILD_CC='"${CC}"'
-+CXXFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
-+CXXFLAGS+=	-DATF_BUILD_CPP='"${CPP}"'
-+CXXFLAGS+=	-DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"'
-+CXXFLAGS+=	-DATF_BUILD_CXX='"${CXX}"'
-+CXXFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
-+CXXFLAGS+=	-DATF_CONFDIR='"${CONFDIR}/atf"'
-+CXXFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
-+CXXFLAGS+=	-DATF_LIBDIR='"${LIBDIR}"'
-+CXXFLAGS+=	-DATF_LIBEXECDIR='"${LIBEXECDIR}"'
-+CXXFLAGS+=	-DATF_MACHINE='"${MACHINE_ARCH}"'
-+CXXFLAGS+=	-DATF_M4='"/usr/bin/m4"'
-+CXXFLAGS+=	-DATF_PKGDATADIR='"${SHAREDIR}/atf"'
-+CXXFLAGS+=	-DATF_SHELL='"/bin/sh"'
-+CXXFLAGS+=	-DATF_WORKDIR='"/tmp"'
-+
- WARNS?=		3
- 
- # vim: syntax=make
-diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
-index 37d6073..90a2687 100644
---- a/lib/atf/libatf-c++/Makefile
-+++ b/lib/atf/libatf-c++/Makefile
-@@ -40,11 +40,11 @@ LDFLAGS+=	-L${.OBJDIR}/../libatf-c
- .PATH:		${ATF}/atf-c++
- .PATH:		${ATF}/atf-c++/detail
- 
--CFLAGS+=	-I${ATF}
--CFLAGS+=	-I${.CURDIR}/../libatf-c
--CFLAGS+=	-I.
-+CXXFLAGS+=	-I${ATF}
-+CXXFLAGS+=	-I${.CURDIR}/../libatf-c
-+CXXFLAGS+=	-I.
- 
--CFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-DHAVE_CONFIG_H
- 
- SRCS=		application.cpp \
- 		build.cpp \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-clang34.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-clang34.patch
deleted file mode 100644
index df6072b..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-clang34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://svnweb.freebsd.org/base/head/gnu/lib/csu/Makefile?r1=245539&r2=259720&view=patch
-
---- head/gnu/lib/csu/Makefile	2013/01/17 05:56:28	245539
-+++ head/gnu/lib/csu/Makefile	2013/12/22 12:53:56	259720
-@@ -15,10 +15,12 @@
- SOBJS=		crtbeginS.o crtendS.o
- CSTD?=		gnu89
- CFLAGS+=	-DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3
--CFLAGS+=	-finhibit-size-directive -fno-inline-functions \
--		-fno-exceptions -fno-zero-initialized-in-bss \
--		-fno-zero-initialized-in-bss -fno-toplevel-reorder \
--		-fno-asynchronous-unwind-tables -fno-omit-frame-pointer
-+.if ${COMPILER_TYPE} == "gcc"
-+CFLAGS+=	-finhibit-size-directive -fno-toplevel-reorder
-+.endif
-+CFLAGS+=	-fno-inline-functions -fno-exceptions \
-+		-fno-zero-initialized-in-bss -fno-asynchronous-unwind-tables \
-+		-fno-omit-frame-pointer
- CFLAGS+=	-I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \
- 		-I${CCDIR}/cc_tools
- CRTS_CFLAGS=	-DCRTSTUFFS_O -DSHARED ${PICFLAG}
-

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-cve-2014-3951.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-cve-2014-3951.patch
deleted file mode 100644
index 5ac0ac8..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-cve-2014-3951.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Index: lib/libc/iconv/citrus_prop.c
-===================================================================
---- lib/libc/iconv/citrus_prop.c	(revision 267591)
-+++ lib/libc/iconv/citrus_prop.c	(working copy)
-@@ -339,7 +339,7 @@ name_found:
- 
- static int
- _citrus_prop_parse_element(struct _memstream * __restrict ms,
--    const _citrus_prop_hint_t * __restrict hints, void ** __restrict context)
-+    const _citrus_prop_hint_t * __restrict hints, void * __restrict context)
- {
- 	int ch, errnum;
- #define _CITRUS_PROP_HINT_NAME_LEN_MAX	255
-@@ -435,8 +435,7 @@ _citrus_prop_parse_variable(const _citrus_prop_hin
- 		if (ch == EOF || ch == '\0')
- 			break;
- 		_memstream_ungetc(&ms, ch);
--		errnum = _citrus_prop_parse_element(
--		    &ms, hints, (void ** __restrict)context);
-+		errnum = _citrus_prop_parse_element(&ms, hints, context);
- 		if (errnum != 0)
- 			return (errnum);
- 	}
-Index: lib/libc/iconv/citrus_prop.h
-===================================================================
---- lib/libc/iconv/citrus_prop.h	(revision 267591)
-+++ lib/libc/iconv/citrus_prop.h	(working copy)
-@@ -42,7 +42,7 @@ typedef struct _citrus_prop_hint_t _citrus_prop_hi
- 
- #define _CITRUS_PROP_CB0_T(_func_, _type_) \
- typedef int (*_citrus_prop_##_func_##_cb_func_t) \
--    (void ** __restrict, const char *, _type_); \
-+    (void * __restrict, const char *, _type_); \
- typedef struct { \
- 	_citrus_prop_##_func_##_cb_func_t func; \
- } _citrus_prop_##_func_##_cb_t;
-@@ -52,7 +52,7 @@ _CITRUS_PROP_CB0_T(str, const char *)
- 
- #define _CITRUS_PROP_CB1_T(_func_, _type_) \
- typedef int (*_citrus_prop_##_func_##_cb_func_t) \
--    (void ** __restrict, const char *, _type_, _type_); \
-+    (void * __restrict, const char *, _type_, _type_); \
- typedef struct { \
- 	_citrus_prop_##_func_##_cb_func_t func; \
- } _citrus_prop_##_func_##_cb_t;
-Index: lib/libiconv_modules/BIG5/citrus_big5.c
-===================================================================
---- lib/libiconv_modules/BIG5/citrus_big5.c	(revision 267591)
-+++ lib/libiconv_modules/BIG5/citrus_big5.c	(working copy)
-@@ -170,7 +170,7 @@ _citrus_BIG5_check_excludes(_BIG5EncodingInfo *ei,
- }
- 
- static int
--_citrus_BIG5_fill_rowcol(void ** __restrict ctx, const char * __restrict s,
-+_citrus_BIG5_fill_rowcol(void * __restrict ctx, const char * __restrict s,
-     uint64_t start, uint64_t end)
- {
- 	_BIG5EncodingInfo *ei;
-@@ -189,7 +189,7 @@ static int
- 
- static int
- /*ARGSUSED*/
--_citrus_BIG5_fill_excludes(void ** __restrict ctx,
-+_citrus_BIG5_fill_excludes(void * __restrict ctx,
-     const char * __restrict s __unused, uint64_t start, uint64_t end)
- {
- 	_BIG5EncodingInfo *ei;
-@@ -235,7 +235,6 @@ static int
- _citrus_BIG5_encoding_module_init(_BIG5EncodingInfo * __restrict ei,
-     const void * __restrict var, size_t lenvar)
- {
--	void *ctx = (void *)ei;
- 	const char *s;
- 	int err;
- 
-@@ -257,9 +256,9 @@ _citrus_BIG5_encoding_module_init(_BIG5EncodingInf
- 	}
- 
- 	/* fallback Big5-1984, for backward compatibility. */
--	_citrus_BIG5_fill_rowcol((void **)&ctx, "row", 0xA1, 0xFE);
--	_citrus_BIG5_fill_rowcol((void **)&ctx, "col", 0x40, 0x7E);
--	_citrus_BIG5_fill_rowcol((void **)&ctx, "col", 0xA1, 0xFE);
-+	_citrus_BIG5_fill_rowcol(ei, "row", 0xA1, 0xFE);
-+	_citrus_BIG5_fill_rowcol(ei, "col", 0x40, 0x7E);
-+	_citrus_BIG5_fill_rowcol(ei, "col", 0xA1, 0xFE);
- 
- 	return (0);
- }
-Index: lib/libiconv_modules/HZ/citrus_hz.c
-===================================================================
---- lib/libiconv_modules/HZ/citrus_hz.c	(revision 267591)
-+++ lib/libiconv_modules/HZ/citrus_hz.c	(working copy)
-@@ -65,8 +65,8 @@ typedef enum {
- } charset_t;
- 
- typedef struct {
-+	int	 start;
- 	int	 end;
--	int	 start;
- 	int	 width;
- } range_t;
- 
-@@ -503,12 +503,12 @@ _citrus_HZ_encoding_module_uninit(_HZEncodingInfo
- }
- 
- static int
--_citrus_HZ_parse_char(void **context, const char *name __unused, const char *s)
-+_citrus_HZ_parse_char(void *context, const char *name __unused, const char *s)
- {
- 	escape_t *escape;
- 	void **p;
- 
--	p = (void **)*context;
-+	p = (void **)context;
- 	escape = (escape_t *)p[0];
- 	if (escape->ch != '\0')
- 		return (EINVAL);
-@@ -520,7 +520,7 @@ static int
- }
- 
- static int
--_citrus_HZ_parse_graphic(void **context, const char *name, const char *s)
-+_citrus_HZ_parse_graphic(void *context, const char *name, const char *s)
- {
- 	_HZEncodingInfo *ei;
- 	escape_t *escape;
-@@ -527,7 +527,7 @@ static int
- 	graphic_t *graphic;
- 	void **p;
- 
--	p = (void **)*context;
-+	p = (void **)context;
- 	escape = (escape_t *)p[0];
- 	ei = (_HZEncodingInfo *)p[1];
- 	graphic = malloc(sizeof(*graphic));
-@@ -589,13 +589,13 @@ _CITRUS_PROP_HINT_END
- };
- 
- static int
--_citrus_HZ_parse_escape(void **context, const char *name, const char *s)
-+_citrus_HZ_parse_escape(void *context, const char *name, const char *s)
- {
- 	_HZEncodingInfo *ei;
- 	escape_t *escape;
- 	void *p[2];
- 
--	ei = (_HZEncodingInfo *)*context;
-+	ei = (_HZEncodingInfo *)context;
- 	escape = malloc(sizeof(*escape));
- 	if (escape == NULL)
- 		return (EINVAL);
-Index: lib/libiconv_modules/VIQR/citrus_viqr.c
-===================================================================
---- lib/libiconv_modules/VIQR/citrus_viqr.c	(revision 267591)
-+++ lib/libiconv_modules/VIQR/citrus_viqr.c	(working copy)
-@@ -431,7 +431,6 @@ static int
- _citrus_VIQR_encoding_module_init(_VIQREncodingInfo * __restrict ei,
-     const void * __restrict var __unused, size_t lenvar __unused)
- {
--	const mnemonic_def_t *p;
- 	const char *s;
- 	size_t i, n;
- 	int errnum;
-@@ -455,7 +454,10 @@ _citrus_VIQR_encoding_module_init(_VIQREncodingInf
- 			return (errnum);
- 		}
- 	}
--	for (i = 0;; ++i) {
-+	/* a + 1 < b + 1 here to silence gcc warning about unsigned < 0. */
-+	for (i = 0; i + 1 < mnemonic_ext_size + 1; ++i) {
-+		const mnemonic_def_t *p;
-+
- 		p = &mnemonic_ext[i];
- 		n = strlen(p->name);
- 		if (ei->mb_cur_max < n)

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libiconv_modules.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libiconv_modules.patch
deleted file mode 100644
index 69126e5..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libiconv_modules.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Should install lib/libiconv_modules to /usr/$(get_libdir)/i18n.
-
-Drop libiconv_modules from lib/Makefile. And set the following in ebuild.
-NON_NATIVE_SUBDIRS="lib/libiconv_modules"
-NATIVE_SUBDIRS="lib/libiconv_modules"
-
-Install to /usr/$(get_libdir)/i18n to force.
-mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n"
-
-
-Welcome a better solution...
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 8722cc2..12a0516 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -38,7 +38,6 @@ SUBDIR_ORDERED=	${_csu} \
- 	libcompiler_rt \
- 	libcrypt \
- 	libelf \
--	${_libiconv_modules} \
- 	libkvm \
- 	${_libldns} \
- 	msun \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch
deleted file mode 100644
index 6ef3f07..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
-index 9a21dde..0815f0a 100644
---- a/lib/libcam/Makefile
-+++ b/lib/libcam/Makefile
-@@ -8,6 +8,7 @@ INCS=		camlib.h
- 
- DPADD=		${LIBSBUF}
- LDADD=		-lsbuf
-+LDFLAGS+=	-L${.OBJDIR}/../libsbuf
- 
- MAN=		cam.3 cam_cdbparse.3
- 
-diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
-index dbd7895..607b1f6 100644
---- a/lib/libdwarf/Makefile
-+++ b/lib/libdwarf/Makefile
-@@ -21,6 +21,7 @@ SRCS=	\
- INCS=	dwarf.h libdwarf.h
- 
- CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}/../libelf
- 
- SHLIB_MAJOR=	3
- 
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
-index 4449c06..f024cf0 100644
---- a/lib/libproc/Makefile
-+++ b/lib/libproc/Makefile
-@@ -14,6 +14,7 @@ SRCS=	proc_bkpt.c		\
- INCS=	libproc.h
- 
- CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}/../libelf
- 
- .if ${MK_LIBCPLUSPLUS} != "no"
- LDADD+=		-lcxxrt
-@@ -27,4 +28,7 @@ SHLIB_MAJOR=	2
- 
- WITHOUT_MAN=
- 
-+LDADD+=		-lelf
-+LDFLAGS+=	-L${.OBJDIR}/../libelf
-+
- .include <bsd.lib.mk>
-diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
-index af5a775..c01aa05 100644
---- a/lib/libprocstat/Makefile
-+++ b/lib/libprocstat/Makefile
-@@ -16,6 +16,8 @@ VERSION_DEF=	${.CURDIR}/Versions.def
- SYMBOL_MAPS=	${.CURDIR}/Symbol.map
- 
- INCS=		libprocstat.h
-+CFLAGS+=	-I${.CURDIR}/../libelf
-+LDFLAGS+=       -L${.OBJDIR}/../libelf
- CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
- SHLIB_MAJOR=	1
- 
-diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
-index 2815a07..e992662 100644
---- a/lib/librtld_db/Makefile
-+++ b/lib/librtld_db/Makefile
-@@ -10,5 +10,8 @@ SRCS=		rtld_db.c
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+CFLAGS+= -I${.CURDIR}/../libelf
-+LDADD+= -lutil -lproc
-+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
- 
- .include <bsd.lib.mk>
-diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
-index 1cf52a0..3d25fae 100644
---- a/lib/libtelnet/Makefile
-+++ b/lib/libtelnet/Makefile
-@@ -13,6 +13,8 @@ INTERNALLIB=
- SRCS=		genget.c getent.c misc.c
- CFLAGS+=	-I${TELNETDIR}
- 
-+CFLAGS+=	-I${.CURDIR}/../libmp
-+
- WARNS?=		2
- 
- .if !defined(RELEASE_CRUNCH)
-diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
-index 30a1dfb..9f8a99c 100644
---- a/lib/libexecinfo/Makefile
-+++ b/lib/libexecinfo/Makefile
-@@ -10,8 +10,10 @@ SHLIB_MAJOR=	1
- INCS=		execinfo.h
- SRCS=		backtrace.c symtab.c unwind.c
- 
-+CFLAGS+=	-I${.CURDIR}/../libelf
- DPADD=		${LIBELF}
- LDADD=		-lelf
-+LDFLAGS+=	-L${.OBJDIR}/../libelf
- 
- MAN=		backtrace.3
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
deleted file mode 100644
index 55987aa..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
-index f9e01ab..15b27d8 100644
---- a/lib/libproc/Makefile
-+++ b/lib/libproc/Makefile
-@@ -15,7 +15,10 @@ INCS=	libproc.h
- 
- CFLAGS+=	-I${.CURDIR}
- 
--.if ${MK_LIBCPLUSPLUS} != "no"
-+.if ${CXX:T:M*-stdlib=libc++*}
-+LDADD+=		-lcxxrt
-+DPADD+=		${LIBCXXRT}
-+.elif ${CXXFLAGS:T:M*-stdlib=libc++*}
- LDADD+=		-lcxxrt
- DPADD+=		${LIBCXXRT}
- .else

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
deleted file mode 100644
index 2968252..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
-index 21016a9..26010e8 100644
---- a/lib/libusb/Makefile
-+++ b/lib/libusb/Makefile
-@@ -40,11 +40,11 @@ CFLAGS+=	-DCOMPAT_32BIT
- 
- beforeinstall:
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
--		${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-+		${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDIR}/pkgconfig
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
--		${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-+		${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
--		${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
-+		${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
- 
- #
- # Cross platform support

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch
deleted file mode 100644
index e225042..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: lib/libc/stdio/fflush.c
-===================================================================
---- lib/libc/stdio/fflush.c.orig
-+++ lib/libc/stdio/fflush.c
-@@ -124,11 +124,13 @@
- 		t = _swrite(fp, (char *)p, n);
- 		if (t <= 0) {
- 			/* Reset _p and _w. */
--			if (p > fp->_p)	/* Some was written. */
-+			if (p > fp->_p) {
-+				/* Some was written. */
- 				memmove(fp->_p, p, n);
--			fp->_p += n;
--			if ((fp->_flags & (__SLBF | __SNBF)) == 0)
--				fp->_w -= n;
-+				fp->_p += n;
-+				if ((fp->_flags & (__SLBF | __SNBF)) == 0)
-+					fp->_w -= n;
-+			}
- 			fp->_flags |= __SERR;
- 			return (EOF);
- 		}

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
deleted file mode 100644
index 00de8a6..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fbsd-6/lib/libipsec/policy_token.l
-===================================================================
---- fbsd-6.orig/lib/libipsec/policy_token.l
-+++ fbsd-6/lib/libipsec/policy_token.l
-@@ -138,8 +138,6 @@ void
- __policy__strbuffer__init__(msg)
- 	char *msg;
- {
--	if (yy_current_buffer)
--		yy_delete_buffer(yy_current_buffer);
- 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
- 	yy_switch_to_buffer(strbuffer);
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
deleted file mode 100644
index a3e7d5e..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is needed to avoid inclusion of GCC's float.h that defines
-LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
-
-Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-===================================================================
---- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
-+++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-@@ -28,7 +28,7 @@
- __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
- 
- #include <fenv.h>
--#include <float.h>
-+#include <machine/float.h>
- #include <math.h>
- 
- /*

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
deleted file mode 100644
index 2f6de46..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: freebsd-6.0_beta4/lib/libpmc/Makefile
-===================================================================
---- freebsd-6.0_beta4.orig/lib/libpmc/Makefile
-+++ freebsd-6.0_beta4/lib/libpmc/Makefile
-@@ -9,6 +9,8 @@ WARNS?=	6
- 
- MAN=	pmc.3 pmclog.3
- 
-+CFLAGS+= -I${.CURDIR}
-+
- MLINKS+= \
- 	pmc.3 pmc_allocate.3 \
- 	pmc.3 pmc_attach.3 \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
deleted file mode 100644
index 075f278..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/csu/amd64/Makefile.orig	2006-07-04 07:49:58 -0300
-+++ lib/csu/amd64/Makefile	2006-07-04 07:50:15 -0300
-@@ -16,6 +16,7 @@
- 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c
- 
- realinstall:
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${OBJS} ${DESTDIR}${LIBDIR}
- 
---- lib/csu/sparc64/Makefile.orig	2006-10-06 15:13:55 +0100
-+++ lib/csu/sparc64/Makefile	2006-10-06 15:15:06 +0100
-@@ -15,6 +15,7 @@
- 	${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC}
- 
- realinstall:
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${OBJS} ${DESTDIR}${LIBDIR}
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
deleted file mode 100644
index 8de5df2..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes a compile error if XOPEN_SOURCE 600 is defined.
-
-See: http://www.mailinglistarchive.com/freebsd-current@×××××××.org/msg15011.html
-
---- sys/sys/types.h.orig
-+++ sys/sys/types.h
-@@ -46,7 +46,7 @@
- 
- #include <sys/_pthreadtypes.h>
- 
--#if __BSD_VISIBLE
-+#ifndef _POSIX_SOURCE
- typedef	unsigned char	u_char;
- typedef	unsigned short	u_short;
- typedef	unsigned int	u_int;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
deleted file mode 100644
index 2ddb9ea..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur work.orig/include/rpcsvc/nis.x work/include/rpcsvc/nis.x
---- work.orig/include/rpcsvc/nis.x	2009-10-25 10:10:29.000000000 +0900
-+++ work/include/rpcsvc/nis.x	2011-04-13 21:25:13.000000000 +0900
-@@ -399,10 +399,7 @@
- %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
- %#define WORLD_DEFAULT (NIS_READ_ACC)
- %#define GROUP_DEFAULT (NIS_READ_ACC << 8)
--%#define OWNER_DEFAULT ((NIS_READ_ACC +\
--			 NIS_MODIFY_ACC +\
--			 NIS_CREATE_ACC +\
--			 NIS_DESTROY_ACC) << 16)
-+%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16)
- %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
- %
- %/* Result manipulation defines ... */
-@@ -431,10 +428,8 @@
- % * these definitions they take an nis_object *, and an int and return
- % * a u_char * for Value, and an int for length.
- % */
--%#define ENTRY_VAL(obj, col) \
--	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
--%#define ENTRY_LEN(obj, col) \
--	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
-+%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
-+%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
- %
- %#ifdef __cplusplus
- %}

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
deleted file mode 100644
index a7de06f..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Without this linking fails during a stage3 build.
-
---- lib/librpcsec_gss/Makefile.orig
-+++ lib/librpcsec_gss/Makefile
-@@ -8,6 +8,7 @@
- 
- DPADD+=	${LIBGSSAPI}
- LDADD+=	-lgssapi
-+LDFLAGS+= 	-L${.OBJDIR}/../libgssapi
- 
- VERSION_DEF=	${.CURDIR}/../libc/Versions.def
- SYMBOL_MAPS=	${.CURDIR}/Symbol.map

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch
deleted file mode 100644
index cf1172a..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur lib.orig/libsdp/Makefile lib/libsdp/Makefile
---- lib.orig/libsdp/Makefile	2012-12-25 20:28:50.000000000 +0900
-+++ lib/libsdp/Makefile	2012-12-25 20:31:19.000000000 +0900
-@@ -5,7 +5,7 @@
- MAN=		sdp.3
- 
- WARNS?=		2
--CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../libbluetooth
- 
- SHLIB_MAJOR=	4
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
deleted file mode 100644
index f8e4707..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr lib.ol/libproc/Makefile lib/libproc/Makefile
---- lib.ol/libproc/Makefile	2011-11-02 14:02:17.000000000 +0000
-+++ lib/libproc/Makefile	2011-11-02 14:03:09.000000000 +0000
-@@ -16,5 +16,6 @@
- SHLIB_MAJOR=	2
- 
- WITHOUT_MAN=
-+LDADD+=-lelf
- 
- .include <bsd.lib.mk>
-diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile
---- lib.ol/librtld_db/Makefile	2011-11-02 14:02:13.000000000 +0000
-+++ lib/librtld_db/Makefile	2011-11-02 14:04:00.000000000 +0000
-@@ -10,5 +10,7 @@
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+LDADD+=-lutil -lproc
-+LDFLAGS+=-L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
- 
- .include <bsd.lib.mk>

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch
deleted file mode 100644
index c1c2a0e..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur lib.orig/libncp/Makefile lib/libncp/Makefile
---- lib.orig/libncp/Makefile	2012-12-25 20:35:16.000000000 +0900
-+++ lib/libncp/Makefile	2012-12-25 20:36:23.000000000 +0900
-@@ -6,6 +6,7 @@
- 
- DPADD=		${LIBIPX}
- LDADD=		-lipx
-+LDFLAGS+=-L${.OBJDIR}/../libipx
- 
- SRCS=	ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \
- 	ncpl_net.c ncpl_rcfile.c ncpl_conn.c ncpl_nls.c ncpl_msg.c \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
deleted file mode 100644
index bf77a0a..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Fixes warnings like:
-/var/tmp/portage/sys-freebsd/freebsd-lib-9.0-r2/work/lib/libopie/../../contrib/opie/libopie/randomchallenge.c:43:5:
-warning: incompatible implicit declaration of built-in function ‘strcpy’ 
-
-diff -uNr contrib.old/opie/libopie/accessfile.c contrib/opie/libopie/accessfile.c
---- contrib.old/opie/libopie/accessfile.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/accessfile.c	2012-05-25 09:12:34.000000000 -0400
-@@ -46,6 +46,7 @@
- #ifdef DEBUG
- #include <syslog.h>
- #endif /* DEBUG */
-+#include <ctype.h>
- 
- #include "opie.h"
- 
-diff -uNr contrib.old/opie/libopie/generator.c contrib/opie/libopie/generator.c
---- contrib.old/opie/libopie/generator.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/generator.c	2012-05-25 08:58:10.000000000 -0400
-@@ -50,6 +50,7 @@
- #include <syslog.h>
- #endif /* DEBUG */
- #include "opie.h"
-+#include <stdio.h>
- 
- static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" };
- 
-diff -uNr contrib.old/opie/libopie/lookup.c contrib/opie/libopie/lookup.c
---- contrib.old/opie/libopie/lookup.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/lookup.c	2012-05-25 09:15:08.000000000 -0400
-@@ -14,6 +14,7 @@
- #include "opie_cfg.h"
- #include <stdio.h>
- #include "opie.h"
-+#include <string.h>
- 
- int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal)
- {
-diff -uNr contrib.old/opie/libopie/newseed.c contrib/opie/libopie/newseed.c
---- contrib.old/opie/libopie/newseed.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/newseed.c	2012-05-25 09:14:37.000000000 -0400
-@@ -36,6 +36,9 @@
- #include <syslog.h>
- #endif /* DEBUG */
- #include "opie.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <time.h>
- 
- int opienewseed FUNCTION((seed), char *seed)
- {
-diff -uNr contrib.old/opie/libopie/parsechallenge.c contrib/opie/libopie/parsechallenge.c
---- contrib.old/opie/libopie/parsechallenge.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/parsechallenge.c	2012-05-25 09:15:54.000000000 -0400
-@@ -20,6 +20,8 @@
- #include <string.h>
- #endif /* HAVE_STRING_H */
- #include "opie.h"
-+#include <stdlib.h>
-+#include <ctype.h>
- 
- struct algorithm {
-   char *name;
-diff -uNr contrib.old/opie/libopie/passwd.c contrib/opie/libopie/passwd.c
---- contrib.old/opie/libopie/passwd.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/passwd.c	2012-05-25 09:13:45.000000000 -0400
-@@ -22,6 +22,7 @@
- 
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <string.h>
- 
- int opiepasswd FUNCTION((old, flags, principal, n, seed, ks), struct opie *old AND int flags AND char *principal AND int n AND char *seed AND char *ks)
- {
-diff -uNr contrib.old/opie/libopie/randomchallenge.c contrib/opie/libopie/randomchallenge.c
---- contrib.old/opie/libopie/randomchallenge.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/randomchallenge.c	2012-05-25 09:00:27.000000000 -0400
-@@ -28,6 +28,9 @@
- 
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
- 
- static char *algids[] = { 0, 0, 0, "sha1", "md4", "md5" };
- 
-diff -uNr contrib.old/opie/libopie/verify.c contrib/opie/libopie/verify.c
---- contrib.old/opie/libopie/verify.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/verify.c	2012-05-25 09:12:09.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <string.h>
- #endif /* HAVE_STRING_H */
- #include "opie.h"
-+#include <ctype.h>
- 
- #define RESPONSE_STANDARD  0
- #define RESPONSE_WORD      1
-diff -uNr contrib.old/opie/libopie/version.c contrib/opie/libopie/version.c
---- contrib.old/opie/libopie/version.c	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/libopie/version.c	2012-05-25 09:13:15.000000000 -0400
-@@ -19,6 +19,8 @@
- */
- #include "opie_cfg.h"
- #include "opie.h"
-+#include <stdio.h>
-+#include <stdlib.h>
- 
- VOIDRET opieversion FUNCTION_NOARGS
- {
-diff -uNr contrib.old/opie/opie.h contrib/opie/opie.h
---- contrib.old/opie/opie.h	2012-05-25 08:54:33.000000000 -0400
-+++ contrib/opie/opie.h	2012-05-25 09:21:28.000000000 -0400
-@@ -158,6 +158,9 @@
- int __opiereadrec __P((struct opie *));
- int __opiewriterec __P((struct opie *));
- int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts));
-+VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND struct opie_otpkey *out AND int n);
-+int opieinsecure FUNCTION_NOARGS;
-+int opienewseed FUNCTION((seed), char *seed);
- __END_DECLS
- 
- #define opiestrncpy(dst, src, n) \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
deleted file mode 100644
index e72b171..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://www.freebsd.org/cgi/query-pr.cgi?pr=168317
-
-Index: lib/libthr/thread/thr_mutex.c
-===================================================================
---- lib/libthr/thread/thr_mutex.c	(revision 235924)
-+++ lib/libthr/thread/thr_mutex.c	(working copy)
-@@ -538,6 +538,7 @@
- 	switch (PMUTEX_TYPE(m->m_flags)) {
- 	case PTHREAD_MUTEX_ERRORCHECK:
- 	case PTHREAD_MUTEX_NORMAL:
-+	case PTHREAD_MUTEX_ADAPTIVE_NP:
- 		ret = EBUSY; 
- 		break;
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch
deleted file mode 100644
index fdb7e16..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix "no .eh_frame_hdr table will be created" error.
-
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47829
-http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4a0e0cd7377c45dc21d5c71bcab931b5e5727e74
-
-diff -Nur lib.orig/csu/i386-elf/Makefile lib/csu/i386-elf/Makefile
---- lib.orig/csu/i386-elf/Makefile	2013-03-06 01:07:57.000000000 +0900
-+++ lib/csu/i386-elf/Makefile	2013-03-06 01:10:09.000000000 +0900
-@@ -10,6 +10,8 @@
- FILESDIR=	${LIBDIR}
- CFLAGS+=	-I${.CURDIR}/../common \
- 		-I${.CURDIR}/../../libc/include
-+CFLAGS+=	-fno-omit-frame-pointer
-+CFLAGS+=	-fno-asynchronous-unwind-tables
- CLEANFILES=	${FILES} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
- CLEANFILES+=	crt1_c.s gcrt1_c.s Scrt1_c.s
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch
deleted file mode 100644
index 62357e0..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- include/Makefile.orig	2013-06-16 10:47:52.000000000 +0200
-+++ include/Makefile	2013-06-16 10:47:37.000000000 +0200
-@@ -6,11 +6,11 @@
- .include <bsd.own.mk>
- 
- CLEANFILES= osreldate.h version vers.c
-+SUBDIR= arpa protocols rpcsvc rpc xlocale
--SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
- INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
- 	db.h \
- 	dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
-+	fts.h ftw.h getopt.h glob.h grp.h \
--	fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
- 	ieeefp.h ifaddrs.h \
- 	inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
- 	locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
deleted file mode 100644
index 99ee36a..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
-index 87ce8d4..77d0535 100644
---- a/lib/libdwarf/Makefile
-+++ b/lib/libdwarf/Makefile
-@@ -21,6 +21,7 @@ SRCS=	\
- INCS=	dwarf.h libdwarf.h
- 
- CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}/../libelf
- 
- SHLIB_MAJOR=	3
- 
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
-index e20e00a..77d46d7 100644
---- a/lib/libproc/Makefile
-+++ b/lib/libproc/Makefile
-@@ -12,9 +12,13 @@ SRCS=	proc_bkpt.c		\
- INCS=	libproc.h
- 
- CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}/../libelf
- 
- SHLIB_MAJOR=	2
- 
- WITHOUT_MAN=
- 
-+LDADD+=		-lelf
-+LDFLAGS+=	-L${.OBJDIR}/../libelf
-+
- .include <bsd.lib.mk>
-diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
-index 783fb8b..62e7c60 100644
---- a/lib/librtld_db/Makefile
-+++ b/lib/librtld_db/Makefile
-@@ -10,5 +10,8 @@ SRCS=		rtld_db.c
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+CFLAGS+= -I${.CURDIR}/../libelf
-+LDADD+= -lutil -lproc
-+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
- 
- .include <bsd.lib.mk>
-diff -uNr lib.old/libprocstat/Makefile lib/libprocstat/Makefile
---- a/lib/libprocstat/Makefile	2013-08-11 16:00:47.000000000 -0400
-+++ b/lib/libprocstat/Makefile	2013-08-11 16:18:19.000000000 -0400
-@@ -17,6 +17,8 @@
- SYMBOL_MAPS=	${.CURDIR}/Symbol.map
- 
- INCS=		libprocstat.h
-+CFLAGS+=	-I${.CURDIR}/../libelf
-+LDFLAGS+=       -L${.OBJDIR}/../libelf
- CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
- SHLIB_MAJOR=	1
- 
-diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
-index fcb16de..6d0312b 100644
---- a/lib/libcam/Makefile
-+++ b/lib/libcam/Makefile
-@@ -8,6 +8,7 @@ INCS=		camlib.h
- 
- DPADD=		${LIBSBUF}
- LDADD=		-lsbuf
-+LDFLAGS+=	-L${.OBJDIR}/../libsbuf
- 
- MAN=		cam.3 cam_cdbparse.3
- 
-diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
-index 446f552..f55b3ba 100644
---- a/lib/libtelnet/Makefile
-+++ b/lib/libtelnet/Makefile
-@@ -13,6 +13,8 @@ INTERNALLIB=
- SRCS=		genget.c getent.c misc.c
- CFLAGS+=	-I${TELNETDIR}
- 
-+CFLAGS+=	-I${.CURDIR}/../libmp
-+
- WARNS?=		2
- 
- .if !defined(RELEASE_CRUNCH)

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch
deleted file mode 100644
index 00b39f7..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Please do not disable this patch.
-All commands will be non-executable.
-Abort trap: 6 (core dumped) is displayed...
-
-Details see Gentoo Bug #511698.
-https://bugs.gentoo.org/show_bug.cgi?id=511698
-
-diff --git a/lib/libc/Makefile b/lib/libc/Makefile
-index 1cc23b7..7dd458e 100644
---- a/lib/libc/Makefile
-+++ b/lib/libc/Makefile
-@@ -149,6 +149,6 @@ CWARNFLAGS:=	${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/}
- # in the future to circumvent this.
- SSP_CFLAGS:=	${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/}
- # Disable stack protection for SSP symbols.
--SSP_CFLAGS:=	${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/}
-+SSP_CFLAGS:=	${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/:C/^$/-fno-stack-protector/}
- # Generate stack unwinding tables for cancellation points
- CANCELPOINTS_CFLAGS:=	${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//}
-diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
-index f92d87d..7a3a2f3 100644
---- a/lib/csu/Makefile.inc
-+++ b/lib/csu/Makefile.inc
-@@ -1,5 +1,5 @@
- # $FreeBSD: release/9.1.0/lib/csu/Makefile.inc 204757 2010-03-05 13:29:05Z uqs $
- 
--SSP_CFLAGS=
-+SSP_CFLAGS= -fno-stack-protector
-
- .include "../Makefile.inc"

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
deleted file mode 100644
index 1b4e791..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile
---- lib/libgeom.old/Makefile	2011-07-10 14:23:51.000000000 +0000
-+++ lib/libgeom/Makefile	2011-07-10 15:12:39.000000000 +0000
-@@ -13,8 +13,8 @@
- 
- WARNS?=	3
- 
--DPADD=	${LIBBSDXML} ${LIBSBUF}
--LDADD=	-lbsdxml -lsbuf
-+DPADD=	${LIBSBUF}
-+LDADD=	-lexpat -lsbuf
- 
- MAN=	libgeom.3
- 
-diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
---- lib/libgeom.old/geom_xml2tree.c	2010-12-21 17:09:25.000000000 +0000
-+++ lib/libgeom/geom_xml2tree.c	2011-07-10 15:12:52.000000000 +0000
-@@ -43,7 +43,7 @@
- #include <sys/sbuf.h>
- #include <sys/sysctl.h>
- #include <err.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <libgeom.h>
- 
- struct mystate {

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
deleted file mode 100644
index c2cf142..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix headers dependencies so that they can be included alone.
-
---- include/ifaddrs.h.old	2009-05-15 13:50:10 +0000
-+++ include/ifaddrs.h	2009-05-15 13:50:23 +0000
-@@ -28,6 +28,8 @@
- #ifndef	_IFADDRS_H_
- #define	_IFADDRS_H_
- 
-+#include <sys/types.h>
-+
- struct ifaddrs {
- 	struct ifaddrs  *ifa_next;
- 	char		*ifa_name;

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
deleted file mode 100644
index 751a77c..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-u_int is defined in sys/types.h
-makes header usable alone.
-
---- sys/sys/sysctl.h.old	2012-05-25 11:08:53.000000000 -0400
-+++ sys/sys/sysctl.h	2012-05-25 11:09:16.000000000 -0400
-@@ -788,6 +788,7 @@
- 		    struct sysctl_req *);
- #else	/* !_KERNEL */
- #include <sys/cdefs.h>
-+#include <sys/types.h> /* for u_int */
- 
- __BEGIN_DECLS
- int	sysctl(const int *, u_int, void *, size_t *, const void *, size_t);

diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf
deleted file mode 100644
index 7a879f9..0000000
--- a/sys-freebsd/freebsd-lib/files/libmap.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/libmap.conf
-
-# Ensure that libthr does all threading
-libpthread.so.2         libthr.so.2
-libpthread.so           libthr.so
-libc_r.so.6             libthr.so.2
-libc_r.so               libthr.so
-

diff --git a/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in b/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in
deleted file mode 100644
index 058ecb4..0000000
--- a/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=@LIBDIR@
-includedir=${prefix}/include
-
-Name: libusb
-Description: USB access library (FreeBSD version)
-Version: 1.0.1
-Libs: -L${libdir} -lusb
-Cflags: -I${includedir}
-

diff --git a/sys-freebsd/freebsd-lib/files/libusb.pc.in b/sys-freebsd/freebsd-lib/files/libusb.pc.in
deleted file mode 100644
index f63c6e3..0000000
--- a/sys-freebsd/freebsd-lib/files/libusb.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=@LIBDIR@
-includedir=${prefix}/include
-
-Name: libusb
-Description: USB access library (FreeBSD version)
-Version: 0.1.12
-Libs: -L${libdir} -lusb
-Cflags: -I${includedir}
-

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.0.9999-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.1.0.9999-r1.ebuild
deleted file mode 100644
index 2697cb8..0000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.0.9999-r1.ebuild
+++ /dev/null
@@ -1,632 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-# 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
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${LIB}.tar.xz
-			mirror://gentoo/${CONTRIB}.tar.xz
-			mirror://gentoo/${CRYPTO}.tar.xz
-			mirror://gentoo/${LIBEXEC}.tar.xz
-			mirror://gentoo/${ETC}.tar.xz
-			mirror://gentoo/${INCLUDE}.tar.xz
-			mirror://gentoo/${USBIN}.tar.xz
-			mirror://gentoo/${GNU}.tar.xz
-			mirror://gentoo/${SECURE}.tar.xz
-			build? ( mirror://gentoo/${SYS}.tar.xz )
-			zfs? ( mirror://gentoo/${CDDL}.tar.xz )"
-fi
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( app-crypt/heimdal )
-		usb? ( !dev-libs/libusb )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		=sys-freebsd/freebsd-libexec-${RV}*
-		!sys-libs/libutempter
-		!dev-libs/libelf
-		!dev-libs/libexecinfo
-		!dev-libs/libiconv
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*"
-	RDEPEND="${RDEPEND}
-		=sys-freebsd/freebsd-share-${RV}*
-		>=virtual/libiconv-0-r2"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.xz"
-fi
-
-DEPEND="${DEPEND}
-		userland_GNU? ( sys-apps/mtree )
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD"
-
-QA_DT_NEEDED="lib/libc.so.7 lib32/libc.so.7"
-
-pkg_setup() {
-	[ -c /dev/zero ] || \
-		die "You forgot to mount /dev; the compiled libc would break."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-10.0-liblink.patch"
-	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
-	"${FILESDIR}/${PN}-10.0-libusb.patch"
-	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
-	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
-	"${FILESDIR}/${PN}-add-nossp-cflags.patch"
-	"${FILESDIR}/${PN}-10.1-cve-2014-8611.patch"
-	)
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from
-# boot0 instead.
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap libwrap libmagic \
-	libcom_err
-	libedit
-	libstand
-	libgssapi"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		if [[ ! -e "${WORKDIR}/sys" ]]; then
-			ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-		fi
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	cd "${S}"
-	if use userland_GNU; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-	fi
-}
-
-bootstrap_lib() {
-	for i ; do
-		cd "${WORKDIR}/${i}" || die "missing ${i}"
-		freebsd_src_compile
-		append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
-	done
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	bootstrap_lib "${csudir}"
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-
-	bootstrap_lib "gnu/lib/csu"
-
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	for i in *.So ; do
-		ln -s $i ${i%.So}S.o
-	done
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
-	export LDADD="-lssp_nonshared"
-}
-
-bootstrap_libgcc() {
-	bootstrap_lib "lib/libcompiler_rt"
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
-	ln -s libcompiler_rt.a libgcc.a || die
-
-	bootstrap_lib "lib/libc" "gnu/lib/libgcc"
-}
-
-bootstrap_libthr() {
-	bootstrap_lib "lib/libthr"
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
-	ln -s libthr.so libpthread.so
-}
-
-# What to build for a cross-compiler.
-# We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared"
-
-# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	multilib_is_native_abi
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${CROSS_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	else
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-		CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-	is_crosscompile && bootstrap_lib "lib/libc"
-	is_crosscompile || is_native_abi || bootstrap_libgcc
-	is_native_abi   || bootstrap_libthr
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	# Bootstrap if needed, otherwise assume the system headers are in
-	# /usr/include.
-	if need_bootstrap ; then
-		do_bootstrap
-	else
-		CFLAGS="${CFLAGS} -isystem /usr/include"
-		CXXFLAGS="${CXXFLAGS} -isystem /usr/include"
-	fi
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if use userland_BSD ; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${D}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	# iconv symbol provided by libc_nonshared.a.
-	# http://svnweb.freebsd.org/base?view=revision&amp;revision=258283
-	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-header_list=""
-
-move_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ ! -d "${dirname}/${ABI}" ] ; then
-		mkdir "${dirname}/${ABI}" || die
-	fi
-
-	mv "${1}" "${dirname}/${ABI}/" || die
-
-	export header_list="${header_list} ${1}"
-}
-
-make_header_template() {
-	cat <<-END_HEADER
-/*
- * Wrapped header for multilib support.
- * See the real headers included below.
- */
-
-#if defined(__x86_64__)
-  @ABI_amd64_fbsd@
-#elif defined(__i386__)
-  @ABI_x86_fbsd@
-#else
-  @ABI_${DEFAULT_ABI}@
-#endif
-END_HEADER
-}
-
-wrap_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ -n "${dirname#.}" ] ; then
-		dirname="${dirname}/${2}"
-	else
-		dirname="${2}"
-	fi
-
-	if [ -f "${dirname}/${filename}" ] ; then
-		sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
-	else
-		cat ${1}
-	fi
-}
-
-wrap_header_end() {
-	sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
-}
-
-do_install() {
-	if is_crosscompile ; then
-		INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	else
-		INCLUDEDIR="/usr/include"
-	fi
-
-	dodir ${INCLUDEDIR}
-	CTARGET="${CHOST}" \
-		install_includes ${INCLUDEDIR}
-
-	is_crosscompile && use crosscompile_opts_headers-only && return 0
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc
-	fi
-
-	for i in $(get_subdirs) ; do
-		if [[ ${i} != *libiconv_modules* ]] ; then
-			einfo "Installing in ${i}..."
-			cd "${WORKDIR}/${i}/" || die "missing ${i}."
-			freebsd_src_install || die "Install ${i} failed"
-		fi
-	done
-
-	if ! is_crosscompile; then
-		local mymakeopts_save="${mymakeopts}"
-		mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n"
-
-		einfo "Installing in lib/libiconv_modules..."
-		cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules."
-		freebsd_src_install || die "Install lib/libiconv_modules failed"
-
-		mymakeopts="${mymakeopts_save}"
-	fi
-
-	if ! is_crosscompile ; then
-		if ! multilib_is_native_abi ; then
-			gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		else
-			dodir "$(get_libdir)"
-			gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		fi
-	else
-		CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
-		# We're done for the cross libc here.
-		return 0
-	fi
-
-	# Generate ldscripts for core libraries that will go in /
-	multilib_is_native_abi && \
-		gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-			kvm m md procstat sbuf thr ufs util elf
-
-	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
-		cd "${D}/usr/include"
-		for i in machine/*.h fenv.h ; do
-			move_header ${i}
-		done
-		if multilib_is_native_abi ; then
-			# Supposedly the last one!
-			local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
-			for j in ${uniq_headers} ; do
-				make_header_template > ${j}
-				for i in $(get_all_abis) ; do
-					wrap_header ${j} ${i} > ${j}.new
-					cp ${j}.new ${j}
-					rm -f ${j}.new
-				done
-				wrap_header_end ${j} > ${j}.new
-				cp ${j}.new ${j}
-				rm -f ${j}.new
-			done
-		fi
-	fi
-}
-
-src_install() {
-	if is_crosscompile ; then
-		einfo "Installing for ${CTARGET} in ${CHOST}.."
-		# From this point we need to force: get stripped with the correct tools,
-		# get tc-arch-kernel to return the right value, etc.
-		export CHOST=${CTARGET}
-
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-
-		return 0
-	else
-		export STRIP_MASK="*/usr/lib*/*crt*.o"
-		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" \
-		WITHOUT_GSSAPI= || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}

diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
deleted file mode 100644
index daee594..0000000
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX bootpd.confd 183 SHA256 c70c6a7a99470354a5f61bfe5c0f71325f4896e41da150e782223a30f07a275c SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f WHIRLPOOL c6721ac9b3ba70268fdba8c81ad9225e26049a5eb5ef8ea9bccc5fbbe7a110defe15df1d27b1c4b54f92e19d7d8b2099f87e7972faa0e5ddf17b66d30e26e0ad
-AUX bootpd.initd 553 SHA256 1fdc8470fda0acca9213c11e1e380110d36e992754709f754bec6ab04b77e7fa SHA512 a7522086d3c968485891fb658fee490f53582328dd07ee65f4b620b227f33f3bfb6637ad5758846eac7df11425f2e8ed681b70bc7f52bea2db0b4a29fca4b87d WHIRLPOOL a7725cfd975808759c91468f61b161701adaafbaab0e2675e9ebb33ed43b4840dfbe71cf4a203f3d9105cbaa02306258c6d12984c51a4e3e4866704b8b2d58a1
-AUX freebsd-libexec-10.0-atf-check.patch 628 SHA256 3733068f0253cd7b3c311390927e77d3d315d9ed42f07d1e82c549d8a4a2457e SHA512 fb21ad139f0ebabf94856dde84c9694e70da21f2e02286a1f35101ae80b19739f536525f3cf1ef17f8b09d7ada093785b3f86b0dd72cd59b12460605b5f48868 WHIRLPOOL 3c01985ffda2a75188290fe5ac805564561af6dde51c67b2d0003f11e597f8432238d1bb7a9c62fef02a45250c8bcd4b196245eb2b98d40bc774388efeda8420
-AUX freebsd-libexec-9.2-no_ld32.patch 634 SHA256 ee5568c2ffbff4cf73c87401e5eb93165e813a2ff252d953a95fc4294dd2ace8 SHA512 df5421ad4d07d9f3d5f8dfd110eca588848ff55a63c70adf76f90746c1156ac50004a79bb626783ada8f96060fdd37e153e64da6ed43148c02a8eae4493c18d8 WHIRLPOOL d11ddc097a8ff171d143c655c1f2c9dd4ee3ff5e7bd6693bbd7c5d065e72c4d9e2c5a3521b9701ea0a3c7f5234fb174675373e68fb65cbb41c95133db6eb53f5
-AUX rquotad.xinetd 162 SHA256 3f73f86e5a6ab3b6d25698f6179cdbe169b2fd01c682b45a9c8711f36bb317e5 SHA512 2cf16514f18abe2aeaa273fabc2dc94b09f31d02001ece5c82d9336c02d921e03dff6f82a613a4bffe57b5e415add2b82ef883a306907dd20ffe1bbe332b011f WHIRLPOOL 237667cbff4807d703a3c4c4eb8c2c5863d024a6263e3addf8d96ffa1461a8d1cda6318deee1de72146d27305b670b501da9ad4035880551dee5138b6798f6c6
-AUX rstatd.xinetd 218 SHA256 7bf526babdd46f03a6ea9ed12b5df16e5c2abc8aeb567214c8edb8ac327d4381 SHA512 febca8ab8248b1c103dd7be0806e3d678c5b5cf165a7b3bd0305bc905da228bf92392d65d44a765b7692f772befeedcbc3df205d32bb62ad5aa307f71a1c1011 WHIRLPOOL 76f8b1f3f85e97f27950549f62dc411e0620b25eba68c161c96a5252617c7c4beb0fecf94af9bc9cf931dff8fc4c750e780c41143a50b39d7538a30b7c0bd322
-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
-EBUILD freebsd-libexec-10.1.0.9999.ebuild 3198 SHA256 b9833d0d661363258bbd3ba68bef66bfe5e0b120140ace4ef2f6b59b8754f66f SHA512 15d631126cb462cc63b456da4963952829fb9ed5f7b97492a162f831ef4b493c798573f0a900c64a631efabeb3ec825c35ab6e258f033c6ecfaac74b8210ce1f WHIRLPOOL 348beffbd76065a94e440629bfd12eef8610bc6a7e15bfa4b779acac0bf443825b8ba3a95a90dcb29b81956098f5ab166c1f73eb3c93e1f7ff06e677325593f6

diff --git a/sys-freebsd/freebsd-libexec/files/bootpd.confd b/sys-freebsd/freebsd-libexec/files/bootpd.confd
deleted file mode 100644
index 6d238e4..0000000
--- a/sys-freebsd/freebsd-libexec/files/bootpd.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration file for /etc/init.d/bootpd
-
-# Name of the configuration file for bootpd
-# bootptab_file="/etc/bootptab"
-
-# Options to pass to bootpd. See bootpd(8).
-# bootpd_opts=""

diff --git a/sys-freebsd/freebsd-libexec/files/bootpd.initd b/sys-freebsd/freebsd-libexec/files/bootpd.initd
deleted file mode 100644
index e82563f..0000000
--- a/sys-freebsd/freebsd-libexec/files/bootpd.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	 need net
-}
-
-start() {
-	local bootptab=${bootptab_file:-/etc/bootptab}
-
-	if ! [ -f "${bootptab}" ]; then
-		eerror "Unable to find the bootptab file: ${bootptab}"
-		eend 1
-		return 1
-	fi
-
-	ebegin "Starting BOOTP server"
-	start-stop-daemon --start --exec /usr/libexec/bootpd -- ${bootpd_opts} ${bootptab}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping BOOTP server"
-	start-stop-daemon --stop --exec /usr/libexec/bootpd
-	eend $?
-}

diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.0-atf-check.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.0-atf-check.patch
deleted file mode 100644
index c7bb686..0000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.0-atf-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc
-index a28f546..9f55937 100644
---- a/libexec/atf/Makefile.inc
-+++ b/libexec/atf/Makefile.inc
-@@ -27,6 +27,6 @@
- 
- ATF = ${.CURDIR}/../../../contrib/atf
- 
--CFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-DHAVE_CONFIG_H
- 
- WARNS?=		3
-diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
-index fafb1e4..3710403 100644
---- a/libexec/atf/atf-check/Makefile
-+++ b/libexec/atf/atf-check/Makefile
-@@ -34,7 +34,7 @@ PROG_CXX=	atf-check
- SRCS=		atf-check.cpp
- MAN=		atf-check.1
- 
--CFLAGS+=	-I${ATF}
-+CXXFLAGS+=	-I${ATF}
- 
- DPADD+=		${LIBATF_CXX} ${LIBATF_C}
- 

diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch
deleted file mode 100644
index d330009..0000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*.
-We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue
-about LD_32_* and thus fail to run from the build directory.
-
-diff -uNr libexec.old/rtld-elf/rtld.h libexec/rtld-elf/rtld.h
---- libexec.old/rtld-elf/rtld.h	2013-08-24 12:30:26.000000000 -0400
-+++ libexec/rtld-elf/rtld.h	2013-08-26 17:10:19.000000000 -0400
-@@ -47,7 +47,6 @@
- #define	_PATH_ELF_HINTS		"/var/run/ld-elf32.so.hints"
- /* For running 32 bit binaries  */
- #define	STANDARD_LIBRARY_PATH	"/lib32:/usr/lib32"
--#define LD_ "LD_32_"
- #endif
- 
- #ifndef STANDARD_LIBRARY_PATH

diff --git a/sys-freebsd/freebsd-libexec/files/rquotad.xinetd b/sys-freebsd/freebsd-libexec/files/rquotad.xinetd
deleted file mode 100644
index 876cd16..0000000
--- a/sys-freebsd/freebsd-libexec/files/rquotad.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service rquotad
-{
-	type = rpc
-	socket_type = dgram
-	protocol = udp
-	wait = yes
-	user = root
-	server = /usr/libexec/rpc.rquotad
-	rpc_version = 1
-	disabled = yes
-}

diff --git a/sys-freebsd/freebsd-libexec/files/rstatd.xinetd b/sys-freebsd/freebsd-libexec/files/rstatd.xinetd
deleted file mode 100644
index ba1b819..0000000
--- a/sys-freebsd/freebsd-libexec/files/rstatd.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service rstatd
-{
-        type = rpc
-        socket_type = dgram
-        protocol = udp
-        wait = yes
-        user = root
-        server = /usr/libexec/rpc.rstatd
-        rpc_version = 1-3
-        disabled = yes
-}

diff --git a/sys-freebsd/freebsd-libexec/files/rusersd.xinetd b/sys-freebsd/freebsd-libexec/files/rusersd.xinetd
deleted file mode 100644
index 5cbe091..0000000
--- a/sys-freebsd/freebsd-libexec/files/rusersd.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service rusersd
-{
-        type = rpc
-        socket_type = dgram
-        protocol = udp
-        wait = yes
-        user = root
-        server = /usr/libexec/rpc.rusersd
-        rpc_version = 1-2
-        disabled = yes
-}

diff --git a/sys-freebsd/freebsd-libexec/files/sprayd.xinetd b/sys-freebsd/freebsd-libexec/files/sprayd.xinetd
deleted file mode 100644
index 7be5577..0000000
--- a/sys-freebsd/freebsd-libexec/files/sprayd.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service sprayd
-{
-        type = rpc
-        socket_type = dgram
-        protocol = udp
-        wait = yes
-        user = root
-        server = /usr/libexec/rpc.sprayd
-        rpc_version = 1
-        disabled = yes
-}

diff --git a/sys-freebsd/freebsd-libexec/files/walld.xinetd b/sys-freebsd/freebsd-libexec/files/walld.xinetd
deleted file mode 100644
index 800b84f..0000000
--- a/sys-freebsd/freebsd-libexec/files/walld.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service walld
-{
-        type = rpc
-        socket_type = dgram
-        protocol = udp
-        wait = yes
-        user = root
-        server = /usr/libexec/rpc.rwalld
-        rpc_version = 1
-        disabled = yes
-}

diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.0.9999.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.0.9999.ebuild
deleted file mode 100644
index 5a2d7bc..0000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${LIBEXEC}.tar.xz
-		mirror://gentoo/${UBIN}.tar.xz
-		mirror://gentoo/${BIN}.tar.xz
-		mirror://gentoo/${CONTRIB}.tar.xz
-		mirror://gentoo/${LIB}.tar.xz
-		mirror://gentoo/${ETC}.tar.xz
-		mirror://gentoo/${USBIN}.tar.xz"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch"
-	"${FILESDIR}/${PN}-10.0-atf-check.patch" )
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-	# allow upgrade directly from 9.x to 10.1.
-	if has_version "<sys-freebsd/freebsd-lib-10.0"; then
-		# taken from sys/sys/elf_common.h
-		echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h
-		echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h
-		echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h
-		echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h
-		echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/fcntl.h
-		echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/cdefs.h
-		echo '#define __compiler_membar()  __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h
-	fi
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/libexec/rtld-elf" || die
-		export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
-	else
-		cd "${S}"
-	fi
-	"$@"
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
deleted file mode 100644
index dd4368c..0000000
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX freebsd-mk-defs-10.0-gentoo.patch 12183 SHA256 7e859440386e4b7047507a279fa6e5b0737918f65a04f8c75cc8470a20511d39 SHA512 3d257b59873281afbaeaead56abe944cb82cd42fe3b403795009efe452ae9e85f50da845f261e576b39c5110f422dc8929b30451905f7a797541a83983c8a39b WHIRLPOOL 67adf7e146743b0c372197df595ccdfa0725879213dab05656ce033a5189e3d71a7f64462baf4ff4761de572ca61473cadeacf63c76e67aa80543d0916b94a93
-AUX freebsd-mk-defs-10.0-gnu.patch 2290 SHA256 c393eacd7abc98e74d9c6d222a1edb9fd8fb3ef300dd88ae1805962d40bbfb9d SHA512 06bee5f219f7650041a48558ba3447125179ba501a8e5cf767533cd8fb972ef73eb68bbe8099b429326a5ca9ece4afa54d97fabf915b21d46d0574aeaa1e1e18 WHIRLPOOL f594d656a27a4ffe2b3613d74b7997bd91f01e3a254932217654720fe35bb1dcebb425685837c939a1fdd1d0f36d074d011ca99811c36e59654307421dd2b152
-AUX freebsd-mk-defs-9.0-gentoo.patch 11525 SHA256 da5204dc5f421d918fab06c6a5796282dff28e8b48d728905eaba343dd1d9232 SHA512 c5ff71797f771c334560364270d9e01fa35c1368e713057c559d86b05992d2ca3a19bc65beec240cae2f5ca07391e32c127211a3b577bc9e573104843c34942e WHIRLPOOL a22613d188c27d28de8ebbea9440d4a6333a4c19fa1bcdf6061cc468e150556f5cbe472dc3f6c3f29947827817ba6dd5af933a8a117793293118bcc9bb0f5362
-AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e SHA512 536745ae047ce1dd5ffacf46401e16218e7245efaef0d69b2a38dd907eddcef2089798dbe653d614aa34d71472a890e467a5c8fad79c1762d24a5a87a01d8cc8 WHIRLPOOL a617d4f956cbb6accc7f56dc28e341e233e1d3e24ed7526be5f89d59b555a0ebe18d9a74cc82ba1c65b1ec32cf8cee4675103ee49771dbd7754d6ea9dfdb6e7e
-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-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
-AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362
-AUX freebsd-mk-defs-9.3-gentoo.patch 12275 SHA256 e77676e5604a77d10cb3f245de9e5d12acd37064f9d1220a7bc9b562de8068a6 SHA512 db184d82508f386c7176f68431009c89d97fe1d11a5fcb29579341162b85f1e14d4b8fcbe9b4e2c6bd4b097b4b8c68fb8282b27d56f053cf94eaf43e28b31301 WHIRLPOOL fc1bb6d56b93490a00b9c05273920d8051a3c89ec329efecc2483c8cc60d7fddc907b24bcd82a829e159e3f83a1ff85fc8cf2b7cd1e014f68f1fcf98809cbae0
-AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1
-EBUILD freebsd-mk-defs-10.1.0.9999.ebuild 822 SHA256 d07246a139936e75d6c3d582acbdf69d3f529ec8ce038ff5f07a395e6b9c3334 SHA512 a339f41281ee5896e24b736e75c628d438dcd09dc162caa547c58846a8cbf4fad9b18514fa5683d2db3ac68159ae8018945c0753ee966fbd6334fcdd22d66c7c WHIRLPOOL aa5e407e4169e9b3c67d538a4787a16163cbf5032fb06d2e60e766166f431710fc9c0e03028e5b9b749f0e3bf98899059a627d5ab779b5c1f3a9c2312afa03a1

diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch
deleted file mode 100644
index 2b99754..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-tested revision 255489
-
-diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
-index 2d648de..e456a4b 100644
---- a/share/mk/bsd.compiler.mk
-+++ b/share/mk/bsd.compiler.mk
-@@ -1,7 +1,7 @@
- # $FreeBSD$
- 
- .if !defined(COMPILER_TYPE)
--. if ${CC:T:Mgcc*}
-+. if ${CC:T:M*gcc*}
- COMPILER_TYPE:=	gcc  
- . elif ${CC:T:Mclang}
- COMPILER_TYPE:=	clang
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
-index 49b2d9b..c2a8c5c 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:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .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 240f958..67f0cf9 100644
---- a/share/mk/bsd.files.mk
-+++ b/share/mk/bsd.files.mk
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles: _${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} \
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
- installfiles: _${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 74c378b..7d2c7a0 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 c54b435..d283240 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 bb3db64..dbb9bf4 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -39,8 +39,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) && \
-@@ -302,14 +300,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}
-@@ -363,10 +364,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 00d38ff..86792f4 100644
---- a/share/mk/bsd.libnames.mk
-+++ b/share/mk/bsd.libnames.mk
-@@ -53,7 +53,7 @@ LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBEXECINFO?=	${DESTDIR}${LIBDIR}/libexecinfo.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.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
-@@ -88,7 +88,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 1e4d57e..fcb81fe 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 6445ba3..fabffa2 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 48093eb..69f56bc 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 8f7f0b9..189ccec 100644
---- a/share/mk/bsd.own.mk
-+++ b/share/mk/bsd.own.mk
-@@ -202,9 +202,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 22ddfb5..f6a4939 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -44,10 +44,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
-@@ -201,6 +197,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"
-@@ -234,6 +231,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 72dfa61..4f21af4 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
-@@ -99,10 +95,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 eb9f2ca..09ad4cf 100644
---- a/share/mk/sys.mk
-+++ b/share/mk/sys.mk
-@@ -321,12 +321,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/files/freebsd-mk-defs-10.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch
deleted file mode 100644
index acce807..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 0a33fdb..cd7ca2f 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -165,11 +165,7 @@ _LIBS=		lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -182,11 +178,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
- lib${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -213,15 +205,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
- .if defined(SHLIB_LINK)
- 	@${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
--	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
--	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .if ${MK_CTF} != "no"
- 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
- .endif
-@@ -279,13 +265,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index 02024e0..0f9010d 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -180,13 +180,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}

diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
deleted file mode 100644
index f5e6568..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-diff -ur share/mk.old/bsd.doc.mk share/mk/bsd.doc.mk
---- share/mk.old/bsd.doc.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.doc.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -135,10 +135,12 @@
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-diff -ur share/mk.old/bsd.files.mk share/mk/bsd.files.mk
---- share/mk.old/bsd.files.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.files.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -39,6 +39,7 @@
- .endif
- installfiles: _${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} \
-@@ -51,10 +52,12 @@
- installfiles: _${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 -ur share/mk.old/bsd.incs.mk share/mk/bsd.incs.mk
---- share/mk.old/bsd.incs.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.incs.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -41,7 +41,10 @@
- .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} \
- 	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -53,10 +56,14 @@
- 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
- .endif
-diff -ur share/mk.old/bsd.info.mk share/mk/bsd.info.mk
---- share/mk.old/bsd.info.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.info.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -83,6 +83,7 @@
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -144,15 +145,17 @@
- 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 -ur share/mk.old/bsd.lib.mk share/mk/bsd.lib.mk
---- share/mk.old/bsd.lib.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.lib.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -46,10 +46,6 @@
- .endif
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .include <bsd.libnames.mk>
- 
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -270,14 +266,17 @@
- .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}
-@@ -295,10 +294,12 @@
- .endif
- .endif
- .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 -ur share/mk.old/bsd.libnames.mk share/mk/bsd.libnames.mk
---- share/mk.old/bsd.libnames.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.libnames.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -46,7 +46,7 @@
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -77,7 +77,7 @@
- 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
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-diff -ur share/mk.old/bsd.links.mk share/mk/bsd.links.mk
---- share/mk.old/bsd.links.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.links.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -15,6 +15,8 @@
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		ln -f $$l $$t; \
- 	done; true
- .endif
-@@ -26,6 +28,8 @@
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		ln -fs $$l $$t; \
- 	done; true
- .endif
-diff -ur share/mk.old/bsd.man.mk share/mk/bsd.man.mk
---- share/mk.old/bsd.man.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.man.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -165,9 +165,11 @@
- .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 @@
- 		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 @@
- .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 -ur share/mk.old/bsd.nls.mk share/mk/bsd.nls.mk
---- share/mk.old/bsd.nls.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.nls.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -62,7 +62,8 @@
- # 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 -ur share/mk.old/bsd.own.mk share/mk/bsd.own.mk
---- share/mk.old/bsd.own.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.own.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -182,9 +182,6 @@
- INCLUDEDIR?=	/usr/include
- 
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-diff -ur share/mk.old/bsd.prog.mk share/mk/bsd.prog.mk
---- share/mk.old/bsd.prog.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.prog.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -33,10 +33,6 @@
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -155,6 +151,7 @@
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- .if defined(PROGNAME)
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-@@ -186,6 +183,7 @@
- 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 -ur share/mk.old/bsd.sys.mk share/mk/bsd.sys.mk
---- share/mk.old/bsd.sys.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.sys.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -28,9 +28,6 @@
- . if defined(WARNS)
- .  if ${WARNS} >= 1
- CWARNFLAGS	+=	-Wsystem-headers
--.   if !defined(NO_WERROR)
--CWARNFLAGS	+=	-Werror
--.   endif
- .  endif
- .  if ${WARNS} >= 2
- CWARNFLAGS	+=	-Wall -Wno-format-y2k
-@@ -66,9 +63,6 @@
- .  if ${WFORMAT} > 0
- #CWARNFLAGS	+=	-Wformat-nonliteral -Wformat-security -Wno-format-extra-args
- CWARNFLAGS	+=	-Wformat=2 -Wno-format-extra-args
--.   if !defined(NO_WERROR)
--CWARNFLAGS	+=	-Werror
--.   endif
- .  endif
- . endif
- . if defined(NO_WFORMAT)
-diff -ur share/mk.old/sys.mk share/mk/sys.mk
---- share/mk.old/sys.mk	2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/sys.mk	2011-11-06 15:45:08.000000000 +0000
-@@ -349,12 +349,6 @@
- 		(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- 		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
- 
--# 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/files/freebsd-mk-defs-9.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
deleted file mode 100644
index bd7d7e6..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: work/share/mk/bsd.lib.mk
-===================================================================
---- work.orig/share/mk/bsd.lib.mk
-+++ work/share/mk/bsd.lib.mk
-@@ -146,11 +146,7 @@ _LIBS=		lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -163,11 +159,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=
- lib${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -189,15 +181,9 @@ ${SHLIB_NAME}: ${SOBJS}
- .if defined(SHLIB_LINK)
- 	@ln -fs ${.TARGET} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
--	@${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
--	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- 	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
- 		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
- 		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
-@@ -245,13 +231,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
-Index: work/share/mk/bsd.prog.mk
-===================================================================
---- work.orig/share/mk/bsd.prog.mk
-+++ work/share/mk/bsd.prog.mk
-@@ -134,13 +134,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}

diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
deleted file mode 100644
index 598d0b9..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
---- share.orig/mk/bsd.doc.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.doc.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -135,10 +135,12 @@
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
---- share.orig/mk/bsd.files.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.files.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -39,6 +39,7 @@
- .endif
- installfiles: _${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} \
-@@ -51,10 +52,12 @@
- installfiles: _${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 -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
---- share.orig/mk/bsd.incs.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.incs.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -41,6 +41,9 @@
- .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 @@
- 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 -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
---- share.orig/mk/bsd.info.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.info.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -83,6 +83,7 @@
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -144,15 +145,17 @@
- 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 -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
---- share.orig/mk/bsd.lib.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.lib.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -46,10 +46,6 @@
- .endif
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .include <bsd.libnames.mk>
- 
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -284,14 +280,17 @@
- .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}
-@@ -329,10 +328,12 @@
- .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 -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
---- share.orig/mk/bsd.libnames.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.libnames.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -48,7 +48,7 @@
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -79,7 +79,7 @@
- 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
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk
---- share.orig/mk/bsd.links.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.links.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -15,6 +15,8 @@
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		ln -f $$l $$t; \
- 	done; true
- .endif
-@@ -26,6 +28,8 @@
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		ln -fs $$l $$t; \
- 	done; true
- .endif
-diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
---- share.orig/mk/bsd.man.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.man.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -165,9 +165,11 @@
- .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 @@
- 		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 @@
- .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 -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
---- share.orig/mk/bsd.nls.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.nls.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -62,7 +62,8 @@
- # 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 -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
---- share.orig/mk/bsd.own.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.own.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -182,9 +182,6 @@
- INCLUDEDIR?=	/usr/include
- 
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
---- share.orig/mk/bsd.prog.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.prog.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -33,10 +33,6 @@
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -155,6 +151,7 @@
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- .if defined(PROGNAME)
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-@@ -186,6 +183,7 @@
- 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 -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
---- share.orig/mk/bsd.sys.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.sys.mk	2012-07-16 00:04:14.000000000 +0900
-@@ -28,10 +28,6 @@
- .if defined(WARNS)
- .if ${WARNS} >= 1
- CWARNFLAGS+=	-Wsystem-headers
--.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
--    ${CC:T:Mclang} != "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
-@@ -95,10 +91,6 @@
- CWARNFLAGS+=	-Wno-format-nonliteral
- .endif # WARNS <= 3
- .endif # CLANG
--.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
--    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WFORMAT > 0
- .endif # WFORMAT
- .if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \
-diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
---- share.orig/mk/sys.mk	2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/sys.mk	2012-07-16 00:01:55.000000000 +0900
-@@ -349,12 +349,6 @@
- 		(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- 		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
- 
--# 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/files/freebsd-mk-defs-9.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
deleted file mode 100644
index f986ed9..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
---- share.orig/mk/bsd.lib.mk	2012-07-16 02:40:07.000000000 +0900
-+++ share/mk/bsd.lib.mk	2012-07-16 02:41:40.000000000 +0900
-@@ -155,11 +155,7 @@
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -172,11 +168,7 @@
- lib${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -203,15 +195,9 @@
- .if defined(SHLIB_LINK)
- 	@ln -fs ${.TARGET} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
--	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
--	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- 	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
- 		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
- 		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
-@@ -259,13 +245,6 @@
- 
- .if !target(install)
- 
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
-diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
---- share.orig/mk/bsd.prog.mk	2012-07-16 02:40:07.000000000 +0900
-+++ share/mk/bsd.prog.mk	2012-07-16 02:40:24.000000000 +0900
-@@ -134,13 +134,6 @@
- 
- .if !target(install)
- 
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}

diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gentoo.patch
deleted file mode 100644
index ce66bc8..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gentoo.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-tested revision 251934.
-
-diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
-index d9f0ccf..9cf6b4f 100644
---- a/share/mk/bsd.compiler.mk
-+++ b/share/mk/bsd.compiler.mk
-@@ -1,7 +1,7 @@
- # $FreeBSD$
- 
- .if !defined(COMPILER_TYPE)
--. if ${CC:T:Mgcc*}
-+. if ${CC:T:M*gcc*}
- COMPILER_TYPE:=	gcc  
- . elif ${CC:T:Mclang}
- COMPILER_TYPE:=	clang
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
-index 49b2d9b..c2a8c5c 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:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .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 240f958..67f0cf9 100644
---- a/share/mk/bsd.files.mk
-+++ b/share/mk/bsd.files.mk
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles: _${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} \
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
- installfiles: _${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 74c378b..7d2c7a0 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 c54b435..d283240 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 05a949f..215d198 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
- CTFFLAGS+= -g
- .endif
--.else
--STRIP?=	-s
- .endif
- 
- .include <bsd.libnames.mk>
-@@ -256,14 +254,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}
-@@ -306,10 +307,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 a3dbf3b..2cf726c 100644
---- a/share/mk/bsd.libnames.mk
-+++ b/share/mk/bsd.libnames.mk
-@@ -50,7 +50,7 @@ LIBDWARF?=	${DESTDIR}${LIBDIR}/libdwarf.a
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.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
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
-index 1e4d57e..fcb81fe 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 6445ba3..fabffa2 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 48093eb..69f56bc 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 b871f91..bbcd667 100644
---- a/share/mk/bsd.own.mk
-+++ b/share/mk/bsd.own.mk
-@@ -191,9 +191,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 0cf2f6d..50d5e54 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -28,10 +28,6 @@ CTFFLAGS+= -g
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -152,6 +148,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}
- .endif
-@@ -178,6 +175,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 21c3352..5bfaa8e 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
-@@ -95,10 +91,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 e8ec4c1..e98501e 100644
---- a/share/mk/sys.mk
-+++ b/share/mk/sys.mk
-@@ -305,12 +305,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/files/freebsd-mk-defs-9.2-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gnu.patch
deleted file mode 100644
index 1b2a207..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.2-gnu.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 131b90e..60c7207 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -153,11 +153,7 @@ _LIBS=		lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -170,11 +166,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
- lib${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--.if !defined(NM)
--	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
--	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- 	${RANLIB} ${.TARGET}
- .endif
- 
-@@ -201,15 +193,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
- .if defined(SHLIB_LINK)
- 	@${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
--	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
--	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .if ${MK_CTF} != "no"
- 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
- .endif
-@@ -267,13 +253,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index 3c8fe5e..7916787 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -176,13 +176,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}

diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.3-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.3-gentoo.patch
deleted file mode 100644
index ba4b5cf..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.3-gentoo.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-tested revision 266298.
-
-diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
-index 0b2e46b..4854519 100644
---- a/share/mk/bsd.compiler.mk
-+++ b/share/mk/bsd.compiler.mk
-@@ -1,7 +1,7 @@
- # $FreeBSD: stable/9/share/mk/bsd.compiler.mk 253220 2013-07-11 20:09:46Z dim $
- 
- .if !defined(COMPILER_TYPE)
--. if ${CC:T:Mgcc*}
-+. if ${CC:T:M*gcc*}
- COMPILER_TYPE:=	gcc  
- . elif ${CC:T:Mclang}
- COMPILER_TYPE:=	clang
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
-index ccc6aaa..579eb76 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:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .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 cf77893..85d1c78 100644
---- a/share/mk/bsd.files.mk
-+++ b/share/mk/bsd.files.mk
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles: _${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} \
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
- installfiles: _${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 51200a6..efa04cc 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 285a778..c09a8dd 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 c6ff20a..7c2a816 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -39,8 +39,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) && \
-@@ -302,14 +300,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}
-@@ -363,10 +364,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 fce7e2a..4ee6f81 100644
---- a/share/mk/bsd.libnames.mk
-+++ b/share/mk/bsd.libnames.mk
-@@ -50,7 +50,7 @@ LIBDWARF?=	${DESTDIR}${LIBDIR}/libdwarf.a
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.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
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
-index 1e848c5..035f5aa 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 d76fb48..a93c3b8 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 2d18ad4..1f06753 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 11a63cf..37ff0f2 100644
---- a/share/mk/bsd.own.mk
-+++ b/share/mk/bsd.own.mk
-@@ -202,9 +202,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 34937f8..d2ae145 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -44,10 +44,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
-@@ -201,6 +197,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"
-@@ -234,6 +231,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 519143c..358371d 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
-@@ -95,10 +91,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 3d61918..5b841ff 100644
---- a/share/mk/sys.mk
-+++ b/share/mk/sys.mk
-@@ -311,12 +311,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/files/freebsd-mk-defs-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
deleted file mode 100644
index 8eb80c3..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=511698
-
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index e438633..de4a05b 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
- CFLAGS+=	 -Qunused-arguments
- .endif # CLANG
- 
--.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
--    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
-+.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \
-+    && ${MACHINE_CPUARCH} != "mips"
-+.if ${MK_SSP} != "no"
- # Don't use -Wstack-protector as it breaks world with -Werror.
- SSP_CFLAGS?=	-fstack-protector
-+.else
-+# gcc-4.9, -fstack-protector-strong is enabled by default.
-+# Add -fno-stack-protector to disable it. Gentoo Bug #511698.
-+SSP_CFLAGS=	-fno-stack-protector
-+.endif #SSP
- CFLAGS+=	${SSP_CFLAGS}
--.endif # SSP && !IA64 && !ARM && !MIPS
-+.endif # !IA64 && !ARM && !MIPS
- 
- # Allow user-specified additional warning flags
- CFLAGS+=	${CWARNFLAGS}

diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.0.9999.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.0.9999.ebuild
deleted file mode 100644
index 54a98c8..0000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-
-IUSE="userland_GNU"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${SHARE}.tar.xz"
-fi
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-10.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
-	use userland_GNU && epatch "${FILESDIR}/${PN}-10.0-gnu.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd
-	else
-		insinto /usr/share/mk
-	fi
-	doins *.mk *.awk
-}

diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
deleted file mode 100644
index f3052db..0000000
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX README.pamd 2965 SHA256 2d3cea2b59ddee2ca6639ca7d14068e1499acee4194181c255bdfea81964d5ac SHA512 e278fd0a5056ae8c1de2f6104bfb4766adc89c7c357a4b965cb08ee555a071b326462c937fd63cd8fc7bd7e2a880f939cecdf2997a3d2c33c1b962afee12d38e WHIRLPOOL 8ee79582595a2b79f3936863bd5fdb144930380a4073a74ec81967b3a11d61a40ca0becaf36dfa760c0c6110efa2041a4acd6041615e0d006f032e1d9c819aff
-AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7
-EBUILD freebsd-pam-modules-10.1.0.9999.ebuild 1123 SHA256 cafabb8a7349e9da4b38191fcb0564ec8f858e4e22f3036c664196c0f767b2b6 SHA512 f89569d4bd75c970d564405b2fe6474faea98cfc46d1d87e8ca46e7af1a5e3261db535cdc8d1854f90a4ad92647d428b321b609645b52d5b451a6c0ed605b243 WHIRLPOOL 0055549c4390770e1527337db1cf17bc577a8f2c418b7e7f73343dcb1e3e04a5de01e963d94ffde155bdf144b9acb193e64e20eda631e32195a926d60af4a86f

diff --git a/sys-freebsd/freebsd-pam-modules/files/README.pamd b/sys-freebsd/freebsd-pam-modules/files/README.pamd
deleted file mode 100644
index 64e716c..0000000
--- a/sys-freebsd/freebsd-pam-modules/files/README.pamd
+++ /dev/null
@@ -1,63 +0,0 @@
-/etc/pam.d
-
-This directory contains configuration files for the Pluggable
-Authentication Modules (PAM) library.
-
-Each file details the module chain for a single service, and must be
-named after that service.  If no configuration file is found for a
-particular service, the /etc/pam.d/other is used instead.  If that
-file does not exist, /etc/pam.conf is searched for entries matching
-the specified service or, failing that, the "other" service.
-
-See the pam(8) manual page for an explanation of the workings of the
-PAM library and descriptions of the various files and modules.  Below
-is a summary of the format for the pam.conf and /etc/pam.d/* files.
-
-Configuration lines take the following form:
-
-module-type	control-flag	module-path	arguments
-
-Comments are introduced with a hash mark ('#').  Blank lines and lines
-consisting entirely of comments are ignored.
-
-The meanings of the different fields are as follows:
-
- module-type:
-   auth:      prompt for a password to authenticate that the user is
-              who they say they are, and set any credentials.
-   account:   non-authentication based authorization, based on time,
-              resources, etc.
-   session:   housekeeping before and/or after login.
-   password:  update authentication tokens.
-
- control-flag: How libpam handles success or failure of the module.
-   required:   success is required; on failure all remaining
-               modules are run, but the request will be denied.
-   requisite:  success is required, and on failure no remaining
-               modules are run.
-   sufficient: success is sufficient, and if no previous required
-               module failed, no remaining modules are run.
-   binding:    success is sufficient; on failure all remaining
-               modules are run, but the request will be denied.
-   optional:   ignored unless the other modules return PAM_IGNORE.
-
- arguments: Module-specific options, plus some generic ones:
-   debug:           syslog debug info.
-   no_warn:         return no warning messages to the application.
-                    Remove this to feed back to the user the
-                    reason(s) they are being rejected.
-   use_first_pass:  try authentication using password from the
-                    preceding auth module.
-   try_first_pass:  first try authentication using password from
-                    the preceding auth module, and if that fails
-                    prompt for a new password.
-   use_mapped_pass: convert cleartext password to a crypto key.
-   expose_account:  allow printing more info about the user when
-                    prompting.
-
-Note that having a "sufficient" module as the last entry for a
-particular service and module type may result in surprising behaviour.
-To get the intended semantics, add a "required" entry listing the
-pam_deny module at the end of the chain.
-
-$Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/files/README.pamd,v 1.1 2009/01/22 21:03:18 the_paya Exp $

diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch
deleted file mode 100644
index aa08d40..0000000
--- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/libpam/modules/Makefile.inc.old	2011-11-02 20:46:56.000000000 +0000
-+++ lib/libpam/modules/Makefile.inc	2011-11-02 20:47:16.000000000 +0000
-@@ -5,18 +5,10 @@
- NO_INSTALLLIB=
- NO_PROFILE=
- 
--CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
-+CFLAGS+= -I${.CURDIR}/../../libpam
- 
--# This is nasty.
--# For the static case, libpam.a depends on the modules.
--# For the dynamic case, the modules depend on libpam.so.N
--.if defined(_NO_LIBPAM_SO_YET)
--NO_PIC=
--.else
- SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
--DPADD+=		${LIBPAM}
- LDADD+=		-lpam
--.endif
- 
- .c.o:
- 	${CC} ${CFLAGS} -DOPENPAM_STATIC_MODULES -c ${.IMPSRC}

diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.0.9999.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.0.9999.ebuild
deleted file mode 100644
index f60689b..0000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-
-IUSE="kerberos nis"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${LIB}.tar.xz"
-fi
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} WITHOUT_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-}
-
-src_prepare() {
-	for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc
-	done
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/README.pamd"
-}

diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
deleted file mode 100644
index 8d70ceb..0000000
--- a/sys-freebsd/freebsd-pf/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX freebsd-pf-10.0-libevent.patch 403 SHA256 b3de99dbc75a116ae46fec1aeaab0bfcc7448a87b963e9defbb94238bb79bee0 SHA512 1ec0d97afd9392c852071d6df704b05a0ca3146a20a3daa4ac541291a2a30c7c8752330381e1f3ae3d874640dd2f04d4b94c5b4adf985a3fbf8890da6a7f9b0b WHIRLPOOL 9cfa4b4b751737b224c43eb75a6eb27ba2e02f2c99829ce8327956d5b0aa381afce7cb86455bc97792ffbe66d8919959865f0c4a5ba44302391c8ea91c7bc065
-AUX freebsd-pf-10.0-pflogd.patch 349 SHA256 630346adc5d39d32112ebb299391b728a0e22b517376fa5f1d872593186f3800 SHA512 d4a605bb1a31837bfb0fa5d20fbac5ed449e4d579c5ab6025da2988ff101c31df7c67e23f9863f2f0b98a76788123e06402d8790d1c9baafd5b732dff0678644 WHIRLPOOL 388b3e724a6971e17867fc4749ea8769d56327a07fbba318f6e4d052ac049f78cc673911cca28dc37dbc3ca93f47eee061c07c0854101cefe6919b373746ebe1
-AUX freebsd-pf-9.0-bpf.patch 309 SHA256 9adf0af94c2cf2f61c1e9f2ab071c8628b3845778f7f61abfe52feb347a615a7 SHA512 e3364e372b5c2d2c4a1960ee1f6d5fa411810ba3597356ec17b275afd8bb6813cce62d781fc683663037b008d81804d28a2617f308c942a741657cf8dcf0e039 WHIRLPOOL 141a2ad5dbc1e199dc669aef995fcd9b4c71a6a0da55c11645adbef073755a8d661ae4e653d377c42ab000913599ba7f90aa611059496996a2f57282eaf07f8a
-AUX freebsd-pf-9.0-getline.patch 1159 SHA256 c56fa01870e2ea7ea187b14ef0d13801782c3f479f3e7fe31ac8fba2917969aa SHA512 2b7ab780e8a66a63e17302f9de19a9a72c7246b349f16745fbe7a2a69d8c83c9d8c5c7e18311bf0273620ce18cd9add6dcf051364013f941d477dbbf165b3ddb WHIRLPOOL 4ab2c2598b79a4066d013bc056f6e3977501cdce959568b7f14360b8b34f3622654a784291c9ba979390fb71f6b76672c26c0242ee9c1df09aadbe96e3e4156e
-AUX freebsd-pf-9.0-libevent.patch 384 SHA256 e1331cdc64d5d135f3cf33bea70031cba7813abc39778f860f06a161c395f799 SHA512 763c352e5a1e789e5d634066cfa7de84199db14a1f0d61b699f84f04ef1a2acb82dd63d59cffa339ff673bf92a3a9aab25f4b60fb5928e040e47b8c43b6a93f8 WHIRLPOOL ac352886754590178c550aa755a2380e493cccb66815f2875e03427d5d644394de5f711b6d01625a49fafabb4df1e63bff89ea19f47f99b1f6252ff7ca248ab2
-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
-EBUILD freebsd-pf-10.1.0.9999.ebuild 1678 SHA256 3bc74457178d6c6496c2080943e80de01853e45b4427e27ba10e53ad6c51b093 SHA512 f7eb1b7f5db59329cbe19b94db51d5372529e43a4e4e925d8fea1801d75220fb8c8073a40fb7d85240557c3a02b8239fc8dabfaaaefae1062afaab7679cf6128 WHIRLPOOL 287a0be6dac4bb133954829d35886c478768a5b81d6a7e416bf1c47cb1f6b24558145b757749f647d9326acfb95f99de79a5859b8323b1f3e02ac53cf9cc6610

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch
deleted file mode 100644
index 57474ea..0000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
-index de49888..2ab32fb 100644
---- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile
-+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
-@@ -7,10 +7,7 @@ MAN=	ftp-proxy.8
- 
- SRCS=	ftp-proxy.c filter.c
- 
--CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
--
--LDADD+= ${LIBEVENT}
--DPADD+= ${LIBEVENT}
-+LDADD+= -levent
- 
- WARNS?=	3
- 

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch
deleted file mode 100644
index 1316d3b..0000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
-index fcff8eb..0da383d 100644
---- a/sbin/pflogd/Makefile
-+++ b/sbin/pflogd/Makefile
-@@ -6,10 +6,7 @@ PROG=	pflogd
- SRCS= 	pflogd.c pidfile.c privsep.c privsep_fdpass.c
- MAN=	pflogd.8
- 
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
--
- LDADD=	-lpcap
--DPADD=	${LIBPCAP}
- 
- WARNS?=	2
- 

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch
deleted file mode 100644
index fb3c701..0000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- contrib/pf/pflogd/pflogd.c.old	2011-11-02 21:12:57.000000000 +0000
-+++ contrib/pf/pflogd/pflogd.c	2011-11-02 21:13:11.000000000 +0000
-@@ -39,6 +39,7 @@
- #include <sys/stat.h>
- #include <sys/socket.h>
- #include <net/if.h>
-+#include <net/bpf.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch
deleted file mode 100644
index 6679d32..0000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- contrib/pf/ftp-proxy/ftp-proxy.c.old	2011-11-02 21:18:19.000000000 +0000
-+++ contrib/pf/ftp-proxy/ftp-proxy.c	2011-11-02 21:18:36.000000000 +0000
-@@ -103,7 +103,7 @@
- int	drop_privs(void);
- void	end_session(struct session *);
- void	exit_daemon(void);
--int	getline(char *, size_t *);
-+int	ftpgetline(char *, size_t *);
- void	handle_connection(const int, short, void *);
- void	handle_signal(int, short, void *);
- struct session * init_session(void);
-@@ -249,7 +249,7 @@
- 		    buf_avail);
- 		s->cbuf_valid += clientread;
- 
--		while ((n = getline(s->cbuf, &s->cbuf_valid)) > 0) {
-+		while ((n = ftpgetline(s->cbuf, &s->cbuf_valid)) > 0) {
- 			logmsg(LOG_DEBUG, "#%d client: %s", s->id, linebuf);
- 			if (!client_parse(s)) {
- 				end_session(s);
-@@ -343,7 +343,7 @@
- }
- 
- int
--getline(char *buf, size_t *valid)
-+ftpgetline(char *buf, size_t *valid)
- {
- 	size_t i;
- 
-@@ -1087,7 +1087,7 @@
- 		    buf_avail);
- 		s->sbuf_valid += srvread;
- 
--		while ((n = getline(s->sbuf, &s->sbuf_valid)) > 0) {
-+		while ((n = ftpgetline(s->sbuf, &s->sbuf_valid)) > 0) {
- 			logmsg(LOG_DEBUG, "#%d server: %s", s->id, linebuf);
- 			if (!server_parse(s)) {
- 				end_session(s);

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch
deleted file mode 100644
index e488423..0000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.old	2011-11-02 20:57:03.000000000 +0000
-+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile	2011-11-02 20:57:21.000000000 +0000
-@@ -7,11 +7,9 @@
- 
- SRCS=	ftp-proxy.c filter.c
- 
--CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
- CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf
- 
--LDADD+= ${LIBEVENT}
--DPADD+= ${LIBEVENT}
-+LDADD+= -levent
- 
- WARNS?=	3
- 

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch
deleted file mode 100644
index 184ab6f..0000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- contrib/pf/pflogd/privsep.c.old	2011-11-02 21:04:01.000000000 +0000
-+++ contrib/pf/pflogd/privsep.c	2011-11-02 21:04:27.000000000 +0000
-@@ -32,11 +32,13 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <stdio.h>
-+#define HAVE_SNPRINTF
-+#define HAVE_STRLCPY
- #include <pcap.h>
- #include <pcap-int.h>
- #include <pwd.h>
- #include <signal.h>
--#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <syslog.h>

diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch
deleted file mode 100644
index d5a65ea..0000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- sbin/pflogd/Makefile.old	2011-11-02 21:08:46.000000000 +0000
-+++ sbin/pflogd/Makefile	2011-11-02 21:08:53.000000000 +0000
-@@ -6,10 +6,7 @@
- SRCS= 	pflogd.c pidfile.c privsep.c privsep_fdpass.c
- MAN=	pflogd.8
- 
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
--
- LDADD=	-lpcap
--DPADD=	${LIBPCAP} ${LIBUTIL}
- 
- WARNS?=	2
- 

diff --git a/sys-freebsd/freebsd-pf/files/pf.confd b/sys-freebsd/freebsd-pf/files/pf.confd
deleted file mode 100644
index 87c21b2..0000000
--- a/sys-freebsd/freebsd-pf/files/pf.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Defines where the rules file is found, by default /etc/pf.conf
-# pf_conf=/etc/pf.conf
-
-# Extra options to pass to pfctl when loading the rules
-# See pfctl(8)
-# pf_args=

diff --git a/sys-freebsd/freebsd-pf/files/pf.initd b/sys-freebsd/freebsd-pf/files/pf.initd
deleted file mode 100755
index da12019..0000000
--- a/sys-freebsd/freebsd-pf/files/pf.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/files/pf.initd,v 1.2 2007/02/23 13:51:44 uberlord Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if ! [ -c /dev/pf ]; then
-		ewarn "Pseudo-device /dev/pf not found."
-	
-		ebegin "Loading pf module"
-		if ! kldload pf; then
-			eerror "Unable to load pf module."
-			eend 1
-			return 1
-		fi
-		eend $?
-
-		if ! [ -c /dev/pf ]; then
-			eerror "Pseudo-device /dev/pf still not found."
-			return 1
-		fi
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	einfo "Starting firewall"
-	
-	if [ -r "${PF_RULES_FILE}" ]; then
-		einfo "Loading firewall rules"
-		/sbin/pfctl -qe -f ${PF_RULES_FILE:-/etc/pf.conf} ${PF_OPTS}
-	else
-		/sbin/pfctl -qe ${PF_OPTS}
-	fi
-	
-	eend $?
-}
-
-stop() {
-	einfo "Stopping firewall"
-	/sbin/pfctl -qd || retval=1
-	eend $?
-}

diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.1.0.9999.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.1.0.9999.ebuild
deleted file mode 100644
index 70e25fa..0000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${USBIN}.tar.xz
-			mirror://gentoo/${SBIN}.tar.xz
-			mirror://gentoo/${CONTRIB}.tar.xz
-			mirror://gentoo/${ETC}.tar.xz"
-fi
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-libs/libevent
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy"
-
-pkg_setup() {
-	enewgroup authpf 63
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_prepare() {
-	# pcap-int.h redefines snprintf as pcap_snprintf
-	epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
-	# Use system's libevent
-	epatch "${FILESDIR}/${PN}-10.0-libevent.patch"
-	epatch "${FILESDIR}/${PN}-10.0-pflogd.patch"
-	epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
-	epatch "${FILESDIR}/${PN}-9.0-getline.patch"
-	# Link in kernel sources
-	[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}"
-		mkmake || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}"
-		mkinstall || die "Install ${dir} failed"
-	done
-
-	cd "${WORKDIR}"/etc
-	insinto /etc
-	doins pf.os
-	# pf.initd provided by openrc, but no pf.confd
-	newconfd "${FILESDIR}/pf.confd" pf
-}

diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
deleted file mode 100644
index 98b1a8e..0000000
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX freebsd-rescue-10.0-zlib.patch 861 SHA256 e6ed90b353f180dc805d8ebf8774ef221f99dcd2ee2df485d48e795020ae8f4c SHA512 b055878934144bb2403bcf7d93b6239d161654d822ff5839676430eec282b1a7d210e9d4d4b744995b6e6d400ac15a98af9268f0ef62e455c6e776fa79d7b037 WHIRLPOOL 13e41e3aa5d9e0ca581927a8550acddd31ca0619b8e59f34a4f1c0a4a43b1d5fe2927fe8860db9c3bbd8cce8f7267c6f88ceca139569a0ac3ab575561929b4b8
-AUX freebsd-rescue-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c WHIRLPOOL cc5572b6ed34cb0462da77edf714e92ba10b672a315b216f342d200f0081ffdc417936b69cdf9e7e5ba8e1451f509fe222d366c84d98a005999c2987ae08d3ef
-AUX freebsd-rescue-8.0-pkgconfig_static_libarchive.patch 330 SHA256 3690730ee66082fcc4f04ab79c49c6759772c0aefc68abdebbe4497b1155a7bc SHA512 529294fbff01e573f714e7f0474ccb85755453da057d224ffc1eab91ea6945af2efc8cafcc48db4d75f5204fa5ab514da35af66d75f90df4bde3f0b8e8aa7dc5 WHIRLPOOL 95b65d6501a8d77fe4ecbc13aea1010e85fa5591fb5fc12d4a3ccaee51b908245ac79961bccd3d0e4b8430eacd7eb0fe271907c8a94812fad8df0ab888e3bd7d
-AUX freebsd-rescue-8.2-libzcleverlink.patch 789 SHA256 80d86cb1b632d0c09fdcfd7b998fb1189e957619a41fc65682e2c439392c38fd SHA512 5c24aed5b05b1de4aad67961edbc168c31f80a2d0d034839af8b2fb73497b34d525e1af2c0979b1e23bbcbb53d6079030aa68a1b218cef470c8daa2f439d3a7f WHIRLPOOL 55b39e959f0d0821189070ca03167becdd6d446a97dff7c171c40b12629cb2365aed6633635e6d8f6e3f3fa6bea68c46f31b79e537c3d56752e4aee76d76ce84
-AUX freebsd-rescue-9.1-bsdtar.patch 404 SHA256 0e71e3e370b33318bbb167e82d6507589fb95cc2c2d1fc6e8b74d0faf3d17ef1 SHA512 320d2a69c2f0de5e6cb733238fcc46133e571d8536f2ac573597f008d4261fae4d27619c244a90a70392688004df438b80e89f6be810841f6a40a22c2c361bb4 WHIRLPOOL 412da27f4535e1300d150edc74f72cf5e4e2b8bb6d4c7e9f31a498396ac12514e97e4b3a83040484b4713a7edb6b2d6ed5e8b2fe714d13f297c35d657f90fc08
-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
-EBUILD freebsd-rescue-10.1.0.9999.ebuild 1997 SHA256 4b669c20567d931f38f20c824b1c9a0a72bfdad998bd7616621289d8077e0586 SHA512 3d39ba10c1db1dc60924e31bb1a8b24436c4d0a8fb2371dc1e081e15c227de729f9be85952f75de21f8316086c8ef969da30863130e65e1e041e0e8f19f79187 WHIRLPOOL dbe509a3d8d6eac97b063382ce0f3aec073102253b21e36ae6df6c54ac534bb8c13178f255afa0066f5ffca3ef6d0f55b9cbf473ddbd6832a9724dbe7511699f

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch
deleted file mode 100644
index 42165c4..0000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
-index 13c0d43..1f258f3 100644
---- a/sbin/savecore/savecore.c
-+++ b/sbin/savecore/savecore.c
-@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose;	/* flags */
- static int nfound, nsaved, nerr;			/* statistics */
- static int maxdumps;
- 
--extern FILE *zopen(const char *, const char *);
-+extern FILE *gzopen(const char *, const char *);
- 
- static sig_atomic_t got_siginfo;
- static void infohandler(int);
-@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device)
- 	if (compress) {
- 		snprintf(corename, sizeof(corename), "%s.%d.gz",
- 		    istextdump ? "textdump.tar" : "vmcore", bounds);
--		fp = zopen(corename, "w");
-+		fp = gzopen(corename, "w");
- 	} else {
- 		snprintf(corename, sizeof(corename), "%s.%d",
- 		    istextdump ? "textdump.tar" : "vmcore", bounds);

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch
deleted file mode 100644
index 22fb2ec..0000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c
---- sbin/savecore/savecore.c	2005-02-26 01:21:50 +0000
-+++ sbin-zlib/savecore/savecore.c	2005-05-06 12:00:06 +0000
-@@ -95,7 +95,7 @@
- static int checkfor, compress, clear, force, keep, verbose;	/* flags */
- static int nfound, nsaved, nerr;			/* statistics */
- 
--extern FILE *zopen(const char *, const char *);
-+extern FILE *gzopen(const char *, const char *);
- 
- static void
- printheader(FILE *f, const struct kerneldumpheader *h, const char *device,
-@@ -553,7 +553,7 @@
- 	if (compress) {
- 		sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" :
- 		    "vmcore", bounds);
--		fp = zopen(filename, "w");
-+		fp = gzopen(filename, "w");
- 	} else {
- 		sprintf(filename, "%s.%d", istextdump ? "textdump.tar" :
- 		    "vmcore", bounds);

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch
deleted file mode 100644
index 7d12621..0000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rescue/rescue/Makefile.old	2010-03-12 12:14:17 +0100
-+++ rescue/rescue/Makefile	2010-03-12 12:14:47 +0100
-@@ -209,7 +209,7 @@
- CRUNCH_LIBS+= -lbz2
- 
- CRUNCH_PROGS_usr.bin+= tar
--CRUNCH_LIBS+= -larchive -lmd
-+CRUNCH_LIBS+= `pkg-config --static --libs libarchive` -lmd
- .if ${MK_OPENSSL} != "no"
- CRUNCH_LIBS+= -lcrypto
- .endif

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch
deleted file mode 100644
index 3d44457..0000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- rescue/rescue/Makefile.old	2011-07-06 01:35:13.000000000 +0000
-+++ rescue/rescue/Makefile	2011-07-06 01:35:54.000000000 +0000
-@@ -143,7 +143,7 @@
- .if ${MK_ZFS} != "no"
- CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
- .endif
--CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
-+CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs
- 
- .if ${MACHINE_ARCH} == "i386"
- CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
-@@ -234,7 +234,7 @@
- CRUNCH_PROGS_usr.sbin+= chown
- CRUNCH_ALIAS_chown= chgrp
- ##################################################################
--CRUNCH_LIBS+= -lm
-+CRUNCH_LIBS+= -lz -lm
- 
- ##################################################################
- #  The following is pretty nearly a generic crunchgen-handling makefile

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
deleted file mode 100644
index d4d23d7..0000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur work.orig/contrib/libarchive/tar/bsdtar.c work/contrib/libarchive/tar/bsdtar.c
---- work.orig/contrib/libarchive/tar/bsdtar.c	2012-07-12 13:44:29.000000000 +0900
-+++ work/contrib/libarchive/tar/bsdtar.c	2012-07-29 00:57:25.000000000 +0900
-@@ -691,7 +691,7 @@
- {
- 	printf("bsdtar %s - %s\n",
- 	    BSDTAR_VERSION_STRING,
--	    archive_version());
-+	    archive_version_string());
- 	exit(0);
- }
- 

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
deleted file mode 100644
index a194397..0000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur work.orig/rescue/rescue/Makefile work/rescue/rescue/Makefile
---- work.orig/rescue/rescue/Makefile	2012-07-29 00:50:20.000000000 +0900
-+++ work/rescue/rescue/Makefile	2012-07-29 00:56:01.000000000 +0900
-@@ -125,7 +125,7 @@
- .if ${MK_ZFS} != "no"
- CRUNCH_LIBS+= -lavl -lnvpair -lpthread -lzfs -luutil -lumem
- .endif
--CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
-+CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lreadline -lsbuf -lufs
- 
- .if ${MACHINE_CPUARCH} == "i386"
- CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
-@@ -216,7 +216,7 @@
- CRUNCH_PROGS_usr.sbin+= chown
- CRUNCH_ALIAS_chown= chgrp
- ##################################################################
--CRUNCH_LIBS+= -lm
-+CRUNCH_LIBS+= -lmd -lz -lm
- 
- .include <bsd.crunchgen.mk>
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch
deleted file mode 100644
index bdda99b..0000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c
---- sbin/ifconfig.old/regdomain.c	2010-12-21 17:09:25.000000000 +0000
-+++ sbin/ifconfig/regdomain.c	2011-07-10 15:56:27.000000000 +0000
-@@ -39,7 +39,7 @@
- #include <err.h>
- #include <unistd.h>
- 
--#include <bsdxml.h>
-+#include <expat.h>
- 
- #include "regdomain.h"
- 
-Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos

diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.0.9999.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.0.9999.ebuild
deleted file mode 100644
index 821021c..0000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${UBIN}.tar.xz
-			mirror://gentoo/${CONTRIB}.tar.xz
-			mirror://gentoo/${LIB}.tar.xz
-			mirror://gentoo/${BIN}.tar.xz
-			mirror://gentoo/${SBIN}.tar.xz
-			mirror://gentoo/${USBIN}.tar.xz
-			mirror://gentoo/${GNU}.tar.xz
-			mirror://gentoo/${SYS}.tar.xz
-			mirror://gentoo/${LIBEXEC}.tar.xz
-			mirror://gentoo/${RESCUE}.tar.xz
-			zfs? ( mirror://gentoo/${CDDL}.tar.xz )"
-fi
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	app-arch/xz-utils[static-libs]
-	sys-libs/ncurses[static-libs]
-	dev-libs/expat[static-libs]
-	app-arch/bzip2[static-libs]
-	dev-libs/libedit[static-libs]
-	dev-libs/libxml2:2[static-libs]
-	dev-libs/openssl[static-libs]
-	sys-libs/zlib[static-libs]
-	sys-libs/readline[static-libs]
-	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} NO_PIC= "
-}
-
-src_prepare() {
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}"-10.0-zlib.patch
-	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
-}
-
-src_compile() {
-	tc-export CC
-	# crunchgen is now checks env MAKE.
-	# Use to force BSD's make
-	export MAKE=/usr/bin/make
-
-	cd "${WORKDIR}/lib/libarchive"
-	echo "#include <expat.h>" > bsdxml.h
-	freebsd_src_compile
-	export CC="${CC} -L${WORKDIR}/lib/libarchive"
-
-	cd "${S}"
-	freebsd_src_compile
-}

diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
deleted file mode 100644
index fb8a538..0000000
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX adjkerntz-crontab 184 SHA256 f3b08140ea38bfe502b34dd8c69aa4a6b65b786d792828cce082be8f844345dc SHA512 28ecfd94257eca2d91323e4bac1920969e589a13f877f1d67c4be0dd5d0bf4585eba8f749ae04f2e0761d5860b76e0c04993350bbdeb52736584ea9df97c6093 WHIRLPOOL 883509014af5a6f3803993eb4fc9f53608b08eaffdfcb409be3945d8234ab66b6a99c620b781a8d650aaeaff1f05db2e5249fb280f9a2bb079421062be3e5332
-AUX freebsd-sbin-10.0-zlib.patch 861 SHA256 9e2b89c1def6424b4a628d286ced8554f5f59bdf890e647f5b07e431e4bc9351 SHA512 8a6e14d15e44e9de22863c65cd359cc408207a4329ecdfe053317fd120d01025f5d42b958447ed0bb2e584cc050391306438934ac8cae0edc4a6a785da8138b7 WHIRLPOOL ebad6febc4ebdd4355fe6a60f99af13d2b15e52f538a6c677705401982e1e55556234df7099c570fa7e6fa5ee9c9264e5a394382c626919d43c214d21023d6ba
-AUX freebsd-sbin-6.1-pr102701.patch 548 SHA256 dccf32386359a2cfd80272c86085467d612c8f4d7924a6a223cd1259a8b7a176 SHA512 2b882565670ffe559410b17e2fa6a94624eee89d25a791ef3e27d657dedcf95b2be282217a2350203af7727b839d5d6ff50368f72c4bef3d7e60fef8a6325cbe WHIRLPOOL 14db7a26e6189314cc9a0e8ff5ccd01bedba178d9ddff856df262b18ce35fbd85999f5f4a612c2388af8718c6a1c0b544db4287bca08356fa5fb191f1cccf978
-AUX freebsd-sbin-6.2-ldconfig.patch 389 SHA256 b3fd47a733d39dea3400bee180d156ed09ff4c19dd47fbf5df52af33bdc5dc2b SHA512 ed8f6073991ba0c8823aea1570e720273d7dc68ec6daf38d7e1d41f2285d307d7905cf674a1148d4783c69f2dafd7fc8a51e729aa4727eb46d857218ab2d71ed WHIRLPOOL 3ecccd7b56c9bee820ca92b8a6a446a1bf69e61e889324407f2e76336eb0328b1162c7dc5d5f24505ec1f36d235bfe33fbecc5c5d60bf0f04741eeca9eb5b1cb
-AUX freebsd-sbin-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c WHIRLPOOL cc5572b6ed34cb0462da77edf714e92ba10b672a315b216f342d200f0081ffdc417936b69cdf9e7e5ba8e1451f509fe222d366c84d98a005999c2987ae08d3ef
-AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b
-AUX freebsd-sbin-setXid.patch 541 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 SHA512 e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e WHIRLPOOL a2d578ff3b54ad25875f65d6724d0762c0fc3a400aa8e14c93ab94dc789910fbc6ab70528cbd0074fd0d7a4957a2d2d51bf10f615cbfd751aa4e95edc88d4e7d
-AUX idmapd.initd 440 SHA256 e89050097731f658825b4a7215023e1c5070f0e31cfdf79eaf299ede9c9f9e39 SHA512 d76f1ed5b6cb0624359f0e1018b1decee80fec6e201393500656a2001034b042dde4299c2768ea8bfd1aa65813c86a5f9c06b5dd2e41ab74f954b8310d55259a WHIRLPOOL eeb04173b61c7e60883bd51e07be5f69aa67d6f4e506c3b3e07604e86cb43d81b5722e23e21ec189d83f2549a8827256216f45025ea5fd427b4874f2723c7a16
-EBUILD freebsd-sbin-10.1.0.9999.ebuild 2682 SHA256 0089b62a44f816b015aae62867f54c085c6ed531359b9c4b4562747de67d777f SHA512 1d848b4463e9ce046f227966c9b0499f864e8644c3bad9779f00fc1fc1f941ff78ac130fd968cb954e83869e20473e36fc99106fdc4728e8c0bb05574bd14650 WHIRLPOOL 7174b3132e112288cb99f493e7b3982f4f01b63b67962f2a81516404bb131f00c9aca4316f2eda31d232b53c0343f98722d3f5882a37f4e4ded92b9d584c8741

diff --git a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab b/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab
deleted file mode 100644
index 5fc46f5..0000000
--- a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab
+++ /dev/null
@@ -1,4 +0,0 @@
-# Adjust the time zone if the CMOS clock keeps local time, as opposed to
-# UTC time.  See adjkerntz(8) for details.
-1,31    0-5     *       *       *       root    /sbin/adjkerntz -a
-

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch
deleted file mode 100644
index c0a2bf9..0000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
-index bdbf7e3..a4c67ec 100644
---- a/sbin/savecore/savecore.c
-+++ b/sbin/savecore/savecore.c
-@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose;	/* flags */
- static int nfound, nsaved, nerr;			/* statistics */
- static int maxdumps;
- 
--extern FILE *zopen(const char *, const char *);
-+extern FILE *gzopen(const char *, const char *);
- 
- static sig_atomic_t got_siginfo;
- static void infohandler(int);
-@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device)
- 	if (compress) {
- 		snprintf(corename, sizeof(corename), "%s.%d.gz",
- 		    istextdump ? "textdump.tar" : "vmcore", bounds);
--		fp = zopen(corename, "w");
-+		fp = gzopen(corename, "w");
- 	} else {
- 		snprintf(corename, sizeof(corename), "%s.%d",
- 		    istextdump ? "textdump.tar" : "vmcore", bounds);

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch
deleted file mode 100644
index 7b9578c..0000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Solves the issue reported in Problem Report bin/102701.
-
-Can't delete an inet6 alias address from an interface.
-
-Index: fbsd-6.1/sbin/ifconfig/af_inet6.c
-===================================================================
---- fbsd-6.1.orig/sbin/ifconfig/af_inet6.c
-+++ fbsd-6.1/sbin/ifconfig/af_inet6.c
-@@ -515,7 +515,7 @@ static struct afswtch af_inet6 = {
- 	.af_settunnel	= in6_set_tunnel,
- 	.af_difaddr	= SIOCDIFADDR_IN6,
- 	.af_aifaddr	= SIOCAIFADDR_IN6,
--	.af_ridreq	= &in6_addreq,
-+	.af_ridreq	= &in6_ridreq,
- 	.af_addreq	= &in6_addreq,
- };
- 

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch
deleted file mode 100644
index 81ad024..0000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur sbin.orig/ldconfig/elfhints.c sbin/ldconfig/elfhints.c
---- sbin.orig/ldconfig/elfhints.c	2001-05-03 00:56:18 +0100
-+++ sbin/ldconfig/elfhints.c	2007-08-06 10:16:24 +0100
-@@ -245,6 +245,9 @@
- 		else
- 			add_dir(hintsfile, argv[i], 0);
- 	}
-+	/* Always add our system dirs */
-+	add_dir (hintsfile, "/lib", 1);
-+	add_dir (hintsfile, "/usr/lib", 1);
- 	write_elf_hints(hintsfile);
- }
- 

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch
deleted file mode 100644
index 22fb2ec..0000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c
---- sbin/savecore/savecore.c	2005-02-26 01:21:50 +0000
-+++ sbin-zlib/savecore/savecore.c	2005-05-06 12:00:06 +0000
-@@ -95,7 +95,7 @@
- static int checkfor, compress, clear, force, keep, verbose;	/* flags */
- static int nfound, nsaved, nerr;			/* statistics */
- 
--extern FILE *zopen(const char *, const char *);
-+extern FILE *gzopen(const char *, const char *);
- 
- static void
- printheader(FILE *f, const struct kerneldumpheader *h, const char *device,
-@@ -553,7 +553,7 @@
- 	if (compress) {
- 		sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" :
- 		    "vmcore", bounds);
--		fp = zopen(filename, "w");
-+		fp = gzopen(filename, "w");
- 	} else {
- 		sprintf(filename, "%s.%d", istextdump ? "textdump.tar" :
- 		    "vmcore", bounds);

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch
deleted file mode 100644
index bdda99b..0000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c
---- sbin/ifconfig.old/regdomain.c	2010-12-21 17:09:25.000000000 +0000
-+++ sbin/ifconfig/regdomain.c	2011-07-10 15:56:27.000000000 +0000
-@@ -39,7 +39,7 @@
- #include <err.h>
- #include <unistd.h>
- 
--#include <bsdxml.h>
-+#include <expat.h>
- 
- #include "regdomain.h"
- 
-Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos

diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch
deleted file mode 100644
index c8cbebc..0000000
--- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur sbin.orig/ping/Makefile sbin.setXid/ping/Makefile
---- sbin.orig/ping/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin.setXid/ping/Makefile	Thu Apr  7 20:42:02 2005
-@@ -18,4 +18,6 @@
- LDADD+=	-lipsec
- .endif
- 
-+LDFLAGS+= -Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur sbin.orig/shutdown/Makefile sbin.setXid/shutdown/Makefile
---- sbin.orig/shutdown/Makefile	Thu Apr  7 20:27:57 2005
-+++ sbin.setXid/shutdown/Makefile	Thu Apr  7 20:42:17 2005
-@@ -7,4 +7,6 @@
- BINGRP=	operator
- BINMODE=4550
- 
-+LDFLAGS+= -Wl,-z,now
-+
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-sbin/files/idmapd.initd b/sys-freebsd/freebsd-sbin/files/idmapd.initd
deleted file mode 100755
index 407b0e8..0000000
--- a/sys-freebsd/freebsd-sbin/files/idmapd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need rpcbind
-}
-
-start() {
-	ebegin "Starting NFS idmapd"
-	start-stop-daemon --start --quiet --exec \
-		/sbin/idmapd -- $idmapdopts
-	eend $? "Error starting NFS idmapd"
-}
-
-stop() {
-	ebegin "Stopping NFS idmapd"
-	start-stop-daemon --stop --quiet --exec /sbin/idmapd
-	eend $? "Error stopping NFS idmapd"
-}

diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.0.9999.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.0.9999.ebuild
deleted file mode 100644
index 36ef6d8..0000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${SBIN}.tar.xz
-		mirror://gentoo/${CONTRIB}.tar.xz
-		mirror://gentoo/${LIB}.tar.xz
-		mirror://gentoo/${LIBEXEC}.tar.xz
-		mirror://gentoo/${USBIN}.tar.xz
-		mirror://gentoo/${ETC}.tar.xz
-		build? ( mirror://gentoo/${SYS}.tar.xz )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	>=dev-libs/expat-2.0.1
-	ssl? ( dev-libs/openssl )
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/readline
-	|| (
-		sys-process/cronie
-		sys-process/vixie-cron
-	)
-	atm? ( net-analyzer/bsnmp )"
-DEPEND="${RDEPEND}
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX="
-	use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL="
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-10.0-zlib.patch"
-	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
-	"${FILESDIR}/${PN}-6.1-pr102701.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-}
-
-src_install() {
-	mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
-	freebsd_src_install
-	keepdir /var/log
-	# Needed by ldconfig:
-	keepdir /var/run
-
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	# New wireless config method requires regdomain.xml in /etc
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins minfree sysctl.conf regdomain.xml || die
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ipfwdenied || die
-
-	use ipfilter && { doperiodic security \
-		security/*.ipfdenied || die ; }
-
-	use pf && { doperiodic security \
-		security/*.pfdenied || die ; }
-}

diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
deleted file mode 100644
index 1ad74ef..0000000
--- a/sys-freebsd/freebsd-share/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX freebsd-share-10.0-gentoo-eapi3.patch 475 SHA256 504841c762c1fa82ac14c22e16b84543e88927608f3fb972d995caa89449e487 SHA512 b7fe870aafe1cf9029c1d1d9de16413b5be8354b1c2ba0d0eab6f0fe3076ab03da08ff764c923c087e246b90355a48d55acef9b9b5a29238ddf8c92bdb3ca0f8 WHIRLPOOL 58dd84d64cea1c149b0126d7e9567caf7dbe6f238b1434eb4ffde08496e45e268691ba8604ea80da863d06d3f6ac6aeff4e9f7a01d558a28a31f347ed6c0c4c9
-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.0-gentoowaydir.patch 314 SHA256 68ddc9d6d95c95fc295f3ed3f7d7562de01ff6894b002bd7455d2da72cf4e2f2 SHA512 ef325e79806d78ede26567268829949de3aab02db1b7ea5f1dd834d4deeeddee8338679f7196fee6dc1a5682ccd79c1a0bdd73c96349961a8e1c2153fcf84afd WHIRLPOOL 10448b2cd090068b698d2d9037f2a217cdc20cebcfce4a13f98111ae4e4a2073ce4cb274ec3a7011c2e89acc1b2ab1b5e8e3d141817c065fdb35d1879ae31c37
-AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256 0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512 b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e WHIRLPOOL ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b
-EBUILD freebsd-share-10.1.0.9999.ebuild 3241 SHA256 e7be206aadbbfc959a46b818175fa8a59ba7f430d961bbf1f1f16a2cca7b8bcd SHA512 5a3419014aa7907b35f93cfef867fa6e7fd1b8a4fde392eb2d8813bb080722a11871bf5dbaca3125d3d2849c9e7740dd99f3f3129dbc1fb211f6fe3c09e2c5c7 WHIRLPOOL 48f8a6ccff8ab003c53e21812747c641b17ede01c151fc9d1251ef152de50d4c6301389379bfd29a25b8cfb5ec9793a80dce93a7d47713f3cc31e32354860283
-MISC metadata.xml 223 SHA256 5c9860c4ce81b51fef51a6c5e87081bfd13e74ba452c27191a1abc0ca5ff0aa0 SHA512 3dc7fea8c9f850d63d4f9f24af639fb41d406c2e87439eb960c401412b37e7dc7ab6822d446ec113eb079aba30967391e95cd71dceb889753ed969bc51f6064e WHIRLPOOL 577570d1260a6ef86155c1647e3d90c18aa9b83a89027dcea28b70d22df60e413cee353083d7e915d81129f447772dc7dc4ea766e478a9cf363dabce5d9042de

diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch
deleted file mode 100644
index 1d0a53e..0000000
--- a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/share/i18n/esdb/Makefile.part b/share/i18n/esdb/Makefile.part
-index 9ca8577..329e9fb 100644
---- a/share/i18n/esdb/Makefile.part
-+++ b/share/i18n/esdb/Makefile.part
-@@ -13,10 +13,10 @@ PART!=	sed '/^\#/d;/^ *$$/d' ${PARTFILE}
- .endif
- .if !defined(NO_EPREFIX)
- CODESETS?= ${PART:C/^/${CODE}${SEP}/}
--EPREFIX?= ${CODE}${SEP}
-+EPREFIX= ${CODE}${SEP}
- .else
- CODESETS?= ${PART}
--EPREFIX?=	
-+EPREFIX=	
- .endif
- ESUBDIR?= ${CODE}
- ESDB?=	${CODESETS:C/$/.esdb/:S/:/@/}

diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch
deleted file mode 100644
index c0798d3..0000000
--- a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- examples/smbfs/Makefile.orig	Tue Mar 22 15:20:20 2005
-+++ examples/smbfs/Makefile	Tue Mar 22 15:20:46 2005
-@@ -2,6 +2,7 @@
- 
- NOOBJ=
- BINDIR=	/usr/share/examples/smbfs
-+FILESDIR=      ${DOCDIR}/smbfs
- FILES=	dot.nsmbrc
- 
- .PATH: ${.CURDIR}/../../../contrib/smbfs/examples
---- examples/smbfs/print/Makefile.orig	Tue Mar 22 15:22:17 2005
-+++ examples/smbfs/print/Makefile	Tue Mar 22 15:22:35 2005
-@@ -2,6 +2,7 @@
- 
- NOOBJ=
- BINDIR=	/usr/share/examples/smbfs/print
-+FILESDIR=      ${DOCDIR}/smbfs/print
- FILES=	lj6l ljspool printcap.sample tolj
- 
- .PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print

diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch
deleted file mode 100644
index f668d04..0000000
--- a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: fbsd/share/skel/Makefile
-===================================================================
---- fbsd.orig/share/skel/Makefile
-+++ fbsd/share/skel/Makefile
-@@ -2,11 +2,11 @@
- # $FreeBSD: src/share/skel/Makefile,v 1.9.2.1 2005/02/13 07:23:30 obrien Exp $
- 
- 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=	/usr/share/skel
--FILES2DIR=	/usr/share/skel
-+FILES2=		dot.mail_aliases
-+FILES1DIR=	/etc/skel
-+FILES2DIR=	/etc/skel
- FILES1MODE=	0644
- FILES2MODE=	0600
- NOOBJ=

diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch
deleted file mode 100644
index 19167a6..0000000
--- a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- share/misc/Makefile.old	2010-03-12 01:32:39 +0100
-+++ share/misc/Makefile	2010-03-12 01:33:25 +0100
-@@ -3,9 +3,9 @@
- 
- .PATH:	${.CURDIR}/../../sys/dev/usb
- 
--FILES=	ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
-+FILES=	bsd-family-tree committers-doc.dot committers-ports.dot \
- 	committers-src.dot eqnchar flowers init.ee \
--	iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
-+	iso3166 iso639 man.template mdoc.template pci_vendors \
- 	scsi_modes usb_hid_usages usbdevs
- 
- NO_OBJ=
---- share/dict/Makefile.old	2010-03-12 01:33:53 +0100
-+++ share/dict/Makefile	2010-03-12 01:34:18 +0100
-@@ -4,8 +4,7 @@
- NO_OBJ=
- 
- # XXX MISSING:	connectives words
--FILES=		README propernames web2 web2a freebsd
-+FILES=		README freebsd
- FILESDIR=	${BINDIR}/dict
--SYMLINKS=	web2 ${FILESDIR}/words
- 
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch b/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch
deleted file mode 100644
index f299051..0000000
--- a/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur etc.orig/mtree/BSD.usr.dist etc/mtree/BSD.usr.dist
---- etc.orig/mtree/BSD.usr.dist	2012-01-03 12:26:10.000000000 +0900
-+++ etc/mtree/BSD.usr.dist	2012-01-27 21:50:47.941466067 +0900
-@@ -25,12 +25,6 @@
- 	i18n
- 	..
-     ..
--    lib32
--	dtrace
--	..
--	i18n
--	..
--    ..
-     libdata
-         gcc
-         ..

diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch
deleted file mode 100644
index af84dc3..0000000
--- a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur share.orig/dict/Makefile share/dict/Makefile
---- share.orig/dict/Makefile	2012-12-31 18:00:00.000000000 +0900
-+++ share/dict/Makefile	2012-12-31 18:03:15.000000000 +0900
-@@ -4,8 +4,7 @@
- NO_OBJ=
- 
- # XXX MISSING:	connectives words
--FILES=		README propernames web2 web2a freebsd
-+FILES=		README freebsd
- FILESDIR=	${BINDIR}/dict
--SYMLINKS=	web2 ${FILESDIR}/words
- 
- .include <bsd.prog.mk>
-diff -Nur share.orig/misc/Makefile share/misc/Makefile
---- share.orig/misc/Makefile	2012-12-31 18:00:00.000000000 +0900
-+++ share/misc/Makefile	2012-12-31 18:04:22.000000000 +0900
-@@ -3,9 +3,9 @@
- 
- .PATH:	${.CURDIR}/../../sys/dev/usb
- 
--FILES=	ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
-+FILES=	bsd-family-tree committers-doc.dot committers-ports.dot \
- 	committers-src.dot eqnchar flowers init.ee \
--	iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
-+	iso3166 iso639 man.template mdoc.template pci_vendors \
- 	scsi_modes usb_hid_usages usbdevs \
- 	organization.dot
- 

diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.1.0.9999.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.1.0.9999.ebuild
deleted file mode 100644
index aa62f9c..0000000
--- a/sys-freebsd/freebsd-share/freebsd-share-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-
-IUSE="doc zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${SHARE}.tar.xz
-		mirror://gentoo/${CONTRIB}.tar.xz
-		mirror://gentoo/${GNU}.tar.xz
-		mirror://gentoo/${UBIN}.tar.xz
-		mirror://gentoo/${USBIN}.tar.xz
-		mirror://gentoo/${SBIN}.tar.xz
-		mirror://gentoo/${BIN}.tar.xz
-		mirror://gentoo/${LIB}.tar.xz
-		mirror://gentoo/${ETC}.tar.xz
-		zfs? ( mirror://gentoo/${CDDL}.tar.xz )"
-fi
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-		=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	[[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
-	"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
-	"${FILESDIR}/${PN}-9.2-gnu-miscfiles.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch" )
-
-src_prepare() {
-	# Remove make.conf manpage as it describes bsdmk's make.conf.
-	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
-	# Remove rc.conf manpage as it describes bsd's rc.conf.
-	sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
-	sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
-	# Remove mailer.conf manpage
-	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
-	# Remove pbm and moduli(ssh) manpages
-	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
-	# Remove builtins manpage
-	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
-	# Remove rc manpages
-	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-	# Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin.
-	sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile"
-
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf "${S}"/mk/*.mk
-
-	# Make proper symlinks by defining the full target.
-	local sdir
-	for sdir in colldef mklocale monetdef msgdef numericdef timedef
-	do
-		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
-			"${S}/${sdir}/Makefile" || \
-			die "Error fixing ${sdir}/Makefile"
-	done
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
-	fi
-}
-
-src_compile() {
-	export ESED="/usr/bin/sed"
-
-	# libiconv support.
-	# i18n/csmapper/APPLE requires mkcsmapper_static
-	# i18n/esdb/APPLE requires mkesdb_static
-	for pkg in mkcsmapper_static mkesdb_static
-	do
-		cd "${WORKDIR}"/usr.bin/${pkg}
-		freebsd_src_compile
-	done
-
-	# This is a groff problem and not a -shared problem.
-	cd "${S}"
-	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/"
-	freebsd_src_compile -j1 || die "emake failed"
-}
-
-src_install() {
-	mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}

diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml
deleted file mode 100644
index d74d135..0000000
--- a/sys-freebsd/freebsd-share/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>bsd</herd>
-  <use>
-    <flag name='zfs'>Enable ZFS support.</flag>
-  </use>
-</pkgmetadata>

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
deleted file mode 100644
index b595b90..0000000
--- a/sys-freebsd/freebsd-sources/Manifest
+++ /dev/null
@@ -1,29 +0,0 @@
-AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9
-AUX freebsd-sources-10.0-EN-1407-pmap.patch 520 SHA256 64f3fc5765449538fecd6a911cf8fe4a03f8123a0169549ab2fa5363acbd4480 SHA512 eba94035c01d4e9819a89973a0e9baa2b573dfb20c9ee22cfbe786e29bb323beec54f6d6de2d14705c9a558ea6429e7a9edc81c34cd38ddcef4d9ed32b704108 WHIRLPOOL 4adb95ca70f781e5e812936a5fcf86149050bf10c12dccc9c1502ac6df79ae9f80e945b3872a55c187741d795f84e40ec83be015ecf9d7a729fcb13610429738
-AUX freebsd-sources-10.0-SA-1417-kmem.patch 10626 SHA256 217fed19e36d6febc973f2eff141e9d10ff5700122126b9097c36f9642b168e7 SHA512 0706bef96076723a92664316573c2a877e090213ea50fdde2418d8ea7d98acc76fd45832bb9b66a5af45b6fc97e9d6ab11e7aa561514a4c59ed3afce516d3581 WHIRLPOOL f06b189d12ee4dd7ccec1d84b68297d2b3e33c832440f01c94c07cf5e051e9fa8ef782c28d01f976a017941f832da0be88700575f1092498aaffb7eb931821ac
-AUX freebsd-sources-10.0-clang34.patch 838 SHA256 2f1b02ff11ac48958857fa07168ea27f4974884cdf850f54f3c61541bf9617d2 SHA512 63403f328a2c394aefc66a6230e5c7699ca59d809780686055152f53ce5f7b86b7f2b083951e5e51d0a34ed20561f2473a22c3af8919f0336bf6f10a9db03113 WHIRLPOOL 5d0779ea5f5609f629d9751e365997ac39c2eaab3c0b8f2153b0ed17bf08896b581f3c109a51634be820f0e40b3cc18c6072b1540a1a270099263c63adfb3d67
-AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
-AUX freebsd-sources-10.1-cve-2014-8612.patch 2097 SHA256 c8ade882a39dd8f65c34b175457cdd93be6eafea67ffb5f977435d48a19b6b68 SHA512 b233ae1d249bdbf516aba611d081a5a6ccaaab32f9e281cce65136c68c6a47362eac33398d6849a45e4e1c30f02a482287d6339069d29ece0aa5c4d9101e24a4 WHIRLPOOL 4713b4d896c561d47686b9f1d53a7e3c912fc58c8039529f0ae244b2cc533aabf20f386a1f9bc8632849ebd084d3739b6be55d4f39a00d484d5d230755497b69
-AUX freebsd-sources-10.1-cve-2014-8613.patch 4181 SHA256 61b5e717e88671ecc3da9c2b11d4c6d5ddc26f529ed19cb8ce588743cd00af9d SHA512 30deeb82af385abb0b57cc02752e72d8dda37688df99038910f04558ab064624cb576b1989ba8a7674e3a9046f9607be90596d9bdfb2f28900568291b0f96717 WHIRLPOOL 1073a364805b0ef8377dae6e3cd1665de6e4e99612549081fd794a4d92b4b4ee583a68e66f089340dc35129e3fb0bcf00b14b5b71304b6dac744d9a852530fbe
-AUX freebsd-sources-10.1-cve-2015-1414.patch 463 SHA256 969674297e3afbacbd3e15fc6621c813149ab044964d47b936761f04f8ff0bd6 SHA512 5668d18c0abcaad53547394bca18fa1060372cd7f59fd35265778ad74bd331ed08fd8c0b0e48fb338bf8d08c427af1b40315855c7d83c9e3c1917b2f22de1f92 WHIRLPOOL ca93b5f794aac22a23c0e14853813439ce9e0a26847aeec3498bf01c7e10cc1829ddde1a2d5d1291bf2a610773846bfef9217199da1a249d4e7df9f4e44a3e46
-AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
-AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
-AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512
-AUX freebsd-sources-7.1-includes.patch 318 SHA256 70c73d0939325185430a3a133380f0bc10674cb8fbe5c7ebfe3b07630d023369 SHA512 f73db3fd72bdd2972ae25c3f661e7677bd5877aa623981303a4b0c5e9522fd458e294799a0ebad17ac3c639d588394b10ad5fcab4d88743a6dfcc8a8d60eecd7 WHIRLPOOL 5dca685df773113dff0c8aac16f244882728ad586b62b7c20df948240b097e89d1bb62f16ed181f2535e13835471754d8fdd0f4ef02b73ce5077b9169c958557
-AUX freebsd-sources-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3
-AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 SHA256 091764c97f4148d2245c24dcfabebd53ef0b4f3175a140fd5b1132788e718ca1 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5 WHIRLPOOL 01e27e011c94641498cf0c04a663e4f8f4844a57bd462aa38a1c23a8b3244e5eec226fb11b5e8e598de7227ac2d3dd33aaa98d16f6e7628329ac59e1e7ce62ae
-AUX freebsd-sources-9.0-disable-optimization.patch 927 SHA256 e8ad8d8ed1f729b7b22839a7af93b3dd667f257b05db95f408c48b270003a486 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b WHIRLPOOL 86f9586a3f07118f95e5fbce1a65fdd3be8dd701ed1bee1379ed2133cef3d9473b437826a13ec2a53c73f7b3e1003256d912a45eb80c86195749a8cd08f9813c
-AUX freebsd-sources-9.0-gentoo.patch 1194 SHA256 251178d014e62fbc3f20c26dd0e78401cc6691a848facd3ff2c7418ed7a43f22 SHA512 0c06b2e18ee8e97c8cc17eeaa50bd77a8a4fed0982cdc2f5cf3446b6020436bb91da256e8765a72ba4d384ebcb494f0b14c5302c4b956f540ff7374b6f55eea6 WHIRLPOOL 77a8bb44b6a18927eb21876672ece0bbfb79a57e29ea56df0eb484e5de37780156652330f03acfa7b8311b836d16ace56d52466a975cc036c3143c2994b14986
-AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953b9e8c8629c2302082e0ee172dd7e84a7104bdd5 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658 WHIRLPOOL c0511b2fec1f2ecc8a6e3aba23808a4c60a4c94f45693b6f21a30cb01386e24969fcc9b655584c78a501524579f7e266993fdd6d565525740f4f8e04f47b55a9
-AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
-AUX freebsd-sources-9.1-MFC-r239588.patch 3076 SHA256 c23f0f8b66c06e024413db49267d217225464c0f965d3ea4db07854c2e23458e SHA512 a11b6a7e7290a4c63dda13a15972cae57c21c0a23df8d3f7fe4679a2af273ea6b1be01b34e99148b4f61d83395f5453f65ccb3c2ebadfde57df02b9817e58e7b WHIRLPOOL 5ca75d43686d051e2282226ee4a82cc7e855353e409c1b08f98ea6b6a7d01b37b3bfac93483e6d5bf4883783a2608b4bb327cc5629877d77d4e1f2a68f1574e0
-AUX freebsd-sources-9.1-ciss.patch 2067 SHA256 a450312394a9ed449144c1b320ec323f8fcd6cb744ad6c6862046b0fd5086e4e SHA512 5b8088644813d465443754f248e0068da1c53b4f947b7c1e584ae9dcd9b7b135a53edd70efc463b500aef74c4f8193e2d1d349b39ce183ed1f18284a2c2d7989 WHIRLPOOL 59f1324eaa98e11a094e4fe48e8ad8f468bc373691de101c5082630d1a69d10a3e6d904f3b6138a2107b0f35f37c16f07da575c1efb4bbfa22869a7cf328e5e2
-AUX freebsd-sources-9.1-cve-2014-1453.patch 2239 SHA256 2605926b9a36cf2eecf65fc3bcc92ed772922562fdfebfd39c99137526f2a440 SHA512 27b48c96447cb961d2de3ad7f67a739ff78ee3904da508b2e6c1948d299090cb169bd3f289b0448e7d242c1c0d39fd5e5fc29700d92ba4877c3e6d013a6cd6a1 WHIRLPOOL 206c18f70756f77050c681ee4b14f7e0d0e38cac42d146ae0ccd9bd79a3977c4db57d1456c3bfe0294dad313eead5dfb748446e0fa401c98105ea53097505e45
-AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
-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-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
-AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
-AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-10.1.0.9999-r2.ebuild 3951 SHA256 3e5071a1dc764809739680dcb3fc123c34362e90531eb4efacec4a17b39bb389 SHA512 eef5c568e1009ba26408d7059d27d737f1f9777ecc3d1e553ed299f513244f20aa2ab01b1eec66a50064138d1c8fced7830660a94a3f8d6a0bf60cd8e4d647ef WHIRLPOOL 6504ffef793b3118751070ee7827fb8203603f2162304e92f525e9c7d6eeed7c4a8eb00af6875eafd2d50de5bfbfedcbd19956cc43e66a2812760f3a31f6f6b5
-MISC metadata.xml 410 SHA256 f29a086ab076d7e7924571990c4cab73cce2aec303e10cf3be057dfa0c8b27fd SHA512 d949aac7499d418fce878c099d47713112e1856346dbf7478e95c14f37a5f2c2fbd580a21b2330712e439d5be235bc2de69ac182bd46c1727e95fbb3b081dd0f WHIRLPOOL ffc6ba7653dfa4be5d63231043a64c85a3ad2409f98b8e1f9cf03dd51edb84b1ed0add5a613e591e9f2409c92e3be08e8b3f7f2073fa45f362c19ef72ec7f63d

diff --git a/sys-freebsd/freebsd-sources/files/config-GENTOO b/sys-freebsd/freebsd-sources/files/config-GENTOO
deleted file mode 100644
index 7c7eb26..0000000
--- a/sys-freebsd/freebsd-sources/files/config-GENTOO
+++ /dev/null
@@ -1,4 +0,0 @@
-# Kernel configuration for Gentoo/FreeBSD.
-include GENERIC
-ident GENTOO
-

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-EN-1407-pmap.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-EN-1407-pmap.patch
deleted file mode 100644
index 078d6e0..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-EN-1407-pmap.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sys/amd64/amd64/pmap.c
-===================================================================
---- sys/amd64/amd64/pmap.c	(revision 267572)
-+++ sys/amd64/amd64/pmap.c	(working copy)
-@@ -367,7 +367,7 @@ static int pmap_flags = PMAP_PDE_SUPERPAGE;	/* fla
- 
- static struct unrhdr pcid_unr;
- static struct mtx pcid_mtx;
--int pmap_pcid_enabled = 1;
-+int pmap_pcid_enabled = 0;
- SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN, &pmap_pcid_enabled,
-     0, "Is TLB Context ID enabled ?");
- int invpcid_works = 0;

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-SA-1417-kmem.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-SA-1417-kmem.patch
deleted file mode 100644
index 433da94..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-SA-1417-kmem.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-Index: sys/kern/uipc_sockbuf.c
-===================================================================
---- sys/kern/uipc_sockbuf.c	(revision 268273)
-+++ sys/kern/uipc_sockbuf.c	(working copy)
-@@ -1071,6 +1071,11 @@ sbcreatecontrol(caddr_t p, int size, int type, int
- 	m->m_len = 0;
- 	KASSERT(CMSG_SPACE((u_int)size) <= M_TRAILINGSPACE(m),
- 	    ("sbcreatecontrol: short mbuf"));
-+	/*
-+	 * Don't leave the padding between the msg header and the
-+	 * cmsg data and the padding after the cmsg data un-initialized.
-+	 */
-+	bzero(cp, CMSG_SPACE((u_int)size));
- 	if (p != NULL)
- 		(void)memcpy(CMSG_DATA(cp), p, size);
- 	m->m_len = CMSG_SPACE(size);
-Index: sys/netinet/sctp_auth.c
-===================================================================
---- sys/netinet/sctp_auth.c	(revision 268273)
-+++ sys/netinet/sctp_auth.c	(working copy)
-@@ -1790,6 +1790,7 @@ sctp_notify_authentication(struct sctp_tcb *stcb,
- 
- 	SCTP_BUF_LEN(m_notify) = 0;
- 	auth = mtod(m_notify, struct sctp_authkey_event *);
-+	memset(auth, 0, sizeof(struct sctp_authkey_event));
- 	auth->auth_type = SCTP_AUTHENTICATION_EVENT;
- 	auth->auth_flags = 0;
- 	auth->auth_length = sizeof(*auth);
-Index: sys/netinet/sctp_indata.c
-===================================================================
---- sys/netinet/sctp_indata.c	(revision 268273)
-+++ sys/netinet/sctp_indata.c	(working copy)
-@@ -250,6 +250,11 @@ sctp_build_ctl_nchunk(struct sctp_inpcb *inp, stru
- 
- 	/* We need a CMSG header followed by the struct */
- 	cmh = mtod(ret, struct cmsghdr *);
-+	/*
-+	 * Make sure that there is no un-initialized padding between the
-+	 * cmsg header and cmsg data and after the cmsg data.
-+	 */
-+	memset(cmh, 0, len);
- 	if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_RECVRCVINFO)) {
- 		cmh->cmsg_level = IPPROTO_SCTP;
- 		cmh->cmsg_len = CMSG_LEN(sizeof(struct sctp_rcvinfo));
-Index: sys/netinet/sctputil.c
-===================================================================
---- sys/netinet/sctputil.c	(revision 268273)
-+++ sys/netinet/sctputil.c	(working copy)
-@@ -2622,6 +2622,7 @@ sctp_notify_assoc_change(uint16_t state, struct sc
- 		}
- 		SCTP_BUF_NEXT(m_notify) = NULL;
- 		sac = mtod(m_notify, struct sctp_assoc_change *);
-+		memset(sac, 0, notif_len);
- 		sac->sac_type = SCTP_ASSOC_CHANGE;
- 		sac->sac_flags = 0;
- 		sac->sac_length = sizeof(struct sctp_assoc_change);
-@@ -2835,11 +2836,10 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uin
- 	if (m_notify == NULL)
- 		/* no space left */
- 		return;
--	length += chk->send_size;
--	length -= sizeof(struct sctp_data_chunk);
- 	SCTP_BUF_LEN(m_notify) = 0;
- 	if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) {
- 		ssfe = mtod(m_notify, struct sctp_send_failed_event *);
-+		memset(ssfe, 0, length);
- 		ssfe->ssfe_type = SCTP_SEND_FAILED_EVENT;
- 		if (sent) {
- 			ssfe->ssfe_flags = SCTP_DATA_SENT;
-@@ -2846,10 +2846,11 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uin
- 		} else {
- 			ssfe->ssfe_flags = SCTP_DATA_UNSENT;
- 		}
-+		length += chk->send_size;
-+		length -= sizeof(struct sctp_data_chunk);
- 		ssfe->ssfe_length = length;
- 		ssfe->ssfe_error = error;
- 		/* not exactly what the user sent in, but should be close :) */
--		bzero(&ssfe->ssfe_info, sizeof(ssfe->ssfe_info));
- 		ssfe->ssfe_info.snd_sid = chk->rec.data.stream_number;
- 		ssfe->ssfe_info.snd_flags = chk->rec.data.rcv_flags;
- 		ssfe->ssfe_info.snd_ppid = chk->rec.data.payloadtype;
-@@ -2859,6 +2860,7 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uin
- 		SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_send_failed_event);
- 	} else {
- 		ssf = mtod(m_notify, struct sctp_send_failed *);
-+		memset(ssf, 0, length);
- 		ssf->ssf_type = SCTP_SEND_FAILED;
- 		if (sent) {
- 			ssf->ssf_flags = SCTP_DATA_SENT;
-@@ -2865,6 +2867,8 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uin
- 		} else {
- 			ssf->ssf_flags = SCTP_DATA_UNSENT;
- 		}
-+		length += chk->send_size;
-+		length -= sizeof(struct sctp_data_chunk);
- 		ssf->ssf_length = length;
- 		ssf->ssf_error = error;
- 		/* not exactly what the user sent in, but should be close :) */
-@@ -2948,16 +2952,16 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, ui
- 		/* no space left */
- 		return;
- 	}
--	length += sp->length;
- 	SCTP_BUF_LEN(m_notify) = 0;
- 	if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) {
- 		ssfe = mtod(m_notify, struct sctp_send_failed_event *);
-+		memset(ssfe, 0, length);
- 		ssfe->ssfe_type = SCTP_SEND_FAILED_EVENT;
- 		ssfe->ssfe_flags = SCTP_DATA_UNSENT;
-+		length += sp->length;
- 		ssfe->ssfe_length = length;
- 		ssfe->ssfe_error = error;
- 		/* not exactly what the user sent in, but should be close :) */
--		bzero(&ssfe->ssfe_info, sizeof(ssfe->ssfe_info));
- 		ssfe->ssfe_info.snd_sid = sp->stream;
- 		if (sp->some_taken) {
- 			ssfe->ssfe_info.snd_flags = SCTP_DATA_LAST_FRAG;
-@@ -2971,12 +2975,13 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, ui
- 		SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_send_failed_event);
- 	} else {
- 		ssf = mtod(m_notify, struct sctp_send_failed *);
-+		memset(ssf, 0, length);
- 		ssf->ssf_type = SCTP_SEND_FAILED;
- 		ssf->ssf_flags = SCTP_DATA_UNSENT;
-+		length += sp->length;
- 		ssf->ssf_length = length;
- 		ssf->ssf_error = error;
- 		/* not exactly what the user sent in, but should be close :) */
--		bzero(&ssf->ssf_info, sizeof(ssf->ssf_info));
- 		ssf->ssf_info.sinfo_stream = sp->stream;
- 		ssf->ssf_info.sinfo_ssn = 0;
- 		if (sp->some_taken) {
-@@ -3038,6 +3043,7 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb
- 		return;
- 	SCTP_BUF_LEN(m_notify) = 0;
- 	sai = mtod(m_notify, struct sctp_adaptation_event *);
-+	memset(sai, 0, sizeof(struct sctp_adaptation_event));
- 	sai->sai_type = SCTP_ADAPTATION_INDICATION;
- 	sai->sai_flags = 0;
- 	sai->sai_length = sizeof(struct sctp_adaptation_event);
-@@ -3093,6 +3099,7 @@ sctp_notify_partial_delivery_indication(struct sct
- 		return;
- 	SCTP_BUF_LEN(m_notify) = 0;
- 	pdapi = mtod(m_notify, struct sctp_pdapi_event *);
-+	memset(pdapi, 0, sizeof(struct sctp_pdapi_event));
- 	pdapi->pdapi_type = SCTP_PARTIAL_DELIVERY_EVENT;
- 	pdapi->pdapi_flags = 0;
- 	pdapi->pdapi_length = sizeof(struct sctp_pdapi_event);
-@@ -3202,6 +3209,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb)
- 		/* no space left */
- 		return;
- 	sse = mtod(m_notify, struct sctp_shutdown_event *);
-+	memset(sse, 0, sizeof(struct sctp_shutdown_event));
- 	sse->sse_type = SCTP_SHUTDOWN_EVENT;
- 	sse->sse_flags = 0;
- 	sse->sse_length = sizeof(struct sctp_shutdown_event);
-@@ -3252,6 +3260,7 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb
- 	}
- 	SCTP_BUF_LEN(m_notify) = 0;
- 	event = mtod(m_notify, struct sctp_sender_dry_event *);
-+	memset(event, 0, sizeof(struct sctp_sender_dry_event));
- 	event->sender_dry_type = SCTP_SENDER_DRY_EVENT;
- 	event->sender_dry_flags = 0;
- 	event->sender_dry_length = sizeof(struct sctp_sender_dry_event);
-@@ -3284,7 +3293,6 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb
- 	struct mbuf *m_notify;
- 	struct sctp_queued_to_read *control;
- 	struct sctp_stream_change_event *stradd;
--	int len;
- 
- 	if ((stcb == NULL) ||
- 	    (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT))) {
-@@ -3297,25 +3305,20 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb
- 		return;
- 	}
- 	stcb->asoc.peer_req_out = 0;
--	m_notify = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_NOWAIT, 1, MT_DATA);
-+	m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_stream_change_event), 0, M_NOWAIT, 1, MT_DATA);
- 	if (m_notify == NULL)
- 		/* no space left */
- 		return;
- 	SCTP_BUF_LEN(m_notify) = 0;
--	len = sizeof(struct sctp_stream_change_event);
--	if (len > M_TRAILINGSPACE(m_notify)) {
--		/* never enough room */
--		sctp_m_freem(m_notify);
--		return;
--	}
- 	stradd = mtod(m_notify, struct sctp_stream_change_event *);
-+	memset(stradd, 0, sizeof(struct sctp_stream_change_event));
- 	stradd->strchange_type = SCTP_STREAM_CHANGE_EVENT;
- 	stradd->strchange_flags = flag;
--	stradd->strchange_length = len;
-+	stradd->strchange_length = sizeof(struct sctp_stream_change_event);
- 	stradd->strchange_assoc_id = sctp_get_associd(stcb);
- 	stradd->strchange_instrms = numberin;
- 	stradd->strchange_outstrms = numberout;
--	SCTP_BUF_LEN(m_notify) = len;
-+	SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_stream_change_event);
- 	SCTP_BUF_NEXT(m_notify) = NULL;
- 	if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) {
- 		/* no space */
-@@ -3346,7 +3349,6 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb
- 	struct mbuf *m_notify;
- 	struct sctp_queued_to_read *control;
- 	struct sctp_assoc_reset_event *strasoc;
--	int len;
- 
- 	if ((stcb == NULL) ||
- 	    (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT))) {
-@@ -3353,25 +3355,20 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb
- 		/* event not enabled */
- 		return;
- 	}
--	m_notify = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_NOWAIT, 1, MT_DATA);
-+	m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_assoc_reset_event), 0, M_NOWAIT, 1, MT_DATA);
- 	if (m_notify == NULL)
- 		/* no space left */
- 		return;
- 	SCTP_BUF_LEN(m_notify) = 0;
--	len = sizeof(struct sctp_assoc_reset_event);
--	if (len > M_TRAILINGSPACE(m_notify)) {
--		/* never enough room */
--		sctp_m_freem(m_notify);
--		return;
--	}
- 	strasoc = mtod(m_notify, struct sctp_assoc_reset_event *);
-+	memset(strasoc, 0, sizeof(struct sctp_assoc_reset_event));
- 	strasoc->assocreset_type = SCTP_ASSOC_RESET_EVENT;
- 	strasoc->assocreset_flags = flag;
--	strasoc->assocreset_length = len;
-+	strasoc->assocreset_length = sizeof(struct sctp_assoc_reset_event);
- 	strasoc->assocreset_assoc_id = sctp_get_associd(stcb);
- 	strasoc->assocreset_local_tsn = sending_tsn;
- 	strasoc->assocreset_remote_tsn = recv_tsn;
--	SCTP_BUF_LEN(m_notify) = len;
-+	SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_assoc_reset_event);
- 	SCTP_BUF_NEXT(m_notify) = NULL;
- 	if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) {
- 		/* no space */
-@@ -3424,6 +3421,7 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb,
- 		return;
- 	}
- 	strreset = mtod(m_notify, struct sctp_stream_reset_event *);
-+	memset(strreset, 0, len);
- 	strreset->strreset_type = SCTP_STREAM_RESET_EVENT;
- 	strreset->strreset_flags = flag;
- 	strreset->strreset_length = len;
-@@ -6236,9 +6234,12 @@ sctp_soreceive(struct socket *so,
- 		fromlen = 0;
- 	}
- 
-+	if (filling_sinfo) {
-+		memset(&sinfo, 0, sizeof(struct sctp_extrcvinfo));
-+	}
- 	error = sctp_sorecvmsg(so, uio, mp0, from, fromlen, flagsp,
- 	    (struct sctp_sndrcvinfo *)&sinfo, filling_sinfo);
--	if ((controlp) && (filling_sinfo)) {
-+	if (controlp != NULL) {
- 		/* copy back the sinfo in a CMSG format */
- 		if (filling_sinfo)
- 			*controlp = sctp_build_ctl_nchunk(inp,

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-clang34.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-clang34.patch
deleted file mode 100644
index 271b436..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-clang34.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://svnweb.freebsd.org/base/stable/10/sys/modules/drm2/radeonkms/Makefile?r1=260321&r2=256281&view=patch
-
-diff -Nur sys.orig/modules/drm2/radeonkms/Makefile sys/modules/drm2/radeonkms/Makefile
---- sys.orig/modules/drm2/radeonkms/Makefile	2014-01-25 00:19:59.000000000 +0900
-+++ sys/modules/drm2/radeonkms/Makefile	2014-01-25 00:22:07.000000000 +0900
-@@ -1,5 +1,7 @@
- # $FreeBSD: release/10.0.0/sys/modules/drm2/radeonkms/Makefile 254885 2013-08-25 19:37:15Z dumbbell $
- 
-+.include <bsd.own.mk>
-+
- .PATH:	${.CURDIR}/../../../dev/drm2/radeon
- 
- KMOD	= radeonkms
-@@ -101,7 +103,10 @@
- 	iicbus_if.h							\
- 	pci_if.h
- 
--CFLAGS  += -I${.CURDIR}/../../../dev/drm2/radeon			\
--	   -fms-extensions
-+
-+CFLAGS  += -I${.CURDIR}/../../../dev/drm2/radeon
-+.if ${COMPILER_TYPE} == "gcc"
-+CFLAGS	+= -fms-extensions
-+.endif
- 
- .include <bsd.kmod.mk>

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch
deleted file mode 100644
index c7e12bd..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
-index 2939a59..124ef6f 100644
---- a/sys/conf/kern.mk
-+++ b/sys/conf/kern.mk
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \
-+		-Wundef -Wno-pointer-sign \
- 		-Wmissing-include-dirs -fdiagnostics-show-option \
- 		${CWARNEXTRA}
- #
-@@ -61,7 +61,7 @@ FORMAT_EXTENSIONS=	-fformat-extensions
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${COMPILER_TYPE} != "clang"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
-+CFLAGS+=	-mpreferred-stack-boundary=2
- .else
- CFLAGS+=	-mno-aes -mno-avx
- .endif

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8612.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8612.patch
deleted file mode 100644
index 7c615d3..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8612.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: sys/netinet/sctp_usrreq.c
-===================================================================
---- sys/netinet/sctp_usrreq.c	(revision 277788)
-+++ sys/netinet/sctp_usrreq.c	(working copy)
-@@ -1863,8 +1863,9 @@ flags_out:
- 			SCTP_CHECK_AND_CAST(av, optval, struct sctp_stream_value, *optsize);
- 			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
- 			if (stcb) {
--				if (stcb->asoc.ss_functions.sctp_ss_get_value(stcb, &stcb->asoc, &stcb->asoc.strmout[av->stream_id],
--				    &av->stream_value) < 0) {
-+				if ((av->stream_id >= stcb->asoc.streamoutcnt) ||
-+				    (stcb->asoc.ss_functions.sctp_ss_get_value(stcb, &stcb->asoc, &stcb->asoc.strmout[av->stream_id],
-+				    &av->stream_value) < 0)) {
- 					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
- 					error = EINVAL;
- 				} else {
-@@ -4032,8 +4033,9 @@ sctp_setopt(struct socket *so, int optname, void *
- 			SCTP_CHECK_AND_CAST(av, optval, struct sctp_stream_value, optsize);
- 			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
- 			if (stcb) {
--				if (stcb->asoc.ss_functions.sctp_ss_set_value(stcb, &stcb->asoc, &stcb->asoc.strmout[av->stream_id],
--				    av->stream_value) < 0) {
-+				if ((av->stream_id >= stcb->asoc.streamoutcnt) ||
-+				    (stcb->asoc.ss_functions.sctp_ss_set_value(stcb, &stcb->asoc, &stcb->asoc.strmout[av->stream_id],
-+				    av->stream_value) < 0)) {
- 					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
- 					error = EINVAL;
- 				}
-@@ -4043,10 +4045,12 @@ sctp_setopt(struct socket *so, int optname, void *
- 					SCTP_INP_RLOCK(inp);
- 					LIST_FOREACH(stcb, &inp->sctp_asoc_list, sctp_tcblist) {
- 						SCTP_TCB_LOCK(stcb);
--						stcb->asoc.ss_functions.sctp_ss_set_value(stcb,
--						    &stcb->asoc,
--						    &stcb->asoc.strmout[av->stream_id],
--						    av->stream_value);
-+						if (av->stream_id < stcb->asoc.streamoutcnt) {
-+							stcb->asoc.ss_functions.sctp_ss_set_value(stcb,
-+							    &stcb->asoc,
-+							    &stcb->asoc.strmout[av->stream_id],
-+							    av->stream_value);
-+						}
- 						SCTP_TCB_UNLOCK(stcb);
- 					}
- 					SCTP_INP_RUNLOCK(inp);

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8613.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8613.patch
deleted file mode 100644
index 1e2fe91..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2014-8613.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Index: sys/netinet/sctp_input.c
-===================================================================
---- sys/netinet/sctp_input.c	(revision 277788)
-+++ sys/netinet/sctp_input.c	(working copy)
-@@ -3649,6 +3649,9 @@ sctp_handle_stream_reset_response(struct sctp_tcb
- 					/* huh ? */
- 					return (0);
- 				}
-+				if (ntohs(respin->ph.param_length) < sizeof(struct sctp_stream_reset_response_tsn)) {
-+					return (0);
-+				}
- 				if (action == SCTP_STREAM_RESET_RESULT_PERFORMED) {
- 					resp = (struct sctp_stream_reset_response_tsn *)respin;
- 					asoc->stream_reset_outstanding--;
-@@ -4037,7 +4040,7 @@ __attribute__((noinline))
- 	    sctp_handle_stream_reset(struct sctp_tcb *stcb, struct mbuf *m, int offset,
-         struct sctp_chunkhdr *ch_req)
- {
--	int chk_length, param_len, ptype;
-+	uint16_t remaining_length, param_len, ptype;
- 	struct sctp_paramhdr pstore;
- 	uint8_t cstore[SCTP_CHUNK_BUFFER_SIZE];
- 	uint32_t seq = 0;
-@@ -4050,7 +4053,7 @@ __attribute__((noinline))
- 	int num_param = 0;
- 
- 	/* now it may be a reset or a reset-response */
--	chk_length = ntohs(ch_req->chunk_length);
-+	remaining_length = ntohs(ch_req->chunk_length) - sizeof(struct sctp_chunkhdr);
- 
- 	/* setup for adding the response */
- 	sctp_alloc_a_chunk(stcb, chk);
-@@ -4088,20 +4091,27 @@ strres_nochunk:
- 	ch->chunk_length = htons(chk->send_size);
- 	SCTP_BUF_LEN(chk->data) = SCTP_SIZE32(chk->send_size);
- 	offset += sizeof(struct sctp_chunkhdr);
--	while ((size_t)chk_length >= sizeof(struct sctp_stream_reset_tsn_request)) {
-+	while (remaining_length >= sizeof(struct sctp_paramhdr)) {
- 		ph = (struct sctp_paramhdr *)sctp_m_getptr(m, offset, sizeof(pstore), (uint8_t *) & pstore);
--		if (ph == NULL)
-+		if (ph == NULL) {
-+			/* TSNH */
- 			break;
-+		}
- 		param_len = ntohs(ph->param_length);
--		if (param_len < (int)sizeof(struct sctp_stream_reset_tsn_request)) {
--			/* bad param */
-+		if ((param_len > remaining_length) ||
-+		    (param_len < (sizeof(struct sctp_paramhdr) + sizeof(uint32_t)))) {
-+			/* bad parameter length */
- 			break;
- 		}
--		ph = (struct sctp_paramhdr *)sctp_m_getptr(m, offset, min(param_len, (int)sizeof(cstore)),
-+		ph = (struct sctp_paramhdr *)sctp_m_getptr(m, offset, min(param_len, sizeof(cstore)),
- 		    (uint8_t *) & cstore);
-+		if (ph == NULL) {
-+			/* TSNH */
-+			break;
-+		}
- 		ptype = ntohs(ph->param_type);
- 		num_param++;
--		if (param_len > (int)sizeof(cstore)) {
-+		if (param_len > sizeof(cstore)) {
- 			trunc = 1;
- 		} else {
- 			trunc = 0;
-@@ -4113,6 +4123,9 @@ strres_nochunk:
- 		if (ptype == SCTP_STR_RESET_OUT_REQUEST) {
- 			struct sctp_stream_reset_out_request *req_out;
- 
-+			if (param_len < sizeof(struct sctp_stream_reset_out_request)) {
-+				break;
-+			}
- 			req_out = (struct sctp_stream_reset_out_request *)ph;
- 			num_req++;
- 			if (stcb->asoc.stream_reset_outstanding) {
-@@ -4126,6 +4139,9 @@ strres_nochunk:
- 		} else if (ptype == SCTP_STR_RESET_ADD_OUT_STREAMS) {
- 			struct sctp_stream_reset_add_strm *str_add;
- 
-+			if (param_len < sizeof(struct sctp_stream_reset_add_strm)) {
-+				break;
-+			}
- 			str_add = (struct sctp_stream_reset_add_strm *)ph;
- 			num_req++;
- 			sctp_handle_str_reset_add_strm(stcb, chk, str_add);
-@@ -4132,6 +4148,9 @@ strres_nochunk:
- 		} else if (ptype == SCTP_STR_RESET_ADD_IN_STREAMS) {
- 			struct sctp_stream_reset_add_strm *str_add;
- 
-+			if (param_len < sizeof(struct sctp_stream_reset_add_strm)) {
-+				break;
-+			}
- 			str_add = (struct sctp_stream_reset_add_strm *)ph;
- 			num_req++;
- 			sctp_handle_str_reset_add_out_strm(stcb, chk, str_add);
-@@ -4156,6 +4175,9 @@ strres_nochunk:
- 			struct sctp_stream_reset_response *resp;
- 			uint32_t result;
- 
-+			if (param_len < sizeof(struct sctp_stream_reset_response)) {
-+				break;
-+			}
- 			resp = (struct sctp_stream_reset_response *)ph;
- 			seq = ntohl(resp->response_seq);
- 			result = ntohl(resp->result);
-@@ -4167,7 +4189,11 @@ strres_nochunk:
- 			break;
- 		}
- 		offset += SCTP_SIZE32(param_len);
--		chk_length -= SCTP_SIZE32(param_len);
-+		if (remaining_length >= SCTP_SIZE32(param_len)) {
-+			remaining_length -= SCTP_SIZE32(param_len);
-+		} else {
-+			remaining_length = 0;
-+		}
- 	}
- 	if (num_req == 0) {
- 		/* we have no response free the stuff */

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-1414.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-1414.patch
deleted file mode 100644
index eeb65e0..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-cve-2015-1414.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: sys/netinet/igmp.c
-===================================================================
---- sys/netinet/igmp.c	(revision 278973)
-+++ sys/netinet/igmp.c	(working copy)
-@@ -1533,8 +1533,8 @@ igmp_input(struct mbuf *m, int off)
- 		case IGMP_VERSION_3: {
- 				struct igmpv3 *igmpv3;
- 				uint16_t igmpv3len;
--				uint16_t srclen;
--				int nsrc;
-+				uint16_t nsrc;
-+				int srclen;
- 
- 				IGMPSTAT_INC(igps_rcv_v3_queries);
- 				igmpv3 = (struct igmpv3 *)igmp;

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch
deleted file mode 100644
index 88710cf..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-===================================================================
---- fbsd-6.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-+++ fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-@@ -528,7 +528,7 @@ expand_macro(struct symbol *macro_symbol
- 
- 		/* Put back everything up until the replacement. */
- 		while (body_pos > next_match)
--			unput(*--body_pos);
-+			yyunput(*--body_pos, body_head);
- 
- 		/* Perform the replacement. */
- 		if (match_marg != NULL) {
-@@ -537,7 +537,7 @@ expand_macro(struct symbol *macro_symbol
- 			next_match = match_marg->replacement_text;
- 			strp = next_match + strlen(next_match);
- 			while (strp > next_match)
--				unput(*--strp);
-+				yyunput(*--strp, next_match);
- 
- 			/* Skip past the unexpanded macro arg. */
- 			body_pos -= match.rm_eo - match.rm_so;

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
deleted file mode 100644
index e74fcd3..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- sys/fs/ntfs/ntfs_vnops.c.orig	2006-10-17 17:31:36 -0300
-+++ sys/fs/ntfs/ntfs_vnops.c	2006-10-17 17:30:24 -0300
-@@ -507,8 +507,12 @@
- 
- 	/* Simulate . in every dir except ROOT */
- 	if( ip->i_number != NTFS_ROOTINO ) {
--		struct dirent dot = { NTFS_ROOTINO,
--				sizeof(struct dirent), DT_DIR, 1, "." };
-+		struct dirent dot;
-+		dot.d_fileno	= NTFS_ROOTINO;
-+		dot.d_reclen	= sizeof(struct dirent);
-+		dot.d_type	= DT_DIR;
-+		dot.d_namlen	= 1;
-+		bcopy(".", dot.d_name, 1);
- 
- 		if( uio->uio_offset < sizeof(struct dirent) ) {
- 			dot.d_fileno = ip->i_number;
-@@ -522,8 +526,12 @@
- 
- 	/* Simulate .. in every dir including ROOT */
- 	if( uio->uio_offset < 2 * sizeof(struct dirent) ) {
--		struct dirent dotdot = { NTFS_ROOTINO,
--				sizeof(struct dirent), DT_DIR, 2, ".." };
-+		struct dirent dotdot;
-+		dotdot.d_fileno	= NTFS_ROOTINO;
-+		dotdot.d_reclen	= sizeof(struct dirent);
-+		dotdot.d_type	= DT_DIR;
-+		dotdot.d_namlen	= 2;
-+		bcopy("..", dotdot.d_name, 2);
- 
- 		error = uiomove((char *)&dotdot,sizeof(struct dirent),uio);
- 		if(error)

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
deleted file mode 100644
index 13524ef..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur sys/fs/tmpfs.orig/tmpfs_vnops.c sys/fs/tmpfs/tmpfs_vnops.c
---- sys/fs/tmpfs.orig/tmpfs_vnops.c	2008-06-22 12:17:48 -0300
-+++ sys/fs/tmpfs/tmpfs_vnops.c	2008-06-28 12:05:10 -0300
-@@ -1459,6 +1459,30 @@
- 	return (0);
- }
- 
-+
-+/* --------------------------------------------------------------------- */
-+/* This does absolutely nothing */
-+#ifdef GENTOO_LIVECD
-+static int
-+tmpfs_whiteout(struct vop_whiteout_args *ap)
-+{
-+	switch (ap->a_flags) {
-+	case LOOKUP:
-+		return (0);
-+		break;
-+	case CREATE:
-+		return(EOPNOTSUPP);
-+		break;
-+	case DELETE:
-+		return (0);
-+		break;
-+	default:
-+		return(EOPNOTSUPP);
-+	}
-+	return(0);
-+}
-+#endif
-+
- /* --------------------------------------------------------------------- */
- 
- /*
-@@ -1484,6 +1508,9 @@
- 	.vop_mkdir =			tmpfs_mkdir,
- 	.vop_rmdir =			tmpfs_rmdir,
- 	.vop_symlink =			tmpfs_symlink,
-+#ifdef GENTOO_LIVECD
-+	.vop_whiteout =			tmpfs_whiteout,
-+#endif
- 	.vop_readdir =			tmpfs_readdir,
- 	.vop_readlink =			tmpfs_readlink,
- 	.vop_inactive =			tmpfs_inactive,

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch
deleted file mode 100644
index 3db46fa..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Make headers usable alone, include the headers they need.
-There are probably much more missing.
-
---- sys/net/if.h.old	2009-05-15 10:51:50 +0000
-+++ sys/net/if.h	2009-05-15 10:52:05 +0000
-@@ -34,6 +34,7 @@
- #define	_NET_IF_H_
- 
- #include <sys/cdefs.h>
-+#include <sys/socket.h>
- 
- #ifdef _KERNEL
- #include <sys/queue.h>

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
deleted file mode 100644
index 8de5df2..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes a compile error if XOPEN_SOURCE 600 is defined.
-
-See: http://www.mailinglistarchive.com/freebsd-current@×××××××.org/msg15011.html
-
---- sys/sys/types.h.orig
-+++ sys/sys/types.h
-@@ -46,7 +46,7 @@
- 
- #include <sys/_pthreadtypes.h>
- 
--#if __BSD_VISIBLE
-+#ifndef _POSIX_SOURCE
- typedef	unsigned char	u_char;
- typedef	unsigned short	u_short;
- typedef	unsigned int	u_int;

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch
deleted file mode 100644
index a7335f6..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fixes changing the default subnet route after removing an ip address.
-
-See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133
-and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html
-
-Thanks to Roy Marples.
---- sys/netinet/in.c.orig
-+++ sys/netinet/in.c
-@@ -858,6 +858,12 @@
- 	error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags);
- 	if (!error)
- 		target->ia_flags |= IFA_ROUTE;
-+	else if (error == EEXIST) {
-+		/*
-+		 * the fact that the route already exists is not an error.
-+		 */
-+		error = 0;
-+	}
- 	return (error);
- }
- 

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
deleted file mode 100644
index 4824ff6..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Taken from debian GNU/kFreeBSD.
-
-Regretably, with GCC 4.4 or later this is the only flag combination
-I could find that doesn't cause kernel panics CPU triple-faults or
-other kind of severe breakage. This is Gentoo Bug #410945.
-
-Clang can use -O2, so we do not force -O1 on it
-
---- a/sys/conf/kern.pre.mk
-+++ b/sys/conf/kern.pre.mk
-@@ -41,6 +41,9 @@
- .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
- COPTFLAGS+= -fno-strict-aliasing
- .endif
-+.if ${CC:T:Mclang} != "clang" && !empty(COPTFLAGS:M-O[23s])
-+COPTFLAGS+= -O1
-+.endif
- .if !defined(NO_CPU_COPTFLAGS)
- COPTFLAGS+= ${_CPUCFLAGS}
- .endif
---- a/sys/conf/kmod.mk
-+++ b/sys/conf/kmod.mk
-@@ -91,6 +91,9 @@
- .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
- CFLAGS+=	-fno-strict-aliasing
- .endif
-+.if ${CC:T:Mclang} != "clang" && !empty(CFLAGS:M-O[23s])
-+CFLAGS+=	-O1
-+.endif
- WERROR?=	-Werror
- CFLAGS+=	${WERROR}
- CFLAGS+=	-D_KERNEL

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch
deleted file mode 100644
index 840af81..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -uNr sys.old/conf/kern.mk sys/conf/kern.mk
---- sys.old/conf/kern.mk	2011-11-02 13:02:13.000000000 +0000
-+++ sys/conf/kern.mk	2011-11-02 13:05:53.000000000 +0000
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-Wundef -Wno-pointer-sign -fformat-extensions \
-+		-Wundef -Wno-pointer-sign \
- 		-Wmissing-include-dirs -fdiagnostics-show-option
- #
- # The following flags are next up for working on:
-@@ -32,7 +32,7 @@
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${CC:T:Mclang} != "clang"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2 -mno-sse
-+CFLAGS+=	-mpreferred-stack-boundary=2 -mno-sse
- .else
- CFLAGS+=	-mno-aes -mno-avx
- .endif
-diff -uNr sys.old/dev/aic7xxx/aicasm/Makefile sys/dev/aic7xxx/aicasm/Makefile
---- sys.old/dev/aic7xxx/aicasm/Makefile	2011-11-02 13:02:11.000000000 +0000
-+++ sys/dev/aic7xxx/aicasm/Makefile	2011-11-02 13:06:24.000000000 +0000
-@@ -14,7 +14,7 @@
- SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD=	${LIBL}
--LDADD=	-ll
-+LDADD=	-lfl
- WARNS?=	5
- 
- # Correct path for kernel builds

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
deleted file mode 100644
index f0984f6..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Index: sys/netinet6/in6.c
-===================================================================
---- sys/netinet6/in6.c.orig
-+++ sys/netinet6/in6.c
-@@ -1369,6 +1369,8 @@ in6_purgeaddr(struct ifaddr *ifa)
- 	}
- 
- cleanup:
-+	if (ifa0 != NULL)
-+		ifa_free(ifa0);
- 
- 	plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */
- 	if ((ia->ia_flags & IFA_ROUTE) && plen == 128) {
-@@ -1393,8 +1395,6 @@ cleanup:
- 			return;
- 		ia->ia_flags &= ~IFA_ROUTE;
- 	}
--	if (ifa0 != NULL)
--		ifa_free(ifa0);
- 
- 	in6_unlink_ifa(ia, ifp);
- }
-@@ -1667,14 +1667,19 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, c
- 			hostid = IFA_IN6(ifa);
- 
- 			/* prefixlen must be <= 64. */
--			if (64 < iflr->prefixlen)
-+			if (64 < iflr->prefixlen) {
-+				if (ifa != NULL)
-+					ifa_free(ifa);
- 				return EINVAL;
-+			}
- 			prefixlen = iflr->prefixlen;
- 
- 			/* hostid part must be zero. */
- 			sin6 = (struct sockaddr_in6 *)&iflr->addr;
- 			if (sin6->sin6_addr.s6_addr32[2] != 0 ||
- 			    sin6->sin6_addr.s6_addr32[3] != 0) {
-+				if (ifa != NULL)
-+					ifa_free(ifa);
- 				return EINVAL;
- 			}
- 		} else
-@@ -2265,14 +2265,20 @@ in6_ifawithifp(struct ifnet *ifp, struct in6_addr
- 		IN6_IFADDR_RUNLOCK();
- 		return (struct in6_ifaddr *)ifa;
- 	}
--	IN6_IFADDR_RUNLOCK();
- 
- 	/* use the last-resort values, that are, deprecated addresses */
--	if (dep[0])
-+	if (dep[0]) {
-+		ifa_ref((struct ifaddr *)dep[0]);
-+		IN6_IFADDR_RUNLOCK();
- 		return dep[0];
--	if (dep[1])
-+	}
-+	if (dep[1]) {
-+		ifa_ref((struct ifaddr *)dep[1]);
-+		IN6_IFADDR_RUNLOCK();
- 		return dep[1];
-+	}
- 
-+	IN6_IFADDR_RUNLOCK();
- 	return NULL;
- }
- 
-Index: sys/netinet6/ip6_input.c
-===================================================================
---- sys/netinet6/ip6_input.c.orig
-+++ sys/netinet6/ip6_input.c
-@@ -879,19 +879,23 @@ passin:
- 	 * as our interface address (e.g. multicast addresses, addresses
- 	 * within FAITH prefixes and such).
- 	 */
--	if (deliverifp && !ip6_getdstifaddr(m)) {
-+	if (deliverifp) {
- 		struct in6_ifaddr *ia6;
- 
--		ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
--		if (ia6) {
--			if (!ip6_setdstifaddr(m, ia6)) {
--				/*
--				 * XXX maybe we should drop the packet here,
--				 * as we could not provide enough information
--				 * to the upper layers.
--				 */
-+ 		if ((ia6 = ip6_getdstifaddr(m)) != NULL) {
-+			ifa_free(&ia6->ia_ifa);
-+		} else {
-+			ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
-+			if (ia6) {
-+				if (!ip6_setdstifaddr(m, ia6)) {
-+					/*
-+					 * XXX maybe we should drop the packet here,
-+					 * as we could not provide enough information
-+					 * to the upper layers.
-+					 */
-+				}
-+				ifa_free(&ia6->ia_ifa);
- 			}
--			ifa_free(&ia6->ia_ifa);
- 		}
- 	}
- 
-Index: sys/netinet/tcp_input.c
-===================================================================
---- sys/netinet/tcp_input.c.orig
-+++ sys/netinet/tcp_input.c
-@@ -512,6 +512,8 @@ tcp6_input(struct mbuf **mp, int *offp, int proto)
- 			    (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
- 		return IPPROTO_DONE;
- 	}
-+	if (ia6)
-+		ifa_free(&ia6->ia_ifa);
- 
- 	tcp_input(m, *offp);
- 	return IPPROTO_DONE;
-@@ -1240,7 +1242,8 @@ relocked:
- 				rstreason = BANDLIM_RST_OPENPORT;
- 				goto dropwithreset;
- 			}
--			ifa_free(&ia6->ia_ifa);
-+			if (ia6)
-+				ifa_free(&ia6->ia_ifa);
- 		}
- #endif /* INET6 */
- 		/*

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch
deleted file mode 100644
index 751a77c..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-u_int is defined in sys/types.h
-makes header usable alone.
-
---- sys/sys/sysctl.h.old	2012-05-25 11:08:53.000000000 -0400
-+++ sys/sys/sysctl.h	2012-05-25 11:09:16.000000000 -0400
-@@ -788,6 +788,7 @@
- 		    struct sysctl_req *);
- #else	/* !_KERNEL */
- #include <sys/cdefs.h>
-+#include <sys/types.h> /* for u_int */
- 
- __BEGIN_DECLS
- int	sysctl(const int *, u_int, void *, size_t *, const void *, size_t);

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-MFC-r239588.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-MFC-r239588.patch
deleted file mode 100644
index 5390d0e..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-MFC-r239588.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-https://bugs.gentoo.org/444918
-
-Taken from
-http://svnweb.freebsd.org/base/stable/9/sys/kern/vfs_subr.c?r1=237839&r2=239755&view=patch
-
-FYI,
-http://svnweb.freebsd.org/base?view=revision&amp;revision=239588
-
---- stable/9/sys/kern/vfs_subr.c	2012/06/30 14:17:59	237839
-+++ stable/9/sys/kern/vfs_subr.c	2012/08/27 20:25:26	239755
-@@ -41,6 +41,7 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
- 
-+#include "opt_compat.h"
- #include "opt_ddb.h"
- #include "opt_watchdog.h"
- 
-@@ -3110,22 +3111,50 @@
- /*
-  * Fill in a struct xvfsconf based on a struct vfsconf.
-  */
--static void
--vfsconf2x(struct vfsconf *vfsp, struct xvfsconf *xvfsp)
-+static int
-+vfsconf2x(struct sysctl_req *req, struct vfsconf *vfsp)
- {
-+	struct xvfsconf xvfsp;
- 
--	strcpy(xvfsp->vfc_name, vfsp->vfc_name);
--	xvfsp->vfc_typenum = vfsp->vfc_typenum;
--	xvfsp->vfc_refcount = vfsp->vfc_refcount;
--	xvfsp->vfc_flags = vfsp->vfc_flags;
-+	bzero(&xvfsp, sizeof(xvfsp));
-+	strcpy(xvfsp.vfc_name, vfsp->vfc_name);
-+	xvfsp.vfc_typenum = vfsp->vfc_typenum;
-+	xvfsp.vfc_refcount = vfsp->vfc_refcount;
-+	xvfsp.vfc_flags = vfsp->vfc_flags;
- 	/*
- 	 * These are unused in userland, we keep them
- 	 * to not break binary compatibility.
- 	 */
--	xvfsp->vfc_vfsops = NULL;
--	xvfsp->vfc_next = NULL;
-+	xvfsp.vfc_vfsops = NULL;
-+	xvfsp.vfc_next = NULL;
-+	return (SYSCTL_OUT(req, &xvfsp, sizeof(xvfsp)));
- }
- 
-+#ifdef COMPAT_FREEBSD32
-+struct xvfsconf32 {
-+	uint32_t	vfc_vfsops;
-+	char		vfc_name[MFSNAMELEN];
-+	int32_t		vfc_typenum;
-+	int32_t		vfc_refcount;
-+	int32_t		vfc_flags;
-+	uint32_t	vfc_next;
-+};
-+
-+static int
-+vfsconf2x32(struct sysctl_req *req, struct vfsconf *vfsp)
-+{
-+	struct xvfsconf32 xvfsp;
-+
-+	strcpy(xvfsp.vfc_name, vfsp->vfc_name);
-+	xvfsp.vfc_typenum = vfsp->vfc_typenum;
-+	xvfsp.vfc_refcount = vfsp->vfc_refcount;
-+	xvfsp.vfc_flags = vfsp->vfc_flags;
-+	xvfsp.vfc_vfsops = 0;
-+	xvfsp.vfc_next = 0;
-+	return (SYSCTL_OUT(req, &xvfsp, sizeof(xvfsp)));
-+}
-+#endif
-+
- /*
-  * Top level filesystem related information gathering.
-  */
-@@ -3133,14 +3162,16 @@
- sysctl_vfs_conflist(SYSCTL_HANDLER_ARGS)
- {
- 	struct vfsconf *vfsp;
--	struct xvfsconf xvfsp;
- 	int error;
- 
- 	error = 0;
- 	TAILQ_FOREACH(vfsp, &vfsconf, vfc_list) {
--		bzero(&xvfsp, sizeof(xvfsp));
--		vfsconf2x(vfsp, &xvfsp);
--		error = SYSCTL_OUT(req, &xvfsp, sizeof xvfsp);
-+#ifdef COMPAT_FREEBSD32
-+		if (req->flags & SCTL_MASK32)
-+			error = vfsconf2x32(req, vfsp);
-+		else
-+#endif
-+			error = vfsconf2x(req, vfsp);
- 		if (error)
- 			break;
- 	}
-@@ -3160,7 +3191,6 @@
- 	int *name = (int *)arg1 - 1;	/* XXX */
- 	u_int namelen = arg2 + 1;	/* XXX */
- 	struct vfsconf *vfsp;
--	struct xvfsconf xvfsp;
- 
- 	printf("WARNING: userland calling deprecated sysctl, "
- 	    "please rebuild world\n");
-@@ -3184,9 +3214,12 @@
- 				break;
- 		if (vfsp == NULL)
- 			return (EOPNOTSUPP);
--		bzero(&xvfsp, sizeof(xvfsp));
--		vfsconf2x(vfsp, &xvfsp);
--		return (SYSCTL_OUT(req, &xvfsp, sizeof(xvfsp)));
-+#ifdef COMPAT_FREEBSD32
-+		if (req->flags & SCTL_MASK32)
-+			return (vfsconf2x32(req, vfsp));
-+		else
-+#endif
-+			return (vfsconf2x(req, vfsp));
- 	}
- 	return (EOPNOTSUPP);
- }

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
deleted file mode 100644
index 697984b..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: sys/dev/ciss/ciss.c
-===================================================================
---- sys/dev/ciss/ciss.c	(revision 264510)
-+++ sys/dev/ciss/ciss.c	(revision 264511)
-@@ -180,8 +180,6 @@
- static void	ciss_cam_poll(struct cam_sim *sim);
- static void	ciss_cam_complete(struct ciss_request *cr);
- static void	ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio);
--static struct cam_periph *ciss_find_periph(struct ciss_softc *sc,
--					   int bus, int target);
- static int	ciss_name_device(struct ciss_softc *sc, int bus, int target);
- 
- /* periodic status monitoring */
-@@ -3398,27 +3396,6 @@
- 
- 
- /********************************************************************************
-- * Find a peripheral attached at (target)
-- */
--static struct cam_periph *
--ciss_find_periph(struct ciss_softc *sc, int bus, int target)
--{
--    struct cam_periph	*periph;
--    struct cam_path	*path;
--    int			status;
--
--    status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
--			     target, 0);
--    if (status == CAM_REQ_CMP) {
--	periph = cam_periph_find(path, NULL);
--	xpt_free_path(path);
--    } else {
--	periph = NULL;
--    }
--    return(periph);
--}
--
--/********************************************************************************
-  * Name the device at (target)
-  *
-  * XXX is this strictly correct?
-@@ -3427,12 +3404,22 @@
- ciss_name_device(struct ciss_softc *sc, int bus, int target)
- {
-     struct cam_periph	*periph;
-+    struct cam_path	*path;
-+    int			status;
- 
-     if (CISS_IS_PHYSICAL(bus))
- 	return (0);
--    if ((periph = ciss_find_periph(sc, bus, target)) != NULL) {
-+
-+    status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
-+			     target, 0);
-+
-+    if (status == CAM_REQ_CMP) {
-+    	mtx_lock(&sc->ciss_mtx);
-+	periph = cam_periph_find(path, NULL);
- 	sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
- 		periph->periph_name, periph->unit_number);
-+    	mtx_unlock(&sc->ciss_mtx);
-+	xpt_free_path(path);
- 	return(0);
-     }
-     sc->ciss_logical[bus][target].cl_name[0] = 0;

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch
deleted file mode 100644
index fe9e97e..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: sys/fs/nfsserver/nfs_nfsdserv.c
-===================================================================
---- sys/fs/nfsserver/nfs_nfsdserv.c	(revision 264251)
-+++ sys/fs/nfsserver/nfs_nfsdserv.c	(working copy)
-@@ -1457,10 +1457,23 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 		nfsvno_relpathbuf(&fromnd);
- 		goto out;
- 	}
-+	/*
-+	 * Unlock dp in this code section, so it is unlocked before
-+	 * tdp gets locked. This avoids a potential LOR if tdp is the
-+	 * parent directory of dp.
-+	 */
- 	if (nd->nd_flag & ND_NFSV4) {
- 		tdp = todp;
- 		tnes = *toexp;
--		tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, p, 0);
-+		if (dp != tdp) {
-+			NFSVOPUNLOCK(dp, 0);
-+			tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
-+			    p, 0);	/* Might lock tdp. */
-+		} else {
-+			tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
-+			    p, 1);
-+			NFSVOPUNLOCK(dp, 0);
-+		}
- 	} else {
- 		tfh.nfsrvfh_len = 0;
- 		error = nfsrv_mtofh(nd, &tfh);
-@@ -1481,10 +1494,12 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 			tnes = *exp;
- 			tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
- 			    p, 1);
-+			NFSVOPUNLOCK(dp, 0);
- 		} else {
-+			NFSVOPUNLOCK(dp, 0);
- 			nd->nd_cred->cr_uid = nd->nd_saveduid;
- 			nfsd_fhtovp(nd, &tfh, LK_EXCLUSIVE, &tdp, &tnes, NULL,
--			    0, p);
-+			    0, p);	/* Locks tdp. */
- 			if (tdp) {
- 				tdirfor_ret = nfsvno_getattr(tdp, &tdirfor,
- 				    nd->nd_cred, p, 1);
-@@ -1499,7 +1514,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 		if (error) {
- 			if (tdp)
- 				vrele(tdp);
--			vput(dp);
-+			vrele(dp);
- 			nfsvno_relpathbuf(&fromnd);
- 			nfsvno_relpathbuf(&tond);
- 			goto out;
-@@ -1514,7 +1529,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 		}
- 		if (tdp)
- 			vrele(tdp);
--		vput(dp);
-+		vrele(dp);
- 		nfsvno_relpathbuf(&fromnd);
- 		nfsvno_relpathbuf(&tond);
- 		goto out;
-@@ -1523,7 +1538,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
- 	/*
- 	 * Done parsing, now down to business.
- 	 */
--	nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 1, exp, p, &fdirp);
-+	nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 0, exp, p, &fdirp);
- 	if (nd->nd_repstat) {
- 		if (nd->nd_flag & ND_NFSV3) {
- 			nfsrv_wcc(nd, fdirfor_ret, &fdirfor, fdiraft_ret,

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
deleted file mode 100644
index b02d8b6..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk
---- sys.orig/conf/kern.mk	2012-07-12 13:26:37.000000000 +0900
-+++ sys/conf/kern.mk	2012-07-16 02:32:19.000000000 +0900
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-Wundef -Wno-pointer-sign -fformat-extensions \
-+		-Wundef -Wno-pointer-sign \
- 		-Wmissing-include-dirs -fdiagnostics-show-option \
- 		${CWARNEXTRA}
- #
-@@ -52,7 +52,7 @@
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
-+CFLAGS+=	-mpreferred-stack-boundary=2
- .else
- CFLAGS+=	-mno-aes -mno-avx
- .endif

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch
deleted file mode 100644
index 2f82a5f..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: sys/netinet/tcp_reass.c
-===================================================================
---- sys/netinet/tcp_reass.c	(revision 264836)
-+++ sys/netinet/tcp_reass.c	(working copy)
-@@ -211,7 +211,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int
- 	 * Investigate why and re-evaluate the below limit after the behaviour
- 	 * is understood.
- 	 */
--	if (th->th_seq != tp->rcv_nxt &&
-+	if ((th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) &&
- 	    tp->t_segqlen >= (so->so_rcv.sb_hiwat / tp->t_maxseg) + 1) {
- 		V_tcp_reass_overflows++;
- 		TCPSTAT_INC(tcps_rcvmemdrop);
-@@ -234,7 +234,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int
- 	 */
- 	te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT);
- 	if (te == NULL) {
--		if (th->th_seq != tp->rcv_nxt) {
-+		if (th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) {
- 			TCPSTAT_INC(tcps_rcvmemdrop);
- 			m_freem(m);
- 			*tlenp = 0;
-@@ -282,7 +282,8 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int
- 				TCPSTAT_INC(tcps_rcvduppack);
- 				TCPSTAT_ADD(tcps_rcvdupbyte, *tlenp);
- 				m_freem(m);
--				uma_zfree(V_tcp_reass_zone, te);
-+				if (te != &tqs)
-+					uma_zfree(V_tcp_reass_zone, te);
- 				tp->t_segqlen--;
- 				/*
- 				 * Try to present any queued data

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch
deleted file mode 100644
index 9076fd2..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
-index e504f75..7aa63df 100644
---- a/sys/conf/newvers.sh
-+++ b/sys/conf/newvers.sh
-@@ -86,7 +86,7 @@ fi
- touch version
- v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
- i=`${MAKE:-make} -V KERN_IDENT`
--compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
-+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1)
- 
- for dir in /bin /usr/bin /usr/local/bin; do
- 	if [ -x "${dir}/svnversion" ] ; then

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo.patch
deleted file mode 100644
index 0aa1d6e..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk
---- sys.orig/conf/kern.mk	2012-12-31 17:51:27.000000000 +0900
-+++ sys/conf/kern.mk	2012-12-31 17:55:03.000000000 +0900
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-Wundef -Wno-pointer-sign -fformat-extensions \
-+		-Wundef -Wno-pointer-sign \
- 		-Wmissing-include-dirs -fdiagnostics-show-option \
- 		${CWARNEXTRA}
- #
-@@ -52,7 +52,7 @@
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${COMPILER_TYPE} != "clang"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
-+CFLAGS+=	-mpreferred-stack-boundary=2
- .else
- CFLAGS+=	-mno-aes -mno-avx
- .endif

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
deleted file mode 100644
index 0bf1b61..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: sys/amd64/amd64/trap.c
-===================================================================
---- sys/amd64/amd64/trap.c.orig
-+++ sys/amd64/amd64/trap.c	(working copy)
-@@ -972,4 +972,21 @@
- 	     syscallname(td->td_proc, sa.code)));
- 
- 	syscallret(td, error, &sa);
-+
-+	/*
-+	 * If the user-supplied value of %rip is not a canonical
-+	 * address, then some CPUs will trigger a ring 0 #GP during
-+	 * the sysret instruction.  However, the fault handler would
-+	 * execute with the user's %gs and %rsp in ring 0 which would
-+	 * not be safe.  Instead, preemptively kill the thread with a
-+	 * SIGBUS.
-+	 */
-+	if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
-+		ksiginfo_init_trap(&ksi);
-+		ksi.ksi_signo = SIGBUS;
-+		ksi.ksi_code = BUS_OBJERR;
-+		ksi.ksi_trapno = T_PROTFLT;
-+		ksi.ksi_addr = (void *)td->td_frame->tf_rip;
-+		trapsignal(td, &ksi);
-+	}
- }

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch
deleted file mode 100644
index 08110d6..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-4576.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: sys/compat/linux/linux_ioctl.c
-===================================================================
---- sys/compat/linux/linux_ioctl.c	(revision 242578)
-+++ sys/compat/linux/linux_ioctl.c	(working copy)
-@@ -2260,8 +2260,9 @@ again:
- 
- 	ifc.ifc_len = valid_len; 
- 	sbuf_finish(sb);
--	memcpy(PTRIN(ifc.ifc_buf), sbuf_data(sb), ifc.ifc_len);
--	error = copyout(&ifc, uifc, sizeof(ifc));
-+	error = copyout(sbuf_data(sb), PTRIN(ifc.ifc_buf), ifc.ifc_len);
-+	if (error == 0)
-+		error = copyout(&ifc, uifc, sizeof(ifc));
- 	sbuf_delete(sb);
- 	CURVNET_RESTORE();
- 

diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.9999-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.9999-r2.ebuild
deleted file mode 100644
index ad398cc..0000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1.0.9999-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-
-IUSE="+build-kernel debug dtrace profile zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${SYS}.tar.xz
-		mirror://gentoo/${UBIN}.tar.xz"
-fi
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!sys-freebsd/virtio-kmod
-	!sys-fs/fuse4bsd
-	!<sys-freebsd/freebsd-sources-9.2_beta1"
-DEPEND="build-kernel? (
-		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		!sparc-fbsd? ( sys-devel/clang )
-		>=sys-freebsd/freebsd-usbin-9.1
-		=sys-freebsd/freebsd-mk-defs-${RV}*
-	)"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENTOO
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
-	"${FILESDIR}/${PN}-10.1-cve-2014-8612.patch"
-	"${FILESDIR}/${PN}-10.1-cve-2014-8613.patch"
-	"${FILESDIR}/${PN}-10.1-cve-2015-1414.patch" )
-
-pkg_setup() {
-	# Force set CC=clang. when using gcc, aesni fails to build.
-	use sparc-fbsd || export CC=clang
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
-}
-
-src_prepare() {
-	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 10.0-RELEASE it's 1000001.
-	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	# Set the kernel configuration using USE flags.
-	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
-	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
-	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
-
-	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
-	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
-	if use build-kernel ; then
-		tc-export CC
-		cd "${S}/$(tc-arch-kernel)/conf" || die
-		config ${KERN_BUILD} || die
-	fi
-}
-
-src_compile() {
-	if use build-kernel ; then
-		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
-			cd "${WORKDIR}"/usr.bin/bmake || die
-			if [[ -e /usr/lib/libgcc.a ]] ; then
-				freebsd_src_compile
-			else
-				local CC_SAVE="${CC}"
-				CC=gcc freebsd_src_compile
-				export CC="${CC_SAVE}"
-			fi
-			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
-		fi
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_compile depend
-		freebsd_src_compile
-	else
-		einfo "Nothing to compile.."
-	fi
-}
-
-src_install() {
-	if use build-kernel ; then
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_install
-		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
-		cd "${S}"
-	fi
-
-	insinto "/usr/src/sys"
-	doins -r "${S}/"*
-}
-
-pkg_preinst() {
-	if [[ -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys is a symlink, removing it..."
-		rm -f "${ROOT}/usr/src/sys"
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-}

diff --git a/sys-freebsd/freebsd-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml
deleted file mode 100644
index 798b447..0000000
--- a/sys-freebsd/freebsd-sources/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>bsd</herd>
-  <use>
-    <flag name='build-kernel'>Build and install a kernel (recommended).</flag>
-    <flag name='dtrace'>Enable DTrace support.</flag>
-    <flag name='newcons'>Enable Newcons support.</flag>
-    <flag name='zfs'>Enable ZFS support.</flag>
-  </use>
-</pkgmetadata>

diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
deleted file mode 100644
index d9eee94..0000000
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
-AUX freebsd-ubin-10.0-atf.patch 424 SHA256 31ac8807f4088b75ae4684316f18f3096363ee2d8bb1d5c47d9caab77e6cd5f5 SHA512 b343441f49d3fd41221766c7b54b8f831cf6e19f4400b6a0913e16476e32fd70603c28fc5a8d82eef54afc50c4a999d5151bdd96b243495bca319a0f69a6e860 WHIRLPOOL e4f2ab98d015c7656d3da2364e9dc9c6f675ac95fed05bbb886edf5efc79c843103ba9eaac13376cb9f5c5f02d37fed485a54db508ca350a13d5de2483403045
-AUX freebsd-ubin-10.0-dtc-gcc46.patch 591 SHA256 0adcc784a7fa6a6d8bd867d39b46149c4b61c3751e1ce5eb0a50d0e07d927b60 SHA512 a47ae1540cf2d7f71b718dad84010f725312bc0308cc61b99ab3560a5a18c67c8a34b54d9b99c0974b0662519c20c43c81843fca10d252178f888a14a6990eae WHIRLPOOL 6ae4e254b78d026e634fc1f26c304fc3026b8ceb7a8f7746a5480f61dbd8676aad07d0571f57b31279df119fbace4e8bb2ef7d246cf5d78566905e056bbf4d77
-AUX freebsd-ubin-10.0-kdump-ioctl.patch 1027 SHA256 7fe03c7e7cdbffdabf64557fa63eae0243a28be9025fc735393048ed2dca12c1 SHA512 6fda9d9ab4210d952277b112a5c4a2e75fcff3f63debde980ca791c6f6471038fda26d1e3ddf809384d95525e9ec9140f7b5af17dee8c11967e0b4bc9ea2b850 WHIRLPOOL 1ae5e229824a4371940ef7a0c9d8bae78aada8bcd73371a4479ced9013c55137bd4b153e296ee5873c8a9042607e86273754589e6a2a38519ba5ac78ee442740
-AUX freebsd-ubin-10.0-mandoc.patch 375 SHA256 c4d14aabe0a39bc2c12ca87b6c83628ea1c46640044bbd6946f3e6af343348b6 SHA512 b2789a57ce9afd5b7fe2989f37d246b2034b1578314ac0f6e7c4af26e81f73d043ea3440edee7c30b82fc0ddf5a4592cc3c3c6871ed0eb5fc6932bdf97a88d68 WHIRLPOOL 8e9fa01e662376225c69b41890c1f518c23116ff105ec45c43958d5749b3e265af5dd799e2c2fed5c078e0ca42f8ac988dfe7acb401875c7a769cfe38b14c56a
-AUX freebsd-ubin-6.0-bsdcmp.patch 413 SHA256 a0a99a602538d95ddae2fc4b823150ea58862def87c8196806a379233e3ddb2c SHA512 1516d984e7e17e8a3474ce519c9e5d6fefaee244ad27f1ed21af73335a6a25275e842007e71a60d6b18aa049f84c87b349f3350664cea03885cd55a846a73d50 WHIRLPOOL 7a23988970695ccdeaadfce96a0bf05e986736d0c93079cddf0101c0b17b7e5f3421e5da6c1e2b6e0c96ff025dd8d80effc392064ce9ff1cb2e0bce0e8d90b35
-AUX freebsd-ubin-6.0-kdump-ioctl.patch 1111 SHA256 71f41de71568dd819e39c871dd5e570141f243dbabb23d855505c38bec4e9de9 SHA512 53f2decb5a695b8daa4db10ac4f72b5a1d4fa58bd151314211f0ce230de5247a64e360855cef10b9e0c195146a704acb7f4cec623501516dfb9dcce09946262e WHIRLPOOL 48d2be90273b6ce1a0b4701a77d5a10e7e26f9f595b54b35cc410d81266c104c67c1fd1d735b659d41e4c3e02261cc79a85f3fe61c45ce79e4dadd1cf17b877a
-AUX freebsd-ubin-8.0-bsdar.patch 556 SHA256 cb81663b4cbb91372b492f2d8c430c166fe4f425fc464a94bb08ea43e23f278d SHA512 46ac4dc366571be48fb6bd131dba49253a3f6e54f68c33bb5b4fede5143c3b96dc107fbd1c3159e15f3816d3b716238c0dc162c958798fbafb5074603c7da430 WHIRLPOOL 32c57b0ccb3b2256e1169da0f7b4d9a3a6300cf703e792ab7286255a12bbaca983bb65ea1c42f6115fc071ee923b5182401e1d14461bf5407269a17361ce003d
-AUX freebsd-ubin-8.0-xinstall.patch 1014 SHA256 124cd30b5f44425d0914c64fd8ae98242c9649e4eb0cb1f786839137532504d6 SHA512 a39843600497876287c13a10ca783041123631ef7a82501df323c6a118eb20d871fa6683b812eeebea220c4cfa1eba81450dc7de7ea08888229f326375ff285d WHIRLPOOL 94e16b120a39e5331fa5db7bcda4ba970c3c92049122e958f4ea378936bd384671955af700053d8ae89d6a0c118abae61751cc2e866f719f882559801c6db359
-AUX freebsd-ubin-9.0-fixmakefiles.patch 445 SHA256 88c90ea1e20afb56ae1b62c4e7ca9de8da8aa9b3726059a96e85beea13935d1c SHA512 588b0e7f58504ae338b714fb324b1525ed340b56e2e99a1ebaac2606799c9ff15b8c1a05e2ddaa5dfbdc7328684917de8753d99b0c8929c056d6eb6446aa9955 WHIRLPOOL 35445ccd0d4a63c5ac593157d55b0e08106d37cbab0a0b10a699e63872fd2a5e9bd53fe2c4a94dff7b1441fa27c141c171b6938ee51e7c696de95695938985a0
-AUX freebsd-ubin-9.1-ar-libarchive3.patch 593 SHA256 92a37952790362f73b0c6a1000877e633e7a0055be8397184aa8ad7e15bfecee SHA512 ece840657b425a666af495332a00a57a4c9c353187ee98747651da4ba69227bd0a58dbbdc7af860d49e0d662c9eaca046ec2f087a86c5bf282530bb9cdcf7aaa WHIRLPOOL 4e25ddac55843e725903c28ed009b646ed63eef4b935ee03eb4a60c3fdeb02b158e018ff76adea6ca14a9a40268a1b7347f26f067d407ffb7329fb3c4641da5c
-AUX freebsd-ubin-9.1-bsdar.patch 656 SHA256 86834418e478bc21918d6f310fb422dbfd0aa0df1315bd4fbc0ddd7a8fc62868 SHA512 88fc86fdb0ee6f757cee9b6bd55226517e6b79946f0518904bedd8176230124b40b868dee30049daa7053ea0ebe7d242dc58778e3addae2612ffd53996303bac WHIRLPOOL b66fd0a613cd32f9037c739146e465fd2ddcc56f78a3fdffc67eec9b92b6f2f78d6948906a77c2418e2bae5d782ab70f9c4f473ee8e256f233b237f6a11ae08c
-AUX freebsd-ubin-9.1-grep.patch 549 SHA256 5ab5dafccdc0c64f07742698abe51a24ab0abe10aba7d4bd80afcf4b5a36066f SHA512 2ddec1a02064ee91a177edb78a964d37b5be14c6e92a78ba9ce0a902c40f673eb7a6449042e341dfb3f31be6bef1a19fdf735af0d32526c0891fe6d9cc060101 WHIRLPOOL 3742f0c0612d2158ce2e5afaea7fb15f3f9cbc95f702fd51ea30c0c97a5cccabdffd4b722d1cb1930b362a4d2256bce77d997a69f02304a4d187391c8f8e0734
-AUX freebsd-ubin-9.1-kdump-ioctl.patch 1001 SHA256 03804b82087884efa28157b36781a746349f41164591b46b73785e0b53088e2a SHA512 aadf3a6d97c5822aa9ff0d1ad8a7bfb2d17fc3193851f864bcb847ef05fe5b7e2b852cb95aaf159194a12b26900697f089113ccb15854c8e3bdb43518de9adf8 WHIRLPOOL 904f1c9dee700cab16a6075216e85768c1a146064da10e865caa319850d400b96255f677df70b2ba1766d4d855b553ad58d74f7e139391bb841f7fc0ef39ebef
-AUX freebsd-ubin-9.1-minigzip.patch 336 SHA256 88ad33268fd33012d37ec3f0f915322a536a4868900aa7c19486226e96125723 SHA512 e25cb6b74b17ee3d999321701fcc5a90ab94abac8ea33a155847f99e7836f16203485618be3426e34a1a5895b7582f5f466f997986486637e52dbc0e6c225dd5 WHIRLPOOL 2fa652c4548eb5b305bafca4b788d9f19f1f52903b0e27cbf402e11bcd7ceb78bdf1dfabf79932b8e78b1bbf898308405ccc19b1ca21198446889c8360db24a7
-AUX freebsd-ubin-9.3-kdump-workaround.patch 415 SHA256 a2812aaacae36bfab6703f72fde31e705f9ebe952d1d394eb91e4e05d06c4c60 SHA512 9ee3e9a8c508f36326e24463b1bdfc5a511d6c994b8fb0da8bd1a0fa30b9eafe968c228825ad6b25849c47d800f17866e4667dc9ae8c76cff6f8181b37148d70 WHIRLPOOL 5f4f2ab4b72bae236d0c34c65404f351520869ea6a083590239f38ab0fe95f74108a4b7cbd7f84dfc5fb22f2140ded334999c492adb3fddc5dcd81ddeed8b6e5
-AUX freebsd-ubin-lint-stdarg.patch 792 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6 SHA512 0f06547b0b90c65466c5c032efe6563dfd32ca56175fbad0885228310f6dc5f973d3adffe93bdb35d42b8af045ecdc23d1198fd8bad0c96c46512dbedbab3059 WHIRLPOOL 853d89f6f35c91718a30c8cbd2fed72a01c01dd03b3fab28c931fd80f71394122f4e5fe240df17b524dffb91829bc0148a605e797b88827d4f5e48730790fa57
-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
-EBUILD freebsd-ubin-10.1.0.9999.ebuild 5869 SHA256 e7600ba7d8fea578be80f86d474b5d7d162c138b986a3856e278c7ec68d1894d SHA512 a3abc6c2641c38561251922e75aa11700ac373abed3cf0065808b320b7b73c5fb2f1b709775c3d3a3b89421b1368951ce610a583fc8557c5973926b8ec88794f WHIRLPOOL b7378cfa4813571f5410aac6f81d0e9b90bdbcebcf2006b822cf2cc4e58d2cccbfb3471166573be677a9de4343f29a32ea1cac4a8b2672390ca31be28470cf56

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch
deleted file mode 100644
index d758c48..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile
-index 4ebdc33..37ff8fa 100644
---- a/usr.bin/atf/atf-sh/Makefile
-+++ b/usr.bin/atf/atf-sh/Makefile
-@@ -33,8 +33,8 @@ PROG_CXX=	atf-sh
- SRCS=		atf-sh.cpp
- MAN=            atf-sh.1 atf-sh-api.3
- 
--CFLAGS+=	-DHAVE_CONFIG_H
--CFLAGS+=	-I${ATF}
-+CXXFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-I${ATF}
- 
- DPADD+=		${LIBATF_C} ${LIBATF_CXX}
- LDADD+=		-latf-c++ -latf-c

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch
deleted file mode 100644
index 1125238..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/usr.bin/dtc/string.hh b/usr.bin/dtc/string.hh
-index 45bc4fd..6eaf8e4 100644
---- a/usr.bin/dtc/string.hh
-+++ b/usr.bin/dtc/string.hh
-@@ -32,6 +32,8 @@
- 
- #ifndef _STRING_HH_
- #define _STRING_HH_
-+#include <cstdio>
-+#include <cstring>
- #include "input_buffer.hh"
- 
- namespace dtc
-diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh
-index 7f2ec67..8e13b1c 100644
---- a/usr.bin/dtc/util.hh
-+++ b/usr.bin/dtc/util.hh
-@@ -33,6 +33,7 @@
- #ifndef _UTIL_HH_
- #define _UTIL_HH_
- 
-+#include <stdint.h>
- #include <vector>
- 
- // If we aren't using C++11, then just ignore static asserts.

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch
deleted file mode 100644
index e106852..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
-index 38e9df6..5e831c6 100644
---- a/usr.bin/kdump/Makefile
-+++ b/usr.bin/kdump/Makefile
-@@ -22,7 +22,7 @@ CLEANFILES=	ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c
- 
- ioctl.c: mkioctls
- 	env MACHINE=${MACHINE} CPP="${CPP}" \
--	    sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET}
-+	    sh ${.CURDIR}/mkioctls print ${.CURDIR}/../../include > ${.TARGET}
- 
- kdump_subr.h: mksubr
- 	sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \
-diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
-index 7a49497..bc8b61f 100644
---- a/usr.bin/truss/Makefile
-+++ b/usr.bin/truss/Makefile
-@@ -24,7 +24,7 @@ syscalls.h:	syscalls.master
- 
- ioctl.c: ${.CURDIR}/../kdump/mkioctls
- 	env MACHINE=${MACHINE} CPP="${CPP}" \
--		/bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET}
-+		/bin/sh ${.CURDIR}/../kdump/mkioctls return ${.CURDIR}/../../include > ${.TARGET}
- 
- .if ${MACHINE_CPUARCH} == "i386"
- SRCS+=	i386-linux.c linux_syscalls.h

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch
deleted file mode 100644
index c5f7706..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
-index 0995534..1bcb3e0 100644
---- a/usr.bin/mandoc/Makefile
-+++ b/usr.bin/mandoc/Makefile
-@@ -1,7 +1,7 @@
- # $FreeBSD$
- 
- MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
--LIBMANDOC=	${.OBJDIR}/../../lib/libmandoc/libmandoc.a
-+LIBMANDOC=	${.CURDIR}/../../lib/libmandoc/libmandoc.a
- .PATH: ${MDOCMLDIR}
- 
- PROG=	mandoc

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch
deleted file mode 100644
index 1a85529..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fbsd-6.0/usr.bin/cmp/Makefile
-===================================================================
---- fbsd-6.0.orig/usr.bin/cmp/Makefile
-+++ fbsd-6.0/usr.bin/cmp/Makefile
-@@ -1,7 +1,7 @@
- #	@(#)Makefile	8.1 (Berkeley) 6/6/93
- # $FreeBSD: src/usr.bin/cmp/Makefile,v 1.6.14.1 2005/09/17 11:33:41 brian Exp $
- 
--PROG=	cmp
-+PROG=	bsdcmp
- SRCS=	cmp.c link.c misc.c regular.c special.c
- 
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
deleted file mode 100644
index a89cf52..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-By default the mkioctl program that generates code for kdump does look for
-ioctls in the whole /usr/include tree, but this does break when xorg is merged.
-This patch allows to look for include files only in the source tree.
-
-Index: fbsd-6/usr.bin/kdump/Makefile
-===================================================================
---- fbsd-6.orig/usr.bin/kdump/Makefile
-+++ fbsd-6/usr.bin/kdump/Makefile
-@@ -10,6 +10,6 @@ CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CUR
- CLEANFILES=	ioctl.c
- 
- ioctl.c: mkioctls
--	sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- .include <bsd.prog.mk>
-Index: fbsd-6/usr.bin/truss/Makefile
-===================================================================
---- fbsd-6.orig/usr.bin/truss/Makefile
-+++ fbsd-6/usr.bin/truss/Makefile
-@@ -29,6 +29,6 @@ syscalls.h:	syscalls.master
- 		${.CURDIR}/i386.conf
- 
- ioctl.c: ${.CURDIR}/../kdump/mkioctls
--	sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch
deleted file mode 100644
index c966b9b..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- usr.bin/ar/Makefile.old	2010-03-12 14:50:30 +0100
-+++ usr.bin/ar/Makefile	2010-03-12 14:50:53 +0100
-@@ -1,6 +1,6 @@
- # $FreeBSD: src/usr.bin/ar/Makefile,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
- 
--PROG=	ar
-+PROG=	freebsd-ar
- SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
- 
- WARNS?=	5
-@@ -10,8 +10,7 @@
- 
- CFLAGS+=-I. -I${.CURDIR}
- 
--NO_SHARED?=	yes
--LINKS=	${BINDIR}/ar ${BINDIR}/ranlib
--MLINKS= ar.1 ranlib.1
-+LINKS=	${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib
-+MLINKS= freebsd-ar.1 freebsd-ranlib.1
- 
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch
deleted file mode 100644
index e8f978a..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Parallel make installs often cause 2 concurrent install -d to fail
-while they are creating the path to the target dirs.
-This patch changes the failure to a warning so that a make -j6 install doesn't
-fails as often as it does on Gentoo/FreeBSD, if it uses /usr/bin/install.
-
---- usr.bin/xinstall/xinstall.c.orig
-+++ usr.bin/xinstall/xinstall.c
-@@ -748,9 +748,17 @@
- 			ch = *p;
- 			*p = '\0';
- 			if (stat(path, &sb)) {
--				if (errno != ENOENT || mkdir(path, 0755) < 0) {
-+				if (errno != ENOENT) {
- 					err(EX_OSERR, "mkdir %s", path);
- 					/* NOTREACHED */
-+				} else if (mkdir(path, 0755) < 0) {
-+					/* Previous errno from stat() says that the directory didn't exist (ENOENT)
-+					 * But if errno is now EEXIST, then we just hit a parallel make bug.
-+					 */
-+					if (errno == EEXIST)
-+						warn("mkdir: %s now exists!", path); /* let me know when this happens */
-+					else
-+						err(EX_OSERR, "mkdir %s", path);
- 				} else if (verbose)
- 					(void)printf("install: mkdir %s\n",
- 						     path);

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch
deleted file mode 100644
index d34eb9e..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr usr.bin.old/calendar/Makefile usr.bin/calendar/Makefile
---- usr.bin.old/calendar/Makefile	2011-11-02 18:22:09.000000000 +0000
-+++ usr.bin/calendar/Makefile	2011-11-02 18:22:48.000000000 +0000
-@@ -15,6 +15,7 @@
- WARNS?=		7
- 
- beforeinstall:
-+	${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
- 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
- .for lang in ${INTER}

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch
deleted file mode 100644
index d4d89e1..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur usr.bin.orig/ar/ar.c usr.bin/ar/ar.c
---- usr.bin.orig/ar/ar.c	2012-01-03 12:23:45.000000000 +0900
-+++ usr.bin/ar/ar.c	2012-12-25 20:50:29.000000000 +0900
-@@ -386,13 +386,13 @@
- static void
- bsdar_version(void)
- {
--	(void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version());
-+	(void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version_string());
- 	exit(EX_OK);
- }
- 
- static void
- ranlib_version(void)
- {
--	(void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version());
-+	(void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version_string());
- 	exit(EX_OK);
- }

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch
deleted file mode 100644
index a65185f..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur work.orig/usr.bin/ar/Makefile work/usr.bin/ar/Makefile
---- work.orig/usr.bin/ar/Makefile	2012-07-16 03:59:48.000000000 +0900
-+++ work/usr.bin/ar/Makefile	2012-07-16 04:02:38.000000000 +0900
-@@ -2,7 +2,7 @@
- 
- .include <bsd.own.mk>
- 
--PROG=	ar
-+PROG=	freebsd-ar
- SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
- 
- DPADD=	${LIBARCHIVE} ${LIBELF}
-@@ -10,10 +10,7 @@
- 
- CFLAGS+=-I. -I${.CURDIR}
- 
--.if ${MK_SHARED_TOOLCHAIN} == "no"
--NO_SHARED?=	yes
--.endif
--LINKS=	${BINDIR}/ar ${BINDIR}/ranlib
--MLINKS= ar.1 ranlib.1
-+LINKS=	${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib
-+MLINKS= freebsd-ar.1 freebsd-ranlib.1
- 
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch
deleted file mode 100644
index 06cc5d2..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur work.orig/usr.bin/grep/Makefile work/usr.bin/grep/Makefile
---- work.orig/usr.bin/grep/Makefile	2012-07-16 04:59:01.000000000 +0900
-+++ work/usr.bin/grep/Makefile	2012-07-16 05:00:15.000000000 +0900
-@@ -40,13 +40,6 @@
- 	grep.1 lzfgrep.1
- .endif
- 
--LINKS+=	${BINDIR}/${PROG} ${BINDIR}/xzgrep \
--	${BINDIR}/${PROG} ${BINDIR}/xzegrep \
--	${BINDIR}/${PROG} ${BINDIR}/xzfgrep \
--	${BINDIR}/${PROG} ${BINDIR}/lzgrep \
--	${BINDIR}/${PROG} ${BINDIR}/lzegrep \
--	${BINDIR}/${PROG} ${BINDIR}/lzfgrep
--
- LDADD=	-lz -llzma
- DPADD=	${LIBZ} ${LIBLZMA}
- 

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch
deleted file mode 100644
index d98e599..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur work.orig/usr.bin/kdump/Makefile work/usr.bin/kdump/Makefile
---- work.orig/usr.bin/kdump/Makefile	2012-07-12 13:24:01.000000000 +0900
-+++ work/usr.bin/kdump/Makefile	2012-07-16 03:54:14.000000000 +0900
-@@ -21,7 +21,7 @@
- 
- ioctl.c: mkioctls
- 	env CPP="${CPP}" \
--	   sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	   sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- kdump_subr.c: mksubr
- 	sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET}
-diff -Nur work.orig/usr.bin/truss/Makefile work/usr.bin/truss/Makefile
---- work.orig/usr.bin/truss/Makefile	2012-07-12 13:24:03.000000000 +0900
-+++ work/usr.bin/truss/Makefile	2012-07-16 03:54:40.000000000 +0900
-@@ -24,7 +24,7 @@
- 
- ioctl.c: ${.CURDIR}/../kdump/mkioctls
- 	env CPP="${CPP}" \
--	    sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	    sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- .if ${MACHINE_CPUARCH} == "i386"
- SRCS+=	i386-linux.c linux_syscalls.h

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch
deleted file mode 100644
index a9c0622..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nur work.orig/usr.bin/minigzip/Makefile work/usr.bin/minigzip/Makefile
---- work.orig/usr.bin/minigzip/Makefile	2012-07-16 04:39:31.000000000 +0900
-+++ work/usr.bin/minigzip/Makefile	2012-07-16 04:45:30.000000000 +0900
-@@ -10,4 +10,6 @@
- DPADD=	${LIBZ}
- LDADD=	-lz
- 
-+CFLAGS+= -I${.CURDIR}/../../lib/libz
-+
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.3-kdump-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.3-kdump-workaround.patch
deleted file mode 100644
index 064647c..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.3-kdump-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
-index cbf31d0..fa0d04d 100644
---- a/usr.bin/kdump/Makefile
-+++ b/usr.bin/kdump/Makefile
-@@ -8,7 +8,7 @@ SFX=		32
- .PATH: ${.CURDIR}/../ktrace
- 
- PROG=		kdump
--SRCS=		kdump_subr.c kdump.c ioctl.c subr.c
-+SRCS=		kdump_subr.h kdump_subr.c kdump.c ioctl.c subr.c
- DPSRCS=		kdump_subr.h 
- CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
- 

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
deleted file mode 100644
index 9774724..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur usr.bin.orig/xlint/llib/llib-lposix usr.bin/xlint/llib/llib-lposix
---- usr.bin.orig/xlint/llib/llib-lposix	2005-04-29 17:30:03 +0000
-+++ usr.bin/xlint/llib/llib-lposix	2005-05-03 14:12:26 +0000
-@@ -42,7 +42,7 @@
- #include <sys/utsname.h>
- #include <sys/times.h>
- #include <stdio.h>
--#include <stdarg.h>
-+#include <machine/stdarg.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <math.h>
-diff -ur usr.bin.orig/xlint/llib/llib-lstdc usr.bin/xlint/llib/llib-lstdc
---- usr.bin.orig/xlint/llib/llib-lstdc	2005-04-29 17:30:03 +0000
-+++ usr.bin/xlint/llib/llib-lstdc	2005-05-03 14:12:35 +0000
-@@ -44,7 +44,7 @@
- #include <math.h>
- #include <setjmp.h>
- #include <signal.h>
--#include <stdarg.h>
-+#include <machine/stdarg.h>
- #include <stddef.h>
- #include <stdio.h>
- #include <stdlib.h>

diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
deleted file mode 100644
index 631ee4f..0000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -ur usr.bin.orig/at/Makefile usr.bin.setXid/at/Makefile
---- usr.bin.orig/at/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/at/Makefile	Thu Apr  7 21:21:02 2005
-@@ -15,6 +15,8 @@
- BINMODE= 4555
- CLEANFILES+= at.1
- 
-+LDFLAGS+=-Wl,-z,now
-+
- at.1: at.man
- 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
- 	sed -e \
-diff -ur usr.bin.orig/chpass/Makefile usr.bin.setXid/chpass/Makefile
---- usr.bin.orig/chpass/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/chpass/Makefile	Thu Apr  7 21:22:40 2005
-@@ -15,6 +15,8 @@
- #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
- CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
- 
-+LDFLAGS+=-Wl,-z,now
-+
- DPADD=	${LIBCRYPT} ${LIBUTIL}
- LDADD=	-lcrypt -lutil
- .if !defined(NO_NIS)
-diff -ur usr.bin.orig/fstat/Makefile usr.bin.setXid/fstat/Makefile
---- usr.bin.orig/fstat/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/fstat/Makefile	Thu Apr  7 21:24:35 2005
-@@ -9,4 +9,6 @@
- BINMODE=2555
- WARNS?=	6
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/lock/Makefile usr.bin.setXid/lock/Makefile
---- usr.bin.orig/lock/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/lock/Makefile	Thu Apr  7 21:24:45 2005
-@@ -7,4 +7,6 @@
- DPADD=	${LIBCRYPT}
- LDADD=	-lcrypt
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/login/Makefile usr.bin.setXid/login/Makefile
---- usr.bin.orig/login/Makefile	Thu Apr  7 20:52:57 2005
-+++ usr.bin.setXid/login/Makefile	Thu Apr  7 21:24:55 2005
-@@ -13,4 +13,6 @@
- INSTALLFLAGS=-fschg
- .endif
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/netstat/Makefile usr.bin.setXid/netstat/Makefile
---- usr.bin.orig/netstat/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/netstat/Makefile	Thu Apr  7 21:25:08 2005
-@@ -14,4 +14,6 @@
- DPADD=	${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} ${LIBUTIL}
- LDADD=	-lkvm -lipx -lnetgraph -lutil
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/opieinfo/Makefile usr.bin.setXid/opieinfo/Makefile
---- usr.bin.orig/opieinfo/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/opieinfo/Makefile	Thu Apr  7 21:25:20 2005
-@@ -11,6 +11,8 @@
- DPADD=	${LIBOPIE} ${LIBMD}
- LDADD=	-lopie -lmd
- 
-+LDFLAGS+=-Wl,-z,now
-+
- BINOWN=	root
- BINMODE=4555
- INSTALLFLAGS=-fschg
-diff -ur usr.bin.orig/opiepasswd/Makefile usr.bin.setXid/opiepasswd/Makefile
---- usr.bin.orig/opiepasswd/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/opiepasswd/Makefile	Thu Apr  7 21:25:29 2005
-@@ -11,6 +11,8 @@
- DPADD=	${LIBOPIE} ${LIBMD}
- LDADD=	-lopie -lmd
- 
-+LDFLAGS+=-Wl,-z,now
-+
- BINOWN=	root
- BINMODE=4555
- INSTALLFLAGS=-fschg
-diff -ur usr.bin.orig/passwd/Makefile usr.bin.setXid/passwd/Makefile
---- usr.bin.orig/passwd/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/passwd/Makefile	Thu Apr  7 21:25:37 2005
-@@ -10,6 +10,8 @@
- MLINKS	 = passwd.1 yppasswd.1
- WARNS	?= 4
- 
-+LDFLAGS+=-Wl,-z,now
-+
- beforeinstall:
- .for i in passwd yppasswd
- 	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
---- usr.bin.orig/su/Makefile	Thu Apr  7 20:52:58 2005
-+++ usr.bin.setXid/su/Makefile	Thu Apr  7 21:26:00 2005
-@@ -10,4 +10,6 @@
- BINMODE=4555
- INSTALLFLAGS=-fschg
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/wall/Makefile usr.bin.setXid/wall/Makefile
---- usr.bin.orig/wall/Makefile	Thu Apr  7 20:52:59 2005
-+++ usr.bin.setXid/wall/Makefile	Thu Apr  7 21:26:07 2005
-@@ -5,4 +5,6 @@
- BINGRP=	tty
- BINMODE=2555
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>
-diff -ur usr.bin.orig/write/Makefile usr.bin.setXid/write/Makefile
---- usr.bin.orig/write/Makefile	Thu Apr  7 20:52:59 2005
-+++ usr.bin.setXid/write/Makefile	Thu Apr  7 21:26:13 2005
-@@ -4,4 +4,6 @@
- BINMODE=2555
- BINGRP=	tty
- 
-+LDFLAGS+=-Wl,-z,now
-+
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron b/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron
deleted file mode 100644
index 323f455..0000000
--- a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-if [ -x /usr/libexec/locate.updatedb ]
-then
-	echo /usr/libexec/locate.updatedb | nice  -n 5 su  -fm nobody
-fi

diff --git a/sys-freebsd/freebsd-ubin/files/login.1.pamd b/sys-freebsd/freebsd-ubin/files/login.1.pamd
deleted file mode 100644
index 2c09584..0000000
--- a/sys-freebsd/freebsd-ubin/files/login.1.pamd
+++ /dev/null
@@ -1,4 +0,0 @@
-auth		include		system-local-login
-account		include		system-local-login
-session		include		system-local-login
-password	include		system-local-login

diff --git a/sys-freebsd/freebsd-ubin/files/login.pamd b/sys-freebsd/freebsd-ubin/files/login.pamd
deleted file mode 100644
index 859fb67..0000000
--- a/sys-freebsd/freebsd-ubin/files/login.pamd
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/files/login.pamd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
-#
-# PAM configuration for the "login" service
-#
-
-# auth
-auth		required	pam_nologin.so		no_warn
-auth		sufficient	pam_self.so		no_warn
-auth		include		system
-
-# account
-account		requisite	pam_securetty.so
-account		include		system
-
-# session
-session		include		system
-
-# password
-password	include		system

diff --git a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd b/sys-freebsd/freebsd-ubin/files/passwd.1.pamd
deleted file mode 100644
index fa1574f..0000000
--- a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/files/passwd.1.pamd,v 1.1 2008/02/19 12:04:06 flameeyes Exp $
-#
-# PAM configuration for the "passwd" service
-#
-
-# passwd(1) does not use the auth, account or session services.
-
-password	include		system-auth

diff --git a/sys-freebsd/freebsd-ubin/files/passwd.pamd b/sys-freebsd/freebsd-ubin/files/passwd.pamd
deleted file mode 100644
index 4d3955f..0000000
--- a/sys-freebsd/freebsd-ubin/files/passwd.pamd
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/files/passwd.pamd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
-#
-# PAM configuration for the "passwd" service
-#
-
-# passwd(1) does not use the auth, account or session services.
-
-# password
-#password	requisite	pam_passwdqc.so		enforce=users
-password	required	pam_unix.so		no_warn try_first_pass nullok

diff --git a/sys-freebsd/freebsd-ubin/files/su.1.pamd b/sys-freebsd/freebsd-ubin/files/su.1.pamd
deleted file mode 100644
index 72daa49..0000000
--- a/sys-freebsd/freebsd-ubin/files/su.1.pamd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/files/su.1.pamd,v 1.1 2008/02/19 12:04:06 flameeyes Exp $
-#
-# PAM configuration for the "su" service
-#
-
-# auth
-auth		sufficient	pam_rootok.so		no_warn
-auth		sufficient	pam_self.so		no_warn
-auth		requisite	pam_group.so		no_warn group=wheel root_only fail_safe
-auth		include		system-auth
-
-# account
-account		include		system-auth
-
-# session
-session		required	pam_permit.so

diff --git a/sys-freebsd/freebsd-ubin/files/su.pamd b/sys-freebsd/freebsd-ubin/files/su.pamd
deleted file mode 100644
index 17feb0d..0000000
--- a/sys-freebsd/freebsd-ubin/files/su.pamd
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/files/su.pamd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
-#
-# PAM configuration for the "su" service
-#
-
-# auth
-auth		sufficient	pam_rootok.so		no_warn
-auth		sufficient	pam_self.so		no_warn
-auth		requisite	pam_group.so		no_warn group=wheel root_only fail_safe
-auth		include		system
-
-# account
-account		include		system
-
-# session
-session		required	pam_permit.so

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.0.9999.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.0.9999.ebuild
deleted file mode 100644
index 694d1f5..0000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${UBIN}.tar.xz
-			mirror://gentoo/${CONTRIB}.tar.xz
-			mirror://gentoo/${LIB}.tar.xz
-			mirror://gentoo/${ETC}.tar.xz
-			mirror://gentoo/${BIN}.tar.xz
-			mirror://gentoo/${INCLUDE}.tar.xz
-			zfs? ( mirror://gentoo/${CDDL}.tar.xz )
-			build? ( mirror://gentoo/${SYS}.tar.xz )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	!sys-process/fuser-bsd
-	!dev-util/csup
-	!dev-libs/libiconv
-	!sys-freebsd/freebsd-contrib"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-9.1-minigzip.patch"
-	"${FILESDIR}/${PN}-10.0-atf.patch"
-	"${FILESDIR}/${PN}-10.0-dtc-gcc46.patch"
-	"${FILESDIR}/${PN}-10.0-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-10.0-mandoc.patch"
-	"${FILESDIR}/${PN}-9.3-kdump-workaround.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	hesinfo host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp man"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
-		rm -f "${ROOT}"/usr/bin/yacc
-	fi
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-
-	# Preparing to build xlint
-	export LINT=xlint
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/usr.bin/ldd" || die
-		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
-	else
-		cd "${S}"
-	fi
-	"$@"
-}
-
-src_compile() {
-	# Preparing to build mandoc
-	cd "${WORKDIR}/lib/libmandoc"
-	freebsd_src_compile
-
-	cd "${S}"
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf ; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-
-	# create locate database #472468
-	local f=/var/db/locate.database
-	mkdir "${ED}${f%/*}" || die
-	touch "${ED}${f}" || die
-	fowners nobody:nobody ${f}
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb	-f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc
-	fi
-}

diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
deleted file mode 100644
index c65bb87..0000000
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-AUX freebsd-usbin-10.0-bsdxml2expat.patch 835 SHA256 765ab05ef6d5d828d2cc54e78e0676dc2b6caac7193788524a7dd4cc5a983c8c SHA512 23bcfdc1657c1dd7fdb59c3717af5a5560c8f3c10d498aaae539e1779838a0a33cf247ae806c72c09d298fc9be3c02b5c3d1d9f1a879493c0e5d1aeb4dbf3509 WHIRLPOOL 2342438a26ef915f29d487aecedfd0920baa6c2130b3efd6fbd64d7a2bf81f74444e7409ceaceb29d4c5ad210af4cee0a4d98b0935131ff577a6103023f83f44
-AUX freebsd-usbin-9.0-newsyslog.patch 507 SHA256 d5f910655c66a3e766f227c25837347d11d796655d71480c3cf3526f4136d557 SHA512 5423fc577035c2a272d4cb4305c5ee5e1e910a68af44595524665f7b867bd0a48bab0349b2fa13eabc385b2ec29c8f578d018cd8196f3ad20a13a68d36a335ae WHIRLPOOL 0551fde1581f3642535d1e34f2b111ed1404fc153ed14f4d7d4c75bc96715ed1eb3f218fc55fb2bb038616a929e106b8d8355f2de95447f7a93c09c515cdd511
-AUX freebsd-usbin-9.1-bsdxml2expat.patch 431 SHA256 43f0ebe5406f6065d7dad45b4270f0645e7dc1d6db1bcdf1443e32aede9d7af6 SHA512 ef1e9be49796b50e8dd818ac1a6f363eaa54d767ac9477e3df09354df78dff887a31a3c793288f321b7976bd98de79821742550ee8e7f9fcf3b1a42cccbc68b0 WHIRLPOOL 17c14ef758cede73619f774710afd38862609da6302e0d2378e7b5124d38dd60c427218f140f67e1ea255a24f7eb6d900df1ad5835d23a135cef7cb5cc94bc73
-AUX freebsd-usbin-adduser.patch 428 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af SHA512 51720e3db9bf3728afc0dc370a469746cb1bf61623c44a20c58e27d647e5a5d0360145b1d174382176d803f2558afa2f2a29eca6c85c638529d0e11e2859c0c3 WHIRLPOOL 15a5a7e2c123a3103546134a27baad0a459758ec66bb0a7011684f367c7dd46435688f837d9d5fb5a9a51e95a58d6ce0e672c57a9dc2ef16a1e094a4b6e78931
-AUX iscsid.initd 428 SHA256 d3755344567711972d2811d59a99b700007f2651872e47a8f82bf89130df914c SHA512 4d95488508fc5c5717b1ea761440ddc2138f3b07ed0f3e81c295937ce3e5cf17d6ad5a539a4e47a76b5233c6840d4dd7d8c857ff27d692eb016cd45d3a5c8bc9 WHIRLPOOL ba31ac472f0013f365d310379c78da30247e39cec4271adee700b8b6cfab5dad146c343102fe295c3b3459cfeca69fc8436bb1ddf439f50c91b67a2e3cd87a06
-AUX moused.confd 827 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e SHA512 88919d638fe67ce8c8a43e470851eafd3ff8185a44e67b175d43107fa030721c91d7ac4e2959326aa3910e6788f59d851598edfda593515e3571ba42df564a4f WHIRLPOOL bf2065b2d39ae534349c4186b1d7e254ed7bbf96bddcaf92453f79265f73de6e09a0f9a55a3eadd31f57e110dbfbe380cf51930136ea3eec6f6b80761ec6d3bb
-AUX moused.initd 1783 SHA256 84f2d221ce16f5ffce43170fdcf86675dae79a776e1f2abf3b1b490b585f6d0e SHA512 eb5465ab4f9fc94bfb70c56ad144fed79cbe604d1970ea1c56f050afc42fe9fb8e605e58c7924e82de1ffc0f32994a94e23a11cdb75db4e855bb7f67dc81b499 WHIRLPOOL 9f37fcef86e2a9797090e2e4d62f0a73f8cf20736b5b798f1f4435734f067b3cb298f25f2d0581b23f5bd6e92c1944dbf566f5828608040691f4ad547a687d36
-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 nfsuserd.confd 153 SHA256 9575adaba684100f78ff1d60ca5e7b6f5be6fcda9e2d8fac2a1ab4aaf8944a59 SHA512 47bf885dc80a61c9f8aab5890a360063fc2e846ce8abefb84e9d504f62c455cd759af753c7a5ab8cdd624842200f6b0ec7d177ddfdc1e7564460764eb4d4d073 WHIRLPOOL 4e4aabc4c936c067d99133620a117d9c1fc539e23acfe9b15b4a7ebb57e3cb55b4ffab34b2af93fcfdf7fe81e4372e3afa38994ee999093aa1ec0a80c3c12175
-AUX nfsuserd.initd 446 SHA256 20eab89441ea19741338eff1d57ec09f293fb33c4fc66523f1aa66240d7b2561 SHA512 72e5b58151b7e1207cf50772451661255d527afd1c76946bfb2e80e79b137c55de68d44b9c756d6370cf69f787f095a0c73ca06a3dfd9ed1ef8225323e34fda8 WHIRLPOOL 0fd55b5bdd3d84911254b2d08834675dbaef7e2eacd77b462fbaf7f8793da549a2f7fc4b5365f1a994296b0bd33da81bde554827cd5b1d12194b82bf18a513b6
-AUX powerd.confd 368 SHA256 989e31b98daacb3d6ecddf8788ee496f3c100d549e7a210e387f03d69c3c8e98 SHA512 77cc956ddc806383c465b71b352813c71f001cd908b740d92a12059eb9606133a57d9585e03c514108d81aa17e56245e512e0d741f0c0eb8464568977f4b3e44 WHIRLPOOL 2ae3ec637011befda90c83fa55b532e2b3704e4eccd1f5b78ef871e160ec4e5f8573603f63b863251dbb600ebb15821181391881860259b5b8c877e6c7174e36
-AUX powerd.initd 774 SHA256 2ee95ad25206716b6043407c6fbb412513fcbd0893d7f2faf2c927c55990fb03 SHA512 13798d2f4c0c002775eb506158b111c3645c19dde86d934c9bd74147d836ac3c1433d426bc54bf257636c75127edc567961c42c994171831cc610395762b3121 WHIRLPOOL 22ce78d84d9b1e9a6f0ab095e0624567d8c6471117f04603d4aa0ebea590025fcacf4472cb09265eaa75a4a3e67613864bd462a751350ec026706b546a1f9236
-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 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
-EBUILD freebsd-usbin-10.1.0.9999.ebuild 5394 SHA256 809e5c8ff04b70fd30dda8e73e19c01920ebb5cee11239dc4b2951b896672ba0 SHA512 0db2df64096169c470f5f9c6d54091e936b04163d0f1abe745e3e38ba42fcda4fae6d040128ffa6fee3da6fc0ab6be156f1b4ad0ec27e98cc4d017c54951b6ff WHIRLPOOL bfad1b78162fb63a61f4e4709942613197c29218cd1fcc2aeda5fe197b550e518123eefd252f6bd41dcb0966870ecd2d6cc27c50e25f2950b03ec4568a8a402f

diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch
deleted file mode 100644
index a84f96d..0000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c
---- work.orig/usr.sbin/ctladm/ctladm.c	2012-07-12 13:25:58.000000000 +0900
-+++ work/usr.sbin/ctladm/ctladm.c	2012-07-16 05:37:14.000000000 +0900
-@@ -60,7 +60,7 @@
- #include <errno.h>
- #include <err.h>
- #include <ctype.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <cam/scsi/scsi_all.h>
- #include <cam/scsi/scsi_message.h>
- #include <cam/ctl/ctl.h>
-diff -Nur work.orig/usr.sbin/ctld/kernel.c work/usr.sbin/ctld/kernel.c
---- work.orig/usr.sbin/ctld/kernel.c	2013-09-20 21:55:45.000000000 +0900
-+++ work/usr.sbin/ctld/kernel.c	2013-09-20 22:01:17.000000000 +0900
-@@ -45,7 +45,7 @@
- #include <sys/sbuf.h>
- #include <sys/capability.h>
- #include <assert.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>

diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch
deleted file mode 100644
index 1d83865..0000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr usr.sbin/newsyslog.old/pathnames.h usr.sbin/newsyslog/pathnames.h
---- usr.sbin/newsyslog.old/pathnames.h	2011-11-02 20:12:37.000000000 +0000
-+++ usr.sbin/newsyslog/pathnames.h	2011-11-02 20:12:50.000000000 +0000
-@@ -24,6 +24,6 @@
- 
- #define	_PATH_CONF	"/etc/newsyslog.conf"
- #define	_PATH_SYSLOGPID	_PATH_VARRUN "syslog.pid"
--#define	_PATH_BZIP2	"/usr/bin/bzip2"
--#define	_PATH_GZIP	"/usr/bin/gzip"
-+#define	_PATH_BZIP2	"/bin/bzip2"
-+#define	_PATH_GZIP	"/bin/gzip"
- #define	_PATH_XZ	"/usr/bin/xz"

diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
deleted file mode 100644
index bddc0c7..0000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c
---- work.orig/usr.sbin/ctladm/ctladm.c	2012-07-12 13:25:58.000000000 +0900
-+++ work/usr.sbin/ctladm/ctladm.c	2012-07-16 05:37:14.000000000 +0900
-@@ -60,7 +60,7 @@
- #include <errno.h>
- #include <err.h>
- #include <ctype.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <cam/scsi/scsi_all.h>
- #include <cam/scsi/scsi_message.h>
- #include <cam/ctl/ctl.h>

diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
deleted file mode 100644
index 39177b4..0000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- usr.sbin/adduser/adduser.sh.old	2006-10-01 13:41:16 +0000
-+++ usr.sbin/adduser/adduser.sh	2006-10-01 13:41:38 +0000
-@@ -809,7 +809,7 @@
- NOHOME="/nonexistent"
- NOLOGIN="nologin"
- NOLOGIN_PATH="/usr/sbin/nologin"
--GREPCMD="/usr/bin/grep"
-+GREPCMD="/bin/grep"
- DATECMD="/bin/date"
- 
- # Set default values
-@@ -823,7 +823,7 @@
- uhome=
- upass=
- ushell=
--udotdir=/usr/share/skel
-+udotdir=/etc/skel
- ugroups=
- uexpire=
- upwexpire=

diff --git a/sys-freebsd/freebsd-usbin/files/iscsid.initd b/sys-freebsd/freebsd-usbin/files/iscsid.initd
deleted file mode 100755
index 60e63da..0000000
--- a/sys-freebsd/freebsd-usbin/files/iscsid.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting iscsid"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/iscsid -- $iscsidopts
-	eend $? "Error starting iscsid"
-}
-
-stop() {
-	ebegin "Stopping iscsid"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/iscsid
-	eend $? "Error stopping iscsid"
-}

diff --git a/sys-freebsd/freebsd-usbin/files/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd
deleted file mode 100644
index fea968b..0000000
--- a/sys-freebsd/freebsd-usbin/files/moused.confd
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.confd,v 1.2 2006/10/03 14:43:39 uberlord Exp $
-
-# See the moused man page for available settings.
-
-# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports
-# Leave blank to try to autodetect it
-MOUSED_DEVICE=""
-
-# Any additional flags requires
-MOUSED_FLAGS=""
-
-# If 0xd0-0xd3 default range is occupied in your language code table, specify
-# alternative range start like MOUSECHAR_START="3", see vidcontrol(1)
-MOUSECHAR_START=""
-
-# You can also multiplex the init script for each device like so
-#   ln -s moused /etc/init.d/moused.ums0
-# This enables you to have a config file per mouse (forces MOUSED_DEVICE
-# to ums0 in this case) and control each mouse.
-# devd can also start and stop these mice, which laptop users will find handy.

diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd
deleted file mode 100644
index 3ac9a34..0000000
--- a/sys-freebsd/freebsd-usbin/files/moused.initd
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/moused.initd,v 1.3 2007/02/23 14:03:08 uberlord Exp $
-
-MOUSED_NAME=${SVCNAME##*.}
-if [ -n "${MOUSED_NAME}" ] && [ ${MOUSED_NAME} != "moused" ] ; then
-	MOUSED_DEVICE=/dev/"${MOUSED_NAME}"
-	MOUSED_PIDFILE=/var/run/moused-"${MOUSED_NAME}".pid
-else
-	MOUSED_NAME=
-	MOUSED_PIDFILE=/var/run/moused.pid
-fi
-
-depend() {
-	need localmount 
-}
-
-start() {
-	ebegin "Starting the Console Mouse Daemon" "${MOUSED_NAME}"
-
-	if [ -z ${MOUSED_DEVICE} ] ; then
-		for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do
-			if [ -e "${x}" ] && \
-			[ ! -e /var/run/moused-$(basename "${x}").pid ] ; then
-				MOUSED_DEVICE=${x}
-				eindent
-				einfo "Using mouse on ${MOUSED_DEVICE}"
-				eoutdent
-				break
-			fi
-		done
-	fi
-
-	if [ -z "${MOUSED_DEVICE}" ] ; then
-		eend 1 "No device specified in" "/etc/conf.d/${SVCNAME}" \
-			"and no mouse detected"
-		return 1
-	fi
-
-	local opts="${MOUSED_FLAGS} -p ${MOUSED_DEVICE}"
-	start-stop-daemon --start --quiet --exec /usr/sbin/moused \
-		--pidfile "${MOUSED_PIDFILE}" \
-		-- ${opts} -I "${MOUSED_PIDFILE}"
-	local retval=$?
-	
-	[ -n "${MOUSE_CHAR_START}" ] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}"
-	local ttyv=
-	for ttyv in /dev/ttyv* ; do
-		vidcontrol < "${ttyv}" ${MOUSE_CHAR_START} -m on || retval=1
-	done
-	
-	eend ${retval} "Failed to start moused"
-}
-
-stop() {
-	ebegin "Stopping the Console Mouse Daemon" "${MOUSED_NAME}"
-	# Don't specify the binary as >1 instance of moused may be running
-	# which is perfectly valid as we can be multiplexed.
-	start-stop-daemon --stop --exec /usr/sbin/moused \
-		--pidfile "${MOUSED_PIDFILE}"
-	eend $? "Failed to stop moused"
-}
-
-# vim: set ts=4 :
-

diff --git a/sys-freebsd/freebsd-usbin/files/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd
deleted file mode 100644
index 844252f..0000000
--- a/sys-freebsd/freebsd-usbin/files/nfs.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# Config file for /etc/init.d/nfs
-# Options for nfsd (see man nfsd)
-# Example: 8 nfsd servers started:
-#nfsdopts="-n 8"
-
-# Options for mountd (see man mountd)
-# Example: allow non-root users to mount shares:
-#mountdopts="-n"
-# Specify t he exports file, this is the default:
-#exportsfile="/etc/exports"

diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd
deleted file mode 100755
index fa54bdb..0000000
--- a/sys-freebsd/freebsd-usbin/files/nfs.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#---------------------------------------------------------------------------
-# This script starts/stops nfsd and mountd
-# Daemons rpc.rquotad, rpc.rstatd, rpc.rusersd, rpc.rwalld and rpc.sprayd
-# should be started from inetd on FreeBSD.
-#---------------------------------------------------------------------------
-
-extra_started_commands="reload"
-
-# The binary locations
-nfsd=/usr/sbin/nfsd
-mountd=/usr/sbin/mountd
-
-depend() {
-	use ypbind net rpc.lockd
-	need rpcbind
-	after quota
-}
-
-start() {
-	ebegin "Starting NFS daemon"
-	start-stop-daemon --start --quiet --exec \
-		$nfsd -- ${nfsdopts}
-	eend $? "Error starting NFS daemon"
-
-	# Start mountd
-	ebegin "Starting NFS mountd"
-	start-stop-daemon --start --quiet --exec \
-		$mountd -- ${mountdopts} ${exportsfile}
-	eend $? "Error starting NFS mountd"
-}
-
-stop() {
-	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --exec $mountd \
-		--pidfile /var/run/mountd.pid
-	eend $? "Error stopping NFS mountd"
-
-	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --signal USR1 --quiet \
-		--name nfsd --user root
-	eend $? "Error stopping NFS daemon"
-}
-
-reload() {
-	# Hangup signal to mountd reloads /etc/exports.
-	ebegin "Reloading /etc/exports"
-	start-stop-daemon --signal 1 --quiet --exec $mountd \
-		--pidfile /var/run/mountd.pid
-	eend $?
-}

diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd
deleted file mode 100755
index 9208804..0000000
--- a/sys-freebsd/freebsd-usbin/files/nfsmount.initd
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfsmount.initd,v 1.3 2007/04/06 14:47:17 uberlord Exp $
-
-depend() {
-	need net rpcbind
-	use ypbind
-}
-
-start_statd() {
-	# Don't start rpc.statd if already started by init.d/nfs
-	killall -0 rpc.statd 2>/dev/null && return 0
-	ebegin "Starting NFS statd"
-	rpc.statd
-	eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-	# Don't stop rpc.statd if it's in use by init.d/nfs
-	killall -0 nfsd 2>/dev/null && return 0
-	# Make sure it's actually running
-	killall -0 rpc.statd 2>/dev/null || return 0
-	# Okay, all tests passed, stop rpc.statd
-	ebegin "Stopping NFS statd"
-	killall rpc.statd
-	eend $? "Error stopping NFS statd"
-}
-
-start_lockd() {
-	# Don't start rpc.lockd if already started by init.d/nfs
-	killall -0 rpc.lockd 2>/dev/null && return 0
-	ebegin "Starting NFS lockd"
-	rpc.lockd
-	eend $? "Error starting NFS lockd"
-}
-
-stop_lockd() {
-	# Don't stop rpc.lockd if it's in use by init.d/nfs
-	killall -0 nfsd 2>/dev/null && return 0
-	# Make sure it's actually running
-	killall -0 rpc.lockd 2>/dev/null || return 0
-	# Okay, all tests passed, stop rpc.lockd
-	ebegin "Stopping NFS lockd"
-	killall rpc.lockd
-	eend $? "Error stopping NFS lockd"
-}
-
-start() {
-	start_statd
-	start_lockd
-	ebegin "Mounting NFS filesystems"
-	mount -a -t nfs
-	eend $? "Error mounting NFS filesystems"
-}
-
-stop() {
-	ebegin "Unmounting NFS filesystems"
-	umount -a -t nfs
-	eend $? "Error unmounting NFS filesystems"
-	stop_statd
-	stop_lockd
-}

diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd b/sys-freebsd/freebsd-usbin/files/nfsuserd.confd
deleted file mode 100644
index f8f3ea1..0000000
--- a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for /etc/init.d/nfsuserd
-# Options for nfsuserd (see man nfsuserd)
-# Example: set domain example.com:
-#nfsuserdopts="-domain example.com"
-

diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd b/sys-freebsd/freebsd-usbin/files/nfsuserd.initd
deleted file mode 100755
index 88fbda2..0000000
--- a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net nfs
-}
-
-start() {
-	ebegin "Starting nfsuserd"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/nfsuserd -- $nfsuserdopts
-	eend $? "Error starting nfsuserd"
-}
-
-stop() {
-	ebegin "Stopping nfsuserd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/nfsuserd
-	eend $? "Error stopping nfsuserd"
-}

diff --git a/sys-freebsd/freebsd-usbin/files/powerd.confd b/sys-freebsd/freebsd-usbin/files/powerd.confd
deleted file mode 100644
index 793e68b..0000000
--- a/sys-freebsd/freebsd-usbin/files/powerd.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/powerd.confd,v 1.2 2006/10/12 14:59:48 uberlord Exp $
-
-# Mode allowed: maximum, minimum, adaptive
-# Default unless specified is adaptive
-
-AC_MODE="maximum"
-
-#BATTERY_MODE="minimum"
-
-POWERD_OPTS=""
-
-

diff --git a/sys-freebsd/freebsd-usbin/files/powerd.initd b/sys-freebsd/freebsd-usbin/files/powerd.initd
deleted file mode 100755
index c99adf8..0000000
--- a/sys-freebsd/freebsd-usbin/files/powerd.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/powerd.initd,v 1.3 2007/02/23 14:03:08 uberlord Exp $
-
-depend() {
-	need localmount
-}
-
-start() {
-	local args=
-	[ -n "${BATTERY_MODE}" ] && args="${args} -b ${BATTERY_MODE}"
-	[ -n "${AC_MODE}" ] && args="${args} -a ${AC_MODE}"
-	
-	ebegin "Starting Power Control Daemon"
-	start-stop-daemon --start --exec /usr/sbin/powerd \
-		--pidfile /var/run/powerd.pid \
-		-- ${args} ${POWERD_OPTS}
-	eend $? "Failed to start powerd"
-}
-
-stop() {
-	ebegin "Stopping Power Control Daemon"
-	start-stop-daemon --stop --exec /usr/sbin/powerd \
-		--pidfile /var/run/powerd.pid
-	eend $? "Failed to stop powerd"
-}

diff --git a/sys-freebsd/freebsd-usbin/files/pw.conf b/sys-freebsd/freebsd-usbin/files/pw.conf
deleted file mode 100644
index 29a246f..0000000
--- a/sys-freebsd/freebsd-usbin/files/pw.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Change this to Gentoo's Default, instead of FreeBSD's default of
-# /usr/share/skel, so that bash and other packages installs the files on the
-# right place.
-skeleton /etc/skel
-

diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.confd b/sys-freebsd/freebsd-usbin/files/rarpd.confd
deleted file mode 100644
index 63c7fac..0000000
--- a/sys-freebsd/freebsd-usbin/files/rarpd.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rarpd.confd,v 1.1 2006/11/19 17:02:29 flameeyes Exp $
-
-# Configuration file for /etc/init.d/rarpd
-
-# To start rarpd only for a given interface, set the
-# following variable
-# RARPD_ONLY_INTERFACE="rl0"

diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.initd b/sys-freebsd/freebsd-usbin/files/rarpd.initd
deleted file mode 100644
index f5b21c8..0000000
--- a/sys-freebsd/freebsd-usbin/files/rarpd.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rarpd.initd,v 1.3 2007/02/23 14:03:08 uberlord Exp $
-
-depend() {
-	if [ -z "${RARPD_ONLY_INTERFACE}" ]; then
-		need net
-	else
-		need net."${RARPD_ONLY_INTERFACE}"
-	fi
-}
-
-start() {
-	local rarpd_opts
-
-	if [ -z "${RARPD_ONLY_INTERFACE}" ]; then
-		rarpd_opts="${rarpd_opts} -a"
-	else
-		rarpd_opts="${rarpd_opts} ${RARPD_ONLY_INTERFACE}"
-	fi
-
-	ebegin "Starting reverse ARP daemon"
-	start-stop-daemon --start --background \
-		--pidfile /var/run/rarpd.pid --make-pidfile \
-		--exec /usr/sbin/rarpd -- -f ${rarpd_opts}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping reverse ARP daemon"
-	start-stop-daemon --stop --pidfile /var/run/rarpd.pid \
-		--exec /usr/sbin/rarpd -- ${rarpd_opts}
-	eend $?
-}

diff --git a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
deleted file mode 100755
index 0c74b9f..0000000
--- a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net rpcbind rpc.statd
-}
-
-start() {
-        ebegin "Starting NFS lockd"
-        start-stop-daemon --start --quiet --exec \
-                /usr/sbin/rpc.lockd -- $rpclockdopts
-        eend $? "Error starting NFS lockd"
-}
-
-stop() {
-        ebegin "Stopping NFS lockd"
-        start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.lockd
-        eend $? "Error stopping NFS lockd"
-}

diff --git a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
deleted file mode 100755
index 5c3cf30..0000000
--- a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net rpcbind
-}
-
-start() {
-        ebegin "Starting NFS statd"
-        start-stop-daemon --start --quiet --exec \
-                /usr/sbin/rpc.statd -- $rpcstatdopts
-        eend $? "Error starting NFS statd"
-}
-
-stop() {
-        ebegin "Stopping NFS statd"
-        start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.statd
-        eend $? "Error stopping NFS statd"
-}

diff --git a/sys-freebsd/freebsd-usbin/files/rpcbind.initd b/sys-freebsd/freebsd-usbin/files/rpcbind.initd
deleted file mode 100755
index 69451f1..0000000
--- a/sys-freebsd/freebsd-usbin/files/rpcbind.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/rpcbind.initd,v 1.3 2006/12/07 18:00:15 uberlord Exp $
-
-depend() {
-	need localmount
-	use net
-	before inetd
-	before xinetd
-}
-
-start() {
-	ebegin "Starting rpcbind"
-	start-stop-daemon --start --exec /usr/sbin/rpcbind
-	local ret=$?
-	eend ${ret}
-	
-	# without, if a service depending on portmap is started too fast,
-	# connecting to portmap will fail -- azarah
-	# doing that for rpcbind, too -- flameeyes
-	sleep 1
-	return ${ret}
-}
-
-stop() {
-	ebegin "Stopping rpcbind"
-	start-stop-daemon --stop --exec /usr/sbin/rpcbind
-	eend $?
-}

diff --git a/sys-freebsd/freebsd-usbin/files/syscons.confd b/sys-freebsd/freebsd-usbin/files/syscons.confd
deleted file mode 100644
index a6d7cd4..0000000
--- a/sys-freebsd/freebsd-usbin/files/syscons.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syscons.confd,v 1.1 2006/09/14 17:03:27 flameeyes Exp $
-# Example syscons config file. This is the place to set things like keymap, etc.
-
-# Set the keymap to "uk.iso".
-#KEYMAP="uk.iso"
-
-# Set the keyboard rate to 250ms delay, and 34 repeat rate.
-#KEYRATE="250.34"
-
-# Change the behaviour of F-unction keys (see kbdcontrol(1)).
-#KEYCHANGE="10 'ssh myhost'"
-
-# See vidcontrol(1) -t
-#BLANKTIME="off"

diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd
deleted file mode 100755
index f84b9ed..0000000
--- a/sys-freebsd/freebsd-usbin/files/syscons.initd
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syscons.initd,v 1.4 2009/02/24 17:43:07 drizzt Exp $
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Configuring system console"
-
-	if [ -n "${MODE}" ] ; then
-		einfo "Setting mode to ${MODE}"
-		vidcontrol "${MODE}"
-		eend $?
-	fi
-	
-	# XXX: This should handle serial consoles.
-	
-	# Set the keymap.
-	if [ -n "${KEYMAP}" ]; then
-		einfo "Setting keymap to" "${KEYMAP}"
-		kbdcontrol -l ${KEYMAP} < /dev/console
-	fi
-	
-	if [ -n "${KEYRATE}" ]; then
-		einfo "Setting keyrate to" "${KEYRATE}"
-		kbdcontrol -r ${KEYRATE} < /dev/console
-	fi
-
-	if [ -n "${KEYCHANGE}" ]; then
-		einfo "Changing function keys..."
-		eval set -- "${KEYCHANGE}"
-		eindent
-		while [ $# -gt 0 ] ; do
-			veinfo "F$1 -> \`$2'"
-			kbdcontrol -f "$1" "$2" < /dev/console
-			shift ; shift
-		done
-		eoutdent
-	fi
-	
-	if [ -n "${CURSOR}" ]; then
-		einfo "Setting cursor"
-		vidcontrol -c ${CURSOR}
-	fi
-
-	einfo "Setting custom fonts..."
-	# Nothing to see here, move along...
-	for v in FONT8x16 FONT8x14 FONT8x8; do
-		f=$(eval \$"${v}")
-		if [ -n "${f}" ]; then
-			vidcontrol -f ${v##FONT} ${f}
-		fi
-	done
-
-	if [ -n "${BLANKTIME}" ]; then
-		einfo "Setting blanktime"
-		vidcontrol -t ${BLANKTIME}
-	fi
-
-	if [ -n "${SAVER}" ]; then
-		for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do
-			kldunload ${i}
-		done
-		kldstat -v | grep -q _saver || kldload ${SAVER}_saver
-	fi
-
-	if [ -n "${KBDFLAGS}" ]; then
-		einfo "Setting keyboard flags for all screens"
-		for ttyv in /dev/ttyv*; do    
-			kbdcontrol ${KBDFLAGS} <${ttyv} >${ttyv} 2>&1
-		done
-	fi
-
-	eend 0
-}

diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd
deleted file mode 100755
index 0cb314e..0000000
--- a/sys-freebsd/freebsd-usbin/files/syslogd.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/syslogd.initd,v 1.3 2007/02/23 14:03:08 uberlord Exp $
-
-depend() {
-	provide logger
-	need localmount
-}
-
-start() {
-	ebegin "Starting System Logger"
-	start-stop-daemon --start --quiet --exec /usr/sbin/syslogd \
-		-- ${SYSLOGD_OPTS}
-	eend $?
-}
-
-stop() {
-       ebegin "Stopping System Logger"
-       start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid
-       eend $?
-}
-
-
-

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.0.9999.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.0.9999.ebuild
deleted file mode 100644
index c6a38ac..0000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.0.9999.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-			mirror://gentoo/${CONTRIB}.tar.xz
-			mirror://gentoo/${UBIN}.tar.xz
-			mirror://gentoo/${LIB}.tar.xz
-			mirror://gentoo/${SBIN}.tar.xz
-			mirror://gentoo/${ETC}.tar.xz
-			mirror://gentoo/${GNU}.tar.xz
-			nis? ( mirror://gentoo/${LIBEXEC}.tar.xz )
-			build? ( mirror://gentoo/${SYS}.tar.xz
-			mirror://gentoo/${INCLUDE}.tar.xz )"
-fi
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl )
-	>=app-arch/libarchive-3
-	sys-apps/tcp-wrappers
-	dev-util/dialog
-	>=dev-libs/libedit-20120311.3.0-r1
-	net-libs/libpcap
-	kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${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"
-
-pkg_setup() {
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-
-	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	"${FILESDIR}/${PN}-10.0-bsdxml2expat.patch"
-	)
-
-REMOVE_SUBDIRS="
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	pc-sysinstall cron mailwrapper ntp bsnmpd
-	tcpdump ndp inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg pkg_install freebsd-update service sysrc"
-
-src_prepare() {
-	if ! use build; then
-		[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-		[[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-	# Don't install mtree format manpage
-	# it's installed by libarchive.
-	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_compile() {
-	# Preparing to build nmtree
-	cd "${WORKDIR}/lib/libnetbsd"
-	freebsd_src_compile
-
-	cd "${S}"
-	freebsd_src_compile
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
-	# Most of these now come from openrc.
-	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util} || die
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util} || die
-		fi
-	done
-
-	for class in daily monthly weekly; do
-		cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe "${T}/periodic.${class}" periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf" || die
-
-	cd "${WORKDIR}/etc"
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf || die
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/* || die
-		rm -f "${D}"/etc/bluetooth/Makefile
-	fi
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic"
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	# We need to run pwd_mkdb if key files are not present
-	# If they are, then there is no need to run pwd_mkdb
-	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
-		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
-			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
-			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
-		else
-			eerror "${ROOT}etc/master.passwd does not exist!"
-			eerror "You will no be able to log into your system!"
-		fi
-	fi
-
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
-	done
-}