Update to libtool-2.4.2:

- Initial support for Go.
- On Mac OS X, try to open .dylib as well as .so in lt_dlopenext.
- sysroot support
- man pages for libtool and libtoolize
- various smaller bug fixes

pkgsrc side: remove support for pre-ELF NetBSD

8 files changed, 845 insertions, 1546 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index dbde2f5568e..d63af65230d 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.78 2012/10/31 11:17:23 asau Exp $
+# $NetBSD: Makefile.common,v 1.79 2013/04/12 13:44:08 joerg Exp $
 # used by devel/libltdl/Makefile
 # used by devel/libtool-base/Makefile
 # used by devel/libtool-info/Makefile
@@ -26,7 +26,7 @@
 ###########################################################################
 ###########################################################################
 
-DISTNAME=	libtool-2.2.6b
+DISTNAME=	libtool-2.4.2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index fdd38d7111a..a665b17b1e3 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.85 2012/07/26 12:04:03 bsiegert Exp $
+$NetBSD: distinfo,v 1.86 2013/04/12 13:44:08 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) = d71723a66b65ccdd5d2100bf98c9796e15d6da40
-SHA1 (patch-ac) = d4d6987ea14180891737a3defa37689d7c35853e
-SHA1 (patch-ad) = 1dd8037f79a95572dc7b592c5e77d901fdf5cbe9
+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) = da181513402d0ea02e710b3f4fafa94eaae572ae
+SHA1 (patch-ac) = 9efc7b276f830c2f8cabcbafb508c453bbfac46f
+SHA1 (patch-ad) = d52f6494c3c9d6b8ed40171565c7bc99b40badde
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index fe8e8bb370a..213b13a4762 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,12 +1,12 @@
-$NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
+$NetBSD: manual-libtool.m4,v 1.34 2013/04/12 13:44:08 joerg Exp $
 
---- libltdl/m4/libtool.m4.orig	Mon Nov 16 13:11:35 2009
+--- libltdl/m4/libtool.m4.orig	2011-10-17 10:17:05.000000000 +0000
 +++ libltdl/m4/libtool.m4
-@@ -118,7 +118,10 @@ m4_defun([_LT_CC_BASENAME],
+@@ -123,7 +123,10 @@ m4_defun([_LT_CC_BASENAME],
      *) break;;
    esac
  done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
@@ -14,49 +14,16 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
  ])
  
  
-@@ -1527,6 +1530,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-+  mint*)
-+    # On MiNT we can support fairly large cmd lengths, but it takes
-+    # a while to run the tests, so let's restrict it to something
-+    # reasonable.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-   amigaos*)
-     # On AmigaOS with pdksh, this test takes hours, literally.
-     # So we just punt and use a minimum line length of 8192.
-@@ -1533,7 +1543,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
-     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`
-@@ -2189,6 +2199,7 @@ beos*)
- bsdi[[45]]*)
-   version_type=linux
-   need_version=no
-+  need_lib_prefix=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -2290,9 +2301,7 @@ freebsd1*)
-   dynamic_linker=no
+@@ -2468,7 +2471,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
    ;;
  
 -freebsd* | dragonfly*)
--  # DragonFly does not have aout.  When/if they implement a new
--  # versioning mechanism, adjust this.
 +freebsd*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-     objformat=`/usr/bin/objformat`
-   else
-@@ -2304,7 +2313,7 @@ freebsd* | dragonfly*)
+@@ -2482,7 +2485,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -65,7 +32,7 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -2327,7 +2336,7 @@ freebsd* | dragonfly*)
+@@ -2505,13 +2508,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -74,7 +41,6 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -2334,6 +2343,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -90,35 +56,15 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
 +  ;;
 +
  gnu*)
-   version_type=linux
+   version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -2344,6 +2364,19 @@ gnu*)
-   hardcode_into_libs=yes
-   ;;
- 
-+haiku*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+  hardcode_into_libs=yes
-+  ;;
-+
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
-@@ -2405,12 +2438,7 @@ interix[[3-9]]*)
+@@ -2599,12 +2613,7 @@ interix[[3-9]]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
+-		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
@@ -126,7 +72,7 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -2485,16 +2513,38 @@ linux* | k*bsd*-gnu)
+@@ -2684,19 +2693,36 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -160,16 +106,20 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
    need_version=no
 -  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -2523,7 +2573,7 @@ newsos6)
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='NetBSD ld.elf_so'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+@@ -2722,7 +2748,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -178,7 +128,7 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert 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.
-@@ -2531,7 +2581,7 @@ openbsd*)
+@@ -2730,7 +2756,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -187,18 +137,7 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert 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
-@@ -3038,6 +3088,10 @@ gnu*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+haiku*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
-   case $host_cpu in
-@@ -3076,6 +3130,17 @@ linux* | k*bsd*-gnu)
+@@ -3289,12 +3315,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -214,9 +153,16 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
 +  ;;
 +
  netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-@@ -3091,7 +3156,7 @@ newos6*)
+-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+-  fi
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+   ;;
+ 
+ newos6*)
+@@ -3304,7 +3337,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -225,16 +171,7 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
    ;;
  
  openbsd*)
-@@ -3256,7 +3321,7 @@ AC_DEFUN([LT_LIB_M],
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- LIBM=
- case $host in
--*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+*-*-beos* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-   # These system don't have libm, or don't need it
-   ;;
- *-ncr-sysv4.3*)
-@@ -3580,14 +3645,25 @@ m4_if([$1], [CXX], [
+@@ -3913,9 +3946,15 @@ m4_if([$1], [CXX], [
  	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
        ;;
      darwin* | rhapsody*)
@@ -244,24 +181,14 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
        # Common symbols not allowed in MH_DYLIB files
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=''
-       ;;
++      ;;
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+      ;;
+       ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-       ;;
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-+      ;;
-     interix[[3-9]]*)
-       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-       # Instead, we relocate shared libraries at runtime.
-@@ -3650,6 +3726,9 @@ m4_if([$1], [CXX], [
+@@ -3994,6 +4033,9 @@ m4_if([$1], [CXX], [
  	    ;;
  	esac
  	;;
@@ -271,7 +198,7 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -3888,11 +3967,19 @@ m4_if([$1], [CXX], [
+@@ -4232,9 +4274,16 @@ m4_if([$1], [CXX], [
        ;;
  
      darwin* | rhapsody*)
@@ -281,18 +208,15 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
        # Common symbols not allowed in MH_DYLIB files
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=''
-       ;;
- 
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
 +      ;;
 +
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -3912,6 +3999,13 @@ m4_if([$1], [CXX], [
++    *mint*)
++      # FreeMiNT does not support shared libraries at all
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+       ;;
+ 
+     haiku*)
+@@ -4262,6 +4311,13 @@ m4_if([$1], [CXX], [
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -306,7 +230,7 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -4035,6 +4129,15 @@ m4_if([$1], [CXX], [
+@@ -4415,6 +4471,15 @@ m4_if([$1], [CXX], [
        esac
        ;;
  
@@ -322,7 +246,7 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
      newsos6)
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4110,6 +4213,9 @@ m4_if([$1], [CXX], [
+@@ -4490,6 +4555,9 @@ m4_if([$1], [CXX], [
  ])
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -332,73 +256,88 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
    *djgpp*)
      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;
-@@ -4343,6 +4449,11 @@ _LT_EOF
+@@ -4861,16 +4929,28 @@ _LT_EOF
        fi
        ;;
  
-+    haiku*)
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
-     interix[[3-9]]*)
-       _LT_TAGVAR(hardcode_direct, $1)=no
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4429,7 +4540,7 @@ _LT_EOF
-       ;;
- 
-     netbsd*)
+-    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
+-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	_LT_TAGVAR(hardcode_direct, $1)=yes
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -4735,6 +4846,11 @@ _LT_EOF
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_TAGVAR(ld_shlibs, $1)=no
+       fi
        ;;
  
-+      haiku*)
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(link_all_deplibs, $1)=yes
-+        ;;
++    netbsd*)
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
 +
-     hpux9*)
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-@@ -4841,6 +4957,20 @@ _LT_EOF
+     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
        _LT_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +    mirbsd*)
-+      if test -f /usr/libexec/ld.so; then
++     if test -f /usr/libexec/ld.so; then
 +	_LT_TAGVAR(hardcode_direct, $1)=yes
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      else
++	_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 +	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
+       fi
+-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +      ;;
 +
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-@@ -4861,6 +4991,8 @@ _LT_EOF
++    netbsd*)
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       _LT_TAGVAR(hardcode_direct, $1)=yes
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+@@ -5362,6 +5454,11 @@ _LT_EOF
        ;;
  
      *nto* | *qnx*)
 +      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
      openbsd*)
-@@ -5318,9 +5450,7 @@ m4_defun([_LT_PROG_CXX],
- [
- pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
- AC_PROG_CXX
+@@ -5819,9 +5916,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
 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -    (test "X$CXX" != "Xg++"))) ; then
@@ -406,80 +345,49 @@ $NetBSD: manual-libtool.m4,v 1.33 2012/07/26 12:04:04 bsiegert Exp $
    AC_PROG_CXXCPP
  else
    _lt_caught_CXX_error=yes
-@@ -5993,6 +6123,22 @@ if test "$_lt_caught_CXX_error" != yes; 
-         _LT_TAGVAR(ld_shlibs, $1)=no
+@@ -6552,15 +6647,12 @@ if test "$_lt_caught_CXX_error" != yes; 
  	;;
  
-+      mirbsd*)
-+	if test -f /usr/libexec/ld.so; then
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+	  output_verbose_link_cmd='echo'
-+	else
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+
-       mvs*)
-         case $cc_basename in
-           cxx*)
-@@ -6008,18 +6154,37 @@ if test "$_lt_caught_CXX_error" != yes; 
- 
        netbsd*)
-         if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+          # a.out is quite broken and goes directly to ld
- 	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- 	  wlarc=
-+          # Determine if we need to override the c++rt0 that is
-+          # picked up by analysing output_verbose_link_cmds
-+          if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
-+            cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
-+          else
-+            cpprt0_file=
-+          fi
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- 	  _LT_TAGVAR(hardcode_direct, $1)=yes
- 	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+-	  wlarc=
+-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	  _LT_TAGVAR(hardcode_direct, $1)=yes
+-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 -	fi
 -	# Workaround some broken pre-1.5 toolchains
 -	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+        elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then
-+          # Workaround some broken pre-1.5 ELF toolchains
-+          output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+        else
-+          # Modern ELF works sanely as-is
-+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+          output_verbose_link_cmd='echo'
-+        fi
++	_LT_TAGVAR(ld_shlibs, $1)=yes
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_TAGVAR(hardcode_direct, $1)=yes
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
  	;;
  
        *nto* | *qnx*)
--        _LT_TAGVAR(ld_shlibs, $1)=yes
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+        _LT_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+        output_verbose_link_cmd='echo'
- 	;;
+@@ -6740,9 +6832,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
+-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ 
+ 	        # Commands to make compiler produce verbose output that lists
+ 	        # what "hidden" libraries, object files and flags are used when
+@@ -6751,9 +6843,9 @@ if test "$_lt_caught_CXX_error" != yes; 
+ 	      else
+ 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	        # platform.
+-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++		  $CC -G -nostdlib ${wl}-M $wl$lib.exp $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  
-       openbsd2*)
-@@ -6481,6 +6646,11 @@ $RM -f confest.$objext
- # PORTME: override above test on systems where it is broken
- m4_if([$1], [CXX],
- [case $host_os in
-+netbsd*)
-+  if test -n "$cpprt0_file"; then
-+    _LT_TAGVAR(predep_objects,$1)=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
-+  fi
-+   ;;
- interix[[3-9]]*)
-   # Interix 3.5 installs completely hosed .la files for C++, so rather than
-   # hack all around it, let's just trust "g++" to DTRT.
+ 	        # Commands to make compiler produce verbose output that lists
+ 	        # what "hidden" libraries, object files and flags are used when
diff --git a/devel/libtool/patches/manual-ltdl.m4 b/devel/libtool/patches/manual-ltdl.m4
index 9e9aeddbbdc..bdfec247839 100644
--- a/devel/libtool/patches/manual-ltdl.m4
+++ b/devel/libtool/patches/manual-ltdl.m4
@@ -1,8 +1,8 @@
-$NetBSD: manual-ltdl.m4,v 1.4 2011/05/14 16:49:45 bsiegert Exp $
+$NetBSD: manual-ltdl.m4,v 1.5 2013/04/12 13:44:08 joerg Exp $
 
---- libltdl/m4/ltdl.m4.orig	2009-11-16 14:11:59.000000000 +0100
-+++ libltdl/m4/ltdl.m4	2010-12-30 17:04:01.000000000 +0100
-@@ -487,6 +487,9 @@
+--- libltdl/m4/ltdl.m4.orig	2011-10-17 10:17:05.000000000 +0000
++++ libltdl/m4/ltdl.m4
+@@ -493,6 +493,9 @@ AC_CACHE_CHECK([whether deplibs are load
      # at 6.2 and later dlopen does load deplibs.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index 4ae661ca038..779c13afc13 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,22 +1,33 @@
-$NetBSD: patch-aa,v 1.36 2009/12/15 17:35:37 joerg Exp $
+$NetBSD: patch-aa,v 1.37 2013/04/12 13:44:08 joerg Exp $
 
---- Makefile.in.orig	2009-09-11 03:13:51.000000000 +0200
+--- Makefile.in.orig	2011-10-17 10:18:55.000000000 +0000
 +++ Makefile.in
-@@ -1594,7 +1594,7 @@ all-am: Makefile $(INFO_DEPS) $(LTLIBRAR
- 		config.h all-local
+@@ -638,9 +638,7 @@ sub_configure_deps = $(sub_aclocal_m4_de
+ info_TEXINFOS = doc/libtool.texi
+ doc_libtool_TEXINFOS = doc/PLATFORMS doc/fdl.texi doc/notes.texi
+ dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1
+-update_mans = \
+-  PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \
+-  $(HELP2MAN) --output=$@
++update_mans = true
+ 
+ 
+ # These are required by libtoolize and must be executable when installed.
+@@ -2033,7 +2031,7 @@ all-am: Makefile $(INFO_DEPS) $(LTLIBRAR
+ 		$(HEADERS) config.h all-local
  installdirs: installdirs-recursive
  installdirs-am:
--	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)"; do \
-+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)"; do \
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)"; do \
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)"; do \
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -1658,7 +1658,7 @@ info: info-recursive
+@@ -2104,7 +2102,7 @@ info: info-recursive
  info-am: $(INFO_DEPS)
  
  install-data-am: install-data-local install-includeHEADERS \
--	install-info-am install-ltdlincludeHEADERS
-+	install-ltdlincludeHEADERS
+-	install-info-am install-ltdlincludeHEADERS install-man
++	install-ltdlincludeHEADERS install-man
  
  install-dvi: install-dvi-recursive
  
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index f87e70cd167..f45b2acf05a 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,117 +1,8 @@
-$NetBSD: patch-ab,v 1.73 2012/07/26 12:04:04 bsiegert Exp $
+$NetBSD: patch-ab,v 1.74 2013/04/12 13:44:08 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	Thu Jul 26 11:26:28 2012
+--- configure.orig	2013-03-03 13:53:45.000000000 +0000
 +++ configure
-@@ -822,6 +822,7 @@ CPP
- am__fastdepCC_FALSE
- am__fastdepCC_TRUE
- CCDEPMODE
-+am__nodep
- AMDEPBACKSLASH
- AMDEP_FALSE
- AMDEP_TRUE
-@@ -3257,17 +3258,17 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
- 
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
--# Always define AMTAR for backward compatibility.
-+# Always define AMTAR for backward compatibility.  Yes, it's still used
-+# in the wild :-(  We should find a proper way to deprecate it ...
-+AMTAR='$${TAR-tar}'
- 
--AMTAR=${AMTAR-"${am_missing_run}tar"}
-+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
- 
--am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
- 
- 
- 
- 
- 
--
- M4SH='$(AUTOM4TE) --language=m4sh'
- 
- 
-@@ -4145,6 +4146,7 @@ fi
- if test "x$enable_dependency_tracking" != xno; then
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
-+  am__nodep='_no'
- fi
-  if test "x$enable_dependency_tracking" != xno; then
-   AMDEP_TRUE=
-@@ -4169,6 +4171,7 @@ else
-   # instance it was reported that on HP-UX the gcc test will end up
-   # making a dummy file named `D' -- because `-MD' means `put the output
-   # in D'.
-+  rm -rf conftest.dir
-   mkdir conftest.dir
-   # Copy depcomp to subdir because otherwise we won't find it if we're
-   # using a relative directory.
-@@ -4228,7 +4231,7 @@ else
- 	break
-       fi
-       ;;
--    msvisualcpp | msvcmsys)
-+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-       # This compiler won't grok `-c -o', but also, the minuso test has
-       # not run yet.  These depmodes are late enough in the game, and
-       # so weak that their functioning should not be impacted.
-@@ -5230,13 +5233,13 @@ if test "${lt_cv_nm_interface+set}" = se
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:5233: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:5236: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:5236: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:5239: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:5239: output\"" >&5)
-+  (eval echo "\"\$as_me:5242: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -5293,6 +5296,13 @@ else
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-+  mint*)
-+    # On MiNT we can support fairly large cmd lengths, but it takes
-+    # a while to run the tests, so let's restrict it to something
-+    # reasonable.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-   amigaos*)
-     # On AmigaOS with pdksh, this test takes hours, literally.
-     # So we just punt and use a minimum line length of 8192.
-@@ -5299,7 +5309,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`
-@@ -5665,6 +5675,10 @@ gnu*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+haiku*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
-   case $host_cpu in
-@@ -5703,6 +5717,17 @@ linux* | k*bsd*-gnu)
+@@ -5829,12 +5829,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -127,9 +18,16 @@ The problem manifests with wl and no_builtin_flag containing newlines.
 +  ;;
 +
  netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-@@ -5718,7 +5743,7 @@ newos6*)
+-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+-  fi
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+   ;;
+ 
+ newos6*)
+@@ -5844,7 +5851,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -138,20 +36,11 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    ;;
  
  openbsd*)
-@@ -6439,7 +6464,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6442 "configure"' > conftest.$ac_ext
-+  echo '#line 6467 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7900,7 +7925,10 @@ for cc_temp in $compiler""; do
+@@ -8493,7 +8500,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
@@ -159,21 +48,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
  # Only perform the check for file, if the check method requires it
-@@ -8129,11 +8157,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8132: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8160: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8136: \$? = $ac_status" >&5
-+   echo "$as_me:8164: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -8210,11 +8238,19 @@ $as_echo_n "checking for $compiler optio
+@@ -8806,9 +8816,16 @@ lt_prog_compiler_static=
        ;;
  
      darwin* | rhapsody*)
@@ -183,18 +58,15 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic='-fno-common'
 +      lt_prog_compiler_static=''
-       ;;
- 
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static=
 +      ;;
 +
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8234,6 +8270,13 @@ $as_echo_n "checking for $compiler optio
++    *mint*)
++      # FreeMiNT does not support shared libraries at all
++      lt_prog_compiler_pic=
+       ;;
+ 
+     haiku*)
+@@ -8836,6 +8853,13 @@ lt_prog_compiler_static=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -208,7 +80,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -8356,6 +8399,15 @@ $as_echo_n "checking for $compiler optio
+@@ -8988,6 +9012,15 @@ lt_prog_compiler_static=
        esac
        ;;
  
@@ -224,7 +96,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      newsos6)
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -8431,6 +8483,9 @@ $as_echo_n "checking for $compiler optio
+@@ -9063,6 +9096,9 @@ lt_prog_compiler_static=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -234,131 +106,94 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -8468,11 +8523,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8471: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8526: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8475: \$? = $ac_status" >&5
-+   echo "$as_me:8530: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -8573,11 +8628,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8576: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8631: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:8580: \$? = $ac_status" >&5
-+   echo "$as_me:8635: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -8628,11 +8683,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8631: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8686: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:8635: \$? = $ac_status" >&5
-+   echo "$as_me:8690: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -8844,6 +8899,11 @@ _LT_EOF
+@@ -9608,16 +9644,28 @@ _LT_EOF
        fi
        ;;
  
-+    haiku*)
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      link_all_deplibs=yes
-+      ;;
-+
-     interix[3-9]*)
-       hardcode_direct=no
-       hardcode_shlibpath_var=no
-@@ -8930,7 +8990,7 @@ _LT_EOF
-       ;;
- 
-     netbsd*)
+-    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
+-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	hardcode_direct_absolute=yes
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -9317,6 +9377,11 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_shlibpath_var=no
+-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	ld_shlibs=no
+       fi
        ;;
  
-+      haiku*)
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        link_all_deplibs=yes
-+        ;;
++    netbsd*)
++      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
 +
-     hpux9*)
-       if test "$GCC" = yes; then
- 	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-@@ -9430,6 +9495,20 @@ rm -f core conftest.err conftest.$ac_obj
+     solaris*)
+       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs=no
+@@ -10238,13 +10286,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs=yes
        ;;
  
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +    mirbsd*)
-+      if test -f /usr/libexec/ld.so; then
++     if test -f /usr/libexec/ld.so; then
 +	hardcode_direct=yes
 +	hardcode_shlibpath_var=no
 +	hardcode_direct_absolute=yes
-+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	archive_cmds='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	archive_expsym_cmds='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
 +	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 +	export_dynamic_flag_spec='${wl}-E'
-+      else
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 +	ld_shlibs=no
-+      fi
+       fi
+-      hardcode_libdir_flag_spec='-R$libdir'
 +      ;;
 +
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-@@ -9450,6 +9529,8 @@ rm -f core conftest.err conftest.$ac_obj
++    netbsd*)
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+       ;;
+@@ -10258,6 +10318,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
 +      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
        ;;
  
      openbsd*)
-@@ -10064,6 +10145,7 @@ beos*)
- bsdi[45]*)
-   version_type=linux
-   need_version=no
-+  need_lib_prefix=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -10165,9 +10247,7 @@ freebsd1*)
-   dynamic_linker=no
+@@ -11031,7 +11096,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
    ;;
  
 -freebsd* | dragonfly*)
--  # DragonFly does not have aout.  When/if they implement a new
--  # versioning mechanism, adjust this.
 +freebsd*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-     objformat=`/usr/bin/objformat`
-   else
-@@ -10179,7 +10259,7 @@ freebsd* | dragonfly*)
+@@ -11045,7 +11110,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -367,7 +202,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -10202,7 +10282,7 @@ freebsd* | dragonfly*)
+@@ -11068,13 +11133,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -376,7 +211,6 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -10209,6 +10289,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -392,35 +226,15 @@ The problem manifests with wl and no_builtin_flag containing newlines.
 +  ;;
 +
  gnu*)
-   version_type=linux
+   version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -10219,6 +10310,19 @@ gnu*)
-   hardcode_into_libs=yes
-   ;;
- 
-+haiku*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+  hardcode_into_libs=yes
-+  ;;
-+
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
-@@ -10280,12 +10384,7 @@ interix[3-9]*)
+@@ -11162,12 +11238,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
+-		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
@@ -428,7 +242,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -10375,16 +10474,38 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11266,19 +11337,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -462,16 +276,20 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    need_version=no
 -  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -10413,7 +10534,7 @@ newsos6)
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='NetBSD ld.elf_so'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+@@ -11304,7 +11392,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -480,7 +298,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -10421,7 +10542,7 @@ openbsd*)
+@@ -11312,7 +11400,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -489,34 +307,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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
-@@ -10995,7 +11116,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10998 "configure"
-+#line 11119 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11091,7 +11212,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11094 "configure"
-+#line 11215 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11764,7 +11885,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11767 "configure"
-+#line 11888 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11910,6 +12031,9 @@ else
+@@ -12847,6 +12935,9 @@ else
      # at 6.2 and later dlopen does load deplibs.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
@@ -526,39 +317,22 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    netbsd*)
      lt_cv_sys_dlopen_deplibs=yes
      ;;
-@@ -12473,6 +12597,7 @@ else
-   # instance it was reported that on HP-UX the gcc test will end up
-   # making a dummy file named `D' -- because `-MD' means `put the output
-   # in D'.
-+  rm -rf conftest.dir
-   mkdir conftest.dir
-   # Copy depcomp to subdir because otherwise we won't find it if we're
-   # using a relative directory.
-@@ -12532,7 +12657,7 @@ else
- 	break
-       fi
-       ;;
--    msvisualcpp | msvcmsys)
-+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-       # This compiler won't grok `-c -o', but also, the minuso test has
-       # not run yet.  These depmodes are late enough in the game, and
-       # so weak that their functioning should not be impacted.
-@@ -12587,9 +12712,7 @@ else
- fi
- 
+@@ -13536,9 +13627,7 @@ func_stripname_cnf ()
+   esac
+ } # func_stripname_cnf
  
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -    (test "X$CXX" != "Xg++"))) ; then
-+if test -n "$CXX" && test "X$CXX" != "Xno" ; then
++      if test -n "$CXX" && test "X$CXX" != "Xno" ; then
    ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12836,7 +12959,10 @@ $RM -r conftest*
+@@ -13786,7 +13875,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
@@ -566,84 +340,53 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
    if test -n "$compiler"; then
-@@ -13613,6 +13739,22 @@ if test -z "$aix_libpath"; then aix_libp
-         ld_shlibs_CXX=no
+@@ -14665,15 +14757,12 @@ fi
  	;;
  
-+      mirbsd*)
-+	if test -f /usr/libexec/ld.so; then
-+	  hardcode_direct_CXX=yes
-+	  hardcode_shlibpath_var_CXX=no
-+	  hardcode_direct_absolute_CXX=yes
-+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	  export_dynamic_flag_spec_CXX='${wl}-E'
-+	  whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+	  output_verbose_link_cmd='echo'
-+	else
-+	  ld_shlibs_CXX=no
-+	fi
-+	;;
-+
-       mvs*)
-         case $cc_basename in
-           cxx*)
-@@ -13628,18 +13770,37 @@ if test -z "$aix_libpath"; then aix_libp
- 
        netbsd*)
-         if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+          # a.out is quite broken and goes directly to ld
- 	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
- 	  wlarc=
-+          # Determine if we need to override the c++rt0 that is
-+          # picked up by analysing output_verbose_link_cmds
-+          if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
-+            cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
-+          else
-+            cpprt0_file=
-+          fi
- 	  hardcode_libdir_flag_spec_CXX='-R$libdir'
- 	  hardcode_direct_CXX=yes
- 	  hardcode_shlibpath_var_CXX=no
+-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+-	  wlarc=
+-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+-	  hardcode_direct_CXX=yes
+-	  hardcode_shlibpath_var_CXX=no
 -	fi
 -	# Workaround some broken pre-1.5 toolchains
 -	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+        elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then
