Update to 6.1-RELEASE.

Package-Manager: portage-2.1_pre10-r5

39 files changed, 1278 insertions, 13 deletions

diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index 1ab843e2fb82..490c5680a313 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/boot0
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.5 2006/05/02 21:50:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.6 2006/05/09 07:33:10 flameeyes Exp $
+
+*boot0-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org> -boot0-6.1_rc2.ebuild,
+  +boot0-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *boot0-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/boot0/boot0-6.1.ebuild b/sys-freebsd/boot0/boot0-6.1.ebuild
new file mode 100644
index 000000000000..8a608bfa3cd4
--- /dev/null
+++ b/sys-freebsd/boot0/boot0-6.1.ebuild
@@ -0,0 +1,34 @@
+# 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.ebuild,v 1.1 2006/05/09 07:33:10 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 b/sys-freebsd/boot0/files/digest-boot0-6.1
new file mode 100644
index 000000000000..ed81a3f45c74
--- /dev/null
+++ b/sys-freebsd/boot0/files/digest-boot0-6.1
@@ -0,0 +1,3 @@
+MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
+RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
+SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog
index 6678a1c2ff81..37f816d698d5 100644
--- a/sys-freebsd/freebsd-bin/ChangeLog
+++ b/sys-freebsd/freebsd-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.8 2006/05/02 21:51:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.9 2006/05/09 07:34:00 flameeyes Exp $
+
+*freebsd-bin-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-bin-6.1_rc2.ebuild, +freebsd-bin-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-bin-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1 b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1
new file mode 100644
index 000000000000..1aa16ea5aaa5
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/files/digest-freebsd-bin-6.1
@@ -0,0 +1,9 @@
+MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680
+RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680
+SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680
+MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
+RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
+SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
+MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163
+RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163
+SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-6.1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-6.1.ebuild
new file mode 100644
index 000000000000..73c1dd75fbc7
--- /dev/null
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-6.1.ebuild
@@ -0,0 +1,37 @@
+# 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.ebuild,v 1.1 2006/05/09 07:34:00 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/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index 33d0358b207e..6f8d913538e3 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-contrib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.6 2006/05/02 21:52:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.7 2006/05/09 07:34:55 flameeyes Exp $
+
+*freebsd-contrib-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-contrib-6.1_rc2.ebuild, +freebsd-contrib-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-contrib-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1 b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1
new file mode 100644
index 000000000000..6fa51642140a
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/files/digest-freebsd-contrib-6.1
@@ -0,0 +1,9 @@
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+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 986fe1e300d5d0d89180eb9559f87334 freebsd-gnu-6.1.tar.bz2 867244
+RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 freebsd-gnu-6.1.tar.bz2 867244
+SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 freebsd-gnu-6.1.tar.bz2 867244
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild
new file mode 100644
index 000000000000..1edad7ece5a8
--- /dev/null
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-6.1.ebuild
@@ -0,0 +1,45 @@
+# 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.ebuild,v 1.1 2006/05/09 07:34:55 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/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 5064817bf736..6fe3e82f98f2 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.14 2006/05/02 21:53:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.15 2006/05/09 07:35:58 flameeyes Exp $
+
+*freebsd-lib-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-lib-6.1_rc2.ebuild, +freebsd-lib-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-lib-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1
new file mode 100644
index 000000000000..05013f6c080f
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1
@@ -0,0 +1,24 @@
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+MD5 8244e2505e95db531ce027d8b252be31 freebsd-crypto-6.1.tar.bz2 3978359
+RMD160 de2fa1e12cda42661565d5bf0f910b1a99d3c4df freebsd-crypto-6.1.tar.bz2 3978359
+SHA256 52be404c7f86ca29f957e1dc46c8a2c32a46ddb5c316d5123faf92a9c9fe37c5 freebsd-crypto-6.1.tar.bz2 3978359
+MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045
+RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045
+SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045
+MD5 d832298dc9565d138f86fd53e1d9ad3f freebsd-include-6.1.tar.bz2 127179
+RMD160 f873b13bb16408a390932d14974b39336bd90a7c freebsd-include-6.1.tar.bz2 127179
+SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 freebsd-include-6.1.tar.bz2 127179
+MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
+RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
+SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
+MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860
+RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860
+SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860
+MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
+RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
+SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
+MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570
+RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570
+SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild
new file mode 100644
index 000000000000..30d18e75550e
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild
@@ -0,0 +1,223 @@
+# 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.ebuild,v 1.1 2006/05/09 07:35:58 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/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index 11ae743452de..4d032ebf8aae 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.11 2006/05/02 21:55:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.12 2006/05/09 07:37:49 flameeyes Exp $
+
+*freebsd-mk-defs-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-mk-defs-6.1_rc2.ebuild, +freebsd-mk-defs-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-mk-defs-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1
new file mode 100644
index 000000000000..80d00a6b0cb0
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1
@@ -0,0 +1,3 @@
+MD5 87e50c5ad62ac4c2e062c5a05b6709f3 freebsd-share-6.1.tar.bz2 3745745
+RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a freebsd-share-6.1.tar.bz2 3745745
+SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 freebsd-share-6.1.tar.bz2 3745745
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1.ebuild
new file mode 100644
index 000000000000..ad643b1c191d
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1.ebuild
@@ -0,0 +1,42 @@
+# 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.ebuild,v 1.1 2006/05/09 07:37:49 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/ChangeLog b/sys-freebsd/freebsd-pam-modules/ChangeLog
index 550586a15223..19a5b595db71 100644
--- a/sys-freebsd/freebsd-pam-modules/ChangeLog
+++ b/sys-freebsd/freebsd-pam-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-pam-modules
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.6 2006/05/02 21:56:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.7 2006/05/09 07:38:36 flameeyes Exp $
+
+*freebsd-pam-modules-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-pam-modules-6.1_rc2.ebuild, +freebsd-pam-modules-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-pam-modules-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1 b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1
new file mode 100644
index 000000000000..26df127ad223
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/files/digest-freebsd-pam-modules-6.1
@@ -0,0 +1,3 @@
+MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
+RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
+SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1.ebuild
new file mode 100644
index 000000000000..21da961c45ca
--- /dev/null
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-6.1.ebuild
@@ -0,0 +1,49 @@
+# 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.ebuild,v 1.1 2006/05/09 07:38:36 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/ChangeLog b/sys-freebsd/freebsd-pf/ChangeLog
index 393dcbb19f1b..52adade78b77 100644
--- a/sys-freebsd/freebsd-pf/ChangeLog
+++ b/sys-freebsd/freebsd-pf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-pf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.7 2006/05/02 21:57:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.8 2006/05/09 07:39:28 flameeyes Exp $
+
+*freebsd-pf-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-pf-6.1_rc2.ebuild, +freebsd-pf-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-pf-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1 b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1
new file mode 100644
index 000000000000..b30ffabb738b
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/files/digest-freebsd-pf-6.1
@@ -0,0 +1,15 @@
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045
+RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045
+SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045
+MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860
+RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860
+SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860
+MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163
+RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163
+SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163
+MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570
+RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570
+SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-6.1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-6.1.ebuild
new file mode 100644
index 000000000000..ca7fd61436d0
--- /dev/null
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-6.1.ebuild
@@ -0,0 +1,59 @@
+# 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.ebuild,v 1.1 2006/05/09 07:39:28 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/ChangeLog b/sys-freebsd/freebsd-rescue/ChangeLog
index 7cbe7f81efac..096bf5fbc3b5 100644
--- a/sys-freebsd/freebsd-rescue/ChangeLog
+++ b/sys-freebsd/freebsd-rescue/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-rescue
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.5 2006/05/02 21:58:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.6 2006/05/09 07:40:27 flameeyes Exp $
+
+*freebsd-rescue-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-rescue-6.1_rc2.ebuild, +freebsd-rescue-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-rescue-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1 b/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1
new file mode 100644
index 000000000000..b4a7e216e5c2
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/files/digest-freebsd-rescue-6.1
@@ -0,0 +1,30 @@
+MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680
+RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680
+SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+MD5 986fe1e300d5d0d89180eb9559f87334 freebsd-gnu-6.1.tar.bz2 867244
+RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 freebsd-gnu-6.1.tar.bz2 867244
+SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 freebsd-gnu-6.1.tar.bz2 867244
+MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
+RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
+SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
+MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860
+RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860
+SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860
+MD5 c749fb90404ad32d0ef21ef1845bb322 freebsd-rescue-6.1.tar.bz2 4949
+RMD160 334e1904b0240d80fcec7b3681eb8bb37f3a6f73 freebsd-rescue-6.1.tar.bz2 4949
+SHA256 3801dfb9cf608b106ff0621a1b69df92290da9baa4af23c2e3b7d22193c211aa freebsd-rescue-6.1.tar.bz2 4949
+MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163
+RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163
+SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163
+MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
+RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
+SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
+MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218
+RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218
+SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218
+MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570
+RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570
+SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1.ebuild
new file mode 100644
index 000000000000..ad0bd1dabbee
--- /dev/null
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-6.1.ebuild
@@ -0,0 +1,51 @@
+# 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.ebuild,v 1.1 2006/05/09 07:40:27 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/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 7368d71dbeae..413fe0b59066 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.10 2006/05/02 21:59:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.11 2006/05/09 07:41:31 flameeyes Exp $
+
+*freebsd-sbin-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-sbin-6.1_rc2.ebuild, +freebsd-sbin-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-sbin-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1
new file mode 100644
index 000000000000..33014dcb6b14
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1
@@ -0,0 +1,18 @@
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045
+RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045
+SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045
+MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
+RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
+SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
+MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860
+RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860
+SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860
+MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163
+RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163
+SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163
+MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570
+RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570
+SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1.ebuild
new file mode 100644
index 000000000000..8c657fc89129
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1.ebuild
@@ -0,0 +1,87 @@
+# 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.ebuild,v 1.1 2006/05/09 07:41:31 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/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index 632e27a3ca6f..36eea199fead 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-share
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.8 2006/05/02 22:00:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.9 2006/05/09 07:42:34 flameeyes Exp $
+
+*freebsd-share-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-share-6.1_rc2.ebuild, +freebsd-share-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-share-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1 b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1
new file mode 100644
index 000000000000..27102169636e
--- /dev/null
+++ b/sys-freebsd/freebsd-share/files/digest-freebsd-share-6.1
@@ -0,0 +1,27 @@
+MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680
+RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680
+SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045
+RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045
+SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045
+MD5 986fe1e300d5d0d89180eb9559f87334 freebsd-gnu-6.1.tar.bz2 867244
+RMD160 5eeff2beb898984c40ae1d7c8adfdf41f2c0b8f8 freebsd-gnu-6.1.tar.bz2 867244
+SHA256 7bf79a2535539add15da6480830f771e5aea6594c24ffed2d196c7f0c700fdc1 freebsd-gnu-6.1.tar.bz2 867244
+MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
+RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
+SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
+MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163
+RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163
+SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163
+MD5 87e50c5ad62ac4c2e062c5a05b6709f3 freebsd-share-6.1.tar.bz2 3745745
+RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a freebsd-share-6.1.tar.bz2 3745745
+SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 freebsd-share-6.1.tar.bz2 3745745
+MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218
+RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218
+SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218
+MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570
+RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570
+SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570
diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.1.ebuild
new file mode 100644
index 000000000000..d2059babfc4c
--- /dev/null
+++ b/sys-freebsd/freebsd-share/freebsd-share-6.1.ebuild
@@ -0,0 +1,65 @@
+# 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.ebuild,v 1.1 2006/05/09 07:42:34 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/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index cfe7294a5103..393c5a0cd525 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.10 2006/05/02 22:01:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.11 2006/05/09 07:43:28 flameeyes Exp $
+
+*freebsd-sources-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-sources-6.1_rc2.ebuild, +freebsd-sources-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-sources-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1
new file mode 100644
index 000000000000..ed81a3f45c74
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1
@@ -0,0 +1,3 @@
+MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
+RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
+SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1.ebuild
new file mode 100644
index 000000000000..116ba6749211
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1.ebuild
@@ -0,0 +1,70 @@
+# 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.ebuild,v 1.1 2006/05/09 07:43:28 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/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index c84c11066891..405120b50402 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.11 2006/05/02 22:02:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.12 2006/05/09 07:44:23 flameeyes Exp $
+
+*freebsd-ubin-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-ubin-6.1_rc2.ebuild, +freebsd-ubin-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-ubin-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1
new file mode 100644
index 000000000000..c3e53df368f7
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1
@@ -0,0 +1,18 @@
+MD5 e8c5589329d476255f8a15f9f9bfebd1 freebsd-bin-6.1.tar.bz2 405680
+RMD160 33f2e5b49fce90dcaab652621af3b33e8e80b643 freebsd-bin-6.1.tar.bz2 405680
+SHA256 86d7a000827432c594f9d37b98a1f936f6168030cf033c6e621a37c670ef5271 freebsd-bin-6.1.tar.bz2 405680
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045
+RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045
+SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045
+MD5 d832298dc9565d138f86fd53e1d9ad3f freebsd-include-6.1.tar.bz2 127179
+RMD160 f873b13bb16408a390932d14974b39336bd90a7c freebsd-include-6.1.tar.bz2 127179
+SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 freebsd-include-6.1.tar.bz2 127179
+MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
+RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
+SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
+MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218
+RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218
+SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild
new file mode 100644
index 000000000000..7e5ac00fcf9f
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild
@@ -0,0 +1,93 @@
+# 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.ebuild,v 1.1 2006/05/09 07:44:23 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/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index c6bb82bf173b..ce79bfd65dc8 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.10 2006/05/02 22:03:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.11 2006/05/09 07:45:23 flameeyes Exp $
+
+*freebsd-usbin-6.1 (09 May 2006)
+
+  09 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -freebsd-usbin-6.1_rc2.ebuild, +freebsd-usbin-6.1.ebuild:
+  Update to 6.1-RELEASE.
 
 *freebsd-usbin-6.1_rc2 (02 May 2006)
 
diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1
new file mode 100644
index 000000000000..07808559207c
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1
@@ -0,0 +1,21 @@
+MD5 a04643beb2d94972200d6714688930cf freebsd-contrib-6.1.tar.bz2 36017365
+RMD160 225f6ade032533d08b98b79cb29b75da2a3c74fa freebsd-contrib-6.1.tar.bz2 36017365
+SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-contrib-6.1.tar.bz2 36017365
+MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045
+RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045
+SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045
+MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
+RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
+SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
+MD5 244baf5f7ef26dbf33428970913a40f3 freebsd-libexec-6.1.tar.bz2 277860
+RMD160 bef98efbc76812cf36b55067433039f3805cfbab freebsd-libexec-6.1.tar.bz2 277860
+SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-libexec-6.1.tar.bz2 277860
+MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163
+RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163
+SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163
+MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218
+RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218
+SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218
+MD5 ca61245fd3ec21d31ab9e41cd1ad35b7 freebsd-usbin-6.1.tar.bz2 2664570
+RMD160 98a87538790a814d0afd35bb0f848bcff574c72d freebsd-usbin-6.1.tar.bz2 2664570
+SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e freebsd-usbin-6.1.tar.bz2 2664570
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1.ebuild
new file mode 100644
index 000000000000..87cbd144b29f
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1.ebuild
@@ -0,0 +1,149 @@
+# 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.ebuild,v 1.1 2006/05/09 07:45:23 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
+}
+