From 3858c0281aec2bd2ba1f7b02fa3c3acf50a195d3 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sat, 8 Mar 2014 19:57:25 +0000
Subject: Don't try to extract GCC's linker line. It includes -lgcc, but not
 -lgcc_s for starters. It also confuses the static-only library search in
 libtool itself. Bump revision.

Based on patch from jperkin@.
---
 devel/libtool/distinfo                  |   6 +-
 devel/libtool/patches/manual-libtool.m4 |  25 +++--
 devel/libtool/patches/manual.README     |   4 +-
 devel/libtool/patches/patch-ab          | 185 ++++++++++++++++++--------------
 devel/libtool/patches/patch-ad          |  48 ++++++---
 5 files changed, 158 insertions(+), 110 deletions(-)

(limited to 'devel/libtool')

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 9fcd7478137..e757a4c5935 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.89 2013/08/27 15:50:23 joerg Exp $
+$NetBSD: distinfo,v 1.90 2014/03/08 19:57:25 joerg Exp $
 
 SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88
 RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d
 Size (libtool-2.4.2.tar.gz) = 2632347 bytes
 SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69
-SHA1 (patch-ab) = 621798a0b1ed5b63f90d5cdca9c0287795a3d27c
+SHA1 (patch-ab) = cf6e8852b6c9eb04256904085f4ee6fefc470a02
 SHA1 (patch-ac) = 108989e3f1ee199fa8e8a9dc7331d360c586a800
-SHA1 (patch-ad) = a9471bff3c9f7e87120f78c1461835e6cbc60931
+SHA1 (patch-ad) = 48c3832e9205777832ef2a6334033ff6099be8a4
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 222bbcdc5db..3c204eccd53 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,7 +1,9 @@
-$NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.38 2014/03/08 19:57:25 joerg Exp $
 
 --- libltdl/m4/libtool.m4.orig	2011-10-17 10:17:05.000000000 +0000
 +++ libltdl/m4/libtool.m4
+--- libtool.m4.orig	2011-10-17 10:17:05.000000000 +0000
++++ libtool.m4
 @@ -123,7 +123,10 @@ m4_defun([_LT_CC_BASENAME],
      *) break;;
    esac
@@ -283,7 +285,7 @@ $NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
    *djgpp*)
      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;
-@@ -4861,16 +4929,28 @@ _LT_EOF
+@@ -4861,16 +4929,29 @@ _LT_EOF
        fi
        ;;
  
@@ -313,12 +315,13 @@ $NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      output_verbose_link_cmd=func_echo_all
 +      ;;
 +
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	_LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5342,13 +5422,25 @@ _LT_EOF
+@@ -5342,15 +5423,28 @@ _LT_EOF
        _LT_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -348,8 +351,11 @@ $NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
        _LT_TAGVAR(hardcode_direct, $1)=yes
        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      output_verbose_link_cmd=func_echo_all
        ;;
-@@ -5362,6 +5454,11 @@ _LT_EOF
+ 
+     newsos6)
+@@ -5362,6 +5456,11 @@ _LT_EOF
        ;;
  
      *nto* | *qnx*)
@@ -361,7 +367,7 @@ $NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      openbsd*)
-@@ -5819,9 +5916,7 @@ m4_defun([_LT_LANG_CXX_CONFIG],
+@@ -5819,9 +5918,7 @@ m4_defun([_LT_LANG_CXX_CONFIG],
  [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  m4_require([_LT_DECL_EGREP])dnl
  m4_require([_LT_PATH_MANIFEST_TOOL])dnl
@@ -372,7 +378,7 @@ $NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
    AC_PROG_CXXCPP
  else
    _lt_caught_CXX_error=yes
-@@ -6538,6 +6633,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
  	;;
  
@@ -395,7 +401,7 @@ $NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
        mvs*)
          case $cc_basename in
            cxx*)
-@@ -6552,15 +6663,12 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6552,15 +6665,13 @@ if test "$_lt_caught_CXX_error" != yes; 
  	;;
  
        netbsd*)
@@ -414,10 +420,11 @@ $NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +	_LT_TAGVAR(hardcode_direct, $1)=yes
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	output_verbose_link_cmd=func_echo_all
  	;;
  
        *nto* | *qnx*)
