[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-lib/, ...

[Yuta SATOH]

commit:     80977454bccf3a8611eb39a3afc37a505f1c1d89
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Dec 31 08:16:42 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Mon Dec 31 08:16:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=80977454

sys-freebsd/*: added 9.1.9999.ebuild, tested releng/9.1 revision 244896

---
 sys-freebsd/boot0/Manifest                         |    1 +
 sys-freebsd/boot0/boot0-9.1.9999.ebuild            |   64 +++
 sys-freebsd/freebsd-bin/Manifest                   |    1 +
 .../freebsd-bin/freebsd-bin-9.1.9999.ebuild        |   37 ++
 sys-freebsd/freebsd-cddl/Manifest                  |    1 +
 .../freebsd-cddl/freebsd-cddl-9.1.9999.ebuild      |   64 +++
 sys-freebsd/freebsd-contrib/Manifest               |    1 +
 .../freebsd-contrib-9.1.9999.ebuild                |   62 +++
 sys-freebsd/freebsd-lib/Manifest                   |    1 +
 .../freebsd-lib/freebsd-lib-9.1.9999.ebuild        |  532 ++++++++++++++++++++
 sys-freebsd/freebsd-libexec/Manifest               |    1 +
 .../freebsd-libexec-9.1.9999.ebuild                |   66 +++
 sys-freebsd/freebsd-mk-defs/Manifest               |    1 +
 .../freebsd-mk-defs-9.1.9999.ebuild                |   40 ++
 sys-freebsd/freebsd-pam-modules/Manifest           |    1 +
 .../freebsd-pam-modules-9.1.9999.ebuild            |   47 ++
 sys-freebsd/freebsd-pf/Manifest                    |    1 +
 sys-freebsd/freebsd-pf/freebsd-pf-9.1.9999.ebuild  |   70 +++
 sys-freebsd/freebsd-rescue/Manifest                |    1 +
 .../freebsd-rescue/freebsd-rescue-9.1.9999.ebuild  |   64 +++
 sys-freebsd/freebsd-sbin/Manifest                  |    1 +
 .../freebsd-sbin/freebsd-sbin-9.1.9999.ebuild      |   94 ++++
 sys-freebsd/freebsd-share/Manifest                 |    1 +
 .../freebsd-share/freebsd-share-9.1.9999.ebuild    |   89 ++++
 sys-freebsd/freebsd-sources/Manifest               |    1 +
 .../freebsd-sources-9.1.9999.ebuild                |   94 ++++
 sys-freebsd/freebsd-ubin/Manifest                  |    1 +
 .../freebsd-ubin/freebsd-ubin-9.1.9999.ebuild      |  161 ++++++
 sys-freebsd/freebsd-usbin/Manifest                 |    1 +
 .../freebsd-usbin/freebsd-usbin-9.1.9999.ebuild    |  170 +++++++
 30 files changed, 1669 insertions(+), 0 deletions(-)

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index a6f05ce..ecc09b0 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,4 +1,5 @@
 DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
 DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
+EBUILD boot0-9.1.9999.ebuild 1620 SHA256 514c2ac7974c08dae73fd5470fa7f506c94e5f7a0982bcee715eee0bd7324ecc SHA512 ad0f959276088e7840c3201b5b41f76fd8feb6b653b894abb265c6a55de998b5b950e67b496c7cdbedb8b175f6892f30925e35bf4c7342019a0af523b9ed5f61 WHIRLPOOL 74b6ededc1d8a35501c46eccb07fbb65fdf6c6222a72db9976ef74cc0ac335dc7a82e325977ef3dfa42877e176502c0d487a51eb6c059a19a36e232e3b4b1d06
 EBUILD boot0-9.1_rc3.ebuild 1582 SHA256 ddd0523a74825adc0578d65f15a0ae1efe50f006bfbc1fedb9a2ac741f4f96cd SHA512 7303a987eb3b66a74cdc58c8a6eab0e7f3676c2c3e0b853da72dd53cdb15fa7143a8192f6ed1c9bedc5f783991f141e407a5204dabd3b1cf96b0aeb820c9f9a9 WHIRLPOOL bf6f8d46a7b48a852b5bd933c200e525c88029984d7a7e697ad5064bbce7e315f88499f47f3497151602413ce86c67603b71458a5d3cac72b93bd282d49934ae

diff --git a/sys-freebsd/boot0/boot0-9.1.9999.ebuild b/sys-freebsd/boot0/boot0-9.1.9999.ebuild
new file mode 100644
index 0000000..9d18c4f
--- /dev/null
+++ b/sys-freebsd/boot0/boot0-9.1.9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+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.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2"
+fi
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-lib-${RV}*"
+
+S="${WORKDIR}/sys/boot"
+
+boot0_use_enable() {
+	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
+}
+
+pkg_setup() {
+	boot0_use_enable ieee1394 FIREWIRE
+	boot0_use_enable zfs ZFS
+	boot0_use_enable tftp TFTP
+	boot0_use_enable bzip2 BZIP2
+}
+
+src_prepare() {
+	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
+
+	# gcc-4.6 or later version support, bug #409815
+	if ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 6 ]] ) ; then
+		sed -i -e '/-m elf_i386_fbsd/d' "${S}"/i386/Makefile.inc || die
+		for dir in boot2 gptboot gptzfsboot zfsboot; do
+			echo "LDFLAGS+= -m elf_i386_fbsd" >> "${S}"/i386/${dir}/Makefile || die
+		done
+		echo "CFLAGS+= -fno-asynchronous-unwind-tables" >> "${S}"/i386/boot2/Makefile || die
+	fi
+}
+
+src_compile() {
+	strip-flags
+	append-flags "-fno-strict-aliasing"
+	NOFLAGSTRIP="yes" freebsd_src_compile
+}
+
+src_install() {
+	dodir /boot/defaults
+	mkinstall FILESDIR=/boot || die "mkinstall failed"
+}

diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index 70e6851..3b0a778 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -2,4 +2,5 @@ DIST freebsd-bin-9.1_rc3.tar.bz2 385903 SHA256 309be19d01ee7fddaab6a9d0438ec9add
 DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
 DIST freebsd-sbin-9.1_rc3.tar.bz2 1273367 SHA256 3e576899dfd64987e2dd3f7b6d31f9570e1ac32f809ebd3de066d037097eab68 SHA512 d43e4ec5b85b5f5cd07818bb4cb21a016145550c02bdbedaa9606984e6e88707daf1c93931f4d3ec8843029de296b2b9133032dd006e6d2ea09770068eecdd9e WHIRLPOOL d137fcae29d903aa91253476009a3e7a792f086dd1dc1795c1720c47dc4a63a382d1531ad012474b1c72c67981082a5e9749b5e8e4efce047e93164b1a48fae1
 DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
+EBUILD freebsd-bin-9.1.9999.ebuild 879 SHA256 624ea963fdadd4446ca3e0ebfde13d7713eb289a5c9f7b785612e67dbc518150 SHA512 645dc05c83764dbadc3027aba43653bcd5752757d8128e50ccf2cb6c7abd12e82d87b7e5fb309dc7d7e1fe1b4d6bd3d9df4fb0626e0cd49d51825c585594bfdb WHIRLPOOL 5fe1d33e1ec45bfd23c2e1d1b0928e081344cf193684f95b10d53f6a690d35c1671db3751f3885b7aa5542b64c119bccf5b916fcc77e3f79abc10ff3b924a669
 EBUILD freebsd-bin-9.1_rc3.ebuild 840 SHA256 6513bdd449106651dfe245ef0a4e786c827d0268d233b43f66b864babf39cdb9 SHA512 65ae382329d3827409898dcb6a2a02051e8db35a0ec7d13f94e4ff971cc16933446076cd321bb85ddf6142bb26188b0adccd680e4d3fae22c97046e89011e9b2 WHIRLPOOL 74a9139b8924843d125dae7fc9c04bb405e6fbdb32d9a8873d15f0ddcaf6008116f63e592f7e32fd3d181a3c3ba9dbcc7fe17b241820f98b0896b7393f3c52b8

diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-9.1.9999.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.1.9999.ebuild
new file mode 100644
index 0000000..51d762c
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-9.1.9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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.bz2
+			mirror://gentoo/${UBIN}.tar.bz2
+			mirror://gentoo/${SBIN}.tar.bz2
+			mirror://gentoo/${LIB}.tar.bz2"
+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"
+
+pkg_setup() {
+	mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
+}

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 642f075..6a98bde 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -10,4 +10,5 @@ DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12
 DIST freebsd-sbin-9.1_rc3.tar.bz2 1273367 SHA256 3e576899dfd64987e2dd3f7b6d31f9570e1ac32f809ebd3de066d037097eab68 SHA512 d43e4ec5b85b5f5cd07818bb4cb21a016145550c02bdbedaa9606984e6e88707daf1c93931f4d3ec8843029de296b2b9133032dd006e6d2ea09770068eecdd9e WHIRLPOOL d137fcae29d903aa91253476009a3e7a792f086dd1dc1795c1720c47dc4a63a382d1531ad012474b1c72c67981082a5e9749b5e8e4efce047e93164b1a48fae1
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
 DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
+EBUILD freebsd-cddl-9.1.9999.ebuild 1567 SHA256 5e5d59f974e821a11d0d103cd4d9e2aabc8a7c7e0119d3177b617059e5d95b22 SHA512 9f29f6ab7afdf54a32af3d60f367f02e8601463928e0781fed64a8a00caa8884a22563ad8a962b98e9b8fa716b14152b7dff7eaec8595d624daf2e3c8b8e80f1 WHIRLPOOL 993bb423470ed9119807ca5a5e4f380297f045481ca72badcff711626a90da52699e0557b7d15291cc541b9c7403ee0370de7afe716fa09d7d4b9452c327a127
 EBUILD freebsd-cddl-9.1_rc3.ebuild 1524 SHA256 d16bcc6fe29047a307bc02f8c6208cda7eaa150c121f69fc74df8db17902909c SHA512 788fe17fbf321567138b8c315e7bb012ae0a4fef6e351f631023067dbc347a9abb909ed3a906cb83b54e03f6c1201778f18dab6fcd3f02256fac72431085e6a9 WHIRLPOOL c15cb7fb710838240fefd4a4df24d5f7c9acb37ef1657f9bf787fe10bdea6bc1fca9a9b2ee4ae60017bd7a997b5d85af35fb84b8cf83d30a3deca10cdbe8e860

diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1.9999.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1.9999.ebuild
new file mode 100644
index 0000000..7de0f86
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1.9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 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.bz2
+			mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${UBIN}.tar.bz2
+			mirror://gentoo/${LIB}.tar.bz2
+			mirror://gentoo/${SBIN}.tar.bz2
+			mirror://gentoo/${SYS}.tar.bz2
+			build? ( mirror://gentoo/${SYS}.tar.bz2
+				mirror://gentoo/${INCLUDE}.tar.bz2 )"
+fi
+
+# sys is required.
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	=sys-freebsd/freebsd-libexec-${RV}*
+	build? ( sys-apps/baselayout )
+	dev-libs/libelf"
+
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
+
+S="${WORKDIR}/cddl"
+
+PATCHES=( "${FILESDIR}/${PN}-9.0-bsdxml.patch"
+	"${FILESDIR}/${PN}-9.0-underlink.patch"
+	"${FILESDIR}/${PN}-9.0-libpaths.patch" )
+
+src_unpack() {
+	freebsd_src_unpack
+	# Link in include headers.
+	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
+}
+
+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
+
+	# 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
index f565663..f3c8e2d 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -1,3 +1,4 @@
 DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
 DIST freebsd-gnu-9.1_rc3.tar.bz2 795216 SHA256 43f493dbf3ccfea445cff838bf9b9887ed4f9d5437278529fee306444a3ea8e4 SHA512 0679f100f83e7347d00b2749aeb57a9582404a5f9160b170f5fcac715e8f401738cf89025e23b2c036b67be2a4030e283105dc707bf745e9cd4c199cd7a2689d WHIRLPOOL 9b4a12009c0826c891907d2312bc4eef4466b8124c9c00b70775556487a1a6e88676528a682ca29c3e36cdad13d61065b955d886a79885147cfc7731186ae8f4
+EBUILD freebsd-contrib-9.1.9999.ebuild 1513 SHA256 758e7785c189139e2f8097035342a5f81f22cdd55269ff10ae4deecd3cb719ce SHA512 e9b396185f2e6ce92a0ff89ddb27cc8410cc2f4df951850e69210c8bdc0f59e832eea670edc78dd2ffbe7d5d26e38ea1f8b17b92bfd759c8189d4c3130826d82 WHIRLPOOL 8612f39cc710cee694a4e877f671c38ed4d93609d56c7614b2375cadff0ea4b1ba43a618516712808be2ce1bd4289bd83c59c50952a533ea94a81756eaa395a2
 EBUILD freebsd-contrib-9.1_rc3.ebuild 1407 SHA256 f33ecdffd2648870725dd5d8b7814cafc3f9195e87fa94f7cb88f847b8388943 SHA512 588f06372ba4e7d6cb92038bf83959b1f146a10f61fc9b4b4b5e3e616d61511b3651386071bc09c726cedf5ee07f61d82afda5a92042942dc7d1916eaa3ac267 WHIRLPOOL 98303bb9ed8d2bcbee2a71c77d81bbc8bdb14aa669ed20d40b8edbcd88f99f800d03e504ea0221456e06826b3cfee18d859bd1800166aea85d454edaa528cd77

diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.9999.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.9999.ebuild
new file mode 100644
index 0000000..d1dc191
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit bsdmk freebsd flag-o-matic multilib
+
+DESCRIPTION="Contributed sources for FreeBSD."
+SLOT="0"
+LICENSE="BSD GPL-2 as-is"
+
+IUSE=""
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+		mirror://gentoo/${P}.tar.bz2"
+fi
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/gnu"
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		freebsd_src_unpack
+	else
+		echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
+		tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libodialog gnu/usr.bin/sort gnu/usr.bin/patch
+		echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
+		tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
+
+		freebsd_do_patches
+		freebsd_rename_libraries
+	fi
+}
+
+src_compile() {
+	cd "${S}/lib/libodialog"
+	freebsd_src_compile
+
+	cd "${S}/usr.bin/sort"
+	freebsd_src_compile
+
+	cd "${S}/usr.bin/patch"
+	freebsd_src_compile
+}
+
+src_install() {
+	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
+	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
+
+	cd "${S}/lib/libodialog"
+	mkinstall LIBDIR="/usr/$(get_libdir)" || die "libodialog install failed"
+
+	cd "${S}/usr.bin/sort"
+	mkinstall BINDIR="/bin/" || die "sort install failed"
+
+	cd "${S}/usr.bin/patch"
+	mkinstall BINDIR="/usr/bin/" || die "patch install failed"
+}

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index b511bf6..834071f 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -37,4 +37,5 @@ DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8
 DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
 EBUILD freebsd-lib-9.0-r3.ebuild 16910 SHA256 ef1c239e4650515a31fc0745ff66fbb9d6e482a3a955db066d61378cd4e4fe9d SHA512 95816399828aab69bf1b327cb350e116d8a4b94362445704694bb8e6d8ab3872648e02d1b624216749cff7b8832dc6657560cc503b41d08d542228f3d079c212 WHIRLPOOL acdadd9dab02b5e6ece319463ffb9d70dc018ad2c542fe8abd281f95c1db761aadd6d60e36ac04ab3181ffa987b98f5ced9e17d9e7865a5f4229e6da941a8b6e
+EBUILD freebsd-lib-9.1.9999.ebuild 17079 SHA256 05e7823c472a6c9e790cb8732f50e73afb8951174cd2aa00031aa785010ba2b2 SHA512 02434be57352c8b8783ece8b5a78540a022acf61e898dee503557bf5453c380fbce002a9d2c49dcd0f131f543aed51d94280841ee7b0fc55a17b4b0e50693855 WHIRLPOOL 07479d3642a12d6230a05c9d55b8e69f780a78b03a42ba0294ea5df43ca98653f7e32ef882c96f275c5f9fddf031e3255d4e75692f2ae2cbf1ecb410432712fa
 EBUILD freebsd-lib-9.1_rc3-r1.ebuild 17032 SHA256 a07d1533ff8a2603707b713d15da3415025f7e72e5216ef5ce06b1b72e6fef71 SHA512 b196c593bfcff4281510e111048a41181942242d5b8cd04bfe3bad3d827bd6ac217962b4840cc6aadb19bfc72f9e2760531ca4777961f69bb9953dd5c886be78 WHIRLPOOL 7faf123963dd2057e13bd1814540e684f89624c32b454679129fcb32721e4b26596479d96c24649d2c75f263f02a00e888153b68890f61258e08d959a914d305

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1.9999.ebuild
new file mode 100644
index 0000000..1b97025
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1.9999.ebuild
@@ -0,0 +1,532 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
+
+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.bz2
+			mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${CRYPTO}.tar.bz2
+			mirror://gentoo/${LIBEXEC}.tar.bz2
+			mirror://gentoo/${ETC}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2
+			mirror://gentoo/${USBIN}.tar.bz2
+			mirror://gentoo/${GNU}.tar.bz2
+			build? (
+				mirror://gentoo/${SYS}.tar.bz2 )
+			zfs? (
+				mirror://gentoo/${CDDL}.tar.bz2 )"
+fi
+
+if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
+	RDEPEND="ssl? ( dev-libs/openssl )
+		hesiod? ( net-dns/hesiod )
+		kerberos? ( virtual/krb5 )
+		usb? ( !dev-libs/libusb !dev-libs/libusbx )
+		userland_GNU? ( sys-apps/mtree )
+		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
+		>=dev-libs/expat-2.0.1
+		!sys-libs/libutempter
+		!sys-freebsd/freebsd-headers"
+	DEPEND="${RDEPEND}
+		>=sys-devel/flex-2.5.31-r2
+		=sys-freebsd/freebsd-sources-${RV}*
+		!bootstrap? ( app-arch/bzip2 )"
+else
+	SRC_URI="${SRC_URI}
+			mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+DEPEND="${DEPEND}
+		=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 bootstrap crosscompile_opts_headers-only zfs
+	userland_GNU userland_BSD multilib"
+
+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= "
+	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_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
+
+	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.0-gccfloat.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-csu.patch"
+	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
+	"${FILESDIR}/${PN}-9.0-liblink.patch"
+	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
+	"${FILESDIR}/${PN}-9.0-netware.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.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)
+# - Clang (compiler_rt and blocksruntime)
+#
+# The rest are libraries we already have somewhere else because
+# they are contribution.
+# Note: libtelnet is an internal lib used by telnet and telnetd programs
+# as it's not used in freebsd-lib package itself, it's pointless building
+# it here.
+REMOVE_SUBDIRS="ncurses \
+	libexpat \
+	libz libbz2 libarchive liblzma \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libcompiler_rt libblocksruntime \
+	libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet
+	libelf libedit"
+
+# 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
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+	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
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
+		die "Couldn't make ${machine}/include symlink."
+
+	cd "${S}"
+	use bootstrap && dummy_mk libstand
+	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
+	# BSD's sed on BSD.
+	if use userland_GNU; then
+		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+	fi
+}
+
+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)
+	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
+	freebsd_src_compile
+
+	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+}
+
+# Compile libssp_nonshared.a and add it's path to LDFLAGS.
+bootstrap_libssp_nonshared() {
+	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+	export LDADD="-lssp_nonshared"
+}
+
+# What to build for a non-native build: cross-compiler, non-native abi in
+# multilib. We also need the csu but this has to be handled separately.
+NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
+
+# Subdirs for a native build:
+NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
+
+# Is my $ABI native ?
+is_native_abi() {
+	is_crosscompile && return 1
+	use multilib || return 0
+	[ "${ABI}" = "${DEFAULT_ABI}" ]
+}
+
+# Do we need to bootstrap the csu and libssp_nonshared?
+need_bootstrap() {
+	is_crosscompile || use build || ! is_native_abi || 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="${NON_NATIVE_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
+	elif use build ; then
+		# For the non-native ABIs we only build the csu parts and very core
+		# libraries for now.
+		ret="gnu/lib/libssp/libssp_nonshared"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+	else
+		# Only build the csu parts and core libraries for now.
+		ret="gnu/lib/libssp/libssp_nonshared"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+		# Finally, with a non-native ABI without USE=build, we build everything
+		# too.
+		#ret="${NATIVE_SUBDIRS}"
+	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}"
+	fi
+	bootstrap_csu
+	bootstrap_libssp_nonshared
+}
+
+# Compile it. Assume we have the toolchain setup correctly.
+do_compile() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
+	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
+	need_bootstrap && do_bootstrap
+
+	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
+
+	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="
+		append-flags "-I/usr/${CTARGET}/usr/include"
+		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
+	fi
+
+	if is_crosscompile ; then
+		do_compile
+	else
+		for ABI in $(get_all_abis) ; do
+			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				export ${i}_SAVE="${!i}"
+			done
+
+			multilib_toolchain_setup ${ABI}
+
+			local target="$(tc-arch-kernel ${CHOST})"
+			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
+			CFLAGADD=""
+			if ! is_native_abi ; then
+				mymakeopts="${mymakeopts} COMPAT_32BIT="
+			fi
+			need_bootstrap || CFLAGS="${CFLAGS} -isystem /usr/include"
+
+			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
+
+			CTARGET="${CHOST}" do_compile
+
+			# Restore the variables now.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				ii="${i}_SAVE"
+				export ${i}="${!ii}"
+			done
+		done
+	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} )"
+
+	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/libssp_nonshared.a )
+END_LDSCRIPT
+}
+
+do_install() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
+	for i in $(get_subdirs) ; do
+		einfo "Installing in ${i}..."
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_install || die "Install ${i} failed"
+	done
+}
+
+src_install() {
+	[ "${CTARGET}" = "${CHOST}" ] \
+		&& INCLUDEDIR="/usr/include" \
+		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
+	dodir ${INCLUDEDIR}
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+	install_includes ${INCLUDEDIR}
+
+	use crosscompile_opts_headers-only && return 0
+	local mylibdir=$(get_libdir)
+
+	if is_crosscompile ; then
+		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
+	else
+		if ! use multilib ; then
+			# Set SHLIBDIR and LIBDIR for multilib
+			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
+			do_install
+		else
+			for ABI in $(get_all_abis) ; do
+				mymakeopts_SAVE="${mymakeopts}"
+				multilib_toolchain_setup ${ABI}
+				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
+				do_install
+				mymakeopts="${mymakeopts_SAVE}"
+			done
+		fi
+	fi
+
+	# Don't install the rest of the configuration files if crosscompiling
+	if is_crosscompile ; then
+		# This is to get it stripped with the correct tools, otherwise it gets
+		# stripped with the host strip.
+		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
+		export CHOST=${CTARGET}
+		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
+		return 0
+	fi
+
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins nls.alias mac.conf netconfig
+
+	# Install ttys file
+	local MACHINE="$(tc-arch-kernel)"
+	doins "etc.${MACHINE}"/*
+
+	# Generate ldscripts for core libraries that will go in /
+	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
+		kvm m md procstat sbuf thr ufs util
+
+	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
+
+	# Install a libusb.pc for better compat with Linux's libusb
+	if use usb ; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb1.0.pc" || die
+	fi
+}
+
+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}" || 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
index 9f3b74a..15c3e42 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -12,4 +12,5 @@ DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12
 DIST freebsd-libexec-9.1_rc3.tar.bz2 305301 SHA256 4cf56ff81096112b33276f619e823c8426bc1c97904f183b431e2e98c29ef698 SHA512 3122faf7f88934c05bee6c6d5faa24998d27c35e11bf4f809af26d7b8ad0a26519715b7a29f303ba878e3e8897742486a0a86a123d00b9deb60246c8cac4e1a7 WHIRLPOOL 1b10d85d2d426457189143350b375c7a1723ff8067c37200cce15f18fa6d963b94fdd0339e91d01ed16b87e4338761e33c7afb022e50b3bbff8dbcc3a45f5b73
 DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
+EBUILD freebsd-libexec-9.1.9999.ebuild 1747 SHA256 058548a3fdfce70318afc999f4158ccaba61729e86e0dfe1f751d88711ab985a SHA512 4853268771992f651e2f445659a005ddb3d606ba7eef61c8bd334ac2d801a3e8209b81fefdb577fd7032035806c5a13c3b16ff7dcf975fa74e71b7b3c87d6795 WHIRLPOOL 294961dfb4261df654091a10cd520c0e9bc4e93a36cfcc04dd800c4b921d8a65dc84ae66204f6e46c773f7040007c21e1eef7e163535609502ce24d18b0ee7f1
 EBUILD freebsd-libexec-9.1_rc3.ebuild 1705 SHA256 a1a1ba949b0af66b71b2ce612a26f127c4bfe26e347ab130c03bf6c450b34d54 SHA512 a181641ef79ebdb277ede7119ddc2a6c601187aad49f1a4fb9b651631a8fe8fdfde6f696775f1d8374985015c80bf1328c34700e43ca2fe8bf1ff341fcf8fe3c WHIRLPOOL 37f8dd1a40828ca84a92c56f8cd6edc4fd32008f328af24e52ca4d078c62895348fe68f26db4ed19cdcd14f64cdaac793e7291e909d5abd05fba1d64abbe8409

diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.9999.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.9999.ebuild
new file mode 100644
index 0000000..170ffc5
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit bsdmk freebsd pam
+
+DESCRIPTION="FreeBSD libexec things"
+SLOT="0"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2"
+fi
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	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 lukemftpd ftpd"
+
+IUSE="pam ssl kerberos ipv6 nis xinetd"
+
+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() {
+	ln -s /usr/include "${WORKDIR}/include"
+}
+
+src_install() {
+	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
index a4252e1..52d20f8 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -3,4 +3,5 @@ AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee7
 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
 DIST freebsd-share-9.1_rc3.tar.bz2 6737671 SHA256 2def8da87433c0f25b8bf32b62c31bd391c2a49a6b4986d81c8301e1be232cdc SHA512 4043cfc2b70eb26d0bc73c698aee7c2b223e813499a4afc7352a232e85cab32c248fc65066b942db11ce2b2108e9fbcd739a71245ebe4f841cbb71bd9f729848 WHIRLPOOL 3088efed7520de1b9727cecfa3819cca753b1ef76fa943753f93f0bacc83e17434b45479e6b831bac0819ee43dcde6982c94d8a9d7c147b7222b639b7d6a8aa2
+EBUILD freebsd-mk-defs-9.1.9999.ebuild 770 SHA256 c90f6bff8e828b4f032bda3e296eb6dde2ecae147144b54a918d5386a24ef8da SHA512 c55746a024097f0ef175132d8d1b192e4b588012b10025ed8601f5c64b99a04d4f7f24be064dd0605f03a12684b5ab1fc1df0a857dd88aadeec407f30f0fe6e1 WHIRLPOOL f355cf82c55846a5f230072ee9ec7c3e84c74d8753610d9717d32afe6b5144c20618ed751d1301bdc5209f385fe5d5f611a518f118364cf1eae6a10ec318e0ad
 EBUILD freebsd-mk-defs-9.1_rc3.ebuild 734 SHA256 b4775cb0a733151d16d90c43a3fdd9dc14ec661881319605e88ef92dde0320e2 SHA512 5310173ea2d0b620989a8d158e3a3ef30019fc1303147629d0303f3a7ff146b64aeee474ffc908a3e1956132131558dec8e49f34ffb52645ff7b35e9864c4a2f WHIRLPOOL a825f8f32be0a9efdaaf42b0dd1da6d1d9bbe348a14d0eda6a85a432b94489e3375455b23cb1a5e4dce0c21ede691fe60c61d9969f47d16affedc2ca65f3ba4e

diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.9999.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.9999.ebuild
new file mode 100644
index 0000000..9e890f5
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 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.bz2"
+fi
+
+RDEPEND=""
+DEPEND=""
+
+RESTRICT="strip"
+
+S="${WORKDIR}/share/mk"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
+	use userland_GNU && epatch "${FILESDIR}/${PN}-9.1-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
index a3a5286..83b13d2 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,4 +1,5 @@
 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
 DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+EBUILD freebsd-pam-modules-9.1.9999.ebuild 1112 SHA256 bd5a410810945b907dfa87b85d3d5cd3251e2d7d9a61a4f6ca94fb7356054a23 SHA512 dde4a02fa66b6b340c44429253e580654819c06c1d910e620449e9d093f5f2342cdbc1eefcad8101211c67c10cf7a52f6fc8a831027ceaf0b41842f043d4e911 WHIRLPOOL 1404077f2d51bb5b34e8f6c7655d8f1926c79453506bf872913d1ed7b5aeab5992287c4077f0ea71f827bebec64b7932d56a7cdf4c18346da335c6bef2c02635
 EBUILD freebsd-pam-modules-9.1_rc3.ebuild 1076 SHA256 f0be3f955849315f9215e8b5abafdf9197f1c2f1c03525f55f63627f7843d789 SHA512 e7d09c5811542ec43c17740d09f11b5666be469f4f4bb0b49ff3229145c13d2cf95134f849a3bd17120266f184ae11269343f02e6d5ecbb22517598faaaa4f56 WHIRLPOOL cee3676110eb396393a7625033a3a6e27aee75989c3eda9362ab0e5e8605910092474b834ee4f4ba09fd04a3ca9a18488aed49900f0cf540feebde984d97d47f

diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1.9999.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1.9999.ebuild
new file mode 100644
index 0000000..7162840
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1.9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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.bz2"
+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} NO_OPENSSH= "
+	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+}
+
+src_unpack() {
+	freebsd_src_unpack
+
+	for module in pam_deny pam_passwdqc pam_permit; 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
index d8048a0..786e4bb 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -9,4 +9,5 @@ DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe18
 DIST freebsd-etc-9.1_rc3.tar.bz2 207784 SHA256 c6d6b208077ccff739484b2b473892ee1a650c52029beff2d2b435da6dd469b7 SHA512 15153dfefa59aea78b017b9af2295a6ad488c805080dd613c0955fc9797881a3636570074cfd4adf3f4d13119ab05ccec83107b0fc809fbb8b7dab6a7a2333b3 WHIRLPOOL 6234b73f300db3e9ed8f37124892333fe80d6b39e48d4ac101cce6219db7c2a13992af56d18caffcaef8501873b2703780bdb890472e8717e1ace294f0a2ecb3
 DIST freebsd-sbin-9.1_rc3.tar.bz2 1273367 SHA256 3e576899dfd64987e2dd3f7b6d31f9570e1ac32f809ebd3de066d037097eab68 SHA512 d43e4ec5b85b5f5cd07818bb4cb21a016145550c02bdbedaa9606984e6e88707daf1c93931f4d3ec8843029de296b2b9133032dd006e6d2ea09770068eecdd9e WHIRLPOOL d137fcae29d903aa91253476009a3e7a792f086dd1dc1795c1720c47dc4a63a382d1531ad012474b1c72c67981082a5e9749b5e8e4efce047e93164b1a48fae1
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
+EBUILD freebsd-pf-9.1.9999.ebuild 1690 SHA256 2068e5f98a8916593239802d8aa431439809b63343df7b4d501721c5b57a120d SHA512 c12a186f8332c625a6de970d2513a56f9d60910688255a23ac9c4b63872fcb8205f86f519f12bcdeba4a2bd69f0c85dbf25540caba9246b34d23819cd56df70e WHIRLPOOL 83fd5e6bf0e660a35a5d360bf9cfc135447a490947cee79ec572ad832c8ed53bac991c0b8bd148b3038acf883cf2018a8b38b60b046ba5264130060e5d7a46cc
 EBUILD freebsd-pf-9.1_rc3.ebuild 1651 SHA256 e467cc39cce0a95efd62856581970e2af9f825c2a42a8109ef7ac572b4e8897a SHA512 a35d03d9ab3c8d01823c5429df136cb70cc6fc25df8fb9228d1c2ef634bd7a11d9e74e7c3056084005fee4cef0ef874dfa4db6a93fd8c23cf00a62b358f4a85f WHIRLPOOL 7dacc0e59b1ca5a5b3aea9437cdc48b136351a85ca8dd9f98043d1a19cca67819fb3d17bceee38a9cfe34dee3898c2f1445a30f66b66a8ae30484d8d0ba90490

diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.1.9999.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.1.9999.ebuild
new file mode 100644
index 0000000..d7a8a60
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-9.1.9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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.bz2
+			mirror://gentoo/${SBIN}.tar.bz2
+			mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${ETC}.tar.bz2"
+fi
+
+RDEPEND="net-libs/libpcap"
+DEPEND="${RDEPEND}
+	dev-libs/libevent
+	sys-freebsd/freebsd-mk-defs
+	=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_unpack() {
+	freebsd_src_unpack
+	# pcap-int.h redefines snprintf as pcap_snprintf
+	epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
+	# Use system's libevent
+	epatch "${FILESDIR}/${PN}-9.0-libevent.patch"
+	epatch "${FILESDIR}/${PN}-9.0-pflogd.patch"
+	epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
+	epatch "${FILESDIR}/${PN}-9.0-getline.patch"
+	# Link in kernel sources
+	ln -s "/usr/src/sys-${RV}" "${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
+	newdoc pf.conf pf.conf.example
+	# 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
index eea8b15..deed50c 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -15,4 +15,5 @@ DIST freebsd-sbin-9.1_rc3.tar.bz2 1273367 SHA256 3e576899dfd64987e2dd3f7b6d31f95
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
 DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
+EBUILD freebsd-rescue-9.1.9999.ebuild 1839 SHA256 fb3746d88cef20876dd580eef5eff6f2177527319c611c3e365d64ff0685b6c2 SHA512 2b9c46abf56faca05b376226ebd4eb0cded97c4264e6323d9492fc653c8e5071f4216c80b817746c6d3d2f5761046a5aae8780c17806d6ab464910e8a141b96c WHIRLPOOL 0621ab03bc91fa60a55945ff4dbfc914b8ba805c881c34d0f04aafd0942f40816f6cb71438d13465138e0493621f29874a716e3f287576760a30e8ee825e9f95
 EBUILD freebsd-rescue-9.1_rc3.ebuild 1793 SHA256 b4d0d7366413b3e5ac7cf25718e9c3df86217a06d60fd3ce11ebe5994fe42467 SHA512 dce30ef8044e7ce0303044e87630d13bd5973c1b9739bedbbfc3d136231f986640d12b69f7581d187c846b32a682af8661e297df25845ddfc2cb893b03180599 WHIRLPOOL 16b4b4726d554fb77c3447053233b159ae97cdad417cc97c644acfba837dd29a27fbb8f8cf0a640d354d2b3c72f8d5de3de7c83f01a89d0c3a63a90af7816e2e

diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.9999.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.9999.ebuild
new file mode 100644
index 0000000..b915b3f
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit bsdmk freebsd
+
+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.bz2
+			mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${LIB}.tar.bz2
+			mirror://gentoo/${BIN}.tar.bz2
+			mirror://gentoo/${SBIN}.tar.bz2
+			mirror://gentoo/${USBIN}.tar.bz2
+			mirror://gentoo/${GNU}.tar.bz2
+			mirror://gentoo/${SYS}.tar.bz2
+			mirror://gentoo/${LIBEXEC}.tar.bz2
+			mirror://gentoo/${RESCUE}.tar.bz2
+			zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
+fi
+
+RDEPEND=""
+DEPEND="sys-devel/flex
+	>=app-arch/libarchive-3.0.3[static-libs]
+	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]
+	virtual/pkgconfig
+	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
+	=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${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= "
+}
+
+src_prepare() {
+	# As they are patches from ${WORKDIR} apply them by hand
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch
+	epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
+	epatch "${FILESDIR}/${PN}"-9.1-libcleverlink.patch
+	epatch "${FILESDIR}/${PN}"-9.1-bsdtar.patch
+	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
+}

diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index edbdd8b..ce3246f 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -12,4 +12,5 @@ DIST freebsd-libexec-9.1_rc3.tar.bz2 305301 SHA256 4cf56ff81096112b33276f619e823
 DIST freebsd-sbin-9.1_rc3.tar.bz2 1273367 SHA256 3e576899dfd64987e2dd3f7b6d31f9570e1ac32f809ebd3de066d037097eab68 SHA512 d43e4ec5b85b5f5cd07818bb4cb21a016145550c02bdbedaa9606984e6e88707daf1c93931f4d3ec8843029de296b2b9133032dd006e6d2ea09770068eecdd9e WHIRLPOOL d137fcae29d903aa91253476009a3e7a792f086dd1dc1795c1720c47dc4a63a382d1531ad012474b1c72c67981082a5e9749b5e8e4efce047e93164b1a48fae1
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
+EBUILD freebsd-sbin-9.1.9999.ebuild 2692 SHA256 ef5ca7ab05f4ce15f63717cca9911044681bd1471687f66bfe7bc261008f2568 SHA512 e263ef9ff425a7a39d3b7c3c33895f60a6c546bafef3dd6b66ef73e4b4fa85fdb0d5d85943b621e459c3bea1d531f7a8415d7a97e8142cf82d27c6086f5f4109 WHIRLPOOL f2d1a4e85b212e704e839cf39fb45b3729742f97bf933dfcc12ca48d006c0007cf28927da6efb3b1c0f32a51991456212a8e5802528744c68bd6a93bb1c7f9f5
 EBUILD freebsd-sbin-9.1_rc3.ebuild 2650 SHA256 0cf4a177ec5610ae26e8517dc10d21db7795f0b0b438c6393912f81fcc191c1d SHA512 9e1db71d792b4e03df46830708b21ce77e8a6c0028f55e74211080f49aed5070c94bfb8b04aaa912d1909710b1e716afd270555a6371911a49afa5f522ade537 WHIRLPOOL 6747ffe77878dd431f169d9721b8ac2c77f23692bcaf28019f861d8211ebde85f47eed575e450a30c5daa1450c7153027eac9ccdcc0e9019ba5eecff878706f3

diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.9999.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.9999.ebuild
new file mode 100644
index 0000000..61977a2
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+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.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
+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/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}-7.1-zlib.patch"
+	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
+	"${FILESDIR}/${PN}-6.1-pr102701.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
+
+src_prepare() {
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+}
+
+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
+
+	# initd script for idmapd
+	newinitd "${FILESDIR}/idmapd.initd" idmapd
+
+	# 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
index e65b7ca..e514edb 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -21,4 +21,5 @@ DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d740
 DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
 EBUILD freebsd-share-9.0.ebuild 2674 SHA256 81a4907bbdd18e07cc5f290607d1df5c98394eab6a0052b5aeb3be9a4bbf9aba SHA512 cd5f50ea116962529edaac265b79304e9c038d3f40d2dc5bb33a115aef7f2d3f5884eed97ee78c236a3ce902f82ec06271dda3e75621b752625f694c8ce3e4c5 WHIRLPOOL 40b3153281defac4c5aff4f99ceec70f7785bda5c6a4a60d13329f813ac3b68a2714e9a95238bdf5088226a20e12c3092f37218d183d846b0ee908367194670c
+EBUILD freebsd-share-9.1.9999.ebuild 2631 SHA256 62e75f2845129d7aa8b47b8d40757b40243b4720b24f362e3034326651ee6caa SHA512 c29cd0ca3e14f6fd352dd6009b6cf5cd324bc235f80fa35b61a7dd663a4ab46274372050415ff40a754c648f48d400f83a7c39841755f3b6b0719e82a28985ef WHIRLPOOL a202fdcdaa003ba77926f753de3448f5758831c6f700d2c785a4dd3c31998c093c908423a7cc9c608c0d90ab8a1220224a5f38935b6bed24c2872d31a081dbc4
 EBUILD freebsd-share-9.1_rc3.ebuild 2587 SHA256 e9b8a5c0594fa5bd938de90e360e87f657ab072e6c0fe04409ef560de7a3610b SHA512 8b36bac96375a95bdcce64a39b0bb3ee867f503fb4865ffd64bba935f3088de6d2c32dcd32e85427ca7addf00667bf0f023cbbe737a5a16072d5cf076cea9ab3 WHIRLPOOL 25886cb59b144a7b40fe349f64b259610a27b4ac56d27585f8adcc5a3a0e54eb961a4eef3aa166b9cf3252a72118b4b759bd24b5f015db2818d93a09b4540ecb

diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.1.9999.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.1.9999.ebuild
new file mode 100644
index 0000000..14f87eb
--- /dev/null
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.1.9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD shared tools/files"
+SLOT="0"
+
+IUSE="doc"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2"
+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= "
+
+	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}-8.0-gnu-miscfiles.patch" )
+
+src_unpack() {
+	freebsd_src_unpack
+
+	# 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"
+
+	# 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
+	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink"
+}
+
+src_compile() {
+	export ESED="/usr/bin/sed"
+
+	# This is a groff problem and not a -shared problem.
+	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
+	mkmake || die "emake failed"
+}
+
+src_install() {
+	mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
+}

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 4aaf271..a658acc 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -13,4 +13,5 @@ AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee4
 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
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
+EBUILD freebsd-sources-9.1.9999.ebuild 2938 SHA256 cfb9168fda2af171bc99a23c323ce0007144d2ce9ec29248e8e13c540be05a55 SHA512 49bacc39752aea82efddbc78eb5ab06b091af4d8628b7275b7ccad95489ae89e614e9c9723c71e2e3fbf1e6fc824127e7b86fbf01c5e643b9198a83dc58df29a WHIRLPOOL fb5fd6f8d4eceb1bac8e5db7284255b8ed46b61dbf630b14093ecc66fa100adbcee745127600b72e75ad8bbdef5d4f797ae587aa9cb312606361705ef932d143
 EBUILD freebsd-sources-9.1_rc3-r1.ebuild 2943 SHA256 82d263ff739c01df32ac29155cf8615784898e7d7135da4728ec89c2240c108e SHA512 45cb847a33037af639be9d104bff54d76eda9ff63730d0bf2878dd5498fe0ac6fb30fe9b5e01cc8c7ef0aded5df409cfabdb1c6f9b957aa4a7e54e9e2bd5d504 WHIRLPOOL 1fa1db59216e58d74c07a3ccbb68bcbd96adb5525799ebd257750ae818e598e5435c4a43d2d4a5d57418d5817380f1c46b970db63f29fa11418c4d9000a5e8b9

diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.9999.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1.9999.ebuild
new file mode 100644
index 0000000..07bfcf5
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1.9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+
+IUSE="symlink"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+	"${FILESDIR}/${PN}-9.1-gentoo.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-ntfs.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.1-MFC-r239588.patch"
+	"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
+
+src_unpack() {
+	freebsd_src_unpack
+
+	# 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 9.0-RELEASE it's 900001.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001: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
+}
+
+src_compile() {
+	einfo "Nothing to compile.."
+}
+
+src_install() {
+	insinto "/usr/src/sys-${MY_PVR}"
+	doins -r "${S}/"*
+}
+
+pkg_postinst() {
+	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		# just in case...
+		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	elif use symlink; then
+		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't remove previous symlinks, please fix manually."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	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-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index cbd1894..1189e71 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -35,4 +35,5 @@ DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd3
 DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
 EBUILD freebsd-ubin-9.0-r1.ebuild 4661 SHA256 c54ae99afb40565740357ed7cb86512d4f06225f42b1498f157bb7488760eebd SHA512 5bb79b20c2e4d07bed93e16e1fa59bb1c32dcf617041c65e7a63c8862f630cb3a5d26b9e22ef4289c59a1d777fbb5e883c7fbcf5aa4cd6b9473baed3e09a6ce5 WHIRLPOOL f3ffd3a2f5c338da65da979f4d4dd837174c7242d2659a07bf3b963a74f31d5fd269b705034e3f38be8b365dc74b279fc0d5571a2cc85e8125d0e04746668cb1
 EBUILD freebsd-ubin-9.0.ebuild 4665 SHA256 a118f88387da9bfdc4213e81858248cb483e0f0d0030bf51f46bd8791337aa65 SHA512 809bfebafe6aaae86f14ecf51e3cb7a60555fc870b56c735ae7e3691fd64d2a62038e69f857eb5ea764c8863f150c749b1e231b50b6091ab37db5396ad029e89 WHIRLPOOL 335603d714b033e7d29d3a13f3ea892cd0d28f2567f2be0fb3c3fcfc73070b1d396a2e636b315e122485d5da7f53bd647676f6bcf772504dad83e5262c5e9e32
+EBUILD freebsd-ubin-9.1.9999.ebuild 4780 SHA256 034ce577e1a4bb3de5d228873f73a7c601cc18c5955db6f4e67e20193dbbe153 SHA512 c7c2527ce989c957c09452e2f62bb2889e836964e7ef9d32d7ec4ba49d48bab0d47b8835fdd43ba2476a808bbc175b2ee2ef3cd4ee6782c3e39afe0c2a493630 WHIRLPOOL 939924341d531896372c383ae7cb1f50892e5d2bc80ceef3f7f73ca581b0fd011a34847ca5f8b6ad5f40b07ed810d9d5022c2813d9afa50290462c31c62c7c7b
 EBUILD freebsd-ubin-9.1_rc3.ebuild 4737 SHA256 b8a911adfb3b42b8082509995c905c519c6144af6f79d52a12a8b1b9ced0f569 SHA512 a472827752bb8a3035e7d909c8a6d9792738b4c961974d40cc422cc6fac6a14b33fb0e1c14650ee17a94f9afaf40f9768228ed3a3606374882b50054773be887 WHIRLPOOL 6202d945450f0805d50be41fe463ad8593344548d6b48762887d2a28f2ea755038ffac806c63e2c1b039c8543dd0bf254ee598604586242afa3b80ca8eccd66d

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.9999.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.9999.ebuild
new file mode 100644
index 0000000..3dc5aff
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1.9999.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic pam
+
+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.bz2
+			mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${LIB}.tar.bz2
+			mirror://gentoo/${ETC}.tar.bz2
+			mirror://gentoo/${BIN}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2
+			zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
+			build? ( mirror://gentoo/${SYS}.tar.bz2 )"
+fi
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
+	ssl? ( dev-libs/openssl )
+	kerberos? ( virtual/krb5 )
+	ar? ( app-arch/libarchive )
+	virtual/pam
+	sys-libs/zlib
+	>=sys-libs/ncurses-5.9
+	!sys-process/fuser-bsd
+	!dev-util/csup"
+
+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}-9.1-kdump-ioctl.patch"
+	"${FILESDIR}/${PN}-8.0-xinstall.patch"
+	"${FILESDIR}/${PN}-9.0-ar-libarchive3.patch"
+	"${FILESDIR}/${PN}-9.1-bsdar.patch"
+	"${FILESDIR}/${PN}-9.1-minigzip.patch"
+	"${FILESDIR}/${PN}-9.1-grep.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
+	dig hesinfo nslookup nsupdate 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= "
+}
+
+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() {
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+
+	# 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
+}
+
+src_install() {
+	freebsd_src_install
+
+	# baselayout requires these in /bin
+	dodir /bin
+	for bin in sed printf fuser; 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
+}
+
+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
index 74b76c9..588b5a2 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -38,4 +38,5 @@ DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d740
 DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
 EBUILD freebsd-usbin-9.0.ebuild 5174 SHA256 24728beb3b728588a922947b05d150f2ad531897c31258bf245e71b413d75800 SHA512 a3bd8b55df0d6d81199ac5712516f1e3b78e8a0e885ddfe454bea6bafc1476f05fa5d50f751ec5333bfaf32410bd2e78a55beb44c3b624ced70d884d1e4f4f7e WHIRLPOOL db2be971dc95d13010607492e72621636dc37af0c7ac2c4a8fe9f3760a91579c2bc4daee66735e9fd2dc416fef73e42a30fef4480752cc125b1092781a436b53
+EBUILD freebsd-usbin-9.1.9999.ebuild 5267 SHA256 fd40eee9296a426849fb624f6557e0f2f99c449c4b81d539f81df00306345066 SHA512 a3c15fcda886010d6ab2f9c8fe525911337cf351966686749a2630d8795d5578bf594da400f414a97bc29a9219a8b7285f0608260d0f10940b5d37cfd688e0c7 WHIRLPOOL 22216b0ee665f3439b4c645fc5775de28c43df6ceafc03c7ac928c4b899cbc6788efd5545f58cf33b7ae889a02bbf238034cde8912139a87f1eafd2ab310c22b
 EBUILD freebsd-usbin-9.1_rc3.ebuild 5222 SHA256 0f8831d95bb3c3df43d0aba3a70266d4062cfffdea5ca2a8fbe0316cf9e9c9d5 SHA512 7f2a614cfd6b0d695cd162d019eff4fbe90598309c57273f67b33752c2436d3ec0b4d7c517a16a0bf3e1701e9c25ee246d5dac9de5b6f7fc174b2c61a43fc47c WHIRLPOOL f5fc3bc054b04cc3faffa8d533e04103da924b85a71b4fe2db3920918dcca0af43c3583cff6e19f009a65a2244b9f1ea8376bbb3e48bf8fb76ce6ba2e9e74613

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1.9999.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1.9999.ebuild
new file mode 100644
index 0000000..60c3e6f
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1.9999.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+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.bz2
+			mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${UBIN}.tar.bz2
+			mirror://gentoo/${LIB}.tar.bz2
+			mirror://gentoo/${SBIN}.tar.bz2
+			mirror://gentoo/${ETC}.tar.bz2
+			mirror://gentoo/${GNU}.tar.bz2
+			nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
+			build? ( mirror://gentoo/${SYS}.tar.bz2
+				mirror://gentoo/${INCLUDE}.tar.bz2 )"
+fi
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
+	=sys-freebsd/freebsd-libexec-${RV}*
+	=sys-freebsd/freebsd-contrib-${RV}*
+	acpi? ( sys-power/iasl )
+	build? ( sys-apps/baselayout )
+	ssl? ( dev-libs/openssl )
+	>=app-arch/libarchive-3
+	sys-apps/tcp-wrappers
+	dev-util/dialog
+	dev-libs/libelf
+	>=dev-libs/libedit-20120311.3.0-r1
+	net-libs/libpcap"
+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 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= "
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
+
+	append-flags $(test-flags -fno-strict-aliasing)
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-adduser.patch"
+	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
+	"${FILESDIR}/${PN}-9.1-bsdxml2expat.patch"
+	)
+
+REMOVE_SUBDIRS="
+	named named-checkzone named-checkconf rndc rndc-confgen
+	dnssec-keygen dnssec-signzone
+	tcpdchk tcpdmatch
+	sendmail praliases editmap mailstats makemap
+	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"
+
+src_prepare() {
+	if ! use build; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		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_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 nfs 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
+}