Update to 6.1_rc1 ensuring that the includes from the same package are used.

Package-Manager: portage-2.1_pre10

4 files changed, 276 insertions, 8 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index de479ad887e7..4c0da333c008 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.12 2006/04/30 09:13:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.13 2006/04/30 21:37:27 flameeyes Exp $
+
+*freebsd-lib-6.1_rc1 (30 Apr 2006)
+
+  30 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +freebsd-lib-6.1_rc1.ebuild:
+  Update to 6.1_rc1 ensuring that the includes from the same package are used.
 
 *freebsd-lib-6.0-r3 (30 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 5b5e97ed8011..09cb83a547ce 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -30,21 +30,33 @@ MD5 eb10216ffda9c5f69fdb28728c574114 files/freebsd-lib-fixmp.patch 548
 RMD160 91cf241eaa972c13ea6ddd1ec03a6fd7f3a2a4b3 files/freebsd-lib-fixmp.patch 548
 SHA256 bd99697872b00a4275c80935f4f5188f4f859aa358be0ecfc0c5470e9979c354 files/freebsd-lib-fixmp.patch 548
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
+DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
 DIST freebsd-crypto-6.0.tar.bz2 3978650 RMD160 361efbba1f651925a7cc2284665b044bc232f181 SHA256 e86223d40ef2747de98f575f3875a6ce8a5e913baa850a5ef547ffef00ace480 size 3978650
+DIST freebsd-crypto-6.1_rc1.tar.bz2 3977940 RMD160 220cbe0073aec15a306e7a253675fa8bbdbefe06 SHA256 be0aeb0e6923260bae34e0e93c8483c56e0c566721010ab9bc49b94c064d52cf size 3977940
 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-include-6.0.tar.bz2 127219 RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b size 127219
+DIST freebsd-include-6.1_rc1.tar.bz2 127236 RMD160 b978bf654921e9f58f71b372881c494b39482b56 SHA256 4adecf2a0517b1c9040afe1df9f18873e76f6312ced22a7ed98ee1e7f61245ad size 127236
 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-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-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 size 16069887
+DIST freebsd-sys-6.1_rc1.tar.bz2 17096208 RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 size 17096208
 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
 EBUILD freebsd-lib-6.0-r3.ebuild 6540 RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539eac78e SHA1 f6d44373b904023fa915be186829a80024b67c5b SHA256 d1007fb5b26aefbd85e08374ab32324643e734b704da97ad8461c59f327fdeb5 size 6540
 MD5 1bde4db8e821cdb167f10b4514a0dbe2 freebsd-lib-6.0-r3.ebuild 6540
 RMD160 b5aba6b58d97cb6f6dd725bbc2a12f3539eac78e freebsd-lib-6.0-r3.ebuild 6540
 SHA256 d1007fb5b26aefbd85e08374ab32324643e734b704da97ad8461c59f327fdeb5 freebsd-lib-6.0-r3.ebuild 6540
-MISC ChangeLog 7560 RMD160 c5dea2e92f2db0ba8e09c3e37f36c92aba2020f5 SHA1 e76f4f4aadd9498ca3cf03db9e25a394d2adf4da SHA256 fa68920f26f42284e21d78eabedf78bdf2668e7109aa23fc4cfc2b5c3f97af9a size 7560
-MD5 ef5f9ecf51957485248c68499dba4fa5 ChangeLog 7560
-RMD160 c5dea2e92f2db0ba8e09c3e37f36c92aba2020f5 ChangeLog 7560
-SHA256 fa68920f26f42284e21d78eabedf78bdf2668e7109aa23fc4cfc2b5c3f97af9a ChangeLog 7560
+EBUILD freebsd-lib-6.1_rc1.ebuild 6698 RMD160 3efc8c07863e8b883075b000179b7b27ee01073b SHA1 2608d1df1f828e5426f0f7895cb097c714412cb6 SHA256 a673eac6dbe6c2d7ed13ad67acd42da6eaddde734d98a4ce37fc9280abdb3837 size 6698
+MD5 3f23c072fb59e8591acbe1b3fbc95d5c freebsd-lib-6.1_rc1.ebuild 6698
+RMD160 3efc8c07863e8b883075b000179b7b27ee01073b freebsd-lib-6.1_rc1.ebuild 6698
+SHA256 a673eac6dbe6c2d7ed13ad67acd42da6eaddde734d98a4ce37fc9280abdb3837 freebsd-lib-6.1_rc1.ebuild 6698
+MISC ChangeLog 7760 RMD160 a74b31ef8814e9075ada1d5eb198e508df65c4f3 SHA1 304333162648005f36562c42e7b30dee4a2f19c0 SHA256 781e1435bbf1f43ba357e74f2aa124e556fcebb0c5b6736141b01366348d20dc size 7760
+MD5 a40c6234f1a6d4d056aaedde573ecd43 ChangeLog 7760
+RMD160 a74b31ef8814e9075ada1d5eb198e508df65c4f3 ChangeLog 7760
+SHA256 781e1435bbf1f43ba357e74f2aa124e556fcebb0c5b6736141b01366348d20dc ChangeLog 7760
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -52,10 +64,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 c15a1a49762c0863cbfa4bd5be03f174 files/digest-freebsd-lib-6.0-r3 2072
 RMD160 6c9ffd60849a62554acd27568cc21f1b76692ca3 files/digest-freebsd-lib-6.0-r3 2072
 SHA256 f0deccdb9489aa7f2a1dcad0b619427916876a3a58d1b020d754852396c59766 files/digest-freebsd-lib-6.0-r3 2072
+MD5 2a193712290cd9b29ce1b1af21254bbe files/digest-freebsd-lib-6.1_rc1 2168
+RMD160 48d493732bcc22b0cae6a5855fb5159dc3c5fcae files/digest-freebsd-lib-6.1_rc1 2168
+SHA256 01e78f57db74fd3a89f26781fa0f954a1532fd52a71c0128fc967e5eb5e54bcf files/digest-freebsd-lib-6.1_rc1 2168
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVH/QAiZjviIA2XgRAjsdAJ47BLjZGoWur72UXF22yngCqZUEvgCfarQL
-OYkDcBY0JpH3XLr8yrg6iRk=
-=dseq
+iD8DBQFEVS5EAiZjviIA2XgRAqCuAJ9GwgC08TPi8tDvE/KKm7MYXntwSACdFIbL
+zgEeOSoFvTylHAcr6Q9hNro=
+=6EJL
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc1 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc1
new file mode 100644
index 000000000000..a071cf4ea523
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.1_rc1
@@ -0,0 +1,24 @@
+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 6e8e8aefca8657f46f3065793490d1bb freebsd-crypto-6.1_rc1.tar.bz2 3977940
+RMD160 220cbe0073aec15a306e7a253675fa8bbdbefe06 freebsd-crypto-6.1_rc1.tar.bz2 3977940
+SHA256 be0aeb0e6923260bae34e0e93c8483c56e0c566721010ab9bc49b94c064d52cf freebsd-crypto-6.1_rc1.tar.bz2 3977940
+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 8b52d1055322cf2b0cad3fc9c4c066b2 freebsd-include-6.1_rc1.tar.bz2 127236
+RMD160 b978bf654921e9f58f71b372881c494b39482b56 freebsd-include-6.1_rc1.tar.bz2 127236
+SHA256 4adecf2a0517b1c9040afe1df9f18873e76f6312ced22a7ed98ee1e7f61245ad freebsd-include-6.1_rc1.tar.bz2 127236
+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 6045efaa93abaa1399d751d7eae279b2 freebsd-sys-6.1_rc1.tar.bz2 17096208
+RMD160 26bbd25ed3f3b883c6e06e849a20d47a867733b4 freebsd-sys-6.1_rc1.tar.bz2 17096208
+SHA256 612c4f37658a5e355933bc8e6c1748e5624b62c1490f7640ef9d676f96e09c29 freebsd-sys-6.1_rc1.tar.bz2 17096208
+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-lib/freebsd-lib-6.1_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc1.ebuild
new file mode 100644
index 000000000000..fb8d1b3b39a5
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.1_rc1.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_rc1.ebuild,v 1.1 2006/04/30 21:37:27 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)"/*
+}
+