Updated patches, thanks Naohiro Aotaf or this #382961

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

4 files changed, 47 insertions, 12 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index b95a48617a0b..6f948caf4c0d 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/expect
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.85 2010/12/17 23:23:44 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.86 2011/11/04 12:38:03 jlec Exp $
+
+  04 Nov 2011; Justin Lecher <jlec@gentoo.org> files/expect-5.45-gfbsd.patch,
+  files/expect-5.45-headers.patch, metadata.xml:
+  Updated patches, thanks Naohiro Aotaf or this #382961
 
 *expect-5.45 (17 Dec 2010)
 
diff --git a/dev-tcltk/expect/files/expect-5.45-gfbsd.patch b/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
index 229eb2726fe1..5ae9c26adb88 100644
--- a/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
+++ b/dev-tcltk/expect/files/expect-5.45-gfbsd.patch
@@ -1,11 +1,26 @@
 --- a/tclconfig/tcl.m4
 +++ b/tclconfig/tcl.m4
-@@ -1579,7 +1579,7 @@
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
+@@ -1634,20 +1634,15 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_LD="${CC} -shared"
+ 	    TCL_SHLIB_LD_EXTRAS="-soname \$[@]"
  	    SHLIB_SUFFIX=".so"
--	    LDFLAGS="$LDFLAGS -export-dynamic"
-+	    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+-	    LDFLAGS=""
++	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
  	    AS_IF([test $doRpath = yes], [
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+-		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
++		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
++	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    AS_IF([test "${TCL_THREADS}" = "1"], [
+ 		# The -pthread needs to go in the LDFLAGS, not LIBS
+ 		LIBS=`echo $LIBS | sed s/-pthread//`
+ 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
+-	    # 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'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	Darwin-*)
+ 	    CFLAGS_OPTIMIZE="-Os"
diff --git a/dev-tcltk/expect/files/expect-5.45-headers.patch b/dev-tcltk/expect/files/expect-5.45-headers.patch
index 33253bf381cc..98330211b328 100644
--- a/dev-tcltk/expect/files/expect-5.45-headers.patch
+++ b/dev-tcltk/expect/files/expect-5.45-headers.patch
@@ -1,5 +1,15 @@
 https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113179
-
+--- a/configure.in
++++ b/configure.in
+@@ -133,6 +133,8 @@ AC_CHECK_HEADER(sys/fcntl.h,     AC_DEFINE(HAVE_SYS_FCNTL_H))
+ AC_CHECK_HEADER(sys/ptem.h,      AC_DEFINE(HAVE_SYS_PTEM_H))
+ AC_CHECK_HEADER(sys/strredir.h,  AC_DEFINE(HAVE_STRREDIR_H))
+ AC_CHECK_HEADER(sys/strpty.h,    AC_DEFINE(HAVE_STRPTY_H))
++AC_CHECK_HEADER(pty.h,           AC_DEFINE(HAVE_PTY_H))
++AC_CHECK_HEADER(libutil.h,       AC_DEFINE(HAVE_LIBUTIL_H))
+ 
+ AC_MSG_CHECKING([for sys/bsdtypes.h])
+ if test "ISC_${ISC}" = "ISC_1"   ;    then
 --- a/exp_clib.c
 +++ b/exp_clib.c
 @@ -15,6 +15,12 @@
@@ -27,12 +37,18 @@ https://sourceforge.net/tracker/?func=detail&aid=3071706&group_id=13179&atid=113
  #include <sys/wait.h>
 --- a/pty_termios.c
 +++ b/pty_termios.c
-@@ -9,6 +9,8 @@
+@@ -9,6 +9,14 @@
  
  #include <stdio.h>
  #include <signal.h>
 +#include <string.h>
++#ifdef HAVE_PTY_H
 +#include <pty.h>
++#endif
++#ifdef HAVE_LIBUTIL_H
++#include <sys/types.h>
++#include <libutil.h>
++#endif
  
  #if defined(SIGCLD) && !defined(SIGCHLD)
  #define SIGCHLD SIGCLD
diff --git a/dev-tcltk/expect/metadata.xml b/dev-tcltk/expect/metadata.xml
index d9408d8ab078..815cc916f2b6 100644
--- a/dev-tcltk/expect/metadata.xml
+++ b/dev-tcltk/expect/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+	<herd>tcltk</herd>
 </pkgmetadata>