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

2 files changed, 20 insertions, 12 deletions

diff --git a/x11/wxGTK26/distinfo b/x11/wxGTK26/distinfo
index 5c9e6132775..ca09943c225 100644
--- a/x11/wxGTK26/distinfo
+++ b/x11/wxGTK26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2011/01/24 09:33:32 wiz Exp $
+$NetBSD: distinfo,v 1.7 2012/01/27 07:44:07 sbd Exp $
 
 SHA1 (wxGTK-2.6.3-libtool.diff3.bz2) = 657566a9384a4bc160dffd26678b5e0c6a1cb5b2
 RMD160 (wxGTK-2.6.3-libtool.diff3.bz2) = 233af8dd61317ed1771c1862c6cec65f131b6de0
@@ -6,7 +6,7 @@ Size (wxGTK-2.6.3-libtool.diff3.bz2) = 136446 bytes
 SHA1 (wxGTK-2.6.3.tar.bz2) = 7c2dfe27a56aa99b4ea557a436bf84a13a579a9d
 RMD160 (wxGTK-2.6.3.tar.bz2) = d7465860d7c07b42d299d4b4c5d015b25f96a9dd
 Size (wxGTK-2.6.3.tar.bz2) = 7213119 bytes
-SHA1 (patch-aa) = ea46005e47f33a9e3d76f23b463b474fd0691e32
+SHA1 (patch-aa) = c682754da141ab0a0d8739b9678a914637ad27b3
 SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b
 SHA1 (patch-ac) = 50bd7d4291e44dac1d2bbbae1b12167177f5ef01
 SHA1 (patch-ad) = fb51bb80451d39ba2bba53d42722327888b4a0be
diff --git a/x11/wxGTK26/patches/patch-aa b/x11/wxGTK26/patches/patch-aa
index f69325c83e1..f7b182b1f54 100644
--- a/x11/wxGTK26/patches/patch-aa
+++ b/x11/wxGTK26/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2012/01/27 07:44:07 sbd Exp $
 
 --- configure.orig	2006-03-21 23:42:05.000000000 +0000
 +++ configure
@@ -21,7 +21,15 @@ $NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
  
  echo "$as_me:$LINENO: checking for libraries directory" >&5
  echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
-@@ -24519,9 +24520,9 @@ fi
+@@ -23532,6 +23533,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
+@@ -24519,9 +24521,9 @@ fi
  
  
              if test "$ac_cv_header_png_h" = "yes"; then
@@ -34,7 +42,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -24539,11 +24540,11 @@ extern "C"
+@@ -24539,11 +24541,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.  */
@@ -48,7 +56,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
    ;
    return 0;
  }
-@@ -24570,20 +24571,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -24570,20 +24572,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -74,7 +82,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
    PNG_LINK=" -lpng -lz"
  fi
  
-@@ -36663,6 +36664,9 @@ echo "$as_me: WARNING: BeOS threads are 
+@@ -36663,6 +36665,9 @@ echo "$as_me: WARNING: BeOS threads are
                      THREAD_OPTS="-mt $THREAD_OPTS"
                  fi
                  ;;
@@ -84,7 +92,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
            *-*-freebsd*)
                                                  THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
                  ;;
-@@ -36797,7 +36801,7 @@ echo $ECHO_N "checking if more special f
+@@ -36797,7 +36802,7 @@ echo $ECHO_N "checking if more special f
                                                                                                                  LDFLAGS="-L/usr/lib/threads $LDFLAGS"
                  flag="-D_THREAD_SAFE"
                  ;;
@@ -93,7 +101,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
                  flag="-D_THREAD_SAFE"
                  ;;
              *-hp-hpux* )
-@@ -42959,7 +42963,7 @@ echo "$as_me: WARNING: GStreamer install
+@@ -42959,7 +42964,7 @@ echo "$as_me: WARNING: GStreamer install
  
  
  
@@ -102,7 +110,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
              # Extract the first word of "gst-inspect", so it can be a program name with args.
  set dummy gst-inspect; ac_word=$2
  echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -44788,7 +44792,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
+@@ -44788,7 +44793,7 @@ echo "${ECHO_T}$bakefile_cv_gcc31" >&6
              SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
          fi
  
@@ -111,7 +119,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
              PIC_FLAG="-dynamic -fPIC"
          fi
          if test "x$XLCC" = "xyes"; then
-@@ -45354,7 +45358,7 @@ EOF
+@@ -45354,7 +45359,7 @@ EOF
        ;;
  
        powerpc-apple-macos* | \
@@ -120,7 +128,7 @@ $NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
        *-*-sunos4* | \
        *-*-osf* | \
        *-*-dgux5* | \
-@@ -45396,7 +45400,7 @@ echo "$as_me: error: unknown system type
+@@ -45396,7 +45401,7 @@ echo "$as_me: error: unknown system type
      SONAME_FLAG=
  
      case "${BAKEFILE_HOST}" in