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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-lib/, ...
@ 2012-08-23 11:05 Yuta SATOH
  0 siblings, 0 replies; 3+ messages in thread
From: Yuta SATOH @ 2012-08-23 11:05 UTC (permalink / raw
  To: gentoo-commits

commit:     1c8920f02832889f3f1b7224b56b1cb71127455b
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu Aug 23 11:04:37 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu Aug 23 11:04:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=1c8920f0

rename 9.1_beta1 --> 9.1_rc1.ebuild, tested upgrade from 9.1_beta1 on amd64-fbsd.

---
 scripts/mkstages/stages_builder.sh                 |    4 +-
 sys-freebsd/boot0/Manifest                         |   10 ++---
 ...boot0-9.1_beta1.ebuild => boot0-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-bin/Manifest                   |   14 +++-----
 ...9.1_beta1.ebuild => freebsd-bin-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-cddl/Manifest                  |   24 ++++---------
 ....1_beta1.ebuild => freebsd-cddl-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-contrib/Manifest               |    9 ++---
 ...beta1.ebuild => freebsd-contrib-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-lib/Manifest                   |   32 ++++++-----------
 ...9.1_beta1.ebuild => freebsd-lib-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-libexec/Manifest               |   24 ++++---------
 ...beta1.ebuild => freebsd-libexec-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-mk-defs/Manifest               |    6 +--
 ...beta1.ebuild => freebsd-mk-defs-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-pam-modules/Manifest           |    6 +--
 ...1.ebuild => freebsd-pam-modules-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-pf/Manifest                    |   15 +++-----
 ...-9.1_beta1.ebuild => freebsd-pf-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-rescue/Manifest                |   36 ++++++-------------
 ..._beta1.ebuild => freebsd-rescue-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-sbin/Manifest                  |   24 ++++---------
 ....1_beta1.ebuild => freebsd-sbin-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-share/Manifest                 |   30 +++++-----------
 ...1_beta1.ebuild => freebsd-share-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-sources/Manifest               |    6 +--
 ...beta1.ebuild => freebsd-sources-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-ubin/Manifest                  |   27 +++++----------
 ....1_beta1.ebuild => freebsd-ubin-9.1_rc1.ebuild} |    0
 sys-freebsd/freebsd-usbin/Manifest                 |   35 ++++++------------
 ...1_beta1.ebuild => freebsd-usbin-9.1_rc1.ebuild} |    0
 31 files changed, 103 insertions(+), 199 deletions(-)

diff --git a/scripts/mkstages/stages_builder.sh b/scripts/mkstages/stages_builder.sh
index 4184601..9160347 100755
--- a/scripts/mkstages/stages_builder.sh
+++ b/scripts/mkstages/stages_builder.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 export TARGETVER="${TARGETVER:-9.1}"
-export MKSRC="${MKSRC:-beta1}"
+export MKSRC="${MKSRC:-rc1}"
 export WORKDATE="`date +%Y%m%d`"
 export ARCH="`uname -m`"
