Update to 6.1-RELEASE.

(Portage version: 2.1_pre10-r5)
 (Signed Manifest commit)

3 files changed, 19 insertions, 93 deletions

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
-}