Fix buildling for X11R7

2 files changed, 19 insertions, 11 deletions

diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo
index 8ce679b3dc7..81ec27cba43 100644
--- a/x11/wxGTK28/distinfo
+++ b/x11/wxGTK28/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2009/03/23 00:38:55 joerg Exp $
+$NetBSD: distinfo,v 1.4 2009/05/15 07:08:59 adam Exp $
 
 SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
 RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
@@ -6,6 +6,6 @@ Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes
 SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4
 RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432
 Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes
-SHA1 (patch-aa) = 9cf0af5d5d9f6eaee43ed74c45e45c0a88907ad1
+SHA1 (patch-aa) = 1a30c79f07ea8ea5dff02fad9b5e1ba8dadde01a
 SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
diff --git a/x11/wxGTK28/patches/patch-aa b/x11/wxGTK28/patches/patch-aa
index cf73f6d902c..27b2277c308 100644
--- a/x11/wxGTK28/patches/patch-aa
+++ b/x11/wxGTK28/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2009/05/15 07:09:00 adam Exp $
 
---- configure.orig	2008-06-20 11:07:14.000000000 +0200
+--- configure.orig	2009-03-06 13:17:38.000000000 +0100
 +++ configure
 @@ -1962,7 +1962,7 @@ _ACEOF
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
      USE_BSD=1
      USE_FREEBSD=1
      cat >>confdefs.h <<\_ACEOF
-@@ -15805,7 +15805,7 @@ retest_macosx_linking=no
+@@ -16139,7 +16139,7 @@ retest_macosx_linking=no
  
  #if test "$wxUSE_MAC" = 1; then
      if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
              # Implicitly turn on the new --with-macosx-sdk using the default
              # SDK which provides the behavior this option has always had.
              if test "x$wxUSE_MACOSX_SDK" = "x"; then
-@@ -15887,7 +15887,7 @@ echo $ECHO_N "checking SDK deployment ve
+@@ -16221,7 +16221,7 @@ echo $ECHO_N "checking SDK deployment ve
          MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
  
          # If that failed, try again with the new key
@@ -29,7 +29,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
  
              MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
  
-@@ -38671,6 +38671,9 @@ echo "$as_me: WARNING: BeOS threads are 
+@@ -24948,6 +24948,7 @@ SEARCH_INCLUDE="\
+                               \
+     /usr/include/Xm           \
+                               \
++    /usr/X11R7/include        \
+     /usr/X11R6/include        \
+     /usr/X11R6.4/include      \
+                               \
+@@ -39478,6 +39479,9 @@ echo "$as_me: WARNING: BeOS threads are 
                      THREAD_OPTS="-mt $THREAD_OPTS"
                  fi
                  ;;
@@ -39,7 +47,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
            *-*-freebsd*)
                                                  THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
                  ;;
-@@ -38804,7 +38807,7 @@ echo $ECHO_N "checking if more special f
+@@ -39611,7 +39615,7 @@ echo $ECHO_N "checking if more special f
                                                                                                                  LDFLAGS="-L/usr/lib/threads $LDFLAGS"
                  flag="-D_THREAD_SAFE"
                  ;;
@@ -48,7 +56,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
                  flag="-D_THREAD_SAFE"
                  ;;
              *-hp-hpux* )
-@@ -47714,7 +47717,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
+@@ -48532,7 +48536,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
              SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
          fi
  
@@ -57,7 +65,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
              PIC_FLAG="-dynamic -fPIC"
          fi
          if test "x$XLCC" = "xyes"; then
-@@ -48281,6 +48284,7 @@ EOF
+@@ -49099,6 +49103,7 @@ EOF
  
        powerpc-apple-macos* | \
        *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
@@ -65,7 +73,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
        *-*-mirbsd* | \
        *-*-sunos4* | \
        *-*-osf* | \
-@@ -48324,7 +48328,7 @@ echo "$as_me: error: unknown system type
+@@ -49142,7 +49147,7 @@ echo "$as_me: error: unknown system type
  
      case "${BAKEFILE_HOST}" in
        *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \