Add patch to fix build on Gentoo/FreeBSD. Closes bug #270049.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 36 insertions, 10 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index a7804bdd34e4..f17e5fae26d3 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/expect
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.51 2008/12/08 14:08:02 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.52 2009/05/16 13:11:21 flameeyes Exp $
+
+  16 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  expect-5.44.1.ebuild, +files/expect-5.44.1-gfbsd.patch:
+  Add patch to fix build on Gentoo/FreeBSD. Closes bug #270049.
 
   08 Dec 2008; Alexis Ballier <aballier@gentoo.org> expect-5.43.0.ebuild,
   expect-5.44.1.ebuild:
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 2988a7a43b95..eb8a7f06438e 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -6,19 +6,20 @@ AUX expect-5.42.1-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912
 AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 RMD160 2a99f4496dbbb7b1575189fe284e847851b4bedf SHA1 e85341cfd075dc27c9f79c86ac6c035e82203a15 SHA256 2dbfcf569e766d6e5d2b6bc83a7556c0cb189a7da334e07b7201bb0b764fb610
 AUX expect-5.43.0-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002
 AUX expect-5.44.1-destdir.patch 1072 RMD160 b5dcc02f39215616e790b79088ee197ea74af7f6 SHA1 a662f32614cf37a40991e80cea8d43646ca72947 SHA256 41102ebbd7da6eccea0a88c29e5b5a1ce7039effdf8c271fe09d9bbe3fe55f0e
+AUX expect-5.44.1-gfbsd.patch 720 RMD160 c2601d99b3e8d631af37d3f249c32aa9f9a3f488 SHA1 5c63fb190d20f0288e973bd24861075ebb4110e3 SHA256 7dc2e2bd43808f60574e300682c800b373ea0832488e684e589f33d79a3150bf
 AUX expect.m4 20468 RMD160 b06e075db9afed2b0a59d9b5721f874d74acdef5 SHA1 14d4cfc26131f8231af0bfa126722b123573aac4 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca
 DIST expect-5.42.1.tar.gz 524882 RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341 SHA1 84ca72f0abd2b7a31ee332049b34575a286e8f27 SHA256 a2b64dbca4dc127dfcb6d7e16dd3c08ef8bba2056104ce89819d3e6f0e1df430
 DIST expect-5.43.0.tar.gz 525570 RMD160 223b78f39dca8cc7900d82230cf7db91e6770389 SHA1 4da64b7c50cea22ac87fcf0f8f98f786793ee785 SHA256 d11a77e680ddc0244370b46f117f0b28a6571db842885bee3b7c15372c1ca079
 DIST expect-5.44.1.tar.gz 623422 RMD160 5f206d9e5b9bb73c97bb7fc0d7df7318d4525a32 SHA1 b897c7626e7dde0fd090a572389a5e2a95056de8 SHA256 e41a6b82d67150f0dc38faa5c96715d93b68d3e55be40a585737cc4f59c4fd8f
 EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 37e2632986cfa482437551c2e8842fa773505d66 SHA1 21a51490a22cbcaac3ff158159af9583d34082e1 SHA256 e3315c6b5fd88d502bc53c735ca654308084a3cd4d0ba814b197f92ff4229183
 EBUILD expect-5.43.0.ebuild 3271 RMD160 f9dae46d98d364b86d3d2d36221c3dde2e262e86 SHA1 5cb2c9860af9c45cbc06d8ed1936fc2eb528953e SHA256 7e828063384563eb6dae764d87dcc77e07309fe4341af5e5f7ed34d09035f5d7
-EBUILD expect-5.44.1.ebuild 3286 RMD160 ebc4a485dd00ebcdc86fd41d1944fea72db7cade SHA1 4e07b57fdc52262ee4fd3f42f21b08a877c57bba SHA256 0c8ef1da8558e1b08e404f8dd196e86309b0f2ec76d8c4b68ee47fa9e6bb4386
-MISC ChangeLog 7481 RMD160 d38de84ede7c27815b73db9b87764585eaf9161b SHA1 6fd1b0cab03ee331925eca4d574bc49486ad361a SHA256 665b009de9866b3185a7fa15be7199d2303d7d720f9089a7a7e1c3fcaaaa7ef0
+EBUILD expect-5.44.1.ebuild 3327 RMD160 5e52ad948f23a3cca56a5287d3536d35e8f20715 SHA1 32d729660889a4ce7eddd79cdae8a7c451aa2ce9 SHA256 476fd0417956a6538b0af071b3ac3e824b69296fd728e5e330522cd17412e257
+MISC ChangeLog 7661 RMD160 df14049051a948d1620442c147d157593228251e SHA1 0e5fb001603e7c44de90ccb65adca56dc860f0f9 SHA256 c661b44faf58cb663350e7a9f5d238e9601cfda76798d6e67b8ca85bf211abb4
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkk9KkgACgkQvFcC4BYPU0rl2gCfcDuxEiAlF63Ap7Y4GXrqLonm
-2qQAn15ySrKYj7lUMEVJpr3jXJOyNuYO
-=xIop
+iEYEARECAAYFAkoOu34ACgkQAiZjviIA2XiKUwCeMfXApKlC6felojIIUhJGbNq8
+2SAAn1BprfbVBKm6xAgU1YnQuCVMd70H
+=rpdg
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.44.1.ebuild b/dev-tcltk/expect/expect-5.44.1.ebuild
index 6dc98ca08a41..89b1aa543f61 100644
--- a/dev-tcltk/expect/expect-5.44.1.ebuild
+++ b/dev-tcltk/expect/expect-5.44.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.ebuild,v 1.3 2008/12/08 14:08:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.ebuild,v 1.4 2009/05/16 13:11:21 flameeyes Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools eutils
@@ -43,6 +43,8 @@ src_unpack() {
 	#slacky destdir support in Makefile
 	epatch "${FILESDIR}/${P}-destdir.patch"
 
+	epatch "${FILESDIR}/${P}-gfbsd.patch"
+
 	eautoconf
 }
 
diff --git a/dev-tcltk/expect/files/expect-5.44.1-gfbsd.patch b/dev-tcltk/expect/files/expect-5.44.1-gfbsd.patch
new file mode 100644
index 000000000000..84f3bfeeb6fe
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.44.1-gfbsd.patch
@@ -0,0 +1,19 @@
+Index: expect-5.44.1/tclconfig/tcl.m4
+===================================================================
+--- expect-5.44.1.orig/tclconfig/tcl.m4
++++ expect-5.44.1/tclconfig/tcl.m4
+@@ -1395,12 +1395,12 @@ dnl AC_CHECK_TOOL(AR, ar, :)
+ 	FreeBSD-*)
+ 	    # FreeBSD 3.* and greater have ELF.
+ 	    SHLIB_CFLAGS="-fPIC"
+-	    SHLIB_LD="ld -Bshareable -x"
++	    SHLIB_LD="${CC} -shared"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="$LDFLAGS -export-dynamic"
++	    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+ 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    if test "${TCL_THREADS}" = "1" ; then
+ 		# The -pthread needs to go in the CFLAGS, not LIBS