-@@ -6740,9 +6848,9 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6740,9 +6851,9 @@ if test "$_lt_caught_CXX_error" != yes; 
  	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -429,7 +436,7 @@ $NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
  
  	        # Commands to make compiler produce verbose output that lists
  	        # what "hidden" libraries, object files and flags are used when
-@@ -6751,9 +6859,9 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6751,9 +6862,9 @@ if test "$_lt_caught_CXX_error" != yes; 
  	      else
  	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	        # platform.
diff --git a/devel/libtool/patches/manual.README b/devel/libtool/patches/manual.README
index b948140fa2c..33ccb464565 100644
--- a/devel/libtool/patches/manual.README
+++ b/devel/libtool/patches/manual.README
@@ -1,4 +1,4 @@
-$NetBSD: manual.README,v 1.11 2009/12/17 12:23:26 joerg Exp $
+$NetBSD: manual.README,v 1.12 2014/03/08 19:57:25 joerg Exp $
 
 The "manual-*" patch files are used to maintain the pkgsrc version of
 libtool.  These files contain patches for the .m4 files in libtool which are
@@ -24,8 +24,6 @@ cp -f configure configure.orig
 cp -f libltdl/configure libltdl/configure.orig
 ./bootstrap
 pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab
-cp -f acinclude.m4 libltdl/
-(cd libltdl && aclocal && make ./configure)
 pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad
 cd /usr/pkgsrc/devel/libtool
 make makepatchsum
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 23daab02fe0..f5e02d12d8c 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
+$NetBSD: patch-ab,v 1.78 2014/03/08 19:57:25 joerg Exp $
 
---- configure.orig	2011-10-17 10:18:58.000000000 +0000
+--- configure.orig	2014-03-06 15:38:07.000000000 +0000
 +++ configure
 @@ -5335,7 +5335,7 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -124,7 +124,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -9608,16 +9644,28 @@ _LT_EOF
+@@ -9608,16 +9644,29 @@ _LT_EOF
        fi
        ;;
  
@@ -154,12 +154,13 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 +      hardcode_direct=yes
 +      hardcode_shlibpath_var=no
++      output_verbose_link_cmd=func_echo_all
 +      ;;
 +
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
-@@ -10026,7 +10074,7 @@ fi
+@@ -10026,7 +10075,7 @@ fi
    allow_undefined_flag="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -168,7 +169,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -10238,13 +10286,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -10238,15 +10287,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs=yes
        ;;
  
@@ -198,8 +199,11 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
++      output_verbose_link_cmd=func_echo_all
        ;;
-@@ -10258,6 +10318,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+ 
+     newsos6)
+@@ -10258,6 +10320,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -211,7 +215,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      openbsd*)
-@@ -11031,7 +11096,7 @@ dgux*)
+@@ -11031,7 +11098,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -220,7 +224,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -11045,7 +11110,7 @@ freebsd* | dragonfly*)
+@@ -11045,7 +11112,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -229,7 +233,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -11068,13 +11133,24 @@ freebsd* | dragonfly*)
+@@ -11068,13 +11135,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -255,7 +259,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  gnu*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -11162,12 +11238,7 @@ interix[3-9]*)
+@@ -11162,12 +11240,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -269,7 +273,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -11266,19 +11337,36 @@ fi
+@@ -11266,19 +11339,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -316,7 +320,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -11304,7 +11392,7 @@ newsos6)
+@@ -11304,7 +11394,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -325,7 +329,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -11312,7 +11400,7 @@ openbsd*)
+@@ -11312,7 +11402,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -334,7 +338,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -12847,6 +12935,9 @@ else
+@@ -12847,6 +12937,9 @@ else
      # at 6.2 and later dlopen does load deplibs.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
@@ -344,7 +348,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    netbsd*)
      lt_cv_sys_dlopen_deplibs=yes
      ;;
-@@ -13536,9 +13627,7 @@ func_stripname_cnf ()
+@@ -13536,9 +13629,7 @@ func_stripname_cnf ()
    esac
  } # func_stripname_cnf
  
