port tcl fbsd patch to let it build sanely on FreeBSD: the patch is for tcl.m4 and tk bundles it own unfixed version...

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

4 files changed, 31 insertions, 8 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 87e0c02a0f1a..72e66a14834f 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.168 2012/04/01 15:24:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.169 2012/04/26 19:47:53 aballier Exp $
+
+  26 Apr 2012; Alexis Ballier <aballier@gentoo.org>
+  +files/tcl-8.5.9-gentoo-fbsd.patch, tk-8.5.11.ebuild:
+  port tcl fbsd patch to let it build sanely on FreeBSD: the patch is for
+  tcl.m4 and tk bundles it own unfixed version...
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> tk-8.5.10-r1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #406607
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 944cb29505b1..6a66e6f4e5ac 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX remove-control-v-8.4.9.diff 522 RMD160 393f14c68f75795bc10e94d00a2e4d470ab50e4d SHA1 e45327e49545a8ef6132bec7303ef0b19a06e794 SHA256 f82a147821e6eb4cda3674568450903de864c99d73cae6062b56c391e7290bba
+AUX tcl-8.5.9-gentoo-fbsd.patch 475 RMD160 f271932db1692ed5b3a4e14393febd2e2c1a7eac SHA1 2804780f2d4b51e83c8b4b4d45cc0437b9bb28a1 SHA256 5f7c415260c124f7515b8621535ba277add91b584149283543a92f5f2613dc75
 AUX tk-8.4-lastevent.patch 1095 RMD160 5e03fcb59320898429a3c1d438916eb0a65eeefc SHA1 433e2718f8eaa124ae87f53a276bb2208602fd6d SHA256 73bdd40b9e04ad705ac8956ea96967aaee5ac8ee9588a43e5c1bf30d50c0996d
 AUX tk-8.4.11-multilib.patch 896 RMD160 29152dde424c41555e132c1b279ccc7ab279e27f SHA1 7f6e6d808e2016b1283d45fa001482c7a76a66a7 SHA256 1f15653e3f68fdd6b32b985514d6b2bae7a3a6c717a326c85082394095376636
 AUX tk-8.4.15-aqua.patch 713 RMD160 aceaeca7033b68c198f8299a8e7d72ef331d3c0f SHA1 adf4e1098e73d42b0da2b0be7742782c6a84e28d SHA256 64eea5899c147cd1ad0b9da76de663f73570a50dc8a482c860c6caf2fd058470
@@ -22,17 +23,17 @@ EBUILD tk-8.4.18-r1.ebuild 3250 RMD160 5e4a4e2a1bf9d627e3ac943e79fc4559cc3ddedc
 EBUILD tk-8.4.18.ebuild 3172 RMD160 92277145a90076904705c1793f8edacedf4dbed6 SHA1 f4053271122a5ead05d4ab9e193af286da7a862f SHA256 66950b70f7d997a27ce641af9ecc0d78001b57cf05c6b8d7dc5b396827323b90
 EBUILD tk-8.4.19-r1.ebuild 3262 RMD160 c9fe9b3b572d4b0e1933bd095a9fba8c850a3d19 SHA1 32826f74e838ec3ad09bdf54811cb2c75f59d6f2 SHA256 4853aa1c968cc14c369e105bfce4f4c5b3b28fdee97757dbb49681ad65d0390e
 EBUILD tk-8.5.10-r1.ebuild 3167 RMD160 81e5d6ae06cf239f83857735a16bccb3b95e039c SHA1 19aa1061d8d067dc0a9c3971deada25c5aeac0a9 SHA256 31e14de37faeef6d62e295fc01e4692831b2089fbf28671f1b610ba054720e2d