-OLDVER="9.0"
+OLDVER="${OLDVER:-9.0}"
 OVERLAY_SNAPSHOT="http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=snapshot;h=HEAD;sf=tgz"
 
 prepare(){

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 0e2d9b3..b1058eb 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,8 +1,6 @@
 AUX boot0-7.0-gentoo.patch 5523 RMD160 d6805e228c05acfd47deb42a8363a8aac2091aec SHA1 c77f9526f0eee1ec82b4e4f851b6cc9a9da0d0a0 SHA256 deb18a75bb96314fb34da515f12af3706df711b53d6ebf0c7c2d10c3ba8a6ace
 AUX boot0-8.2-zfsboot-makefile.patch 436 RMD160 2e0615b7d16389e0f659893fe1b99411fb5c9e63 SHA1 d30e0dd3cf71beec22ff8b01568f43eee435e75e SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
-DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
-DIST freebsd-sys-8.1.tar.bz2 24173113 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
-DIST freebsd-sys-9.1_beta1.tar.bz2 32431009 RMD160 7d6c62f051f7a49fbd73645bdfe3c26777d3a741 SHA1 183b5c29fa3af5d2173918f91fe47f6e0f30a157 SHA256 f0aa625b61314781104a978d8a726f2dee4bb4c4510f92e512b4d035a3ff4ccc
-EBUILD boot0-8.1.ebuild 1237 RMD160 f4aa7226ec3c342688d4dfed5d5c49250f0935bf SHA1 5dd55da5174328b774eb138761242d3c488003e9 SHA256 7b8ef4a6c8bb4611795a1063f4b19db4e1e36d323e7579e02786e1bba4faa333
-EBUILD boot0-9.1_beta1.ebuild 1178 RMD160 da55d0223bf78f52db6294cc9b8798efbe0a6d68 SHA1 af63f066eac61e71e45d8ff9b5574b89493f9b05 SHA256 88c7c10275df54bc20d131923b7a2eb764732a8af500bb721cabf64759634459
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
+EBUILD boot0-9.1_rc1.ebuild 1178 RMD160 da55d0223bf78f52db6294cc9b8798efbe0a6d68 SHA1 af63f066eac61e71e45d8ff9b5574b89493f9b05 SHA256 88c7c10275df54bc20d131923b7a2eb764732a8af500bb721cabf64759634459

diff --git a/sys-freebsd/boot0/boot0-9.1_beta1.ebuild b/sys-freebsd/boot0/boot0-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/boot0/boot0-9.1_beta1.ebuild
rename to sys-freebsd/boot0/boot0-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index bdd750a..6c93b2d 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -1,10 +1,6 @@
 AUX freebsd-bin-6.0-flex-2.5.31.patch 277 RMD160 3dd13f280f462964feecd54ea9cafac8608955d4 SHA1 a1e9e16bc343610a30b60f77ee54e85e0c601326 SHA256 4c60ee85f4ec7dfb86eab1536eb0d6aae65c955c756362cd2b7f2b5a024dfb17
-DIST freebsd-bin-8.1.tar.bz2 417319 RMD160 faefbd01af0d26811e33bf056e5d619543bfe449 SHA1 6cfca01630aa65a4d68c3e2670c8b6c743ac0e94 SHA256 3f61adb8d9635817778d7a2133789af28468a2544dadba55210373e1ee1bff83
-DIST freebsd-bin-9.1_beta1.tar.bz2 389182 RMD160 fd134bf191c0ba811e6562f3fcfeb2d051ae5b5d SHA1 716bf53081ae86636ef3b2330889a1a363c45401 SHA256 28440b2a76327400960f46541ab3c77f2ef56053e43eb2a8266acc33a25e6a64
-DIST freebsd-lib-8.1.tar.bz2 3314868 RMD160 625d4b50400804a668247504a449b4949d7607d9 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
-DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
-DIST freebsd-sbin-8.1.tar.bz2 1217639 RMD160 7e6facf4537f33d94a528019ca0e98127128b425 SHA1 809f4621aff06aa721571d9a2857eb1e38778a9b SHA256 33721b159aa1f15dbed12f27ed29fe37f58cdfc0cf045b81cd15121364b52cd0
-DIST freebsd-sbin-9.1_beta1.tar.bz2 1275577 RMD160 5900c79d0db61b4b57c43c27484d6ed3918a1ece SHA1 34170cf09a717531b758abbf337607e78e8e804b SHA256 a2f07ac952dd6d534279182dab5ee7039069552e29c390719405b3effb285015
-DIST freebsd-ubin-9.1_beta1.tar.bz2 1905258 RMD160 07c5ffec607325503ef28d7b0b87f95f2092ec8b SHA1 d6fb6ec008e2aa99822e3e49d3a0f6a19c451531 SHA256 0bf8411f611e902a8188957feb1d653a2f90b7ddf836442dbe5927644c639c24
-EBUILD freebsd-bin-8.1.ebuild 886 RMD160 bd0461d385120bbc17593bbbc02878f7cffd5178 SHA1 e5bfed30b1bb8edf17a4732d83ce7d96958e07d5 SHA256 c96d85ab3a3c2587ec69d694cb33dd5fd2d708769d0d09aabfe3b136c610ce22
-EBUILD freebsd-bin-9.1_beta1.ebuild 840 RMD160 6cc8239725860762004dfecf79fea74e3a8f18ab SHA1 be35fee5b1a865cb1ece0bebb3468cf642fcd6c9 SHA256 6513bdd449106651dfe245ef0a4e786c827d0268d233b43f66b864babf39cdb9
+DIST freebsd-bin-9.1_rc1.tar.bz2 388709 RMD160 e9dff7716f552875dcb51653e963f7408faf3785 SHA1 b8fe1ceea88a4896e2412f30f960315521ccef75 SHA256 94b9261f042a6350a28f792c235f95c006813944dd8cebca1e793e3a31b7043a
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52
+DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979
+EBUILD freebsd-bin-9.1_rc1.ebuild 840 RMD160 6cc8239725860762004dfecf79fea74e3a8f18ab SHA1 be35fee5b1a865cb1ece0bebb3468cf642fcd6c9 SHA256 6513bdd449106651dfe245ef0a4e786c827d0268d233b43f66b864babf39cdb9

diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-9.1_beta1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-bin/freebsd-bin-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-bin/freebsd-bin-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 3c1aa7e..70f8517 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -8,19 +8,11 @@ AUX freebsd-cddl-9.0-underlink.patch 755 RMD160 fd26244f69dececaf488efe196866b09
 AUX zfs.initd 481 RMD160 5a12f8be72bc71d605479f0677d7f31b8d3bff1d SHA1 bad2add2bedef6f110d47afc67c82bd1b139e0b6 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61
 AUX zvol.initd 955 RMD160 cfd7bda7514f8217edc42a7ca103c92b174046fa SHA1 5e5af05dd5a0dc4bda75cf1548387ebe06c5b81c SHA256 6252345dca575d479621de99e4b19a384d76d0db1490fc1048ce742a065e9467
 AUX zvol.initd-9.0 930 RMD160 2a776a61c6c30083b152e57ce607c351f7f8118c SHA1 1bc21a74ae70573f31d4d40e7fec2c8d86e78ca2 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a
-DIST freebsd-cddl-8.1.tar.bz2 772450 RMD160 6df59800acbbdce0edb050c89d7f653b6349180c SHA1 78a21fc3824a9269e916352883bf3f06498d22e9 SHA256 fba896c3a16ce29773b4df49522231f59aaad46fdadc02a3df102070cf1a1e4d
-DIST freebsd-cddl-9.1_beta1.tar.bz2 909373 RMD160 7b19518f8b29a89089c417d6eab882ce5b0a48ee SHA1 a324b048a35a341bcfba1f085c3938faf34f5891 SHA256 c4effa8f88f37f828d58dd708806234e72259ec8558b93c820c085ab9994dca1
-DIST freebsd-contrib-8.1.tar.bz2 41505936 RMD160 68223ba655f944485c3ac69d9c06ed81bb88b1d1 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
-DIST freebsd-include-8.1.tar.bz2 139066 RMD160 75ef8aaa8d23cd4ace63bbcbf50daef0724be1de SHA1 30e23794b7efdb61f7e692eb2913f082e5f984ed SHA256 122e58904ea9fc403f44b23a106df486cd3bcc89b7cddcec95b5a56a90c1370a
-DIST freebsd-include-9.1_beta1.tar.bz2 146786 RMD160 3a1d80f481967008541f5b300179cf35109f1c38 SHA1 4316c8f31326b67e63d6f6bdf16974838b872d8a SHA256 3982d25ca4fec4978b22e53d525da5599583690cd3bb93e5bc4deedaae2a43c5
-DIST freebsd-lib-8.1.tar.bz2 3314868 RMD160 625d4b50400804a668247504a449b4949d7607d9 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
-DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
-DIST freebsd-sbin-8.1.tar.bz2 1217639 RMD160 7e6facf4537f33d94a528019ca0e98127128b425 SHA1 809f4621aff06aa721571d9a2857eb1e38778a9b SHA256 33721b159aa1f15dbed12f27ed29fe37f58cdfc0cf045b81cd15121364b52cd0
-DIST freebsd-sbin-9.1_beta1.tar.bz2 1275577 RMD160 5900c79d0db61b4b57c43c27484d6ed3918a1ece SHA1 34170cf09a717531b758abbf337607e78e8e804b SHA256 a2f07ac952dd6d534279182dab5ee7039069552e29c390719405b3effb285015
-DIST freebsd-sys-8.1.tar.bz2 24173113 RMD160 539ec5ddefb0bc6c20abe66dd406700e8fab1728 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
-DIST freebsd-sys-9.1_beta1.tar.bz2 32431009 RMD160 7d6c62f051f7a49fbd73645bdfe3c26777d3a741 SHA1 183b5c29fa3af5d2173918f91fe47f6e0f30a157 SHA256 f0aa625b61314781104a978d8a726f2dee4bb4c4510f92e512b4d035a3ff4ccc
-DIST freebsd-ubin-8.1.tar.bz2 1807958 RMD160 526d26c6485770bf2d72a65d28eea2d33c12f5c1 SHA1 6bf37003a3f21f96d0ad7b577df9650aba66ff89 SHA256 85b416178d2ed356130a697450fbba665d4a1179f99e80b414317a07a08ff14d
-DIST freebsd-ubin-9.1_beta1.tar.bz2 1905258 RMD160 07c5ffec607325503ef28d7b0b87f95f2092ec8b SHA1 d6fb6ec008e2aa99822e3e49d3a0f6a19c451531 SHA256 0bf8411f611e902a8188957feb1d653a2f90b7ddf836442dbe5927644c639c24
-EBUILD freebsd-cddl-8.1.ebuild 1290 RMD160 32123bd1521f5e43c12157e7374e13062963ddb6 SHA1 6ea0927b177f036e5dbfe6f2272640b58e17b9e1 SHA256 fcc3d6777c67c418d05327d3c92bb012fe40cb0eb250cbc715a4825c1bc41019
-EBUILD freebsd-cddl-9.1_beta1.ebuild 1518 RMD160 0fc6d56009d4fe0fdf98cdc99954c352c327c667 SHA1 d912bbc5901587a8d7f316ae13c66b6551b5f087 SHA256 d153936e5c7b21b883e6faa9337248f2ffcc3a5000958c7d7be4aea01e170c81
+DIST freebsd-cddl-9.1_rc1.tar.bz2 910010 RMD160 54476d310621277b6d56ba6f7ffcff7bfe05dff2 SHA1 f92527d3dd6aa0278fb0882f3c633315c521ce49 SHA256 ac64b78bb3313d811d065bf1f4299897c3fd78d1f976eedf218ae361c56d0fd7
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-include-9.1_rc1.tar.bz2 146409 RMD160 ced0903d8c1eff121e1b5c7acc8da946132227c0 SHA1 7cbaa00e333299eb8453ae551ac983f5333037f3 SHA256 c6febd4ace254d2109375d38c1ec4a960999aa62c1409c9ea9f2d336595d42c5
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52
+DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
+DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979
+EBUILD freebsd-cddl-9.1_rc1.ebuild 1524 RMD160 76cfbea7ab3f37057fd9f5be4bbce6f9fdde48ef SHA1 6ed1ca77401bb0fd4b58c18b7419628c57ceb2b9 SHA256 d16bcc6fe29047a307bc02f8c6208cda7eaa150c121f69fc74df8db17902909c

diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_beta1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index b774824..0ddabed 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -1,6 +1,3 @@
-DIST freebsd-contrib-8.1.tar.bz2 41505936 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
-DIST freebsd-gnu-8.1.tar.bz2 818430 SHA1 762be40e717cdb21f572865ae2dbad4055dc2439 SHA256 222e7341ec912832583cf364d9c19487ee763c1290d0f16549934e9fb0545064
-DIST freebsd-gnu-9.1_beta1.tar.bz2 802694 RMD160 b2a1ab81c30c3c40a5bbf980a0b63d82a760b85b SHA1 897e3a0032be5d6ea719ed5e48c5ff283323972e SHA256 b794c84343eec01d82c11a114c0262271fe59e52b630ed6524cfe7a2fbeafba4
-EBUILD freebsd-contrib-8.1.ebuild 1481 RMD160 1c449611f55ebff521a981ea5c980b9a58833397 SHA1 5239aa37ce378e607ab916c521c7e592d2ae3191 SHA256 ad1b9afb7b22e3b42feeffa5bb3a037a5ab06e7e43101a494b419adad459f7a5
-EBUILD freebsd-contrib-9.1_beta1.ebuild 1407 RMD160 c19d5463e1ea7d3dec95761e79130d90c392c6ed SHA1 d1707148e278789eae6fa3d7501bb003fe9b0f48 SHA256 f33ecdffd2648870725dd5d8b7814cafc3f9195e87fa94f7cb88f847b8388943
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-gnu-9.1_rc1.tar.bz2 802034 RMD160 663b9e12ef05446be9f465dea292267745c94124 SHA1 9628e7a6f11c7f1dc3a4efa275d9a9515cb4619a SHA256 00bebcad9d87f06b0b33a1eac62d2345d258f47fca2b8aaba3b955c70d40e985
+EBUILD freebsd-contrib-9.1_rc1.ebuild 1407 RMD160 c19d5463e1ea7d3dec95761e79130d90c392c6ed SHA1 d1707148e278789eae6fa3d7501bb003fe9b0f48 SHA256 f33ecdffd2648870725dd5d8b7814cafc3f9195e87fa94f7cb88f847b8388943

diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_beta1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 757d6ff..0a0c6e3 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -22,34 +22,24 @@ AUX freebsd-sources-9.0-sysctluint.patch 403 RMD160 46bb18c424ea7011db86341e427f
 AUX libmap.conf 201 RMD160 ad0ab6c08b5c541e0e45636dcbbaa468bbae2f95 SHA1 df81db07a94d988f1c41b4696b4d3b0058e73f83 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742
 AUX libusb.pc.in 208 RMD160 13c7e5587c565453fc6a11d156da302fa7590ee0 SHA1 f0f9815fa27a8f1cf8405c1a8987df5d5d6a6b1b SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56
 DIST freebsd-cddl-9.0.tar.bz2 878299 RMD160 187504c1cd008c47d71a60be496eab62846bd3c8 SHA1 5eb6d065afe49ae48d1b3581038b30bf43532ca7 SHA256 80d2efbe5a0dcba98050e420ecc16c6fb8ad4c410c05424a5bf6800de58ced4b
-DIST freebsd-cddl-9.1_beta1.tar.bz2 909633 RMD160 dca387e2c60d4a260c48c26f39d0142a42d788df SHA1 1eb086e5cabef08998d679608d35c353a9f815ac SHA256 59b09ef324c12b168e432d1fa297f12765bae9b81eeb08bd5e1ea79df4068ddc
-DIST freebsd-contrib-8.1.tar.bz2 41505936 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
+DIST freebsd-cddl-9.1_rc1.tar.bz2 910010 RMD160 54476d310621277b6d56ba6f7ffcff7bfe05dff2 SHA1 f92527d3dd6aa0278fb0882f3c633315c521ce49 SHA256 ac64b78bb3313d811d065bf1f4299897c3fd78d1f976eedf218ae361c56d0fd7
 DIST freebsd-contrib-9.0.tar.bz2 53993596 RMD160 b0e602dec32f4dc9ba29b132b3d27fb98fc95cb9 SHA1 e637f40d0f0ed2441b9a7737c88451e1327384c1 SHA256 5c7daec9f77bb295d9e65e35017fc625320423623e7e9bee98645a20f10ed14c
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54323262 RMD160 946c255f946a9d71011bea0eb488797370a14d1d SHA1 8337143138d6c32d887099d44a6eee178cc1c37b SHA256 e1bb740ea40ba56fc4829cd3543fb8a8efc798a82a63ab5ee8d322e036662604
-DIST freebsd-crypto-8.1.tar.bz2 5651981 SHA1 d5be0a484409e709bfb8c217cf7db09c24d4b3f4 SHA256 150ed869b30f02db8aee01dc1591771be90b33b6338e557a11d5a78db4995ff6
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
 DIST freebsd-crypto-9.0.tar.bz2 5669925 RMD160 fb0a5815254ad1aa601e621349059edcccd2c493 SHA1 a6b5e8cb3214adbeef10f9f39058bfabb0c00f95 SHA256 98f1a203d20c1a8884a04a0349d49c75f257dddfd71a4c3c60414d535dd782a8
-DIST freebsd-crypto-9.1_beta1.tar.bz2 5698539 RMD160 f2c5a41cfa09b0927683109f9b6d9eea94cd971c SHA1 b2864b0c109552d4af639a824b3ca0972513ab69 SHA256 6f5e247e3001ce724d43b17400d40c10dea580bae0e7558cf00e50b7aa477c18
-DIST freebsd-etc-8.1.tar.bz2 186545 SHA1 f16fc5717fb2b2f7a5196e2c6b7e43a975b2ca90 SHA256 5abd47694c12aa5acf278474942bf772cd5d3a99cc89b14e4fa378c1d8acea8c
+DIST freebsd-crypto-9.1_rc1.tar.bz2 5698339 RMD160 204562bf67e6352d183909cbbddfdd4e74f710ad SHA1 936937335e158c0f9b0eb864099d7f388d9015f2 SHA256 56299e9cb51d325cfa0ce2b5a23df61110384b917826ef7f75584421727be2f1
 DIST freebsd-etc-9.0.tar.bz2 207258 RMD160 67688c29d95270f03a43ed3f15f31bae1ccbe1c7 SHA1 03a7d766a451d61cb9a5677f3cf49f4ef62f706a SHA256 a4fe6ae59e966bdc3129613ebeb61d8247588125d2157855838f267a84c744d1
-DIST freebsd-etc-9.1_beta1.tar.bz2 205601 RMD160 cd68e75b7b9f5bc7dc94728c6c4295f3512ea6ac SHA1 3f73969057219f1ee041e6632f55f0aae50228ab SHA256 36a9d5bbf3b77ef07ab3d4b04bd058232b838647d6b7bba06021170875b13505
-DIST freebsd-gnu-8.1.tar.bz2 818430 SHA1 762be40e717cdb21f572865ae2dbad4055dc2439 SHA256 222e7341ec912832583cf364d9c19487ee763c1290d0f16549934e9fb0545064
+DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b
 DIST freebsd-gnu-9.0.tar.bz2 783723 RMD160 f0776cb32a30f173acbebb4bedfc103c029769dc SHA1 f0db654d836ad03e06adc2a528a612fb14503930 SHA256 39d2215e97f321d08b3c1de9dd5572aa1fe0ae9577d5ed6d6b3dc9221bc33e2c
-DIST freebsd-gnu-9.1_beta1.tar.bz2 803642 RMD160 386c44b5c52962b048cd712b4f2fc3b935c0052e SHA1 8e5e4e244576f0e6337801d112014b744dfce310 SHA256 1f4f8b69de8f53b139168a9f777b2b33ce0fc129726164da1c2ff9ac1a1aa1a8
-DIST freebsd-include-8.1.tar.bz2 139066 SHA1 30e23794b7efdb61f7e692eb2913f082e5f984ed SHA256 122e58904ea9fc403f44b23a106df486cd3bcc89b7cddcec95b5a56a90c1370a
+DIST freebsd-gnu-9.1_rc1.tar.bz2 802034 RMD160 663b9e12ef05446be9f465dea292267745c94124 SHA1 9628e7a6f11c7f1dc3a4efa275d9a9515cb4619a SHA256 00bebcad9d87f06b0b33a1eac62d2345d258f47fca2b8aaba3b955c70d40e985
 DIST freebsd-include-9.0.tar.bz2 141657 RMD160 5ad8d85f5c1d8adef755684b704e21db5e7fbff5 SHA1 3b6304699da72b15754c0f1a9cc6594a0c26fee1 SHA256 bd0196dfeb7e491638f76d626dd02d122a7702bbddd7330f6aeb4f44e4c7dcf0
-DIST freebsd-include-9.1_beta1.tar.bz2 146884 RMD160 08dda6d3d42fbed51eeecb0fa42066f522c8539b SHA1 30814840c7ea754f5bbc57250e55b59d2d50d848 SHA256 9615289a741ec0ba844bc67eb654399078ee09fe73f70aa463192272393ada04
-DIST freebsd-lib-8.1.tar.bz2 3314868 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
+DIST freebsd-include-9.1_rc1.tar.bz2 146409 RMD160 ced0903d8c1eff121e1b5c7acc8da946132227c0 SHA1 7cbaa00e333299eb8453ae551ac983f5333037f3 SHA256 c6febd4ace254d2109375d38c1ec4a960999aa62c1409c9ea9f2d336595d42c5
 DIST freebsd-lib-9.0.tar.bz2 3547388 RMD160 4b0de140bad6bb7fa9423d7d96ff695b0aba1ecd SHA1 6ffb802e0f8433b5a83128f55ead4e6759059a53 SHA256 920a4fdcdbcc980328bc2156e3e9d07353c3982db495f341b63815142cf6a03a
-DIST freebsd-lib-9.1_beta1.tar.bz2 3211722 RMD160 fb9e39be6153681a7a400ced82f7a87b48ec3785 SHA1 b183d7f475dbaf02f4ff41aa0c570a2cc18a47c5 SHA256 5fb3c002866f735fbaf600cadfb12e771528a479ec29bd99a51d1ace6975cf1e
-DIST freebsd-libexec-8.1.tar.bz2 281958 SHA1 4be5da6d0fee935df3731587bb967f0225c10b19 SHA256 fbd03c7b34bf294d6ce2a999d7dab1b6dffd07253b2242f2608a3cdb35720623
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
 DIST freebsd-libexec-9.0.tar.bz2 298680 RMD160 2f27821e1e9cccc409a6f4762957dcf851306237 SHA1 f8c023cf511f5b53724124f062bd9c8269353bb1 SHA256 2b259cdb01e520a875af2c04553dd096178aa6f243e11f7215e461ecd13c945e
-DIST freebsd-libexec-9.1_beta1.tar.bz2 310339 RMD160 87230ec5ab8a1706265daf15a4f2ac779ade1015 SHA1 8fb5b538ac255a4511685ca09cccc85228ec5e41 SHA256 c492c4717a8305f824a7e4bc233b2ebcc9cfb68c288caa05d111015cf2bac011
-DIST freebsd-sys-8.1.tar.bz2 24173113 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
+DIST freebsd-libexec-9.1_rc1.tar.bz2 310066 RMD160 4635555af871b887a3385605132af25cbf020eff SHA1 e259145ea2b1a6b68a8e0f7af9d08f48edc709b4 SHA256 e2b7d0c0583b3053b5a91b547576eca78f4035826f056534b17824126c4d4cb8
 DIST freebsd-sys-9.0.tar.bz2 30369960 RMD160 137ac728d78767eae184ac0bf00014d1bfeffc37 SHA1 cc09df384bd519ddf39254605a5ad80f702f3d68 SHA256 1c5e2181db9e92209933b1de9488109d88f0b2f15d07ee37aa491920e1990a54
-DIST freebsd-sys-9.1_beta1.tar.bz2 32432638 RMD160 6f25992ee6cc1a0f99cf62168ecdb52b1fe39aa1 SHA1 e28773d0515b85275ba9e9205efac7a6cd5646fc SHA256 f992f5274b7f1e249a079493acf18a1c420cdd199cc45affc25f20b95e90bb29
-DIST freebsd-usbin-8.1.tar.bz2 2467364 SHA1 c178890bae87238ae5a6254a022e7825808cda1f SHA256 5bacdb59c1e73137af62cddf837429fa0c35f0f7fea5a57aafb7bcf220823dd7
+DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
 DIST freebsd-usbin-9.0.tar.bz2 2608252 RMD160 fb070b602615289a849ec19d35b670bc2290423b SHA1 db82960e36f7585b25b09fa686328bcd9f7cfcb3 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea
-DIST freebsd-usbin-9.1_beta1.tar.bz2 2681785 RMD160 36a913ee728ece476d5196eab65e72903d8ded10 SHA1 d823baf11d70cb9c29b77ae37b77ae2903f496e5 SHA256 f3eec62799b20678bb8a0b00f17505763d736c1d7d3656d0f7194295c523efc5
-EBUILD freebsd-lib-8.1.ebuild 14600 RMD160 6a4b04f660a84b64d75495260000ece9422cd19d SHA1 ee888e446ba13914c473231c2353582cb375a5f8 SHA256 8c8b09f192af3869059b3a6e1e694e7411df208caedb049cc69ce0600f9d8c71
+DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164
 EBUILD freebsd-lib-9.0-r3.ebuild 17211 RMD160 38e5f30c6407bab50d2775b77fc879f97e46516b SHA1 25b7a49e9e83b27d0bec49349a16d270c0824987 SHA256 4b06e34ecf076d35d041135cfe07ae76f40288de61d83ff966824cd1dc8d7926
-EBUILD freebsd-lib-9.1_beta1.ebuild 17198 RMD160 f97fca4ac58ad45c2b401d493d2e2c5dbe497fd7 SHA1 48c88d5a3f7e8285711f1377dfa179a32a958d0d SHA256 bbfc7cd976b580611e9a539a3d429ee01d21c9d7196ca359a0a8ed9797ea8ed5
+EBUILD freebsd-lib-9.1_rc1.ebuild 17198 RMD160 f97fca4ac58ad45c2b401d493d2e2c5dbe497fd7 SHA1 48c88d5a3f7e8285711f1377dfa179a32a958d0d SHA256 bbfc7cd976b580611e9a539a3d429ee01d21c9d7196ca359a0a8ed9797ea8ed5

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_beta1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-lib/freebsd-lib-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index f367f92..8bb5728 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -13,19 +13,11 @@ AUX rstatd.xinetd 218 RMD160 d023d79caf4fb8b309be4ce7d6de0492b63db11d SHA1 7344e
 AUX rusersd.xinetd 220 RMD160 448f13ef61420ca08f6d457e9ddc8c7ea1b0e9c4 SHA1 3552bb20b976c800c9d7363cf3672c6887f398ed SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e99181408067a49cd3
 AUX sprayd.xinetd 216 RMD160 3988be6b92672f7522213d924b912703248eb829 SHA1 7a0414f5111bd15ca51ff187f4ea78125db3c5f7 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e
 AUX walld.xinetd 215 RMD160 79137d1e075178ac22c099e7dd484caa5db5db11 SHA1 f092f7bb6087391d367f4d9968ae9ca56c1cf2da SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0
-DIST freebsd-bin-8.1.tar.bz2 417319 SHA1 6cfca01630aa65a4d68c3e2670c8b6c743ac0e94 SHA256 3f61adb8d9635817778d7a2133789af28468a2544dadba55210373e1ee1bff83
-DIST freebsd-bin-9.1_beta1.tar.bz2 389182 RMD160 fd134bf191c0ba811e6562f3fcfeb2d051ae5b5d SHA1 716bf53081ae86636ef3b2330889a1a363c45401 SHA256 28440b2a76327400960f46541ab3c77f2ef56053e43eb2a8266acc33a25e6a64
-DIST freebsd-contrib-8.1.tar.bz2 41505936 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
-DIST freebsd-etc-8.1.tar.bz2 186545 SHA1 f16fc5717fb2b2f7a5196e2c6b7e43a975b2ca90 SHA256 5abd47694c12aa5acf278474942bf772cd5d3a99cc89b14e4fa378c1d8acea8c
-DIST freebsd-etc-9.1_beta1.tar.bz2 205684 RMD160 d7f6a1fd4c3ad9cf36190957691d02932a849a9a SHA1 9dd4d8d898035bb586b8756809bbecb82420f6af SHA256 7aa2155570daad76fbb8ccaeef3840ffc1fe385e7d20b4534d70e63eb3dc0a51
-DIST freebsd-lib-8.1.tar.bz2 3314868 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
-DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
-DIST freebsd-libexec-8.1.tar.bz2 281958 SHA1 4be5da6d0fee935df3731587bb967f0225c10b19 SHA256 fbd03c7b34bf294d6ce2a999d7dab1b6dffd07253b2242f2608a3cdb35720623
-DIST freebsd-libexec-9.1_beta1.tar.bz2 309755 RMD160 d293a6647d31ff0f7f4fa075e5e47dd33a0d6ed8 SHA1 05318a8326060ea5bd65b355ecc465366e815a76 SHA256 ddb686cd63c374203a9f4449332ba7d2cc097f5e95b25b2f1b84abf33c09c48d
-DIST freebsd-ubin-8.1.tar.bz2 1807958 SHA1 6bf37003a3f21f96d0ad7b577df9650aba66ff89 SHA256 85b416178d2ed356130a697450fbba665d4a1179f99e80b414317a07a08ff14d
-DIST freebsd-ubin-9.1_beta1.tar.bz2 1905258 RMD160 07c5ffec607325503ef28d7b0b87f95f2092ec8b SHA1 d6fb6ec008e2aa99822e3e49d3a0f6a19c451531 SHA256 0bf8411f611e902a8188957feb1d653a2f90b7ddf836442dbe5927644c639c24
-DIST freebsd-usbin-8.1.tar.bz2 2467364 SHA1 c178890bae87238ae5a6254a022e7825808cda1f SHA256 5bacdb59c1e73137af62cddf837429fa0c35f0f7fea5a57aafb7bcf220823dd7
-DIST freebsd-usbin-9.1_beta1.tar.bz2 2681064 RMD160 94a64404315913df9842a83a27217aa3372c4ddd SHA1 6f59c65d14adbc6af4c7ab574782ef99cdfc690a SHA256 c0c2dee233dbdb499d8c6e65680d2f316b19d490ba115c54c20ce12e665d64ee
-EBUILD freebsd-libexec-8.1.ebuild 1857 RMD160 3496a5fdade99cfa0dec47257170ac1f863e38c5 SHA1 d1d95f8f0e0e20f17e77b9840486b50f8cb09d82 SHA256 1afbc6668ec31b4b266f08ecc59cf6f3937a2317feeb6f7f40066d07b799f207
-EBUILD freebsd-libexec-9.1_beta1.ebuild 1705 RMD160 03c3c0a5328d08b4d47db3506babb6b00095cfd0 SHA1 b435f61f7eec78d366f6b8ebac8d7d36362c5cc1 SHA256 a1a1ba949b0af66b71b2ce612a26f127c4bfe26e347ab130c03bf6c450b34d54
+DIST freebsd-bin-9.1_rc1.tar.bz2 388709 RMD160 e9dff7716f552875dcb51653e963f7408faf3785 SHA1 b8fe1ceea88a4896e2412f30f960315521ccef75 SHA256 94b9261f042a6350a28f792c235f95c006813944dd8cebca1e793e3a31b7043a
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+DIST freebsd-libexec-9.1_rc1.tar.bz2 310066 RMD160 4635555af871b887a3385605132af25cbf020eff SHA1 e259145ea2b1a6b68a8e0f7af9d08f48edc709b4 SHA256 e2b7d0c0583b3053b5a91b547576eca78f4035826f056534b17824126c4d4cb8
+DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979
+DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164
+EBUILD freebsd-libexec-9.1_rc1.ebuild 1705 RMD160 03c3c0a5328d08b4d47db3506babb6b00095cfd0 SHA1 b435f61f7eec78d366f6b8ebac8d7d36362c5cc1 SHA256 a1a1ba949b0af66b71b2ce612a26f127c4bfe26e347ab130c03bf6c450b34d54

diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1_beta1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-libexec/freebsd-libexec-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-libexec/freebsd-libexec-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 9a1c196..176e762 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -6,7 +6,5 @@ AUX freebsd-mk-defs-9.0-gentoo.patch 11525 RMD160 4eaecca3d452fce3fcde7cb8ab91de
 AUX freebsd-mk-defs-9.0-gnu.patch 2353 RMD160 78f1146fab7134a6e7f54c1433086152f8814c64 SHA1 f73a973e7de1f957f9b13cdc0beb0f43b1b37f4d SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e
 AUX freebsd-mk-defs-9.1-gentoo.patch 11769 RMD160 51f1fb0a055c6dd5aba131f615d46d5aaecd8ca4 SHA1 0272a97b63b611b139fdd53524ffab3a7e9370e8 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818
 AUX freebsd-mk-defs-9.1-gnu.patch 2273 RMD160 ce76f9775c2dfbb494aab4897c12ed9f89f382e2 SHA1 a4da2e11b008e19576f15c8dada76ae70ca7b96c SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18
-DIST freebsd-share-8.1.tar.bz2 3811857 SHA1 e9844c74d1da981f999aaa5afd97d33f9c364bac SHA256 36edb72f8e9ac1d61452d611fcfbc23787206cc66c51f8668833077058497301
-DIST freebsd-share-9.1_beta1.tar.bz2 6673450 RMD160 04027ac40742c2e5fb544ed236cf2f4835beb6b7 SHA1 f70671271bd5f115d99803611ec05bd365aa89ee SHA256 e865e735cc48dbfa7a86c5e7c6db9cb16e44396ada59ae9db5d079bdcb20aa7e
-EBUILD freebsd-mk-defs-8.1.ebuild 879 RMD160 c1bbd5e97bb7948c7020f50840e6f1db88cf1462 SHA1 f844b6f86536e79942ed3a747488a7087d7f3b42 SHA256 06619dbe8ff3e746da248c6fd0ef79fd60f7e46cb479d8480f38bb0c4ffe47b8
-EBUILD freebsd-mk-defs-9.1_beta1.ebuild 734 RMD160 9640fe8f43dd213f4c3cab0ae28ee479309243d4 SHA1 ba54ccfcf3aec78f7cdaed298e04362b1dbe0c51 SHA256 b4775cb0a733151d16d90c43a3fdd9dc14ec661881319605e88ef92dde0320e2
+DIST freebsd-share-9.1_rc1.tar.bz2 6670560 RMD160 d2af901ff0aa70932d9ec2b6a31e9e25d2f560b2 SHA1 b685efb2b6019f7de941aa138eef0f6765674753 SHA256 b7d577784ae21f6e95b1f8e8befbdde4afa1f4e7e8cb209b055eaffabd315c75
+EBUILD freebsd-mk-defs-9.1_rc1.ebuild 734 RMD160 9640fe8f43dd213f4c3cab0ae28ee479309243d4 SHA1 ba54ccfcf3aec78f7cdaed298e04362b1dbe0c51 SHA256 b4775cb0a733151d16d90c43a3fdd9dc14ec661881319605e88ef92dde0320e2

diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_beta1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index bfaa7cd..074b7d3 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,7 +1,5 @@
 AUX README.pamd 2965 RMD160 5ee1831fd33e7b1f9e9994ab849972b82ae3d0c6 SHA1 e20180aa3c0382fdf42132d83d2282ec2c174c83 SHA256 2d3cea2b59ddee2ca6639ca7d14068e1499acee4194181c255bdfea81964d5ac
 AUX freebsd-pam-modules-6.0-gentoo.patch 701 RMD160 f907769f6f0ded416fac03a1fb6b5531ff682070 SHA1 678bd875b4d50acfac7ab59321b275b2c7664d4b SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 RMD160 1f036274a6bc2b1a0752eb2883e385ab5c8322a2 SHA1 722e3818a6f0c6d01be0d96b710198b587f49c96 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb
-DIST freebsd-lib-8.1.tar.bz2 3314868 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
-DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
-EBUILD freebsd-pam-modules-8.1.ebuild 1262 RMD160 be28b45b678e1b8eacf2957b6a649e710c5ca1ac SHA1 0a8000cfdbd9ce43fdf1e17fb0a546693c2b05c2 SHA256 4d408dfeefd28766bc01f16572ab1f6636cf776642cf82e9d05982f23be291aa
-EBUILD freebsd-pam-modules-9.1_beta1.ebuild 1148 RMD160 2a9dbf709ed83767c2d506690d7d70d47dd4bd98 SHA1 2bcf12a530eb93f7b4a7808000037e0aa005c955 SHA256 4121329efdcd9c59e7e5d4f50fabb8dd19e8f10827cc50a0a01d6a5f879d1955
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+EBUILD freebsd-pam-modules-9.1_rc1.ebuild 1148 RMD160 2a9dbf709ed83767c2d506690d7d70d47dd4bd98 SHA1 2bcf12a530eb93f7b4a7808000037e0aa005c955 SHA256 4121329efdcd9c59e7e5d4f50fabb8dd19e8f10827cc50a0a01d6a5f879d1955

diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_beta1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index fc8c16a..1ad1803 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -7,13 +7,8 @@ AUX freebsd-pf-9.0-pcap_pollution.patch 450 RMD160 d1f90c9a7526b56b0b4c9dbc09764
 AUX freebsd-pf-9.0-pflogd.patch 332 RMD160 7a48a8300464e974cd5c79e519087bebc31e332a SHA1 88b5aaee0c1ab181e54c0e9fcbde0689f2592d43 SHA256 fc832fdfa406603a2cb185b8f0f746b13f7673742578913ba635849e1fd778f6
 AUX pf.confd 274 RMD160 d21a3969ea55975b3e5760bf84dd8bc699a96c26 SHA1 4694fee8309ff3371fc91ec805b55e99b093b04a SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb
 AUX pf.initd 916 RMD160 6835f0074e210c162b0eebda902427013b8440d4 SHA1 af6ea4d8be064b780bca7cb476a888598eaa211f SHA256 b0cf7dadb825a1133fb52069e63eda10042aa62e3fa702bfbee53cd455837ac9
-DIST freebsd-contrib-8.1.tar.bz2 41505936 RMD160 68223ba655f944485c3ac69d9c06ed81bb88b1d1 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
-DIST freebsd-etc-8.1.tar.bz2 186545 RMD160 158be8d9125433bbc3dfd10bdef354e76a62e6cd SHA1 f16fc5717fb2b2f7a5196e2c6b7e43a975b2ca90 SHA256 5abd47694c12aa5acf278474942bf772cd5d3a99cc89b14e4fa378c1d8acea8c
-DIST freebsd-etc-9.1_beta1.tar.bz2 205684 RMD160 d7f6a1fd4c3ad9cf36190957691d02932a849a9a SHA1 9dd4d8d898035bb586b8756809bbecb82420f6af SHA256 7aa2155570daad76fbb8ccaeef3840ffc1fe385e7d20b4534d70e63eb3dc0a51
-DIST freebsd-sbin-8.1.tar.bz2 1217639 RMD160 7e6facf4537f33d94a528019ca0e98127128b425 SHA1 809f4621aff06aa721571d9a2857eb1e38778a9b SHA256 33721b159aa1f15dbed12f27ed29fe37f58cdfc0cf045b81cd15121364b52cd0
-DIST freebsd-sbin-9.1_beta1.tar.bz2 1275577 RMD160 5900c79d0db61b4b57c43c27484d6ed3918a1ece SHA1 34170cf09a717531b758abbf337607e78e8e804b SHA256 a2f07ac952dd6d534279182dab5ee7039069552e29c390719405b3effb285015
-DIST freebsd-usbin-8.1.tar.bz2 2467364 RMD160 e71c8cde8357ddeff756d1d1f76b3decfc3c59d0 SHA1 c178890bae87238ae5a6254a022e7825808cda1f SHA256 5bacdb59c1e73137af62cddf837429fa0c35f0f7fea5a57aafb7bcf220823dd7
-DIST freebsd-usbin-9.1_beta1.tar.bz2 2681064 RMD160 94a64404315913df9842a83a27217aa3372c4ddd SHA1 6f59c65d14adbc6af4c7ab574782ef99cdfc690a SHA256 c0c2dee233dbdb499d8c6e65680d2f316b19d490ba115c54c20ce12e665d64ee
-EBUILD freebsd-pf-8.1.ebuild 1609 RMD160 14c3252f549fc715a881d26007669a1bd4efce29 SHA1 1fc1eff21b5bdf82f457d1ec2c9b6a4afbc65dd2 SHA256 48c70a00357e9cd997872545abbc787a64b97359b2039e2aec188b9d46d7ee91
-EBUILD freebsd-pf-9.1_beta1.ebuild 1634 RMD160 2820220de9c9aa2ccb72c7ecae9bb6d2262cd60a SHA1 fbdbe0f5b0ba1218858bea1a657680b1d1733643 SHA256 d88a6d9346148c76058f405bb825a3e8f4c2f6e303b1386c0fe12e54eb430a43
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b
+DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52
+DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164
+EBUILD freebsd-pf-9.1_rc1.ebuild 1634 RMD160 2820220de9c9aa2ccb72c7ecae9bb6d2262cd60a SHA1 fbdbe0f5b0ba1218858bea1a657680b1d1733643 SHA256 d88a6d9346148c76058f405bb825a3e8f4c2f6e303b1386c0fe12e54eb430a43

diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.1_beta1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-pf/freebsd-pf-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-pf/freebsd-pf-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index 3a41a88..84e2a16 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -5,27 +5,15 @@ AUX freebsd-rescue-8.2-libzcleverlink.patch 789 RMD160 e5a0ef150dc78021d6cea6a23
 AUX freebsd-rescue-9.1-bsdtar.patch 404 RMD160 08dbe45a6342becd798422d35f50c30ba66be93d SHA1 194d3886dd17a24881e40380056b195dee5cf7a1 SHA256 0e71e3e370b33318bbb167e82d6507589fb95cc2c2d1fc6e8b74d0faf3d17ef1
 AUX freebsd-rescue-9.1-libcleverlink.patch 801 RMD160 bdcf9b3217a84a9a850576072d3e053a242a5c9c SHA1 44cba5850d24c5165e0b43ec9ff5618eb22e1af6 SHA256 53794263aabaf55cd570adbbfdb68e86a9e9b17557e8ca223d424a5c2f4f6831
 AUX freebsd-sbin-bsdxml2expat.patch 424 RMD160 a17cdeb5f6b663f369aa9bbf3857c903502f87f4 SHA1 fe5910e8319b2c5a5c623934381b298398370290 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287
-DIST freebsd-bin-8.1.tar.bz2 417319 RMD160 faefbd01af0d26811e33bf056e5d619543bfe449 SHA1 6cfca01630aa65a4d68c3e2670c8b6c743ac0e94 SHA256 3f61adb8d9635817778d7a2133789af28468a2544dadba55210373e1ee1bff83
-DIST freebsd-bin-9.1_beta1.tar.bz2 389335 RMD160 466de2906842a3eca534f1434f1374f6ea67088f SHA1 6f568b64ea60b138900e02afa576c7cf09f65c5b SHA256 b66c53f5e64ed73fe40910d520c7b1d6350ffb33dbb38ae634eff3fc748f8adf
-DIST freebsd-cddl-8.1.tar.bz2 772450 RMD160 6df59800acbbdce0edb050c89d7f653b6349180c SHA1 78a21fc3824a9269e916352883bf3f06498d22e9 SHA256 fba896c3a16ce29773b4df49522231f59aaad46fdadc02a3df102070cf1a1e4d
-DIST freebsd-cddl-9.1_beta1.tar.bz2 909633 RMD160 dca387e2c60d4a260c48c26f39d0142a42d788df SHA1 1eb086e5cabef08998d679608d35c353a9f815ac SHA256 59b09ef324c12b168e432d1fa297f12765bae9b81eeb08bd5e1ea79df4068ddc
-DIST freebsd-contrib-8.1.tar.bz2 41505936 RMD160 68223ba655f944485c3ac69d9c06ed81bb88b1d1 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54323262 RMD160 946c255f946a9d71011bea0eb488797370a14d1d SHA1 8337143138d6c32d887099d44a6eee178cc1c37b SHA256 e1bb740ea40ba56fc4829cd3543fb8a8efc798a82a63ab5ee8d322e036662604
-DIST freebsd-gnu-8.1.tar.bz2 818430 RMD160 b37505495a485056826067d41ddfa1f44a56f2f9 SHA1 762be40e717cdb21f572865ae2dbad4055dc2439 SHA256 222e7341ec912832583cf364d9c19487ee763c1290d0f16549934e9fb0545064
-DIST freebsd-gnu-9.1_beta1.tar.bz2 803642 RMD160 386c44b5c52962b048cd712b4f2fc3b935c0052e SHA1 8e5e4e244576f0e6337801d112014b744dfce310 SHA256 1f4f8b69de8f53b139168a9f777b2b33ce0fc129726164da1c2ff9ac1a1aa1a8
-DIST freebsd-lib-8.1.tar.bz2 3314868 RMD160 625d4b50400804a668247504a449b4949d7607d9 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
-DIST freebsd-lib-9.1_beta1.tar.bz2 3211722 RMD160 fb9e39be6153681a7a400ced82f7a87b48ec3785 SHA1 b183d7f475dbaf02f4ff41aa0c570a2cc18a47c5 SHA256 5fb3c002866f735fbaf600cadfb12e771528a479ec29bd99a51d1ace6975cf1e
-DIST freebsd-libexec-8.1.tar.bz2 281958 RMD160 769659a61d15485fba22978e0c642b94d6f992f3 SHA1 4be5da6d0fee935df3731587bb967f0225c10b19 SHA256 fbd03c7b34bf294d6ce2a999d7dab1b6dffd07253b2242f2608a3cdb35720623
-DIST freebsd-libexec-9.1_beta1.tar.bz2 310339 RMD160 87230ec5ab8a1706265daf15a4f2ac779ade1015 SHA1 8fb5b538ac255a4511685ca09cccc85228ec5e41 SHA256 c492c4717a8305f824a7e4bc233b2ebcc9cfb68c288caa05d111015cf2bac011
-DIST freebsd-rescue-8.1.tar.bz2 5051 RMD160 e94e1a99c11f3fd614efd417aa0584b4869c3f16 SHA1 90497235c4dde4b025633e75134e5bc238ab8f29 SHA256 030b3dc79608a10b66cbd05455a966f9518c957531a823fba39907cdf3acee83
-DIST freebsd-rescue-9.1_beta1.tar.bz2 3938 RMD160 db7e7c87bf429f772511dae20ee6e7aa64c3aee5 SHA1 a12e36dc4df8c51ae71361f793e09f23b68f957b SHA256 096a671e9353e21305933507eaa42bbeb1564b4b8ef24539144c1aad59c8ad3c
-DIST freebsd-sbin-8.1.tar.bz2 1217639 RMD160 7e6facf4537f33d94a528019ca0e98127128b425 SHA1 809f4621aff06aa721571d9a2857eb1e38778a9b SHA256 33721b159aa1f15dbed12f27ed29fe37f58cdfc0cf045b81cd15121364b52cd0
-DIST freebsd-sbin-9.1_beta1.tar.bz2 1274406 RMD160 af1ee94ade87170f3f24ff0300400e4beef95496 SHA1 ac4eee0dd738151495739f28528fdd1893e7fdb1 SHA256 bf0f0511806997041662a7439554faa212538a25eaedf1e2e3655dbf43661edd
-DIST freebsd-sys-8.1.tar.bz2 24173113 RMD160 539ec5ddefb0bc6c20abe66dd406700e8fab1728 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
-DIST freebsd-sys-9.1_beta1.tar.bz2 32432638 RMD160 6f25992ee6cc1a0f99cf62168ecdb52b1fe39aa1 SHA1 e28773d0515b85275ba9e9205efac7a6cd5646fc SHA256 f992f5274b7f1e249a079493acf18a1c420cdd199cc45affc25f20b95e90bb29
-DIST freebsd-ubin-8.1.tar.bz2 1807958 RMD160 526d26c6485770bf2d72a65d28eea2d33c12f5c1 SHA1 6bf37003a3f21f96d0ad7b577df9650aba66ff89 SHA256 85b416178d2ed356130a697450fbba665d4a1179f99e80b414317a07a08ff14d
-DIST freebsd-ubin-9.1_beta1.tar.bz2 1905480 RMD160 5b259860a37be8c54a4db027e03fe13e04d8257e SHA1 5bf045aff0343eb90bb0f71b4e2a5c56196cdd71 SHA256 15b71ef06eac072c7cf5c8dc58130e2f04aba84cdf8fa4168f39109f03d172a4
-DIST freebsd-usbin-8.1.tar.bz2 2467364 RMD160 e71c8cde8357ddeff756d1d1f76b3decfc3c59d0 SHA1 c178890bae87238ae5a6254a022e7825808cda1f SHA256 5bacdb59c1e73137af62cddf837429fa0c35f0f7fea5a57aafb7bcf220823dd7
-DIST freebsd-usbin-9.1_beta1.tar.bz2 2681785 RMD160 36a913ee728ece476d5196eab65e72903d8ded10 SHA1 d823baf11d70cb9c29b77ae37b77ae2903f496e5 SHA256 f3eec62799b20678bb8a0b00f17505763d736c1d7d3656d0f7194295c523efc5
-EBUILD freebsd-rescue-8.1.ebuild 1397 RMD160 fea350140b020add5fcd5b0422caff2dc6f379a0 SHA1 85b5c9e643898b4f41633b33892fdd0b860a546d SHA256 9c9ddcee2a7781f2c5227f2568b7f21c9c1d8da38cfd3c95193c8aa0610b4bb2
-EBUILD freebsd-rescue-9.1_beta1.ebuild 1793 RMD160 a9e74c778ef3216991f79dd03386e436f27bcfc3 SHA1 5f64abef386382f7ed80970c2cc5677ee091b543 SHA256 aa48730bebc8265ef076d4a8ee682ef8d920d3217ec3fb5428577b62cc75e098
+DIST freebsd-bin-9.1_rc1.tar.bz2 388709 RMD160 e9dff7716f552875dcb51653e963f7408faf3785 SHA1 b8fe1ceea88a4896e2412f30f960315521ccef75 SHA256 94b9261f042a6350a28f792c235f95c006813944dd8cebca1e793e3a31b7043a
+DIST freebsd-cddl-9.1_rc1.tar.bz2 910010 RMD160 54476d310621277b6d56ba6f7ffcff7bfe05dff2 SHA1 f92527d3dd6aa0278fb0882f3c633315c521ce49 SHA256 ac64b78bb3313d811d065bf1f4299897c3fd78d1f976eedf218ae361c56d0fd7
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-gnu-9.1_rc1.tar.bz2 802034 RMD160 663b9e12ef05446be9f465dea292267745c94124 SHA1 9628e7a6f11c7f1dc3a4efa275d9a9515cb4619a SHA256 00bebcad9d87f06b0b33a1eac62d2345d258f47fca2b8aaba3b955c70d40e985
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+DIST freebsd-libexec-9.1_rc1.tar.bz2 310066 RMD160 4635555af871b887a3385605132af25cbf020eff SHA1 e259145ea2b1a6b68a8e0f7af9d08f48edc709b4 SHA256 e2b7d0c0583b3053b5a91b547576eca78f4035826f056534b17824126c4d4cb8
+DIST freebsd-rescue-9.1_rc1.tar.bz2 3937 RMD160 95ffda68406f35790807397a4968100490fcffc6 SHA1 c747a3e30a820dac73b06649be422aad6d31d349 SHA256 928118be32c19e16662cde0d50897d13710ed031744932d487b936375a9db1d0
+DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52
+DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
+DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979
+DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164
+EBUILD freebsd-rescue-9.1_rc1.ebuild 1793 RMD160 9df961981d9f0d8939b000fe472cc2e729e6bb3e SHA1 eb46c7431ea09cac1fe5376b07699b7963194ca0 SHA256 6b77772368d7c36aceca36646e683a121df52abaebea51d4f176ef2610f56911

diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_beta1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-rescue/freebsd-rescue-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 59bfe9d..e0eb79e 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -11,19 +11,11 @@ AUX idmapd.initd 440 RMD160 694ae6deef0d7cac312611e377b89326d02a2198 SHA1 1fd322
 AUX ipfw.confd 364 RMD160 3dd11070d6e8936ac5fff02693aeb501255a8019 SHA1 f4dcaee7a10d29c002b95527ff85409ac61f9a89 SHA256 97911a2f003e2108c1f5da04b84a3b73fbccbde48fe58af0f056d8a9effbb3d3
 AUX ipfw.initd 2911 RMD160 f39075c437c4d507d352104f3acb6c17719e7ad3 SHA1 11b036c64240146f5108658953182f557f25a5e5 SHA256 45789a2e51c8eb164247d08c58d47ab52798bfbd19b4ddb6cc87acb5684e4eb5
 AUX sysctl.initd 671 RMD160 acdeafdbfa6cc70010f9c497e64485dad9e5b982 SHA1 ddb7808755477b8fb4a19f31a64766b0175df613 SHA256 fde293d294c8985663c3a3685cd27ede3b1cdedbd042102546dd844b93456e69
-DIST freebsd-contrib-8.1.tar.bz2 41505936 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
-DIST freebsd-etc-8.1.tar.bz2 186545 SHA1 f16fc5717fb2b2f7a5196e2c6b7e43a975b2ca90 SHA256 5abd47694c12aa5acf278474942bf772cd5d3a99cc89b14e4fa378c1d8acea8c
-DIST freebsd-etc-9.1_beta1.tar.bz2 205684 RMD160 d7f6a1fd4c3ad9cf36190957691d02932a849a9a SHA1 9dd4d8d898035bb586b8756809bbecb82420f6af SHA256 7aa2155570daad76fbb8ccaeef3840ffc1fe385e7d20b4534d70e63eb3dc0a51
-DIST freebsd-lib-8.1.tar.bz2 3314868 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
-DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
-DIST freebsd-libexec-8.1.tar.bz2 281958 SHA1 4be5da6d0fee935df3731587bb967f0225c10b19 SHA256 fbd03c7b34bf294d6ce2a999d7dab1b6dffd07253b2242f2608a3cdb35720623
-DIST freebsd-libexec-9.1_beta1.tar.bz2 309755 RMD160 d293a6647d31ff0f7f4fa075e5e47dd33a0d6ed8 SHA1 05318a8326060ea5bd65b355ecc465366e815a76 SHA256 ddb686cd63c374203a9f4449332ba7d2cc097f5e95b25b2f1b84abf33c09c48d
-DIST freebsd-sbin-8.1.tar.bz2 1217639 SHA1 809f4621aff06aa721571d9a2857eb1e38778a9b SHA256 33721b159aa1f15dbed12f27ed29fe37f58cdfc0cf045b81cd15121364b52cd0
-DIST freebsd-sbin-9.1_beta1.tar.bz2 1275577 RMD160 5900c79d0db61b4b57c43c27484d6ed3918a1ece SHA1 34170cf09a717531b758abbf337607e78e8e804b SHA256 a2f07ac952dd6d534279182dab5ee7039069552e29c390719405b3effb285015
-DIST freebsd-sys-8.1.tar.bz2 24173113 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
-DIST freebsd-sys-9.1_beta1.tar.bz2 32431009 RMD160 7d6c62f051f7a49fbd73645bdfe3c26777d3a741 SHA1 183b5c29fa3af5d2173918f91fe47f6e0f30a157 SHA256 f0aa625b61314781104a978d8a726f2dee4bb4c4510f92e512b4d035a3ff4ccc
-DIST freebsd-usbin-8.1.tar.bz2 2467364 SHA1 c178890bae87238ae5a6254a022e7825808cda1f SHA256 5bacdb59c1e73137af62cddf837429fa0c35f0f7fea5a57aafb7bcf220823dd7
-DIST freebsd-usbin-9.1_beta1.tar.bz2 2681064 RMD160 94a64404315913df9842a83a27217aa3372c4ddd SHA1 6f59c65d14adbc6af4c7ab574782ef99cdfc690a SHA256 c0c2dee233dbdb499d8c6e65680d2f316b19d490ba115c54c20ce12e665d64ee
-EBUILD freebsd-sbin-8.1.ebuild 2615 RMD160 937fa5a5760cfbed131a593155d56939332a6ccc SHA1 16d3ec2ef426f342900bc09cdc0e534da2a5241f SHA256 acbdb3245df73bb8c835cc101f0399a5ffc6a5ff5127f13569c781ff0ea36db7
-EBUILD freebsd-sbin-9.1_beta1.ebuild 2650 RMD160 43ef6a70ab940036a073209818258f2a189a3a57 SHA1 1d84ad4f41aa2368f016bc9cb5a10677ccbbf089 SHA256 0cf4a177ec5610ae26e8517dc10d21db7795f0b0b438c6393912f81fcc191c1d
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+DIST freebsd-libexec-9.1_rc1.tar.bz2 310066 RMD160 4635555af871b887a3385605132af25cbf020eff SHA1 e259145ea2b1a6b68a8e0f7af9d08f48edc709b4 SHA256 e2b7d0c0583b3053b5a91b547576eca78f4035826f056534b17824126c4d4cb8
+DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52
+DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
+DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164
+EBUILD freebsd-sbin-9.1_rc1.ebuild 2650 RMD160 43ef6a70ab940036a073209818258f2a189a3a57 SHA1 1d84ad4f41aa2368f016bc9cb5a10677ccbbf089 SHA256 0cf4a177ec5610ae26e8517dc10d21db7795f0b0b438c6393912f81fcc191c1d

diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1_beta1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-sbin/freebsd-sbin-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-sbin/freebsd-sbin-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index af4aa30..6d5a44e 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -3,23 +3,13 @@ AUX freebsd-share-5.4-gentoo-skel.patch 621 RMD160 52351bb7b714bb458304d8547c7b1
 AUX freebsd-share-8.0-gnu-miscfiles.patch 858 RMD160 7e6a7fd500d65bb3ecafe10a18c91377ef894685 SHA1 d3c7ed64c47f5a70c47b922a699304c4cbb74391 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855
 AUX freebsd-share-9.0-gentoowaydir.patch 314 RMD160 474bee4a3c020ed2d067945f19cba46dc6eaacc0 SHA1 e790db5da46d14f6486a7b0b2f055fcdad3fea6a SHA256 68ddc9d6d95c95fc295f3ed3f7d7562de01ff6894b002bd7455d2da72cf4e2f2
 AUX freebsd-share-gnu-miscfiles.patch 962 RMD160 08c81ba5cc6f1853179ba272efbd2ecd32480070 SHA1 91ec2e1362c00554f7aa7df17d304a1b674547dc SHA256 97218d3e62fda9515d275549f5ce2e8220a62807de355f249b0f6e65860aaa82
-DIST freebsd-bin-8.1.tar.bz2 417319 SHA1 6cfca01630aa65a4d68c3e2670c8b6c743ac0e94 SHA256 3f61adb8d9635817778d7a2133789af28468a2544dadba55210373e1ee1bff83
-DIST freebsd-bin-9.1_beta1.tar.bz2 389182 RMD160 fd134bf191c0ba811e6562f3fcfeb2d051ae5b5d SHA1 716bf53081ae86636ef3b2330889a1a363c45401 SHA256 28440b2a76327400960f46541ab3c77f2ef56053e43eb2a8266acc33a25e6a64
-DIST freebsd-contrib-8.1.tar.bz2 41505936 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
-DIST freebsd-etc-8.1.tar.bz2 186545 SHA1 f16fc5717fb2b2f7a5196e2c6b7e43a975b2ca90 SHA256 5abd47694c12aa5acf278474942bf772cd5d3a99cc89b14e4fa378c1d8acea8c
-DIST freebsd-etc-9.1_beta1.tar.bz2 205684 RMD160 d7f6a1fd4c3ad9cf36190957691d02932a849a9a SHA1 9dd4d8d898035bb586b8756809bbecb82420f6af SHA256 7aa2155570daad76fbb8ccaeef3840ffc1fe385e7d20b4534d70e63eb3dc0a51
-DIST freebsd-gnu-8.1.tar.bz2 818430 SHA1 762be40e717cdb21f572865ae2dbad4055dc2439 SHA256 222e7341ec912832583cf364d9c19487ee763c1290d0f16549934e9fb0545064
-DIST freebsd-gnu-9.1_beta1.tar.bz2 802694 RMD160 b2a1ab81c30c3c40a5bbf980a0b63d82a760b85b SHA1 897e3a0032be5d6ea719ed5e48c5ff283323972e SHA256 b794c84343eec01d82c11a114c0262271fe59e52b630ed6524cfe7a2fbeafba4
-DIST freebsd-lib-8.1.tar.bz2 3314868 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
-DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
-DIST freebsd-sbin-8.1.tar.bz2 1217639 SHA1 809f4621aff06aa721571d9a2857eb1e38778a9b SHA256 33721b159aa1f15dbed12f27ed29fe37f58cdfc0cf045b81cd15121364b52cd0
-DIST freebsd-sbin-9.1_beta1.tar.bz2 1275577 RMD160 5900c79d0db61b4b57c43c27484d6ed3918a1ece SHA1 34170cf09a717531b758abbf337607e78e8e804b SHA256 a2f07ac952dd6d534279182dab5ee7039069552e29c390719405b3effb285015
-DIST freebsd-share-8.1.tar.bz2 3811857 SHA1 e9844c74d1da981f999aaa5afd97d33f9c364bac SHA256 36edb72f8e9ac1d61452d611fcfbc23787206cc66c51f8668833077058497301
-DIST freebsd-share-9.1_beta1.tar.bz2 6673450 RMD160 04027ac40742c2e5fb544ed236cf2f4835beb6b7 SHA1 f70671271bd5f115d99803611ec05bd365aa89ee SHA256 e865e735cc48dbfa7a86c5e7c6db9cb16e44396ada59ae9db5d079bdcb20aa7e
-DIST freebsd-ubin-8.1.tar.bz2 1807958 SHA1 6bf37003a3f21f96d0ad7b577df9650aba66ff89 SHA256 85b416178d2ed356130a697450fbba665d4a1179f99e80b414317a07a08ff14d
-DIST freebsd-ubin-9.1_beta1.tar.bz2 1905258 RMD160 07c5ffec607325503ef28d7b0b87f95f2092ec8b SHA1 d6fb6ec008e2aa99822e3e49d3a0f6a19c451531 SHA256 0bf8411f611e902a8188957feb1d653a2f90b7ddf836442dbe5927644c639c24
-DIST freebsd-usbin-8.1.tar.bz2 2467364 SHA1 c178890bae87238ae5a6254a022e7825808cda1f SHA256 5bacdb59c1e73137af62cddf837429fa0c35f0f7fea5a57aafb7bcf220823dd7
-DIST freebsd-usbin-9.1_beta1.tar.bz2 2681064 RMD160 94a64404315913df9842a83a27217aa3372c4ddd SHA1 6f59c65d14adbc6af4c7ab574782ef99cdfc690a SHA256 c0c2dee233dbdb499d8c6e65680d2f316b19d490ba115c54c20ce12e665d64ee
-EBUILD freebsd-share-8.1.ebuild 2572 RMD160 265a2ebcf5b7a9b982ad955748727775a15569e2 SHA1 1553b567a2b4b4cf270674256810509d7193b5b7 SHA256 abe0e28e8d4596bb01645a9f881788c726d56ec5e5b04f73fce164b0e7a850e4
-EBUILD freebsd-share-9.1_beta1.ebuild 2728 RMD160 82eafc8193369af976558aedf3f772ca3dd24106 SHA1 1bca14da32d5779a7edb91b3d9525822077242b9 SHA256 5cc1bb2c2b4f75f1429842e570f4d489f803747a73dff558451b70f5347f4008
+DIST freebsd-bin-9.1_rc1.tar.bz2 388709 RMD160 e9dff7716f552875dcb51653e963f7408faf3785 SHA1 b8fe1ceea88a4896e2412f30f960315521ccef75 SHA256 94b9261f042a6350a28f792c235f95c006813944dd8cebca1e793e3a31b7043a
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b
+DIST freebsd-gnu-9.1_rc1.tar.bz2 802034 RMD160 663b9e12ef05446be9f465dea292267745c94124 SHA1 9628e7a6f11c7f1dc3a4efa275d9a9515cb4619a SHA256 00bebcad9d87f06b0b33a1eac62d2345d258f47fca2b8aaba3b955c70d40e985
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52
+DIST freebsd-share-9.1_rc1.tar.bz2 6670560 RMD160 d2af901ff0aa70932d9ec2b6a31e9e25d2f560b2 SHA1 b685efb2b6019f7de941aa138eef0f6765674753 SHA256 b7d577784ae21f6e95b1f8e8befbdde4afa1f4e7e8cb209b055eaffabd315c75
+DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979
+DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164
+EBUILD freebsd-share-9.1_rc1.ebuild 2728 RMD160 82eafc8193369af976558aedf3f772ca3dd24106 SHA1 1bca14da32d5779a7edb91b3d9525822077242b9 SHA256 5cc1bb2c2b4f75f1429842e570f4d489f803747a73dff558451b70f5347f4008

diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.1_beta1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-share/freebsd-share-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-share/freebsd-share-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 55aa152..b29cf84 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -30,7 +30,5 @@ AUX freebsd-sources-9.0-ipv6refcount.patch 3259 RMD160 e9f53cf11931e900ab881748f
 AUX freebsd-sources-9.0-sysctluint.patch 403 RMD160 46bb18c424ea7011db86341e427fd095495c4bcc SHA1 9d3c1606c886d96a88c89283bc18a2717c87fc76 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e
 AUX freebsd-sources-9.1-gentoo.patch 1177 RMD160 ce55a71414efb8580f15a3c73f48d8ff8c37875c SHA1 19387e59447c5b2e675aaa24a79187eb7dc8580b SHA256 6aa1e9a7a22cc56bc4bc3f310b9b2cca9e4674d466c74432b896c8519a895097
 AUX freebsd-sources-cve-2012-0217.patch 856 RMD160 38cd459f900671f0f39df40353da6a0a1894b4b8 SHA1 3f96d861602f6b0442b2a412cd6b18437a3cfa55 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe
-DIST freebsd-sys-8.1.tar.bz2 24173113 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
-DIST freebsd-sys-9.1_beta1.tar.bz2 32431009 RMD160 7d6c62f051f7a49fbd73645bdfe3c26777d3a741 SHA1 183b5c29fa3af5d2173918f91fe47f6e0f30a157 SHA256 f0aa625b61314781104a978d8a726f2dee4bb4c4510f92e512b4d035a3ff4ccc
-EBUILD freebsd-sources-8.1.ebuild 3445 RMD160 e63d717705148d8f864f461dec1ba5d926bc3054 SHA1 180dbee347bf8e61cd28e42ce7d6dd7a109207b2 SHA256 a42865c64624c3053343403e1b9eabadb79fbf7f8c466ed8a9196487c0faaec1
-EBUILD freebsd-sources-9.1_beta1.ebuild 3234 RMD160 523cfadcbb390552f5b8c4e73966e339a6931eb2 SHA1 f9d819852baf6caedec516603a477cf075f14031 SHA256 e6ac738255c3daf56ae3c086fff7e8ee5f1962ac31772dd58e88aef395b7310c
+DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
+EBUILD freebsd-sources-9.1_rc1.ebuild 3234 RMD160 523cfadcbb390552f5b8c4e73966e339a6931eb2 SHA1 f9d819852baf6caedec516603a477cf075f14031 SHA256 e6ac738255c3daf56ae3c086fff7e8ee5f1962ac31772dd58e88aef395b7310c

diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1_beta1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-sources/freebsd-sources-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-sources/freebsd-sources-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 9d8a2b5..08b1624 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -18,21 +18,12 @@ AUX passwd.1.pamd 269 RMD160 d5191183e5bec2add3ebf8525b22239f93d1a8cf SHA1 4fce6
 AUX passwd.pamd 360 RMD160 345f4755bd209234ea7a742dbfcef7f57b70a76d SHA1 1d79568553aec699784ba9e9c22de732073eaac7 SHA256 ff964fd309462cac711422be051122f8a60b570da9b13756e9012b18b1864f79
 AUX su.1.pamd 432 RMD160 eddbeaaead95e2b9a8f8400cc1631740431834fd SHA1 02afb1791784256a81379e9d00e1fb07a80f3d6e SHA256 a231f9cbe5b9e03aa0aaa1520657332771f15d5e5cd69890ce49d02bb34e21c3
 AUX su.pamd 420 RMD160 9888acbac2c2c79b64ec274cc7d96b13b86d8ad8 SHA1 80fb667062953c4232d98d9c9bc8bc5185eab06b SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08
-DIST freebsd-bin-8.1.tar.bz2 417319 SHA1 6cfca01630aa65a4d68c3e2670c8b6c743ac0e94 SHA256 3f61adb8d9635817778d7a2133789af28468a2544dadba55210373e1ee1bff83
-DIST freebsd-bin-9.1_beta1.tar.bz2 389182 RMD160 fd134bf191c0ba811e6562f3fcfeb2d051ae5b5d SHA1 716bf53081ae86636ef3b2330889a1a363c45401 SHA256 28440b2a76327400960f46541ab3c77f2ef56053e43eb2a8266acc33a25e6a64
-DIST freebsd-cddl-8.1.tar.bz2 772450 SHA1 78a21fc3824a9269e916352883bf3f06498d22e9 SHA256 fba896c3a16ce29773b4df49522231f59aaad46fdadc02a3df102070cf1a1e4d
-DIST freebsd-cddl-9.1_beta1.tar.bz2 909373 RMD160 7b19518f8b29a89089c417d6eab882ce5b0a48ee SHA1 a324b048a35a341bcfba1f085c3938faf34f5891 SHA256 c4effa8f88f37f828d58dd708806234e72259ec8558b93c820c085ab9994dca1
-DIST freebsd-contrib-8.1.tar.bz2 41505936 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
-DIST freebsd-etc-8.1.tar.bz2 186545 SHA1 f16fc5717fb2b2f7a5196e2c6b7e43a975b2ca90 SHA256 5abd47694c12aa5acf278474942bf772cd5d3a99cc89b14e4fa378c1d8acea8c
-DIST freebsd-etc-9.1_beta1.tar.bz2 205684 RMD160 d7f6a1fd4c3ad9cf36190957691d02932a849a9a SHA1 9dd4d8d898035bb586b8756809bbecb82420f6af SHA256 7aa2155570daad76fbb8ccaeef3840ffc1fe385e7d20b4534d70e63eb3dc0a51
-DIST freebsd-include-8.1.tar.bz2 139066 SHA1 30e23794b7efdb61f7e692eb2913f082e5f984ed SHA256 122e58904ea9fc403f44b23a106df486cd3bcc89b7cddcec95b5a56a90c1370a
-DIST freebsd-include-9.1_beta1.tar.bz2 146786 RMD160 3a1d80f481967008541f5b300179cf35109f1c38 SHA1 4316c8f31326b67e63d6f6bdf16974838b872d8a SHA256 3982d25ca4fec4978b22e53d525da5599583690cd3bb93e5bc4deedaae2a43c5
-DIST freebsd-lib-8.1.tar.bz2 3314868 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
-DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
-DIST freebsd-sys-8.1.tar.bz2 24173113 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
-DIST freebsd-sys-9.1_beta1.tar.bz2 32431009 RMD160 7d6c62f051f7a49fbd73645bdfe3c26777d3a741 SHA1 183b5c29fa3af5d2173918f91fe47f6e0f30a157 SHA256 f0aa625b61314781104a978d8a726f2dee4bb4c4510f92e512b4d035a3ff4ccc
-DIST freebsd-ubin-8.1.tar.bz2 1807958 SHA1 6bf37003a3f21f96d0ad7b577df9650aba66ff89 SHA256 85b416178d2ed356130a697450fbba665d4a1179f99e80b414317a07a08ff14d
-DIST freebsd-ubin-9.1_beta1.tar.bz2 1905258 RMD160 07c5ffec607325503ef28d7b0b87f95f2092ec8b SHA1 d6fb6ec008e2aa99822e3e49d3a0f6a19c451531 SHA256 0bf8411f611e902a8188957feb1d653a2f90b7ddf836442dbe5927644c639c24
-EBUILD freebsd-ubin-8.1.ebuild 4501 RMD160 4e1d335d0e01721da431196258fbc82009f2e800 SHA1 a5546be70b6d8c7741be68c77a7bc8df98dc4f90 SHA256 286233c1ab083fbc4b287247a0795df6f88828158b2d87f71c44ea8c2e66dd5c
-EBUILD freebsd-ubin-9.1_beta1.ebuild 4691 RMD160 b8f622d0a8f5872d0ec46b8c14ed12c2db255309 SHA1 5083b41450a11617ffe364fa43ed61f3d52bc285 SHA256 2457500e8a04129a1ac261b981da86565229f837ceca3e83867f1bfb0d69bcac
+DIST freebsd-bin-9.1_rc1.tar.bz2 388709 RMD160 e9dff7716f552875dcb51653e963f7408faf3785 SHA1 b8fe1ceea88a4896e2412f30f960315521ccef75 SHA256 94b9261f042a6350a28f792c235f95c006813944dd8cebca1e793e3a31b7043a
+DIST freebsd-cddl-9.1_rc1.tar.bz2 910010 RMD160 54476d310621277b6d56ba6f7ffcff7bfe05dff2 SHA1 f92527d3dd6aa0278fb0882f3c633315c521ce49 SHA256 ac64b78bb3313d811d065bf1f4299897c3fd78d1f976eedf218ae361c56d0fd7
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b
+DIST freebsd-include-9.1_rc1.tar.bz2 146409 RMD160 ced0903d8c1eff121e1b5c7acc8da946132227c0 SHA1 7cbaa00e333299eb8453ae551ac983f5333037f3 SHA256 c6febd4ace254d2109375d38c1ec4a960999aa62c1409c9ea9f2d336595d42c5
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
+DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979
+EBUILD freebsd-ubin-9.1_rc1.ebuild 4691 RMD160 b8f622d0a8f5872d0ec46b8c14ed12c2db255309 SHA1 5083b41450a11617ffe364fa43ed61f3d52bc285 SHA256 2457500e8a04129a1ac261b981da86565229f837ceca3e83867f1bfb0d69bcac

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1_beta1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-ubin/freebsd-ubin-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-ubin/freebsd-ubin-9.1_rc1.ebuild

diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index d2b2b91..ea789b6 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -8,7 +8,7 @@ AUX mountd.patch 542 RMD160 f68fb1bdc53705a392bbb92d91fc44991f19e742 SHA1 c5fb79
 AUX moused.confd 827 RMD160 a9d0822aa3894caed9efa9df93ef25ec6ec6fb8e SHA1 e09f3f44ee29fa75a1ce6fbe9cdbfe503eaa11d6 SHA256 7c15a534c0b10a553848b13e1fccd27fad1684ddc1b252133269257e864d769e
 AUX moused.initd 1783 RMD160 46241b5cf795ad06460e4053f8a76726af70c665 SHA1 02b5c22b7c35439a4c59ddadfd5bb7910cf3cdff SHA256 84f2d221ce16f5ffce43170fdcf86675dae79a776e1f2abf3b1b490b585f6d0e
 AUX nfs.confd 303 RMD160 84d62252bbdd6a5d8c65f537e0cf44495101ebef SHA1 108c14ef72c8ce9cf932ec52b7c0850c0c1b5d07 SHA256 5714e0cbcc45a077ab2348ee4fea521ce9f739927094dccb4b91817f1edaccb8
-AUX nfs.initd 1405 RMD160 65d3aa6ab9b360636f87e6daef2851c6f5290948 SHA1 2eff28ec1b5ba6bae3d833d6813ce2860547923d SHA256 03920f64182089b4f79fcd311cc71c9d3c83197fb9406710ceeced2d623ae661
+AUX nfs.initd 1405 RMD160 7c45d2edefea81fb3d5b4065d2068559f5f405ba SHA1 a36c7f034e7e7f6510714d08c7b129068ec9fa9c SHA256 5ead1faeb5fd145a615a43340bc64ff12286d004a16994fee0e47cda5120b64f
 AUX nfsmount.initd 1596 RMD160 8f47abac7148ad8c35fe314dad6ae2fdffc73cb3 SHA1 5a839e1b4f135619ec1b6c614e9a1cf8d018f0d6 SHA256 0cea497d66d41d093792f8bb2590c45b6b8f965cef9c148b835b362f2a172cbe
 AUX powerd.confd 368 RMD160 4273367b5b1956080d70c300f071ccb7aa614672 SHA1 6cbebc62910ff2d45079f8430d2494ebd7293546 SHA256 989e31b98daacb3d6ecddf8788ee496f3c100d549e7a210e387f03d69c3c8e98
 AUX powerd.initd 774 RMD160 650b7f09be40db75e03c086bc70491c2ce18c40d SHA1 89186f3894357b466d438d7b7b23b7f1228058d6 SHA256 2ee95ad25206716b6043407c6fbb412513fcbd0893d7f2faf2c927c55990fb03
@@ -21,25 +21,14 @@ AUX rpcbind.initd 716 RMD160 86d0b4b9e1ce8013777624375ddd012b8a86f02d SHA1 97693
 AUX syscons.confd 464 RMD160 c9673b5f9f92443a6afb7276db0f0e163044ac4d SHA1 5b753c59b3b09ee648dafb763fbdc348c9d68e7e SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b1013ce02e44ee
 AUX syscons.initd 1711 RMD160 1baace1dd867e77442668bebdcfd45daf0977f96 SHA1 7ab7fc7689470bf618f51d723816e629e3bd0420 SHA256 16f5ab3ceb67accc10350d21527321c1e559c432f0b52e7b3adf08b67d9f62aa
 AUX syslogd.initd 571 RMD160 915d4efbd2bac506c162a3fb8c08efc3a97082b7 SHA1 a3200b5973fb0e474fcc9f93709324162a03b679 SHA256 3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005
-DIST freebsd-contrib-8.1.tar.bz2 41505936 SHA1 1235434a067c1445ff8fb0efa395ef5fb2746b9a SHA256 5933b9172af92242519427c033e753150950d444a653c9ba9491b024d9eb2cf3
-DIST freebsd-contrib-9.1_beta1.tar.bz2 54324352 RMD160 01b581aea0028134fcbdf4fe8fbba85a1080c8ec SHA1 b67ee1228abb94795e7c637b135905fa040a1b06 SHA256 cd3d33bd29ef5b228583fd18885292dd712041d21afe66ef0e19b20600a91c3f
-DIST freebsd-etc-8.1.tar.bz2 186545 SHA1 f16fc5717fb2b2f7a5196e2c6b7e43a975b2ca90 SHA256 5abd47694c12aa5acf278474942bf772cd5d3a99cc89b14e4fa378c1d8acea8c
-DIST freebsd-etc-9.1_beta1.tar.bz2 205684 RMD160 d7f6a1fd4c3ad9cf36190957691d02932a849a9a SHA1 9dd4d8d898035bb586b8756809bbecb82420f6af SHA256 7aa2155570daad76fbb8ccaeef3840ffc1fe385e7d20b4534d70e63eb3dc0a51
-DIST freebsd-gnu-8.1.tar.bz2 818430 SHA1 762be40e717cdb21f572865ae2dbad4055dc2439 SHA256 222e7341ec912832583cf364d9c19487ee763c1290d0f16549934e9fb0545064
-DIST freebsd-gnu-9.1_beta1.tar.bz2 802694 RMD160 b2a1ab81c30c3c40a5bbf980a0b63d82a760b85b SHA1 897e3a0032be5d6ea719ed5e48c5ff283323972e SHA256 b794c84343eec01d82c11a114c0262271fe59e52b630ed6524cfe7a2fbeafba4
-DIST freebsd-include-8.1.tar.bz2 139066 SHA1 30e23794b7efdb61f7e692eb2913f082e5f984ed SHA256 122e58904ea9fc403f44b23a106df486cd3bcc89b7cddcec95b5a56a90c1370a
-DIST freebsd-include-9.1_beta1.tar.bz2 146786 RMD160 3a1d80f481967008541f5b300179cf35109f1c38 SHA1 4316c8f31326b67e63d6f6bdf16974838b872d8a SHA256 3982d25ca4fec4978b22e53d525da5599583690cd3bb93e5bc4deedaae2a43c5
-DIST freebsd-lib-8.1.tar.bz2 3314868 SHA1 c44d7b8b5bfd8ec0bec0500210e8147ef8041dfb SHA256 af7ace10ae7788f90ae25e82b2034d7e93e6a4129c34f78b883c6fc1d467ac55
-DIST freebsd-lib-9.1_beta1.tar.bz2 3212108 RMD160 86daf233379f9c5600ad702455f93f1526793bda SHA1 96204524a13089282ba2cc67d488c40042ef2c3d SHA256 3206a7a9a87403518b3a0136971468cbdaee60510729156e37733f3e1a49bec1
-DIST freebsd-libexec-8.1.tar.bz2 281958 SHA1 4be5da6d0fee935df3731587bb967f0225c10b19 SHA256 fbd03c7b34bf294d6ce2a999d7dab1b6dffd07253b2242f2608a3cdb35720623
-DIST freebsd-libexec-9.1_beta1.tar.bz2 309755 RMD160 d293a6647d31ff0f7f4fa075e5e47dd33a0d6ed8 SHA1 05318a8326060ea5bd65b355ecc465366e815a76 SHA256 ddb686cd63c374203a9f4449332ba7d2cc097f5e95b25b2f1b84abf33c09c48d
-DIST freebsd-sbin-8.1.tar.bz2 1217639 SHA1 809f4621aff06aa721571d9a2857eb1e38778a9b SHA256 33721b159aa1f15dbed12f27ed29fe37f58cdfc0cf045b81cd15121364b52cd0
-DIST freebsd-sbin-9.1_beta1.tar.bz2 1275577 RMD160 5900c79d0db61b4b57c43c27484d6ed3918a1ece SHA1 34170cf09a717531b758abbf337607e78e8e804b SHA256 a2f07ac952dd6d534279182dab5ee7039069552e29c390719405b3effb285015
-DIST freebsd-sys-8.1.tar.bz2 24173113 SHA1 19af10e8b66ef07dc9fe4f991164369aea52feba SHA256 6226c119e8b8f3d2e3d1697cc564a482978730afce7e25d472feecd962cda938
-DIST freebsd-sys-9.1_beta1.tar.bz2 32431009 RMD160 7d6c62f051f7a49fbd73645bdfe3c26777d3a741 SHA1 183b5c29fa3af5d2173918f91fe47f6e0f30a157 SHA256 f0aa625b61314781104a978d8a726f2dee4bb4c4510f92e512b4d035a3ff4ccc
-DIST freebsd-ubin-8.1.tar.bz2 1807958 SHA1 6bf37003a3f21f96d0ad7b577df9650aba66ff89 SHA256 85b416178d2ed356130a697450fbba665d4a1179f99e80b414317a07a08ff14d
-DIST freebsd-ubin-9.1_beta1.tar.bz2 1905258 RMD160 07c5ffec607325503ef28d7b0b87f95f2092ec8b SHA1 d6fb6ec008e2aa99822e3e49d3a0f6a19c451531 SHA256 0bf8411f611e902a8188957feb1d653a2f90b7ddf836442dbe5927644c639c24
-DIST freebsd-usbin-8.1.tar.bz2 2467364 SHA1 c178890bae87238ae5a6254a022e7825808cda1f SHA256 5bacdb59c1e73137af62cddf837429fa0c35f0f7fea5a57aafb7bcf220823dd7
-DIST freebsd-usbin-9.1_beta1.tar.bz2 2681064 RMD160 94a64404315913df9842a83a27217aa3372c4ddd SHA1 6f59c65d14adbc6af4c7ab574782ef99cdfc690a SHA256 c0c2dee233dbdb499d8c6e65680d2f316b19d490ba115c54c20ce12e665d64ee
-EBUILD freebsd-usbin-8.1.ebuild 5372 RMD160 404b65e83425d33efdac42a44b4512a08df8451e SHA1 bff1d06a11550e74c90d21ada6d7810f5c9bf962 SHA256 e8639e171e669df20f483cc7af4a95adfd8ab31dc1e16ce6f6cfd620011c428f
-EBUILD freebsd-usbin-9.1_beta1.ebuild 5376 RMD160 f270bbb74ed48b17adb52506d87693ebd110ba96 SHA1 f9c4db00744b64dd8687d478eeeff3d63f36b409 SHA256 1d0f7f5a9a09c8095f3006d6334085a6de1427e8fb85a023514b193d709dc593
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
+DIST freebsd-etc-9.1_rc1.tar.bz2 205627 RMD160 dc9c4914ad9f76a1166d338bb550e2b55cc3a1e9 SHA1 faff7e4847dbb99dee1e6ab5c511f6244ee57058 SHA256 ac84b97965a359744b5171078476e4b5f024faaf13d61ebe2f8c43d2ea70c77b
+DIST freebsd-gnu-9.1_rc1.tar.bz2 802034 RMD160 663b9e12ef05446be9f465dea292267745c94124 SHA1 9628e7a6f11c7f1dc3a4efa275d9a9515cb4619a SHA256 00bebcad9d87f06b0b33a1eac62d2345d258f47fca2b8aaba3b955c70d40e985
+DIST freebsd-include-9.1_rc1.tar.bz2 146409 RMD160 ced0903d8c1eff121e1b5c7acc8da946132227c0 SHA1 7cbaa00e333299eb8453ae551ac983f5333037f3 SHA256 c6febd4ace254d2109375d38c1ec4a960999aa62c1409c9ea9f2d336595d42c5
+DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
+DIST freebsd-libexec-9.1_rc1.tar.bz2 310066 RMD160 4635555af871b887a3385605132af25cbf020eff SHA1 e259145ea2b1a6b68a8e0f7af9d08f48edc709b4 SHA256 e2b7d0c0583b3053b5a91b547576eca78f4035826f056534b17824126c4d4cb8
+DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52
+DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
+DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979
+DIST freebsd-usbin-9.1_rc1.tar.bz2 2682082 RMD160 2b0286fc1fdc0e7cdf28bce44b30bc8e1e0e8dfc SHA1 5e172d3b02f632dbeab71fd2e2ba466c39c6a387 SHA256 81db21415611ed6ee0400e901e77bb7eaac9450ba06848f2e0c4d2cd8b695164
+EBUILD freebsd-usbin-9.1_rc1.ebuild 5376 RMD160 f270bbb74ed48b17adb52506d87693ebd110ba96 SHA1 f9c4db00744b64dd8687d478eeeff3d63f36b409 SHA256 1d0f7f5a9a09c8095f3006d6334085a6de1427e8fb85a023514b193d709dc593

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1_beta1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1_rc1.ebuild
similarity index 100%
rename from sys-freebsd/freebsd-usbin/freebsd-usbin-9.1_beta1.ebuild
rename to sys-freebsd/freebsd-usbin/freebsd-usbin-9.1_rc1.ebuild


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-lib/, ...
@ 2012-12-31  9:51 Yuta SATOH
  0 siblings, 0 replies; 3+ messages in thread
From: Yuta SATOH @ 2012-12-31  9:51 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

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

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

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

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

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

diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index f565663..f3c8e2d 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -1,3 +1,4 @@
 DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0
 DIST freebsd-gnu-9.1_rc3.tar.bz2 795216 SHA256 43f493dbf3ccfea445cff838bf9b9887ed4f9d5437278529fee306444a3ea8e4 SHA512 0679f100f83e7347d00b2749aeb57a9582404a5f9160b170f5fcac715e8f401738cf89025e23b2c036b67be2a4030e283105dc707bf745e9cd4c199cd7a2689d WHIRLPOOL 9b4a12009c0826c891907d2312bc4eef4466b8124c9c00b70775556487a1a6e88676528a682ca29c3e36cdad13d61065b955d886a79885147cfc7731186ae8f4
+EBUILD freebsd-contrib-9.1.9999.ebuild 1513 SHA256 758e7785c189139e2f8097035342a5f81f22cdd55269ff10ae4deecd3cb719ce SHA512 e9b396185f2e6ce92a0ff89ddb27cc8410cc2f4df951850e69210c8bdc0f59e832eea670edc78dd2ffbe7d5d26e38ea1f8b17b92bfd759c8189d4c3130826d82 WHIRLPOOL 8612f39cc710cee694a4e877f671c38ed4d93609d56c7614b2375cadff0ea4b1ba43a618516712808be2ce1bd4289bd83c59c50952a533ea94a81756eaa395a2
 EBUILD freebsd-contrib-9.1_rc3.ebuild 1407 SHA256 f33ecdffd2648870725dd5d8b7814cafc3f9195e87fa94f7cb88f847b8388943 SHA512 588f06372ba4e7d6cb92038bf83959b1f146a10f61fc9b4b4b5e3e616d61511b3651386071bc09c726cedf5ee07f61d82afda5a92042942dc7d1916eaa3ac267 WHIRLPOOL 98303bb9ed8d2bcbee2a71c77d81bbc8bdb14aa669ed20d40b8edbcd88f99f800d03e504ea0221456e06826b3cfee18d859bd1800166aea85d454edaa528cd77

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

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

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1.9999.ebuild
new file mode 100644
index 0000000..1b97025
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1.9999.ebuild
@@ -0,0 +1,532 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="0"
+
+# Crypto is needed to have an internal OpenSSL header
+# sys is needed for libalias, probably we can just extract that instead of
+# extracting the whole tarball
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${LIB}.tar.bz2
+			mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${CRYPTO}.tar.bz2
+			mirror://gentoo/${LIBEXEC}.tar.bz2
+			mirror://gentoo/${ETC}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2
+			mirror://gentoo/${USBIN}.tar.bz2
+			mirror://gentoo/${GNU}.tar.bz2
+			build? (
+				mirror://gentoo/${SYS}.tar.bz2 )
+			zfs? (
+				mirror://gentoo/${CDDL}.tar.bz2 )"
+fi
+
+if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
+	RDEPEND="ssl? ( dev-libs/openssl )
+		hesiod? ( net-dns/hesiod )
+		kerberos? ( virtual/krb5 )
+		usb? ( !dev-libs/libusb !dev-libs/libusbx )
+		userland_GNU? ( sys-apps/mtree )
+		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
+		>=dev-libs/expat-2.0.1
+		!sys-libs/libutempter
+		!sys-freebsd/freebsd-headers"
+	DEPEND="${RDEPEND}
+		>=sys-devel/flex-2.5.31-r2
+		=sys-freebsd/freebsd-sources-${RV}*
+		!bootstrap? ( app-arch/bzip2 )"
+else
+	SRC_URI="${SRC_URI}
+			mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+DEPEND="${DEPEND}
+		=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/lib"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
+	export CTARGET=${CATEGORY/cross-}
+fi
+
+IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
+	build bootstrap crosscompile_opts_headers-only zfs
+	userland_GNU userland_BSD multilib"
+
+pkg_setup() {
+	[ -c /dev/zero ] || \
+		die "You forgot to mount /dev; the compiled libc would break."
+
+	if ! use ssl && use kerberos; then
+		eerror "If you want kerberos support you need to enable ssl support, too."
+	fi
+
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
+
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
+		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0-pmc.patch"
+	"${FILESDIR}/${PN}-6.0-gccfloat.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-csu.patch"
+	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
+	"${FILESDIR}/${PN}-9.0-liblink.patch"
+	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
+	"${FILESDIR}/${PN}-9.0-netware.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
+
+# Here we disable and remove source which we don't need or want
+# In order:
+# - ncurses stuff
+# - libexpat creates a bsdxml library which is the same as expat
+# - archiving libraries (have their own ebuild)
+# - sendmail libraries (they are installed by sendmail)
+# - SNMP library and dependency (have their own ebuilds)
+# - Clang (compiler_rt and blocksruntime)
+#
+# The rest are libraries we already have somewhere else because
+# they are contribution.
+# Note: libtelnet is an internal lib used by telnet and telnetd programs
+# as it's not used in freebsd-lib package itself, it's pointless building
+# it here.
+REMOVE_SUBDIRS="ncurses \
+	libexpat \
+	libz libbz2 libarchive liblzma \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libcompiler_rt libblocksruntime \
+	libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet
+	libelf libedit"
+
+# Are we building a cross-compiler?
+is_crosscompile() {
+	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
+}
+
+src_prepare() {
+	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
+
+	# Upstream Display Managers default to using VT7
+	# We should make FreeBSD allow this by default
+	local x=
+	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
+		sed -i.bak \
+			-e '/ttyv5[[:space:]]/ a\
+# Display Managers default to VT7.\
+# If you use the xdm init script, keep ttyv6 commented out\
+# unless you force a different VT for the DM being used.' \
+			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
+			|| die "Failed to sed ${x}"
+		rm "${x}".bak
+	done
+
+	# This one is here because it also
+	# patches "${WORKDIR}/include"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-includes.patch"
+	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
+	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
+
+	# Don't install the hesiod man page or header
+	rm "${WORKDIR}"/include/hesiod.h || die
+	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
+	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
+	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
+
+	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
+	cd "${S}"
+	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
+		libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
+		die "Problem fixing \"${dir}/Makefile"
+	done
+	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
+	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
+		-i "${S}/csu/i386-elf/Makefile" \
+		-i "${S}/csu/ia64/Makefile" || die
+	if use build; then
+		cd "${WORKDIR}"
+		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
+		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
+		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
+		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
+		return 0
+	fi
+
+	if ! is_crosscompile ; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+	else
+		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
+			"${S}/libc/rpc/Makefile.inc" \
+			"${S}/libc/yp/Makefile.inc"
+	fi
+
+	if install --version 2> /dev/null | grep -q GNU; then
+		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+	fi
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
+		die "Couldn't make ${machine}/include symlink."
+
+	cd "${S}"
+	use bootstrap && dummy_mk libstand
+	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
+	# BSD's sed on BSD.
+	if use userland_GNU; then
+		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+	fi
+}
+
+get_csudir() {
+	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
+		echo "lib/csu/$1-elf"
+	else
+		echo "lib/csu/$1"
+	fi
+}
+
+bootstrap_csu() {
+	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
+	export RAW_LDFLAGS=$(raw-ldflags)
+	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
+	freebsd_src_compile
+
+	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+}
+
+# Compile libssp_nonshared.a and add it's path to LDFLAGS.
+bootstrap_libssp_nonshared() {
+	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+	export LDADD="-lssp_nonshared"
+}
+
+# What to build for a non-native build: cross-compiler, non-native abi in
+# multilib. We also need the csu but this has to be handled separately.
+NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
+
+# Subdirs for a native build:
+NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex"
+
+# Is my $ABI native ?
+is_native_abi() {
+	is_crosscompile && return 1
+	use multilib || return 0
+	[ "${ABI}" = "${DEFAULT_ABI}" ]
+}
+
+# Do we need to bootstrap the csu and libssp_nonshared?
+need_bootstrap() {
+	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
+}
+
+# Get the subdirs we are building.
+get_subdirs() {
+	local ret=""
+	if is_native_abi ; then
+		# If we are building for the native ABI, build everything
+		ret="${NATIVE_SUBDIRS}"
+	elif is_crosscompile ; then
+		# With a cross-compiler we only build the very core parts.
+		ret="${NON_NATIVE_SUBDIRS}"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			# Add the csu dir first when installing. We treat it separately for
+			# compiling.
+			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
+		fi
+	elif use build ; then
+		# For the non-native ABIs we only build the csu parts and very core
+		# libraries for now.
+		ret="gnu/lib/libssp/libssp_nonshared"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+	else
+		# Only build the csu parts and core libraries for now.
+		ret="gnu/lib/libssp/libssp_nonshared"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+		# Finally, with a non-native ABI without USE=build, we build everything
+		# too.
+		#ret="${NATIVE_SUBDIRS}"
+	fi
+	echo "${ret}"
+}
+
+# Bootstrap the core libraries and setup the flags so that the other parts can
+# build against it.
+do_bootstrap() {
+	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
+	if ! is_crosscompile ; then
+		# Pre-install headers, but not when building a cross-compiler since we
+		# assume they have been installed in the previous pass.
+		einfo "Pre-installing includes in include_proper_${ABI}"
+		mkdir "${WORKDIR}/include_proper_${ABI}" || die
+		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
+		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
+	fi
+	bootstrap_csu
+	bootstrap_libssp_nonshared
+}
+
+# Compile it. Assume we have the toolchain setup correctly.
+do_compile() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
+	mkdir "${MAKEOBJDIRPREFIX}" || die "Could not create ${MAKEOBJDIRPREFIX}."
+	need_bootstrap && do_bootstrap
+
+	export RAW_LDFLAGS=$(raw-ldflags)
+
+	# Everything is now setup, build it!
+	for i in $(get_subdirs) ; do
+		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_compile || die "make ${i} failed"
+	done
+}
+
+src_compile() {
+	# Does not work with GNU sed
+	# Force BSD's sed on BSD.
+	if use userland_BSD ; then
+		export ESED=/usr/bin/sed
+		unalias sed
+	fi
+
+	cd "${WORKDIR}/include"
+	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
+
+	use crosscompile_opts_headers-only && return 0
+
+	# Bug #270098
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Bug #324445
+	append-flags $(test-flags -fno-strict-overflow)
+
+	# strip flags and do not do it later, we only add safe, and in fact
+	# needed flags after all
+	strip-flags
+	export NOFLAGSTRIP=yes
+	if is_crosscompile ; then
+		export YACC='yacc -by'
+		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
+		mymakeopts="${mymakeopts} NLS="
+		append-flags "-I/usr/${CTARGET}/usr/include"
+		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
+	fi
+
+	if is_crosscompile ; then
+		do_compile
+	else
+		for ABI in $(get_all_abis) ; do
+			# First, save the variables: CFLAGS, CXXFLAGS, LDFLAGS and mymakeopts.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				export ${i}_SAVE="${!i}"
+			done
+
+			multilib_toolchain_setup ${ABI}
+
+			local target="$(tc-arch-kernel ${CHOST})"
+			mymakeopts="${mymakeopts} TARGET=${target} MACHINE=${target} MACHINE_ARCH=${target}"
+			CFLAGADD=""
+			if ! is_native_abi ; then
+				mymakeopts="${mymakeopts} COMPAT_32BIT="
+			fi
+			need_bootstrap || CFLAGS="${CFLAGS} -isystem /usr/include"
+
+			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"
+
+			CTARGET="${CHOST}" do_compile
+
+			# Restore the variables now.
+			for i in CFLAGS CXXFLAGS LDFLAGS mymakeopts ; do
+				ii="${i}_SAVE"
+				export ${i}="${!ii}"
+			done
+		done
+	fi
+}
+
+gen_libc_ldscript() {
+	# Parameters:
+	#   $1 = target libdir
+	#   $2 = source libc dir
+	#   $3 = source libssp_nonshared dir
+
+	# Clear the symlink.
+	rm -f "${D}/$2/libc.so" || die
+
+	# Move the library if needed
+	if [ "$1" != "$2" ] ; then
+		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
+	fi
+
+	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
+	# this is done to avoid having to touch gcc spec file as it is currently
+	# done on FreeBSD upstream, mostly because their binutils aren't able to
+	# cope with linker scripts yet.
+	# Taken from toolchain-funcs.eclass:
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
+/* GNU ld script
+   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
+   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
+   this symbol was provided by a shared libc. So we link in
+   libssp_nonshared.a from here.
+ */
+${output_format}
+GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
+END_LDSCRIPT
+}
+
+do_install() {
+	export MAKEOBJDIRPREFIX="${WORKDIR}/${CHOST}"
+	for i in $(get_subdirs) ; do
+		einfo "Installing in ${i}..."
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_install || die "Install ${i} failed"
+	done
+}
+
+src_install() {
+	[ "${CTARGET}" = "${CHOST}" ] \
+		&& INCLUDEDIR="/usr/include" \
+		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
+	dodir ${INCLUDEDIR}
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+	install_includes ${INCLUDEDIR}
+
+	use crosscompile_opts_headers-only && return 0
+	local mylibdir=$(get_libdir)
+
+	if is_crosscompile ; then
+		mymakeopts="${mymakeopts} NO_MAN= \
+			INCLUDEDIR=/usr/${CTARGET}/usr/include \
+			SHLIBDIR=/usr/${CTARGET}/usr/lib \
+			LIBDIR=/usr/${CTARGET}/usr/lib"
+
+		dosym "usr/include" "/usr/${CTARGET}/sys-include"
+		do_install
+	else
+		if ! use multilib ; then
+			# Set SHLIBDIR and LIBDIR for multilib
+			mymakeopts="${mymakeopts} SHLIBDIR=/usr/${mylibdir} LIBDIR=/usr/${mylibdir}"
+			do_install
+		else
+			for ABI in $(get_all_abis) ; do
+				mymakeopts_SAVE="${mymakeopts}"
+				multilib_toolchain_setup ${ABI}
+				mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir) LIBDIR=/usr/$(get_libdir)"
+				do_install
+				mymakeopts="${mymakeopts_SAVE}"
+			done
+		fi
+	fi
+
+	# Don't install the rest of the configuration files if crosscompiling
+	if is_crosscompile ; then
+		# This is to get it stripped with the correct tools, otherwise it gets
+		# stripped with the host strip.
+		# And also get the correct OUTPUT_FORMAT in the libc ldscript.
+		export CHOST=${CTARGET}
+		gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
+		return 0
+	fi
+
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins nls.alias mac.conf netconfig
+
+	# Install ttys file
+	local MACHINE="$(tc-arch-kernel)"
+	doins "etc.${MACHINE}"/*
+
+	# Generate ldscripts for core libraries that will go in /
+	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
+		kvm m md procstat sbuf thr ufs util
+
+	gen_libc_ldscript "${mylibdir}" "usr/${mylibdir}" "usr/${mylibdir}"
+
+	# Install a libusb.pc for better compat with Linux's libusb
+	if use usb ; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb1.0.pc" || die
+	fi
+}
+
+install_includes()
+{
+	local INCLUDEDIR="$1"
+
+	# The idea is to be called from either install or unpack.
+	# During unpack it's required to install them as portage's user.
+	if [[ "${EBUILD_PHASE}" == "install" ]]; then
+		local DESTDIR="${D}"
+		BINOWN="root"
+		BINGRP="wheel"
+	else
+		local DESTDIR="${WORKDIR}"
+		[[ -z "${USER}" ]] && USER="portage"
+		BINOWN="${USER}"
+		[[ -z "${GROUPS}" ]] && GROUPS="portage"
+		BINGRP="${GROUPS}"
+	fi
+
+	# Must exist before we use it.
+	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
+	cd "${WORKDIR}/include"
+
+	local MACHINE="$(tc-arch-kernel)"
+
+	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+	$(freebsd_get_bmake) installincludes \
+		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+		DESTDIR="${DESTDIR}" \
+		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+		BINGRP="${BINGRP}" || die "install_includes() failed"
+	einfo "includes installed ok."
+	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
+	for i in $EXTRA_INCLUDES; do
+		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+		cd "${WORKDIR}/$i" || die
+		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
+			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+			BINGRP="${BINGRP}" || die "problem installing $i includes."
+		einfo "$i includes installed ok."
+	done
+}

diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 9f3b74a..15c3e42 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -12,4 +12,5 @@ DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12
 DIST freebsd-libexec-9.1_rc3.tar.bz2 305301 SHA256 4cf56ff81096112b33276f619e823c8426bc1c97904f183b431e2e98c29ef698 SHA512 3122faf7f88934c05bee6c6d5faa24998d27c35e11bf4f809af26d7b8ad0a26519715b7a29f303ba878e3e8897742486a0a86a123d00b9deb60246c8cac4e1a7 WHIRLPOOL 1b10d85d2d426457189143350b375c7a1723ff8067c37200cce15f18fa6d963b94fdd0339e91d01ed16b87e4338761e33c7afb022e50b3bbff8dbcc3a45f5b73
 DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
+EBUILD freebsd-libexec-9.1.9999.ebuild 1747 SHA256 058548a3fdfce70318afc999f4158ccaba61729e86e0dfe1f751d88711ab985a SHA512 4853268771992f651e2f445659a005ddb3d606ba7eef61c8bd334ac2d801a3e8209b81fefdb577fd7032035806c5a13c3b16ff7dcf975fa74e71b7b3c87d6795 WHIRLPOOL 294961dfb4261df654091a10cd520c0e9bc4e93a36cfcc04dd800c4b921d8a65dc84ae66204f6e46c773f7040007c21e1eef7e163535609502ce24d18b0ee7f1
 EBUILD freebsd-libexec-9.1_rc3.ebuild 1705 SHA256 a1a1ba949b0af66b71b2ce612a26f127c4bfe26e347ab130c03bf6c450b34d54 SHA512 a181641ef79ebdb277ede7119ddc2a6c601187aad49f1a4fb9b651631a8fe8fdfde6f696775f1d8374985015c80bf1328c34700e43ca2fe8bf1ff341fcf8fe3c WHIRLPOOL 37f8dd1a40828ca84a92c56f8cd6edc4fd32008f328af24e52ca4d078c62895348fe68f26db4ed19cdcd14f64cdaac793e7291e909d5abd05fba1d64abbe8409

diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.9999.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.9999.ebuild
new file mode 100644
index 0000000..170ffc5
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1.9999.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit bsdmk freebsd pam
+
+DESCRIPTION="FreeBSD libexec things"
+SLOT="0"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${UBIN}.tar.bz2
+		mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2"
+fi
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-sources-${RV}*"
+RDEPEND="${RDEPEND}
+	xinetd? ( sys-apps/xinetd )"
+
+S="${WORKDIR}/libexec"
+
+# Remove sendmail, tcp_wrapper and other useless stuff
+REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
+
+IUSE="pam ssl kerberos ipv6 nis xinetd"
+
+pkg_setup() {
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+
+	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
+}
+
+src_prepare() {
+	ln -s /usr/include "${WORKDIR}/include"
+}
+
+src_install() {
+	freebsd_src_install
+
+	insinto /etc
+	doins "${WORKDIR}/etc/gettytab"
+	newinitd "${FILESDIR}/bootpd.initd" bootpd
+	newconfd "${FILESDIR}/bootpd.confd" bootpd
+
+	if use xinetd; then
+		for rpcd in rstatd rusersd walld rquotad sprayd; do
+			insinto /etc/xinetd.d
+			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
+		done
+	fi
+}

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index a4252e1..52d20f8 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -3,4 +3,5 @@ AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee7
 AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
 AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
 DIST freebsd-share-9.1_rc3.tar.bz2 6737671 SHA256 2def8da87433c0f25b8bf32b62c31bd391c2a49a6b4986d81c8301e1be232cdc SHA512 4043cfc2b70eb26d0bc73c698aee7c2b223e813499a4afc7352a232e85cab32c248fc65066b942db11ce2b2108e9fbcd739a71245ebe4f841cbb71bd9f729848 WHIRLPOOL 3088efed7520de1b9727cecfa3819cca753b1ef76fa943753f93f0bacc83e17434b45479e6b831bac0819ee43dcde6982c94d8a9d7c147b7222b639b7d6a8aa2
+EBUILD freebsd-mk-defs-9.1.9999.ebuild 770 SHA256 c90f6bff8e828b4f032bda3e296eb6dde2ecae147144b54a918d5386a24ef8da SHA512 c55746a024097f0ef175132d8d1b192e4b588012b10025ed8601f5c64b99a04d4f7f24be064dd0605f03a12684b5ab1fc1df0a857dd88aadeec407f30f0fe6e1 WHIRLPOOL f355cf82c55846a5f230072ee9ec7c3e84c74d8753610d9717d32afe6b5144c20618ed751d1301bdc5209f385fe5d5f611a518f118364cf1eae6a10ec318e0ad
 EBUILD freebsd-mk-defs-9.1_rc3.ebuild 734 SHA256 b4775cb0a733151d16d90c43a3fdd9dc14ec661881319605e88ef92dde0320e2 SHA512 5310173ea2d0b620989a8d158e3a3ef30019fc1303147629d0303f3a7ff146b64aeee474ffc908a3e1956132131558dec8e49f34ffb52645ff7b35e9864c4a2f WHIRLPOOL a825f8f32be0a9efdaaf42b0dd1da6d1d9bbe348a14d0eda6a85a432b94489e3375455b23cb1a5e4dce0c21ede691fe60c61d9969f47d16affedc2ca65f3ba4e

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

diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index a3a5286..83b13d2 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,4 +1,5 @@
 AUX README.pamd 2965 SHA256 2d3cea2b59ddee2ca6639ca7d14068e1499acee4194181c255bdfea81964d5ac SHA512 e278fd0a5056ae8c1de2f6104bfb4766adc89c7c357a4b965cb08ee555a071b326462c937fd63cd8fc7bd7e2a880f939cecdf2997a3d2c33c1b962afee12d38e WHIRLPOOL 8ee79582595a2b79f3936863bd5fdb144930380a4073a74ec81967b3a11d61a40ca0becaf36dfa760c0c6110efa2041a4acd6041615e0d006f032e1d9c819aff
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7
 DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e
+EBUILD freebsd-pam-modules-9.1.9999.ebuild 1112 SHA256 bd5a410810945b907dfa87b85d3d5cd3251e2d7d9a61a4f6ca94fb7356054a23 SHA512 dde4a02fa66b6b340c44429253e580654819c06c1d910e620449e9d093f5f2342cdbc1eefcad8101211c67c10cf7a52f6fc8a831027ceaf0b41842f043d4e911 WHIRLPOOL 1404077f2d51bb5b34e8f6c7655d8f1926c79453506bf872913d1ed7b5aeab5992287c4077f0ea71f827bebec64b7932d56a7cdf4c18346da335c6bef2c02635
 EBUILD freebsd-pam-modules-9.1_rc3.ebuild 1076 SHA256 f0be3f955849315f9215e8b5abafdf9197f1c2f1c03525f55f63627f7843d789 SHA512 e7d09c5811542ec43c17740d09f11b5666be469f4f4bb0b49ff3229145c13d2cf95134f849a3bd17120266f184ae11269343f02e6d5ecbb22517598faaaa4f56 WHIRLPOOL cee3676110eb396393a7625033a3a6e27aee75989c3eda9362ab0e5e8605910092474b834ee4f4ba09fd04a3ca9a18488aed49900f0cf540feebde984d97d47f

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

diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index d8048a0..786e4bb 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -9,4 +9,5 @@ DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe18
 DIST freebsd-etc-9.1_rc3.tar.bz2 207784 SHA256 c6d6b208077ccff739484b2b473892ee1a650c52029beff2d2b435da6dd469b7 SHA512 15153dfefa59aea78b017b9af2295a6ad488c805080dd613c0955fc9797881a3636570074cfd4adf3f4d13119ab05ccec83107b0fc809fbb8b7dab6a7a2333b3 WHIRLPOOL 6234b73f300db3e9ed8f37124892333fe80d6b39e48d4ac101cce6219db7c2a13992af56d18caffcaef8501873b2703780bdb890472e8717e1ace294f0a2ecb3
 DIST freebsd-sbin-9.1_rc3.tar.bz2 1273367 SHA256 3e576899dfd64987e2dd3f7b6d31f9570e1ac32f809ebd3de066d037097eab68 SHA512 d43e4ec5b85b5f5cd07818bb4cb21a016145550c02bdbedaa9606984e6e88707daf1c93931f4d3ec8843029de296b2b9133032dd006e6d2ea09770068eecdd9e WHIRLPOOL d137fcae29d903aa91253476009a3e7a792f086dd1dc1795c1720c47dc4a63a382d1531ad012474b1c72c67981082a5e9749b5e8e4efce047e93164b1a48fae1
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
+EBUILD freebsd-pf-9.1.9999.ebuild 1690 SHA256 2068e5f98a8916593239802d8aa431439809b63343df7b4d501721c5b57a120d SHA512 c12a186f8332c625a6de970d2513a56f9d60910688255a23ac9c4b63872fcb8205f86f519f12bcdeba4a2bd69f0c85dbf25540caba9246b34d23819cd56df70e WHIRLPOOL 83fd5e6bf0e660a35a5d360bf9cfc135447a490947cee79ec572ad832c8ed53bac991c0b8bd148b3038acf883cf2018a8b38b60b046ba5264130060e5d7a46cc
 EBUILD freebsd-pf-9.1_rc3.ebuild 1651 SHA256 e467cc39cce0a95efd62856581970e2af9f825c2a42a8109ef7ac572b4e8897a SHA512 a35d03d9ab3c8d01823c5429df136cb70cc6fc25df8fb9228d1c2ef634bd7a11d9e74e7c3056084005fee4cef0ef874dfa4db6a93fd8c23cf00a62b358f4a85f WHIRLPOOL 7dacc0e59b1ca5a5b3aea9437cdc48b136351a85ca8dd9f98043d1a19cca67819fb3d17bceee38a9cfe34dee3898c2f1445a30f66b66a8ae30484d8d0ba90490

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

diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index eea8b15..deed50c 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -15,4 +15,5 @@ DIST freebsd-sbin-9.1_rc3.tar.bz2 1273367 SHA256 3e576899dfd64987e2dd3f7b6d31f95
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
 DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
+EBUILD freebsd-rescue-9.1.9999.ebuild 1839 SHA256 fb3746d88cef20876dd580eef5eff6f2177527319c611c3e365d64ff0685b6c2 SHA512 2b9c46abf56faca05b376226ebd4eb0cded97c4264e6323d9492fc653c8e5071f4216c80b817746c6d3d2f5761046a5aae8780c17806d6ab464910e8a141b96c WHIRLPOOL 0621ab03bc91fa60a55945ff4dbfc914b8ba805c881c34d0f04aafd0942f40816f6cb71438d13465138e0493621f29874a716e3f287576760a30e8ee825e9f95
 EBUILD freebsd-rescue-9.1_rc3.ebuild 1793 SHA256 b4d0d7366413b3e5ac7cf25718e9c3df86217a06d60fd3ce11ebe5994fe42467 SHA512 dce30ef8044e7ce0303044e87630d13bd5973c1b9739bedbbfc3d136231f986640d12b69f7581d187c846b32a682af8661e297df25845ddfc2cb893b03180599 WHIRLPOOL 16b4b4726d554fb77c3447053233b159ae97cdad417cc97c644acfba837dd29a27fbb8f8cf0a640d354d2b3c72f8d5de3de7c83f01a89d0c3a63a90af7816e2e

diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.9999.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.9999.ebuild
new file mode 100644
index 0000000..b915b3f
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.9999.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit bsdmk freebsd
+
+DESCRIPTION="FreeBSD's rescue binaries"
+SLOT="0"
+LICENSE="BSD zfs? ( CDDL )"
+
+IUSE="atm netware nis zfs"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
+			mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${LIB}.tar.bz2
+			mirror://gentoo/${BIN}.tar.bz2
+			mirror://gentoo/${SBIN}.tar.bz2
+			mirror://gentoo/${USBIN}.tar.bz2
+			mirror://gentoo/${GNU}.tar.bz2
+			mirror://gentoo/${SYS}.tar.bz2
+			mirror://gentoo/${LIBEXEC}.tar.bz2
+			mirror://gentoo/${RESCUE}.tar.bz2
+			zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
+fi
+
+RDEPEND=""
+DEPEND="sys-devel/flex
+	>=app-arch/libarchive-3.0.3[static-libs]
+	app-arch/xz-utils[static-libs]
+	sys-libs/ncurses[static-libs]
+	dev-libs/expat[static-libs]
+	app-arch/bzip2[static-libs]
+	dev-libs/libedit[static-libs]
+	dev-libs/libxml2:2[static-libs]
+	dev-libs/openssl[static-libs]
+	sys-libs/zlib[static-libs]
+	sys-libs/readline[static-libs]
+	virtual/pkgconfig
+	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
+	=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/rescue"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
+	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+}
+
+src_prepare() {
+	# As they are patches from ${WORKDIR} apply them by hand
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch
+	epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
+	epatch "${FILESDIR}/${PN}"-9.1-libcleverlink.patch
+	epatch "${FILESDIR}/${PN}"-9.1-bsdtar.patch
+	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
+}

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

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

diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index e65b7ca..e514edb 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -21,4 +21,5 @@ DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d740
 DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
 EBUILD freebsd-share-9.0.ebuild 2674 SHA256 81a4907bbdd18e07cc5f290607d1df5c98394eab6a0052b5aeb3be9a4bbf9aba SHA512 cd5f50ea116962529edaac265b79304e9c038d3f40d2dc5bb33a115aef7f2d3f5884eed97ee78c236a3ce902f82ec06271dda3e75621b752625f694c8ce3e4c5 WHIRLPOOL 40b3153281defac4c5aff4f99ceec70f7785bda5c6a4a60d13329f813ac3b68a2714e9a95238bdf5088226a20e12c3092f37218d183d846b0ee908367194670c
+EBUILD freebsd-share-9.1.9999.ebuild 2631 SHA256 62e75f2845129d7aa8b47b8d40757b40243b4720b24f362e3034326651ee6caa SHA512 c29cd0ca3e14f6fd352dd6009b6cf5cd324bc235f80fa35b61a7dd663a4ab46274372050415ff40a754c648f48d400f83a7c39841755f3b6b0719e82a28985ef WHIRLPOOL a202fdcdaa003ba77926f753de3448f5758831c6f700d2c785a4dd3c31998c093c908423a7cc9c608c0d90ab8a1220224a5f38935b6bed24c2872d31a081dbc4
 EBUILD freebsd-share-9.1_rc3.ebuild 2587 SHA256 e9b8a5c0594fa5bd938de90e360e87f657ab072e6c0fe04409ef560de7a3610b SHA512 8b36bac96375a95bdcce64a39b0bb3ee867f503fb4865ffd64bba935f3088de6d2c32dcd32e85427ca7addf00667bf0f023cbbe737a5a16072d5cf076cea9ab3 WHIRLPOOL 25886cb59b144a7b40fe349f64b259610a27b4ac56d27585f8adcc5a3a0e54eb961a4eef3aa166b9cf3252a72118b4b759bd24b5f015db2818d93a09b4540ecb

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

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 4aaf271..a658acc 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -13,4 +13,5 @@ AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee4
 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
 AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
 DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8
+EBUILD freebsd-sources-9.1.9999.ebuild 2938 SHA256 cfb9168fda2af171bc99a23c323ce0007144d2ce9ec29248e8e13c540be05a55 SHA512 49bacc39752aea82efddbc78eb5ab06b091af4d8628b7275b7ccad95489ae89e614e9c9723c71e2e3fbf1e6fc824127e7b86fbf01c5e643b9198a83dc58df29a WHIRLPOOL fb5fd6f8d4eceb1bac8e5db7284255b8ed46b61dbf630b14093ecc66fa100adbcee745127600b72e75ad8bbdef5d4f797ae587aa9cb312606361705ef932d143
 EBUILD freebsd-sources-9.1_rc3-r1.ebuild 2943 SHA256 82d263ff739c01df32ac29155cf8615784898e7d7135da4728ec89c2240c108e SHA512 45cb847a33037af639be9d104bff54d76eda9ff63730d0bf2878dd5498fe0ac6fb30fe9b5e01cc8c7ef0aded5df409cfabdb1c6f9b957aa4a7e54e9e2bd5d504 WHIRLPOOL 1fa1db59216e58d74c07a3ccbb68bcbd96adb5525799ebd257750ae818e598e5435c4a43d2d4a5d57418d5817380f1c46b970db63f29fa11418c4d9000a5e8b9

diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1.9999.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1.9999.ebuild
new file mode 100644
index 0000000..07bfcf5
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1.9999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+
+IUSE="symlink"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+	"${FILESDIR}/${PN}-9.1-gentoo.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-ntfs.patch"
+	"${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+	"${FILESDIR}/${PN}-7.1-includes.patch"
+	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
+	"${FILESDIR}/${PN}-9.1-MFC-r239588.patch"
+	"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
+
+src_unpack() {
+	freebsd_src_unpack
+
+	# This replaces the gentoover patch, it doesn't need reapply every time.
+	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+		"${S}/conf/newvers.sh"
+
+	# __FreeBSD_cc_version comes from FreeBSD's gcc.
+	# on 9.0-RELEASE it's 900001.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+	# Remove -Werror
+	sed -e "s:-Werror:-Wno-error:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die
+}
+
+src_compile() {
+	einfo "Nothing to compile.."
+}
+
+src_install() {
+	insinto "/usr/src/sys-${MY_PVR}"
+	doins -r "${S}/"*
+}
+
+pkg_postinst() {
+	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		# just in case...
+		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	elif use symlink; then
+		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't remove previous symlinks, please fix manually."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	fi
+
+	if use sparc-fbsd ; then
+		ewarn "WARNING: kldload currently causes kernel panics"
+		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+		ewarn "Please compile all modules you need into the kernel"
+	fi
+}

diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index cbd1894..1189e71 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -35,4 +35,5 @@ DIST freebsd-ubin-9.0.tar.bz2 1962957 SHA256 48fe71c69ecd2399f1f04068992e52b8cd3
 DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d74039db8829d8c8f58a7316e8e226b83a91a SHA512 5a661d897be918c09f242924870c2c45ee041cbf506ea5e9085a0c15f8c84c290bdc8df409960b3c98bd5435f1e7f6f726ed10c48898c75ba3c4d02c33b20137 WHIRLPOOL 41d16e0aba43cdf02e8e8442d1995e00d3c861a3f7f21c3727ad900a05805aa903bb71b2d62da2a5b8b962b81fd23905c2fee8bb4f178bdbb59ee348fd11321d
 EBUILD freebsd-ubin-9.0-r1.ebuild 4661 SHA256 c54ae99afb40565740357ed7cb86512d4f06225f42b1498f157bb7488760eebd SHA512 5bb79b20c2e4d07bed93e16e1fa59bb1c32dcf617041c65e7a63c8862f630cb3a5d26b9e22ef4289c59a1d777fbb5e883c7fbcf5aa4cd6b9473baed3e09a6ce5 WHIRLPOOL f3ffd3a2f5c338da65da979f4d4dd837174c7242d2659a07bf3b963a74f31d5fd269b705034e3f38be8b365dc74b279fc0d5571a2cc85e8125d0e04746668cb1
 EBUILD freebsd-ubin-9.0.ebuild 4665 SHA256 a118f88387da9bfdc4213e81858248cb483e0f0d0030bf51f46bd8791337aa65 SHA512 809bfebafe6aaae86f14ecf51e3cb7a60555fc870b56c735ae7e3691fd64d2a62038e69f857eb5ea764c8863f150c749b1e231b50b6091ab37db5396ad029e89 WHIRLPOOL 335603d714b033e7d29d3a13f3ea892cd0d28f2567f2be0fb3c3fcfc73070b1d396a2e636b315e122485d5da7f53bd647676f6bcf772504dad83e5262c5e9e32
+EBUILD freebsd-ubin-9.1.9999.ebuild 4780 SHA256 034ce577e1a4bb3de5d228873f73a7c601cc18c5955db6f4e67e20193dbbe153 SHA512 c7c2527ce989c957c09452e2f62bb2889e836964e7ef9d32d7ec4ba49d48bab0d47b8835fdd43ba2476a808bbc175b2ee2ef3cd4ee6782c3e39afe0c2a493630 WHIRLPOOL 939924341d531896372c383ae7cb1f50892e5d2bc80ceef3f7f73ca581b0fd011a34847ca5f8b6ad5f40b07ed810d9d5022c2813d9afa50290462c31c62c7c7b
 EBUILD freebsd-ubin-9.1_rc3.ebuild 4737 SHA256 b8a911adfb3b42b8082509995c905c519c6144af6f79d52a12a8b1b9ced0f569 SHA512 a472827752bb8a3035e7d909c8a6d9792738b4c961974d40cc422cc6fac6a14b33fb0e1c14650ee17a94f9afaf40f9768228ed3a3606374882b50054773be887 WHIRLPOOL 6202d945450f0805d50be41fe463ad8593344548d6b48762887d2a28f2ea755038ffac806c63e2c1b039c8543dd0bf254ee598604586242afa3b80ca8eccd66d

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

diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 74b76c9..588b5a2 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -38,4 +38,5 @@ DIST freebsd-ubin-9.1_rc3.tar.bz2 1910768 SHA256 ac997fa0b1b918991a6b5c8d601d740
 DIST freebsd-usbin-9.0.tar.bz2 2608252 SHA256 384ab18281aa1afb39a0f98bcef0fc734840fd294b22b7d405b0d3eee8f835ea SHA512 d0ce590ee6691ae160a8fb70ac68d8416a3fb2ae1181d98ad0e388d6236c10fcf72884190fb0b92730714e2326405e681ac8ad61628457b332d120256159ad7a WHIRLPOOL c676198222ac78eec774776ed720fb4eb39a000d44a694a33f32e89783f153ac42a2af8dc0b4f02570867b1aaeb83e8d5ad013dccdb90bde6f010af7fee6acda
 DIST freebsd-usbin-9.1_rc3.tar.bz2 2669370 SHA256 de606bb756c413e85a302bc91033952f1beb8066ef555db26d79943bf128aa74 SHA512 3a002d5b7cd98f1139a8bd949633434e8aec8352c3d49bca9c72b3744d60ea63a9fd5e651eedb3d439405bcfa197bfd05d5e658428e57b01e021ba1ab0304d7e WHIRLPOOL 43f066d202d053383f9f7d4b19dd06b22d9c19ad79f258905e5dc2dc9451c936c128b512d3e8cdf90c70f8a19230a536d7c119b2f45a234f04bb9dde2d87fc52
 EBUILD freebsd-usbin-9.0.ebuild 5174 SHA256 24728beb3b728588a922947b05d150f2ad531897c31258bf245e71b413d75800 SHA512 a3bd8b55df0d6d81199ac5712516f1e3b78e8a0e885ddfe454bea6bafc1476f05fa5d50f751ec5333bfaf32410bd2e78a55beb44c3b624ced70d884d1e4f4f7e WHIRLPOOL db2be971dc95d13010607492e72621636dc37af0c7ac2c4a8fe9f3760a91579c2bc4daee66735e9fd2dc416fef73e42a30fef4480752cc125b1092781a436b53
+EBUILD freebsd-usbin-9.1.9999.ebuild 5267 SHA256 fd40eee9296a426849fb624f6557e0f2f99c449c4b81d539f81df00306345066 SHA512 a3c15fcda886010d6ab2f9c8fe525911337cf351966686749a2630d8795d5578bf594da400f414a97bc29a9219a8b7285f0608260d0f10940b5d37cfd688e0c7 WHIRLPOOL 22216b0ee665f3439b4c645fc5775de28c43df6ceafc03c7ac928c4b899cbc6788efd5545f58cf33b7ae889a02bbf238034cde8912139a87f1eafd2ab310c22b
 EBUILD freebsd-usbin-9.1_rc3.ebuild 5222 SHA256 0f8831d95bb3c3df43d0aba3a70266d4062cfffdea5ca2a8fbe0316cf9e9c9d5 SHA512 7f2a614cfd6b0d695cd162d019eff4fbe90598309c57273f67b33752c2436d3ec0b4d7c517a16a0bf3e1701e9c25ee246d5dac9de5b6f7fc174b2c61a43fc47c WHIRLPOOL f5fc3bc054b04cc3faffa8d533e04103da924b85a71b4fe2db3920918dcca0af43c3583cff6e19f009a65a2244b9f1ea8376bbb3e48bf8fb76ce6ba2e9e74613

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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-lib/, ...
@ 2013-08-13 13:06 Yuta SATOH
  0 siblings, 0 replies; 3+ messages in thread
From: Yuta SATOH @ 2013-08-13 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     dd7038cbf7b53c86d7f2271eefdbf385e702d918
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Aug 13 11:05:04 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Aug 13 11:05:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=dd7038cb

sys-freebsd/*-9.9999: sync to 9.2_rc1 ebuild.

---
 sys-freebsd/boot0/Manifest                         |   1 -
 sys-freebsd/freebsd-bin/Manifest                   |   1 -
 sys-freebsd/freebsd-cddl/Manifest                  |   4 +-
 .../files/freebsd-cddl-9.2-underlink.patch         |  24 ++++
 .../freebsd-cddl/freebsd-cddl-9.9999.ebuild        |  10 +-
 sys-freebsd/freebsd-contrib/Manifest               |   3 +-
 .../freebsd-contrib/freebsd-contrib-9.9999.ebuild  |  14 ---
 sys-freebsd/freebsd-lib/Manifest                   |   6 +-
 .../freebsd-lib/files/freebsd-lib-9.2-flex.patch   |  13 ---
 .../files/freebsd-lib-9.2-liblink.patch            |  55 +++++++++
 .../files/freebsd-lib-9.2-telnet.h.patch           |  20 ----
 sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild  | 127 +++++++++------------
 sys-freebsd/freebsd-libexec/Manifest               |   3 +-
 .../freebsd-libexec/freebsd-libexec-9.9999.ebuild  |  16 +--
 sys-freebsd/freebsd-mk-defs/Manifest               |   1 -
 sys-freebsd/freebsd-pam-modules/Manifest           |   1 -
 sys-freebsd/freebsd-pf/Manifest                    |   3 +-
 sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild    |   2 +-
 sys-freebsd/freebsd-rescue/Manifest                |   4 +-
 ...sd-rescue-9.2-pkgconfig_static_libarchive.patch |  12 --
 .../freebsd-rescue/freebsd-rescue-9.9999.ebuild    |  18 +--
 sys-freebsd/freebsd-sbin/Manifest                  |   3 +-
 .../freebsd-sbin/freebsd-sbin-9.9999.ebuild        |   2 +-
 sys-freebsd/freebsd-share/Manifest                 |   3 +-
 .../freebsd-share/freebsd-share-9.9999.ebuild      |   2 +-
 sys-freebsd/freebsd-sources/Manifest               |   4 +-
 .../files/freebsd-sources-9.2-no_ctf.patch         |  28 -----
 .../freebsd-sources/freebsd-sources-9.9999.ebuild  |  67 +++++++----
 sys-freebsd/freebsd-ubin/Manifest                  |   3 +-
 .../freebsd-ubin/freebsd-ubin-9.9999.ebuild        |  19 ++-
 sys-freebsd/freebsd-usbin/Manifest                 |   3 +-
 .../freebsd-usbin/freebsd-usbin-9.9999.ebuild      |  10 +-
 32 files changed, 227 insertions(+), 255 deletions(-)

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 9767a59..451d622 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,3 +1,2 @@
 AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
-EBUILD boot0-9.2.9999_p253912.ebuild 1500 SHA256 64f4fadc14e2d87dd9506d95c8ae7dc8838013d2ad5d6d7d1828cbe234f52cc8 SHA512 7bbd96e3c793ac869d8c266a1cb9c4e6faa08c5ad6921318ea6f16ab6f67dffc8ef114d76b4b094ad6ed069163f63c31a3dc856698cf305a14c920002e1c7773 WHIRLPOOL 3cf114b3940fb2780400eb86d9bdf5f46b1370e132dd402de1564e7eab8550f54ef1223c786db7312483faa157510730230567add84219f57d141c215e8812e6
 EBUILD boot0-9.9999.ebuild 1500 SHA256 64f4fadc14e2d87dd9506d95c8ae7dc8838013d2ad5d6d7d1828cbe234f52cc8 SHA512 7bbd96e3c793ac869d8c266a1cb9c4e6faa08c5ad6921318ea6f16ab6f67dffc8ef114d76b4b094ad6ed069163f63c31a3dc856698cf305a14c920002e1c7773 WHIRLPOOL 3cf114b3940fb2780400eb86d9bdf5f46b1370e132dd402de1564e7eab8550f54ef1223c786db7312483faa157510730230567add84219f57d141c215e8812e6

diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index a12b3cf..3f48ba4 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -1,2 +1 @@
-EBUILD freebsd-bin-9.2.9999_p253912.ebuild 879 SHA256 a3bc995ee0a9ca06d56e68a9096912065956a4974b18a8e04b19cc0ca17dacef SHA512 9ccb036fa7d24557007eb855cbbc073da30abb5a9d2cfda384ad2afd9e12a6afd17d2693830ab469406c799a9685988f0bdb695a9b985770075dbe5c3e216e43 WHIRLPOOL 51f96789f4445cfaa15980cd9d12750b7d84264ca171e5af1a0a8825d380af8a7fa84b78efa814caedcd19856f00509711d002fac150c14b0cd28f8714ff91d8
 EBUILD freebsd-bin-9.9999.ebuild 879 SHA256 a3bc995ee0a9ca06d56e68a9096912065956a4974b18a8e04b19cc0ca17dacef SHA512 9ccb036fa7d24557007eb855cbbc073da30abb5a9d2cfda384ad2afd9e12a6afd17d2693830ab469406c799a9685988f0bdb695a9b985770075dbe5c3e216e43 WHIRLPOOL 51f96789f4445cfaa15980cd9d12750b7d84264ca171e5af1a0a8825d380af8a7fa84b78efa814caedcd19856f00509711d002fac150c14b0cd28f8714ff91d8

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 2c8924a..1c9a102 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -2,7 +2,7 @@ AUX freebsd-cddl-9.0-bsdxml.patch 1419 SHA256 0a5c5f5b242e17d0a378778ec39ff43d41
 AUX freebsd-cddl-9.0-libpaths.patch 7621 SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278 WHIRLPOOL 1f6798ac319bba9dedb0a0776e09cbce01637e057e38f77d59410c942f68c7051b7ccc10bfed748b72eeabf9254bc52262b5c9cc3fa3a4187f8698ede2d27d4f
 AUX freebsd-cddl-9.0-underlink.patch 755 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9 WHIRLPOOL c6403e8e56f2c2e9d67387137eab77eae0f6e1a8c4c4d595c1950ee3ab3bff8d0d8a0f15ca83a7b65aa05d35dafa86ff75ff8fec7ce8f320a2e1d44be38c0995
 AUX freebsd-cddl-9.2-libpaths.patch 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643
+AUX freebsd-cddl-9.2-underlink.patch 924 SHA256 d60e1ce05468ed95b9179c819693f0eb3bbbf89e79fc2d1622d81858aa84bf2d SHA512 aca1093f050463d9fa3feefda73c1e150f5fff79d44079aa10d14ab972dfedcb0fec27e931972e5f518716b4bdcff0c05b66d134fffe57ee546c4e5cdc53bcea WHIRLPOOL 2257ceb51964183694dae2c561c658266f436396d3788dd76963216ce7a06dff6b6b4aa2b02508a9e2c4dc943cf580d8002947ec493dc15e97029dfbe540b22d
 AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
 AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
-EBUILD freebsd-cddl-9.2.9999_p253912.ebuild 1453 SHA256 7df02d86f5c25e34a973a10dd38767822f2f926d167050ee8adc7c325e3defb1 SHA512 17bab0702255841f961c9639ad6a33e5d538b2309b86344b65e7d59421ad599bcb89f49c18742c45f527a692bdf01f738c1e2d39ffb595df3bbaff3e4e8743ed WHIRLPOOL f557b2cb24baf4e8c4b3996abf0eb9f22b5ee86691bc5519f7181a4fe12880bff1434b4b7c71832e580d93bb18da8443d702b53f97c02a56d3de27cab8ce43b3
-EBUILD freebsd-cddl-9.9999.ebuild 1453 SHA256 7df02d86f5c25e34a973a10dd38767822f2f926d167050ee8adc7c325e3defb1 SHA512 17bab0702255841f961c9639ad6a33e5d538b2309b86344b65e7d59421ad599bcb89f49c18742c45f527a692bdf01f738c1e2d39ffb595df3bbaff3e4e8743ed WHIRLPOOL f557b2cb24baf4e8c4b3996abf0eb9f22b5ee86691bc5519f7181a4fe12880bff1434b4b7c71832e580d93bb18da8443d702b53f97c02a56d3de27cab8ce43b3
+EBUILD freebsd-cddl-9.9999.ebuild 1488 SHA256 492cdc15fef9e873347cd200c0394b0ffe0826f2074b014f34f372982bb368b7 SHA512 19d4ace1b3b755a2b283498fe1f2264e757cd67611dc0f8fc847e9175aaa5152ed6cf0ac27a8e1abaa26c2d7a1ea42b386d240356b88f3ec8d03831b13bf1abe WHIRLPOOL 6aa2289d3176b5e185f3fc262edc18820c0ca8ee2d1dc703c9ee5847414b6457c8c4a1ee560e4793dd8aa492054ba39e540c5c3fb38b94d03c7bccb4e8c75fa1

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

diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
index 5749239..d4f39df 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
@@ -27,8 +27,7 @@ fi
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	dev-libs/libelf"
+	build? ( sys-apps/baselayout )"
 
 DEPEND="${RDEPEND}
 	=sys-freebsd/freebsd-mk-defs-${RV}*
@@ -36,7 +35,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/cddl"
 
-PATCHES=( "${FILESDIR}/${PN}-9.2-libpaths.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-9.2-libpaths.patch"
+	"${FILESDIR}/${PN}-9.2-underlink.patch"
+	)
 
 src_unpack() {
 	freebsd_src_unpack
@@ -49,7 +51,7 @@ src_install() {
 	local mylibdir=$(get_libdir)
 	mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
 
-	gen_usr_ldscript -a avl nvpair umem uutil zfs zpool
+	gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
 
 	# Install zfs volinit script.
 	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol

diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index cfa58c1..8eca430 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -1,2 +1 @@
-EBUILD freebsd-contrib-9.2.9999_p253912.ebuild 1517 SHA256 5338b302969099791c602105c35693172654022b46f7a042ca48eb5b2aafcdf3 SHA512 2c2c29445b8f997a32886baa25ef568295671855a64bab9c28b56821364b343fa5244ac91ae52394fa3147c0488a917420b596c5a8582ddbf3b4aca670280c84 WHIRLPOOL b86193209b9e2f2a9b3f5299c5e85c24fb287c954fd8692ff25adf6cab9838cb49b3f838ef1b6913297766169bac59867ac4773bd8b1e6bd7fecf257412e60d0
-EBUILD freebsd-contrib-9.9999.ebuild 1517 SHA256 5338b302969099791c602105c35693172654022b46f7a042ca48eb5b2aafcdf3 SHA512 2c2c29445b8f997a32886baa25ef568295671855a64bab9c28b56821364b343fa5244ac91ae52394fa3147c0488a917420b596c5a8582ddbf3b4aca670280c84 WHIRLPOOL b86193209b9e2f2a9b3f5299c5e85c24fb287c954fd8692ff25adf6cab9838cb49b3f838ef1b6913297766169bac59867ac4773bd8b1e6bd7fecf257412e60d0
+EBUILD freebsd-contrib-9.9999.ebuild 1092 SHA256 90a4e905a49f318d4be556e9671d6e535d941acfd116b9dfdedab16cd9cdef6b SHA512 d3b5e836fc4ec43938480256f011f74b44ee55f995ef0ebfd10be5c67c81b2bea365c1a1a8899cca387b19c4c847a80f5877200d41c02dc7274a4f4d386d57c7 WHIRLPOOL 358b2e4fcffee717801135da32e48bd58595a439b78de69739b7c696e46bc207a52e998a7f34cbedd41297bdc33f80ba3ff0100deaa0d8cb1133d8ea28685346

diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild
index 1870e92..aefd6e2 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild
@@ -20,20 +20,6 @@ DEPEND="=sys-freebsd/freebsd-sources-${RV}*
 
 S="${WORKDIR}/gnu"
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		freebsd_src_unpack
-	else
-		echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
-		tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libodialog gnu/usr.bin/sort gnu/usr.bin/patch
-		echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
-		tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
-
-		freebsd_do_patches
-		freebsd_rename_libraries
-	fi
-}
-
 src_compile() {
 	cd "${S}/lib/libodialog"
 	freebsd_src_compile

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index fac2a73..492ca19 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -12,13 +12,11 @@ AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f
 AUX freebsd-lib-9.0-trylock-adaptive.patch 439 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612 SHA512 ceeeea302294db5a25b5534685dce563778572010f0072ecb300a66550ee8cc241e0ae5523e32fd5424560e82d913c37aefe06c2a6725e951ba4ad5df73a1a68 WHIRLPOOL d2a65eab4b03a7fb65e2dd6f03c2e60fe1248412e28a0829757e6cb733d1f487ee79959680f1db8af20fc409a165c5f4aea3038171e7b82aee7d38c29552531e
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
-AUX freebsd-lib-9.2-flex.patch 397 SHA256 0beba174e1946bf9a5e703443acd33eb95c9df12d33515cd734746dd13b9fb38 SHA512 9fe3854e35ee8ce11f8a150297eb2e1e7d1d0de9a809023aa6d86e12110124bca01ee0040df91e4af5f0bc671d9570719687044bceaf25633fe4771801f54112 WHIRLPOOL 2a628aa4c5ecd90e6706da1ecb290925bba088ba1f865f8c3de51cce3955d5826681481a0a5bb1bc270f64dd00a085e0dba530ae9cd6bb77df292ddb24b8dc8d
-AUX freebsd-lib-9.2-telnet.h.patch 497 SHA256 46e9ef90213e61e0dc31897a89d5103cce76ac7dbc51888a38fb144f94a35af8 SHA512 537df980f8675d72ed8ad872f382bf9c7bc1bbe3efe5e3d8e5e175feb45ed40dbc115d6b11983fa66abdd33e3c7fefa31c2f736db82ef1d2c81dc0a633e8855a WHIRLPOOL bb9353449455eb93ee4ac0584732110913daefe9c56d1372aaad6c5a3f9ba65f32fef236f1d1491982a21541f0ff7ebaf9dde6e7d36f269938206133a992939d
+AUX freebsd-lib-9.2-liblink.patch 1420 SHA256 c8fa4315a89d3acc378c89ecd778a43ab5b4824783ef19af1082732f6b2dc3a4 SHA512 88e564e13399c88eb238a10bea1a4959c62a6af6d3c9c41c331878e0c6a1680767ebdb58f555a9f1145a2c47cdfc65e3f98387947f1941327b800cb18983cda4 WHIRLPOOL b6f2654138e9e46b0fe193b1488150e4f84c5f1b14ab1a8f21348a4158570f99499e94c54acaf8244fc1d2cc0775a40c77585b88387cf2a73ed33062335c5255
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
 AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
 AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
 AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
 AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
-EBUILD freebsd-lib-9.2.9999_p253912.ebuild 18897 SHA256 2526acec475fee972719ea4a376b0a7e59ff213def64a8b4b7ac14f7187e5936 SHA512 c9c8d0f131ba3dfdad698a394525d5d9a15750db483a56c8f81f7af0de9efc6cfe9e53f9cf9582424494d8b20badf1e3a28cccd5c9ed35eb9b8ed5ae6aa23fb1 WHIRLPOOL 95afafdfe9643eb4705adc5ab4554903366e94245d32f953d54d734af92f3fcaf715706fb880aabbca4a55403cc7d6e860908fe48be3e6d5787a223ce6844252
-EBUILD freebsd-lib-9.9999.ebuild 18897 SHA256 2526acec475fee972719ea4a376b0a7e59ff213def64a8b4b7ac14f7187e5936 SHA512 c9c8d0f131ba3dfdad698a394525d5d9a15750db483a56c8f81f7af0de9efc6cfe9e53f9cf9582424494d8b20badf1e3a28cccd5c9ed35eb9b8ed5ae6aa23fb1 WHIRLPOOL 95afafdfe9643eb4705adc5ab4554903366e94245d32f953d54d734af92f3fcaf715706fb880aabbca4a55403cc7d6e860908fe48be3e6d5787a223ce6844252
+EBUILD freebsd-lib-9.9999.ebuild 18159 SHA256 ddd0673a0389e96389294951bcf847304f02dbdc62539f0b8f1636f3d83381f5 SHA512 5b6366c03d8b5e0053f518d72005844a276b45a871d9373d9e258684ad2aec1e37f094abc11461735d11c57714fd441c30c0e29f528e6c73e4f147c13d6659f9 WHIRLPOOL 388a625048570de077df71edd2ef6ac434c04fa39be01c7660c189e44d841790ea364d8f9e8bacd2600665208b485fe188a5bf5f83d7051b793e79805d8e567c

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-flex.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-flex.patch
deleted file mode 100644
index eb4d066..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-flex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l
-index 219cce4..a5d3c03 100644
---- a/lib/libipsec/policy_token.l
-+++ b/lib/libipsec/policy_token.l
-@@ -139,8 +139,6 @@ void
- __policy__strbuffer__init__(msg)
- 	char *msg;
- {
--	if (YY_CURRENT_BUFFER)
--		yy_delete_buffer(YY_CURRENT_BUFFER);
- 	strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
- 	yy_switch_to_buffer(strbuffer);
- 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
new file mode 100644
index 0000000..cfc7181
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
@@ -0,0 +1,55 @@
+diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
+index 87ce8d4..77d0535 100644
+--- a/lib/libdwarf/Makefile
++++ b/lib/libdwarf/Makefile
+@@ -21,6 +21,7 @@ SRCS=	\
+ INCS=	dwarf.h libdwarf.h
+ 
+ CFLAGS+=	-I${.CURDIR}
++CFLAGS+=	-I${.CURDIR}/../libelf
+ 
+ SHLIB_MAJOR=	3
+ 
+diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
+index e20e00a..77d46d7 100644
+--- a/lib/libproc/Makefile
++++ b/lib/libproc/Makefile
+@@ -12,9 +12,13 @@ SRCS=	proc_bkpt.c		\
+ INCS=	libproc.h
+ 
+ CFLAGS+=	-I${.CURDIR}
++CFLAGS+=	-I${.CURDIR}/../libelf
+ 
+ SHLIB_MAJOR=	2
+ 
+ WITHOUT_MAN=
+ 
++LDADD+=		-lelf
++LDFLAGS+=	-L${.OBJDIR}/../libelf
++
+ .include <bsd.lib.mk>
+diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
+index 783fb8b..62e7c60 100644
+--- a/lib/librtld_db/Makefile
++++ b/lib/librtld_db/Makefile
+@@ -10,5 +10,8 @@ SRCS=		rtld_db.c
+ INCS=		rtld_db.h
+ 
+ CFLAGS+= -I${.CURDIR}
++CFLAGS+= -I${.CURDIR}/../libelf
++LDADD+= -lutil -lproc
++LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
+ 
+ .include <bsd.lib.mk>
+diff -uNr lib.old/libprocstat/Makefile lib/libprocstat/Makefile
+--- a/lib/libprocstat/Makefile	2013-08-11 16:00:47.000000000 -0400
++++ b/lib/libprocstat/Makefile	2013-08-11 16:18:19.000000000 -0400
+@@ -17,6 +17,8 @@
+ SYMBOL_MAPS=	${.CURDIR}/Symbol.map
+ 
+ INCS=		libprocstat.h
++CFLAGS+=	-I${.CURDIR}/../libelf
++LDFLAGS+=       -L${.OBJDIR}/../libelf
+ CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
+ SHLIB_MAJOR=	1
+ 

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-telnet.h.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-telnet.h.patch
deleted file mode 100644
index 7a08f13..0000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-telnet.h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-freebsd-{rescue,usbin}-9.9999 needs /usr/include/arpa/telnet.h
-
-diff --git a/include/arpa/Makefile b/include/arpa/Makefile
-index 8a7f63d..a480b31 100644
---- a/include/arpa/Makefile
-+++ b/include/arpa/Makefile
-@@ -1,12 +1,7 @@
- # $FreeBSD$
- 
--.include <bsd.own.mk>
--
- NO_OBJ=
--INCS=	ftp.h inet.h nameser.h nameser_compat.h tftp.h
--.if ${MK_TELNET} == "no"
--INCS+=	telnet.h
--.endif
-+INCS=	ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
- INCSDIR=${INCLUDEDIR}/arpa
- 
- .include <bsd.prog.mk>

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
index f9f33aa..49c05d0 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild
+inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
 
 DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
@@ -22,10 +22,8 @@ if [[ ${PV} != *9999* ]]; then
 			mirror://gentoo/${INCLUDE}.tar.bz2
 			mirror://gentoo/${USBIN}.tar.bz2
 			mirror://gentoo/${GNU}.tar.bz2
-			build? (
-				mirror://gentoo/${SYS}.tar.bz2 )
-			zfs? (
-				mirror://gentoo/${CDDL}.tar.bz2 )"
+			build? ( mirror://gentoo/${SYS}.tar.bz2 )
+			zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
 fi
 
 if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
@@ -36,6 +34,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
 		>=dev-libs/expat-2.0.1
 		!sys-libs/libutempter
+		!dev-libs/libelf
 		!sys-freebsd/freebsd-headers"
 	DEPEND="${RDEPEND}
 		>=sys-devel/flex-2.5.31-r2
@@ -58,7 +57,7 @@ fi
 
 IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
 	build crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD multilib"
+	userland_GNU userland_BSD"
 
 pkg_setup() {
 	[ -c /dev/zero ] || \
@@ -78,7 +77,7 @@ pkg_setup() {
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
 
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS="
+	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= "
 
 	if [ "${CTARGET}" != "${CHOST}" ]; then
 		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
@@ -89,12 +88,12 @@ pkg_setup() {
 PATCHES=(
 	"${FILESDIR}/${PN}-6.0-pmc.patch"
 	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-9.0-liblink.patch"
-	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
+	"${FILESDIR}/${PN}-9.2-liblink.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.patch"
 	"${FILESDIR}/${PN}-9.0-netware.patch"
+	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
 	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
-	"${FILESDIR}/${PN}-9.2-flex.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
+	)
 
 # Here we disable and remove source which we don't need or want
 # In order:
@@ -108,27 +107,17 @@ PATCHES=(
 #
 # The rest are libraries we already have somewhere else because
 # they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
 REMOVE_SUBDIRS="ncurses \
 	libexpat \
 	libz libbz2 libarchive liblzma \
 	libsm libsmdb libsmutil \
 	libbegemot libbsnmp \
 	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libelf libedit
+	libcom_err
+	libedit
 	libstand
 	libgssapi"
 
-# For doing multilib over multibuild.eclass
-if use multilib ; then
-	MULTIBUILD_VARIANTS=( $(get_all_abis) )
-else
-	MULTIBUILD_VARIANTS=${DEFAULT_ABI}
-fi
-
 # Are we building a cross-compiler?
 is_crosscompile() {
 	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
@@ -158,7 +147,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
 	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
 	epatch "${FILESDIR}/${PN}-9.1-rmgssapi.patch"
-	epatch "${FILESDIR}/${PN}-9.2-telnet.h.patch"
 
 	# Don't install the hesiod man page or header
 	rm "${WORKDIR}"/include/hesiod.h || die
@@ -186,7 +174,7 @@ src_prepare() {
 	fi
 
 	if ! is_crosscompile ; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+		ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
 	else
 		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
 			"${S}/libc/rpc/Makefile.inc" \
@@ -205,6 +193,14 @@ src_prepare() {
 	fi
 }
 
+bootstrap_lib() {
+	for i ; do
+		cd "${WORKDIR}/${i}" || die "missing ${i}"
+		freebsd_src_compile
+		append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
+	done
+}
+
 get_csudir() {
 	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
 		echo "lib/csu/$1-elf"
@@ -216,14 +212,13 @@ get_csudir() {
 bootstrap_csu() {
 	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
 	export RAW_LDFLAGS=$(raw-ldflags)
-	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
-	freebsd_src_compile
+	bootstrap_lib "${csudir}"
 
 	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
 	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
 
-	cd "${WORKDIR}/gnu/lib/csu" || die
-	freebsd_src_compile
+	bootstrap_lib "gnu/lib/csu"
+
 	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
 	for i in *.So ; do
 		ln -s $i ${i%.So}S.o
@@ -234,36 +229,20 @@ bootstrap_csu() {
 
 # Compile libssp_nonshared.a and add it's path to LDFLAGS.
 bootstrap_libssp_nonshared() {
-	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+	bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
 	export LDADD="-lssp_nonshared"
 }
 
-bootstrap_libc() {
-	cd "${WORKDIR}/lib/libc" || die
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc"
-}
-
 bootstrap_libgcc() {
-	cd "${WORKDIR}/lib/libcompiler_rt" || die
-	freebsd_src_compile
+	bootstrap_lib "lib/libcompiler_rt"
 	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
 	ln -s libcompiler_rt.a libgcc.a || die
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt"
-
-	bootstrap_libc
 
-	cd "${WORKDIR}/gnu/lib/libgcc" || die
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libgcc"
+	bootstrap_lib "lib/libc" "gnu/lib/libgcc"
 }
 
 bootstrap_libthr() {
-	cd "${WORKDIR}/lib/libthr" || die
-	freebsd_src_compile
-	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr"
+	bootstrap_lib "lib/libthr"
 	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
 	ln -s libthr.so libpthread.so
 }
@@ -273,7 +252,7 @@ bootstrap_libthr() {
 CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
 
 # What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt"
+NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf"
 
 # Subdirs for a native build:
 NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
@@ -281,13 +260,12 @@ NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu
 # Is my $ABI native ?
 is_native_abi() {
 	is_crosscompile && return 1
-	use multilib || return 0
-	[ "${ABI}" = "${DEFAULT_ABI}" ]
+	multilib_is_native_abi
 }
 
 # Do we need to bootstrap the csu and libssp_nonshared?
 need_bootstrap() {
-	is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' ; } || has_version "<${CATEGORY}/${P}" || [[ ${PV} == *9999* ]]
+	is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}"
 }
 
 # Get the subdirs we are building.
@@ -326,9 +304,10 @@ do_bootstrap() {
 	fi
 	bootstrap_csu
 	bootstrap_libssp_nonshared
-	is_crosscompile && bootstrap_libc
+	is_crosscompile && bootstrap_lib "lib/libc"
 	is_crosscompile || is_native_abi || bootstrap_libgcc
 	is_native_abi   || bootstrap_libthr
+	is_native_abi   || bootstrap_lib "lib/libsbuf"
 }
 
 # Compile it. Assume we have the toolchain setup correctly.
@@ -359,12 +338,7 @@ src_compile() {
 		unalias sed
 	fi
 
-	# Support for upgrade from a previous version.
-	# If install command does not support -l option, this is necessary.
-	if is_crosscompile || has_version '<sys-freebsd/freebsd-ubin-9.2_beta1' ; then
-		export INSTALL_LINK="ln -f"
-		export INSTALL_SYMLINK="ln -fs"
-	fi
+	use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
 
 	cd "${WORKDIR}/include"
 	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
@@ -392,6 +366,7 @@ src_compile() {
 	if is_crosscompile ; then
 		do_compile
 	else
+		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
 		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
 	fi
 }
@@ -504,7 +479,7 @@ do_install() {
 	done
 
 	if ! is_crosscompile ; then
-		if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		if ! multilib_is_native_abi ; then
 			gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
 		else
 			dodir "$(get_libdir)"
@@ -512,14 +487,28 @@ do_install() {
 		fi
 	else
 		CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
+		# We're done for the cross libc here.
+		return 0
+	fi
+
+	# Install a libusb.pc for better compat with Linux's libusb
+	if use usb ; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die
 	fi
 
-	if use multilib ; then
+	# Generate ldscripts for core libraries that will go in /
+	multilib_is_native_abi && \
+		gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
+			kvm m md procstat sbuf thr ufs util elf
+
+	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
 		cd "${D}/usr/include"
 		for i in machine/*.h fenv.h ; do
 			move_header ${i}
 		done
-		if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
+		if multilib_is_native_abi ; then
 			# Supposedly the last one!
 			local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
 			for j in ${uniq_headers} ; do
@@ -555,6 +544,7 @@ src_install() {
 		return 0
 	else
 		export STRIP_MASK="*/usr/lib*/*crt*.o"
+		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
 		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
 	fi
 
@@ -565,17 +555,6 @@ src_install() {
 	# Install ttys file
 	local MACHINE="$(tc-arch-kernel)"
 	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts for core libraries that will go in /
-	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-		kvm m md procstat sbuf thr ufs util
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb-1.0.pc" || die
-	fi
 }
 
 install_includes()

diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index d44fcad..37089d1 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -5,5 +5,4 @@ AUX rstatd.xinetd 218 SHA256 7bf526babdd46f03a6ea9ed12b5df16e5c2abc8aeb567214c8e
 AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e99181408067a49cd3 SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd WHIRLPOOL 7517089e5ab5b3925b46908c22a929cb04c8390387ad075f17c2fa0213ab38cae833d9280cfe289915afe4c2ee0b3e0299cee42daa871c23507f5f96cc22f227
 AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f
 AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802
-EBUILD freebsd-libexec-9.2.9999_p253912.ebuild 2348 SHA256 993320130ecf3028644e4c3332a6a352e3e64b2e23f5f79f4a5b882bc32a3264 SHA512 7302b4f1b328d6af43db6f4f44d1bb5d20e3ed7c9ba80487cbabe3789a5403b442c6ca36880947fc53607f20fbaaa977e0f4d5fcc03b8a1586a9422315ea62bc WHIRLPOOL d779dbde3a4a079695e40ef4c3ca97b7d35508812b81e4eec2643e06328ab60e631032ee1f3b23f1af0a4148127173166119104b12cc3bb75396dc74e641d66b
-EBUILD freebsd-libexec-9.9999.ebuild 2348 SHA256 993320130ecf3028644e4c3332a6a352e3e64b2e23f5f79f4a5b882bc32a3264 SHA512 7302b4f1b328d6af43db6f4f44d1bb5d20e3ed7c9ba80487cbabe3789a5403b442c6ca36880947fc53607f20fbaaa977e0f4d5fcc03b8a1586a9422315ea62bc WHIRLPOOL d779dbde3a4a079695e40ef4c3ca97b7d35508812b81e4eec2643e06328ab60e631032ee1f3b23f1af0a4148127173166119104b12cc3bb75396dc74e641d66b
+EBUILD freebsd-libexec-9.9999.ebuild 2351 SHA256 5770dc78de146e03ea34f20cd2cc3c4135dfb4c0398048689e0488dec8d50741 SHA512 69e3729cdc4862c471308f015a7f08868112de149f86305b345cc268ed28c97a4e15a3c76926eb6850a82be81cd4f41c98becd6bbef2416b04337598e68073ec WHIRLPOOL 430cdb560171d20fe69d747484fb79c718abc5943a1c139a6c8cee9cf9766394d74cf05c55a52222c127521f30cfbc8f5192ddaa6c847feaea9def77b08576f9

diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild
index b661e78..a9bd36b 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit bsdmk freebsd pam multilib multibuild
+inherit bsdmk freebsd pam multilib multibuild multilib-build
 
 DESCRIPTION="FreeBSD libexec things"
 SLOT="0"
@@ -21,7 +21,7 @@ if [[ ${PV} != *9999* ]]; then
 fi
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=sys-freebsd/freebsd-lib-9.1-r6[multilib?]
+	>=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	=sys-freebsd/freebsd-mk-defs-${RV}*
@@ -34,13 +34,7 @@ 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 multilib nis xinetd"
-
-if use multilib ; then
-	MULTIBUILD_VARIANTS=( $(get_all_abis) )
-else
-	MULTIBUILD_VARIANTS=${DEFAULT_ABI}
-fi
+IUSE="pam ssl kerberos ipv6 nis xinetd"
 
 pkg_setup() {
 	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
@@ -57,7 +51,7 @@ src_prepare() {
 }
 
 setup_multilib_vars() {
-	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+	if ! multilib_is_native_abi ; then
 		cd "${WORKDIR}/libexec/rtld-elf" || die
 		export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
 	else
@@ -67,10 +61,12 @@ setup_multilib_vars() {
 }
 
 src_compile() {
+	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
 	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
 }
 
 src_install() {
+	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
 	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
 
 	insinto /etc

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index fb816a1..ca00220 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -4,5 +4,4 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f
 AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
 AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
 AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362
-EBUILD freebsd-mk-defs-9.2.9999_p253912.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3
 EBUILD freebsd-mk-defs-9.9999.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3

diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 50b21ee..ff0269a 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,4 +1,3 @@
 AUX README.pamd 2965 SHA256 2d3cea2b59ddee2ca6639ca7d14068e1499acee4194181c255bdfea81964d5ac SHA512 e278fd0a5056ae8c1de2f6104bfb4766adc89c7c357a4b965cb08ee555a071b326462c937fd63cd8fc7bd7e2a880f939cecdf2997a3d2c33c1b962afee12d38e WHIRLPOOL 8ee79582595a2b79f3936863bd5fdb144930380a4073a74ec81967b3a11d61a40ca0becaf36dfa760c0c6110efa2041a4acd6041615e0d006f032e1d9c819aff
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7
-EBUILD freebsd-pam-modules-9.2.9999_p253912.ebuild 1121 SHA256 342ee8740aeff932961270c4ac571da1cc80c687ad894907b828cbd16317df97 SHA512 d73437cb20e20ad658cadfc371d28305160371243e190b053fe0732964e504991e78b77c88e3a9f98332034cb4e8d0b18ad64b9f0a9a28bc7f7d20e9ee1360ad WHIRLPOOL 66a06e999cab8874398753262d0fee0d4afc01fe010d8655a1e96bf7949c889452ef73dab46c605532d16f95165158f74a93a8be840284bdd7df1076752d9432
 EBUILD freebsd-pam-modules-9.9999.ebuild 1121 SHA256 342ee8740aeff932961270c4ac571da1cc80c687ad894907b828cbd16317df97 SHA512 d73437cb20e20ad658cadfc371d28305160371243e190b053fe0732964e504991e78b77c88e3a9f98332034cb4e8d0b18ad64b9f0a9a28bc7f7d20e9ee1360ad WHIRLPOOL 66a06e999cab8874398753262d0fee0d4afc01fe010d8655a1e96bf7949c889452ef73dab46c605532d16f95165158f74a93a8be840284bdd7df1076752d9432

diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index 6072c91..93e72a6 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -5,5 +5,4 @@ AUX freebsd-pf-9.0-pcap_pollution.patch 450 SHA256 d6ec6b1952e22f621b33d85956837
 AUX freebsd-pf-9.0-pflogd.patch 332 SHA256 fc832fdfa406603a2cb185b8f0f746b13f7673742578913ba635849e1fd778f6 SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073 WHIRLPOOL b90b5e454e96cc6f243e99358b78d45b6a13a46810a3683d837f03721052e7b4fc3f8733ac2c96cabed204435a9be93a0652da5311f6552ece294031b0b663df
 AUX pf.confd 274 SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5 WHIRLPOOL fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc
 AUX pf.initd 916 SHA256 b0cf7dadb825a1133fb52069e63eda10042aa62e3fa702bfbee53cd455837ac9 SHA512 cd55eccc9735f5a9e41297049a12c23b3fb4ef0987236b25bbfeeb01e7e0be697ff60fe8c9827dbb6a3da93211d6534e018a9693a6d1d48d60723738a21e7485 WHIRLPOOL babaa4fdcb885262ec9e89b9bd076aa4fec0c82764025d3192dda6986366b2f0169235c4c771510ea742444deb0c7bccf56f4ab23fb592351decae445b9cc158
-EBUILD freebsd-pf-9.2.9999_p253912.ebuild 1666 SHA256 22f38a04fbaa298ad0d7547507131f36b7fbab5e5e0eaf8b01598a8a06985ca0 SHA512 56adcb11151ab3e6ee34e1bb74674aa02aeeac0f871adc070203142eaa780a81f96ec16d2a1128cb54489cf8d57f335512291d4b4b873ce2c01471964a1db454 WHIRLPOOL 16d776b9251c4f7fa9a05c3d65548b2acdae163c1ae5c53705d892793987aba974254da344637b93bc291649641261a5d97d8a80f8c8837fe98280940eb42777
-EBUILD freebsd-pf-9.9999.ebuild 1666 SHA256 22f38a04fbaa298ad0d7547507131f36b7fbab5e5e0eaf8b01598a8a06985ca0 SHA512 56adcb11151ab3e6ee34e1bb74674aa02aeeac0f871adc070203142eaa780a81f96ec16d2a1128cb54489cf8d57f335512291d4b4b873ce2c01471964a1db454 WHIRLPOOL 16d776b9251c4f7fa9a05c3d65548b2acdae163c1ae5c53705d892793987aba974254da344637b93bc291649641261a5d97d8a80f8c8837fe98280940eb42777
+EBUILD freebsd-pf-9.9999.ebuild 1660 SHA256 2e8dd5c31676c4498781875b04e8313b3f4191b39443b48f297d87842c77fa1e SHA512 9d88cad67a8a5f2b3919ed91fd341e629bf760384ac81b83d962578ebbab848168834573ac504182e6076f34ff230933d82912f4d641218ca35155abf59dece0 WHIRLPOOL c4f5ff956d40286fc03b14f32452f4c02efdaf80d5cbeffde30a280e97864c3447c144de2464fc82702bdd6a50d4bb3addd7cf795e6244e26b2467911c45dc2e

diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild
index 71cf3d2..f0e2cc4 100644
--- a/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild
@@ -43,7 +43,7 @@ src_unpack() {
 	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"
+	ln -s "/usr/src/sys" "${WORKDIR}/sys"
 }
 
 src_compile() {

diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index d3e37a7..d318135 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -3,7 +3,5 @@ AUX freebsd-rescue-8.0-pkgconfig_static_libarchive.patch 330 SHA256 3690730ee660
 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-rescue-9.2-pkgconfig_static_libarchive.patch 450 SHA256 bb3920094b51d90f8c276a8376e6d386195527c1259aefc49dcc7dbaaced7c7e SHA512 e23c1e009ae9c3ec3a1ae221229d591aced150668bfb4038af65fab605ff1ff6dfe06fb6c63f02d3630ff6c89c3540eb37c763f08f324d49629d07878c083879 WHIRLPOOL 855a9faaf1fd70a3c6d233ac2b54e68632e1ce87a185d4676dabb3110cde975b4680988fba5075709f5911e12a38335f3d4d44ce7147bdbc083023674fd1fd4c
 AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b
-EBUILD freebsd-rescue-9.2.9999_p253912.ebuild 2015 SHA256 797d2da61fd79060dce98c2be5ad369596bc2ff83254cf0a98f67f9f6356dd42 SHA512 a1afd6df8debe1bcec6b8a0cbf9801d341e727c19fa58f5a7a1614fc43ed51149300139c98f795bb2310e6ff0791434376a1485a3c740ee9cf90610f2f6b1bac WHIRLPOOL 911522a7d855b3082b406a9d7af27f7dfd3be964fd0b161593cd697d9853ec547025d304511f33be07b7c323bb4ea0fcd1def5b6f11cbec9bf09eb03265a110e
-EBUILD freebsd-rescue-9.9999.ebuild 2015 SHA256 797d2da61fd79060dce98c2be5ad369596bc2ff83254cf0a98f67f9f6356dd42 SHA512 a1afd6df8debe1bcec6b8a0cbf9801d341e727c19fa58f5a7a1614fc43ed51149300139c98f795bb2310e6ff0791434376a1485a3c740ee9cf90610f2f6b1bac WHIRLPOOL 911522a7d855b3082b406a9d7af27f7dfd3be964fd0b161593cd697d9853ec547025d304511f33be07b7c323bb4ea0fcd1def5b6f11cbec9bf09eb03265a110e
+EBUILD freebsd-rescue-9.9999.ebuild 2007 SHA256 49832427041ca0c26cdc71bdda85acac7c6f94486511bd29ce51807c28d4529c SHA512 5638b5a64e9a710cdc051a243db2ef7d03895f2c11dfb68b09eab5506a3d2112d51f99f96f2c47ea287afb8fedcaea36b22d3b373a1b6ce6f979d2dd2fe1a0d1 WHIRLPOOL 89225e2bf70cbf8f65248cad5f69f4682d707448177e777253014d748ebe11a38f37294775a6006f85b671395b59020f0b169a7f46038bf37dd0df466e6d0786

diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.2-pkgconfig_static_libarchive.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.2-pkgconfig_static_libarchive.patch
deleted file mode 100644
index 002429c..0000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.2-pkgconfig_static_libarchive.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur rescue.orig/rescue/Makefile rescue/rescue/Makefile
---- rescue.orig/rescue/Makefile	2013-01-29 00:00:47.000000000 +0900
-+++ rescue/rescue/Makefile	2013-01-29 00:09:33.000000000 +0900
-@@ -195,7 +195,7 @@
- CRUNCH_LIBS+= -llzma
- 
- CRUNCH_PROGS_usr.bin+= tar
--CRUNCH_LIBS+= -larchive -lmd
-+CRUNCH_LIBS+= `pkg-config --static --libs libarchive | sed 's:-lz -lxml2 -lz:-lxml2 -lz:'` -lmd
- .if ${MK_OPENSSL} != "no"
- CRUNCH_LIBS+= -lcrypto
- .endif

diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.9999.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.9999.ebuild
index f2b29f1..a01fb54 100644
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-9.9999.ebuild
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-9.9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
-inherit bsdmk freebsd
+inherit bsdmk freebsd toolchain-funcs
 
 DESCRIPTION="FreeBSD's rescue binaries"
 SLOT="0"
@@ -29,7 +29,6 @@ fi
 
 RDEPEND=""
 DEPEND="sys-devel/flex
-	>=app-arch/libarchive-3.0.3[static-libs]
 	app-arch/xz-utils[static-libs]
 	sys-libs/ncurses[static-libs]
 	dev-libs/expat[static-libs]
@@ -39,13 +38,11 @@ DEPEND="sys-devel/flex
 	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}*
 	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
 
-
 S="${WORKDIR}/rescue"
 
 pkg_setup() {
@@ -53,22 +50,27 @@ pkg_setup() {
 	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
 	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+	mymakeopts="${mymakeopts} NO_PIC= "
 }
 
 src_prepare() {
 	# As they are patches from ${WORKDIR} apply them by hand
 	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}"-9.2-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"
 }
 
 src_compile() {
+	tc-export CC
 	# crunchgen is now checks env MAKE.
 	# Use to force BSD's make
 	export MAKE=/usr/bin/make
 
+	cd "${WORKDIR}/lib/libarchive"
+	echo "#include <expat.h>" > bsdxml.h
+	freebsd_src_compile
+	export CC="${CC} -L${WORKDIR}/lib/libarchive"
+
+	cd "${S}"
 	freebsd_src_compile
 }

diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 235473f..03f5d82 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -5,5 +5,4 @@ AUX freebsd-sbin-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4
 AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b
 AUX freebsd-sbin-setXid.patch 541 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 SHA512 e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e WHIRLPOOL a2d578ff3b54ad25875f65d6724d0762c0fc3a400aa8e14c93ab94dc789910fbc6ab70528cbd0074fd0d7a4957a2d2d51bf10f615cbfd751aa4e95edc88d4e7d
 AUX idmapd.initd 440 SHA256 e89050097731f658825b4a7215023e1c5070f0e31cfdf79eaf299ede9c9f9e39 SHA512 d76f1ed5b6cb0624359f0e1018b1decee80fec6e201393500656a2001034b042dde4299c2768ea8bfd1aa65813c86a5f9c06b5dd2e41ab74f954b8310d55259a WHIRLPOOL eeb04173b61c7e60883bd51e07be5f69aa67d6f4e506c3b3e07604e86cb43d81b5722e23e21ec189d83f2549a8827256216f45025ea5fd427b4874f2723c7a16
-EBUILD freebsd-sbin-9.2.9999_p253912.ebuild 2692 SHA256 c3ccfc7220e7d0708bb8f7b9f718af837a7eb46e81666545f97f4a01a64cf143 SHA512 087a5a66aff4da1cde6981d2daec9bde12406067d0465c444dea9d67d8e77b90bbc0cbc1724b108baa0640ebee4445269f8fef459ba139e7f949e9d51c7cda41 WHIRLPOOL 5475c4cdfbc5c5b7bc03acf3b2a249cd8810a34b9ae27d3c7f22f1d870df942b3e4c21037075f65efa1aa127924b13211275e2361fdac4d26a96768e52ab4194
-EBUILD freebsd-sbin-9.9999.ebuild 2692 SHA256 c3ccfc7220e7d0708bb8f7b9f718af837a7eb46e81666545f97f4a01a64cf143 SHA512 087a5a66aff4da1cde6981d2daec9bde12406067d0465c444dea9d67d8e77b90bbc0cbc1724b108baa0640ebee4445269f8fef459ba139e7f949e9d51c7cda41 WHIRLPOOL 5475c4cdfbc5c5b7bc03acf3b2a249cd8810a34b9ae27d3c7f22f1d870df942b3e4c21037075f65efa1aa127924b13211275e2361fdac4d26a96768e52ab4194
+EBUILD freebsd-sbin-9.9999.ebuild 2686 SHA256 27c70f68e06e8d5c41f5a57b42f4695584a6c44490242519c926eb54c77e3686 SHA512 9b781226aaca3b8b561330b413c3ecdf43431a86b9cc72ec243d6080c32369e963fa740088a45b1d7c292e1fd4133d483ee69472110ad99537a1880d43f81aca WHIRLPOOL c7a8e7762d23fa10b2f29997bbbca4183c97d693b52544e85270392e93804e8ef12348f0627554081975bbdd0edc6717390e91fd1ca10e3271c0dfee726f5c7d

diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild
index 6626bda..7408e83 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild
@@ -55,7 +55,7 @@ PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
 	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
 
 src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+	use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
 }
 
 src_install() {

diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index a9582f1..9a4d377 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -3,6 +3,5 @@ AUX freebsd-share-5.4-gentoo-skel.patch 621 SHA256 5480127971c2a5df5faf44355d5ed
 AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853 WHIRLPOOL f8d6675121ac43d2672f77d7ea4215073ff213c311fc1c09fe367f2d86f7dc1791a95f31b6def6f5bb757a5cd682de4c373c91465aa05acd38acfb537e781a6a
 AUX freebsd-share-9.0-gentoowaydir.patch 314 SHA256 68ddc9d6d95c95fc295f3ed3f7d7562de01ff6894b002bd7455d2da72cf4e2f2 SHA512 ef325e79806d78ede26567268829949de3aab02db1b7ea5f1dd834d4deeeddee8338679f7196fee6dc1a5682ccd79c1a0bdd73c96349961a8e1c2153fcf84afd WHIRLPOOL 10448b2cd090068b698d2d9037f2a217cdc20cebcfce4a13f98111ae4e4a2073ce4cb274ec3a7011c2e89acc1b2ab1b5e8e3d141817c065fdb35d1879ae31c37
 AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256 0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512 b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e WHIRLPOOL ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b
-EBUILD freebsd-share-9.2.9999_p253912.ebuild 2745 SHA256 c8fef91174dda270eb89b5c33e455ff3b53f2896b3f7e9a831ffe4dc0c165f0e SHA512 ab26d361691786ad6c784177242bc6fa68b0d9d43c7e6bf4edbcca0540bcfd70ed39aaefb1e78ec71506e125fa77f58ce287216d974c7022439fbac158167c89 WHIRLPOOL 4f8f567a79e88b7a35452ccdc87f0f486b998075422a549c2092d4d48ba7a24b45828067386b138b9b6924488d6b1c42d314fd4fdb745a6862b213ebb8ecf278
-EBUILD freebsd-share-9.9999.ebuild 2745 SHA256 c8fef91174dda270eb89b5c33e455ff3b53f2896b3f7e9a831ffe4dc0c165f0e SHA512 ab26d361691786ad6c784177242bc6fa68b0d9d43c7e6bf4edbcca0540bcfd70ed39aaefb1e78ec71506e125fa77f58ce287216d974c7022439fbac158167c89 WHIRLPOOL 4f8f567a79e88b7a35452ccdc87f0f486b998075422a549c2092d4d48ba7a24b45828067386b138b9b6924488d6b1c42d314fd4fdb745a6862b213ebb8ecf278
+EBUILD freebsd-share-9.9999.ebuild 2739 SHA256 8454228274dcb88de3568b4c14d80e02f035f7e5772ca564f3769bca4ba2bed2 SHA512 4996f0ae0b744a29583b6bf6c2843ae3bae6fd5fd5272f07f1c602cf17f4fdaeb206741749ed25f1f7479b5895091ca9a75695190aa5b929e72c9688c0e8f633 WHIRLPOOL 4012795a14b149a671757de6d965a49d3a708bbe2dbd89ea8bff98d5f4116a445c66a5e909fc1bf3f93722f9b0f6d1cf94b03278a4dcceca62021c399c65bd03
 MISC metadata.xml 223 SHA256 5c9860c4ce81b51fef51a6c5e87081bfd13e74ba452c27191a1abc0ca5ff0aa0 SHA512 3dc7fea8c9f850d63d4f9f24af639fb41d406c2e87439eb960c401412b37e7dc7ab6822d446ec113eb079aba30967391e95cd71dceb889753ed969bc51f6064e WHIRLPOOL 577570d1260a6ef86155c1647e3d90c18aa9b83a89027dcea28b70d22df60e413cee353083d7e915d81129f447772dc7dc4ea766e478a9cf363dabce5d9042de

diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
index af9a3cc..ef3787f 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
@@ -75,7 +75,7 @@ src_unpack() {
 			"${S}/${sdir}/Makefile" || \
 			die "Error fixing ${sdir}/Makefile"
 	done
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink"
+	ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
 }
 
 src_compile() {

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index b84b834..1eef78f 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -12,8 +12,6 @@ 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-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218
 AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
-AUX freebsd-sources-9.2-no_ctf.patch 1076 SHA256 35a1263b10208dc1e1e241bec4724009d809d270a54c06cfc77bfe5316b30d8b SHA512 aa2b71da3aabe89646f4f5006498223242b7d7e34dcf95a6334cd1deda57c5513a74847199f7bdfe575d86797c3c33a73af09a88b537d931d14881e76d8105fc WHIRLPOOL 3d4943cb6fdc8bc81713d6efed836fe8d61ece0a214cf76d516f7ca472a2bec5f0b38d7626aae7e3865871beea100d4082c050e38b1cc147f618c42bcb10a0af
 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
 AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
-EBUILD freebsd-sources-9.2.9999_p253912.ebuild 2547 SHA256 db31053956433d9c7629645e20d1ff33999e49f18373197c246ebff4c7986a96 SHA512 1c15a89264aecbcaf4cdc4ac064b64c0e1f1cdc9dcb361fd8e8f92535eae818c791f284c5bb7551edec3fee840f173c695225fe0a5262d32bbe497a1ecdba09d WHIRLPOOL 182e6f0790a3f30565c9f47b0ce564ba21fb0eb46c33a4e13bc3b4501c58a9e8aa1ddf87b6101e4016fd65c3b36f1f793e943eb7afd888626652f67a7c69b721
-EBUILD freebsd-sources-9.9999.ebuild 2547 SHA256 db31053956433d9c7629645e20d1ff33999e49f18373197c246ebff4c7986a96 SHA512 1c15a89264aecbcaf4cdc4ac064b64c0e1f1cdc9dcb361fd8e8f92535eae818c791f284c5bb7551edec3fee840f173c695225fe0a5262d32bbe497a1ecdba09d WHIRLPOOL 182e6f0790a3f30565c9f47b0ce564ba21fb0eb46c33a4e13bc3b4501c58a9e8aa1ddf87b6101e4016fd65c3b36f1f793e943eb7afd888626652f67a7c69b721
+EBUILD freebsd-sources-9.9999.ebuild 2920 SHA256 19126b7f6b01ce4e2a062972cca1b52a644912d9e7fb32c9b34973318aced25e SHA512 a9c5c773c0ec31b00dc01d53b5e9240a138cb8512f0e8a581506e7b12ab9b29e176fd25e4417228ba759c5f07c39d67821af7e01ecc3f9642a526a8663e4265d WHIRLPOOL 1b11ec494f047a460ea70d363998cd296d6f0965910e470b74e5351cdaefa3aa65ac6ac52dd485f81bdd126eba192faed8f8b8f5c50b114ab081d25231f2e2c9

diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch
deleted file mode 100644
index a3fe93f..0000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
-index 20d0c3f..3f5bf52 100644
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
-@@ -22,7 +22,8 @@ cpu		HAMMER
- ident		GENERIC
- 
- makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
--makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-+#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-+nomakeoptions	WITH_CTF		# Disabled on Gentoo/FreeBSD
- 
- options 	SCHED_ULE		# ULE scheduler
- options 	PREEMPTION		# Enable kernel thread preemption
-diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
-index f77b0fc..1f67a3a 100644
---- a/sys/i386/conf/GENERIC
-+++ b/sys/i386/conf/GENERIC
-@@ -24,7 +24,8 @@ cpu		I686_CPU
- ident		GENERIC
- 
- makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
--makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-+#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-+nomakeoptions	WITH_CTF		# Disabled on Gentoo/FreeBSD
- 
- options 	SCHED_ULE		# ULE scheduler
- options 	PREEMPTION		# Enable kernel thread preemption

diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild
index 2f4565a..34b490a 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.9999.ebuild
@@ -2,26 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit bsdmk freebsd flag-o-matic
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
 DESCRIPTION="FreeBSD kernel sources"
-SLOT="${RV}"
+SLOT="0"
 
-IUSE="symlink"
+IUSE="+build-generic profile"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 	SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
 fi
 
-RDEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+RDEPEND="=sys-freebsd/freebsd-cddl-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*
 	!sys-freebsd/virtio-kmod"
-DEPEND=""
+DEPEND="build-generic? (
+		=sys-freebsd/freebsd-cddl-${RV}*
+		=sys-freebsd/freebsd-usbin-${RV}*
+		=sys-freebsd/freebsd-mk-defs-${RV}*
+	)"
 
 RESTRICT="strip binchecks"
 
 S="${WORKDIR}/sys"
 
+KERN_BUILD=GENERIC
+
 PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-9.2-gentoo.patch"
 	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
@@ -30,13 +39,10 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
 	"${FILESDIR}/${PN}-7.1-includes.patch"
 	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-no_ctf.patch"
 	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
 	"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )
 
-src_unpack() {
-	freebsd_src_unpack
-
+src_prepare() {
 	# This replaces the gentoover patch, it doesn't need reapply every time.
 	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
 		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
@@ -53,28 +59,45 @@ src_unpack() {
 	sed -e "s:-Werror:-Wno-error:g" \
 		-i "${S}/conf/kern.pre.mk" \
 		-i "${S}/conf/kmod.mk" || die
+
+	# Only used with USE=build-generic, let the kernel build with its own flags, its safer.
+	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
+}
+
+src_configure() {
+	if use build-generic ; then
+		tc-export CC
+		cd "${S}/$(tc-arch-kernel)/conf" || die
+		config ${KERN_BUILD} || die
+	fi
 }
 
 src_compile() {
-	einfo "Nothing to compile.."
+	if use build-generic ; then
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_compile depend
+		freebsd_src_compile
+	else
+		einfo "Nothing to compile.."
+	fi
 }
 
 src_install() {
-	insinto "/usr/src/sys-${RV}"
+	if use build-generic ; then
+		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
+		freebsd_src_install
+		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
+		cd "${S}"
+	fi
+
+	insinto "/usr/src/sys"
 	doins -r "${S}/"*
 }
 
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${RV}..."
-		ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${RV}..."
-		rm "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${RV}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+pkg_preinst() {
+	if [[ -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys is a symlink, removing it..."
+		rm -f "${ROOT}/usr/src/sys"
 	fi
 
 	if use sparc-fbsd ; then

diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 57475a6..71ad132 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -17,5 +17,4 @@ AUX passwd.1.pamd 269 SHA256 a00b23b70388075f20c0e6535b6f4a1bebacb72726dc3c20ed1
 AUX passwd.pamd 360 SHA256 ff964fd309462cac711422be051122f8a60b570da9b13756e9012b18b1864f79 SHA512 f7b4accac065a41d453aacb63222bb9da8183ad5a3ba699530a6cd5fecb5e54ee308fd0a58e00a95cc394402aab7dfd9cded1bae58483d826ced5b20b0d14c27 WHIRLPOOL e46ecd4f2945f6121c89daf8c1640e868508d85fb10c4d9bc3ccc1e04999097f226d5b7d3cb1605ffe2544f4da0127bc9ebce985d086bf96e06a659981e9a4ee
 AUX su.1.pamd 432 SHA256 a231f9cbe5b9e03aa0aaa1520657332771f15d5e5cd69890ce49d02bb34e21c3 SHA512 7d7d8ef2a5b1b52b1b5aa5de86a8767a0aa217fb2658c9bb13bce09e3c68c1a4e15f287d2063a3f18615b9d7dc1eba1ebefb95c1510f9a4c7b7de810a5bcfa40 WHIRLPOOL 635fd8294abf9e8948032ab2b6d50565f2f9f72ea64c18799a6337776bdf2a7859e17bb58e3e1ab3558d74a10611225c31ac4b6cb26f1c5462bf855b02dc9e07
 AUX su.pamd 420 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 SHA512 25ac749209c05733d0c9978c8ef1712961a3bd863bb2f5615844ed9b44e98dcf7795c02dfc84d58703eca35331701f1fff06a13904792e634256675af5444a48 WHIRLPOOL c97d3314cd58edff9c05b8286e2a377ae928752197dec0d380fa68867a9e8ce5366cc97e8038c21c3f50f527957b6ecc6c723960e28e39a7e8fef1cf7f3caad1
-EBUILD freebsd-ubin-9.2.9999_p253912.ebuild 5385 SHA256 90177e95b4600e385cd56f60cd6488f75d15c40ce4a8ca2fbccaf71fbd2878c9 SHA512 4008bf4f91eddb76e7ac6c9668336da35d646681d46c89a7d071c08791ad5d3710d9625532f378f884cad613825999b7af5ae7c9acb46968faeff8284de6eedc WHIRLPOOL 69d9aaca40ad525e5fef94c16217e162fa83096d7938b41801c3fd917578fde96122e7c385bf270477b65e483da77ebdf84b637375a1acf53b3c043191580fcb
-EBUILD freebsd-ubin-9.9999.ebuild 5385 SHA256 90177e95b4600e385cd56f60cd6488f75d15c40ce4a8ca2fbccaf71fbd2878c9 SHA512 4008bf4f91eddb76e7ac6c9668336da35d646681d46c89a7d071c08791ad5d3710d9625532f378f884cad613825999b7af5ae7c9acb46968faeff8284de6eedc WHIRLPOOL 69d9aaca40ad525e5fef94c16217e162fa83096d7938b41801c3fd917578fde96122e7c385bf270477b65e483da77ebdf84b637375a1acf53b3c043191580fcb
+EBUILD freebsd-ubin-9.9999.ebuild 5346 SHA256 318cb2b35329bfd3e539420da4a3057842dc864e6625c267865b4d2551fea833 SHA512 072f12573db61aebaf6cea242d1abd7c75fda593026bbd26c67149c5bac3ab3d1597dc1431fd436dbea31f048d1a7252bfa1b2161382d43205e8e40a2811a86c WHIRLPOOL 1052757abdfa3155822bb740a83173219b32f1aaadbf5dd88db25ccda451b1d915ea59d9a63daaaa14d525aec6bff0ff9d84cb3d76d8f092fdf719a358b8fbff

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.9999.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.9999.ebuild
index ca191ee..be0a016 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.9999.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.9999.ebuild
@@ -4,11 +4,11 @@
 
 EAPI=5
 
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild
+inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
 
 DESCRIPTION="FreeBSD's base system source for /usr/bin"
 SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos multilib netware nis ssl usb build zfs"
+IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
 LICENSE="BSD zfs? ( CDDL )"
 
 if [[ ${PV} != *9999* ]]; then
@@ -23,8 +23,7 @@ if [[ ${PV} != *9999* ]]; then
 			build? ( mirror://gentoo/${SYS}.tar.bz2 )"
 fi
 
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
-	>=sys-freebsd/freebsd-lib-9.1-r7[multilib?]
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
 	ssl? ( dev-libs/openssl )
 	kerberos? ( virtual/krb5 )
 	ar? ( >=app-arch/libarchive-3 )
@@ -79,12 +78,6 @@ REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
 	bc dc
 	whois tftp man"
 
-if use multilib ; then
-	MULTIBUILD_VARIANTS=( $(get_all_abis) )
-else
-	MULTIBUILD_VARIANTS=${DEFAULT_ABI}
-fi
-
 pkg_setup() {
 	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
 	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
@@ -109,7 +102,7 @@ pkg_preinst() {
 }
 
 src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+	use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
 
 	# Rename manpage for renamed cmp
 	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
@@ -126,7 +119,7 @@ src_prepare() {
 }
 
 setup_multilib_vars() {
-	if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+	if ! multilib_is_native_abi ; then
 		cd "${WORKDIR}/usr.bin/ldd" || die
 		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
 	else
@@ -136,10 +129,12 @@ setup_multilib_vars() {
 }
 
 src_compile() {
+	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
 	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
 }
 
 src_install() {
+	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
 	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
 
 	# baselayout requires these in /bin

diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 9795f0c..943fa58 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -17,5 +17,4 @@ AUX rpcbind.initd 716 SHA256 2f14334ba584acd31306060bd134c0eccd3afa24c61531f93f8
 AUX syscons.confd 464 SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b1013ce02e44ee SHA512 c505aac9328557d344c64a5615f53a3b87faa39daf94169a652cd0a6447b3173b347f90bf87ba3806978dc57eaf46fac2301c10015397e25c070f5a21a760c61 WHIRLPOOL 02fc5189f82aad4e1052831d3d4d394a65161e241fe7714fa7af193f929af08889e43aa2f1088660935da5a14291bd4ed3a566218262ac8bfccb33ee637c2bfa
 AUX syscons.initd 1711 SHA256 16f5ab3ceb67accc10350d21527321c1e559c432f0b52e7b3adf08b67d9f62aa SHA512 41fef393e1fe732de065cb9ac3fdb4bbe73158a86f7c8b6175b496d0a65b9c682d888ce7b34c8a43732909c12626a2f5783457607e4b9bf6b4210589c3397d76 WHIRLPOOL 7a11eed37860db8dce71ad09299bd48427cf2beb349da3799189ef93d4d5c618b4c33b51e60f17cb485989dd3e0480458f5559c61deaa3f542f920df43f89801
 AUX syslogd.initd 571 SHA256 3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005 SHA512 0c67138b2461ba3629a7aa87dca35357ee17f2a1c1c13e1951417f4c05054ad006efb7f98dcf7fa24f0b90e0c0331e6fb7d1e3459c1db17f1bc82baa63b3beeb WHIRLPOOL e8dc6a0f402a474bb98c5d4a9a21b331a2a55726d517411c2b7c7adec28219e5a538ebb448c6c27dd1540affb914e935e91160cb0795ca6eb624f4ee163b0e9d
-EBUILD freebsd-usbin-9.2.9999_p253912.ebuild 5517 SHA256 9f5d12601dd5ee14774d2645a1671e8c28eedecfe23ed93fdbb515839949f7fe SHA512 437e2e105f220204c675a3dde5d38ed1c12501f863bd27550057f6966c358c021ef7dc2867e9c7a887f5988aa938c8499742167aa6965b9d0159c0e2c31745db WHIRLPOOL cbbe5831c05d9f5c2bf8788bb406b74b0f04266b5be3d057b5742a43ec97fde977928e082b9b21e35a18da522a32203fbe6c9f54a3dcb3a5af4a3ce3ec26947b
-EBUILD freebsd-usbin-9.9999.ebuild 5517 SHA256 9f5d12601dd5ee14774d2645a1671e8c28eedecfe23ed93fdbb515839949f7fe SHA512 437e2e105f220204c675a3dde5d38ed1c12501f863bd27550057f6966c358c021ef7dc2867e9c7a887f5988aa938c8499742167aa6965b9d0159c0e2c31745db WHIRLPOOL cbbe5831c05d9f5c2bf8788bb406b74b0f04266b5be3d057b5742a43ec97fde977928e082b9b21e35a18da522a32203fbe6c9f54a3dcb3a5af4a3ce3ec26947b
+EBUILD freebsd-usbin-9.9999.ebuild 5493 SHA256 b821720c524c3f56597a88ddd37bd03efdd10ccc36d5df55b7ed9cc5b8a8b3cd SHA512 45c970dfef5dfae2e4abde5c3a9119822a83545df739536182eece4e3b6d5bd8638e1519db9e1c4f02f1ab5f4a92f0629f5168a06064d1f2e9465f6914f18dfe WHIRLPOOL 7f0cb9d44fa7dba1d36fd3b539ab1569602825537fd63e6d9b858d253bf60deb55b17d72d9fd9621b90f0bfef8f3dab3faa672abd51163e82c246f2383a5b7a8

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild
index a64d230..92f3bcc 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild
@@ -20,18 +20,18 @@ if [[ ${PV} != *9999* ]]; then
 			mirror://gentoo/${GNU}.tar.bz2
 			nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
 			build? ( mirror://gentoo/${SYS}.tar.bz2
-				mirror://gentoo/${INCLUDE}.tar.bz2 )"
+			mirror://gentoo/${INCLUDE}.tar.bz2 )"
 fi
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
 	=sys-freebsd/freebsd-libexec-${RV}*
 	=sys-freebsd/freebsd-contrib-${RV}*
+	acpi? ( sys-power/iasl )
 	build? ( sys-apps/baselayout )
 	ssl? ( dev-libs/openssl )
 	>=app-arch/libarchive-3
 	sys-apps/tcp-wrappers
 	dev-util/dialog
-	dev-libs/libelf
 	>=dev-libs/libedit-20120311.3.0-r1
 	net-libs/libpcap
 	kerberos? ( app-crypt/heimdal )"
@@ -62,7 +62,7 @@ pkg_setup() {
 	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
 	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
 
 	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
 
@@ -84,11 +84,11 @@ REMOVE_SUBDIRS="
 	tcpdump ndp inetd
 	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
 	zic amd
-	pkg pkg_install freebsd-update sysrc service"
+	pkg pkg_install freebsd-update service sysrc"
 
 src_prepare() {
 	if ! use build; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		ln -s "/usr/src/sys" "${WORKDIR}/sys"
 		ln -s "/usr/include" "${WORKDIR}/include"
 	else
 		dummy_mk mount_smbfs


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-08-13 13:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-31  9:51 [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-lib/, Yuta SATOH
  -- strict thread matches above, loose matches on Subject: below --
2013-08-13 13:06 Yuta SATOH
2012-08-23 11:05 Yuta SATOH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox