move CTARGET parsing logic to the same function and add more tweaks for freebsd from...

Package-Manager: portage-2.0.53_rc5

diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 14e75941879bbb18e1fa7b35a674d2d2d3bf5e1a..8996419c885f9dabfe62d0eeeefca41acfb811bd 100644 (file)
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 MD5 582c83b33545f1de39861e08f42859e2 ChangeLog 5215
 MD5 091fb844f716a3f89969a7c6cc9a5eea crossdev-0.9.9-r3.ebuild 596
-MD5 c479cccda54cd6225a140f732e0c3106 files/crossdev 13066
+MD5 fa240cdd507d211befcfc5b0260484ab files/crossdev 13247
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.9-r3 0
 MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDUitkgIKl8Uu19MoRAm3SAJ42FqynoH6U6i+9r5R5NeDhILFqewCfYpMX
-KbjnxmAlYSiLnrTPqDNgr58=
-=EJGN
+iD8DBQFDUi1/gIKl8Uu19MoRAglRAJ4idOWjCn/dECgizpfLug8vry3lpwCfc+9y
+nfQB4KjdSLhA75fm+FwJdWA=
+=ZYlt
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index a7426be7c06d41c26dd07cfeaed44cb63e141cd8..6db314d1859f1c34ee2d90bbdbc731c5c9f596af 100755 (executable)
--- a/sys-devel/crossdev/files/crossdev
+++ b/sys-devel/crossdev/files/crossdev
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.38 2005/10/16 10:26:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.39 2005/10/16 10:35:26 vapier Exp $
 
 cd /
 
@@ -159,6 +159,21 @@ parse_target() {
 
        CTARGET=${CPRE}
        [[ -n ${CPOST} ]] && CTARGET=${CTARGET}-${CPOST}
+
+       # Tweak packages based upon CTARGET
+       case ${CTARGET} in
+               # Normal Linux host, just diff libc
+               *-dietlibc) LPKG="dietlibc";;
+               *-klibc)    LPKG="klibc";;
+               *-uclibc)   LPKG="uclibc";;
+
+               # Now for the BSDs ...
+               *-freebsd*)
+                       TARCH="${TARCH}-fbsd"
+                       LCAT="sys-freebsd" LPKG="freebsd-lib"
+                       KCAT="sys-freebsd" KPKG="freebsd-headers"
+                       ;;
+       esac
 }
 
 setup_portage_vars() {
@@ -284,12 +299,6 @@ done
 
 [[ -z ${CTARGET} ]] && usage 1
 [[ ${STAGE} == "COW" ]] && STAGE=${STAGE_C_CPP}
-case ${CTARGET} in
-       *-dietlibc) LPKG="dietlibc";;
-       *-freebsd*) LPKG="freebsd-lib" KPKG="freebsd-headers";;
-       *-klibc)    LPKG="klibc";;
-       *-uclibc)   LPKG="uclibc";;
-esac
 
 #####################
 ### sanity checks ###