[pkgsrc/trunk]: pkgsrc/x11/wxGTK28 Add @PREFIX@/lib to SEARCH_LIB in configur...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c38afdddab31
branches:  trunk
changeset: 600690:c38afdddab31
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Mon Mar 12 10:39:13 2012 +0000

description:
Add @PREFIX@/lib to SEARCH_LIB in configure to end up with a sane search
path on SunOS, where a transformation from 'lib' to 'lib/64' is performend
automatically when ABI=64.

diffstat:

 x11/wxGTK28/Makefile.common  |   3 ++-
 x11/wxGTK28/patches/patch-aa |  12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r eea921d11681 -r c38afdddab31 x11/wxGTK28/Makefile.common
--- a/x11/wxGTK28/Makefile.common       Mon Mar 12 09:46:06 2012 +0000
+++ b/x11/wxGTK28/Makefile.common       Mon Mar 12 10:39:13 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2012/01/20 12:02:23 drochner Exp $
+# $NetBSD: Makefile.common,v 1.12 2012/03/12 10:39:13 fhajny Exp $
 #
 # used by x11/wxGTK28/Makefile
 # used by x11/wxGTK28-contrib/Makefile
@@ -53,6 +53,7 @@
 SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
 SUBST_FILES.fix-paths=         configure
 SUBST_SED.fix-paths=           -e 's,/usr/pkg/include,${PREFIX}/include,g'
+SUBST_SED.fix-paths+=          -e 's,@PREFIX@,${PREFIX},g'
 
 pre-configure:
        mkdir ${WRKSRC}/build-non-unicode ${WRKSRC}/build-unicode
diff -r eea921d11681 -r c38afdddab31 x11/wxGTK28/patches/patch-aa
--- a/x11/wxGTK28/patches/patch-aa      Mon Mar 12 09:46:06 2012 +0000
+++ b/x11/wxGTK28/patches/patch-aa      Mon Mar 12 10:39:13 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2012/01/27 06:07:48 sbd Exp $
+$NetBSD: patch-aa,v 1.5 2012/03/12 10:39:13 fhajny Exp $
 
 --- configure.orig     2009-03-06 12:17:38.000000000 +0000
 +++ configure
@@ -37,7 +37,7 @@
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
                                \
-@@ -25055,6 +25056,7 @@ fi
+@@ -25055,11 +25056,12 @@ fi
          wx_cv_std_libpath="lib";
          ;;
  esac
@@ -45,6 +45,12 @@
  
  echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
  echo "${ECHO_T}$wx_cv_std_libpath" >&6
+ 
+-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
++SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath @PREFIX@/lib"
+ 
+ if test "$build" != "$host" -a "$GCC" = yes; then
+                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
 @@ -26379,9 +26381,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
  
  
@@ -98,7 +104,7 @@
    PNG_LINK=" -lpng -lz"
  fi
  
-@@ -39478,6 +39480,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
                  ;;