be compatible with "nm -p" on Solaris 11.3

It now differentiates between bss and common symbols, and lists variables
in the latter section with symbol type "C", like GNU nm(1) does.
So add "C" to the list of letters that the global_symbol_pipe script
accepts on Solaris.
Bump PKGREVISION of libtool-base.

5 files changed, 40 insertions, 13 deletions

diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index f416be18276..d0fcb9592b9 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2016/02/25 12:12:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.116 2016/03/10 12:43:48 tnn Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,7 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-base-/}
-PKGREVISION=	11
+PKGREVISION=	12
 
 COMMENT=	Generic shared library support script (the script itself)
 
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index f602f079a53..175e80c9a13 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.101 2016/02/23 15:17:41 joerg Exp $
+$NetBSD: distinfo,v 1.102 2016/03/10 12:43:48 tnn Exp $
 
 SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88
 RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d
 SHA512 (libtool-2.4.2.tar.gz) = 0e54af7bbec376f943f2b8e4f13631fe5627b099a37a5f0252e12bade76473b0a36a673529d594778064cd8632abdc43d8a20883d66d6b27738861afbb7e211d
 Size (libtool-2.4.2.tar.gz) = 2632347 bytes
 SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69
-SHA1 (patch-ab) = 3ab767d3c0413bf30b6e9cce62e9686cd3d53fda
+SHA1 (patch-ab) = 621320ff0a2bf5c03f40b8bd1a1467471b22a3b6
 SHA1 (patch-ac) = fa8b0388f8f0469803c5869a23c3a1247eef70a1
-SHA1 (patch-ad) = 48c3832e9205777832ef2a6334033ff6099be8a4
+SHA1 (patch-ad) = 4cfe392ea272a4770407dc13104dbf17d640fdb8
 SHA1 (patch-libltdl_config_depcomp) = f8a5247e8c667b896bb426613f1b43d614760097
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index c2b72d8eed6..42ac6a5f23e 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.44 2014/09/10 10:44:58 richard Exp $
+$NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
 
 --- libltdl/m4/libtool.m4.orig	2011-10-17 10:17:05.000000000 +0000
 +++ libltdl/m4/libtool.m4
@@ -198,6 +198,15 @@ $NetBSD: manual-libtool.m4,v 1.44 2014/09/10 10:44:58 richard Exp $
    ;;
  
  openbsd*)
+@@ -3651,7 +3684,7 @@ osf*)
+   symcode='[[BCDEGQRST]]'
+   ;;
+ solaris*)
+-  symcode='[[BDRT]]'
++  symcode='[[BCDRT]]'
+   ;;
+ sco3.2v5*)
+   symcode='[[DT]]'
 @@ -3913,9 +3946,15 @@ m4_if([$1], [CXX], [
  	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
        ;;
@@ -376,7 +385,7 @@ $NetBSD: manual-libtool.m4,v 1.44 2014/09/10 10:44:58 richard Exp $
    AC_PROG_CXXCPP
  else
    _lt_caught_CXX_error=yes
-@@ -6538,6 +6635,22 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6538,6 +6635,22 @@ if test "$_lt_caught_CXX_error" != yes; 
          _LT_TAGVAR(ld_shlibs, $1)=no
  	;;
  
@@ -399,7 +408,7 @@ $NetBSD: manual-libtool.m4,v 1.44 2014/09/10 10:44:58 richard Exp $
        mvs*)
          case $cc_basename in
            cxx*)
-@@ -6552,15 +6665,13 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6552,15 +6665,13 @@ if test "$_lt_caught_CXX_error" != yes; 
  	;;
  
        netbsd*)
@@ -422,7 +431,7 @@ $NetBSD: manual-libtool.m4,v 1.44 2014/09/10 10:44:58 richard Exp $
  	;;
  
        *nto* | *qnx*)
-@@ -6739,27 +6850,14 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -6739,27 +6850,14 @@ if test "$_lt_caught_CXX_error" != yes; 
  	    # GNU C++ compiler with Solaris linker
  	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 0285560a135..799224cccf5 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.84 2014/09/10 10:44:58 richard Exp $
+$NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 
---- configure.orig	2011-10-17 10:18:58.000000000 +0000
+--- configure.orig	2016-03-10 10:28:17.598171804 +0000
 +++ configure
 @@ -5335,7 +5335,7 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -54,6 +54,15 @@ $NetBSD: patch-ab,v 1.84 2014/09/10 10:44:58 richard Exp $
    *)
      lock_old_archive_extraction=no ;;
  esac
+@@ -6562,7 +6569,7 @@ osf*)
+   symcode='[BCDEGQRST]'
+   ;;
+ solaris*)
+-  symcode='[BDRT]'
++  symcode='[BCDRT]'
+   ;;
+ sco3.2v5*)
+   symcode='[DT]'
 @@ -8493,7 +8500,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index e59b8dfa5b1..bce443e75cd 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.45 2014/05/10 15:32:08 joerg Exp $
+$NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
 
---- libltdl/configure.orig	2014-03-06 15:38:09.000000000 +0000
+--- libltdl/configure.orig	2016-03-10 10:28:17.599514319 +0000
 +++ libltdl/configure
 @@ -4548,7 +4548,7 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -54,6 +54,15 @@ $NetBSD: patch-ad,v 1.45 2014/05/10 15:32:08 joerg Exp $
    *)
      lock_old_archive_extraction=no ;;
  esac
+@@ -5775,7 +5782,7 @@ osf*)
+   symcode='[BCDEGQRST]'
+   ;;
+ solaris*)
+-  symcode='[BDRT]'
++  symcode='[BCDRT]'
+   ;;
+ sco3.2v5*)
+   symcode='[DT]'
 @@ -7843,7 +7850,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac