Make the ebuild aware of crosscompile support to allow building crosscompilers. This requires the sys-apps/mtree package on non-BSD systems.

Package-Manager: portage-2.1_pre7-r5

3 files changed, 32 insertions, 17 deletions

diff --git a/sys-freebsd/freebsd-headers/ChangeLog b/sys-freebsd/freebsd-headers/ChangeLog
index 77b4f7d5e0f8..c49370ef4e23 100644
--- a/sys-freebsd/freebsd-headers/ChangeLog
+++ b/sys-freebsd/freebsd-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-headers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-headers/ChangeLog,v 1.2 2006/04/02 21:51:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-headers/ChangeLog,v 1.3 2006/04/18 23:29:09 flameeyes Exp $
+
+  18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-headers-6.0.ebuild:
+  Make the ebuild aware of crosscompile support to allow building
+  crosscompilers. This requires the sys-apps/mtree package on non-BSD systems.
 
 *freebsd-headers-6.0 (01 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-headers/Manifest b/sys-freebsd/freebsd-headers/Manifest
index d7f76ef04f6e..1bca4438a11f 100644
--- a/sys-freebsd/freebsd-headers/Manifest
+++ b/sys-freebsd/freebsd-headers/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5bf970b4e462c03d9a71967db2ecd851 ChangeLog 1360
-RMD160 b307e08ac2824a47749a6cd99a9f39581da83a46 ChangeLog 1360
-SHA256 f780e80fe497d81de45d653a0a0e1014eca51fa34e08de54b039674969bc8932 ChangeLog 1360
+MD5 cad98b587b70b54d768c4193a0d0532b ChangeLog 1589
+RMD160 8609b5fbca8b1fab6fca00f1ccb6824138065c43 ChangeLog 1589
+SHA256 80a36dd8b095b866f9f7b36afa0010047716c9c3b48ec14a7a714dd1c3017467 ChangeLog 1589
 MD5 396b72a7e81b030f7b41760b72ff88b5 files/digest-freebsd-headers-6.0 210
 RMD160 6112211d72d7f1b1a8dfa964904c96a26af9a44d files/digest-freebsd-headers-6.0 210
 SHA256 c889fe2195c91c64754e2f09222477d39e39057229bb2150b56899c6bb88c782 files/digest-freebsd-headers-6.0 210
-MD5 c34506cabc120059deceec5a258c1912 freebsd-headers-6.0.ebuild 1044
-RMD160 c039c7c22a5117467ed4b1f139e4bacc71e044a4 freebsd-headers-6.0.ebuild 1044
-SHA256 b345e5a51b126f7860136d045a92d172ae109b926f1f950c69e9a385b6493f1f freebsd-headers-6.0.ebuild 1044
+MD5 39d6f4a14028d0bff9b127d436f7a004 freebsd-headers-6.0.ebuild 1314
+RMD160 7fe7267c9a8313c1914259da34ac67ecc7bd3999 freebsd-headers-6.0.ebuild 1314
+SHA256 3a9561e75fe6d7d3ba82d1d8d099f9706fc5137dfd7ddad65db4b3d2e2d8bdfe freebsd-headers-6.0.ebuild 1314
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEMEd3AiZjviIA2XgRAramAKDU2343Bh7T8JpzlIEHLh6sONvEtQCfWA4l
-gvUjCppqElPTVCoNxq0Qyic=
-=HHKX
+iD8DBQFERXWkAiZjviIA2XgRAk5TAKCHHYuySRnh3QaXX2cNkGoec/gHpQCgvQMK
+ZheNedUdEz2pmG5UtFIwb5U=
+=ZLGU
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-headers/freebsd-headers-6.0.ebuild b/sys-freebsd/freebsd-headers/freebsd-headers-6.0.ebuild
index fd594404261c..a4afcfd475a7 100644
--- a/sys-freebsd/freebsd-headers/freebsd-headers-6.0.ebuild
+++ b/sys-freebsd/freebsd-headers/freebsd-headers-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-headers/freebsd-headers-6.0.ebuild,v 1.1 2006/04/01 16:43:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-headers/freebsd-headers-6.0.ebuild,v 1.2 2006/04/18 23:29:09 flameeyes Exp $
 
 inherit bsdmk freebsd toolchain-funcs
 
@@ -15,7 +15,8 @@ SRC_URI="mirror://gentoo/${INCLUDE}.tar.bz2
 	mirror://gentoo/${ETC}.tar.bz2"
 
 RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*"
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+	|| ( sys-apps/mtree sys-freebsd/freebsd-ubin )"
 
 PROVIDE="virtual/os-headers"
 
@@ -23,19 +24,28 @@ RESTRICT="nostrip"
 
 S=${WORKDIR}/include
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
+src_unpack() {
+	freebsd_src_unpack
+
+	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && sed -i -e 's:${INSTALL} -C:${INSTALL}:' ${S}/Makefile
+}
 
 src_compile() {
 	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make failed"
 }
 
 src_install() {
+	CTARGET=${CTARGET:-${CHOST}}
+	if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then
+		CTARGET=${CATEGORY/cross-}
+	fi
+
 	[[ ${CTARGET} == ${CHOST} ]] \
 		&& INCLUDEDIR="/usr/include" \
 		|| INCLUDEDIR="/usr/${CTARGET}/include"
 
-	$(freebsd_get_bmake) install DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed"
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+
+	dodir "${INCLUDEDIR}"
+	$(freebsd_get_bmake) installincludes DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed"
 }