-+          # Workaround some broken pre-1.5 ELF toolchains
-+          output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+        else
-+          # Modern ELF works sanely as-is
-+          archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+          archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+          output_verbose_link_cmd='echo'
-+        fi
++	ld_shlibs_CXX=yes
++	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_direct_CXX=yes
++	hardcode_shlibpath_var_CXX=no
  	;;
  
        *nto* | *qnx*)
--        ld_shlibs_CXX=yes
-+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+        hardcode_libdir_flag_spec_CXX='-R$libdir'
-+        hardcode_direct_CXX=yes
-+        hardcode_shlibpath_var_CXX=no
-+        output_verbose_link_cmd='echo'
- 	;;
- 
-       openbsd2*)
-@@ -14036,6 +14197,11 @@ $RM -f confest.$objext
- 
- # PORTME: override above test on systems where it is broken
- case $host_os in
-+netbsd*)
-+  if test -n "$cpprt0_file"; then
-+    predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
-+  fi
-+   ;;
- interix[3-9]*)
-   # Interix 3.5 installs completely hosed .la files for C++, so rather than
-   # hack all around it, let's just trust "g++" to DTRT.
-@@ -14176,14 +14342,25 @@ $as_echo_n "checking for $compiler optio
+@@ -14853,9 +14942,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
+-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ 
+ 	        # Commands to make compiler produce verbose output that lists
+ 	        # what "hidden" libraries, object files and flags are used when
+@@ -14864,9 +14953,9 @@ fi
+ 	      else
+ 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	        # platform.
+-	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++		  $CC -G -nostdlib ${wl}-M $wl$lib.exp $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ 
+ 	        # Commands to make compiler produce verbose output that lists
+ 	        # what "hidden" libraries, object files and flags are used when
+@@ -15236,9 +15325,15 @@ lt_prog_compiler_static_CXX=
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -653,24 +396,14 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_CXX='-fno-common'
 +      lt_prog_compiler_static_CXX=''
-       ;;
++      ;;
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      lt_prog_compiler_pic_CXX=
-+      ;;
+       ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-       lt_prog_compiler_pic_CXX=
-       ;;
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static_CXX=
-+      ;;
-     interix[3-9]*)
-       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-       # Instead, we relocate shared libraries at runtime.
-@@ -14246,6 +14423,9 @@ $as_echo_n "checking for $compiler optio
+@@ -15316,6 +15411,9 @@ lt_prog_compiler_static_CXX=
  	    ;;
  	esac
  	;;
@@ -680,7 +413,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -14443,6 +14623,9 @@ $as_echo_n "checking for $compiler optio
+@@ -15513,6 +15611,9 @@ lt_prog_compiler_static_CXX=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -690,68 +423,16 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_CXX=
      ;;
-@@ -14477,11 +14660,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14480: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14663: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14484: \$? = $ac_status" >&5
-+   echo "$as_me:14667: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -14576,11 +14759,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14579: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14762: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14583: \$? = $ac_status" >&5
-+   echo "$as_me:14766: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -14628,11 +14811,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14631: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14814: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14635: \$? = $ac_status" >&5
-+   echo "$as_me:14818: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -14948,6 +15131,7 @@ beos*)
- bsdi[45]*)
-   version_type=linux
-   need_version=no
-+  need_lib_prefix=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -15048,9 +15232,7 @@ freebsd1*)
-   dynamic_linker=no
+@@ -16184,7 +16285,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
    ;;
  
 -freebsd* | dragonfly*)
--  # DragonFly does not have aout.  When/if they implement a new
--  # versioning mechanism, adjust this.
 +freebsd*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-     objformat=`/usr/bin/objformat`
-   else
-@@ -15062,7 +15244,7 @@ freebsd* | dragonfly*)
+@@ -16198,7 +16299,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -760,7 +441,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -15085,7 +15267,7 @@ freebsd* | dragonfly*)
+@@ -16221,13 +16322,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -769,7 +450,6 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -15092,6 +15274,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -785,35 +465,15 @@ The problem manifests with wl and no_builtin_flag containing newlines.
 +  ;;
 +
  gnu*)
-   version_type=linux
+   version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -15102,6 +15295,19 @@ gnu*)
-   hardcode_into_libs=yes
-   ;;
- 
-+haiku*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+  hardcode_into_libs=yes
-+  ;;
-+
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
-@@ -15163,12 +15369,7 @@ interix[3-9]*)
+@@ -16315,12 +16427,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
+-		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
@@ -821,7 +481,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15258,16 +15459,38 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -16419,19 +16526,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -855,16 +515,20 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    need_version=no
 -  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -15296,7 +15519,7 @@ newsos6)
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='NetBSD ld.elf_so'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+@@ -16457,7 +16581,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -873,7 +537,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -15304,7 +15527,7 @@ openbsd*)
+@@ -16465,7 +16589,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -882,11 +546,11 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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
-@@ -15877,7 +16100,10 @@ $RM -r conftest*
+@@ -17039,7 +17163,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
@@ -894,7 +558,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
    GCC=$G77
    if test -n "$compiler"; then
-@@ -15971,11 +16197,19 @@ $as_echo_n "checking for $compiler optio
+@@ -17131,9 +17258,16 @@ lt_prog_compiler_static_F77=
        ;;
  
      darwin* | rhapsody*)
@@ -904,18 +568,15 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_F77='-fno-common'
 +      lt_prog_compiler_static_F77=''
-       ;;
- 
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static_F77=
 +      ;;
 +
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -15995,6 +16229,13 @@ $as_echo_n "checking for $compiler optio
++    *mint*)
++      # FreeMiNT does not support shared libraries at all
++      lt_prog_compiler_pic_F77=
+       ;;
+ 
+     haiku*)
+@@ -17161,6 +17295,13 @@ lt_prog_compiler_static_F77=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -929,7 +590,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16117,6 +16358,15 @@ $as_echo_n "checking for $compiler optio
+@@ -17313,6 +17454,15 @@ lt_prog_compiler_static_F77=
        esac
        ;;
  
@@ -945,7 +606,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      newsos6)
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16192,6 +16442,9 @@ $as_echo_n "checking for $compiler optio
+@@ -17388,6 +17538,9 @@ lt_prog_compiler_static_F77=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -955,131 +616,94 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_F77=
      ;;
-@@ -16226,11 +16479,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16229: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16482: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16233: \$? = $ac_status" >&5
-+   echo "$as_me:16486: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -16325,11 +16578,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16328: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16581: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16332: \$? = $ac_status" >&5
-+   echo "$as_me:16585: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -16377,11 +16630,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16380: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16633: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16384: \$? = $ac_status" >&5
-+   echo "$as_me:16637: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -16590,6 +16843,11 @@ _LT_EOF
+@@ -17918,16 +18071,28 @@ _LT_EOF
        fi
        ;;
  
-+    haiku*)
-+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      link_all_deplibs_F77=yes
-+      ;;
-+
-     interix[3-9]*)
-       hardcode_direct_F77=no
-       hardcode_shlibpath_var_F77=no
-@@ -16676,7 +16934,7 @@ _LT_EOF
-       ;;
- 
-     netbsd*)
+-    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
+-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_F77=yes
++	hardcode_shlibpath_var_F77=no
++	hardcode_direct_absolute_F77=yes
++	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17051,6 +17309,11 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_shlibpath_var_F77=no
+-	archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	ld_shlibs_F77=no
+       fi
        ;;
  
-+      haiku*)
-+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        link_all_deplibs_F77=yes
-+        ;;
++    netbsd*)
++      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
 +
-     hpux9*)
-       if test "$GCC" = yes; then
- 	archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-@@ -17163,6 +17426,20 @@ rm -f core conftest.err conftest.$ac_obj
+     solaris*)
+       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_F77=no
+@@ -18498,13 +18663,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_F77=yes
        ;;
  
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +    mirbsd*)
-+      if test -f /usr/libexec/ld.so; then
++     if test -f /usr/libexec/ld.so; then
 +	hardcode_direct_F77=yes
 +	hardcode_shlibpath_var_F77=no
 +	hardcode_direct_absolute_F77=yes
-+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	archive_cmds_F77='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
 +	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 +	export_dynamic_flag_spec_F77='${wl}-E'
-+      else
++	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 +	ld_shlibs_F77=no
-+      fi
+       fi
+-      hardcode_libdir_flag_spec_F77='-R$libdir'
 +      ;;
 +
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-@@ -17183,6 +17460,8 @@ rm -f core conftest.err conftest.$ac_obj
++    netbsd*)
++      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+       hardcode_direct_F77=yes
+       hardcode_shlibpath_var_F77=no
+       ;;
+@@ -18518,6 +18695,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
        ;;
  
      openbsd*)
-@@ -17644,6 +17923,7 @@ beos*)
- bsdi[45]*)
-   version_type=linux
-   need_version=no
-+  need_lib_prefix=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -17744,9 +18024,7 @@ freebsd1*)
-   dynamic_linker=no
+@@ -19126,7 +19308,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
    ;;
  
 -freebsd* | dragonfly*)
--  # DragonFly does not have aout.  When/if they implement a new
--  # versioning mechanism, adjust this.
 +freebsd*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-     objformat=`/usr/bin/objformat`
-   else
-@@ -17758,7 +18036,7 @@ freebsd* | dragonfly*)
+@@ -19140,7 +19322,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -1088,7 +712,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -17781,7 +18059,7 @@ freebsd* | dragonfly*)
+@@ -19163,13 +19345,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -1097,7 +721,6 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -17788,6 +18066,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -1113,35 +736,15 @@ The problem manifests with wl and no_builtin_flag containing newlines.
 +  ;;
 +
  gnu*)
-   version_type=linux
+   version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -17798,6 +18087,19 @@ gnu*)
-   hardcode_into_libs=yes
-   ;;
- 
-+haiku*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+  hardcode_into_libs=yes
-+  ;;
-+
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
-@@ -17859,12 +18161,7 @@ interix[3-9]*)
+@@ -19257,12 +19450,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
+-		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
@@ -1149,7 +752,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17948,16 +18245,38 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -19355,19 +19543,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -1183,16 +786,20 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    need_version=no
 -  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -17986,7 +18305,7 @@ newsos6)
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='NetBSD ld.elf_so'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+@@ -19393,7 +19598,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -1201,7 +808,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -17994,7 +18313,7 @@ openbsd*)
+@@ -19401,7 +19606,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -1210,11 +817,11 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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
-@@ -18557,7 +18876,10 @@ $RM -r conftest*
+@@ -19966,7 +20171,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
@@ -1222,7 +829,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
    if test -n "$compiler"; then
-@@ -18776,11 +19098,19 @@ $as_echo_n "checking for $compiler optio
+@@ -20203,9 +20411,16 @@ lt_prog_compiler_static_FC=
        ;;
  
      darwin* | rhapsody*)
@@ -1232,18 +839,15 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_FC='-fno-common'
 +      lt_prog_compiler_static_FC=''
-       ;;
- 
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static_FC=
 +      ;;
 +
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -18800,6 +19130,13 @@ $as_echo_n "checking for $compiler optio
++    *mint*)
++      # FreeMiNT does not support shared libraries at all
++      lt_prog_compiler_pic_FC=
+       ;;
+ 
+     haiku*)
+@@ -20233,6 +20448,13 @@ lt_prog_compiler_static_FC=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -1257,7 +861,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18922,6 +19259,15 @@ $as_echo_n "checking for $compiler optio
+@@ -20385,6 +20607,15 @@ lt_prog_compiler_static_FC=
        esac
        ;;
  
@@ -1273,7 +877,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      newsos6)
        lt_prog_compiler_pic_FC='-KPIC'
        lt_prog_compiler_static_FC='-Bstatic'
-@@ -18997,6 +19343,9 @@ $as_echo_n "checking for $compiler optio
+@@ -20460,6 +20691,9 @@ lt_prog_compiler_static_FC=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -1283,131 +887,94 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_FC=
      ;;
-@@ -19031,11 +19380,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:19034: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19383: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:19038: \$? = $ac_status" >&5
-+   echo "$as_me:19387: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -19130,11 +19479,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:19133: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19482: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:19137: \$? = $ac_status" >&5
-+   echo "$as_me:19486: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -19182,11 +19531,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:19185: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19534: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:19189: \$? = $ac_status" >&5
-+   echo "$as_me:19538: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -19395,6 +19744,11 @@ _LT_EOF
+@@ -20990,16 +21224,28 @@ _LT_EOF
        fi
        ;;
  
-+    haiku*)
-+      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      link_all_deplibs_FC=yes
-+      ;;
-+
-     interix[3-9]*)
-       hardcode_direct_FC=no
-       hardcode_shlibpath_var_FC=no
-@@ -19481,7 +19835,7 @@ _LT_EOF
-       ;;
- 
-     netbsd*)
+-    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
- 	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
+-	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_FC=yes
++	hardcode_shlibpath_var_FC=no
++	hardcode_direct_absolute_FC=yes
++	archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_FC='${wl}-E'
        else