@@ -355,7 +359,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -13786,7 +13875,10 @@ $RM -r conftest*
+@@ -13786,7 +13877,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -367,7 +371,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  
  
    if test -n "$compiler"; then
-@@ -14282,7 +14374,7 @@ fi
+@@ -14282,7 +14376,7 @@ fi
    allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -376,7 +380,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -14651,6 +14743,22 @@ fi
+@@ -14651,6 +14745,22 @@ fi
          ld_shlibs_CXX=no
  	;;
  
@@ -399,7 +403,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        mvs*)
          case $cc_basename in
            cxx*)
-@@ -14665,15 +14773,12 @@ fi
+@@ -14665,15 +14775,13 @@ fi
  	;;
  
        netbsd*)
@@ -418,10 +422,11 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 +	hardcode_direct_CXX=yes
 +	hardcode_shlibpath_var_CXX=no
++	output_verbose_link_cmd=func_echo_all
  	;;
  
        *nto* | *qnx*)
-@@ -14853,9 +14958,9 @@ fi
+@@ -14853,9 +14961,9 @@ fi
  	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -433,7 +438,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  
  	        # Commands to make compiler produce verbose output that lists
  	        # what "hidden" libraries, object files and flags are used when
-@@ -14864,9 +14969,9 @@ fi
+@@ -14864,9 +14972,9 @@ fi
  	      else
  	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	        # platform.
@@ -445,7 +450,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  
  	        # Commands to make compiler produce verbose output that lists
  	        # what "hidden" libraries, object files and flags are used when
-@@ -15236,9 +15341,15 @@ lt_prog_compiler_static_CXX=
+@@ -15236,9 +15344,15 @@ lt_prog_compiler_static_CXX=
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -462,7 +467,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -15316,6 +15427,9 @@ lt_prog_compiler_static_CXX=
+@@ -15316,6 +15430,9 @@ lt_prog_compiler_static_CXX=
  	    ;;
  	esac
  	;;
@@ -472,7 +477,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -15513,6 +15627,9 @@ lt_prog_compiler_static_CXX=
+@@ -15513,6 +15630,9 @@ lt_prog_compiler_static_CXX=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -482,7 +487,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_CXX=
      ;;
-@@ -16184,7 +16301,7 @@ dgux*)
+@@ -16184,7 +16304,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -491,7 +496,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -16198,7 +16315,7 @@ freebsd* | dragonfly*)
+@@ -16198,7 +16318,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -500,7 +505,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -16221,13 +16338,24 @@ freebsd* | dragonfly*)
+@@ -16221,13 +16341,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -526,7 +531,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  gnu*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -16315,12 +16443,7 @@ interix[3-9]*)
+@@ -16315,12 +16446,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -540,7 +545,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -16419,19 +16542,36 @@ fi
+@@ -16419,19 +16545,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -587,7 +592,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -16457,7 +16597,7 @@ newsos6)
+@@ -16457,7 +16600,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -596,7 +601,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16465,7 +16605,7 @@ openbsd*)
+@@ -16465,7 +16608,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -605,7 +610,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -17039,7 +17179,10 @@ $RM -r conftest*
+@@ -17039,7 +17182,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -617,7 +622,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  
    GCC=$G77
    if test -n "$compiler"; then
-@@ -17131,9 +17274,16 @@ lt_prog_compiler_static_F77=
+@@ -17131,9 +17277,16 @@ lt_prog_compiler_static_F77=
        ;;
  
      darwin* | rhapsody*)
@@ -635,7 +640,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      haiku*)
-@@ -17161,6 +17311,13 @@ lt_prog_compiler_static_F77=
+@@ -17161,6 +17314,13 @@ lt_prog_compiler_static_F77=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -649,7 +654,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -17313,6 +17470,15 @@ lt_prog_compiler_static_F77=
+@@ -17313,6 +17473,15 @@ lt_prog_compiler_static_F77=
        esac
        ;;
  
@@ -665,7 +670,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
      newsos6)
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -17388,6 +17554,9 @@ lt_prog_compiler_static_F77=
+@@ -17388,6 +17557,9 @@ lt_prog_compiler_static_F77=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -675,7 +680,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_F77=
      ;;
-@@ -17918,16 +18087,28 @@ _LT_EOF
+@@ -17918,16 +18090,29 @@ _LT_EOF
        fi
        ;;
  
@@ -705,12 +710,13 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 +      hardcode_direct_F77=yes
 +      hardcode_shlibpath_var_F77=no
++      output_verbose_link_cmd=func_echo_all
 +      ;;
 +
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
-@@ -18324,7 +18505,7 @@ fi
+@@ -18324,7 +18509,7 @@ fi
    allow_undefined_flag_F77="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -719,7 +725,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -18498,13 +18679,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -18498,15 +18683,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_F77=yes
        ;;
  
@@ -749,8 +755,11 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
++      output_verbose_link_cmd=func_echo_all
        ;;
-@@ -18518,6 +18711,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+ 
+     newsos6)
+@@ -18518,6 +18716,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -762,7 +771,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      openbsd*)
-@@ -19126,7 +19324,7 @@ dgux*)
+@@ -19126,7 +19329,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -771,7 +780,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -19140,7 +19338,7 @@ freebsd* | dragonfly*)
+@@ -19140,7 +19343,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -780,7 +789,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -19163,13 +19361,24 @@ freebsd* | dragonfly*)
+@@ -19163,13 +19366,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -806,7 +815,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  gnu*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -19257,12 +19466,7 @@ interix[3-9]*)
+@@ -19257,12 +19471,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -820,7 +829,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -19355,19 +19559,36 @@ fi
+@@ -19355,19 +19564,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -867,7 +876,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -19393,7 +19614,7 @@ newsos6)
+@@ -19393,7 +19619,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -876,7 +885,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -19401,7 +19622,7 @@ openbsd*)
+@@ -19401,7 +19627,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -885,7 +894,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -19966,7 +20187,10 @@ $RM -r conftest*
+@@ -19966,7 +20192,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -897,7 +906,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  
  
    if test -n "$compiler"; then
-@@ -20203,9 +20427,16 @@ lt_prog_compiler_static_FC=
+@@ -20203,9 +20432,16 @@ lt_prog_compiler_static_FC=
        ;;
  
      darwin* | rhapsody*)
@@ -915,7 +924,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      haiku*)
-@@ -20233,6 +20464,13 @@ lt_prog_compiler_static_FC=
+@@ -20233,6 +20469,13 @@ lt_prog_compiler_static_FC=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -929,7 +938,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -20385,6 +20623,15 @@ lt_prog_compiler_static_FC=
+@@ -20385,6 +20628,15 @@ lt_prog_compiler_static_FC=
        esac
        ;;
  
@@ -945,7 +954,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
      newsos6)
        lt_prog_compiler_pic_FC='-KPIC'
        lt_prog_compiler_static_FC='-Bstatic'
-@@ -20460,6 +20707,9 @@ lt_prog_compiler_static_FC=
+@@ -20460,6 +20712,9 @@ lt_prog_compiler_static_FC=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -955,7 +964,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_FC=
      ;;
-@@ -20990,16 +21240,28 @@ _LT_EOF
+@@ -20990,16 +21245,29 @@ _LT_EOF
        fi
        ;;
  
@@ -985,12 +994,13 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
 +      hardcode_direct_FC=yes
 +      hardcode_shlibpath_var_FC=no
++      output_verbose_link_cmd=func_echo_all
 +      ;;
 +
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_FC=no
-@@ -21396,7 +21658,7 @@ fi
+@@ -21396,7 +21664,7 @@ fi
    allow_undefined_flag_FC="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -999,7 +1009,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -21570,13 +21832,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -21570,15 +21838,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_FC=yes
        ;;
  
@@ -1029,8 +1039,11 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
        hardcode_direct_FC=yes
        hardcode_shlibpath_var_FC=no
++      output_verbose_link_cmd=func_echo_all
        ;;
-@@ -21590,6 +21864,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+ 
+     newsos6)
+@@ -21590,6 +21871,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -1042,7 +1055,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      openbsd*)
-@@ -22198,7 +22477,7 @@ dgux*)
+@@ -22198,7 +22484,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -1051,7 +1064,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -22212,7 +22491,7 @@ freebsd* | dragonfly*)
+@@ -22212,7 +22498,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -1060,7 +1073,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -22235,13 +22514,24 @@ freebsd* | dragonfly*)
+@@ -22235,13 +22521,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -1086,7 +1099,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  gnu*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -22329,12 +22619,7 @@ interix[3-9]*)
+@@ -22329,12 +22626,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -1100,7 +1113,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -22427,19 +22712,36 @@ fi
+@@ -22427,19 +22719,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -1147,7 +1160,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -22465,7 +22767,7 @@ newsos6)
+@@ -22465,7 +22774,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -1156,7 +1169,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -22473,7 +22775,7 @@ openbsd*)
+@@ -22473,7 +22782,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -1165,7 +1178,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -22883,7 +23185,10 @@ for cc_temp in $compiler""; do
+@@ -22883,7 +23192,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -1177,7 +1190,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  
  
  # Go did not exist at the time GCC didn't implicitly link libc in.
-@@ -23003,9 +23308,16 @@ lt_prog_compiler_static_GO=
+@@ -23003,9 +23315,16 @@ lt_prog_compiler_static_GO=
        ;;
  
      darwin* | rhapsody*)
@@ -1195,7 +1208,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      haiku*)
-@@ -23033,6 +23345,13 @@ lt_prog_compiler_static_GO=
+@@ -23033,6 +23352,13 @@ lt_prog_compiler_static_GO=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -1209,7 +1222,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -23185,6 +23504,15 @@ lt_prog_compiler_static_GO=
+@@ -23185,6 +23511,15 @@ lt_prog_compiler_static_GO=
        esac
        ;;
  
@@ -1225,7 +1238,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
      newsos6)
        lt_prog_compiler_pic_GO='-KPIC'
        lt_prog_compiler_static_GO='-Bstatic'
-@@ -23260,6 +23588,9 @@ lt_prog_compiler_static_GO=
+@@ -23260,6 +23595,9 @@ lt_prog_compiler_static_GO=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -1235,7 +1248,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_GO=
      ;;
-@@ -23790,16 +24121,28 @@ _LT_EOF
+@@ -23790,16 +24128,29 @@ _LT_EOF
        fi
        ;;
  
@@ -1265,12 +1278,13 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
 +      hardcode_direct_GO=yes
 +      hardcode_shlibpath_var_GO=no
++      output_verbose_link_cmd=func_echo_all
 +      ;;
 +
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GO=no
-@@ -24208,7 +24551,7 @@ fi
+@@ -24208,7 +24559,7 @@ fi
    allow_undefined_flag_GO="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -1279,7 +1293,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -24381,13 +24724,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -24381,15 +24732,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_GO=yes
        ;;
  
@@ -1309,8 +1323,11 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
        hardcode_direct_GO=yes
        hardcode_shlibpath_var_GO=no
++      output_verbose_link_cmd=func_echo_all
        ;;
-@@ -24401,6 +24756,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+ 
+     newsos6)
+@@ -24401,6 +24765,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -1322,7 +1339,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      openbsd*)
-@@ -24980,7 +25340,10 @@ for cc_temp in $compiler""; do
+@@ -24980,7 +25349,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -1334,7 +1351,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
  
  
  # GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -25100,9 +25463,16 @@ lt_prog_compiler_static_GCJ=
+@@ -25100,9 +25472,16 @@ lt_prog_compiler_static_GCJ=
        ;;
  
      darwin* | rhapsody*)
@@ -1352,7 +1369,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      haiku*)
-@@ -25130,6 +25500,13 @@ lt_prog_compiler_static_GCJ=
+@@ -25130,6 +25509,13 @@ lt_prog_compiler_static_GCJ=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -1366,7 +1383,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -25282,6 +25659,15 @@ lt_prog_compiler_static_GCJ=
+@@ -25282,6 +25668,15 @@ lt_prog_compiler_static_GCJ=
        esac
        ;;
  
@@ -1382,7 +1399,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
      newsos6)
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -25357,6 +25743,9 @@ lt_prog_compiler_static_GCJ=
+@@ -25357,6 +25752,9 @@ lt_prog_compiler_static_GCJ=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -1392,7 +1409,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
      ;;
