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

[Yuta SATOH]

commit:     5bc6abc341dc616d71356e69d475d62c7c1ca98e
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Dec 31 06:51:05 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Mon Dec 31 06:51:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=5bc6abc3

sys-freebsd/* import from latest tree

---
 sys-freebsd/boot0/Manifest                         |    2 +-
 sys-freebsd/boot0/boot0-9.1_rc3.ebuild             |    2 +-
 sys-freebsd/freebsd-bin/Manifest                   |    5 +
 sys-freebsd/freebsd-bin/freebsd-bin-9.1_rc3.ebuild |   35 ++
 sys-freebsd/freebsd-cddl/Manifest                  |   13 +
 .../files/freebsd-cddl-9.0-bsdxml.patch            |   28 ++
 .../files/freebsd-cddl-9.0-libpaths.patch          |  167 ++++++++++
 .../files/freebsd-cddl-9.0-underlink.patch         |   22 ++
 sys-freebsd/freebsd-cddl/files/zfs.initd           |   24 ++
 sys-freebsd/freebsd-cddl/files/zvol.initd-9.0      |   45 +++
 .../freebsd-cddl/freebsd-cddl-9.1_rc3.ebuild       |   62 ++++
 sys-freebsd/freebsd-contrib/Manifest               |    3 +
 .../freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild |   56 ++++
 sys-freebsd/freebsd-lib/Manifest                   |   13 +-
 ...9.1_rc3-r1.ebuild => freebsd-lib-9.0-r3.ebuild} |   16 +-
 .../freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild      |    2 +-
 sys-freebsd/freebsd-libexec/Manifest               |   15 +
 sys-freebsd/freebsd-libexec/files/bootpd.confd     |    7 +
 sys-freebsd/freebsd-libexec/files/bootpd.initd     |   27 ++
 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/freebsd-libexec-9.1_rc3.ebuild |   64 ++++
 sys-freebsd/freebsd-mk-defs/Manifest               |    6 +
 .../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 +++++
 .../freebsd-mk-defs/freebsd-mk-defs-9.1_rc3.ebuild |   38 +++
 sys-freebsd/freebsd-pam-modules/Manifest           |    4 +
 sys-freebsd/freebsd-pam-modules/files/README.pamd  |   63 ++++
 .../files/freebsd-pam-modules-9.0-gentoo.patch     |   22 ++
 .../freebsd-pam-modules-9.1_rc3.ebuild             |   45 +++
 sys-freebsd/freebsd-pf/Manifest                    |   12 +
 .../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 +++
 sys-freebsd/freebsd-pf/freebsd-pf-9.1_rc3.ebuild   |   68 ++++
 sys-freebsd/freebsd-rescue/Manifest                |   18 +
 .../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/freebsd-rescue-9.1_rc3.ebuild   |   62 ++++
 sys-freebsd/freebsd-sbin/Manifest                  |   15 +
 sys-freebsd/freebsd-sbin/files/adjkerntz-crontab   |    4 +
 .../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-9.1_rc3.ebuild       |   92 ++++++
 sys-freebsd/freebsd-share/Manifest                 |   24 ++
 .../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 +
 sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild |   92 ++++++
 .../freebsd-share/freebsd-share-9.1_rc3.ebuild     |   88 ++++++
 sys-freebsd/freebsd-sources/Manifest               |    6 +-
 .../freebsd-sources-9.1_rc1-r1.ebuild              |  101 ------
 .../freebsd-sources-9.1_rc2-r1.ebuild              |  101 ------
 .../freebsd-sources-9.1_rc3-r1.ebuild              |    2 +-
 sys-freebsd/freebsd-ubin/Manifest                  |   37 +++
 .../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-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-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-9.0-r1.ebuild        |  156 ++++++++++
 sys-freebsd/freebsd-ubin/freebsd-ubin-9.0.ebuild   |  155 ++++++++++
 .../freebsd-ubin/freebsd-ubin-9.1_rc3.ebuild       |  158 ++++++++++
 sys-freebsd/freebsd-usbin/Manifest                 |   41 +++
 .../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/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/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 ++
 sys-freebsd/freebsd-usbin/freebsd-usbin-9.0.ebuild |  174 +++++++++++
 .../freebsd-usbin/freebsd-usbin-9.1_rc3.ebuild     |  175 +++++++++++
 116 files changed, 4389 insertions(+), 221 deletions(-)

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 2d0c238..a6f05ce 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,4 +1,4 @@
 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_rc3.ebuild 1684 SHA256 fbbc75d601f244e7dda562e80a5abbf328fdcac57eb2b688b46a348980139c6d SHA512 e2f02b804e5fcea503f736cc15bdcd1be4963fbd5f78dd40757d2bd8c9e3620f45a3abc5aa2c9d2c6c99c71a0eacd919a4c7fab34de03713edfd8be4153851cf WHIRLPOOL 0f3015ab9626d1a9c789224f3e51ac91455955c5d49374161e2a42f001ff6a39d6a670b9b4ff2d836712feb70c19d00670818dd779c8d68d069109985450cd52
+EBUILD boot0-9.1_rc3.ebuild 1582 SHA256 ddd0523a74825adc0578d65f15a0ae1efe50f006bfbc1fedb9a2ac741f4f96cd SHA512 7303a987eb3b66a74cdc58c8a6eab0e7f3676c2c3e0b853da72dd53cdb15fa7143a8192f6ed1c9bedc5f783991f141e407a5204dabd3b1cf96b0aeb820c9f9a9 WHIRLPOOL bf6f8d46a7b48a852b5bd933c200e525c88029984d7a7e697ad5064bbce7e315f88499f47f3497151602413ce86c67603b71458a5d3cac72b93bd282d49934ae

diff --git a/sys-freebsd/boot0/boot0-9.1_rc3.ebuild b/sys-freebsd/boot0/boot0-9.1_rc3.ebuild
index a369539..ccd56de 100644
--- a/sys-freebsd/boot0/boot0-9.1_rc3.ebuild
+++ b/sys-freebsd/boot0/boot0-9.1_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.1_rc3.ebuild,v 1.1 2012/11/06 12:52:54 aballier Exp $
+# $Header: $
 
 EAPI=2
 

diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
new file mode 100644
index 0000000..70e6851
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -0,0 +1,5 @@
+DIST freebsd-bin-9.1_rc3.tar.bz2 385903 SHA256 309be19d01ee7fddaab6a9d0438ec9addcd7ace85011bd38b776de78131bd968 SHA512 f06b32561ce9ce0add5f36cddd1b38b16cf53491a178681ba20c375d871c3971c974cbf34f3bd72bc0cfe33339e68082b63f02c4f3bac809ffba5a853d927b91 WHIRLPOOL 701f9f3660af41927bfc950e4b72d6f4149e12dc672d1625f2cb54c7548ea56e5e69a6c2b0c401b64338cba010e3522307502a1936bdc254d41030eb54a2727e
+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_rc3.ebuild 840 SHA256 6513bdd449106651dfe245ef0a4e786c827d0268d233b43f66b864babf39cdb9 SHA512 65ae382329d3827409898dcb6a2a02051e8db35a0ec7d13f94e4ff971cc16933446076cd321bb85ddf6142bb26188b0adccd680e4d3fae22c97046e89011e9b2 WHIRLPOOL 74a9139b8924843d125dae7fc9c04bb405e6fbdb32d9a8873d15f0ddcaf6008116f63e592f7e32fd3d181a3c3ba9dbcc7fe17b241820f98b0896b7393f3c52b8

diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-9.1_rc3.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.1_rc3.ebuild
new file mode 100644
index 0000000..24d224f
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-9.1_rc3.ebuild
@@ -0,0 +1,35 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE=""
+
+SRC_URI="mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2"
+
+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
new file mode 100644
index 0000000..642f075
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -0,0 +1,13 @@
+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 zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
+AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
+DIST freebsd-cddl-9.1_rc3.tar.bz2 899359 SHA256 9b9df1bbe109f760fa8dc46655362a6527e4c6b2e0d5c814de2f3a6f8c8d110d SHA512 73c5392c22450853ca745a4e12546b71070ae59dcec82e069d79109eda9b48525f74c15d3d7a936a4ea382dc7c390a1c3739fc3b09c16ccff7bc48992240abcf WHIRLPOOL e60c993e277a54d299731c2230fb40b1c1290c2db267e5e9fddb433a39361550a71a85544e27320259eadb7794137bc2aab366654ad6683e8e5aaa4efd3dc71f
+DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+DIST freebsd-include-9.1_rc3.tar.bz2 146460 SHA256 427fdc76ffb4fb38a2e909d492328be48cf08c62e2f2243c0d11faefd2006c85 SHA512 e7c584beaa2c574079a2c05509bee100d03d66b823de4473d8319f594810f66b3ad524297c21bef83106e4c9f3100fedabc8da0b131a9c41d9728a65a09d9486 WHIRLPOOL 26a2e5e6c1d17493b5b8e14453fdfcf36917b759e50f844762dd5d2701e8c93fe1a26550173f5ad1455304a9504a73872e9e3026b21d7debfbc2570752f32f44
+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-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_rc3.ebuild 1524 SHA256 d16bcc6fe29047a307bc02f8c6208cda7eaa150c121f69fc74df8db17902909c SHA512 788fe17fbf321567138b8c315e7bb012ae0a4fef6e351f631023067dbc347a9abb909ed3a906cb83b54e03f6c1201778f18dab6fcd3f02256fac72431085e6a9 WHIRLPOOL c15cb7fb710838240fefd4a4df24d5f7c9acb37ef1657f9bf787fe10bdea6bc1fca9a9b2ee4ae60017bd7a997b5d85af35fb84b8cf83d30a3deca10cdbe8e860

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
new file mode 100644
index 0000000..b3d95bb
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 0000000..c81a2c3
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch
@@ -0,0 +1,167 @@
+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
new file mode 100644
index 0000000..ff87d2c
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch
@@ -0,0 +1,22 @@
+--- 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/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd
new file mode 100644
index 0000000..a2b0f97
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/zfs.initd
@@ -0,0 +1,24 @@
+#!/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
new file mode 100755
index 0000000..5086680
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
@@ -0,0 +1,45 @@
+#!/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-9.1_rc3.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc3.ebuild
new file mode 100644
index 0000000..1477b4e
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc3.ebuild
@@ -0,0 +1,62 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
+
+IUSE="build"
+LICENSE="CDDL GPL-2"
+
+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 )"
+
+# 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
new file mode 100644
index 0000000..f565663
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -0,0 +1,3 @@
+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_rc3.ebuild 1407 SHA256 f33ecdffd2648870725dd5d8b7814cafc3f9195e87fa94f7cb88f847b8388943 SHA512 588f06372ba4e7d6cb92038bf83959b1f146a10f61fc9b4b4b5e3e616d61511b3651386071bc09c726cedf5ee07f61d82afda5a92042942dc7d1916eaa3ac267 WHIRLPOOL 98303bb9ed8d2bcbee2a71c77d81bbc8bdb14aa669ed20d40b8edbcd88f99f800d03e504ea0221456e06826b3cfee18d859bd1800166aea85d454edaa528cd77

diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild
new file mode 100644
index 0000000..8bec86c
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild
@@ -0,0 +1,56 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+LICENSE="BSD GPL-2 as-is"
+
+IUSE=""
+
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/gnu"
+
+src_unpack() {
+	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
+}
+
+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 1359335..b37ba3d 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -16,14 +16,25 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
+DIST freebsd-cddl-9.0.tar.bz2 878299 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b SHA512 7ae24468e0e95164e99dcb677472a1bbe6a0cb5e09bff7cc460fea7315ec071247e3a426c182fcf19b3ebbb7b9a1caa0d031d73d7d9dd3be9e2db50839227b4a WHIRLPOOL 8020f629133a469af75045e31dfd6a020a41ee5393d4f941db796add37cc7e6e53e82ab8c3056926b28a7b40734bf772060181ba5f526cf7d5be6fde818519c7
 DIST freebsd-cddl-9.1_rc3.tar.bz2 899359 SHA256 9b9df1bbe109f760fa8dc46655362a6527e4c6b2e0d5c814de2f3a6f8c8d110d SHA512 73c5392c22450853ca745a4e12546b71070ae59dcec82e069d79109eda9b48525f74c15d3d7a936a4ea382dc7c390a1c3739fc3b09c16ccff7bc48992240abcf WHIRLPOOL e60c993e277a54d299731c2230fb40b1c1290c2db267e5e9fddb433a39361550a71a85544e27320259eadb7794137bc2aab366654ad6683e8e5aaa4efd3dc71f
+DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
 DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+DIST freebsd-crypto-9.0.tar.bz2 5669925 SHA256 98f1a203d20c1a8884a04a0349d49c75f257dddfd71a4c3c60414d535dd782a8 SHA512 14eabe62328fa7cec03d43ca47c1f1e62c622906a50dae7ed7d274cbdb656eb9d8abb6a9033bdc466b74f16c7f05e67f2ae7a6af64e17c4bf9d310158f5677f4 WHIRLPOOL 2f3b9b0ba3ce5dae430baf4662afcfb6ff8d73c674aa306ae834c4d1f8f58ca6506922de3c6a4d0455a1283ca8385a2ad426bf7ea89cd58c4f56e96261de15bd
 DIST freebsd-crypto-9.1_rc3.tar.bz2 5680339 SHA256 67bcd36ac7ca4148d5706021c30739f337ad8e865d811613cbdc00e556d787d7 SHA512 b45085bd62c9c0063c0fd8805b2094e5cf4b0478645792ad5b79df450fb069cc6bb472996bc4958696450cd5884927eb14c7c7ea98e8c19863338866487f6eac WHIRLPOOL a0ef0c3cec5fcac47b8e5baab97a0e81b48fa18e5360773b01606a91c3488c6e5031691c4db4c37e47746c7e755c5bf4178ec8149114fb4940dc63f60a24424b
+DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
 DIST freebsd-etc-9.1_rc3.tar.bz2 207784 SHA256 c6d6b208077ccff739484b2b473892ee1a650c52029beff2d2b435da6dd469b7 SHA512 15153dfefa59aea78b017b9af2295a6ad488c805080dd613c0955fc9797881a3636570074cfd4adf3f4d13119ab05ccec83107b0fc809fbb8b7dab6a7a2333b3 WHIRLPOOL 6234b73f300db3e9ed8f37124892333fe80d6b39e48d4ac101cce6219db7c2a13992af56d18caffcaef8501873b2703780bdb890472e8717e1ace294f0a2ecb3
+DIST freebsd-gnu-9.0.tar.bz2 783723 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c SHA512 9cc02b4ffb281309390823ce2454503c5cbea0efceb16eeb2b36d2372fe5678490dffab34b78f192ccf3369f9b5ce59b805c7e58347af82193f71d60bb0bacd1 WHIRLPOOL e5d1c89bbe83af4fc8301f8e9bfd63a5c3b69091dedfe36c306d8298417d86e9c3520bd4bcdf97eaf99bb44036a5bfbc6dfbac0bb6d3f1dc035940d05da3d50e
 DIST freebsd-gnu-9.1_rc3.tar.bz2 795216 SHA256 43f493dbf3ccfea445cff838bf9b9887ed4f9d5437278529fee306444a3ea8e4 SHA512 0679f100f83e7347d00b2749aeb57a9582404a5f9160b170f5fcac715e8f401738cf89025e23b2c036b67be2a4030e283105dc707bf745e9cd4c199cd7a2689d WHIRLPOOL 9b4a12009c0826c891907d2312bc4eef4466b8124c9c00b70775556487a1a6e88676528a682ca29c3e36cdad13d61065b955d886a79885147cfc7731186ae8f4
+DIST freebsd-include-9.0.tar.bz2 141657 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0 SHA512 feb74295681ab1bb42138dc5f7c53c5e26820ebe3fd86dcfe5af55604e69978f4029901e549adff92bd974b9d0e3370ff74c94f968c6af4e24e636f4a0603fa8 WHIRLPOOL 5cd9562ad670c1e2695921bb906f0f939bf36ffce6c8f80f2aba4e749681d8255dda8d80c925aecac5737a326863a201dbc6aede9bc2367a4f970d2deb13b1c6
 DIST freebsd-include-9.1_rc3.tar.bz2 146460 SHA256 427fdc76ffb4fb38a2e909d492328be48cf08c62e2f2243c0d11faefd2006c85 SHA512 e7c584beaa2c574079a2c05509bee100d03d66b823de4473d8319f594810f66b3ad524297c21bef83106e4c9f3100fedabc8da0b131a9c41d9728a65a09d9486 WHIRLPOOL 26a2e5e6c1d17493b5b8e14453fdfcf36917b759e50f844762dd5d2701e8c93fe1a26550173f5ad1455304a9504a73872e9e3026b21d7debfbc2570752f32f44
+DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
 DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+DIST freebsd-libexec-9.0.tar.bz2 298680 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e SHA512 b4178d25e7170ba5b58eb87718af1a5c05a23647813fdd7a095f32faae4675f6e296022488414a8ee92857153b21a4cfe1500e659a01a6281011f0971cfbf842 WHIRLPOOL 74124e7b9b2406bcc49815cc8f78897e41b051d595d97a114f2d91dbc4b519e7bce562bdd6c38805bbb15c9ad2e7268b73fb16d1ef3305f483ce316e61f5c946
 DIST freebsd-libexec-9.1_rc3.tar.bz2 305301 SHA256 4cf56ff81096112b33276f619e823c8426bc1c97904f183b431e2e98c29ef698 SHA512 3122faf7f88934c05bee6c6d5faa24998d27c35e11bf4f809af26d7b8ad0a26519715b7a29f303ba878e3e8897742486a0a86a123d00b9deb60246c8cac4e1a7 WHIRLPOOL 1b10d85d2d426457189143350b375c7a1723ff8067c37200cce15f18fa6d963b94fdd0339e91d01ed16b87e4338761e33c7afb022e50b3bbff8dbcc3a45f5b73
+DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
+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.1_rc3-r1.ebuild 17145 SHA256 196bfafe12f2efb397630b1be8af2adc1cd2b01ec45b55791e828c790ba44d17 SHA512 63431ff753cb26404f3dd9189c957a7bd5741359d3bede45c38be7a1ba8e5bc11136a0b32fb01c729f93d310702fb48d4eaff53d1ff242b35c689138068fc7c1 WHIRLPOOL 898d3f5895ce0e9072fd6e600ed8056d75cf7aeba6b0101efbb8b5887e04094489c2f599c89d76eb019ff10d20715e5587657852557dcaf109655855dd067ebb
+EBUILD freebsd-lib-9.0-r3.ebuild 16830 SHA256 87d674702dbe235473c0de8b17642fc0047e85ac3f5139a93a2d3ec6b93acf8e SHA512 579a326f814501b27487ffeb9ce1d72c175a1a22c8923c26c129792bc22b9ec2595912cddada5f6666bd5342e5230bcf13143ec2a609af735482d0c3b224464e WHIRLPOOL 525bb676b110fe89f61e4d891d5923901c7e3055893fcb8f6749d3fdae4ecda146f3fe50cd8d71d72dc1b22ddc79a7e733b5c49b872786dbce1b34b38443cd86
+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_rc3-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
similarity index 96%
copy from sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
copy to sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
index 95e68a8..c4dcdfb 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild,v 1.1 2012/11/09 20:58:00 ryao Exp $
+# $Header: $
 
 EAPI=2
 
@@ -86,15 +86,13 @@ pkg_setup() {
 }
 
 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" )
+	"${FILESDIR}/${PN}-bsdxml2expat.patch"
+	"${FILESDIR}/${PN}-9.0-trylock-adaptive.patch" )
 
 # Here we disable and remove source which we don't need or want
 # In order:
@@ -158,7 +156,7 @@ src_prepare() {
 	# 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" || \
+		libsmb; 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
@@ -359,8 +357,9 @@ src_compile() {
 			CFLAGADD=""
 			if ! is_native_abi ; then
 				mymakeopts="${mymakeopts} COMPAT_32BIT="
+			else
+				use build || CFLAGS="${CFLAGS} -isystem /usr/include";
 			fi
-			need_bootstrap || CFLAGS="${CFLAGS} -isystem /usr/include"
 
 			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
 
@@ -466,7 +465,7 @@ src_install() {
 
 	cd "${WORKDIR}/etc/"
 	insinto /etc
-	doins nls.alias mac.conf netconfig
+	doins auth.conf nls.alias mac.conf netconfig
 
 	# Install ttys file
 	local MACHINE="$(tc-arch-kernel)"
@@ -482,7 +481,6 @@ src_install() {
 	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
 }
 

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
index 95e68a8..6e78594 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc3-r1.ebuild,v 1.1 2012/11/09 20:58:00 ryao Exp $
+# $Header: $
 
 EAPI=2
 

diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
new file mode 100644
index 0000000..9f3b74a
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -0,0 +1,15 @@
+AUX bootpd.confd 183 SHA256 c70c6a7a99470354a5f61bfe5c0f71325f4896e41da150e782223a30f07a275c SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f WHIRLPOOL c6721ac9b3ba70268fdba8c81ad9225e26049a5eb5ef8ea9bccc5fbbe7a110defe15df1d27b1c4b54f92e19d7d8b2099f87e7972faa0e5ddf17b66d30e26e0ad
+AUX bootpd.initd 553 SHA256 1fdc8470fda0acca9213c11e1e380110d36e992754709f754bec6ab04b77e7fa SHA512 a7522086d3c968485891fb658fee490f53582328dd07ee65f4b620b227f33f3bfb6637ad5758846eac7df11425f2e8ed681b70bc7f52bea2db0b4a29fca4b87d WHIRLPOOL a7725cfd975808759c91468f61b161701adaafbaab0e2675e9ebb33ed43b4840dfbe71cf4a203f3d9105cbaa02306258c6d12984c51a4e3e4866704b8b2d58a1
+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
+DIST freebsd-bin-9.1_rc3.tar.bz2 385903 SHA256 309be19d01ee7fddaab6a9d0438ec9addcd7ace85011bd38b776de78131bd968 SHA512 f06b32561ce9ce0add5f36cddd1b38b16cf53491a178681ba20c375d871c3971c974cbf34f3bd72bc0cfe33339e68082b63f02c4f3bac809ffba5a853d927b91 WHIRLPOOL 701f9f3660af41927bfc950e4b72d6f4149e12dc672d1625f2cb54c7548ea56e5e69a6c2b0c401b64338cba010e3522307502a1936bdc254d41030eb54a2727e
+DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+DIST freebsd-etc-9.1_rc3.tar.bz2 207784 SHA256 c6d6b208077ccff739484b2b473892ee1a650c52029beff2d2b435da6dd469b7 SHA512 15153dfefa59aea78b017b9af2295a6ad488c805080dd613c0955fc9797881a3636570074cfd4adf3f4d13119ab05ccec83107b0fc809fbb8b7dab6a7a2333b3 WHIRLPOOL 6234b73f300db3e9ed8f37124892333fe80d6b39e48d4ac101cce6219db7c2a13992af56d18caffcaef8501873b2703780bdb890472e8717e1ace294f0a2ecb3
+DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+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_rc3.ebuild 1705 SHA256 a1a1ba949b0af66b71b2ce612a26f127c4bfe26e347ab130c03bf6c450b34d54 SHA512 a181641ef79ebdb277ede7119ddc2a6c601187aad49f1a4fb9b651631a8fe8fdfde6f696775f1d8374985015c80bf1328c34700e43ca2fe8bf1ff341fcf8fe3c WHIRLPOOL 37f8dd1a40828ca84a92c56f8cd6edc4fd32008f328af24e52ca4d078c62895348fe68f26db4ed19cdcd14f64cdaac793e7291e909d5abd05fba1d64abbe8409

diff --git a/sys-freebsd/freebsd-libexec/files/bootpd.confd b/sys-freebsd/freebsd-libexec/files/bootpd.confd
new file mode 100644
index 0000000..6d238e4
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/bootpd.confd
@@ -0,0 +1,7 @@
+# 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
new file mode 100644
index 0000000..e82563f
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/bootpd.initd
@@ -0,0 +1,27 @@
+#!/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/rquotad.xinetd b/sys-freebsd/freebsd-libexec/files/rquotad.xinetd
new file mode 100644
index 0000000..876cd16
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/rquotad.xinetd
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000..ba1b819
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/rstatd.xinetd
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000..5cbe091
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/rusersd.xinetd
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000..7be5577
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/sprayd.xinetd
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000..800b84f
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/walld.xinetd
@@ -0,0 +1,11 @@
+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-9.1_rc3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1_rc3.ebuild
new file mode 100644
index 0000000..b97520e
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1_rc3.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 pam
+
+DESCRIPTION="FreeBSD libexec things"
+SLOT="0"
+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"
+
+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
new file mode 100644
index 0000000..a4252e1
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -0,0 +1,6 @@
+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
+DIST freebsd-share-9.1_rc3.tar.bz2 6737671 SHA256 2def8da87433c0f25b8bf32b62c31bd391c2a49a6b4986d81c8301e1be232cdc SHA512 4043cfc2b70eb26d0bc73c698aee7c2b223e813499a4afc7352a232e85cab32c248fc65066b942db11ce2b2108e9fbcd739a71245ebe4f841cbb71bd9f729848 WHIRLPOOL 3088efed7520de1b9727cecfa3819cca753b1ef76fa943753f93f0bacc83e17434b45479e6b831bac0819ee43dcde6982c94d8a9d7c147b7222b639b7d6a8aa2
+EBUILD freebsd-mk-defs-9.1_rc3.ebuild 734 SHA256 b4775cb0a733151d16d90c43a3fdd9dc14ec661881319605e88ef92dde0320e2 SHA512 5310173ea2d0b620989a8d158e3a3ef30019fc1303147629d0303f3a7ff146b64aeee474ffc908a3e1956132131558dec8e49f34ffb52645ff7b35e9864c4a2f WHIRLPOOL a825f8f32be0a9efdaaf42b0dd1da6d1d9bbe348a14d0eda6a85a432b94489e3375455b23cb1a5e4dce0c21ede691fe60c61d9969f47d16affedc2ca65f3ba4e

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
new file mode 100644
index 0000000..f5e6568
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
@@ -0,0 +1,326 @@
+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
new file mode 100644
index 0000000..bd7d7e6
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
@@ -0,0 +1,79 @@
+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
new file mode 100644
index 0000000..598d0b9
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
@@ -0,0 +1,326 @@
+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
new file mode 100644
index 0000000..f986ed9
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
@@ -0,0 +1,77 @@
+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/freebsd-mk-defs-9.1_rc3.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_rc3.ebuild
new file mode 100644
index 0000000..d70e1d3
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_rc3.ebuild
@@ -0,0 +1,38 @@
+# 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"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="userland_GNU"
+
+SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
+
+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
new file mode 100644
index 0000000..a3a5286
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -0,0 +1,4 @@
+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_rc3.ebuild 1076 SHA256 f0be3f955849315f9215e8b5abafdf9197f1c2f1c03525f55f63627f7843d789 SHA512 e7d09c5811542ec43c17740d09f11b5666be469f4f4bb0b49ff3229145c13d2cf95134f849a3bd17120266f184ae11269343f02e6d5ecbb22517598faaaa4f56 WHIRLPOOL cee3676110eb396393a7625033a3a6e27aee75989c3eda9362ab0e5e8605910092474b834ee4f4ba09fd04a3ca9a18488aed49900f0cf540feebde984d97d47f

diff --git a/sys-freebsd/freebsd-pam-modules/files/README.pamd b/sys-freebsd/freebsd-pam-modules/files/README.pamd
new file mode 100644
index 0000000..64e716c
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/files/README.pamd
@@ -0,0 +1,63 @@
+/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
new file mode 100644
index 0000000..aa08d40
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch
@@ -0,0 +1,22 @@
+--- 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-9.1_rc3.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc3.ebuild
new file mode 100644
index 0000000..3f5c2a6
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc3.ebuild
@@ -0,0 +1,45 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="kerberos nis"
+
+SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
+
+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
new file mode 100644
index 0000000..d8048a0
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -0,0 +1,12 @@
+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
+DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+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_rc3.ebuild 1651 SHA256 e467cc39cce0a95efd62856581970e2af9f825c2a42a8109ef7ac572b4e8897a SHA512 a35d03d9ab3c8d01823c5429df136cb70cc6fc25df8fb9228d1c2ef634bd7a11d9e74e7c3056084005fee4cef0ef874dfa4db6a93fd8c23cf00a62b358f4a85f WHIRLPOOL 7dacc0e59b1ca5a5b3aea9437cdc48b136351a85ca8dd9f98043d1a19cca67819fb3d17bceee38a9cfe34dee3898c2f1445a30f66b66a8ae30484d8d0ba90490

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
new file mode 100644
index 0000000..fb3c701
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 0000000..6679d32
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch
@@ -0,0 +1,38 @@
+--- 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
new file mode 100644
index 0000000..e488423
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 0000000..184ab6f
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch
@@ -0,0 +1,17 @@
+--- 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
new file mode 100644
index 0000000..d5a65ea
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 0000000..87c21b2
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/pf.confd
@@ -0,0 +1,9 @@
+# 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
new file mode 100755
index 0000000..da12019
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/pf.initd
@@ -0,0 +1,50 @@
+#!/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-9.1_rc3.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.1_rc3.ebuild
new file mode 100644
index 0000000..9aa3066
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-9.1_rc3.ebuild
@@ -0,0 +1,68 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
+
+IUSE=""
+
+# Crypto is needed to have an internal OpenSSL header
+SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${SBIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2"
+
+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
new file mode 100644
index 0000000..eea8b15
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -0,0 +1,18 @@
+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
+DIST freebsd-bin-9.1_rc3.tar.bz2 385903 SHA256 309be19d01ee7fddaab6a9d0438ec9addcd7ace85011bd38b776de78131bd968 SHA512 f06b32561ce9ce0add5f36cddd1b38b16cf53491a178681ba20c375d871c3971c974cbf34f3bd72bc0cfe33339e68082b63f02c4f3bac809ffba5a853d927b91 WHIRLPOOL 701f9f3660af41927bfc950e4b72d6f4149e12dc672d1625f2cb54c7548ea56e5e69a6c2b0c401b64338cba010e3522307502a1936bdc254d41030eb54a2727e
+DIST freebsd-cddl-9.1_rc3.tar.bz2 899359 SHA256 9b9df1bbe109f760fa8dc46655362a6527e4c6b2e0d5c814de2f3a6f8c8d110d SHA512 73c5392c22450853ca745a4e12546b71070ae59dcec82e069d79109eda9b48525f74c15d3d7a936a4ea382dc7c390a1c3739fc3b09c16ccff7bc48992240abcf WHIRLPOOL e60c993e277a54d299731c2230fb40b1c1290c2db267e5e9fddb433a39361550a71a85544e27320259eadb7794137bc2aab366654ad6683e8e5aaa4efd3dc71f
+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
+DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+DIST freebsd-libexec-9.1_rc3.tar.bz2 305301 SHA256 4cf56ff81096112b33276f619e823c8426bc1c97904f183b431e2e98c29ef698 SHA512 3122faf7f88934c05bee6c6d5faa24998d27c35e11bf4f809af26d7b8ad0a26519715b7a29f303ba878e3e8897742486a0a86a123d00b9deb60246c8cac4e1a7 WHIRLPOOL 1b10d85d2d426457189143350b375c7a1723ff8067c37200cce15f18fa6d963b94fdd0339e91d01ed16b87e4338761e33c7afb022e50b3bbff8dbcc3a45f5b73
+DIST freebsd-rescue-9.1_rc3.tar.bz2 3941 SHA256 ba43027dd479a3c9a9cc0031e90944f5a5c65744851ab108098a221954182285 SHA512 bdb9ee9bb69ba324345758d8dd9d43ade818c8d2570b7a09105eb8d224c65b6c2e3293be2df76ccdb71a1809fc3a8b99b73db12a2415706adf5699e3258bfbd4 WHIRLPOOL abf7a96e93a02bac1b9c4d313ef6f495591e48aed04f0c52e41fc4c77ce28b81039d2e9f18f18be0634c362586bfa443d12c27d1489a59acbef76465df801d71
+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
+DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
+EBUILD freebsd-rescue-9.1_rc3.ebuild 1793 SHA256 b4d0d7366413b3e5ac7cf25718e9c3df86217a06d60fd3ce11ebe5994fe42467 SHA512 dce30ef8044e7ce0303044e87630d13bd5973c1b9739bedbbfc3d136231f986640d12b69f7581d187c846b32a682af8661e297df25845ddfc2cb893b03180599 WHIRLPOOL 16b4b4726d554fb77c3447053233b159ae97cdad417cc97c644acfba837dd29a27fbb8f8cf0a640d354d2b3c72f8d5de3de7c83f01a89d0c3a63a90af7816e2e

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
new file mode 100644
index 0000000..22fb2ec
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..7d12621
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..3d44457
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 0000000..d4d23d7
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..a194397
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..bdda99b
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch
@@ -0,0 +1,13 @@
+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-9.1_rc3.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_rc3.ebuild
new file mode 100644
index 0000000..96d0e5c
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_rc3.ebuild
@@ -0,0 +1,62 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
+LICENSE="BSD zfs? ( CDDL )"
+
+IUSE="atm netware nis zfs"
+
+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 )"
+
+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
new file mode 100644
index 0000000..edbdd8b
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -0,0 +1,15 @@
+AUX adjkerntz-crontab 184 SHA256 f3b08140ea38bfe502b34dd8c69aa4a6b65b786d792828cce082be8f844345dc SHA512 28ecfd94257eca2d91323e4bac1920969e589a13f877f1d67c4be0dd5d0bf4585eba8f749ae04f2e0761d5860b76e0c04993350bbdeb52736584ea9df97c6093 WHIRLPOOL 883509014af5a6f3803993eb4fc9f53608b08eaffdfcb409be3945d8234ab66b6a99c620b781a8d650aaeaff1f05db2e5249fb280f9a2bb079421062be3e5332
+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
+DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+DIST freebsd-etc-9.1_rc3.tar.bz2 207784 SHA256 c6d6b208077ccff739484b2b473892ee1a650c52029beff2d2b435da6dd469b7 SHA512 15153dfefa59aea78b017b9af2295a6ad488c805080dd613c0955fc9797881a3636570074cfd4adf3f4d13119ab05ccec83107b0fc809fbb8b7dab6a7a2333b3 WHIRLPOOL 6234b73f300db3e9ed8f37124892333fe80d6b39e48d4ac101cce6219db7c2a13992af56d18caffcaef8501873b2703780bdb890472e8717e1ace294f0a2ecb3
+DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+DIST freebsd-libexec-9.1_rc3.tar.bz2 305301 SHA256 4cf56ff81096112b33276f619e823c8426bc1c97904f183b431e2e98c29ef698 SHA512 3122faf7f88934c05bee6c6d5faa24998d27c35e11bf4f809af26d7b8ad0a26519715b7a29f303ba878e3e8897742486a0a86a123d00b9deb60246c8cac4e1a7 WHIRLPOOL 1b10d85d2d426457189143350b375c7a1723ff8067c37200cce15f18fa6d963b94fdd0339e91d01ed16b87e4338761e33c7afb022e50b3bbff8dbcc3a45f5b73
+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_rc3.ebuild 2650 SHA256 0cf4a177ec5610ae26e8517dc10d21db7795f0b0b438c6393912f81fcc191c1d SHA512 9e1db71d792b4e03df46830708b21ce77e8a6c0028f55e74211080f49aed5070c94bfb8b04aaa912d1909710b1e716afd270555a6371911a49afa5f522ade537 WHIRLPOOL 6747ffe77878dd431f169d9721b8ac2c77f23692bcaf28019f861d8211ebde85f47eed575e450a30c5daa1450c7153027eac9ccdcc0e9019ba5eecff878706f3

diff --git a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab b/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab
new file mode 100644
index 0000000..5fc46f5
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab
@@ -0,0 +1,4 @@
+# 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-6.1-pr102701.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch
new file mode 100644
index 0000000..7b9578c
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000..81ad024
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..22fb2ec
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..bdda99b
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..c8cbebc
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch
@@ -0,0 +1,20 @@
+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
new file mode 100755
index 0000000..407b0e8
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/idmapd.initd
@@ -0,0 +1,20 @@
+#!/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-9.1_rc3.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1_rc3.ebuild
new file mode 100644
index 0000000..24a16c4
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1_rc3.ebuild
@@ -0,0 +1,92 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+
+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 )"
+
+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
new file mode 100644
index 0000000..159ad1e
--- /dev/null
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -0,0 +1,24 @@
+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
+DIST freebsd-bin-9.0.tar.bz2 392264 SHA256 c94d12847431232cf3c3c1f59d42b24f848d41f4ccd448dfd9cbf2ac7203350f SHA512 d56eb7ad6fd0861e7d2e8afa1ce88b04781a727489598385802e24348f3c9459e52ecc819bd3cfcaefae08cf2e046ccb0b294226cc81b498025432239572ec98 WHIRLPOOL a277fceb7c9c48073d1cd0f36fe311902c55ba8357525e0d50ad7d3baf4095a29d5d3a18a29d07e4762f350f21c57b61cfe17a05733a140e1add053a68b58e2f
+DIST freebsd-bin-9.1_rc3.tar.bz2 385903 SHA256 309be19d01ee7fddaab6a9d0438ec9addcd7ace85011bd38b776de78131bd968 SHA512 f06b32561ce9ce0add5f36cddd1b38b16cf53491a178681ba20c375d871c3971c974cbf34f3bd72bc0cfe33339e68082b63f02c4f3bac809ffba5a853d927b91 WHIRLPOOL 701f9f3660af41927bfc950e4b72d6f4149e12dc672d1625f2cb54c7548ea56e5e69a6c2b0c401b64338cba010e3522307502a1936bdc254d41030eb54a2727e
+DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
+DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
+DIST freebsd-etc-9.1_rc3.tar.bz2 207784 SHA256 c6d6b208077ccff739484b2b473892ee1a650c52029beff2d2b435da6dd469b7 SHA512 15153dfefa59aea78b017b9af2295a6ad488c805080dd613c0955fc9797881a3636570074cfd4adf3f4d13119ab05ccec83107b0fc809fbb8b7dab6a7a2333b3 WHIRLPOOL 6234b73f300db3e9ed8f37124892333fe80d6b39e48d4ac101cce6219db7c2a13992af56d18caffcaef8501873b2703780bdb890472e8717e1ace294f0a2ecb3
+DIST freebsd-gnu-9.0.tar.bz2 783723 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c SHA512 9cc02b4ffb281309390823ce2454503c5cbea0efceb16eeb2b36d2372fe5678490dffab34b78f192ccf3369f9b5ce59b805c7e58347af82193f71d60bb0bacd1 WHIRLPOOL e5d1c89bbe83af4fc8301f8e9bfd63a5c3b69091dedfe36c306d8298417d86e9c3520bd4bcdf97eaf99bb44036a5bfbc6dfbac0bb6d3f1dc035940d05da3d50e
+DIST freebsd-gnu-9.1_rc3.tar.bz2 795216 SHA256 43f493dbf3ccfea445cff838bf9b9887ed4f9d5437278529fee306444a3ea8e4 SHA512 0679f100f83e7347d00b2749aeb57a9582404a5f9160b170f5fcac715e8f401738cf89025e23b2c036b67be2a4030e283105dc707bf745e9cd4c199cd7a2689d WHIRLPOOL 9b4a12009c0826c891907d2312bc4eef4466b8124c9c00b70775556487a1a6e88676528a682ca29c3e36cdad13d61065b955d886a79885147cfc7731186ae8f4
+DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
+DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+DIST freebsd-sbin-9.0.tar.bz2 1269087 SHA256 31da65f093b6ca4d86b6ea66e7c268844c1d27ad54ca14e879a411e4b41349cd SHA512 f120c9b908655cbfbef73e0f761aaf2712e9aacf5096a604926df64ec3d0f4708dbe0cf47e3c7d92e51864ba5186594a490931f05f55dce07919e8efb0dab6ff WHIRLPOOL c2518f3d8ddacf9d3a2de3735bfd3f9407b36dbb71c804cb0886c6a6c50e57f37577c61e6d7421f311aa511b09257a92442c3f6c225fe635cffb0fe7bd5f2875
+DIST freebsd-sbin-9.1_rc3.tar.bz2 1273367 SHA256 3e576899dfd64987e2dd3f7b6d31f9570e1ac32f809ebd3de066d037097eab68 SHA512 d43e4ec5b85b5f5cd07818bb4cb21a016145550c02bdbedaa9606984e6e88707daf1c93931f4d3ec8843029de296b2b9133032dd006e6d2ea09770068eecdd9e WHIRLPOOL d137fcae29d903aa91253476009a3e7a792f086dd1dc1795c1720c47dc4a63a382d1531ad012474b1c72c67981082a5e9749b5e8e4efce047e93164b1a48fae1
+DIST freebsd-share-9.0.tar.bz2 6741764 SHA256 6bfe0fffbeb9cb737335bdf5dcdfd2f84a8dfcb3970e41e7bc860fd16906131e SHA512 830a9ccb5a34048ee17a884cda3d4f0e5afba6dcd58dc91faa024f802b951eca6b4dbe28ebef9476ea2eee5bd8095cff496af3f6ae4eaa0bfa3c71bcb4e3e18c WHIRLPOOL ffe05f77a1bbac818d8673116528d874245cff2cf660ef8db6af51f17611a56470228e82ace45954eba2261269719a943fc0f1dc7884bdbe5f9d24d5bcd56f7c
+DIST freebsd-share-9.1_rc3.tar.bz2 6737671 SHA256 2def8da87433c0f25b8bf32b62c31bd391c2a49a6b4986d81c8301e1be232cdc SHA512 4043cfc2b70eb26d0bc73c698aee7c2b223e813499a4afc7352a232e85cab32c248fc65066b942db11ce2b2108e9fbcd739a71245ebe4f841cbb71bd9f729848 WHIRLPOOL 3088efed7520de1b9727cecfa3819cca753b1ef76fa943753f93f0bacc83e17434b45479e6b831bac0819ee43dcde6982c94d8a9d7c147b7222b639b7d6a8aa2
+DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
+DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
+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 2728 SHA256 5cc1bb2c2b4f75f1429842e570f4d489f803747a73dff558451b70f5347f4008 SHA512 2be6024a65f8e7d5f5bd3f2e934984efa3828067054f7328a1f44f8b085d7b13ad1f9006c41224246f93bd65b31a89a9633168a1f59a1488086972f65436acb8 WHIRLPOOL 9b3fbd031bd5781ba14e4d1cc9b5b949179359642f936b81b10e8f7f0ba52f012ccdab51c40f57e59f65f40b25e98b244b760eb006bd7461a54a2c8360edcd5f
+EBUILD freebsd-share-9.1_rc3.ebuild 2641 SHA256 f89962f01ff96f78c3ec53efe22013dfe0d55cb43b30a5d14495e2b67e70603f SHA512 fefb07087684d2915d0174bce6aeb0c7147ff1dc76d5a90ec61e4d68e1639a100105a6aae1d0d528e1746a4557cd22f831f5d9fa0fedbe4256591cc3c7d13e60 WHIRLPOOL 6e8b68610a02bf1b37b1c257144183a192c232aec1c027d5c7e309c9511c680df7693801049e0c6608729aeacdffafb427acb0e9a9610394ca662e1bb4334b09

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
new file mode 100644
index 0000000..c0798d3
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 0000000..f668d04
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0000000..19167a6
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch
@@ -0,0 +1,26 @@
+--- 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
new file mode 100644
index 0000000..f299051
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/freebsd-share-9.0-gentoowaydir.patch
@@ -0,0 +1,16 @@
+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/freebsd-share-9.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild
new file mode 100644
index 0000000..298c4e3
--- /dev/null
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.0.ebuild
@@ -0,0 +1,92 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="doc isdn"
+
+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"
+
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+		=sys-freebsd/freebsd-sources-${RV}*"
+RDEPEND="sys-apps/miscfiles"
+
+RESTRICT="strip"
+
+S="${WORKDIR}/share"
+
+pkg_setup() {
+	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
+	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"
+
+	# see Bug 408595
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}"/${PN}-9.0-gentoowaydir.patch
+}
+
+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-share/freebsd-share-9.1_rc3.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.1_rc3.ebuild
new file mode 100644
index 0000000..55839cb
--- /dev/null
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.1_rc3.ebuild
@@ -0,0 +1,88 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="doc isdn"
+
+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"
+
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+		=sys-freebsd/freebsd-sources-${RV}*"
+RDEPEND="sys-apps/miscfiles"
+
+RESTRICT="strip"
+
+S="${WORKDIR}/share"
+
+pkg_setup() {
+	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
+	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 a43437c..4aaf271 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -12,9 +12,5 @@ AUX freebsd-sources-9.1-MFC-r239588.patch 3076 SHA256 c23f0f8b66c06e024413db4926
 AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
 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_rc1.tar.bz2 32607060 SHA256 0f375b358f5c407c16308a4884207b97022a7a5466e0291087642685f3c83957 SHA512 7aced802f7dd72cee12bdc7311d10137c73eedc9c661e81524b4a91b27df85b947d2b13f18345fa40325e6f87c759023af2620956353d0753653e230fcbfbd9d WHIRLPOOL a0849c14427c5920140a67bb693f54502bbe0860516b41090fb7f84628e4f55e1d0b26e83efbb013c59d57a9136249d8a0dce5b9ac76f0909c604960f56af45f
-DIST freebsd-sys-9.1_rc2.tar.bz2 32602564 SHA256 9b4914b1d5aae492af14c2fb28be5c28d98db43b8642bf397d261b982dbd78ac SHA512 5bf3729849b3d090542ee99995182663c2ccdc004a5ed8ff8792ad01b9db0fdaa9d37bcfed47dd4df25c9aa7121c91bd5acf34fe396e760a6b2ee015d07d69bf WHIRLPOOL 18b61b90e3f978c531bfa3001bc195deb4ac780234e5725b2f4140b0b8e56c00acd9ddfc98e26f50ff6fecb17e3925e7fba4fdda1a337ec34a374994c4ad9caa
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
-EBUILD freebsd-sources-9.1_rc1-r1.ebuild 3405 SHA256 7526cda92e47f09341694d97abea7547da5b32cedf5d421988cb33aa4dd08d4a SHA512 66ff107e9bb881f590eaa0e0614b0fbadb9f4e917682d628d57bfc7e009699b15577377d82e16cb50b0cfec63de339470c53a4e659c4a2cf8e17034fd13dcb49 WHIRLPOOL c9f0eaa2e1283da17f096c958d6039ec42bf0a81865a8c15d7243bd1d985d5d4e0f1ac46fc508816664756e705b29d0447ffdc35020dbd000ea8cce318ea974c
-EBUILD freebsd-sources-9.1_rc2-r1.ebuild 3405 SHA256 26b0d4f381fb6394be4ea62873193b08d98b40f0268de5ee80bf21e95edb926e SHA512 af9047e05e2f3121a414dd3ea952dbd441ad39fede1642a5b783bf3d07e56b3862e27097bb613ac9d352b7ac5db677302b363a5436c3b8191a44a9e6292005a6 WHIRLPOOL f50e4a56f9478c0f2ecbad7e49402aa5ec440d0c5f421343acfd3d94c52a4303544a962b46a9f7d6d627fd572c937659a31e5bb96e90e5ca07c17230eeb2565d
-EBUILD freebsd-sources-9.1_rc3-r1.ebuild 3065 SHA256 772badc11b6c18b04019ab3ce3dbbec2bf72b9ce00a599080ac1fa1413ae1986 SHA512 2e0f1f5556839b65c8f2a7b8231d0bc0e264496e903c083a642382f08ea6653d56613dda9058c1a5ee8cf67952e01d87d062ff39899ae8e109c1bf35e6f8bea6 WHIRLPOOL 0de540be2a35639786fdaf7cd6ea1b111ed516a9b3350636f3c946c22372fa1b63e339151cc6233ee81741972a3dca9f8cde09aef480b8c1b2154a01213b3a2a
+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_rc1-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1-r1.ebuild
deleted file mode 100644
index 6842247..0000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1.ebuild,v 1.1 2012/09/11 17:29:57 aballier Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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"
-
-	# workaround a kernel panic for amd64-fbsd, bug #408019
-	epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-
-	# __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
-
-	epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i	"${S}/conf/ldscript.sparc64" || die
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
-	epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
-
-	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
-	# vop_whiteout to tmpfs, so it can be used as an overlay
-	# unionfs filesystem over the cd9660 readonly filesystem.
-	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	epatch "${FILESDIR}/${PN}-cve-2012-4576.patch"
-}
-
-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-sources/freebsd-sources-9.1_rc2-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2-r1.ebuild
deleted file mode 100644
index c4539f0..0000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc2.ebuild,v 1.1 2012/10/14 15:28:12 aballier Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-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"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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"
-
-	# workaround a kernel panic for amd64-fbsd, bug #408019
-	epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-
-	# __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
-
-	epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i	"${S}/conf/ldscript.sparc64" || die
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
-	epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
-
-	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
-	# vop_whiteout to tmpfs, so it can be used as an overlay
-	# unionfs filesystem over the cd9660 readonly filesystem.
-	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	epatch "${FILESDIR}/${PN}-cve-2012-4576.patch"
-}
-
-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-sources/freebsd-sources-9.1_rc3-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc3-r1.ebuild
index 25b4e67..2f9553a 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc3-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc3.ebuild,v 1.2 2012/11/24 11:30:56 aballier Exp $
+# $Header: $
 
 inherit bsdmk freebsd flag-o-matic
 

diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
new file mode 100644
index 0000000..b0a1733
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -0,0 +1,37 @@
+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-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-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 94 SHA256 ef062eb2e780b6c323a904c0e1cf8fc911954d05a0194033b37419003f64f14c SHA512 17ff44684621a20c75536013d0e34057b671f0cb37d989ed9bbb080e773ae86601dca551f7fa39ee7e615226eda504e2272d86451468ef7d8a47c666537ce036 WHIRLPOOL c7d09269139e1da615b14a1f18d178c75404e8f3667c02c76fb1cb1749e05bdd90296b3ed3a79331862e7b05605b829500f710552b9d606be86115f52900d70a
+AUX login.1.pamd 145 SHA256 c8b81b422104b58afa8b6bb478b1eda77f97c3037030ac09889b7c3bf3de9fcc SHA512 2308d818de388be2973b59fad5a21ffe5a9c9d302b47ccf1a148182ccaf082421c5a277acf0c85649874fd607a8da20222e7a05c15606ee36f6e74d0968a1397 WHIRLPOOL a562ee1210568bdf2339df413ec69eed066738d0d2929c8965f6bfc2b05d60075b23176ca8f744bee2c6a7cfa8448adf4e08a531d36477f78aac78da47f3209c
+AUX login.pamd 421 SHA256 986aad109b31d055c52b55fd04be1a8f434da4b355e1a84b7d8b666b7a63fcb6 SHA512 ecebbaefb29380263074dc70545c2d3d529a1853c4317d860c51b8176a0afe00768d0d9a82ed05cba8abc6a2ec5cbef4a52f825a5a9de706ac4f7fba71d6fea4 WHIRLPOOL 0706c86180640ae8ebb7f7eca1a1e369aac18353f67301f04cb53c496f7848e5797900a19d32557ed1b9e4af5ee924a148710841426d7800a746e1ac3a1313f0
+AUX passwd.1.pamd 269 SHA256 a00b23b70388075f20c0e6535b6f4a1bebacb72726dc3c20ed1d468ecc68f334 SHA512 cb2f0fa05057947ac63031853e14c1867f7f330296548d924b8350dee27e00ec4b08daaab2a8c5704e09a70ed823dbe9b074fef07b648bc43cd56a78f7edb790 WHIRLPOOL e4080d8a9ec81a07b37c779dec2e04ad1fe23eecb2d08cfe1f25e00c305fb9aec59424c1e9693d0c31d1f9cc9f6a76b22b31840bf35a059e31f82238fcdb68b9
+AUX passwd.pamd 360 SHA256 ff964fd309462cac711422be051122f8a60b570da9b13756e9012b18b1864f79 SHA512 f7b4accac065a41d453aacb63222bb9da8183ad5a3ba699530a6cd5fecb5e54ee308fd0a58e00a95cc394402aab7dfd9cded1bae58483d826ced5b20b0d14c27 WHIRLPOOL e46ecd4f2945f6121c89daf8c1640e868508d85fb10c4d9bc3ccc1e04999097f226d5b7d3cb1605ffe2544f4da0127bc9ebce985d086bf96e06a659981e9a4ee
+AUX su.1.pamd 432 SHA256 a231f9cbe5b9e03aa0aaa1520657332771f15d5e5cd69890ce49d02bb34e21c3 SHA512 7d7d8ef2a5b1b52b1b5aa5de86a8767a0aa217fb2658c9bb13bce09e3c68c1a4e15f287d2063a3f18615b9d7dc1eba1ebefb95c1510f9a4c7b7de810a5bcfa40 WHIRLPOOL 635fd8294abf9e8948032ab2b6d50565f2f9f72ea64c18799a6337776bdf2a7859e17bb58e3e1ab3558d74a10611225c31ac4b6cb26f1c5462bf855b02dc9e07
+AUX su.pamd 420 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 SHA512 25ac749209c05733d0c9978c8ef1712961a3bd863bb2f5615844ed9b44e98dcf7795c02dfc84d58703eca35331701f1fff06a13904792e634256675af5444a48 WHIRLPOOL c97d3314cd58edff9c05b8286e2a377ae928752197dec0d380fa68867a9e8ce5366cc97e8038c21c3f50f527957b6ecc6c723960e28e39a7e8fef1cf7f3caad1
+DIST freebsd-bin-9.0.tar.bz2 392264 SHA256 c94d12847431232cf3c3c1f59d42b24f848d41f4ccd448dfd9cbf2ac7203350f SHA512 d56eb7ad6fd0861e7d2e8afa1ce88b04781a727489598385802e24348f3c9459e52ecc819bd3cfcaefae08cf2e046ccb0b294226cc81b498025432239572ec98 WHIRLPOOL a277fceb7c9c48073d1cd0f36fe311902c55ba8357525e0d50ad7d3baf4095a29d5d3a18a29d07e4762f350f21c57b61cfe17a05733a140e1add053a68b58e2f
+DIST freebsd-bin-9.1_rc3.tar.bz2 385903 SHA256 309be19d01ee7fddaab6a9d0438ec9addcd7ace85011bd38b776de78131bd968 SHA512 f06b32561ce9ce0add5f36cddd1b38b16cf53491a178681ba20c375d871c3971c974cbf34f3bd72bc0cfe33339e68082b63f02c4f3bac809ffba5a853d927b91 WHIRLPOOL 701f9f3660af41927bfc950e4b72d6f4149e12dc672d1625f2cb54c7548ea56e5e69a6c2b0c401b64338cba010e3522307502a1936bdc254d41030eb54a2727e
+DIST freebsd-cddl-9.0.tar.bz2 878299 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b SHA512 7ae24468e0e95164e99dcb677472a1bbe6a0cb5e09bff7cc460fea7315ec071247e3a426c182fcf19b3ebbb7b9a1caa0d031d73d7d9dd3be9e2db50839227b4a WHIRLPOOL 8020f629133a469af75045e31dfd6a020a41ee5393d4f941db796add37cc7e6e53e82ab8c3056926b28a7b40734bf772060181ba5f526cf7d5be6fde818519c7
+DIST freebsd-cddl-9.1_rc3.tar.bz2 899359 SHA256 9b9df1bbe109f760fa8dc46655362a6527e4c6b2e0d5c814de2f3a6f8c8d110d SHA512 73c5392c22450853ca745a4e12546b71070ae59dcec82e069d79109eda9b48525f74c15d3d7a936a4ea382dc7c390a1c3739fc3b09c16ccff7bc48992240abcf WHIRLPOOL e60c993e277a54d299731c2230fb40b1c1290c2db267e5e9fddb433a39361550a71a85544e27320259eadb7794137bc2aab366654ad6683e8e5aaa4efd3dc71f
+DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
+DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
+DIST freebsd-etc-9.1_rc3.tar.bz2 207784 SHA256 c6d6b208077ccff739484b2b473892ee1a650c52029beff2d2b435da6dd469b7 SHA512 15153dfefa59aea78b017b9af2295a6ad488c805080dd613c0955fc9797881a3636570074cfd4adf3f4d13119ab05ccec83107b0fc809fbb8b7dab6a7a2333b3 WHIRLPOOL 6234b73f300db3e9ed8f37124892333fe80d6b39e48d4ac101cce6219db7c2a13992af56d18caffcaef8501873b2703780bdb890472e8717e1ace294f0a2ecb3
+DIST freebsd-include-9.0.tar.bz2 141657 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0 SHA512 feb74295681ab1bb42138dc5f7c53c5e26820ebe3fd86dcfe5af55604e69978f4029901e549adff92bd974b9d0e3370ff74c94f968c6af4e24e636f4a0603fa8 WHIRLPOOL 5cd9562ad670c1e2695921bb906f0f939bf36ffce6c8f80f2aba4e749681d8255dda8d80c925aecac5737a326863a201dbc6aede9bc2367a4f970d2deb13b1c6
+DIST freebsd-include-9.1_rc3.tar.bz2 146460 SHA256 427fdc76ffb4fb38a2e909d492328be48cf08c62e2f2243c0d11faefd2006c85 SHA512 e7c584beaa2c574079a2c05509bee100d03d66b823de4473d8319f594810f66b3ad524297c21bef83106e4c9f3100fedabc8da0b131a9c41d9728a65a09d9486 WHIRLPOOL 26a2e5e6c1d17493b5b8e14453fdfcf36917b759e50f844762dd5d2701e8c93fe1a26550173f5ad1455304a9504a73872e9e3026b21d7debfbc2570752f32f44
+DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
+DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
+DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
+DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
+DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
+EBUILD freebsd-ubin-9.0-r1.ebuild 4615 SHA256 70819f50b660077e9b175d749f6d30adee507cf37e1bae1c09a763eba9080d40 SHA512 ddbfb424b57b0fec7309999b5a2ecc27f082969db6d657f2ff4e4a214f7216ba5b63c7dc1ac23dff3b118f52b4ac5b23e5a49c2f2e572aad006a48f72e0fb3f2 WHIRLPOOL b51deb16df39b385beec7ad437afb056c716ce4861169b0760cd7d0349cbacb875820e024d68e7629af128589c906b0eea04842dfe6c4390de33ec28c5b5ef43
+EBUILD freebsd-ubin-9.0.ebuild 4619 SHA256 a9e8c94adcfe4bba35789d3d6e651613a74db35af300bff417b104e285f2d758 SHA512 05e31480d4eb6a93285bc186e9b63317d02b4f62fa6e71601e073336d7e7daea2214a16f5aab54484801e27f726c338330662b017146cbd11d728823f51d0829 WHIRLPOOL 4e320cdfb660228af75369ad738a7939acd0cdefc81d1ea54da34f701fafedcfe13afde374b48d706ebfb2f75d5055ed5668ab46f68f664b17c1c6b7723805cf
+EBUILD freebsd-ubin-9.1_rc3.ebuild 4691 SHA256 2457500e8a04129a1ac261b981da86565229f837ceca3e83867f1bfb0d69bcac SHA512 96b36005f6afdee42fe865ab82773bc3771b21533b42f4bf9fdc89d9657d3c96021225d23a5a791e9b8befb8afe102b60b1f8e40d3e2c054c1bf15000600ab72 WHIRLPOOL a1d14cda3287ead942db814f2914c79a5ca4bac3a91c3d9e766d828b153c00b6f3a19efd42edcd9697977e2cbddb6e691ce5a8034777a2fcb4516630cc09cb40

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
new file mode 100644
index 0000000..1a85529
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..a89cf52
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 0000000..c966b9b
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch
@@ -0,0 +1,21 @@
+--- 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
new file mode 100644
index 0000000..e8f978a
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 0000000..d34eb9e
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch
@@ -0,0 +1,11 @@
+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-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch
new file mode 100644
index 0000000..a65185f
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000..06cc5d2
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000..d98e599
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000..a9c0622
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch
@@ -0,0 +1,10 @@
+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-lint-stdarg.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
new file mode 100644
index 0000000..9774724
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000..631ee4f
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
@@ -0,0 +1,129 @@
+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
new file mode 100644
index 0000000..c9a80aa
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+if [ -x /usr/libexec/locate.updatedb ]
+then
+	nice /usr/libexec/locate.updatedb
+fi

diff --git a/sys-freebsd/freebsd-ubin/files/login.1.pamd b/sys-freebsd/freebsd-ubin/files/login.1.pamd
new file mode 100644
index 0000000..2c09584
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/login.1.pamd
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..859fb67
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/login.pamd
@@ -0,0 +1,20 @@
+#
+# $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
new file mode 100644
index 0000000..fa1574f
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/passwd.1.pamd
@@ -0,0 +1,9 @@
+#
+# $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
new file mode 100644
index 0000000..4d3955f
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/passwd.pamd
@@ -0,0 +1,11 @@
+#
+# $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
new file mode 100644
index 0000000..72daa49
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/su.1.pamd
@@ -0,0 +1,17 @@
+#
+# $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
new file mode 100644
index 0000000..17feb0d
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/su.pamd
@@ -0,0 +1,17 @@
+#
+# $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-9.0-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0-r1.ebuild
new file mode 100644
index 0000000..281b7a1
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0-r1.ebuild
@@ -0,0 +1,156 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
+LICENSE="BSD zfs? ( CDDL )"
+
+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 )"
+
+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}-6.0-kdump-ioctl.patch"
+	"${FILESDIR}/${PN}-8.0-xinstall.patch"
+	"${FILESDIR}/${PN}-8.0-bsdar.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-ubin/freebsd-ubin-9.0.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0.ebuild
new file mode 100644
index 0000000..a747052
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.0.ebuild
@@ -0,0 +1,155 @@
+# 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"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
+LICENSE="BSD zfs? ( CDDL )"
+
+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 )"
+
+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
+	>=dev-libs/libedit-20120311.3.0-r1
+	!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}-6.0-kdump-ioctl.patch"
+	"${FILESDIR}/${PN}-8.0-xinstall.patch"
+	"${FILESDIR}/${PN}-8.0-bsdar.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
+# 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
+	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-ubin/freebsd-ubin-9.1_rc3.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1_rc3.ebuild
new file mode 100644
index 0000000..16c5325
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1_rc3.ebuild
@@ -0,0 +1,158 @@
+# 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"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
+LICENSE="BSD zfs? ( CDDL )"
+
+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 )"
+
+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.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
new file mode 100644
index 0000000..f1241fb
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -0,0 +1,41 @@
+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 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 1405 SHA256 5ead1faeb5fd145a615a43340bc64ff12286d004a16994fee0e47cda5120b64f SHA512 220bb30d915fa349014d2a873fd9461d9660ff434b0f14fdebb6c228e67d4b60232b120980a9912762ccc6d3ea7de67a57e55c6d9cd409be0a8a288892cb17a9 WHIRLPOOL acf2f9e9be1223fd6554bb9ebc83194ad0146e0ce2c2226fe4f364e1f5d0582164120cbac5c84cc2d46af7cc98ef133f92abc94c4e0937524260eb3006f4361e
+AUX nfsmount.initd 1596 SHA256 0cea497d66d41d093792f8bb2590c45b6b8f965cef9c148b835b362f2a172cbe SHA512 741e61dc32728adcb41efa64181cc6b2c768b35f0cbcee1cd0144882373b308c8a592ba7c45f6745fff511b8fd91a38f3a4c970b6224414ba533d2e902fbe656 WHIRLPOOL 5767e45c081146130416c8f46f2db966ef25cb94ee1dcb1db68718e6a41497f7478869af6923d937fd6a5d6d2ae9d8393c683dc1ea0f4657bdd366175932364d
+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
+DIST freebsd-contrib-9.0.tar.bz2 53993596 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c SHA512 d91f9fb7fcd35fa5f965c45eac1002e28768193fd7ad72551b3dc9918c58513e3604e221b8bf0f48bdc946cb1f251b41fb05e3fc6677bf9bc6d2b3cad830b300 WHIRLPOOL fa0840ef89b066ab11315835e09e11cc17327c7cb7e2dab28ea1c205b5273d07c84407eb1efc9c80d99ffe70e65c54fbefcf945ed494a32dbd98ac1f1c678052
+DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
+DIST freebsd-etc-9.0.tar.bz2 207258 SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1 SHA512 2ef3e5c26149af7a31dfca477d3f6c60c8caf7816ca114bd3ac53070af25bae294eca0eba59fe5f364a86e3a2c7a233d3c50168745bfba4989464d99f731cb9e WHIRLPOOL d5d9305deccce4ba366c06a5f102a37fb5409ff4763fe7782ea8df3612a0b7f36c0b1da7d9f55ba85e253a5ad4482033111708708ccda4cf2b24bd2fd3abe717
+DIST freebsd-etc-9.1_rc3.tar.bz2 207784 SHA256 c6d6b208077ccff739484b2b473892ee1a650c52029beff2d2b435da6dd469b7 SHA512 15153dfefa59aea78b017b9af2295a6ad488c805080dd613c0955fc9797881a3636570074cfd4adf3f4d13119ab05ccec83107b0fc809fbb8b7dab6a7a2333b3 WHIRLPOOL 6234b73f300db3e9ed8f37124892333fe80d6b39e48d4ac101cce6219db7c2a13992af56d18caffcaef8501873b2703780bdb890472e8717e1ace294f0a2ecb3
+DIST freebsd-gnu-9.0.tar.bz2 783723 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c SHA512 9cc02b4ffb281309390823ce2454503c5cbea0efceb16eeb2b36d2372fe5678490dffab34b78f192ccf3369f9b5ce59b805c7e58347af82193f71d60bb0bacd1 WHIRLPOOL e5d1c89bbe83af4fc8301f8e9bfd63a5c3b69091dedfe36c306d8298417d86e9c3520bd4bcdf97eaf99bb44036a5bfbc6dfbac0bb6d3f1dc035940d05da3d50e
+DIST freebsd-gnu-9.1_rc3.tar.bz2 795216 SHA256 43f493dbf3ccfea445cff838bf9b9887ed4f9d5437278529fee306444a3ea8e4 SHA512 0679f100f83e7347d00b2749aeb57a9582404a5f9160b170f5fcac715e8f401738cf89025e23b2c036b67be2a4030e283105dc707bf745e9cd4c199cd7a2689d WHIRLPOOL 9b4a12009c0826c891907d2312bc4eef4466b8124c9c00b70775556487a1a6e88676528a682ca29c3e36cdad13d61065b955d886a79885147cfc7731186ae8f4
+DIST freebsd-include-9.0.tar.bz2 141657 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0 SHA512 feb74295681ab1bb42138dc5f7c53c5e26820ebe3fd86dcfe5af55604e69978f4029901e549adff92bd974b9d0e3370ff74c94f968c6af4e24e636f4a0603fa8 WHIRLPOOL 5cd9562ad670c1e2695921bb906f0f939bf36ffce6c8f80f2aba4e749681d8255dda8d80c925aecac5737a326863a201dbc6aede9bc2367a4f970d2deb13b1c6
+DIST freebsd-include-9.1_rc3.tar.bz2 146460 SHA256 427fdc76ffb4fb38a2e909d492328be48cf08c62e2f2243c0d11faefd2006c85 SHA512 e7c584beaa2c574079a2c05509bee100d03d66b823de4473d8319f594810f66b3ad524297c21bef83106e4c9f3100fedabc8da0b131a9c41d9728a65a09d9486 WHIRLPOOL 26a2e5e6c1d17493b5b8e14453fdfcf36917b759e50f844762dd5d2701e8c93fe1a26550173f5ad1455304a9504a73872e9e3026b21d7debfbc2570752f32f44
+DIST freebsd-lib-9.0.tar.bz2 3547388 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a SHA512 c0ffa080896d1980cda81a5bf1c7c3a72336989f1c4bfac226fbe353a0ade63ad3eeba2051aeeff381163db92c01bf4a02ae632a5a9733d9edd6f63fe4f1181e WHIRLPOOL d7bc5ba25a49889405cf2b6d5c5cc1e33efc0ffd8bd1867fb718a76d58ad3bc3005cfa52841df599337bf2031d959755e88fd7db866d80e5f9d4d37b0c25e1e6
+DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+DIST freebsd-libexec-9.0.tar.bz2 298680 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e SHA512 b4178d25e7170ba5b58eb87718af1a5c05a23647813fdd7a095f32faae4675f6e296022488414a8ee92857153b21a4cfe1500e659a01a6281011f0971cfbf842 WHIRLPOOL 74124e7b9b2406bcc49815cc8f78897e41b051d595d97a114f2d91dbc4b519e7bce562bdd6c38805bbb15c9ad2e7268b73fb16d1ef3305f483ce316e61f5c946
+DIST freebsd-libexec-9.1_rc3.tar.bz2 305301 SHA256 4cf56ff81096112b33276f619e823c8426bc1c97904f183b431e2e98c29ef698 SHA512 3122faf7f88934c05bee6c6d5faa24998d27c35e11bf4f809af26d7b8ad0a26519715b7a29f303ba878e3e8897742486a0a86a123d00b9deb60246c8cac4e1a7 WHIRLPOOL 1b10d85d2d426457189143350b375c7a1723ff8067c37200cce15f18fa6d963b94fdd0339e91d01ed16b87e4338761e33c7afb022e50b3bbff8dbcc3a45f5b73
+DIST freebsd-sbin-9.0.tar.bz2 1269087 SHA256 31da65f093b6ca4d86b6ea66e7c268844c1d27ad54ca14e879a411e4b41349cd SHA512 f120c9b908655cbfbef73e0f761aaf2712e9aacf5096a604926df64ec3d0f4708dbe0cf47e3c7d92e51864ba5186594a490931f05f55dce07919e8efb0dab6ff WHIRLPOOL c2518f3d8ddacf9d3a2de3735bfd3f9407b36dbb71c804cb0886c6a6c50e57f37577c61e6d7421f311aa511b09257a92442c3f6c225fe635cffb0fe7bd5f2875
+DIST freebsd-sbin-9.1_rc3.tar.bz2 1273367 SHA256 3e576899dfd64987e2dd3f7b6d31f9570e1ac32f809ebd3de066d037097eab68 SHA512 d43e4ec5b85b5f5cd07818bb4cb21a016145550c02bdbedaa9606984e6e88707daf1c93931f4d3ec8843029de296b2b9133032dd006e6d2ea09770068eecdd9e WHIRLPOOL d137fcae29d903aa91253476009a3e7a792f086dd1dc1795c1720c47dc4a63a382d1531ad012474b1c72c67981082a5e9749b5e8e4efce047e93164b1a48fae1
+DIST freebsd-sys-9.0.tar.bz2 30369960 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54 SHA512 f9d465b06447535256ea0455274d39b1f2514e6d584b0b567f6f9be3881fbeef18798aecd81fe563526b5fa11c73cc60bd3c4290ceced12accaa80775b4a67c5 WHIRLPOOL ffd1e99b41421e9feb9bad796818812243bb070fdb54bde385a89bb8322effbd78df713b08df8b013732f8ed2e6e7c801942022712a76be1740f15bde8efe102
+DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
+DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd307ba6451dd40498a686de76911366 SHA512 8515adfab096979b6d9307e7281e18a0b84a6da2bcaceaf2aced589ded581ec087a69d0d16b3f70baebbe5dd6f5bb9f8f860b65475d53e0c4737ff5ea4089abd WHIRLPOOL aa183a30383703b037ccc913e4c562a7e749a109ee07923a47bc5d8da9f19b88b246b925b2c17b4eeb46c0ad11514921e03afa4648725fdb59180e6eccae1831
+DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
+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 5332 SHA256 c7ec6f23923d767e65ab350fa94bf41ceb817699711c7b17ebd8f953d90a4d0c SHA512 6de7b451094e853638c1dc60c9ab5f833d6d716b2c064e16f3fb93e154f199cbb7ec3cbee9d1062ace4bd2cbe66a0bc7ffea08e1f5af4b8c5fe3b65f7e044be5 WHIRLPOOL c74863b03ae08485f2c6ca11c337116f676b536d21a6047042999e403c8e06ac80115294364254b11a0bf9cff758181183584cbf5b8598b4531e1945ee9af1f7
+EBUILD freebsd-usbin-9.1_rc3.ebuild 5380 SHA256 8d9dde4fff34b1b368bd3f89fed3828681b822ef31c290b64f74547f42f23ac1 SHA512 f1a9aa62f4cda9ace0949ea26f5a3f714a0f4ca013e8a263c1f04609e15de1a6cc05a1dbed134f34e1fc2a77519f6182a51071ee993f2c72cbb46c9dc3a36829 WHIRLPOOL 6d702c8a1b820514caad60cc15ae57ca4e09dd8f4a777310bff2311cfe6f29ee0b518f3c3774a8d3607c4afe8afa696a5168ee2c66825f325ec0a64f138b20b8

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
new file mode 100644
index 0000000..1d83865
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..bddc0c7
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..39177b4
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
@@ -0,0 +1,20 @@
+--- 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/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd
new file mode 100644
index 0000000..fea968b
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/moused.confd
@@ -0,0 +1,20 @@
+# $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
new file mode 100644
index 0000000..3ac9a34
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/moused.initd
@@ -0,0 +1,66 @@
+#!/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
new file mode 100644
index 0000000..844252f
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/nfs.confd
@@ -0,0 +1,10 @@
+# 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
new file mode 100755
index 0000000..27290d6
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/nfs.initd
@@ -0,0 +1,54 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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.
+#---------------------------------------------------------------------------
+
+opts="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
new file mode 100755
index 0000000..9208804
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/nfsmount.initd
@@ -0,0 +1,63 @@
+#!/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/powerd.confd b/sys-freebsd/freebsd-usbin/files/powerd.confd
new file mode 100644
index 0000000..793e68b
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/powerd.confd
@@ -0,0 +1,14 @@
+# 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
new file mode 100755
index 0000000..c99adf8
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/powerd.initd
@@ -0,0 +1,27 @@
+#!/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
new file mode 100644
index 0000000..29a246f
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/pw.conf
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 0000000..63c7fac
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/rarpd.confd
@@ -0,0 +1,7 @@
+# $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
new file mode 100644
index 0000000..f5b21c8
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/rarpd.initd
@@ -0,0 +1,35 @@
+#!/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
new file mode 100755
index 0000000..0c74b9f
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
@@ -0,0 +1,20 @@
+#!/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
new file mode 100755
index 0000000..5c3cf30
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
@@ -0,0 +1,20 @@
+#!/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
new file mode 100755
index 0000000..69451f1
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/rpcbind.initd
@@ -0,0 +1,30 @@
+#!/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
new file mode 100644
index 0000000..a6d7cd4
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/syscons.confd
@@ -0,0 +1,14 @@
+# $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
new file mode 100755
index 0000000..f84b9ed
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/syscons.initd
@@ -0,0 +1,78 @@
+#!/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
new file mode 100755
index 0000000..0cb314e
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/syslogd.initd
@@ -0,0 +1,25 @@
+#!/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-9.0.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0.ebuild
new file mode 100644
index 0000000..688fedc
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.0.ebuild
@@ -0,0 +1,174 @@
+# 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"
+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 )"
+
+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 isdn 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 isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
+	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"
+	)
+
+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_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 isdn; then
+		insinto /etc/isdn
+		doins isdn/* || die
+		rm -f "${D}"/etc/isdn/Makefile
+	fi
+
+	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
+}

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1_rc3.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1_rc3.ebuild
new file mode 100644
index 0000000..add5d8c
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1_rc3.ebuild
@@ -0,0 +1,175 @@
+# 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"
+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 )"
+
+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 isdn 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 isdn || mymakeopts="${mymakeopts} WITHOUT_I4B= "
+	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 isdn; then
+		insinto /etc/isdn
+		doins isdn/* || die
+		rm -f "${D}"/etc/isdn/Makefile
+	fi
+
+	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
+}