Update to 6.1-RELEASE.

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

3 files changed, 21 insertions, 191 deletions

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