-@@ -19856,6 +20210,11 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_shlibpath_var_FC=no
+-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	ld_shlibs_FC=no
+       fi
        ;;
  
-+      haiku*)
-+        archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        link_all_deplibs_FC=yes
-+        ;;
++    netbsd*)
++      archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
++      hardcode_direct_FC=yes
++      hardcode_shlibpath_var_FC=no
++      ;;
 +
-     hpux9*)
-       if test "$GCC" = yes; then
- 	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-@@ -19968,6 +20327,20 @@ rm -f core conftest.err conftest.$ac_obj
+     solaris*)
+       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_FC=no
+@@ -21570,13 +21816,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_FC=yes
        ;;
  
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +    mirbsd*)
-+      if test -f /usr/libexec/ld.so; then
++     if test -f /usr/libexec/ld.so; then
 +	hardcode_direct_FC=yes
 +	hardcode_shlibpath_var_FC=no
 +	hardcode_direct_absolute_FC=yes
-+	archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	archive_cmds_FC='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	archive_expsym_cmds_FC='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
 +	hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
 +	export_dynamic_flag_spec_FC='${wl}-E'
-+      else
++	whole_archive_flag_spec_FC="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+-	archive_cmds_FC='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 +	ld_shlibs_FC=no
-+      fi
+       fi
+-      hardcode_libdir_flag_spec_FC='-R$libdir'
 +      ;;
 +
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-@@ -19988,6 +20361,8 @@ rm -f core conftest.err conftest.$ac_obj
++    netbsd*)
++      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
+       hardcode_direct_FC=yes
+       hardcode_shlibpath_var_FC=no
+       ;;
+@@ -21590,6 +21848,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
 +      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_FC='-R$libdir'
++      hardcode_direct_FC=yes
++      hardcode_shlibpath_var_FC=no
        ;;
  
      openbsd*)
-@@ -20449,6 +20824,7 @@ beos*)
- bsdi[45]*)
-   version_type=linux
-   need_version=no
-+  need_lib_prefix=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -20549,9 +20925,7 @@ freebsd1*)
-   dynamic_linker=no
+@@ -22198,7 +22461,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
    ;;
  
 -freebsd* | dragonfly*)
--  # DragonFly does not have aout.  When/if they implement a new
--  # versioning mechanism, adjust this.
 +freebsd*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-     objformat=`/usr/bin/objformat`
-   else
-@@ -20563,7 +20937,7 @@ freebsd* | dragonfly*)
+@@ -22212,7 +22475,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -1416,7 +983,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -20586,7 +20960,7 @@ freebsd* | dragonfly*)
+@@ -22235,13 +22498,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -1425,7 +992,6 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -20593,6 +20967,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -1441,35 +1007,15 @@ The problem manifests with wl and no_builtin_flag containing newlines.
 +  ;;
 +
  gnu*)
-   version_type=linux
+   version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -20603,6 +20988,19 @@ gnu*)
-   hardcode_into_libs=yes
-   ;;
- 
-+haiku*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+  hardcode_into_libs=yes
-+  ;;
-+
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
-@@ -20664,12 +21062,7 @@ interix[3-9]*)
+@@ -22329,12 +22603,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
+-		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
@@ -1477,7 +1023,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -20753,16 +21146,38 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -22427,19 +22696,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -1511,16 +1057,20 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    need_version=no
 -  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -20791,7 +21206,7 @@ newsos6)
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='NetBSD ld.elf_so'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+@@ -22465,7 +22751,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -1529,7 +1079,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -20799,7 +21214,7 @@ openbsd*)
+@@ -22473,7 +22759,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -1538,11 +1088,159 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    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
-@@ -21205,7 +21620,10 @@ for cc_temp in $compiler""; do
+@@ -22883,7 +23169,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++# Return the actual command name, not our pkgsrc wrapper name because several
++# decisions are made only based on compiler names
++if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
++cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ 
+ 
+ # Go did not exist at the time GCC didn't implicitly link libc in.
+@@ -23003,9 +23292,16 @@ lt_prog_compiler_static_GO=
+       ;;
+ 
+     darwin* | rhapsody*)
+-      # PIC is the default on this platform
++      # PIC is the default on this platform, and static linking of
++      # binaries generally doesn't work
+       # Common symbols not allowed in MH_DYLIB files
+       lt_prog_compiler_pic_GO='-fno-common'
++      lt_prog_compiler_static_GO=''
++      ;;
++
++    *mint*)
++      # FreeMiNT does not support shared libraries at all
++      lt_prog_compiler_pic_GO=
+       ;;
+ 
+     haiku*)
+@@ -23033,6 +23329,13 @@ lt_prog_compiler_static_GO=
+       # Instead, we relocate shared libraries at runtime.
+       ;;
+ 
++    mint*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_GO=no
++      enable_shared=no
++      ;;
++
+     msdosdjgpp*)
+       # Just because we use GCC doesn't mean we suddenly get shared libraries
+       # on systems that don't support them.
+@@ -23185,6 +23488,15 @@ lt_prog_compiler_static_GO=
+       esac
+       ;;
+ 
++    mirbsd*)
++      case $cc_basename in
++      # pkgsrc f77 is f2c, which uses gcc underneath.
++      f77*)
++	lt_prog_compiler_wl_GO='-Wl,'
++	;;
++      esac
++      ;;
++
+     newsos6)
+       lt_prog_compiler_pic_GO='-KPIC'
+       lt_prog_compiler_static_GO='-Bstatic'
+@@ -23260,6 +23572,9 @@ lt_prog_compiler_static_GO=
+ 
+ case $host_os in
+   # For platforms which do not support PIC, -DPIC is meaningless:
++  mint*)
++    lt_prog_compiler_pic_GO=
++    ;;
+   *djgpp*)
+     lt_prog_compiler_pic_GO=
+     ;;
+@@ -23790,16 +24105,28 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	archive_cmds_GO='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_GO=yes
++	hardcode_shlibpath_var_GO=no
++	hardcode_direct_absolute_GO=yes
++	archive_cmds_GO='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GO='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_GO='${wl}-E'
+       else
+-	archive_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	ld_shlibs_GO=no
+       fi
+       ;;
+ 
++    netbsd*)
++      archive_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
++      hardcode_direct_GO=yes
++      hardcode_shlibpath_var_GO=no
++      ;;
++
+     solaris*)
+       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_GO=no
+@@ -24381,13 +24708,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       link_all_deplibs_GO=yes
+       ;;
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	archive_cmds_GO='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++    mirbsd*)
++     if test -f /usr/libexec/ld.so; then
++	hardcode_direct_GO=yes
++	hardcode_shlibpath_var_GO=no
++	hardcode_direct_absolute_GO=yes
++	archive_cmds_GO='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	archive_expsym_cmds_GO='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_GO='${wl}-E'
++	whole_archive_flag_spec_GO="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+-	archive_cmds_GO='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++	ld_shlibs_GO=no
+       fi
+-      hardcode_libdir_flag_spec_GO='-R$libdir'
++      ;;
++
++    netbsd*)
++      archive_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
+       hardcode_direct_GO=yes
+       hardcode_shlibpath_var_GO=no
+       ;;
+@@ -24401,6 +24740,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       ;;
+ 
+     *nto* | *qnx*)
++      archive_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_GO='-R$libdir'
++      hardcode_direct_GO=yes
++      hardcode_shlibpath_var_GO=no
+       ;;
+ 
+     openbsd*)
+@@ -24980,7 +25324,10 @@ for cc_temp in $compiler""; do
+     *) break;;
+   esac
+ done
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
@@ -1550,21 +1248,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
  # GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -21242,11 +21660,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:21245: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:21663: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:21249: \$? = $ac_status" >&5
-+   echo "$as_me:21667: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -21320,11 +21738,19 @@ $as_echo_n "checking for $compiler optio
+@@ -25100,9 +25447,16 @@ lt_prog_compiler_static_GCJ=
        ;;
  
      darwin* | rhapsody*)
@@ -1574,18 +1258,15 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_GCJ='-fno-common'
 +      lt_prog_compiler_static_GCJ=''
