[pkgsrc/trunk]: pkgsrc/devel Add some band aid for the not-yet-fully-analyzed...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cae4984720dd
branches:  trunk
changeset: 568781:cae4984720dd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Dec 18 22:11:10 2009 +0000

description:
Add some band aid for the not-yet-fully-analyzed issue with sh on
NetBSD. Install a prestine install.sh to not leak our modifications
into packages. Bump revision.

diffstat:

 devel/libtool-base/Makefile    |   6 ++++--
 devel/libtool/distinfo         |   4 ++--
 devel/libtool/patches/patch-ab |  25 ++++++++++++++++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diffs (78 lines):

diff -r ca60d70c28be -r cae4984720dd devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Fri Dec 18 21:08:57 2009 +0000
+++ b/devel/libtool-base/Makefile       Fri Dec 18 22:11:10 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2009/12/16 15:27:34 joerg Exp $
+# $NetBSD: Makefile,v 1.90 2009/12/18 22:11:10 joerg Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,7 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-base-/}
-PKGREVISION=   1
+PKGREVISION=   2
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
@@ -36,6 +36,8 @@
 TEST_TARGET=   check
 PLIST_VARS+=   shlibtool
 
+OVERRIDE_DIRDEPTH.install-sh=  1
+
 .if ${OPSYS} == "AIX"
 
 # always build libraries and executables that use the runtime linker.
diff -r ca60d70c28be -r cae4984720dd devel/libtool/distinfo
--- a/devel/libtool/distinfo    Fri Dec 18 21:08:57 2009 +0000
+++ b/devel/libtool/distinfo    Fri Dec 18 22:11:10 2009 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.78 2009/12/17 00:53:52 joerg Exp $
+$NetBSD: distinfo,v 1.79 2009/12/18 22:11:10 joerg Exp $
 
 SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55
 RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef
 Size (libtool-2.2.6b.tar.gz) = 2347317 bytes
 SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751
-SHA1 (patch-ab) = 9253f12bc5e0c0576885a374c76b821c28ae2ede
+SHA1 (patch-ab) = 7b88703844ca0b2906b1ad81a431a4bfc125445e
 SHA1 (patch-ac) = 8187bfc8436d2d7477a6a33c925c6d141804ad65
 SHA1 (patch-ad) = 51ede8bef293d566cd359efa52e6cd04f4a380ec
diff -r ca60d70c28be -r cae4984720dd devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab    Fri Dec 18 21:08:57 2009 +0000
+++ b/devel/libtool/patches/patch-ab    Fri Dec 18 22:11:10 2009 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.66 2009/12/17 00:53:52 joerg Exp $
+$NetBSD: patch-ab,v 1.67 2009/12/18 22:11:10 joerg Exp $
+
+The last two chunks work around bugs in ksh on NetBSD.
+The problem manifests with wl and no_builtin_flag containing newlines.
 
 --- configure.orig     2009-12-17 01:29:54.000000000 +0100
 +++ configure
@@ -835,3 +838,23 @@
  
  lt_cv_prog_compiler_c_o_RC=yes
  
+@@ -24427,6 +24441,9 @@
+ LTCFLAGS='$LTCFLAGS'
+ compiler='$compiler_DEFAULT'
+ 
++printf "%s" "$lt_prog_compiler_wl" > /dev/null
++printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null
++
+ # Quote evaled strings.
+ for var in SED \
+ GREP \
+@@ -24711,6 +24729,9 @@
+   ;;
+ esac
+ 
++printf "%s" "$lt_prog_compiler_wl" > /dev/null
++printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null
++
+ ac_aux_dir='$ac_aux_dir'
+ xsi_shell='$xsi_shell'
+ lt_shell_append='$lt_shell_append'