Make librarys install in PREFIX/lib (not PREFIX/lib64 etc.)

2 files changed, 19 insertions, 11 deletions

diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo
index 1964966df80..cc42f660254 100644
--- a/x11/wxGTK28/distinfo
+++ b/x11/wxGTK28/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/01/24 15:34:31 wiz Exp $
+$NetBSD: distinfo,v 1.12 2012/01/27 06:07:48 sbd Exp $
 
 SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
 RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
@@ -6,7 +6,7 @@ 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) = fbcfd8e6abaabab393f24dc368c1c6b8447a75be
+SHA1 (patch-aa) = ec0eb46931d4356981511e2b4e127766b0b32928
 SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
 SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650
diff --git a/x11/wxGTK28/patches/patch-aa b/x11/wxGTK28/patches/patch-aa
index 0379533ebc8..92bcb6df790 100644
--- a/x11/wxGTK28/patches/patch-aa
+++ b/x11/wxGTK28/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2012/01/27 06:07:48 sbd Exp $
 
 --- configure.orig	2009-03-06 12:17:38.000000000 +0000
 +++ configure
@@ -37,7 +37,15 @@ $NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
                                \
-@@ -26379,9 +26380,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
+@@ -25055,6 +25056,7 @@ fi
+         wx_cv_std_libpath="lib";
+         ;;
+ esac
++wx_cv_std_libpath="lib"
+ 
+ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
+ echo "${ECHO_T}$wx_cv_std_libpath" >&6
+@@ -26379,9 +26381,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
  
  
              if test "$ac_cv_header_png_h" = "yes"; then
@@ -50,7 +58,7 @@ $NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -26399,11 +26400,11 @@ extern "C"
+@@ -26399,11 +26401,11 @@ extern "C"
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -64,7 +72,7 @@ $NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
    ;
    return 0;
  }
-@@ -26429,20 +26430,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -26429,20 +26431,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -90,7 +98,7 @@ $NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
    PNG_LINK=" -lpng -lz"
  fi
  
-@@ -39478,6 +39479,9 @@ echo "$as_me: WARNING: BeOS threads are 
+@@ -39478,6 +39480,9 @@ echo "$as_me: WARNING: BeOS threads are
                      THREAD_OPTS="-mt $THREAD_OPTS"
                  fi
                  ;;
@@ -100,7 +108,7 @@ $NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
            *-*-freebsd*)
                                                  THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
                  ;;
-@@ -39611,7 +39615,7 @@ echo $ECHO_N "checking if more special f
+@@ -39611,7 +39616,7 @@ echo $ECHO_N "checking if more special f
                                                                                                                  LDFLAGS="-L/usr/lib/threads $LDFLAGS"
                  flag="-D_THREAD_SAFE"
                  ;;
@@ -109,7 +117,7 @@ $NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
                  flag="-D_THREAD_SAFE"
                  ;;
              *-hp-hpux* )
-@@ -48532,7 +48536,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
+@@ -48532,7 +48537,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
              SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
          fi
  
@@ -118,7 +126,7 @@ $NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
              PIC_FLAG="-dynamic -fPIC"
          fi
          if test "x$XLCC" = "xyes"; then
-@@ -49099,6 +49103,7 @@ EOF
+@@ -49099,6 +49104,7 @@ EOF
  
        powerpc-apple-macos* | \
        *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
@@ -126,7 +134,7 @@ $NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
        *-*-mirbsd* | \
        *-*-sunos4* | \
        *-*-osf* | \
-@@ -49142,7 +49147,7 @@ echo "$as_me: error: unknown system type
+@@ -49142,7 +49148,7 @@ echo "$as_me: error: unknown system type
  
      case "${BAKEFILE_HOST}" in
        *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \