Update to 6.1_rc2.

(Portage version: 2.1_pre10-r2)
 (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 976e18fde7e7..e8217238791b 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_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
+DIST freebsd-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
-DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
+DIST freebsd-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
-DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
+DIST freebsd-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
-DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
+DIST freebsd-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
-DIST freebsd-sbin-6.1_rc1.tar.bz2 1156116 RMD160 f1931df3003d17320be5f898f318af646aae704c SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b size 1156116
+DIST freebsd-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
 DIST freebsd-ubin-6.0.tar.bz2 1760986 RMD160 08a26aa7afdb1482fd1711355e2ef150ecef709d SHA256 860ecaa8cea7c1bd1a1403d6b345d751e04fed3fd7993bf69a483046844d476b size 1760986
-DIST freebsd-ubin-6.1_rc1.tar.bz2 1762943 RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 size 1762943
+DIST freebsd-ubin-6.1_rc2.tar.bz2 1763289 RMD160 fa35447815178e306792f5f2a60376c0903827a0 SHA256 8182ab26e5716cd91bf2993cbe1b4ae9514a6e57f96cb71d55fd0b8dd6fcfef7 size 1763289
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
-DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 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_rc1.ebuild 4485 RMD160 c87bd654502849afcd4df62faf3a178a3b488212 SHA1 2c8b469fd6e5239f6fa993d86b0f7a736eda81b9 SHA256 e633b792447c51e79193580e0ef54d26ea864797596ead0aca32c20eb6ef8bbf size 4485
-MD5 f90644fa5552206f9af729beeebfb122 freebsd-usbin-6.1_rc1.ebuild 4485
-RMD160 c87bd654502849afcd4df62faf3a178a3b488212 freebsd-usbin-6.1_rc1.ebuild 4485
-SHA256 e633b792447c51e79193580e0ef54d26ea864797596ead0aca32c20eb6ef8bbf freebsd-usbin-6.1_rc1.ebuild 4485
-MISC ChangeLog 8238 RMD160 14562552cdde58e4c2057411348a470a33790eef SHA1 a2295165ca245ab38bd0f476e275ff86e4b3c72a SHA256 c74421632ba0022cf0936c31d1998c6db1504541cb7a5d25a4cc684e4b722714 size 8238
-MD5 c689d69680eb8d3e0c7f32134aa95dd3 ChangeLog 8238
-RMD160 14562552cdde58e4c2057411348a470a33790eef ChangeLog 8238
-SHA256 c74421632ba0022cf0936c31d1998c6db1504541cb7a5d25a4cc684e4b722714 ChangeLog 8238
+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
 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 927abee982bd14ca7cbfbe193643efc2 files/digest-freebsd-usbin-6.1_rc1 1888
-RMD160 1760364d0e89568d0a64294e6a9ef56cf6cbfdc5 files/digest-freebsd-usbin-6.1_rc1 1888
-SHA256 65f8ce2d3dfb59a8f66d935de6cebe642d2ea157a49f2423738d3726df79db73 files/digest-freebsd-usbin-6.1_rc1 1888
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVf7MAiZjviIA2XgRAn82AJ9neHMgnDVwRKI9GfW5oI0GgDE2sACgq9h3
-N87X0nwIJ5a6czSP7qEkVAU=
-=an9q
+iD8DBQFEV9dDAiZjviIA2XgRAnKQAJ9v62Qb/0FKkysJMxwtPQLAhf5jpQCdFltQ
+1vkqLG7PcLdQXMr28/q/GdQ=
+=qQPo
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1_rc1 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1_rc1
deleted file mode 100644
index 03e926afde88..000000000000
--- a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1_rc1
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
-MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
-RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
-SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
-MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
-RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
-SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
-MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
-RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
-SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
-MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
-RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
-SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
-MD5 0198e4c8f064d5f060c15510a87c5f35 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-RMD160 52bfc6de5a322dd0bfabe7d365d0d8a8b8af6b6e freebsd-ubin-6.1_rc1.tar.bz2 1762943
-SHA256 120ace5ae8ec906e09b92128ce6d6afe66dbd6d4806f09a51634ddea917a8370 freebsd-ubin-6.1_rc1.tar.bz2 1762943
-MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
-RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
-SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.ebuild
deleted file mode 100644
index 215d44c0c746..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1_rc1.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_rc1.ebuild,v 1.2 2006/05/01 12:27:31 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
-}
-