Update to 6.1-RELEASE.

Package-Manager: portage-2.1_pre10-r5
author: Diego Elio Pettenò <flameeyes@gentoo.org> 2006-05-09 07:45:38 +0000
committer: Diego Elio Pettenò <flameeyes@gentoo.org> 2006-05-09 07:45:38 +0000
commit: af775d93d8d3ebacd672b2d525931c30297fe6b5 (patch)
tree: e1f962b20390b15d7b1db3bbc72a3afdbd1cd9de /sys-freebsd
parent: Update to 6.1-RELEASE. (diff)
download: historical-af775d93d8d3ebacd672b2d525931c30297fe6b5.tar.gz
historical-af775d93d8d3ebacd672b2d525931c30297fe6b5.tar.bz2
historical-af775d93d8d3ebacd672b2d525931c30297fe6b5.zip
39 files changed, 242 insertions, 1429 deletions
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 7b859ee8f8ce..a494fcb66cf6 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -6,19 +6,19 @@ MD5 f24689293c761803849391ade42168df files/boot0-6.0-gentoo.patch 4447
 RMD160 d84f8cef4483ae75c54da35ed792508932f86603 files/boot0-6.0-gentoo.patch 4447
 SHA256 ce71b949b57e965cbca86bd0ccb31a92201f92ee8dc95f69780e5be93084dd40 files/boot0-6.0-gentoo.patch 4447
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
-DIST freebsd-sys-6.1_rc2.tar.bz2 17197678 RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 size 17197678
+DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f size 17361671
 EBUILD boot0-6.0.ebuild 796 RMD160 a8a46b310052f2848ff7717d2f06c7e00a493787 SHA1 40c8361b47bba6c5877f2c6f5ab54eac8bbd392d SHA256 52839a5ea6f8bcab3233c2c7f71996564eac66bfb6abb9e7ac7b1d00c73a6248 size 796
 MD5 63da29647a285717a5b909bf8d4d9275 boot0-6.0.ebuild 796
 RMD160 a8a46b310052f2848ff7717d2f06c7e00a493787 boot0-6.0.ebuild 796
 SHA256 52839a5ea6f8bcab3233c2c7f71996564eac66bfb6abb9e7ac7b1d00c73a6248 boot0-6.0.ebuild 796
-EBUILD boot0-6.1_rc2.ebuild 800 RMD160 d6be834a7621437855e376fd1c906b49dca7746e SHA1 8b7bf1f67d71f8db9895053688e0e2ed57b6ad3e SHA256 5e2768d0a46b0f9c2657c67a590f28ab2e31140a8a8d5c6697b3692ff2651b24 size 800
-MD5 7ef998f0df55da9e769d2c861e34d873 boot0-6.1_rc2.ebuild 800
-RMD160 d6be834a7621437855e376fd1c906b49dca7746e boot0-6.1_rc2.ebuild 800
-SHA256 5e2768d0a46b0f9c2657c67a590f28ab2e31140a8a8d5c6697b3692ff2651b24 boot0-6.1_rc2.ebuild 800
-MISC ChangeLog 1101 RMD160 b7e6fa4d49fefbc0fdba4313dd931689e54f53ca SHA1 da0963161aecb8d8db31569c588f1bd830a72710 SHA256 e1e315bf3347ba22456036c20840ec364d1958cc9956a2ea08991faa5a748b36 size 1101
-MD5 ff54b6485540316e023a16754f1ebcb4 ChangeLog 1101
-RMD160 b7e6fa4d49fefbc0fdba4313dd931689e54f53ca ChangeLog 1101
-SHA256 e1e315bf3347ba22456036c20840ec364d1958cc9956a2ea08991faa5a748b36 ChangeLog 1101
+EBUILD boot0-6.1.ebuild 796 RMD160 40af2598b06b57817bb7507be3b6867c89ac77c1 SHA1 5fabde0cf5b484b049ca6612f4e141677b0097c7 SHA256 b2c5c827fbf2e3b94af878dbfba664d6077850ad731f534ea1c2f8d43058666c size 796
+MD5 7bdac57864958d3847ace8642212c268 boot0-6.1.ebuild 796
+RMD160 40af2598b06b57817bb7507be3b6867c89ac77c1 boot0-6.1.ebuild 796
+SHA256 b2c5c827fbf2e3b94af878dbfba664d6077850ad731f534ea1c2f8d43058666c boot0-6.1.ebuild 796
+MISC ChangeLog 1250 RMD160 f6b4acca6e788252ab28b65f14a4931761f0a463 SHA1 925e3f5fbb49e9390bf4b6b4482c5814ae239329 SHA256 021b0cd5e8d1e22a389a521dd479105230a820478fd28bb0b75706489454acb0 size 1250
+MD5 4746e3ff8a0dad9b696fb3343f690994 ChangeLog 1250
+RMD160 f6b4acca6e788252ab28b65f14a4931761f0a463 ChangeLog 1250
+SHA256 021b0cd5e8d1e22a389a521dd479105230a820478fd28bb0b75706489454acb0 ChangeLog 1250
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -26,13 +26,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-boot0-6.0 256
 RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-boot0-6.0 256
 SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-boot0-6.0 256
-MD5 312a83074ad6b43772df3ac9eebae5b1 files/digest-boot0-6.1_rc2 268
-RMD160 50e8b7f065ea2fe44a8ee13c4ac10d454c08ab6b files/digest-boot0-6.1_rc2 268
-SHA256 aea6031fefafef2da116542265cc3bceeab3facafc11df30645a038a91a592e7 files/digest-boot0-6.1_rc2 268
+MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-boot0-6.1 256
+RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-boot0-6.1 256
+SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-boot0-6.1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9RGAiZjviIA2XgRAubTAJwJ71sNdDwxjzBh0ejaqjYdwvhhdwCgkad9
-EI3p/z9I791mymbqRc6Mwh0=
-=SQKR
+iD8DBQFEYEW+AiZjviIA2XgRAvQEAJ0TgXxmC2TeGMQWUDzp4ovpWX7HVwCeJhhu
+5ADCOQkWW6PJzrvDjjqGWns=
+=dVO7
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/boot0/boot0-6.1_rc2.ebuild b/sys-freebsd/boot0/boot0-6.1_rc2.ebuild
deleted file mode 100644
index 00243898b622..000000000000
--- a/sys-freebsd/boot0/boot0-6.1_rc2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-6.1_rc2.ebuild,v 1.1 2006/05/02 21:50:46 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES="${FILESDIR}/boot0-6.0-gentoo.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
-}
-
-src_install() {
-	dodir /boot/defaults
-
-	mkinstall FILESDIR=/boot || die "mkinstall failed"
-}
diff --git a/sys-freebsd/boot0/files/digest-boot0-6.1_rc2 b/sys-freebsd/boot0/files/digest-boot0-6.1_rc2
deleted file mode 100644
index 26bf283c442a..000000000000
--- a/sys-freebsd/boot0/files/digest-boot0-6.1_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 232a881d16f64a526796fcd6a054c495 freebsd-sys-6.1_rc2.tar.bz2 17197678
-RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f freebsd-sys-6.1_rc2.tar.bz2 17197678
-SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 freebsd-sys-6.1_rc2.tar.bz2 17197678
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index b4e1604045d0..4813b354b56f 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -6,23 +6,23 @@ MD5 88b10ffe4168218251cdaee3994b36e2 files/freebsd-bin-6.0-flex-2.5.31.patch 277
 RMD160 3dd13f280f462964feecd54ea9cafac8608955d4 files/freebsd-bin-6.0-flex-2.5.31.patch 277
 SHA256 4c60ee85f4ec7dfb86eab1536eb0d6aae65c955c756362cd2b7f2b5a024dfb17 files/freebsd-bin-6.0-flex-2.5.31.patch 277
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
+DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 size 405680
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
+DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 size 1156163
 EBUILD freebsd-bin-6.0-r1.ebuild 988 RMD160 e637475e1559dff4703f9f907eff0b69db631914 SHA1 ca9fca4d8ae313938a0be610f888a81c692b2bed SHA256 05bc5b543958c5d0ab2cca2eb8dd05cdef8d16b1ec7c3c88414bf46d3069663e size 988
 MD5 be1e2131f1e998ab28c8feed43bc74c6 freebsd-bin-6.0-r1.ebuild 988
 RMD160 e637475e1559dff4703f9f907eff0b69db631914 freebsd-bin-6.0-r1.ebuild 988
 SHA256 05bc5b543958c5d0ab2cca2eb8dd05cdef8d16b1ec7c3c88414bf46d3069663e freebsd-bin-6.0-r1.ebuild 988
-EBUILD freebsd-bin-6.1_rc2.ebuild 987 RMD160 b418f961c422e5b8fc00e44eb0328682bbf23924 SHA1 e3880598f188f78604afe43a5d8f393b51e38c60 SHA256 c2a520427b6d6c9206342f367c77c48c57720f510fcf124f69bba4158b78465c size 987
-MD5 dbcc11254a0bbfb1b9c4fce842653e30 freebsd-bin-6.1_rc2.ebuild 987
-RMD160 b418f961c422e5b8fc00e44eb0328682bbf23924 freebsd-bin-6.1_rc2.ebuild 987
-SHA256 c2a520427b6d6c9206342f367c77c48c57720f510fcf124f69bba4158b78465c freebsd-bin-6.1_rc2.ebuild 987
-MISC ChangeLog 2703 RMD160 3acdab4c15f9599d27275a470d596b5539dc66dd SHA1 e97549fd03b37fe3517d9c10b75bd815da50e7f5 SHA256 f85104f0e0c2d6c5fed0d91d07273fdb5efd90c123fa2926d024835c25d741f5 size 2703
-MD5 fe76caf7051753bd14294d1c5afb5900 ChangeLog 2703
-RMD160 3acdab4c15f9599d27275a470d596b5539dc66dd ChangeLog 2703
-SHA256 f85104f0e0c2d6c5fed0d91d07273fdb5efd90c123fa2926d024835c25d741f5 ChangeLog 2703
+EBUILD freebsd-bin-6.1.ebuild 983 RMD160 b2296df734ac3178afbd034ea21569d82de74e46 SHA1 95f3464ec5ca3cda829724ce46506df28181cc0d SHA256 6c8f1e5522769812e9212837989e43956f598774a6a0a2d49a360c9c0aa45cc3 size 983
+MD5 3da186c49a59b95858a3bff6d675480f freebsd-bin-6.1.ebuild 983
+RMD160 b2296df734ac3178afbd034ea21569d82de74e46 freebsd-bin-6.1.ebuild 983
+SHA256 6c8f1e5522769812e9212837989e43956f598774a6a0a2d49a360c9c0aa45cc3 freebsd-bin-6.1.ebuild 983
+MISC ChangeLog 2870 RMD160 1c35d76e5c163ceb6e6a305f4081a0008a71fa0f SHA1 afda580db8a1900281ac87c7e900c2782d02f91b SHA256 5becca347156372bc20aa0eb346c5ba2953951688db81ae9fcfa0ff765a68b4a size 2870
+MD5 989c1e37369ab34d6d83d524a802850f ChangeLog 2870
+RMD160 1c35d76e5c163ceb6e6a305f4081a0008a71fa0f ChangeLog 2870
+SHA256 5becca347156372bc20aa0eb346c5ba2953951688db81ae9fcfa0ff765a68b4a ChangeLog 2870
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -30,13 +30,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 a146e77501dcf32e53101304b328ebfe files/digest-freebsd-bin-6.0-r1 759
 RMD160 e55fbe974b7e035199a3477c8be74d5f5164a3c5 files/digest-freebsd-bin-6.0-r1 759
 SHA256 4f9da8f253b899a320c59d639887a5308d20829337bf4a6153a1332b91672c13 files/digest-freebsd-bin-6.0-r1 759
-MD5 b0e86e98adc7be6ce26b50915e1b9b52 files/digest-freebsd-bin-6.1_rc2 795
-RMD160 e350f4feb9e8fd5203d1373a275ce0cfab373b83 files/digest-freebsd-bin-6.1_rc2 795
-SHA256 7f54d219b145bd578a0c5f033663c6027510fce93ff272e9ea06d94aaf6b5452 files/digest-freebsd-bin-6.1_rc2 795
+MD5 bc68e9479f640f6b73d0c888070056eb files/digest-freebsd-bin-6.1 759
+RMD160 1848f0d5407e5c3cbc0c9e5956d668e405ffa2a1 files/digest-freebsd-bin-6.1 759
+SHA256 1c6189bfea99cf4729de94cba7c6aa4c2c565faf648d8479eb73f0df740a18af files/digest-freebsd-bin-6.1 759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9R8AiZjviIA2XgRAvWoAKCUK3I5rViKWmjLeSGnHUwwTcXKUQCeKzph
-n3o5EcqLdbsE2lFjnyjjWEU=
-=wXMG
+iD8DBQFEYEXvAiZjviIA2XgRAtOJAKCXrq2cZFwiAyvmul2XbUp1xzQVFwCfRj4c
+u+MV5UUTBts8LE+QkuXN3Fo=
+=wUhW
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1_rc2 b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1_rc2
deleted file mode 100644
index 64d5f790aca2..000000000000
--- a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1_rc2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 0e02e2ac409d7048189b2afebe178f42 freebsd-bin-6.1_rc2.tar.bz2 405452
-RMD160 8eee2799407c09dfc9a114860a48b490c5393504 freebsd-bin-6.1_rc2.tar.bz2 405452
-SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 freebsd-bin-6.1_rc2.tar.bz2 405452
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
-MD5 db39af0d7136e230fa609356ec0c87fd freebsd-sbin-6.1_rc2.tar.bz2 1157065
-RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 freebsd-sbin-6.1_rc2.tar.bz2 1157065
-SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f freebsd-sbin-6.1_rc2.tar.bz2 1157065
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-6.1_rc2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-6.1_rc2.ebuild
deleted file mode 100644
index f98c212a1706..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-6.1_rc2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-6.1_rc2.ebuild,v 1.1 2006/05/02 21:51:48 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="rcp nls"
-
-SRC_URI="mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	sys-libs/ncurses
-	sys-apps/ed
-	!app-admin/realpath"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	>=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-PATCHES="${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-
-pkg_setup() {
-	use rcp || mymakeopts="${mymakeopts} NO_RCMNDS= "
-	use nls || mymakeopts="${mymakeopts} NO_NLS= "
-
-	mymakeopts="${mymakeopts} NO_TCSH= NO_SENDMAIL= NO_OPENSSL= NO_CRYPT= "
-}
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed"
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index cc6697498a01..e2d2f026c723 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -6,22 +6,22 @@ MD5 19ed07f6a51e25c4021e799825aa6273 files/freebsd-contrib-5.3-lib_csu-makefile.
 RMD160 d2817b79e134cdd24f6163f0a72c5284cee1bdba files/freebsd-contrib-5.3-lib_csu-makefile.patch 327
 SHA256 ee3ec95497ceea4e88101f10f89b7e161eed1684a624ea9eae257a20408080da files/freebsd-contrib-5.3-lib_csu-makefile.patch 327
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-gcc-3.4.2.tar.bz2 8447406 RMD160 bb9d525baee03e8d0b3897baf0c3b7b36d7941f2 SHA256 9946c986c73ddad8085a94771cac59755fd1c53e3d7cd2841817bdfd5cccd31f size 8447406
 DIST freebsd-gnu-6.0.tar.bz2 866160 RMD160 7e98304027683188a9cbf12811fc3ce9e1923cff SHA256 ad1c93881074763daa0305d72eb365b5a2c7154f9fecfc73b8e369991ba6e6b3 size 866160
-DIST freebsd-gnu-6.1_rc2.tar.bz2 867149 RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 size 867149
+DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 size 867244
 EBUILD freebsd-contrib-6.0.ebuild 1430 RMD160 86afe865d2a94d5fe5a489d9e44f50cdc9b71b19 SHA1 1196d6bf47040ae25348872252ba27325fb4ae98 SHA256 368238ad7f0411387db6853293396e39a5f583ac5fb24b4d3a608f31d81fba35 size 1430
 MD5 33e86cc7aa4036521be3f2bc635dd81a freebsd-contrib-6.0.ebuild 1430
 RMD160 86afe865d2a94d5fe5a489d9e44f50cdc9b71b19 freebsd-contrib-6.0.ebuild 1430
 SHA256 368238ad7f0411387db6853293396e39a5f583ac5fb24b4d3a608f31d81fba35 freebsd-contrib-6.0.ebuild 1430
-EBUILD freebsd-contrib-6.1_rc2.ebuild 1434 RMD160 2dc5fb952a3f1e41304aeba8b57ee0313728e09c SHA1 216c48514dce9badb432c821192e941cbb29b6e6 SHA256 6cac6043c66e08d84f6b6c77a103cd5d847d0336dfda84867ad98a4b6fa8fefe size 1434
-MD5 24972d54879d32159c207673e86fb5db freebsd-contrib-6.1_rc2.ebuild 1434
-RMD160 2dc5fb952a3f1e41304aeba8b57ee0313728e09c freebsd-contrib-6.1_rc2.ebuild 1434
-SHA256 6cac6043c66e08d84f6b6c77a103cd5d847d0336dfda84867ad98a4b6fa8fefe freebsd-contrib-6.1_rc2.ebuild 1434
-MISC ChangeLog 1918 RMD160 8ccd1d29358fad47a67e0b0142554e8d273dae6f SHA1 a3ab6b422dec9cb67358ededd87a8e702edccc75 SHA256 08c233493f884fb206db0de5ec3f497fade6f635a69dead03aab60a04f2e90bf size 1918
-MD5 1caa375e5347581733d0bc38f6e75edd ChangeLog 1918
-RMD160 8ccd1d29358fad47a67e0b0142554e8d273dae6f ChangeLog 1918
-SHA256 08c233493f884fb206db0de5ec3f497fade6f635a69dead03aab60a04f2e90bf ChangeLog 1918
+EBUILD freebsd-contrib-6.1.ebuild 1430 RMD160 3273b253a8e0be403aeee8941e55921b4396a350 SHA1 8d8471d531bc2bffb600386bf92354e01df2cb56 SHA256 b0681e15d02a0c23e6ae62bf50a8ce787de6911e1fdaa78da73126a0082dd74a size 1430
+MD5 642a238167a63c50603a5d4d34a1af6e freebsd-contrib-6.1.ebuild 1430
+RMD160 3273b253a8e0be403aeee8941e55921b4396a350 freebsd-contrib-6.1.ebuild 1430
+SHA256 b0681e15d02a0c23e6ae62bf50a8ce787de6911e1fdaa78da73126a0082dd74a freebsd-contrib-6.1.ebuild 1430
+MISC ChangeLog 2097 RMD160 e70880b17c37d6efdfb22b1b1adcaa912c801999 SHA1 566ae2b875d7804c4385eecb3648cee5371a001c SHA256 02ca1eeca6af41f48e570ad08e97555714015137f5969d9feea83cca8b5e0097 size 2097
+MD5 c62dee66c68c93db8fc567c3d9090171 ChangeLog 2097
+RMD160 e70880b17c37d6efdfb22b1b1adcaa912c801999 ChangeLog 2097
+SHA256 02ca1eeca6af41f48e570ad08e97555714015137f5969d9feea83cca8b5e0097 ChangeLog 2097
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -29,13 +29,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 f488d58ca1870ae90c742a03dc86e617 files/digest-freebsd-contrib-6.0 777
 RMD160 70481972ba946ba0fe0affb5f5f45a12c842385a files/digest-freebsd-contrib-6.0 777
 SHA256 fa6bef7e5aa01e4001df26c9af455c6f2a305f113b7c486b73aa2f1dacddb1d4 files/digest-freebsd-contrib-6.0 777
-MD5 9c18d1f1a7810e53e143d0443be4d1d1 files/digest-freebsd-contrib-6.1_rc2 801
-RMD160 8c4f868d6058f288f41b84471728187b0c9cad17 files/digest-freebsd-contrib-6.1_rc2 801
-SHA256 b539b7b212f057bae6494328e01915045f1f357ded574b4cc144d87c900f61b8 files/digest-freebsd-contrib-6.1_rc2 801
+MD5 7337f39e121d6cad5948eb92fbee7eff files/digest-freebsd-contrib-6.1 777
+RMD160 63f1776d876d27f2d3a5851d3ba9028eb3b5a941 files/digest-freebsd-contrib-6.1 777
+SHA256 714f12051a166b013c8137135b0f3c5ce403f39495abe8061fe24f656188bc7a files/digest-freebsd-contrib-6.1 777
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9S+AiZjviIA2XgRAgnPAKCGTQYOBJMg+gSiHc090Cwfb6WwMwCg5FxV
-vkslv9D3VkMs7PRXO/+K0dw=
-=yDX+
+iD8DBQFEYEYpAiZjviIA2XgRAm2WAKDD7F+IHw+mxoBGY8hochezmtvNzQCgsozM
+2fPDPPkrL2vo+2dMIJrtoqI=
+=YFCX
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1_rc2 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1_rc2
deleted file mode 100644
index a1f1a75f9d51..000000000000
--- a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1_rc2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 4873a3aede8a8c121cab7b37c28487b5 freebsd-gcc-3.4.2.tar.bz2 8447406
-RMD160 bb9d525baee03e8d0b3897baf0c3b7b36d7941f2 freebsd-gcc-3.4.2.tar.bz2 8447406
-SHA256 9946c986c73ddad8085a94771cac59755fd1c53e3d7cd2841817bdfd5cccd31f freebsd-gcc-3.4.2.tar.bz2 8447406
-MD5 876061a056183fda4a8c6fd71b875dff freebsd-gnu-6.1_rc2.tar.bz2 867149
-RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc freebsd-gnu-6.1_rc2.tar.bz2 867149
-SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 freebsd-gnu-6.1_rc2.tar.bz2 867149
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc2.ebuild
deleted file mode 100644
index f557978d1466..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1_rc2.ebuild,v 1.1 2006/05/02 21:52:51 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic
-
-GCC="freebsd-gcc-3.4.2"
-
-DESCRIPTION="Contributed sources for FreeBSD."
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
-IUSE="ssl kerberos"
-
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${GCC}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-RDEPEND="kerberos? ( virtual/krb5 )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/gnu"
-
-pkg_setup() {
-	if use kerberos && ! use ssl; then
-		error "You can't install with kerberos support and no ssl support"
-	fi
-
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-}
-
-REMOVE_SUBDIRS="lib/libg2c lib/libgcc lib/libgcc_r lib/libgcov lib/libiberty
-	lib/libobjc lib/libreadline lib/libregex lib/libstdc++ lib/libsupc++ usr.bin/bc
-	usr.bin/binutils usr.bin/cc usr.bin/cpio usr.bin/cvs usr.bin/dc usr.bin/dialog
-	usr.bin/diff usr.bin/diff3 usr.bin/gdb usr.bin/gperf usr.bin/grep usr.bin/groff
-	usr.bin/gzip usr.bin/man usr.bin/rcs usr.bin/sdiff usr.bin/send-pr
-	usr.bin/tar usr.bin/texinfo"
-
-PATCHES="${FILESDIR}/${PN}-5.3-lib_csu-makefile.patch"
-
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index d2fbdb0ae227..7fa2bee742e9 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -30,33 +30,33 @@ MD5 eb10216ffda9c5f69fdb28728c574114 files/freebsd-lib-fixmp.patch 548
 RMD160 91cf241eaa972c13ea6ddd1ec03a6fd7f3a2a4b3 files/freebsd-lib-fixmp.patch 548
 SHA256 bd99697872b00a4275c80935f4f5188f4f859aa358be0ecfc0c5470e9979c354 files/freebsd-lib-fixmp.patch 548
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-crypto-6.0.tar.bz2 3978650 RMD160 361efbba1f651925a7cc2284665b044bc232f181 SHA256 e86223d40ef2747de98f575f3875a6ce8a5e913baa850a5ef547ffef00ace480 size 3978650
-DIST freebsd-crypto-6.1_rc2.tar.bz2 3978366 RMD160 ea43846793f4fda0fd6861bebb4a816cc838d5f3 SHA256 fdc16e035efc422894c40a95d134d7fc68b3904c0b512ec62d8ab2c8a9caf468 size 3978366
+DIST freebsd-crypto-6.1.tar.bz2 3978359 RMD160 de2fa1e12cda42661565d5bf0f910b1a99d3c4df SHA256 52be404c7f86ca29f957e1dc46c8a2c32a46ddb5c316d5123faf92a9c9fe37c5 size 3978359
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
+DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 size 184045
 DIST freebsd-include-6.0.tar.bz2 127219 RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b size 127219
-DIST freebsd-include-6.1_rc2.tar.bz2 127237 RMD160 4235464be16e87e2f05022fe7024ee77f2afc3ae SHA256 5d346a1410f3daa2bbe2c2a4a158f7e0abf52f696b33ea332b2ad7c6aa14f730 size 127237
+DIST freebsd-include-6.1.tar.bz2 127179 RMD160 f873b13bb16408a390932d14974b39336bd90a7c SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 size 127179
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
+DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 size 277860
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
-DIST freebsd-sys-6.1_rc2.tar.bz2 17197678 RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 size 17197678
+DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f size 17361671
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
+DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e size 2664570
 EBUILD freebsd-lib-6.0-r3.ebuild 6540 RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539eac78e SHA1 f6d44373b904023fa915be186829a80024b67c5b SHA256 d1007fb5b26aefbd85e08374ab32324643e734b704da97ad8461c59f327fdeb5 size 6540
 MD5 1bde4db8e821cdb167f10b4514a0dbe2 freebsd-lib-6.0-r3.ebuild 6540
 RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539eac78e freebsd-lib-6.0-r3.ebuild 6540
 SHA256 d1007fb5b26aefbd85e08374ab32324643e734b704da97ad8461c59f327fdeb5 freebsd-lib-6.0-r3.ebuild 6540
-EBUILD freebsd-lib-6.1_rc2.ebuild 6698 RMD160 388a31d79728691295d20bf6eeb893f5a1b7fafe SHA1 c4ea3ecd580b78e61547b0d8b11718c83b1fa081 SHA256 21d2d18f7be5dd85517a20c4a9733f56961895f7d7ccea95efadabf6ee9da3e6 size 6698
-MD5 511d63198f471dbd1fff44d58308a84f freebsd-lib-6.1_rc2.ebuild 6698
-RMD160 388a31d79728691295d20bf6eeb893f5a1b7fafe freebsd-lib-6.1_rc2.ebuild 6698
-SHA256 21d2d18f7be5dd85517a20c4a9733f56961895f7d7ccea95efadabf6ee9da3e6 freebsd-lib-6.1_rc2.ebuild 6698
-MISC ChangeLog 7931 RMD160 f3a59f80ec9f3d997b6f07479b4b11f8ae3f0016 SHA1 57fd3229f84e1e2e037d4cc01d2e4810e5d09663 SHA256 12399d84486f423d669f244e4453cf5d19660e73ea058ac410536f410304b3af size 7931
-MD5 412b0d9d7aca491982c8aff775050bd0 ChangeLog 7931
-RMD160 f3a59f80ec9f3d997b6f07479b4b11f8ae3f0016 ChangeLog 7931
-SHA256 12399d84486f423d669f244e4453cf5d19660e73ea058ac410536f410304b3af ChangeLog 7931
+EBUILD freebsd-lib-6.1.ebuild 6694 RMD160 06658c0477e660f3e5513d085345facd24a085cc SHA1 bf83dde3f69eb52b5b00b9af147cef181eac0cf6 SHA256 475755c1237f74ec95a07bcdecd8170320e24fab093df124914aa5bc39a12165 size 6694
+MD5 bcfceaa14adf2f12b647c3a56880a543 freebsd-lib-6.1.ebuild 6694
+RMD160 06658c0477e660f3e5513d085345facd24a085cc freebsd-lib-6.1.ebuild 6694
+SHA256 475755c1237f74ec95a07bcdecd8170320e24fab093df124914aa5bc39a12165 freebsd-lib-6.1.ebuild 6694
+MISC ChangeLog 8098 RMD160 c4371b3d00a1b228009c0aa6394ee5aa68dd4aa2 SHA1 6063f44edf5c30fc4dca165ff7a81fc64c40708d SHA256 d6b279edfd1bbc553209a186b53e419f03cd9b378731bc1942237ba0a8144311 size 8098
+MD5 d57ef453c050d07838a5d9067b5fcb2f ChangeLog 8098
+RMD160 c4371b3d00a1b228009c0aa6394ee5aa68dd4aa2 ChangeLog 8098
+SHA256 d6b279edfd1bbc553209a186b53e419f03cd9b378731bc1942237ba0a8144311 ChangeLog 8098
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -64,13 +64,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 c15a1a49762c0863cbfa4bd5be03f174 files/digest-freebsd-lib-6.0-r3 2072
 RMD160 6c9ffd60849a62554acd27568cc21f1b76692ca3 files/digest-freebsd-lib-6.0-r3 2072
 SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/digest-freebsd-lib-6.0-r3 2072
-MD5 19a4bdb5966dcca60a662f86f590b7f8 files/digest-freebsd-lib-6.1_rc2 2168
-RMD160 b792913a908f615fe7f4ceec0f3e49d7b2176bc7 files/digest-freebsd-lib-6.1_rc2 2168
-SHA256 5624c750255e335562226628a8b72ac4726bea57ec6214a23ee4b86e1cdf5618 files/digest-freebsd-lib-6.1_rc2 2168
+MD5 7a392338e5c80064105ffb19a6575361 files/digest-freebsd-lib-6.1 2072
+RMD160 2f3e680d7a90f8387d086addff4fff68fd4c51de files/digest-freebsd-lib-6.1 2072
+SHA256 e4f88af696b9cdd96f0553e2928d59ce138c08f8d4925b32b6ea59c3030d7f21 files/digest-freebsd-lib-6.1 2072
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9UBAiZjviIA2XgRAg0PAKDfGdJRTWPfQaP3ZuocXOxJMyZIagCbBJSD
-VgKNDi5+2q6ODglhuvi0LHw=
-=JPIF
+iD8DBQFEYEZqAiZjviIA2XgRAvyTAKCm0Y898I4O/GGJOgotvEyeGZXqagCfcOID
+0VWy3VEv65oMSeOUit1zYtc=
+=npfx
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc2 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc2
deleted file mode 100644
index ed4a42c7dde5..000000000000
--- a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc2
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 3e1f822e176993896d5d732f22c91043 freebsd-crypto-6.1_rc2.tar.bz2 3978366
-RMD160 ea43846793f4fda0fd6861bebb4a816cc838d5f3 freebsd-crypto-6.1_rc2.tar.bz2 3978366
-SHA256 fdc16e035efc422894c40a95d134d7fc68b3904c0b512ec62d8ab2c8a9caf468 freebsd-crypto-6.1_rc2.tar.bz2 3978366
-MD5 1d2d7469eb731dcff01781fb757ad6ef freebsd-etc-6.1_rc2.tar.bz2 183869
-RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 freebsd-etc-6.1_rc2.tar.bz2 183869
-SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be freebsd-etc-6.1_rc2.tar.bz2 183869
-MD5 c892941f5dbdca8bf5f3e702802c0d3b freebsd-include-6.1_rc2.tar.bz2 127237
-RMD160 4235464be16e87e2f05022fe7024ee77f2afc3ae freebsd-include-6.1_rc2.tar.bz2 127237
-SHA256 5d346a1410f3daa2bbe2c2a4a158f7e0abf52f696b33ea332b2ad7c6aa14f730 freebsd-include-6.1_rc2.tar.bz2 127237
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
-MD5 24f9fb6752c6800db5a98da9c4bb19c9 freebsd-libexec-6.1_rc2.tar.bz2 277785
-RMD160 7e6c035b414287241d22a48e809aae8a243bff38 freebsd-libexec-6.1_rc2.tar.bz2 277785
-SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 freebsd-libexec-6.1_rc2.tar.bz2 277785
-MD5 232a881d16f64a526796fcd6a054c495 freebsd-sys-6.1_rc2.tar.bz2 17197678
-RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f freebsd-sys-6.1_rc2.tar.bz2 17197678
-SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 freebsd-sys-6.1_rc2.tar.bz2 17197678
-MD5 f2c82f1d20cb8b9eae56c129b0b78549 freebsd-usbin-6.1_rc2.tar.bz2 2663193
-RMD160 f183a024fcbce51156330410ba08bae2aeae055f freebsd-usbin-6.1_rc2.tar.bz2 2663193
-SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 freebsd-usbin-6.1_rc2.tar.bz2 2663193
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc2.ebuild
deleted file mode 100644
index e2c44aa818ae..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc2.ebuild,v 1.1 2006/05/02 21:53:57 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="6.0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm bluetooth ssl ipv6 kerberos nis gpib"
-
-# 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
-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
-		nis? ( mirror://gentoo/${USBIN}.tar.bz2 )
-		!kernel_FreeBSD? (
-			mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	!sys-freebsd/freebsd-headers"
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.31-r2
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-if [[ ${CATEGORY/cross-} == {CATEGORY} ]]; then
-	PROVIDE="virtual/libc
-		virtual/os-headers"
-fi
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-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} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
-
-	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= "
-
-	replace-flags "-O?" -"O1"
-
-	if [[ ${CTARGET} != ${CHOST} ]]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES="${FILESDIR}/${PN}-bsdxml.patch
-	${FILESDIR}/${PN}-fixmp.patch
-	${FILESDIR}/${PN}-6.0-pmc.patch
-	${FILESDIR}/${PN}-6.0-gccfloat.patch
-	${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
-	${FILESDIR}/${PN}-6.0-binutils-asm.patch
-	${FILESDIR}/${PN}-6.0-ssp.patch"
-
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-#
-# 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="libncurses libform libmenu libpanel \
-	libz libbz2 libarchive \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libsmb libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	if [[ ${CTARGET} == ${CHOST} ]]; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-	else
-		sed -i -e 's:/usr/include:/usr/'${CTARGET}'/usr/include:g' \
-			"${S}/libc/"{yp,rpc}"/Makefile.inc"
-	fi
-
-	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && \
-		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-
-	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
-}
-
-src_compile() {
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed"
-
-	use _E_CROSS_HEADERS_ONLY && return 0
-
-	# Don't use ssp until properly fixed
-	append-flags -fno-stack-protector -fno-stack-protector-all
-
-	if [[ ${CTARGET} != ${CHOST} ]]; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX
-
-		local machine
-		machine=$(tc-arch-kernel ${CTARGET})
-
-		local csudir
-		if [[ -d "${S}/csu/${machine}-elf" ]]; then
-			csudir="${S}/csu/${machine}-elf"
-		else
-			csudir="${S}/csu/${machine}"
-		fi
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
-
-		append-flags "-isystem /usr/${CTARGET}/usr/include"
-		append-flags "-B ${csudir}"
-		append-ldflags "-B ${csudir}"
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-
-		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
-		cd "${S}/msun"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-	else
-		strip-flags
-		# Forces to use the local copy of headers as they might be outdated in
-		# the system
-		append-flags "-isystem '${WORKDIR}/sys' -isystem '${WORKDIR}/include'"
-
-		cd "${S}"
-		NOFLAGSTRIP=yes freebsd_src_compile
-	fi
-}
-
-src_install() {
-	cd "${WORKDIR}/include"
-
-	[[ ${CTARGET} == ${CHOST} ]] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-
-	dodir "${INCLUDEDIR}"
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=$(tc-arch-kernel) \
-		DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed"
-
-	# Install math.h when crosscompiling, at this point
-	if [[ ${CHOST} != ${CTARGET} ]]; then
-		insinto "/usr/${CTARGET}/usr/include"
-		doins "${S}/msun/src/math.h"
-	fi
-
-	use _E_CROSS_HEADERS_ONLY && return 0
-
-	if [[ ${CTARGET} != ${CHOST} ]]; then
-		local csudir
-		if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
-		else
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
-		fi
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
-			FILESDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
-
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
-
-		cd "${S}/msun"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-	else
-		cd "${S}"
-		mkinstall || die "Install failed"
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
-
-	# install libstand files
-	dodir /usr/include/libstand
-	insinto /usr/include/libstand
-	doins ${S}/libstand/*.h
-
-	cd ${WORKDIR}/etc/
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	doins "etc.$(tc-arch-kernel)"/*
-}
-
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 8778800901ae..2c6c16be639a 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -26,19 +26,19 @@ MD5 7c6bf2b68cd685a9f76af8c0ea652599 files/freebsd-mk-defs-flex.patch 867
 RMD160 a6515de4317f00ec47765987ae3f5bbdd02bc489 files/freebsd-mk-defs-flex.patch 867
 SHA256 3373ded64bf6447a06e1a4e33acd0c3d758fee20488173ab9d6e891ed2399498 files/freebsd-mk-defs-flex.patch 867
 DIST freebsd-share-6.0.tar.bz2 3719732 RMD160 f2acb308d4f0d571e4ae1cb23b8248623a131017 SHA256 5314ba2f6abbc41b63c6f5aa30c802f373a0a398e5dff63402fa1225b77b7e86 size 3719732
-DIST freebsd-share-6.1_rc2.tar.bz2 3746442 RMD160 d45311e50ec1d730f7db3fdbf944bfb381435941 SHA256 a163f2e448b65d1f1ce115638ce00294eae5804af238b6d4a78abe72c21420c5 size 3746442
+DIST freebsd-share-6.1.tar.bz2 3745745 RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 size 3745745
 EBUILD freebsd-mk-defs-6.0-r1.ebuild 1034 RMD160 9c8cc2df3b4a5365aed4659e18fa9e903c48a527 SHA1 f1f701a23fb218acba2f4bd2296aceaf775c19af SHA256 2bc055ce1d2cf57276c1f894edf0a4c3ff880ad5d3599f481f9106dd7c1c5351 size 1034
 MD5 4080e59ebedc828d00e6324380a51d5e freebsd-mk-defs-6.0-r1.ebuild 1034
 RMD160 9c8cc2df3b4a5365aed4659e18fa9e903c48a527 freebsd-mk-defs-6.0-r1.ebuild 1034
 SHA256 2bc055ce1d2cf57276c1f894edf0a4c3ff880ad5d3599f481f9106dd7c1c5351 freebsd-mk-defs-6.0-r1.ebuild 1034
-EBUILD freebsd-mk-defs-6.1_rc2.ebuild 897 RMD160 1a65a57335b9621ad58619a85dba33f8f10d860c SHA1 3d6624ae5ea57183d9879d54096b9a0d1d0f3b3c SHA256 6a892c5a48510be92d921ca8120963f7b2edfae7cf8f2469a0854b4e6af2a2cf size 897
-MD5 3618c77e9021f1adc567100763d2d5c9 freebsd-mk-defs-6.1_rc2.ebuild 897
-RMD160 1a65a57335b9621ad58619a85dba33f8f10d860c freebsd-mk-defs-6.1_rc2.ebuild 897
-SHA256 6a892c5a48510be92d921ca8120963f7b2edfae7cf8f2469a0854b4e6af2a2cf freebsd-mk-defs-6.1_rc2.ebuild 897
-MISC ChangeLog 3935 RMD160 102f9ed94c1265bc7416ed277a46d332320e7e6b SHA1 c92784d1d0c8f71d7763be102ce1b5e3930ae5e2 SHA256 f77d86d50927d0777a36693ade9804c524302f770af548253e96d2a5921c3009 size 3935
-MD5 35486aac4e3735fe7ede82c866875a63 ChangeLog 3935
-RMD160 102f9ed94c1265bc7416ed277a46d332320e7e6b ChangeLog 3935
-SHA256 f77d86d50927d0777a36693ade9804c524302f770af548253e96d2a5921c3009 ChangeLog 3935
+EBUILD freebsd-mk-defs-6.1.ebuild 893 RMD160 ccfe2637ad39132abeefc10e235b235bda5f892e SHA1 ad385ee95559b3504093a8581d5bbbe2e4a1aad7 SHA256 501949c08e6a13777396de0e7cd9b1867f043a75d381afa37fb04dd241a3513d size 893
+MD5 e58a2e5ce1963faf97baa9fc77d768d2 freebsd-mk-defs-6.1.ebuild 893
+RMD160 ccfe2637ad39132abeefc10e235b235bda5f892e freebsd-mk-defs-6.1.ebuild 893
+SHA256 501949c08e6a13777396de0e7cd9b1867f043a75d381afa37fb04dd241a3513d freebsd-mk-defs-6.1.ebuild 893
+MISC ChangeLog 4114 RMD160 9abd026449f0b8db48bba343e8a26cf71af8b8cf SHA1 6bdc75e1e243159c201c43c93ddde2f4e447ec7c SHA256 a9ca3a3df6f26bb51fa393e97ec899fedf5bf14f4d7052270f2a8dbb731bb998 size 4114
+MD5 cdbc8093779b3457c52c11ffc77a04d2 ChangeLog 4114
+RMD160 9abd026449f0b8db48bba343e8a26cf71af8b8cf ChangeLog 4114
+SHA256 a9ca3a3df6f26bb51fa393e97ec899fedf5bf14f4d7052270f2a8dbb731bb998 ChangeLog 4114
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -46,13 +46,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 51273e3fe46983612a5f1fed9ca2b0e3 files/digest-freebsd-mk-defs-6.0-r1 259
 RMD160 46a82d1522095372780a69656537ff13cd6e636e files/digest-freebsd-mk-defs-6.0-r1 259
 SHA256 5cb4a1ab23ba7aeafa13416f967472520b4db1da1a8ad7fc9433df48ac754ed1 files/digest-freebsd-mk-defs-6.0-r1 259
-MD5 d587c27f1c060fb84b21e79ed5e62e07 files/digest-freebsd-mk-defs-6.1_rc2 271
-RMD160 f0ee45deb1e26c9ba089f4b9915077a14f413817 files/digest-freebsd-mk-defs-6.1_rc2 271
-SHA256 973fef7b4bd6751859c2436c84606c9bd89d34b86ed4529603cdb9863f51ac0c files/digest-freebsd-mk-defs-6.1_rc2 271
+MD5 f1a72782a0d392837ecacfc1931ee36d files/digest-freebsd-mk-defs-6.1 259
+RMD160 435f17331e2a54a6ee3811d7545237febace4c27 files/digest-freebsd-mk-defs-6.1 259
+SHA256 1e8cf2e0f827c824b234f8af349dbc641d3ba4763cdac3fdf1cf37f49dc8e8d8 files/digest-freebsd-mk-defs-6.1 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9VuAiZjviIA2XgRAk6zAJ98Djx+YjsqxQv09zWmz//NkSXV7QCfbcok
-A09rN0ZED0TsRx/DWivQ/is=
-=YHlG
+iD8DBQFEYEbUAiZjviIA2XgRAi5tAJ9pBJf4N95Z8dO3+Oa5BJ4RuOeusACfVyRM
+0q/zyJpPm9dzZnBHHmSEAII=
+=jdKv
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1_rc2 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1_rc2
deleted file mode 100644
index 6d3ae6239cee..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1420562cb87b900f9e2237242f51ae58 freebsd-share-6.1_rc2.tar.bz2 3746442
-RMD160 d45311e50ec1d730f7db3fdbf944bfb381435941 freebsd-share-6.1_rc2.tar.bz2 3746442
-SHA256 a163f2e448b65d1f1ce115638ce00294eae5804af238b6d4a78abe72c21420c5 freebsd-share-6.1_rc2.tar.bz2 3746442
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1_rc2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1_rc2.ebuild
deleted file mode 100644
index be62e61b091a..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1_rc2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1_rc2.ebuild,v 1.1 2006/05/02 21:55:51 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="nostrip"
-
-S="${WORKDIR}/share/mk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}/share
-	epatch "${FILESDIR}/${PN}-6.1-gentoo.patch"
-
-	[[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
-		epatch "${FILESDIR}/${PN}-6.0-gnu.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd
-	else
-		insinto /usr/share/mk
-	fi
-	doins *.mk
-}
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 7e6ed588ce1d..841f47894703 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -26,19 +26,19 @@ MD5 252ec73a62c30ee7a502aab5f4ed4c3b files/freebsd-pam-modules-6.0-gentoo.patch
 RMD160 f907769f6f0ded416fac03a1fb6b5531ff682070 files/freebsd-pam-modules-6.0-gentoo.patch 701
 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d files/freebsd-pam-modules-6.0-gentoo.patch 701
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 EBUILD freebsd-pam-modules-6.0.ebuild 1314 RMD160 3ff22b76d89ddc271518b5e8237387944adab479 SHA1 464a3ca4167a0ad7f96ee5b6028ab0d8ae139b49 SHA256 1ef6c0be49991f23577f282dcf252a60034cd07cd2dda53febe3630068d8458c size 1314
 MD5 0c5072a8ce386c4c91203999f8af4097 freebsd-pam-modules-6.0.ebuild 1314
 RMD160 3ff22b76d89ddc271518b5e8237387944adab479 freebsd-pam-modules-6.0.ebuild 1314
 SHA256 1ef6c0be49991f23577f282dcf252a60034cd07cd2dda53febe3630068d8458c freebsd-pam-modules-6.0.ebuild 1314
-EBUILD freebsd-pam-modules-6.1_rc2.ebuild 1287 RMD160 1b89c7adf140485a75ef867c6be5e4ca1ba6e92f SHA1 d09486011b0a89003ffa155e0bfdffb21a1b94ab SHA256 8481a7ec3ab176e0e3c416bf4d23a02c36debf2ee690e1d99d7bbd1453209e6a size 1287
-MD5 631de3d975f39f4eb9ba2b076d4cc223 freebsd-pam-modules-6.1_rc2.ebuild 1287
-RMD160 1b89c7adf140485a75ef867c6be5e4ca1ba6e92f freebsd-pam-modules-6.1_rc2.ebuild 1287
-SHA256 8481a7ec3ab176e0e3c416bf4d23a02c36debf2ee690e1d99d7bbd1453209e6a freebsd-pam-modules-6.1_rc2.ebuild 1287
-MISC ChangeLog 2832 RMD160 e0fdf93047128cb5a09d01bd2a843ed09d2b57bd SHA1 66b52a66ec3a94d82b70945cd34463ca1005af57 SHA256 414c01ee3edfb7c1b311de29e7e9e5759bbd398aef3887bd4a432184ecb4cbd8 size 2832
-MD5 157afae44451e7da90209619e67a0a17 ChangeLog 2832
-RMD160 e0fdf93047128cb5a09d01bd2a843ed09d2b57bd ChangeLog 2832
-SHA256 414c01ee3edfb7c1b311de29e7e9e5759bbd398aef3887bd4a432184ecb4cbd8 ChangeLog 2832
+EBUILD freebsd-pam-modules-6.1.ebuild 1283 RMD160 ad12bdf87865995f33b468f9dc99abf4b100e6e0 SHA1 60886560ba6db6f76b571a07653a181e8ac253b6 SHA256 54f27223e5b30916b3243a626dc63a22764c24f15f31520548370aecdc6d9f3c size 1283
+MD5 398d139a45d7547703d482cba8f14074 freebsd-pam-modules-6.1.ebuild 1283
+RMD160 ad12bdf87865995f33b468f9dc99abf4b100e6e0 freebsd-pam-modules-6.1.ebuild 1283
+SHA256 54f27223e5b30916b3243a626dc63a22764c24f15f31520548370aecdc6d9f3c freebsd-pam-modules-6.1.ebuild 1283
+MISC ChangeLog 3023 RMD160 704b17be8f8b6d6df7055775e3f7aba237633afd SHA1 71dce62a6d4a56c3441116fb3ce63a0c6b789c29 SHA256 887db07a0acb20e81c6062905ce198fdae6460eb6dd3dd7b685143901acfa513 size 3023
+MD5 fceca7f4b46b6efa8bec183e4b5c4e10 ChangeLog 3023
+RMD160 704b17be8f8b6d6df7055775e3f7aba237633afd ChangeLog 3023
+SHA256 887db07a0acb20e81c6062905ce198fdae6460eb6dd3dd7b685143901acfa513 ChangeLog 3023
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -46,13 +46,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 3f8b30a7524ee60de45cfe483e4a98ef files/digest-freebsd-pam-modules-6.0 253
 RMD160 ddc8cde12a8205b150fa1584831471d8e6edc26f files/digest-freebsd-pam-modules-6.0 253
 SHA256 19259c95eb76120fb8b21ac7f9dc26d985edc4eae7828df6c41fe6d0d6bff59d files/digest-freebsd-pam-modules-6.0 253
-MD5 149608fee7d4956de1e2a38f9cad3d30 files/digest-freebsd-pam-modules-6.1_rc2 265
-RMD160 82fb841537780fec91cbae8e2d5597e701e60a0c files/digest-freebsd-pam-modules-6.1_rc2 265
-SHA256 94da21e6c258eaa31249ea7bdf9248799d981cc684e2cea1e92c64913d3345d4 files/digest-freebsd-pam-modules-6.1_rc2 265
+MD5 28f38d75ce4d75e9729c3a6b307a1ad5 files/digest-freebsd-pam-modules-6.1 253
+RMD160 5b8810953e6bf6bd851c5666f9aac0c6f1410326 files/digest-freebsd-pam-modules-6.1 253
+SHA256 8272117e05da623b3d53d7f2e637d1c3f649ff2516ceeb0966bc884df138c25f files/digest-freebsd-pam-modules-6.1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9WfAiZjviIA2XgRAhyBAKCv/qkDsWJm/7gepKoLZ7v9jXmeaQCeMLuZ
-/Y1G6qO+dS4x9fObKRm8ei8=
-=IDKl
+iD8DBQFEYEcCAiZjviIA2XgRAoBxAJ9OgEt3id8s3IZd6PA0X1EApaPzBwCfUQpq
+Iwu7OxQeyQu4oH9i3tu0jf0=
+=KWmx
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1_rc2 b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1_rc2
deleted file mode 100644
index 1b25ae0e5a49..000000000000
--- a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc2.ebuild
deleted file mode 100644
index b11da47fac8f..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1_rc2.ebuild,v 1.1 2006/05/02 21:56:40 flameeyes Exp $
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="kerberos nis"
-
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-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() {
-	unpack ${A}
-
-	cd ${WORKDIR}/lib
-
-	for module in pam_deny pam_passwdqc pam_permit; do
-		sed -i -e "s:${module}::" ${S}/modules.inc
-	done
-
-	# Avoid using static versions; use gentoo /lib/security dir
-	epatch ${FILESDIR}/${PN}-6.0-gentoo.patch
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/5.4/README.pamd"
-	dopamd "${FILESDIR}/5.4/pam.d/"*
-}
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index 225cda946454..a4529cb8a50b 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -14,27 +14,27 @@ MD5 63bc3f738d51075d091f6c6e5d7f5de6 files/pf.initd 921
 RMD160 ea7ae600979120282cc653a056309a1826507d6f files/pf.initd 921
 SHA256 03f35f86697fcdd6667ea4688304f7331b8c0aa56c755cad780563d65b8e6c25 files/pf.initd 921
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
+DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 size 184045
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
+DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 size 277860
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
+DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 size 1156163
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
+DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e size 2664570
 EBUILD freebsd-pf-6.0-r1.ebuild 1329 RMD160 c1bc8c2aa307b8005378369b0c8d4691f0f77efd SHA1 3772f6d20515a2689469612fc3618fe19ee1ac12 SHA256 5230e829058399b3d0eabbe69d069ce7d05a1ca952a37a67f5dec012bfded212 size 1329
 MD5 f93b3c42a4a9135686df3ba810adaff8 freebsd-pf-6.0-r1.ebuild 1329
 RMD160 c1bc8c2aa307b8005378369b0c8d4691f0f77efd freebsd-pf-6.0-r1.ebuild 1329
 SHA256 5230e829058399b3d0eabbe69d069ce7d05a1ca952a37a67f5dec012bfded212 freebsd-pf-6.0-r1.ebuild 1329
-EBUILD freebsd-pf-6.1_rc2.ebuild 1352 RMD160 6987b1bb44ff781c6200c524d594c0ebb41c19ec SHA1 1fdac861aa725ff94ab5c1d7fd5028e868a3a8d2 SHA256 9cd4dfc2ddfb599c615bf3955b09b8bb44089144f0d8029bdaae695f3c073e94 size 1352
-MD5 36b8ece04fd4670f2b5a8899c82b82e0 freebsd-pf-6.1_rc2.ebuild 1352
-RMD160 6987b1bb44ff781c6200c524d594c0ebb41c19ec freebsd-pf-6.1_rc2.ebuild 1352
-SHA256 9cd4dfc2ddfb599c615bf3955b09b8bb44089144f0d8029bdaae695f3c073e94 freebsd-pf-6.1_rc2.ebuild 1352
-MISC ChangeLog 2000 RMD160 54a97b9676364e12f78f7b930f76f27168543da0 SHA1 b0dfc59f1c9f9f7b7f7dc52e9fca5a08a3950880 SHA256 370e09062842a8b28130e72f841f740c4b1df1656575b41d0fe9b6845c6a69a5 size 2000
-MD5 b912bfaacec0b44b2c768b9d6bdd251f ChangeLog 2000
-RMD160 54a97b9676364e12f78f7b930f76f27168543da0 ChangeLog 2000
-SHA256 370e09062842a8b28130e72f841f740c4b1df1656575b41d0fe9b6845c6a69a5 ChangeLog 2000
+EBUILD freebsd-pf-6.1.ebuild 1348 RMD160 228b3a425e464df05377dd6f5a60e16b22d4bab7 SHA1 2fafd28ceab2577df8732dbde61c04232f119b37 SHA256 3d45b2c12e041b5d730606b30c3d7d45a4ef16680d01104ddc1e3fecd85b62b2 size 1348
+MD5 8243e7630b60f02ef285cd31acbf2b9d freebsd-pf-6.1.ebuild 1348
+RMD160 228b3a425e464df05377dd6f5a60e16b22d4bab7 freebsd-pf-6.1.ebuild 1348
+SHA256 3d45b2c12e041b5d730606b30c3d7d45a4ef16680d01104ddc1e3fecd85b62b2 freebsd-pf-6.1.ebuild 1348
+MISC ChangeLog 2164 RMD160 0c27578fffa92e2146698f1a7897ffacdaa66729 SHA1 eb87a19924745bbe6089814b16d6a0ed9c2fddb7 SHA256 f234d50fd26ff0167a5fda9dc4711d17ec5deec1782a602e652e683a6ab94b81 size 2164
+MD5 1be852f07c93f55affcde3b9e924e52c ChangeLog 2164
+RMD160 0c27578fffa92e2146698f1a7897ffacdaa66729 ChangeLog 2164
+SHA256 f234d50fd26ff0167a5fda9dc4711d17ec5deec1782a602e652e683a6ab94b81 ChangeLog 2164
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -42,13 +42,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 85901762b1b5797d4c97aa0cdd7be3e1 files/digest-freebsd-pf-6.0-r1 1295
 RMD160 dfaa6acbcc3a5282d41b3204342dda0e0c906fa8 files/digest-freebsd-pf-6.0-r1 1295
 SHA256 24290e8449f22ded1c68fe86e421e332e96d5dc384d37a79b93aa68cbb8d2b60 files/digest-freebsd-pf-6.0-r1 1295
-MD5 88f9a516b656f762ce99377e79bbc717 files/digest-freebsd-pf-6.1_rc2 1355
-RMD160 16c148ddc7a0d1c48c793276b4befbb14398cd57 files/digest-freebsd-pf-6.1_rc2 1355
-SHA256 a22186b248c3e99bf6505f7cca752dbbfd4466b17d51534728fe563d7c40e8e3 files/digest-freebsd-pf-6.1_rc2 1355
+MD5 49c0ffe57ce74d5d3e4f85d279f496d8 files/digest-freebsd-pf-6.1 1295
+RMD160 9ed0328fa4727e763ca395067e68319b48bcf4fb files/digest-freebsd-pf-6.1 1295
+SHA256 2e4d1db51f0855f578e1dce413bac127b1a0ac7ac105946c53463e7929216c0b files/digest-freebsd-pf-6.1 1295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9XZAiZjviIA2XgRAkAoAKCWmhM4fy1Wr9TCwyf6Tqatpj/6twCdE6M5
-89nlVl0bGiinNN/ctmpDe3Y=
-=gBlS
+iD8DBQFEYEc6AiZjviIA2XgRAutKAJ466yTbQlxkSCzZ+JmD4OLNs7nwPACeOwxY
+7JFlplW9ED5YcD+FHYFBk5c=
+=oJNP
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc2 b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc2
deleted file mode 100644
index f46cc743c32d..000000000000
--- a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1_rc2
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 1d2d7469eb731dcff01781fb757ad6ef freebsd-etc-6.1_rc2.tar.bz2 183869
-RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 freebsd-etc-6.1_rc2.tar.bz2 183869
-SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be freebsd-etc-6.1_rc2.tar.bz2 183869
-MD5 24f9fb6752c6800db5a98da9c4bb19c9 freebsd-libexec-6.1_rc2.tar.bz2 277785
-RMD160 7e6c035b414287241d22a48e809aae8a243bff38 freebsd-libexec-6.1_rc2.tar.bz2 277785
-SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 freebsd-libexec-6.1_rc2.tar.bz2 277785
-MD5 db39af0d7136e230fa609356ec0c87fd freebsd-sbin-6.1_rc2.tar.bz2 1157065
-RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 freebsd-sbin-6.1_rc2.tar.bz2 1157065
-SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f freebsd-sbin-6.1_rc2.tar.bz2 1157065
-MD5 f2c82f1d20cb8b9eae56c129b0b78549 freebsd-usbin-6.1_rc2.tar.bz2 2663193
-RMD160 f183a024fcbce51156330410ba08bae2aeae055f freebsd-usbin-6.1_rc2.tar.bz2 2663193
-SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 freebsd-usbin-6.1_rc2.tar.bz2 2663193
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc2.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc2.ebuild
deleted file mode 100644
index 29d79d9ad8ef..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-6.1_rc2.ebuild,v 1.1 2006/05/02 21:57:36 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	sys-freebsd/freebsd-mk-defs
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="libexec/ftp-proxy usr.sbin/authpf sbin/pfctl sbin/pflogd"
-
-PATCHES="${FILESDIR}/${PN}-6.0-pcap.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	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
-
-	newinitd "${FILESDIR}/pf.initd" pf
-	newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index 4991b7e9751e..6bae5428532b 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -10,37 +10,37 @@ MD5 1eb113940f2deb194fc0e8050a998b93 files/freebsd-rescue-5.4-sbin-gentoo.patch
 RMD160 00982cbcd0922847d8754388e5a5e27df7cf7436 files/freebsd-rescue-5.4-sbin-gentoo.patch 817
 SHA256 8e9c30fb3a3e1344fadc63039165080bfb50ef8ea989383b67b8a343f7436fed files/freebsd-rescue-5.4-sbin-gentoo.patch 817
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
+DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 size 405680
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-gnu-6.0.tar.bz2 866160 RMD160 7e98304027683188a9cbf12811fc3ce9e1923cff SHA256 ad1c93881074763daa0305d72eb365b5a2c7154f9fecfc73b8e369991ba6e6b3 size 866160
-DIST freebsd-gnu-6.1_rc2.tar.bz2 867149 RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 size 867149
+DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 size 867244
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
+DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 size 277860
 DIST freebsd-rescue-6.0.tar.bz2 4939 size 4939
-DIST freebsd-rescue-6.1_rc2.tar.bz2 4944 RMD160 46338046e36478ad76bd0c7700b3052bf4224735 SHA256 73d48f0e48b18e4a54054173785f9ce62916dc679b54eb645b46a70ee934be72 size 4944
+DIST freebsd-rescue-6.1.tar.bz2 4949 RMD160 334e1904b0240d80fcec7b3681eb8bb37f3a6f73 SHA256 3801dfb9cf608b106ff0621a1b69df92290da9baa4af23c2e3b7d22193c211aa size 4949
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
+DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 size 1156163
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
-DIST freebsd-sys-6.1_rc2.tar.bz2 17197678 RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 size 17197678
+DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f size 17361671
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
+DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 size 1763218
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
+DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e size 2664570
 EBUILD freebsd-rescue-6.0.ebuild 1344 RMD160 53841752e1a05e70c2e05fbba53cf6492c708d2e SHA1 069768eaf1655caf5a2bb9c54f7986299577b5f6 SHA256 482ab9af3857e6a4b998de390ff5c9f21886a5179efcf925e50e37c1c4db2915 size 1344
 MD5 05bdcef7237378530928df5e003f542f freebsd-rescue-6.0.ebuild 1344
 RMD160 53841752e1a05e70c2e05fbba53cf6492c708d2e freebsd-rescue-6.0.ebuild 1344
 SHA256 482ab9af3857e6a4b998de390ff5c9f21886a5179efcf925e50e37c1c4db2915 freebsd-rescue-6.0.ebuild 1344
-EBUILD freebsd-rescue-6.1_rc2.ebuild 1411 RMD160 0b32185a7a648d89e683fe61380e9c5e61227334 SHA1 4c24abc4b05b58d2aa716e057d8a1c1a1b5ab5c7 SHA256 90dbfc2fbc4584c95604c027bdf54018ca369856f7978d480c677c0818d58bb8 size 1411
-MD5 25dee19bc35b6a4337742b5f866d8d8c freebsd-rescue-6.1_rc2.ebuild 1411
-RMD160 0b32185a7a648d89e683fe61380e9c5e61227334 freebsd-rescue-6.1_rc2.ebuild 1411
-SHA256 90dbfc2fbc4584c95604c027bdf54018ca369856f7978d480c677c0818d58bb8 freebsd-rescue-6.1_rc2.ebuild 1411
-MISC ChangeLog 1645 RMD160 effcef79491631fe43ede1d5177221d8b99313a6 SHA1 6d8f897f696f1f463cbb8c7653e6241fec8e432d SHA256 c6a50a677b018288c1a8eea0e76225167b43347271afd9f8d98c342fa89551cf size 1645
-MD5 0c32f14f01ac8121421f23a471c16f2d ChangeLog 1645
-RMD160 effcef79491631fe43ede1d5177221d8b99313a6 ChangeLog 1645
-SHA256 c6a50a677b018288c1a8eea0e76225167b43347271afd9f8d98c342fa89551cf ChangeLog 1645
+EBUILD freebsd-rescue-6.1.ebuild 1407 RMD160 f26ea130a21c7a7112ff11b4dd1fc6f18b820385 SHA1 9ad3d239356dbcca800ade2eb0a4a270c677dfec SHA256 951ead3b6c9b746d7957c78bb3fd736883327379118c108dc1aba2c7c0184e86 size 1407
+MD5 7bf030dc03f1414f61bf06253eb187a5 freebsd-rescue-6.1.ebuild 1407
+RMD160 f26ea130a21c7a7112ff11b4dd1fc6f18b820385 freebsd-rescue-6.1.ebuild 1407
+SHA256 951ead3b6c9b746d7957c78bb3fd736883327379118c108dc1aba2c7c0184e86 freebsd-rescue-6.1.ebuild 1407
+MISC ChangeLog 1821 RMD160 58073da52bd3cfa45b34e0a8d648c5da0862642a SHA1 c1e3b4688ae3b87afe201fead48c707ff4194b8f SHA256 68fa5df4144439f857ad783a0e0713a6b2f7850af0135c3f4b6a280842f69f85 size 1821
+MD5 37fd802a348e92216ad481f9cd1f36ca ChangeLog 1821
+RMD160 58073da52bd3cfa45b34e0a8d648c5da0862642a ChangeLog 1821
+SHA256 68fa5df4144439f857ad783a0e0713a6b2f7850af0135c3f4b6a280842f69f85 ChangeLog 1821
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -48,13 +48,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 1116dfa305b8808b96442ace49d27ce4 files/digest-freebsd-rescue-6.0 2379
 RMD160 0d0bd65ae84eb68b04bd87545098304477907572 files/digest-freebsd-rescue-6.0 2379
 SHA256 6678f801523cd128dccc6dc28685139a9c378376383545659001d8812c4f4fd8 files/digest-freebsd-rescue-6.0 2379
-MD5 7fff65d4db2f001dc74abf3dc947d5f1 files/digest-freebsd-rescue-6.1_rc2 2683
-RMD160 f12de6a8eccdd55fb79a126cb2cc00e08833d90d files/digest-freebsd-rescue-6.1_rc2 2683
-SHA256 901992125c5309a1c34b354436b31a9d2728f17f9f56652b30d8547d2ef53cee files/digest-freebsd-rescue-6.1_rc2 2683
+MD5 650c6e5c9b451aecd30682f8bc83479f files/digest-freebsd-rescue-6.1 2563
+RMD160 d02c93da4336f2e5d6285f32a096c3899e768e50 files/digest-freebsd-rescue-6.1 2563
+SHA256 5fee6bbca127d5b7174e412d0913433b83abc7316c408b013545019ba2fa7bbe files/digest-freebsd-rescue-6.1 2563
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9YZAiZjviIA2XgRAmL7AJ9HdsK/66xK+2/vUnsDPPnRo6Fq+wCfZHzs
-s8govrJZfghfKbat+B0XamI=
-=strm
+iD8DBQFEYEd7AiZjviIA2XgRAlgVAJ4owkrBoNMzGQokyO8MygYglJB8KACdHacT
+RxLLaTmNEJB/voPS08Xa2ck=
+=QC15
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1_rc2 b/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1_rc2
deleted file mode 100644
index bb92c7f752d0..000000000000
--- a/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1_rc2
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 0e02e2ac409d7048189b2afebe178f42 freebsd-bin-6.1_rc2.tar.bz2 405452
-RMD160 8eee2799407c09dfc9a114860a48b490c5393504 freebsd-bin-6.1_rc2.tar.bz2 405452
-SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 freebsd-bin-6.1_rc2.tar.bz2 405452
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 876061a056183fda4a8c6fd71b875dff freebsd-gnu-6.1_rc2.tar.bz2 867149
-RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc freebsd-gnu-6.1_rc2.tar.bz2 867149
-SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 freebsd-gnu-6.1_rc2.tar.bz2 867149
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
-MD5 24f9fb6752c6800db5a98da9c4bb19c9 freebsd-libexec-6.1_rc2.tar.bz2 277785
-RMD160 7e6c035b414287241d22a48e809aae8a243bff38 freebsd-libexec-6.1_rc2.tar.bz2 277785
-SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 freebsd-libexec-6.1_rc2.tar.bz2 277785
-MD5 0e2fd265c7f489c904cbc2692483ce91 freebsd-rescue-6.1_rc2.tar.bz2 4944
-RMD160 46338046e36478ad76bd0c7700b3052bf4224735 freebsd-rescue-6.1_rc2.tar.bz2 4944
-SHA256 73d48f0e48b18e4a54054173785f9ce62916dc679b54eb645b46a70ee934be72 freebsd-rescue-6.1_rc2.tar.bz2 4944
-MD5 db39af0d7136e230fa609356ec0c87fd freebsd-sbin-6.1_rc2.tar.bz2 1157065
-RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 freebsd-sbin-6.1_rc2.tar.bz2 1157065
-SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f freebsd-sbin-6.1_rc2.tar.bz2 1157065
-MD5 232a881d16f64a526796fcd6a054c495 freebsd-sys-6.1_rc2.tar.bz2 17197678
-RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f freebsd-sys-6.1_rc2.tar.bz2 17197678
-SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 freebsd-sys-6.1_rc2.tar.bz2 17197678
-MD5 3d35f39660e85c2e9dce5e0edd2e13a5 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-RMD160 fa35447815178e306792f5f2a60376c0903827a0 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-MD5 f2c82f1d20cb8b9eae56c129b0b78549 freebsd-usbin-6.1_rc2.tar.bz2 2663193
-RMD160 f183a024fcbce51156330410ba08bae2aeae055f freebsd-usbin-6.1_rc2.tar.bz2 2663193
-SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 freebsd-usbin-6.1_rc2.tar.bz2 2663193
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1_rc2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1_rc2.ebuild
deleted file mode 100644
index 64884a5d767a..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1_rc2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1_rc2.ebuild,v 1.1 2006/05/02 21:58:37 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm nis"
-
-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"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
-	for flag in atm nis; do
-		if use ${flag} && ! built_with_use sys-libs/freebsd-lib ${flag}; then
-			die "You can't add ${flag} support here without adding it to sys-libs/freebsd-lib"
-		fi
-	done
-
-#	append-flags -fno-stack-protector -fno-stack-protector-all
-}
-
-src_unpack() {
-	freebsd_src_unpack
-
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd ${WORKDIR}
-	epatch ${FILESDIR}/${PN}-5.4-gentoo.patch
-	epatch ${FILESDIR}/${PN}-5.4-sbin-gentoo.patch
-}
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index eab6172d6945..c947366bde6d 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -26,29 +26,29 @@ MD5 edcf04ea876f3ac2275867633fa4e96d files/sysctl.initd 778
 RMD160 09ed017c2dd767db57cfa71da6c9d656a8fbb23b files/sysctl.initd 778
 SHA256 12f1bbcd72244579ae3b23d2455a00739cc6ff074f68cbb7db1410d19c0f69f4 files/sysctl.initd 778
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
+DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 size 184045
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
+DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 size 277860
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
+DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 size 1156163
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
+DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e size 2664570
 EBUILD freebsd-sbin-6.0-r1.ebuild 2127 RMD160 b0bc72f6c2a9a62b23297e431feedc12f32c76e6 SHA1 2093aae1c6d5c9fc3c7575b8aec98a1d069122a4 SHA256 09ece1d5395fbb75a039746906ad4fc4d0cb815763188eac38c9282b765e958f size 2127
 MD5 226f3c852e244b961b05828ee84cef56 freebsd-sbin-6.0-r1.ebuild 2127
 RMD160 b0bc72f6c2a9a62b23297e431feedc12f32c76e6 freebsd-sbin-6.0-r1.ebuild 2127
 SHA256 09ece1d5395fbb75a039746906ad4fc4d0cb815763188eac38c9282b765e958f freebsd-sbin-6.0-r1.ebuild 2127
-EBUILD freebsd-sbin-6.1_rc2.ebuild 2194 RMD160 869c2e5baf55b29c5a81f5d1511c0b5a4290d3b6 SHA1 9768a8914f889bd0a89e72f58ffd3823c8637900 SHA256 ff789006715eb680f4d86049e195d50422448c44e6fd570a8a2641056e9667fc size 2194
-MD5 ca8a19d175a7557a32d1ae71f1683c92 freebsd-sbin-6.1_rc2.ebuild 2194
-RMD160 869c2e5baf55b29c5a81f5d1511c0b5a4290d3b6 freebsd-sbin-6.1_rc2.ebuild 2194
-SHA256 ff789006715eb680f4d86049e195d50422448c44e6fd570a8a2641056e9667fc freebsd-sbin-6.1_rc2.ebuild 2194
-MISC ChangeLog 4583 RMD160 ee21175e6bac32a9a5dde29004cc6507839ab668 SHA1 d4829b75a33a9484409a5f0f4f8c7f10ac5fe1f2 SHA256 8140b0c94c36b98254e9bf4407f272f0e80d85cdf31bf4e0ff69e6474274293b size 4583
-MD5 8872834568a0871ff0c85b1d4e97b46e ChangeLog 4583
-RMD160 ee21175e6bac32a9a5dde29004cc6507839ab668 ChangeLog 4583
-SHA256 8140b0c94c36b98254e9bf4407f272f0e80d85cdf31bf4e0ff69e6474274293b ChangeLog 4583
+EBUILD freebsd-sbin-6.1.ebuild 2190 RMD160 444bf8b5cebb733282f1d9b74d3e7005b86da889 SHA1 d6e8cd5a0e2b0d895f6e5981da5b2fc0e1c24dfc SHA256 7e5d761da5161cc47e62d8ae377c1f1b425c9f1bff35ac077891d8e8b61ea138 size 2190
+MD5 aef27a1c0dbff639ec24180e31ceb4df freebsd-sbin-6.1.ebuild 2190
+RMD160 444bf8b5cebb733282f1d9b74d3e7005b86da889 freebsd-sbin-6.1.ebuild 2190
+SHA256 7e5d761da5161cc47e62d8ae377c1f1b425c9f1bff35ac077891d8e8b61ea138 freebsd-sbin-6.1.ebuild 2190
+MISC ChangeLog 4753 RMD160 2e20621f052a77190563bb6a4da714a8e1f4bf00 SHA1 a210847d3a4b33cb6188de05757875d044c00cd1 SHA256 cca15930bdd74134926591d51984e805201231702c55fd3d57115be35947b228 size 4753
+MD5 26e1379ccb96e8f720dd5563ea43e775 ChangeLog 4753
+RMD160 2e20621f052a77190563bb6a4da714a8e1f4bf00 ChangeLog 4753
+SHA256 cca15930bdd74134926591d51984e805201231702c55fd3d57115be35947b228 ChangeLog 4753
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -56,13 +56,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 5fd83bcbf48686bcd615b60799613cce files/digest-freebsd-sbin-6.0-r1 1548
 RMD160 bf64735bbceeed83ebccd22f2b3a989100e6ec31 files/digest-freebsd-sbin-6.0-r1 1548
 SHA256 c10cfdca82d0a375d105c9ec1834a52f8ebab8e1ab244cedb63ff06f29d39c05 files/digest-freebsd-sbin-6.0-r1 1548
-MD5 1d07ec06d5e2c43bf7e3832813d71deb files/digest-freebsd-sbin-6.1_rc2 1620
-RMD160 b91ef2a5cfd9e7f37b982410975a889c13251cae files/digest-freebsd-sbin-6.1_rc2 1620
-SHA256 587e973d251300bb09571b9ca2a35031ac20cbd1e95fbc1c99a691d97807bc9c files/digest-freebsd-sbin-6.1_rc2 1620
+MD5 4afd3864120ad05017029f351a0d66d9 files/digest-freebsd-sbin-6.1 1548
+RMD160 86cc454e257ee1b32116424de0ef07518905d51e files/digest-freebsd-sbin-6.1 1548
+SHA256 3ede2f3a4050bce0bce2b41f1e338e87f862e2362d7a922d7b540c495f61d8da files/digest-freebsd-sbin-6.1 1548
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9ZYAiZjviIA2XgRAuz6AJ4n4bBwifXf3uh1pnflqQ4iTwkHYQCdEpBz
-hC3KPmdzyLUfZFikr0KM3zQ=
-=6Q29
+iD8DBQFEYEe2AiZjviIA2XgRAi3iAJ0UR7SUj7mOby/1teNavFEGwtA5zwCglVUu
+XZQu0PCvjhv9Jie2ZCosPPQ=
+=Qk+E
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc2 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc2
deleted file mode 100644
index 6db4abe3c317..000000000000
--- a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc2
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 1d2d7469eb731dcff01781fb757ad6ef freebsd-etc-6.1_rc2.tar.bz2 183869
-RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 freebsd-etc-6.1_rc2.tar.bz2 183869
-SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be freebsd-etc-6.1_rc2.tar.bz2 183869
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
-MD5 24f9fb6752c6800db5a98da9c4bb19c9 freebsd-libexec-6.1_rc2.tar.bz2 277785
-RMD160 7e6c035b414287241d22a48e809aae8a243bff38 freebsd-libexec-6.1_rc2.tar.bz2 277785
-SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 freebsd-libexec-6.1_rc2.tar.bz2 277785
-MD5 db39af0d7136e230fa609356ec0c87fd freebsd-sbin-6.1_rc2.tar.bz2 1157065
-RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 freebsd-sbin-6.1_rc2.tar.bz2 1157065
-SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f freebsd-sbin-6.1_rc2.tar.bz2 1157065
-MD5 f2c82f1d20cb8b9eae56c129b0b78549 freebsd-usbin-6.1_rc2.tar.bz2 2663193
-RMD160 f183a024fcbce51156330410ba08bae2aeae055f freebsd-usbin-6.1_rc2.tar.bz2 2663193
-SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 freebsd-usbin-6.1_rc2.tar.bz2 2663193
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc2.ebuild
deleted file mode 100644
index 019543223c56..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc2.ebuild,v 1.1 2006/05/02 21:59:39 flameeyes Exp $
-
-inherit flag-o-matic bsdmk freebsd
-
-DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~x86-fbsd"
-SLOT="0"
-
-SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	ssl? ( dev-libs/openssl )
-	sys-libs/readline
-	sys-process/vixie-cron"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-PROVIDE="virtual/dev-manager
-	virtual/dhcpc"
-
-S="${WORKDIR}/sbin"
-
-IUSE="atm ipfilter ipv6 vinum suid ssl"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use vinum || mymakeopts="${mymakeopts} NO_VINUM= "
-	use suid || mymakeopts="${mymakeopts} NO_SUID= "
-
-	# O3 breaks this, apparently
-	replace-flags -O3 -O2
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd"
-
-PATCHES="${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-zlib.patch"
-
-src_unpack() {
-	freebsd_src_unpack
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-6.1-devd-conf.patch"
-}
-
-src_install() {
-	freebsd_src_install
-	keepdir /var/log
-
-	newinitd ${FILESDIR}/ipfw.initd ipfw
-	newinitd ${FILESDIR}/sysctl.initd sysctl
-
-	cd ${WORKDIR}/etc/
-	insinto /etc
-	doins devd.conf pccard_ether defaults/pccard.conf minfree rc.firewall \
-		sysctl.conf
-
-	# 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/*.ip6fwlimit \
-		security/*.ip6fwdenied \
-		security/*.ipfwdenied
-
-	use ipfilter && doperiodic security \
-		security/*.ipf6denied \
-		security/*.ipfdenied
-}
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index d30c044ffc9a..1fa3ad7ffe9b 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -14,35 +14,35 @@ MD5 5b3ed8d353ad16881f8786815724678a files/freebsd-share-6.0-links.patch 539
 RMD160 272e428e61ceb22e204bf82bce94bc808c67f4b3 files/freebsd-share-6.0-links.patch 539
 SHA256 4858d5ba24d64ff41111142eeeecdb226703501b7a637b03baa3a7f5d0af9261 files/freebsd-share-6.0-links.patch 539
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
+DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 size 405680
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
+DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 size 184045
 DIST freebsd-gnu-6.0.tar.bz2 866160 RMD160 7e98304027683188a9cbf12811fc3ce9e1923cff SHA256 ad1c93881074763daa0305d72eb365b5a2c7154f9fecfc73b8e369991ba6e6b3 size 866160
-DIST freebsd-gnu-6.1_rc2.tar.bz2 867149 RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 size 867149
+DIST freebsd-gnu-6.1.tar.bz2 867244 RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 size 867244
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
+DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 size 1156163
 DIST freebsd-share-6.0.tar.bz2 3719732 RMD160 f2acb308d4f0d571e4ae1cb23b8248623a131017 SHA256 5314ba2f6abbc41b63c6f5aa30c802f373a0a398e5dff63402fa1225b77b7e86 size 3719732
-DIST freebsd-share-6.1_rc2.tar.bz2 3746442 RMD160 d45311e50ec1d730f7db3fdbf944bfb381435941 SHA256 a163f2e448b65d1f1ce115638ce00294eae5804af238b6d4a78abe72c21420c5 size 3746442
+DIST freebsd-share-6.1.tar.bz2 3745745 RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 size 3745745
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
+DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 size 1763218
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
+DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e size 2664570
 EBUILD freebsd-share-6.0-r1.ebuild 1734 RMD160 6c04383d4f924bfa305909cabbd9d6c2e10f4f38 SHA1 e889315c5f7830b88b929a533af530683dea4e1a SHA256 8214dd31e0b0c7b20b5ddb0efaacdc41126acb59def01b5edbaf080e0b71c489 size 1734
 MD5 81b5b0be188ed81fd608e066a07b5d93 freebsd-share-6.0-r1.ebuild 1734
 RMD160 6c04383d4f924bfa305909cabbd9d6c2e10f4f38 freebsd-share-6.0-r1.ebuild 1734
 SHA256 8214dd31e0b0c7b20b5ddb0efaacdc41126acb59def01b5edbaf080e0b71c489 freebsd-share-6.0-r1.ebuild 1734
-EBUILD freebsd-share-6.1_rc2.ebuild 1764 RMD160 576b74b5ba1ea2b8a44f618a13da38bcd1250427 SHA1 dd588d22d878cf8b4569e0b1338a01ce6c7ea532 SHA256 e428d52e26e93a977e9eed4f67f85f30c33ff9a44b74052e35edb8683a68d4d4 size 1764
-MD5 08fdacf329f91cc7246042a24d9068df freebsd-share-6.1_rc2.ebuild 1764
-RMD160 576b74b5ba1ea2b8a44f618a13da38bcd1250427 freebsd-share-6.1_rc2.ebuild 1764
-SHA256 e428d52e26e93a977e9eed4f67f85f30c33ff9a44b74052e35edb8683a68d4d4 freebsd-share-6.1_rc2.ebuild 1764
-MISC ChangeLog 2962 RMD160 531612fb0b79f78c8e37907cedf93d5164ef051a SHA1 8b54d8476fd7ce97a8b4f01b202498b3f406c1d0 SHA256 35c2d681136f9c1ad283010765f414886989761165316fa09c0040377c47ef5a size 2962
-MD5 5903a932e7bbab06c2516f7634d1b08a ChangeLog 2962
-RMD160 531612fb0b79f78c8e37907cedf93d5164ef051a ChangeLog 2962
-SHA256 35c2d681136f9c1ad283010765f414886989761165316fa09c0040377c47ef5a ChangeLog 2962
+EBUILD freebsd-share-6.1.ebuild 1760 RMD160 6e118e18dc3cf300fe3c38c53ab11578b418914e SHA1 e8c6dcc72bce2a6716279782718e3f38d31cbbf8 SHA256 b850e304a49da5fc91c5484bd89df995639d5e9e2bd5f15adb4096fa1dff62d9 size 1760
+MD5 311d235fbb4e5f49e2d4cea81f77e2aa freebsd-share-6.1.ebuild 1760
+RMD160 6e118e18dc3cf300fe3c38c53ab11578b418914e freebsd-share-6.1.ebuild 1760
+SHA256 b850e304a49da5fc91c5484bd89df995639d5e9e2bd5f15adb4096fa1dff62d9 freebsd-share-6.1.ebuild 1760
+MISC ChangeLog 3135 RMD160 cdfe898699161c1cb54726ad366a38acb6d87fea SHA1 ac7e6ba2ded7861e4072314fe821c9dffb48a5af SHA256 14c596863579d7de01bf0d618c3a8ed0d88d2880f25547e1a7bcb5dca4f4ca4f size 3135
+MD5 1a3dfc67060ac7d647e1c85aa8f44234 ChangeLog 3135
+RMD160 cdfe898699161c1cb54726ad366a38acb6d87fea ChangeLog 3135
+SHA256 14c596863579d7de01bf0d618c3a8ed0d88d2880f25547e1a7bcb5dca4f4ca4f ChangeLog 3135
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -50,13 +50,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 19fcc8bd1bce9e9f8789a41a4dc2bb42 files/digest-freebsd-share-6.0-r1 2301
 RMD160 051abc7348b55916a5cdc3a2d7182938839a7c4a files/digest-freebsd-share-6.0-r1 2301
 SHA256 1ce361c768542499214da47548a18e3482adb79ee88aef42d5e8fd3fb5db32d1 files/digest-freebsd-share-6.0-r1 2301
-MD5 e459de41faab371c8d0b753c6354d7cf files/digest-freebsd-share-6.1_rc2 2409
-RMD160 b3ee33fe7a963fccfe85b54f12355d05af0edef7 files/digest-freebsd-share-6.1_rc2 2409
-SHA256 1ac1d267be3824b025e2bccc635a7d2001d886a196c10edd1642ac197c9db9ea files/digest-freebsd-share-6.1_rc2 2409
+MD5 9dd683f10a3c5bfcf614a90900b43e57 files/digest-freebsd-share-6.1 2301
+RMD160 1af09cac4e39812f0124e38b0c8142c9e9184127 files/digest-freebsd-share-6.1 2301
+SHA256 3306e2a404841662bed25ff0b656ca44560a631103ca04ce3c351dce6900229a files/digest-freebsd-share-6.1 2301
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9aWAiZjviIA2XgRAo2kAKDYfa+AqfIomFHSf2EMh1yTI889ngCgnm+F
-tLUIJuO96qXIcT99TnJZJCs=
-=txbR
+iD8DBQFEYEf2AiZjviIA2XgRAuGuAKCVJpHhdhLLN9IxtjBqrVkpuvGvPACgyLjd
+ao1+83k9aVej8zuMH2HCSBo=
+=Ee+c
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1_rc2 b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1_rc2
deleted file mode 100644
index 2e1d640786e5..000000000000
--- a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1_rc2
+++ /dev/null
@@ -1,27 +0,0 @@
-MD5 0e02e2ac409d7048189b2afebe178f42 freebsd-bin-6.1_rc2.tar.bz2 405452
-RMD160 8eee2799407c09dfc9a114860a48b490c5393504 freebsd-bin-6.1_rc2.tar.bz2 405452
-SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 freebsd-bin-6.1_rc2.tar.bz2 405452
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 1d2d7469eb731dcff01781fb757ad6ef freebsd-etc-6.1_rc2.tar.bz2 183869
-RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 freebsd-etc-6.1_rc2.tar.bz2 183869
-SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be freebsd-etc-6.1_rc2.tar.bz2 183869
-MD5 876061a056183fda4a8c6fd71b875dff freebsd-gnu-6.1_rc2.tar.bz2 867149
-RMD160 79b359943dac2258f56d84d652fa0eec5ff291dc freebsd-gnu-6.1_rc2.tar.bz2 867149
-SHA256 a88e6e3d015d46ad7187240dd27d060dbe13734f7618c0a94a8b2b4624403465 freebsd-gnu-6.1_rc2.tar.bz2 867149
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
-MD5 db39af0d7136e230fa609356ec0c87fd freebsd-sbin-6.1_rc2.tar.bz2 1157065
-RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 freebsd-sbin-6.1_rc2.tar.bz2 1157065
-SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f freebsd-sbin-6.1_rc2.tar.bz2 1157065
-MD5 1420562cb87b900f9e2237242f51ae58 freebsd-share-6.1_rc2.tar.bz2 3746442
-RMD160 d45311e50ec1d730f7db3fdbf944bfb381435941 freebsd-share-6.1_rc2.tar.bz2 3746442
-SHA256 a163f2e448b65d1f1ce115638ce00294eae5804af238b6d4a78abe72c21420c5 freebsd-share-6.1_rc2.tar.bz2 3746442
-MD5 3d35f39660e85c2e9dce5e0edd2e13a5 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-RMD160 fa35447815178e306792f5f2a60376c0903827a0 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-MD5 f2c82f1d20cb8b9eae56c129b0b78549 freebsd-usbin-6.1_rc2.tar.bz2 2663193
-RMD160 f183a024fcbce51156330410ba08bae2aeae055f freebsd-usbin-6.1_rc2.tar.bz2 2663193
-SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 freebsd-usbin-6.1_rc2.tar.bz2 2663193
diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.1_rc2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.1_rc2.ebuild
deleted file mode 100644
index 42e9b914d025..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-6.1_rc2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.1_rc2.ebuild,v 1.1 2006/05/02 22:00:44 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="doc isdn"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
-RDEPEND=""
-
-RESTRICT="nostrip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
-	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo"
-
-PATCHES="${FILESDIR}/${PN}-5.3-doc-locations.patch
-	${FILESDIR}/${PN}-5.4-gentoo-skel.patch
-	${FILESDIR}/${PN}-6.0-links.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
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' ${S}/man/man4/man4.{alpha,i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf ${S}/mk/*.mk
-}
-
-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 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 344865e861b4..ed822520239b 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -46,19 +46,19 @@ MD5 91662a80d0cd0cd3dca34f3c1ca54830 files/freebsd-sources-gentoo.patch 1191
 RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 files/freebsd-sources-gentoo.patch 1191
 SHA256 e5e7186858259e7d6d21e925dde640a68b27255cf69ab089ee82675568e7d9a7 files/freebsd-sources-gentoo.patch 1191
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
-DIST freebsd-sys-6.1_rc2.tar.bz2 17197678 RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 size 17197678
+DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f size 17361671
 EBUILD freebsd-sources-6.0-r4.ebuild 2090 RMD160 845d1ef4c577205fa735ce5d11cee0b340b87181 SHA1 2ed100aea8b5964045a3d3c2e679a1514c535767 SHA256 03bc841690e36a1159faf7987c8255fd6533b84943b43524913341b9ebc12e98 size 2090
 MD5 aff23c6739f5cd117e5266494e740154 freebsd-sources-6.0-r4.ebuild 2090
 RMD160 845d1ef4c577205fa735ce5d11cee0b340b87181 freebsd-sources-6.0-r4.ebuild 2090
 SHA256 03bc841690e36a1159faf7987c8255fd6533b84943b43524913341b9ebc12e98 freebsd-sources-6.0-r4.ebuild 2090
-EBUILD freebsd-sources-6.1_rc2.ebuild 2010 RMD160 260d9fb55bc8a1047b172f5ded73d59929677e93 SHA1 b2b7564c34e47ddb7985a1225bea4e248f5d0a06 SHA256 bc4a12d918797d0750f3ead6d8b98763881ebd8d558d0d1a34293dcfa1bb8cc3 size 2010
-MD5 45aabe20f815d03465be81aa7ebeeecf freebsd-sources-6.1_rc2.ebuild 2010
-RMD160 260d9fb55bc8a1047b172f5ded73d59929677e93 freebsd-sources-6.1_rc2.ebuild 2010
-SHA256 bc4a12d918797d0750f3ead6d8b98763881ebd8d558d0d1a34293dcfa1bb8cc3 freebsd-sources-6.1_rc2.ebuild 2010
-MISC ChangeLog 5364 RMD160 c8a2bda57797c76af43707d5592996c211ba01da SHA1 81e734c9fe623b0cc33fa95cc70117d854b4c909 SHA256 a0bd82fdb5d82877fa5a92412dbff198ce58b8914cb388e380caf440368a284e size 5364
-MD5 b87733f7b2ccfa59722093b11c58453b ChangeLog 5364
-RMD160 c8a2bda57797c76af43707d5592996c211ba01da ChangeLog 5364
-SHA256 a0bd82fdb5d82877fa5a92412dbff198ce58b8914cb388e380caf440368a284e ChangeLog 5364
+EBUILD freebsd-sources-6.1.ebuild 2006 RMD160 7637a480578e497a2945e8c30f4dba85db3e88c8 SHA1 eb75527211ba554d3e5fcbc40c9b99f235554475 SHA256 38c3d12e8fd27b2dff14c1d31ee72db6d106ee7cd1c8318a23aad07e21807387 size 2006
+MD5 d32c8da0c60ce665834024cdc605443c freebsd-sources-6.1.ebuild 2006
+RMD160 7637a480578e497a2945e8c30f4dba85db3e88c8 freebsd-sources-6.1.ebuild 2006
+SHA256 38c3d12e8fd27b2dff14c1d31ee72db6d106ee7cd1c8318a23aad07e21807387 freebsd-sources-6.1.ebuild 2006
+MISC ChangeLog 5543 RMD160 ee79980722256050b92d67dac8b9e5c733c082d7 SHA1 11cc726d0889197a87a056f230a0915e6cf2d0a0 SHA256 1aa4109e0a5923cce6371ad95259ffe456ec76dea12c578056ddf29af64a27d1 size 5543
+MD5 cfc1f4832733ee1574da7ed3906b3781 ChangeLog 5543
+RMD160 ee79980722256050b92d67dac8b9e5c733c082d7 ChangeLog 5543
+SHA256 1aa4109e0a5923cce6371ad95259ffe456ec76dea12c578056ddf29af64a27d1 ChangeLog 5543
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -66,13 +66,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-freebsd-sources-6.0-r4 256
 RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-freebsd-sources-6.0-r4 256
 SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-freebsd-sources-6.0-r4 256
-MD5 312a83074ad6b43772df3ac9eebae5b1 files/digest-freebsd-sources-6.1_rc2 268
-RMD160 50e8b7f065ea2fe44a8ee13c4ac10d454c08ab6b files/digest-freebsd-sources-6.1_rc2 268
-SHA256 aea6031fefafef2da116542265cc3bceeab3facafc11df30645a038a91a592e7 files/digest-freebsd-sources-6.1_rc2 268
+MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1 256
+RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1 256
+SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9bKAiZjviIA2XgRAm7AAJ9A5sXTOnhSnrKj0ph/My+KsitbJACgsH2z
-9VEaF7tcwgwlCHpJF8Oig5s=
-=eB/O
+iD8DBQFEYEgnAiZjviIA2XgRAmv3AKCUqS8emu1Qv8/S5tXRmDviyPxNVACg82hU
+ux1R6fiDXpf+dDDlH3OZGK0=
+=lGNl
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc2 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc2
deleted file mode 100644
index 26bf283c442a..000000000000
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 232a881d16f64a526796fcd6a054c495 freebsd-sys-6.1_rc2.tar.bz2 17197678
-RMD160 1a561e14dc87d1561f98ab03b6c68546fe435a9f freebsd-sys-6.1_rc2.tar.bz2 17197678
-SHA256 7e1d80f437574a81a880b5f8f76d7f0eb1a87039261d72301d15845d63892d24 freebsd-sys-6.1_rc2.tar.bz2 17197678
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc2.ebuild
deleted file mode 100644
index dc51f6b1ca19..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.1_rc2.ebuild,v 1.1 2006/05/02 22:01:38 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
-DEPEND=""
-
-RESTRICT="nostrip"
-
-S=${WORKDIR}/sys
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		${S}/conf/newvers.sh
-
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	epatch "${FILESDIR}/${PN}-6.0-asm.patch"
-	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
-
-	# Disable SSP for the kernel
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
-}
-
-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..."
-		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."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink..."
-		rm ${ROOT}/usr/src/sys ${ROOT}/usr/src/sys-${RV}
-		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
-}
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 79982a9e7423..cf6f877a690f 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -42,29 +42,29 @@ MD5 764135d89f71d46bd96de7271f1083fc files/su.pamd 420
 RMD160 9888acbac2c2c79b64ec274cc7d96b13b86d8ad8 files/su.pamd 420
 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 files/su.pamd 420
 DIST freebsd-bin-6.0.tar.bz2 403680 RMD160 4694f5e9e6469cf64b0e05ae8a1d23a612b2130d SHA256 1b228a67634edc978e961d81855ac8b5efa611683654f9d956b9fe2ece3e9f6c size 403680
-DIST freebsd-bin-6.1_rc2.tar.bz2 405452 RMD160 8eee2799407c09dfc9a114860a48b490c5393504 SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 size 405452
+DIST freebsd-bin-6.1.tar.bz2 405680 RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 size 405680
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
+DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 size 184045
 DIST freebsd-include-6.0.tar.bz2 127219 RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b size 127219
-DIST freebsd-include-6.1_rc2.tar.bz2 127237 RMD160 4235464be16e87e2f05022fe7024ee77f2afc3ae SHA256 5d346a1410f3daa2bbe2c2a4a158f7e0abf52f696b33ea332b2ad7c6aa14f730 size 127237
+DIST freebsd-include-6.1.tar.bz2 127179 RMD160 f873b13bb16408a390932d14974b39336bd90a7c SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 size 127179
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
+DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 size 1763218
 EBUILD freebsd-ubin-6.0-r1.ebuild 2617 RMD160 292aab8acc32189d68a4a3fabc625b5896598bae SHA1 4186dc8c109934922b27d754e03f8c69e2659293 SHA256 e0ef405e4c278df67e25df85922161867e8286550f3a7f8f34770c89984e90f4 size 2617
 MD5 da749ba3892845a9be31236cdbd1faa0 freebsd-ubin-6.0-r1.ebuild 2617
 RMD160 292aab8acc32189d68a4a3fabc625b5896598bae freebsd-ubin-6.0-r1.ebuild 2617
 SHA256 e0ef405e4c278df67e25df85922161867e8286550f3a7f8f34770c89984e90f4 freebsd-ubin-6.0-r1.ebuild 2617
-EBUILD freebsd-ubin-6.1_rc2.ebuild 2581 RMD160 01760be2fdcf8f00b8062391139ee0b037f58019 SHA1 3f8b7c4dc50fb49408d57144ca6b8fd2c1e3d394 SHA256 300af2a3618293f678f628c66a83834044ae134c777586b41203732c1cad145b size 2581
-MD5 721a7483b095ef6f279ad3bc144e7ecd freebsd-ubin-6.1_rc2.ebuild 2581
-RMD160 01760be2fdcf8f00b8062391139ee0b037f58019 freebsd-ubin-6.1_rc2.ebuild 2581
-SHA256 300af2a3618293f678f628c66a83834044ae134c777586b41203732c1cad145b freebsd-ubin-6.1_rc2.ebuild 2581
-MISC ChangeLog 6186 RMD160 59e69cd5ae56ea3cbabb52d35fda00cad559b3b7 SHA1 0ef3964f2d5a0294355cb463c72f389948d3a298 SHA256 440e71490f26d28b47f0f879185be5da7b13c429048ee5ac42fa24ace3c0c995 size 6186
-MD5 5661005b993c40b47ee21d607c65e015 ChangeLog 6186
-RMD160 59e69cd5ae56ea3cbabb52d35fda00cad559b3b7 ChangeLog 6186
-SHA256 440e71490f26d28b47f0f879185be5da7b13c429048ee5ac42fa24ace3c0c995 ChangeLog 6186
+EBUILD freebsd-ubin-6.1.ebuild 2577 RMD160 790addc4c09a57318d502295d2118dc1d4124a83 SHA1 4e4855e8d39df00a6010c8493b5129cd4549c2d3 SHA256 17702f6eeac93c690a7e608776867e5dc9e93ae7339b4707b957cd62495feb0e size 2577
+MD5 3ba9107e3b6a17966a206583375a5350 freebsd-ubin-6.1.ebuild 2577
+RMD160 790addc4c09a57318d502295d2118dc1d4124a83 freebsd-ubin-6.1.ebuild 2577
+SHA256 17702f6eeac93c690a7e608776867e5dc9e93ae7339b4707b957cd62495feb0e freebsd-ubin-6.1.ebuild 2577
+MISC ChangeLog 6356 RMD160 07baf907109f8961359b230959ca0368cb928611 SHA1 93a6129c09f6ab4558d00e9f5603e3adb6db172b SHA256 ea95a7867764353309d936abafc0f3fae553393bd57bb16968be87e637000a7e size 6356
+MD5 b3730d74175a7a1118aa2b7fd832aa7b ChangeLog 6356
+RMD160 07baf907109f8961359b230959ca0368cb928611 ChangeLog 6356
+SHA256 ea95a7867764353309d936abafc0f3fae553393bd57bb16968be87e637000a7e ChangeLog 6356
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -72,13 +72,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 613424f0099cad1ce85a06d47bcb49f6 files/digest-freebsd-ubin-6.0-r1 1539
 RMD160 d39f6c71d301f5e62cfcd5624afd871e6ef9442d files/digest-freebsd-ubin-6.0-r1 1539
 SHA256 6841a99d17c9cf21996c35a5b0edeefb23aca499ff9479f825a733e1b31d1dec files/digest-freebsd-ubin-6.0-r1 1539
-MD5 dd09739ad90d047a3892abeee8935bd4 files/digest-freebsd-ubin-6.1_rc2 1611
-RMD160 25912fe8f0cdfe8f3d594150829eb20528c3049a files/digest-freebsd-ubin-6.1_rc2 1611
-SHA256 58912450dbd68c9c99fe7a91c72d47e769b737b0a81626cc7f801f9e73ac0221 files/digest-freebsd-ubin-6.1_rc2 1611
+MD5 26098214f8781d00f13bde0da2257059 files/digest-freebsd-ubin-6.1 1539
+RMD160 9f6c67a78d44686397958e49759418e4cf8e04d6 files/digest-freebsd-ubin-6.1 1539
+SHA256 cfdac09bb63d09d942690cf6956d5d9f805de04a60457dc1a672903ecc217bbd files/digest-freebsd-ubin-6.1 1539
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9cGAiZjviIA2XgRAsL1AJ97P9PlZHRGP82w7t2aRNCqApzUVACg7/5j
-Q8L8j7iylnbTPJWu3kAzA/M=
-=zwv1
+iD8DBQFEYEhhAiZjviIA2XgRAot4AJwI9CC13dRPTkRDvQPcjX+0g6h36ACeJJah
+i3BUzbQX1MloTYnZlucPYDc=
+=k/Eh
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1_rc2 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1_rc2
deleted file mode 100644
index 1e27fdbb42ac..000000000000
--- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1_rc2
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 0e02e2ac409d7048189b2afebe178f42 freebsd-bin-6.1_rc2.tar.bz2 405452
-RMD160 8eee2799407c09dfc9a114860a48b490c5393504 freebsd-bin-6.1_rc2.tar.bz2 405452
-SHA256 b35c997e7275f48b869b56157cbef30af3aad4d6ef72fb1779abd2b05968f4c0 freebsd-bin-6.1_rc2.tar.bz2 405452
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 1d2d7469eb731dcff01781fb757ad6ef freebsd-etc-6.1_rc2.tar.bz2 183869
-RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 freebsd-etc-6.1_rc2.tar.bz2 183869
-SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be freebsd-etc-6.1_rc2.tar.bz2 183869
-MD5 c892941f5dbdca8bf5f3e702802c0d3b freebsd-include-6.1_rc2.tar.bz2 127237
-RMD160 4235464be16e87e2f05022fe7024ee77f2afc3ae freebsd-include-6.1_rc2.tar.bz2 127237
-SHA256 5d346a1410f3daa2bbe2c2a4a158f7e0abf52f696b33ea332b2ad7c6aa14f730 freebsd-include-6.1_rc2.tar.bz2 127237
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
-MD5 3d35f39660e85c2e9dce5e0edd2e13a5 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-RMD160 fa35447815178e306792f5f2a60376c0903827a0 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 freebsd-ubin-6.1_rc2.tar.bz2 1763289
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc2.ebuild
deleted file mode 100644
index 8c5613dc4ea7..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1_rc2.ebuild,v 1.1 2006/05/02 22:02:36 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis"
-
-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"
-
-RDEPEND="sys-freebsd/freebsd-lib
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	sys-libs/zlib
-	virtual/pam"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-pkg_setup() {
-	use nls || mymakeopts="${mymakeopts} NO_NLS= "
-	use atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use usb || mymakeopts="${mymakeopts} NO_USB= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= "
-}
-
-# List of patches to apply
-PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch
-	${FILESDIR}/${PN}-6.0-fixmakefiles.patch
-	${FILESDIR}/${PN}-setXid.patch
-	${FILESDIR}/${PN}-lint-stdarg.patch
-	${FILESDIR}/${PN}-6.0-kdump-ioctl.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
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar
-	tput tset
-	less lessecho lesskey
-	dig nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet"
-
-src_unpack() {
-	freebsd_src_unpack
-
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# Rename manpage for renamed cmp
-	mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1
-}
-
-src_install() {
-	freebsd_src_install
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.pamd" ${pamdfile}
-	done
-
-	cd "${WORKDIR}/etc"
-	insinto /etc
-	doins remote phones opieaccess fbtab
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb
-}
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index e8217238791b..f04f7c8b4ce7 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -54,31 +54,31 @@ MD5 26bce1f4cc64c909807fecd318973e2a files/syslogd.initd 574
 RMD160 4dfc927915b794809d9570079a6fe1adf2ba8520 files/syslogd.initd 574
 SHA256 6532f12605e9f961c4e758a126db87428365779430a8e98644201bdded19461f files/syslogd.initd 574
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
-DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
+DIST freebsd-contrib-6.1.tar.bz2 36017365 RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 size 36017365
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
+DIST freebsd-etc-6.1.tar.bz2 184045 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 size 184045
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
+DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 size 2613584
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
+DIST freebsd-libexec-6.1.tar.bz2 277860 RMD160 bef98efbc76812cf36b55067433039f3805cfbab SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 size 277860
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
+DIST freebsd-sbin-6.1.tar.bz2 1156163 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 size 1156163
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
+DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 size 1763218
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
+DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e size 2664570
 EBUILD freebsd-usbin-6.0-r2.ebuild 4497 RMD160 8209e49747046ca194553c2f2bef6194c4d48bcb SHA1 23a6a5d8af837e37728823f2774334584f7eb62b SHA256 184369481778b09f527ca18e0d2fef7b674a4777cbf48e034183286fb39959f6 size 4497
 MD5 4ac1daaab9b9409fc8a2a8fa10ca7754 freebsd-usbin-6.0-r2.ebuild 4497
 RMD160 8209e49747046ca194553c2f2bef6194c4d48bcb freebsd-usbin-6.0-r2.ebuild 4497
 SHA256 184369481778b09f527ca18e0d2fef7b674a4777cbf48e034183286fb39959f6 freebsd-usbin-6.0-r2.ebuild 4497
-EBUILD freebsd-usbin-6.1_rc2.ebuild 4485 RMD160 ad4c4c3a95bc703cf6670509c4baa9f134b65868 SHA1 9de32c4e6760471af22ddf49eaef6aea90e76da9 SHA256 f62158e176ec879c1bcc1729d680be1866948c1296fe7aaa93f765d1a9c8aa4a size 4485
-MD5 ad05bebaad5eba76db6b310882dddbcb freebsd-usbin-6.1_rc2.ebuild 4485
-RMD160 ad4c4c3a95bc703cf6670509c4baa9f134b65868 freebsd-usbin-6.1_rc2.ebuild 4485
-SHA256 f62158e176ec879c1bcc1729d680be1866948c1296fe7aaa93f765d1a9c8aa4a freebsd-usbin-6.1_rc2.ebuild 4485
-MISC ChangeLog 8416 RMD160 42842271d8d35a556ce3bccd2424d7bcfbb62870 SHA1 2c3f98485c34d9d1a511a146834eb9db1a1a06b1 SHA256 6c9d314b5ff959e5755e160fc99ae09729900bf6fac952c086950ed3ce80d9b9 size 8416
-MD5 3f9fe925ee5fb6c630066af2458f1e5a ChangeLog 8416
-RMD160 42842271d8d35a556ce3bccd2424d7bcfbb62870 ChangeLog 8416
-SHA256 6c9d314b5ff959e5755e160fc99ae09729900bf6fac952c086950ed3ce80d9b9 ChangeLog 8416
+EBUILD freebsd-usbin-6.1.ebuild 4481 RMD160 cb97c1d7fd513e81f0be0cf5b3051a829ba8d12e SHA1 8ef426808f0c2a6e308a306917bbd4023000a71a SHA256 f0ba39d245b7aaf137f6674346dec7c9c1146fb41f5d3fbbd3adfb4e2489222a size 4481
+MD5 b39bda19a445307b52f1b9e0535c2c1a freebsd-usbin-6.1.ebuild 4481
+RMD160 cb97c1d7fd513e81f0be0cf5b3051a829ba8d12e freebsd-usbin-6.1.ebuild 4481
+SHA256 f0ba39d245b7aaf137f6674346dec7c9c1146fb41f5d3fbbd3adfb4e2489222a freebsd-usbin-6.1.ebuild 4481
+MISC ChangeLog 8589 RMD160 56e20d5f8a7cbe4822c89377cad53a95b8967080 SHA1 75a22e7dd42a37855182329c295bbbf510ab35d4 SHA256 d26367726ba8ae0321a1196986f745320676c94a8d0e7dff8f556ed7382a6bdb size 8589
+MD5 5fa24fa92507e6f60ad9b54e3456414d ChangeLog 8589
+RMD160 56e20d5f8a7cbe4822c89377cad53a95b8967080 ChangeLog 8589
+SHA256 d26367726ba8ae0321a1196986f745320676c94a8d0e7dff8f556ed7382a6bdb ChangeLog 8589
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -86,13 +86,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 c9135c1dd494a2530c64932b005b3a6e files/digest-freebsd-usbin-6.0-r2 1804
 RMD160 518b8d1c0f014b712766336798e69fcde36d9eb4 files/digest-freebsd-usbin-6.0-r2 1804
 SHA256 e220ea79f7fe0698bcd6890c46fbd7e6280194f4cfc4cf88a491e41fa5b47a9b files/digest-freebsd-usbin-6.0-r2 1804
-MD5 ba9075f98872810c125053976196b1bb files/digest-freebsd-usbin-6.1_rc2 1888
-RMD160 098683e36230246dd66565cc1ed8c873893f8320 files/digest-freebsd-usbin-6.1_rc2 1888
-SHA256 21735ca6b0848f0448f06094c6f02a3b9057799e66f32887b21c3ce782cd16b2 files/digest-freebsd-usbin-6.1_rc2 1888
+MD5 1fb7f5f16940cedd1c8fdf66f437a1f4 files/digest-freebsd-usbin-6.1 1804
+RMD160 22ba309f075ae9b8cbae48a54014fe1052ca53a5 files/digest-freebsd-usbin-6.1 1804
+SHA256 0e2af80bb11fda4774c21e3d0e44368ffbce6d71fde45b08d4774a038e4c9f06 files/digest-freebsd-usbin-6.1 1804
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEV9dDAiZjviIA2XgRAnKQAJ9v62Qb/0FKkysJMxwtPQLAhf5jpQCdFltQ
-1vkqLG7PcLdQXMr28/q/GdQ=
-=qQPo
+iD8DBQFEYEidAiZjviIA2XgRAqliAJ9dR53fEqdjRbPQlv2txOP5o393kQCfTFNp
+ojIK64zq9N/ZpU5f8IMBKwA=
+=qj3a
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1_rc2 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1_rc2
deleted file mode 100644
index 87baf2959bab..000000000000
--- a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1_rc2
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 4cbed5dff2de056bb603b9c1acb643a9 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 freebsd-contrib-6.1_rc2.tar.bz2 36015082
-MD5 1d2d7469eb731dcff01781fb757ad6ef freebsd-etc-6.1_rc2.tar.bz2 183869
-RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 freebsd-etc-6.1_rc2.tar.bz2 183869
-SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be freebsd-etc-6.1_rc2.tar.bz2 183869
-MD5 0b01eb3e71750e54a6e1ae346a15311a freebsd-lib-6.1_rc2.tar.bz2 2613579
-RMD160 ed3f9dc5afe9896ee685934978f888c816562574 freebsd-lib-6.1_rc2.tar.bz2 2613579
-SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 freebsd-lib-6.1_rc2.tar.bz2 2613579
-MD5 24f9fb6752c6800db5a98da9c4bb19c9 freebsd-libexec-6.1_rc2.tar.bz2 277785
-RMD160 7e6c035b414287241d22a48e809aae8a243bff38 freebsd-libexec-6.1_rc2.tar.bz2 277785
-SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 freebsd-libexec-6.1_rc2.tar.bz2 277785
-MD5 db39af0d7136e230fa609356ec0c87fd freebsd-sbin-6.1_rc2.tar.bz2 1157065
-RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 freebsd-sbin-6.1_rc2.tar.bz2 1157065
-SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f freebsd-sbin-6.1_rc2.tar.bz2 1157065
-MD5 3d35f39660e85c2e9dce5e0edd2e13a5 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-RMD160 fa35447815178e306792f5f2a60376c0903827a0 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 freebsd-ubin-6.1_rc2.tar.bz2 1763289
-MD5 f2c82f1d20cb8b9eae56c129b0b78549 freebsd-usbin-6.1_rc2.tar.bz2 2663193
-RMD160 f183a024fcbce51156330410ba08bae2aeae055f freebsd-usbin-6.1_rc2.tar.bz2 2663193
-SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 freebsd-usbin-6.1_rc2.tar.bz2 2663193
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc2.ebuild
deleted file mode 100644
index 0a9e31c6e12b..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc2.ebuild,v 1.1 2006/05/02 22:03:37 flameeyes Exp $
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="atm bluetooth tcpd ssl usb ipv6 acpi ipfilter isdn pam ssl radius
-	netgraph minimal ipsec nis pam suid nat radius"
-
-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
-		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*
-	sys-apps/texinfo
-	sys-devel/flex"
-
-PROVIDE="virtual/logger"
-
-S="${WORKDIR}/usr.sbin"
-
-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 atm || mymakeopts="${mymakeopts} NO_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
-	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
-	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
-	use usb || mymakeopts="${mymakeopts} NO_USB= "
-	use acpi || mymakeopts="${mymakeopts} NO_ACPI= "
-	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
-	use pam || mymakeopts="${mymakeopts} NO_PAM= "
-	use radius || mymakeopts="${mymakeopts} NO_RADIUS= "
-	use suid || mymakeopts="${mymakeopts} NO_SUID= "
-	use ipsec || mymakeopts="${mymakeopts} NO_IPSEC= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-	use nat || mymakeopts="${mymakeopts} NO_NAT= "
-	use pam || mymakeopts="${mymakeopts} NO_PAM= "
-	use suid || mymakeopts="${mymakeopts} NO_SUID= PPP_NOSUID= "
-	use radius || mymakeopts="${mymakeopts} NO_RADIUS= "
-	use tcpd || mymakeopts="${mymakeopts} NO_WRAP= "
-
-	mymakeopts="${mymakeopts} NO_MAILWRAPPER= NO_BIND= NO_SENDMAIL= NO_PF= NO_AUTHPF= NO_LPR="
-
-	# kldxref does not build with -O2
-	replace-flags "-O?" "-O1"
-}
-
-PATCHES="${FILESDIR}/${PN}-6.0-fixmakefiles.patch
-	${FILESDIR}/${PN}-6.1-nowrap.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 mount_smbfs
-	tcpdump ndp traceroute pkg_install inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli
-	zic amd"
-
-src_unpack() {
-	freebsd_src_unpack
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-	ln -s "/usr/include" "${WORKDIR}/include"
-}
-
-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"
-
-	for util in nfs nfsmount rpcbind syslogd moused powerd; do
-		newinitd ${FILESDIR}/${util}.initd ${util}
-		[[ -e ${FILESDIR}/${util}.confd ]] && \
-			newconfd ${FILESDIR}/${util}.confd ${util}
-	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"
-
-	cd "${WORKDIR}/etc"
-	doins amd.map apmd.conf syslog.conf newsyslog.conf usbd.conf
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf
-
-	if use isdn; then
-		insinto /etc/isdn
-		doins isdn/*
-		rm -f ${D}/etc/isdn/Makefile
-	fi
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/*
-		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() {
-	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
-}
-
author	Diego Elio Pettenò <flameeyes@gentoo.org>	2006-05-09 07:45:38 +0000
committer	Diego Elio Pettenò <flameeyes@gentoo.org>	2006-05-09 07:45:38 +0000
commit	af775d93d8d3ebacd672b2d525931c30297fe6b5 (patch)
tree	e1f962b20390b15d7b1db3bbc72a3afdbd1cd9de /sys-freebsd
parent	Update to 6.1-RELEASE. (diff)
download	historical-af775d93d8d3ebacd672b2d525931c30297fe6b5.tar.gz historical-af775d93d8d3ebacd672b2d525931c30297fe6b5.tar.bz2 historical-af775d93d8d3ebacd672b2d525931c30297fe6b5.zip