Fix build on Gentoo/FreeBSD by detecting it correctly.

Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64

4 files changed, 71 insertions, 11 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index 87af52e8a3ed..81b02bf0216d 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/blt
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.59 2011/12/15 17:07:46 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.60 2012/05/10 16:56:19 aballier Exp $
+
+  10 May 2012; Alexis Ballier <aballier@gentoo.org> blt-2.4z-r10.ebuild,
+  +files/blt-2.4z-gbsd.patch:
+  Fix build on Gentoo/FreeBSD by detecting it correctly.
 
   15 Dec 2011; Justin Lecher <jlec@gentoo.org> blt-2.4z-r10.ebuild:
   Mirror the sources, #394797
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index 853445d14534..5c2eae499c06 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX blt-2.4z-darwin.patch 1186 RMD160 fda20dc982aa1d7bce63e3ed248b7504e1389e5f SHA1 f6e19c0444943a106afaf9708e0bcc06f53f8636 SHA256 3cbdbbf123aeb4b4a727704c2daabddb7a4a44e23c2d0bd7652c0b0b0aa8d297
+AUX blt-2.4z-gbsd.patch 1980 RMD160 def30c58a9ed6405b3f159b0969a9c66ada42c1d SHA1 0f5d0a82a453d341aa0cd064756b11c76c5a5411 SHA256 b020b0043847bc05bda1b5c4c96c888dc0075ba3ef397bbb4af8181c20c69ce9
 AUX blt-2.4z-ldflags.patch 1086 RMD160 dc9bb13405d8c89aa86ed57e994abef8059163db SHA1 813a6f7461364568b35630a1d5e281334efc8d7e SHA256 20245d45dfb0e96afe1127fa40209a7881fbd3f3880ef04af9496809a308f06e
 AUX blt-2.4z-linking.patch 684 RMD160 14fda8108cebdcfa170677976dd1af80b2f489cc SHA1 77d56fbe846bf4990ddbb64b4eacd2350447886e SHA256 cd19df698ca40ce743c81fe2c18dce615a6db385c6a973b9a14201f45e5467a2
 AUX blt-2.4z-r4-fix-makefile.patch 817 RMD160 dcd6f91b7be961df99143ebe6f7acebb116e01b6 SHA1 4049c4c4eda24fc2c57def93f09c24176c83a132 SHA256 fd8ada3720c85856770f4770a93f4e668a75de3cf68d35d25597215996e023e8
@@ -11,13 +12,13 @@ AUX blt2.4z-64bit.patch 891 RMD160 f2bc82f9a98d632480fc678af7a94fdf8899810d SHA1
 AUX blt2.4z-install.diff 1057 RMD160 4531572aa1177ab362d522964a8f62d6401ff237 SHA1 47b65e77e663cf95282612216a2fb4c8d8dda725 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8
 AUX pkgIndex.tcl 146 RMD160 fdb0f974b517685ba1f207b11eea1f3a4c4f2f14 SHA1 c005d612949e1a70a34fa83098d1a36bf51a912c SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef511ec2f2659d
 DIST blt2.4z-8.5.2.tar.gz 2326234 RMD160 1012e0a21a9b45957d6482e55e21b9e54e3f1db2 SHA1 217986ef73dfbb9f64d4af7da0248e28ee2f6cab SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16
-EBUILD blt-2.4z-r10.ebuild 3592 RMD160 ddfe237ef040094eb58483ccc4d73ec0ead7d813 SHA1 778df40735708321140e97c42b24d6c1cf93844d SHA256 cd266af7402ed0096654f1a8e450e6ebf5e4dd2b06476135df0b97f5306aa6fb
-MISC ChangeLog 7945 RMD160 151e5ddbadcbf06ff4dd8fa2dcd7d21a27149fc2 SHA1 a9f566a7d05b3b22cbce58cdd06306d0963f3fc4 SHA256 4cce0e84a3978854a3c06efb672316da25332eb48becf301b73f02bcbf705dd8
+EBUILD blt-2.4z-r10.ebuild 3634 RMD160 18b16283c82e5507b650e0977ad4c343fc842e98 SHA1 677e3761d4644ab57ee15015da0ebc0348de512c SHA256 3c2f88bcdf1121fd9bbf241200577dfbdfda4bbb82a6c0ce045d5796344aacca
+MISC ChangeLog 8110 RMD160 615ebfa33a6aa57f82d99b0beaa9e4214b1da450 SHA1 8fadb75bc3bc0a5c4baac6bdd3c2d4431935f0fd SHA256 1a56b0d833539f795565838018a7f8ac0c52e91480a4676dfc8bf91dcb89d838
 MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk7qKXAACgkQgAnW8HDreRaWhQCeL4BN41lMOk/dc/U/V4Sx5XsP