-@@ -25887,16 +26276,28 @@ _LT_EOF
+@@ -25887,16 +26285,29 @@ _LT_EOF
        fi
        ;;
  
@@ -1422,12 +1439,13 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 +      hardcode_direct_GCJ=yes
 +      hardcode_shlibpath_var_GCJ=no
++      output_verbose_link_cmd=func_echo_all
 +      ;;
 +
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
-@@ -26305,7 +26706,7 @@ fi
+@@ -26305,7 +26716,7 @@ fi
    allow_undefined_flag_GCJ="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -1436,7 +1454,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -26478,13 +26879,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -26478,15 +26889,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -1466,8 +1484,11 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
++      output_verbose_link_cmd=func_echo_all
        ;;
-@@ -26498,6 +26911,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+ 
+     newsos6)
+@@ -26498,6 +26922,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -1479,7 +1500,7 @@ $NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      openbsd*)
-@@ -27075,7 +27493,10 @@ for cc_temp in $compiler""; do
+@@ -27075,7 +27504,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 3903ca48e7c..3f98849bba0 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
+$NetBSD: patch-ad,v 1.43 2014/03/08 19:57:25 joerg Exp $
 
---- libltdl/configure.orig	2011-10-17 10:19:47.000000000 +0000
+--- libltdl/configure.orig	2014-03-06 15:38:09.000000000 +0000
 +++ libltdl/configure
+@@ -4548,7 +4548,7 @@ else
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  netbsd* | freebsd* | openbsd* | mirbsd* | darwin* | dragonfly*)
+     # This has been around since 386BSD, at least.  Likely further.
+     if test -x /sbin/sysctl; then
+       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
 @@ -5042,12 +5042,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
@@ -115,7 +124,7 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -8958,16 +8994,28 @@ _LT_EOF
+@@ -8958,16 +8994,29 @@ _LT_EOF
        fi
        ;;
  
@@ -145,12 +154,22 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 +      hardcode_direct=yes
 +      hardcode_shlibpath_var=no
++      output_verbose_link_cmd=func_echo_all
 +      ;;
 +
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
-@@ -9588,13 +9636,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -9376,7 +9425,7 @@ fi
+   allow_undefined_flag="$_lt_dar_allow_undefined"
+   case $cc_basename in
+      ifort*) _lt_dar_can_shared=yes ;;
+-     *) _lt_dar_can_shared=$GCC ;;
++     *) _lt_dar_can_shared=yes ;;
+   esac
+   if test "$_lt_dar_can_shared" = "yes"; then
+     output_verbose_link_cmd=func_echo_all
+@@ -9588,15 +9637,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs=yes
        ;;
  
@@ -180,8 +199,11 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
 +      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
++      output_verbose_link_cmd=func_echo_all
        ;;
-@@ -9608,6 +9668,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+ 
+     newsos6)
+@@ -9608,6 +9670,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -193,7 +215,7 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
        ;;
  
      openbsd*)
-@@ -10381,7 +10446,7 @@ dgux*)
+@@ -10381,7 +10448,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -202,7 +224,7 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -10395,7 +10460,7 @@ freebsd* | dragonfly*)
+@@ -10395,7 +10462,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -211,7 +233,7 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -10418,13 +10483,24 @@ freebsd* | dragonfly*)
+@@ -10418,13 +10485,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -237,7 +259,7 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
  gnu*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -10512,12 +10588,7 @@ interix[3-9]*)
+@@ -10512,12 +10590,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -251,7 +273,7 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -10616,19 +10687,36 @@ fi
+@@ -10616,19 +10689,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -298,7 +320,7 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -10654,7 +10742,7 @@ newsos6)
+@@ -10654,7 +10744,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -307,7 +329,7 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -10662,7 +10750,7 @@ openbsd*)
+@@ -10662,7 +10752,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -316,7 +338,7 @@ $NetBSD: patch-ad,v 1.42 2013/08/27 15:50:23 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -12196,6 +12284,9 @@ else
+@@ -12196,6 +12286,9 @@ else
      # at 6.2 and later dlopen does load deplibs.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
-- 
cgit v1.2.3