1 files changed, 10 insertions, 40 deletions
diff --git a/x11-toolkits/wxgtk29/files/patch-configure b/x11-toolkits/wxgtk29/files/patch-configure
index b3cf594f3ac9..1fec2d79037f 100644
--- a/x11-toolkits/wxgtk29/files/patch-configure
+++ b/x11-toolkits/wxgtk29/files/patch-configure
@@ -1,58 +1,28 @@
---- configure.orig	Thu Jun  2 23:03:05 2005
-+++ configure	Wed Aug 31 23:48:02 2005
-@@ -23409,6 +23409,7 @@
+--- configure.orig	Mon Nov 13 16:57:42 2006
++++ configure	Thu Nov 30 22:49:10 2006
+@@ -24040,6 +24040,7 @@
  
  
  SEARCH_INCLUDE="\
-+    $X11BASE/include	      \
++    $X11BASE/include          \
      /usr/local/include        \
                                \
      /usr/Motif-2.1/include    \
-@@ -34396,7 +34396,7 @@
+@@ -38999,7 +39000,7 @@
                  fi
                  ;;
            *-*-freebsd*)
 -                                                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
-+                                                THREAD_OPTS="$PTHREAD_LIBS"
++                                                THREAD_OPTS="${PTHREAD_LIBS}"
                  ;;
            *-*-darwin* | *-*-cygwin* )
                                                  THREAD_OPTS=""
-@@ -34433,6 +34433,12 @@
- echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6
-                     ;;
- 
-+                -pthread|-l*)
-+                    echo "$as_me:$LINENO: checking for the pthreads library $flag" >&5
-+echo $ECHO_N "checking for the pthreads library $flag... $ECHO_C" >&6
-+                    THREADS_LINK="$flag"
-+                    ;;
-+
-                 -*)
-                     echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
- echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6
-@@ -34515,7 +34521,7 @@
-           { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5
- echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
-       else
--                              LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
-+                              LDFLAGS="$THREADS_CFLAGS $THREADS_LINK $LDFLAGS"
-           LIBS="$THREADS_LINK $LIBS"
- 
-           echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
-@@ -35701,6 +35707,7 @@
-     fi
-   fi
- fi
-+TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} ${PTHREAD_CFLAGS}"
- 
- if test "$WXGTK20" = 1 ; then
-   cat >>confdefs.h <<_ACEOF
-@@ -35823,7 +35830,7 @@
-         OPTIMISE="-O"
+@@ -41649,7 +41650,7 @@
+         OPTIMISE_CFLAGS="-O"
      fi
  fi
 -
-+OPTIMISE=
++OPTIMISE_CFLAGS=
  
- if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
+ if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then
      cat >>confdefs.h <<\_ACEOF