-17oAn0vAh+4LS9O/FNncaSUmJP/JN2yr
-=xxyw
+iEYEARECAAYFAk+r8zgACgkQvFcC4BYPU0pqmQCeIisgW3RlOdT2j8QgwHjbl018
+6QgAn2cQT7kF8m1B7UVlw2BAHp6PUYUX
+=Dkkf
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/blt/blt-2.4z-r10.ebuild b/dev-tcltk/blt/blt-2.4z-r10.ebuild
index dd7f370e9ede..f1cd6c2761ab 100644
--- a/dev-tcltk/blt/blt-2.4z-r10.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.10 2011/12/15 17:07:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.11 2012/05/10 16:56:19 aballier Exp $
 
 EAPI="3"
 
@@ -51,6 +51,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${P}-linking.patch
 	epatch "${FILESDIR}"/${P}-darwin.patch
+	epatch "${FILESDIR}"/${P}-gbsd.patch
 }
 
 src_configure() {
diff --git a/dev-tcltk/blt/files/blt-2.4z-gbsd.patch b/dev-tcltk/blt/files/blt-2.4z-gbsd.patch
new file mode 100644
index 000000000000..ffdadf1746e5
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-gbsd.patch
@@ -0,0 +1,54 @@
+Detect correctly Gentoo/*BSD CHOSTS:
+- *-*-freebsd* means tcl/tk libs will be like libtcl85.so, instead of
+  libtcl8.5.so
+- *-gentoo-*bsd means this is a Gentoo/*BSD system which uses the same toolchain
+  as linux, so we link in the same way.
+
+--- blt2.4z-8.5.2/configure.old	2012-05-06 18:11:45.000000000 -0400
++++ blt2.4z-8.5.2/configure	2012-05-06 18:15:25.000000000 -0400
+@@ -3376,7 +3376,7 @@
+ fi
+ 
+ case $target in
+-  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
++  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-freebsd*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
+     TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+     TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+     ;;
+@@ -4079,6 +4079,12 @@
+     EXTRA_LIB_SPECS="-ldl"
+     ;;
+ 
++  *-gentoo-netbsd*|*-gentoo-freebsd*|*-gentoo-openbsd*)
++    SHLIB_CFLAGS="-fPIC"
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
++    ;;
++
+   *-netbsd*|*-freebsd*|*-openbsd*)
+     # Not available on all versions:  check for include file.
+     ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
+--- blt2.4z-8.5.2/configure.in.old	2012-05-06 18:11:47.000000000 -0400
++++ blt2.4z-8.5.2/configure.in	2012-05-06 18:15:08.000000000 -0400
+@@ -708,7 +708,7 @@
+ fi
+ 
+ case $target in
+-  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
++  *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-freebsd*|OpenBSD-*|*-*-cygwin*|*-*-mingw*)
+     TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+     TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+     ;;
+@@ -1241,6 +1241,12 @@
+     EXTRA_LIB_SPECS="-ldl"
+     ;;
+ 
++  *-gentoo-netbsd*|*-gentoo-freebsd*|*-gentoo-openbsd*)
++    SHLIB_CFLAGS="-fPIC"
++    SHLIB_LD="${CC}"
++    SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
++    ;;
++
+   *-netbsd*|*-freebsd*|*-openbsd*)
+     # Not available on all versions:  check for include file.
+     AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)