-       ;;
- 
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static_GCJ=
 +      ;;
 +
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -21344,6 +21770,13 @@ $as_echo_n "checking for $compiler optio
++    *mint*)
++      # FreeMiNT does not support shared libraries at all
++      lt_prog_compiler_pic_GCJ=
+       ;;
+ 
+     haiku*)
+@@ -25130,6 +25484,13 @@ lt_prog_compiler_static_GCJ=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -1599,7 +1280,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -21466,6 +21899,15 @@ $as_echo_n "checking for $compiler optio
+@@ -25282,6 +25643,15 @@ lt_prog_compiler_static_GCJ=
        esac
        ;;
  
@@ -1615,7 +1296,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      newsos6)
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -21541,6 +21983,9 @@ $as_echo_n "checking for $compiler optio
+@@ -25357,6 +25727,9 @@ lt_prog_compiler_static_GCJ=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -1625,116 +1306,89 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
      ;;
-@@ -21575,11 +22020,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:21578: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:22023: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:21582: \$? = $ac_status" >&5
-+   echo "$as_me:22027: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -21674,11 +22119,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:21677: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:22122: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:21681: \$? = $ac_status" >&5
-+   echo "$as_me:22126: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -21726,11 +22171,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:21729: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:22174: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:21733: \$? = $ac_status" >&5
-+   echo "$as_me:22178: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -21939,6 +22384,11 @@ _LT_EOF
+@@ -25887,16 +26260,28 @@ _LT_EOF
        fi
        ;;
  
-+    haiku*)
-+      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      link_all_deplibs_GCJ=yes
-+      ;;
-+
-     interix[3-9]*)
-       hardcode_direct_GCJ=no
-       hardcode_shlibpath_var_GCJ=no
-@@ -22025,7 +22475,7 @@ _LT_EOF
-       ;;
- 
-     netbsd*)
+-    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
+-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_GCJ=yes
++	hardcode_shlibpath_var_GCJ=no
++	hardcode_direct_absolute_GCJ=yes
++	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -22412,6 +22862,11 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_shlibpath_var_GCJ=no
+-	archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	ld_shlibs_GCJ=no
+       fi
        ;;
  
-+      haiku*)
-+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        link_all_deplibs_GCJ=yes
-+        ;;
++    netbsd*)
++      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
 +
-     hpux9*)
-       if test "$GCC" = yes; then
- 	archive_cmds_GCJ='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-@@ -22525,6 +22980,20 @@ rm -f core conftest.err conftest.$ac_obj
+     solaris*)
+       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ 	ld_shlibs_GCJ=no
+@@ -26478,13 +26863,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs_GCJ=yes
        ;;
  
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +    mirbsd*)
-+      if test -f /usr/libexec/ld.so; then
++     if test -f /usr/libexec/ld.so; then
 +	hardcode_direct_GCJ=yes
 +	hardcode_shlibpath_var_GCJ=no
 +	hardcode_direct_absolute_GCJ=yes
-+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	archive_cmds_GCJ='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
 +	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 +	export_dynamic_flag_spec_GCJ='${wl}-E'
-+      else
++	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 +	ld_shlibs_GCJ=no
-+      fi
+       fi
+-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 +      ;;
 +
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-@@ -22545,6 +23014,8 @@ rm -f core conftest.err conftest.$ac_obj
++    netbsd*)
++      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+       hardcode_direct_GCJ=yes
+       hardcode_shlibpath_var_GCJ=no
+       ;;
+@@ -26498,6 +26895,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
 +      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
        ;;
  
      openbsd*)
-@@ -23115,7 +23586,10 @@ for cc_temp in $compiler""; do
+@@ -27075,7 +27477,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
@@ -1742,23 +1396,3 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  lt_cv_prog_compiler_c_o_RC=yes
  
-@@ -24296,6 +24770,9 @@ LTCC='$LTCC'
- 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 \
-@@ -24580,6 +25057,9 @@ case \$lt_ECHO in
-   ;;
- 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'
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 615b0f7ec1b..36a340026d2 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,62 +1,16 @@
-$NetBSD: patch-ac,v 1.26 2011/05/14 16:49:45 bsiegert Exp $
+$NetBSD: patch-ac,v 1.27 2013/04/12 13:44:08 joerg Exp $
 
---- libltdl/config/ltmain.sh.orig	2009-11-16 13:23:18.000000000 +0000
+--- libltdl/config/ltmain.sh.orig	2011-10-17 10:19:35.000000000 +0000
 +++ libltdl/config/ltmain.sh
-@@ -111,9 +111,9 @@ done
- $lt_unset CDPATH
+@@ -133,8 +133,9 @@ $lt_unset CDPATH
+ # function.
+ progpath="$0"
  
- 
--
 -
 -
 +unset CP
 +unset MV
 +unset RM
  : ${CP="cp -f"}
- : ${ECHO="echo"}
- : ${EGREP="/bin/grep -E"}
-@@ -4522,7 +4522,7 @@ func_mode_link ()
-       -l*)
- 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # These systems don't actually have a C or math library (as such)
- 	    continue
- 	    ;;
-@@ -6308,6 +6308,7 @@ func_mode_link ()
- 	  func_arith $current - $age
- 	  major=.$func_arith_result
- 	  versuffix="$major.$age.$revision"
-+	  versuffix2="$major.$age"
- 	  ;;
- 
- 	osf)
-@@ -6368,8 +6369,10 @@ func_mode_link ()
- 	  esac
- 	  if test "$need_version" = no; then
- 	    versuffix=
-+	    versuffix2=
- 	  else
- 	    versuffix=".0.0"
-+	    versuffix2=".0.0"
- 	  fi
- 	fi
- 
-@@ -6377,6 +6380,7 @@ func_mode_link ()
- 	if test "$avoid_version" = yes && test "$need_version" = no; then
- 	  major=
- 	  versuffix=
-+	  versuffix2=
- 	  verstring=""
- 	fi
- 
-@@ -6476,7 +6480,7 @@ func_mode_link ()
-       if test "$build_libtool_libs" = yes; then
- 	if test -n "$rpath"; then
- 	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
+ test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+ : ${MAKE="make"}
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 2532ee45914..6c87c0c2e35 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,116 +1,8 @@
-$NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
+$NetBSD: patch-ad,v 1.41 2013/04/12 13:44:08 joerg Exp $
 
---- libltdl/configure.orig	Thu Jul 26 11:26:38 2012
+--- libltdl/configure.orig	2013-03-03 13:53:50.000000000 +0000
 +++ libltdl/configure
-@@ -779,6 +779,7 @@ SED
- am__fastdepCC_FALSE
- am__fastdepCC_TRUE
- CCDEPMODE
-+am__nodep
- AMDEPBACKSLASH
- AMDEP_FALSE
- AMDEP_TRUE
-@@ -2822,11 +2823,12 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
- 
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
--# Always define AMTAR for backward compatibility.
-+# Always define AMTAR for backward compatibility.  Yes, it's still used
-+# in the wild :-(  We should find a proper way to deprecate it ...
-+AMTAR='$${TAR-tar}'
- 
--AMTAR=${AMTAR-"${am_missing_run}tar"}
-+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
- 
--am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
- 
- 
- 
-@@ -2833,7 +2835,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
- 
- 
- 
--
- ## ------------------------------- ##
- ## Libtool specific configuration. ##
- ## ------------------------------- ##
-@@ -2991,6 +2992,7 @@ fi
- if test "x$enable_dependency_tracking" != xno; then
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
-+  am__nodep='_no'
- fi
-  if test "x$enable_dependency_tracking" != xno; then
-   AMDEP_TRUE=
-@@ -3781,6 +3783,7 @@ else
-   # instance it was reported that on HP-UX the gcc test will end up
-   # making a dummy file named `D' -- because `-MD' means `put the output
-   # in D'.
-+  rm -rf conftest.dir
-   mkdir conftest.dir
-   # Copy depcomp to subdir because otherwise we won't find it if we're
-   # using a relative directory.
-@@ -3840,7 +3843,7 @@ else
- 	break
-       fi
-       ;;
--    msvisualcpp | msvcmsys)
-+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-       # This compiler won't grok `-c -o', but also, the minuso test has
-       # not run yet.  These depmodes are late enough in the game, and
-       # so weak that their functioning should not be impacted.
-@@ -4479,13 +4482,13 @@ if test "${lt_cv_nm_interface+set}" = se
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:4482: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:4485: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4485: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:4488: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4488: output\"" >&5)
-+  (eval echo "\"\$as_me:4491: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -4542,6 +4545,13 @@ else
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-+  mint*)
-+    # On MiNT we can support fairly large cmd lengths, but it takes
-+    # a while to run the tests, so let's restrict it to something
-+    # reasonable.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-   amigaos*)
-     # On AmigaOS with pdksh, this test takes hours, literally.
-     # So we just punt and use a minimum line length of 8192.
-@@ -4548,7 +4558,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`
-@@ -4914,6 +4924,10 @@ gnu*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+haiku*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
- hpux10.20* | hpux11*)
-   lt_cv_file_magic_cmd=/usr/bin/file
-   case $host_cpu in
-@@ -4952,6 +4966,17 @@ linux* | k*bsd*-gnu)
+@@ -5042,12 +5042,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -126,9 +18,16 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
 +  ;;
 +
  netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-@@ -4967,7 +4992,7 @@ newos6*)
+-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+-  fi
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+   ;;
+ 
+ newos6*)
+@@ -5057,7 +5064,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -137,20 +36,11 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
    ;;
  
  openbsd*)
-@@ -5688,7 +5713,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 5691 "configure"' > conftest.$ac_ext
-+  echo '#line 5716 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7286,7 +7311,10 @@ for cc_temp in $compiler""; do
+@@ -7843,7 +7850,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
@@ -158,21 +48,7 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
  
  
  # Only perform the check for file, if the check method requires it
-@@ -7515,11 +7543,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7518: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7546: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7522: \$? = $ac_status" >&5
-+   echo "$as_me:7550: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7596,11 +7624,19 @@ $as_echo_n "checking for $compiler optio
+@@ -8156,9 +8166,16 @@ lt_prog_compiler_static=
        ;;
  
      darwin* | rhapsody*)
@@ -182,18 +58,15 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic='-fno-common'
 +      lt_prog_compiler_static=''
-       ;;
- 
-+    haiku*)
-+      # PIC is the default for Haiku.
-+      # The "-static" flag exists, but is broken.
-+      lt_prog_compiler_static=
 +      ;;
 +
-     hpux*)
-       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -7620,6 +7656,13 @@ $as_echo_n "checking for $compiler optio
++    *mint*)
++      # FreeMiNT does not support shared libraries at all
++      lt_prog_compiler_pic=
+       ;;
+ 
+     haiku*)
+@@ -8186,6 +8203,13 @@ lt_prog_compiler_static=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -207,7 +80,7 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -7742,6 +7785,15 @@ $as_echo_n "checking for $compiler optio
+@@ -8338,6 +8362,15 @@ lt_prog_compiler_static=
        esac
        ;;
  
@@ -223,7 +96,7 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
      newsos6)
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -7817,6 +7869,9 @@ $as_echo_n "checking for $compiler optio
+@@ -8413,6 +8446,9 @@ lt_prog_compiler_static=
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -233,131 +106,94 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -7854,11 +7909,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7857: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7912: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7861: \$? = $ac_status" >&5
-+   echo "$as_me:7916: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7959,11 +8014,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7962: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8017: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7966: \$? = $ac_status" >&5
-+   echo "$as_me:8021: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -8014,11 +8069,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8017: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8072: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:8021: \$? = $ac_status" >&5
-+   echo "$as_me:8076: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -8230,6 +8285,11 @@ _LT_EOF
+@@ -8958,16 +8994,28 @@ _LT_EOF
        fi
        ;;
  
-+    haiku*)
-+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      link_all_deplibs=yes
-+      ;;
-+
-     interix[3-9]*)
-       hardcode_direct=no
-       hardcode_shlibpath_var=no
-@@ -8316,7 +8376,7 @@ _LT_EOF
-       ;;
- 
-     netbsd*)
+-    netbsd*)
 -      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
+-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	hardcode_direct_absolute=yes
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -8703,6 +8763,11 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_shlibpath_var=no
+-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	ld_shlibs=no
+       fi
        ;;
  
-+      haiku*)
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        link_all_deplibs=yes
-+        ;;
++    netbsd*)
++      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
 +
-     hpux9*)
-       if test "$GCC" = yes; then
- 	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-@@ -8816,6 +8881,20 @@ rm -f core conftest.err conftest.$ac_obj
+     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" >
        link_all_deplibs=yes
        ;;
  
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +    mirbsd*)
-+      if test -f /usr/libexec/ld.so; then
++     if test -f /usr/libexec/ld.so; then
 +	hardcode_direct=yes
 +	hardcode_shlibpath_var=no
 +	hardcode_direct_absolute=yes
-+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	archive_cmds='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	archive_expsym_cmds='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
 +	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 +	export_dynamic_flag_spec='${wl}-E'
-+      else
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 +	ld_shlibs=no
-+      fi
+       fi
+-      hardcode_libdir_flag_spec='-R$libdir'
 +      ;;
 +
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-@@ -8836,6 +8915,8 @@ rm -f core conftest.err conftest.$ac_obj
++    netbsd*)
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+       ;;
+@@ -9608,6 +9668,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
 +      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
        ;;
  
      openbsd*)
-@@ -9450,6 +9531,7 @@ beos*)
- bsdi[45]*)
-   version_type=linux
-   need_version=no
-+  need_lib_prefix=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -9551,9 +9633,7 @@ freebsd1*)
-   dynamic_linker=no
+@@ -10381,7 +10446,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
    ;;
  
 -freebsd* | dragonfly*)
--  # DragonFly does not have aout.  When/if they implement a new
--  # versioning mechanism, adjust this.
 +freebsd*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-     objformat=`/usr/bin/objformat`
-   else
-@@ -9565,7 +9645,7 @@ freebsd* | dragonfly*)
+@@ -10395,7 +10460,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -366,7 +202,7 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -9588,7 +9668,7 @@ freebsd* | dragonfly*)
+@@ -10418,13 +10483,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -375,7 +211,6 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -9595,6 +9675,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -391,35 +226,15 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
 +  ;;
 +
  gnu*)
-   version_type=linux
+   version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -9605,6 +9696,19 @@ gnu*)
-   hardcode_into_libs=yes
-   ;;
- 
-+haiku*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  dynamic_linker="$host_os runtime_loader"
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+  hardcode_into_libs=yes
-+  ;;
-+
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
-@@ -9666,12 +9770,7 @@ interix[3-9]*)
+@@ -10512,12 +10588,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
+-		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
 -	fi ;;
@@ -427,7 +242,7 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -9761,16 +9860,38 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10616,19 +10687,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -461,16 +276,20 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert Exp $
    need_version=no
 -  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -9799,7 +9920,7 @@ newsos6)
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='NetBSD ld.elf_so'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+@@ -10654,7 +10742,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -479,7 +298,7 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert 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.
-@@ -9807,7 +9928,7 @@ openbsd*)
+@@ -10662,7 +10750,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -488,40 +307,13 @@ $NetBSD: patch-ad,v 1.40 2012/07/26 12:04:04 bsiegert 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
-@@ -10381,7 +10502,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10384 "configure"
-+#line 10505 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10477,7 +10598,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10480 "configure"
-+#line 10601 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11149,7 +11270,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11152 "configure"
-+#line 11273 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11293,6 +11414,9 @@ else
-   irix*)
-     # The case above catches anything before 6.2, and it's known that
+@@ -12196,6 +12284,9 @@ else
      # at 6.2 and later dlopen does load deplibs.
+     lt_cv_sys_dlopen_deplibs=yes
+     ;;
++  mirbsd*)
 +    lt_cv_sys_dlopen_deplibs=yes
 +    ;;
-+  mirbsd*)
+   netbsd*)
      lt_cv_sys_dlopen_deplibs=yes
      ;;
-   netbsd*)