-EBUILD tk-8.5.11.ebuild 3162 RMD160 3c5f156eb824e5fd81c8a2f2446f01e00255dbce SHA1 54d74945e1a4f8316fe2b10d8d14a11993cc6688 SHA256 9ea3c05f922e7a1f3320eaa7dc712a70c10182e8aeacc628267ed9fbada53306
+EBUILD tk-8.5.11.ebuild 3317 RMD160 e11ba4ba753109d95b8e54ecb5a929a4754e8869 SHA1 f044ec978c61fba97ee50f01a73802ccaf87521f SHA256 d5785d5f634c00e5c135bd7c12381b599b23b526422cc156d70ef1c3d0ce9307
 EBUILD tk-8.5.7-r1.ebuild 2880 RMD160 445ae6825eb80c09dade8b9eb834697662be1ab1 SHA1 89ec94ed94dbd33245b451c319beeb0037878afd SHA256 efd70fe2b92b24ce91ccc8b03e99f20dc830f8ebe7bf4a2bbd6836de8eb24e15
 EBUILD tk-8.5.7.ebuild 2776 RMD160 ac64048b9fd4113d5fc5bc4f888156e32901617b SHA1 766e18f181acd1d269bd38062ae2c0c2b4909c62 SHA256 8201c25e9a294908c000bd4e897f7a9e61d28b0df2b0fbc39e50e5ccec8d647b
 EBUILD tk-8.5.8-r1.ebuild 3226 RMD160 1d9f7270b8628a1c480138e31ff65700fed000a4 SHA1 e9cd361427b09d027faaa4403ce9dcf7d226b24e SHA256 9885d6d414455e63bc284f13884091ba4b88a822efd61a18da8bb47cad971fc1
 EBUILD tk-8.5.9-r1.ebuild 3225 RMD160 16883f5abf8d9f0dfb912603a14e3b8564f023e1 SHA1 a8c56641d215fcb96b536609bb8959077707a37b SHA256 dba430898da54a61ad6fa7dacb6b747db57c35cd8eff225a173951b43402ccfd
-MISC ChangeLog 22291 RMD160 4638b8cbc7f70d2ab8b471520f16731f895ea0d9 SHA1 cde08b8aa1cbf1066528dd9dc24231915f2cccbb SHA256 55f0d3dae7d1eeb1966fea756fad087d36b91abd1c4b67a2fc35290f99dca925
+MISC ChangeLog 22525 RMD160 e9274531ef2faece5d9eede964ec2598861e6c4b SHA1 a7712e8a1f150ec95b06c308c61db9c6e557dc14 SHA256 ea62c619bd6a2b256749c79fea02a2f13858d051f09eb90eac3071a85e8f8742
 MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk94c0oACgkQuQc30/atMkDVGACfTX1s0T1iFJ5E2Ec43TVI4486
-etEAnR5KQrkbWDs+EznVfiiV1eXXA+qq
-=3eru
+iEYEARECAAYFAk+Zpm8ACgkQvFcC4BYPU0p4YwCeMRWwHPGCxnXT7qDb90j3q7ud
+dC8AoM3Qw7wUIyjZv+g/pC3CXiQzOHls
+=8twT
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch b/dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch
new file mode 100644
index 000000000000..022d81d3e261
--- /dev/null
+++ b/dev-lang/tk/files/tcl-8.5.9-gentoo-fbsd.patch
@@ -0,0 +1,13 @@
+diff --git a/unix/tcl.m4 b/unix/tcl.m4
+index fdd9d44..31bfca8 100644
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -1601,7 +1601,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # Version numbers are dot-stripped by system policy.
+ 	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	Darwin-*)
diff --git a/dev-lang/tk/tk-8.5.11.ebuild b/dev-lang/tk/tk-8.5.11.ebuild
index b41086913984..ead688632896 100644
--- a/dev-lang/tk/tk-8.5.11.ebuild
+++ b/dev-lang/tk/tk-8.5.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.3 2012/03/19 08:10:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.4 2012/04/26 19:47:53 aballier Exp $
 
 EAPI=4
 
@@ -39,6 +39,10 @@ src_prepare() {
 	# Bug 125971
 	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
 
+	# Bug 354067 : the same applies to tk, since the patch is about tcl.m4, just
+	# copy the tcl patch
+	epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch
+
 	sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die
 
 	cd "${S}"/unix