From 736b7accc96009516f9284eceb3903af39d395a8 Mon Sep 17 00:00:00 2001
From: Jonathan Perkin <jperkin@joyent.com>
Date: Thu, 2 Feb 2017 10:30:19 +0000
Subject: [PATCH] Test libtool 2.4.6 update.

---
 README.push                                   |   1 +
 devel/libtool-base/Makefile                   |  10 +-
 devel/libtool-base/PLIST                      |  86 +-
 devel/libtool-fortran/Makefile                |  10 +-
 devel/libtool/Makefile                        |   2 -
 devel/libtool/Makefile.common                 |  12 +-
 devel/libtool/distinfo                        |  18 +-
 devel/libtool/patches/manual-libtool.m4       | 249 +++---
 devel/libtool/patches/manual-ltdl.m4          |   8 +-
 devel/libtool/patches/manual-ltmain.in        |  96 +++
 devel/libtool/patches/manual-ltmain.m4sh      |  28 -
 devel/libtool/patches/manual.README           |   8 +-
 .../patches/{patch-aa => patch-Makefile.in}   |  22 +-
 devel/libtool/patches/patch-ac                | 106 ---
 ...config_depcomp => patch-build-aux_depcomp} |   6 +-
 .../libtool/patches/patch-build-aux_ltmain.sh | 105 +++
 .../patches/{patch-ab => patch-configure}     | 732 +++++++-----------
 .../{patch-ad => patch-libltdl_configure}     | 172 ++--
 18 files changed, 781 insertions(+), 890 deletions(-)
 create mode 100644 README.push
 create mode 100644 devel/libtool/patches/manual-ltmain.in
 delete mode 100644 devel/libtool/patches/manual-ltmain.m4sh
 rename devel/libtool/patches/{patch-aa => patch-Makefile.in} (63%)
 delete mode 100644 devel/libtool/patches/patch-ac
 rename devel/libtool/patches/{patch-libltdl_config_depcomp => patch-build-aux_depcomp} (84%)
 create mode 100644 devel/libtool/patches/patch-build-aux_ltmain.sh
 rename devel/libtool/patches/{patch-ab => patch-configure} (62%)
 rename devel/libtool/patches/{patch-ad => patch-libltdl_configure} (68%)

diff --git a/README.push b/README.push
new file mode 100644
index 0000000000000..3505cbe51827f
--- /dev/null
+++ b/README.push
@@ -0,0 +1 @@
+Test libtool 2.4.6 update.
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index c58da6e3c96e9..be08107c03751 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -17,8 +17,13 @@
 # these patch files properly; otherwise your changes WILL be lost on the
 # next libtool update.
 #
-# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
-# INSTRUCTIONS.  There are no exceptions to this rule.
+# DO NOT MAKE CHANGES TO THESE FILES:
+#
+#   patches/patch-build-aux_ltmain.sh
+#   patches/patch-configure
+#   patches/patch-libltdl_configure
+#
+# WITHOUT FOLLOWING THESE INSTRUCTIONS.  There are no exceptions to this rule.
 #
 ###########################################################################
 ###########################################################################
@@ -26,7 +31,6 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-base-/}
-PKGREVISION=	13
 
 COMMENT=	Generic shared library support script (the script itself)
 
diff --git a/devel/libtool-base/PLIST b/devel/libtool-base/PLIST
index e95b7c68588e1..0d113a69a4964 100644
--- a/devel/libtool-base/PLIST
+++ b/devel/libtool-base/PLIST
@@ -4,52 +4,52 @@ bin/libtoolize
 bin/shlibtool
 man/man1/libtool.1
 man/man1/libtoolize.1
-share/aclocal/argz.m4
 share/aclocal/libtool.m4
+share/aclocal/ltargz.m4
 share/aclocal/ltdl.m4
 share/aclocal/ltoptions.m4
 share/aclocal/ltsugar.m4
 share/aclocal/ltversion.m4
 share/aclocal/lt~obsolete.m4
-share/libtool/config/compile
-share/libtool/config/config.guess
-share/libtool/config/config.sub
-share/libtool/config/depcomp
-share/libtool/config/install-sh
-share/libtool/config/ltmain.sh
-share/libtool/config/missing
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/Makefile.inc
-share/libtool/libltdl/README
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/argz.c
-share/libtool/libltdl/argz_.h
-share/libtool/libltdl/config-h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.ac
-share/libtool/libltdl/libltdl/lt__alloc.h
-share/libtool/libltdl/libltdl/lt__dirent.h
-share/libtool/libltdl/libltdl/lt__glibc.h
-share/libtool/libltdl/libltdl/lt__private.h
-share/libtool/libltdl/libltdl/lt__strl.h
-share/libtool/libltdl/libltdl/lt_dlloader.h
-share/libtool/libltdl/libltdl/lt_error.h
-share/libtool/libltdl/libltdl/lt_system.h
-share/libtool/libltdl/libltdl/slist.h
-share/libtool/libltdl/loaders/dld_link.c
-share/libtool/libltdl/loaders/dlopen.c
-share/libtool/libltdl/loaders/dyld.c
-share/libtool/libltdl/loaders/load_add_on.c
-share/libtool/libltdl/loaders/loadlibrary.c
-share/libtool/libltdl/loaders/preopen.c
-share/libtool/libltdl/loaders/shl_load.c
-share/libtool/libltdl/lt__alloc.c
-share/libtool/libltdl/lt__dirent.c
-share/libtool/libltdl/lt__strl.c
-share/libtool/libltdl/lt_dlloader.c
-share/libtool/libltdl/lt_error.c
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/slist.c
+share/libtool/COPYING.LIB
+share/libtool/Makefile.am
+share/libtool/Makefile.in
+share/libtool/README
+share/libtool/aclocal.m4
+share/libtool/build-aux/compile
+share/libtool/build-aux/config.guess
+share/libtool/build-aux/config.sub
+share/libtool/build-aux/depcomp
+share/libtool/build-aux/install-sh
+share/libtool/build-aux/ltmain.sh
+share/libtool/build-aux/missing
+share/libtool/config-h.in
+share/libtool/configure
+share/libtool/configure.ac
+share/libtool/libltdl/lt__alloc.h
+share/libtool/libltdl/lt__argz_.h
+share/libtool/libltdl/lt__dirent.h
+share/libtool/libltdl/lt__glibc.h
+share/libtool/libltdl/lt__private.h
+share/libtool/libltdl/lt__strl.h
+share/libtool/libltdl/lt_dlloader.h
+share/libtool/libltdl/lt_error.h
+share/libtool/libltdl/lt_system.h
+share/libtool/libltdl/slist.h
+share/libtool/loaders/dld_link.c
+share/libtool/loaders/dlopen.c
+share/libtool/loaders/dyld.c
+share/libtool/loaders/load_add_on.c
+share/libtool/loaders/loadlibrary.c
+share/libtool/loaders/preopen.c
+share/libtool/loaders/shl_load.c
+share/libtool/lt__alloc.c
+share/libtool/lt__argz.c
+share/libtool/lt__dirent.c
+share/libtool/lt__strl.c
+share/libtool/lt_dlloader.c
+share/libtool/lt_error.c
+share/libtool/ltdl.c
+share/libtool/ltdl.h
+share/libtool/ltdl.mk
+share/libtool/slist.c
diff --git a/devel/libtool-fortran/Makefile b/devel/libtool-fortran/Makefile
index 0e8903406cb63..f355c149211c8 100644
--- a/devel/libtool-fortran/Makefile
+++ b/devel/libtool-fortran/Makefile
@@ -17,8 +17,13 @@
 # these patch files properly; otherwise your changes WILL be lost on the
 # next libtool update.
 #
-# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
-# INSTRUCTIONS.  There are no exceptions to this rule.
+# DO NOT MAKE CHANGES TO THESE FILES:
+#
+#   patches/patch-build-aux_ltmain.sh
+#   patches/patch-configure
+#   patches/patch-libltdl_configure
+#
+# WITHOUT FOLLOWING THESE INSTRUCTIONS.  There are no exceptions to this rule.
 #
 ###########################################################################
 ###########################################################################
@@ -28,7 +33,6 @@
 FILESDIR=	${.CURDIR}/../libtool-base/files
 
 PKGNAME=	${DISTNAME:S/-/-fortran-/}
-PKGREVISION=	9
 
 COMMENT=	Generic shared library support script (the script itself, incl. Fortran)
 
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index d8ce1f90116b3..eff54af9339f6 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -3,8 +3,6 @@
 META_PACKAGE=	# empty
 
 .include "Makefile.common"
-PKGREVISION=	3
-
 
 DEPENDS+=	${DISTNAME:S/-/-base-/}{,nb[0-9]*}:../../devel/libtool-base
 DEPENDS+=	${DISTNAME:S/-/-fortran-/}{,nb[0-9]*}:../../devel/libtool-fortran
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 7c7f287dcf3b0..52eedc65bb901 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -21,13 +21,18 @@
 # these patch files properly; otherwise your changes WILL be lost on the
 # next libtool update.
 #
-# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
-# INSTRUCTIONS.  There are no exceptions to this rule.
+# DO NOT MAKE CHANGES TO THESE FILES:
+#
+#   patches/patch-build-aux_ltmain.sh
+#   patches/patch-configure
+#   patches/patch-libltdl_configure
+#
+# WITHOUT FOLLOWING THESE INSTRUCTIONS.  There are no exceptions to this rule.
 #
 ###########################################################################
 ###########################################################################
 
-DISTNAME=	libtool-2.4.2
+DISTNAME=	libtool-2.4.6
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
@@ -38,6 +43,7 @@ LICENSE=	gnu-gpl-v2
 
 CONFLICTS=	glibtool-[0-9]*
 
+USE_TOOLS+=	gm4
 GNU_CONFIGURE=	yes
 
 DISTINFO_FILE=	${.CURDIR}/../../devel/libtool/distinfo
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 175e80c9a1327..26410d3860649 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.102 2016/03/10 12:43:48 tnn Exp $
 
-SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88
-RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d
-SHA512 (libtool-2.4.2.tar.gz) = 0e54af7bbec376f943f2b8e4f13631fe5627b099a37a5f0252e12bade76473b0a36a673529d594778064cd8632abdc43d8a20883d66d6b27738861afbb7e211d
-Size (libtool-2.4.2.tar.gz) = 2632347 bytes
-SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69
-SHA1 (patch-ab) = 621320ff0a2bf5c03f40b8bd1a1467471b22a3b6
-SHA1 (patch-ac) = fa8b0388f8f0469803c5869a23c3a1247eef70a1
-SHA1 (patch-ad) = 4cfe392ea272a4770407dc13104dbf17d640fdb8
-SHA1 (patch-libltdl_config_depcomp) = f8a5247e8c667b896bb426613f1b43d614760097
+SHA1 (libtool-2.4.6.tar.gz) = 25b6931265230a06f0fc2146df64c04e5ae6ec33
+RMD160 (libtool-2.4.6.tar.gz) = 6f4b4c3e89426652da3acffa707f71bb4ccee26a
+SHA512 (libtool-2.4.6.tar.gz) = 3233d81cb2739a54b840a0a82064eebbfaa4fb442fb993a35d6bd41d8395c51f038c90ae048b9252f172d0a5bbfb4b36e2b13d4477001f9ff7d4124237819a18
+Size (libtool-2.4.6.tar.gz) = 1806697 bytes
+SHA1 (patch-Makefile.in) = 0adb634335acd5fb280c99b5d43ae568018ca0af
+SHA1 (patch-build-aux_depcomp) = ae6f93ad4fac1df648cfcb62601c72f9ebb30233
+SHA1 (patch-build-aux_ltmain.sh) = cb839f6d2aff9cc490efa8d5fa156659d72748f1
+SHA1 (patch-configure) = 818157dd9bf985657a0089a7d887304b71559837
+SHA1 (patch-libltdl_configure) = 87535836200547ceb8463a98e86561c2adf1f0ed
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 42ac6a5f23ee2..e523b0b42bb49 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,29 +1,45 @@
 $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
 
---- libltdl/m4/libtool.m4.orig	2011-10-17 10:17:05.000000000 +0000
-+++ libltdl/m4/libtool.m4
-@@ -123,7 +123,10 @@ m4_defun([_LT_CC_BASENAME],
-     *) 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
-+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- ])
- 
+Support mirbsd/midnightbsd.
+Handle pkgsrc wrappers.
+Fixup output on various OS.
+
+--- m4/libtool.m4.orig	2015-01-20 16:15:19.000000000 +0000
++++ m4/libtool.m4
+@@ -117,7 +117,10 @@ func_cc_basename ()
+         *) break;;
+       esac
+     done
+-    func_cc_basename_result=`$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
++    func_cc_basename_result=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ }
+ ])# _LT_PREPARE_CC_BASENAME
  
-@@ -1098,7 +1101,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
-   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+@@ -141,7 +144,10 @@ cc_basename=$func_cc_basename_result
+ # It is okay to use these file commands and assume they have been set
+ # sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
+ m4_defun([_LT_FILEUTILS_DEFAULTS],
+-[: ${CP="cp -f"}
++[unset CP
++unset MV
++unset RM
++: ${CP="cp -f"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+ ])# _LT_FILEUTILS_DEFAULTS
+@@ -1120,7 +1126,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+   _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
    case $cc_basename in
-      ifort*) _lt_dar_can_shared=yes ;;
+      ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
-   if test "$_lt_dar_can_shared" = "yes"; then
+   if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -1482,7 +1485,7 @@ fi
+@@ -1558,7 +1564,7 @@ fi
  
  case $host_os in
    darwin*)
@@ -32,16 +48,16 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
    *)
      lock_old_archive_extraction=no ;;
  esac
-@@ -1638,7 +1641,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+@@ -1714,7 +1720,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*)
+-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
++  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd* | mirbsd*)
      # 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`
-@@ -2468,7 +2471,7 @@ dgux*)
+@@ -2655,7 +2661,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -50,24 +66,7 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -2482,7 +2485,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-@@ -2505,13 +2508,24 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
--  *) # from 4.6 on, and DragonFly
-+  *) # from 4.6 on
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
+@@ -2700,6 +2706,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -82,15 +81,15 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
 +  hardcode_into_libs=yes
 +  ;;
 +
- gnu*)
+ haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -2599,12 +2613,7 @@ interix[[3-9]]*)
+@@ -2777,12 +2794,7 @@ interix[[3-9]]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
+-	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
@@ -99,7 +98,7 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -2684,19 +2693,36 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -2887,19 +2899,36 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -132,12 +131,12 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
    need_lib_prefix=no
    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$shared_ext$versuffix'
 -    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'
+-    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
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -146,25 +145,25 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -2722,7 +2748,7 @@ newsos6)
+@@ -2925,7 +2954,7 @@ newsos6)
    ;;
  
- openbsd*)
+ openbsd* | bitrig*)
 -  version_type=sunos
 +  version_type=linux
-   sys_lib_dlsearch_path_spec="/usr/lib"
+   sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -2730,7 +2756,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-     *)				need_version=no  ;;
-   esac
--  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 test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+@@ -2933,7 +2962,7 @@ openbsd* | bitrig*)
+   else
+     need_version=yes
+   fi
+-  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}'
    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
-@@ -3289,12 +3315,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   shlibpath_overrides_runpath=yes
+@@ -3546,12 +3575,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -189,7 +188,7 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
    ;;
  
  newos6*)
-@@ -3304,7 +3337,7 @@ newos6*)
+@@ -3561,7 +3597,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -197,8 +196,8 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
 +  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|S\.a)$'
    ;;
  
- openbsd*)
-@@ -3651,7 +3684,7 @@ osf*)
+ openbsd* | bitrig*)
+@@ -3931,7 +3967,7 @@ osf*)
    symcode='[[BCDEGQRST]]'
    ;;
  solaris*)
@@ -207,8 +206,8 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
    ;;
  sco3.2v5*)
    symcode='[[DT]]'
-@@ -3913,9 +3946,15 @@ m4_if([$1], [CXX], [
- 	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+@@ -4236,9 +4272,15 @@ m4_if([$1], [CXX], [
+       esac
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -224,7 +223,7 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -3994,6 +4033,9 @@ m4_if([$1], [CXX], [
+@@ -4317,6 +4359,9 @@ m4_if([$1], [CXX], [
  	    ;;
  	esac
  	;;
@@ -234,7 +233,7 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -4232,9 +4274,16 @@ m4_if([$1], [CXX], [
+@@ -4561,9 +4606,16 @@ m4_if([$1], [CXX], [
        ;;
  
      darwin* | rhapsody*)
@@ -252,7 +251,7 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      haiku*)
-@@ -4262,6 +4311,13 @@ m4_if([$1], [CXX], [
+@@ -4591,6 +4643,13 @@ m4_if([$1], [CXX], [
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -266,7 +265,7 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -4415,6 +4471,15 @@ m4_if([$1], [CXX], [
+@@ -4769,6 +4828,15 @@ m4_if([$1], [CXX], [
        esac
        ;;
  
@@ -282,17 +281,17 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
      newsos6)
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4490,6 +4555,9 @@ m4_if([$1], [CXX], [
+@@ -4844,6 +4912,9 @@ m4_if([$1], [CXX], [
  ])
  case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
+   # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +    ;;
    *djgpp*)
      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;
-@@ -4861,16 +4929,29 @@ _LT_EOF
+@@ -5252,16 +5323,29 @@ _LT_EOF
        fi
        ;;
  
@@ -302,17 +301,17 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
 -	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'
++        _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
--	_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
+-	_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
        ;;
  
@@ -328,8 +327,8 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	_LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5342,15 +5423,28 @@ _LT_EOF
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
+@@ -5794,15 +5878,28 @@ _LT_EOF
+       esac
        ;;
  
 -    netbsd*)
@@ -362,7 +361,7 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      newsos6)
-@@ -5362,6 +5456,11 @@ _LT_EOF
+@@ -5814,6 +5911,11 @@ _LT_EOF
        ;;
  
      *nto* | *qnx*)
@@ -373,19 +372,19 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
-     openbsd*)
-@@ -5819,9 +5918,7 @@ m4_defun([_LT_LANG_CXX_CONFIG],
+     openbsd* | bitrig*)
+@@ -6287,9 +6389,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
+-if test -n "$CXX" && ( test no != "$CXX" &&
+-    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test g++ != "$CXX"))); then
 +if test -n "$CXX" && test "X$CXX" != "Xno" ; then
    AC_PROG_CXXCPP
  else
    _lt_caught_CXX_error=yes
-@@ -6538,6 +6635,22 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -7079,6 +7179,22 @@ if test yes != "$_lt_caught_CXX_error"; 
          _LT_TAGVAR(ld_shlibs, $1)=no
  	;;
  
@@ -408,7 +407,7 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
        mvs*)
          case $cc_basename in
            cxx*)
-@@ -6552,15 +6665,13 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -7093,15 +7209,13 @@ if test yes != "$_lt_caught_CXX_error"; 
  	;;
  
        netbsd*)
@@ -431,58 +430,20 @@ $NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
  	;;
  
        *nto* | *qnx*)
-@@ -6739,27 +6850,14 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -7275,7 +7389,7 @@ if test yes != "$_lt_caught_CXX_error"; 
  	    # GNU C++ compiler with Solaris linker
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ 	    if test yes,no = "$GXX,$with_gnu_ld"; 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_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'
--
--	        # Commands to make compiler produce verbose output that lists
--	        # what "hidden" libraries, object files and flags are used when
--	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
--	      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_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'
--
--	        # Commands to make compiler produce verbose output that lists
--	        # what "hidden" libraries, object files and flags are used when
--	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
--	      fi
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $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 ${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
-+	      # linking a shared library.
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 
- 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- 	      case $host_os in
-@@ -6995,13 +7093,11 @@ if AC_TRY_EVAL(ac_compile); then
-     case ${prev}${p} in
- 
-     -L* | -R* | -l*)
--       # Some compilers place space between "-{L,R}" and the path.
--       # Remove the space.
--       if test $p = "-L" ||
--          test $p = "-R"; then
--	 prev=$p
--	 continue
--       fi
-+       # Some compilers place space between "-{L,R,l}" and the path or
-+       # library.  Remove the space.
-+       case $p in
-+       -L|-R|-l) prev=$p; continue ;;
-+       esac
- 
-        # Expand the sysroot to ease extracting the directories later.
-        if test -z "$prev"; then
++	      if true; then
+ 	        _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 $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+@@ -7535,6 +7649,7 @@ if AC_TRY_EVAL(ac_compile); then
+        # Some compilers place space between "-{L,R}" and the path.
+        # Remove the space.
+        if test x-L = "$p" ||
++          test x-l = "$p" ||
+           test x-R = "$p"; then
+ 	 prev=$p
+ 	 continue
diff --git a/devel/libtool/patches/manual-ltdl.m4 b/devel/libtool/patches/manual-ltdl.m4
index bdfec24783973..677c3005e5d1e 100644
--- a/devel/libtool/patches/manual-ltdl.m4
+++ b/devel/libtool/patches/manual-ltdl.m4
@@ -1,8 +1,10 @@
 $NetBSD: manual-ltdl.m4,v 1.5 2013/04/12 13:44:08 joerg Exp $
 
---- 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
+Support mirbsd.
+
+--- m4/ltdl.m4.orig	2015-01-16 18:52:04.000000000 +0000
++++ m4/ltdl.m4
+@@ -496,6 +496,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/manual-ltmain.in b/devel/libtool/patches/manual-ltmain.in
new file mode 100644
index 0000000000000..756d8319b9bb5
--- /dev/null
+++ b/devel/libtool/patches/manual-ltmain.in
@@ -0,0 +1,96 @@
+$NetBSD: manual-ltmain.m4sh,v 1.2 2015/07/18 16:50:51 joerg Exp $
+
+Handle versuffix2 for mirbsd/midnightbsd.
+Avoid empty relink_command.
+
+--- build-aux/ltmain.in.orig	2015-02-06 12:57:56.000000000 +0000
++++ build-aux/ltmain.in
+@@ -6430,7 +6430,11 @@ func_mode_link ()
+ 	    # Finalize command for both is simple: just hardcode it.
+ 	    if test yes = "$hardcode_direct" &&
+ 	       test no = "$hardcode_direct_absolute"; then
+-	      add=$libdir/$linklib
++	      if test -f "$inst_prefix_dir$libdir/$linklib"; then
++		add="$inst_prefix_dir$libdir/$linklib"
++	      else
++		add="$libdir/$linklib"
++	      fi
+ 	    elif test yes = "$hardcode_minus_L"; then
+ 	      add_dir=-L$libdir
+ 	      add=-l$name
+@@ -6953,6 +6957,7 @@ func_mode_link ()
+ 	# Calculate the version variables.
+ 	major=
+ 	versuffix=
++	versuffix2=
+ 	verstring=
+ 	case $version_type in
+ 	none) ;;
+@@ -7023,6 +7028,7 @@ func_mode_link ()
+ 	  func_arith $current - $age
+ 	  major=.$func_arith_result
+ 	  versuffix=$major.$age.$revision
++	  versuffix2=$major.$age
+ 	  ;;
+ 
+ 	osf)
+@@ -7088,8 +7094,10 @@ func_mode_link ()
+ 	  esac
+ 	  if test no = "$need_version"; then
+ 	    versuffix=
++	    versuffix2=
+ 	  else
+ 	    versuffix=.0.0
++	    versuffix2=.0.0
+ 	  fi
+ 	fi
+ 
+@@ -7097,6 +7105,7 @@ func_mode_link ()
+ 	if test yes,no = "$avoid_version,$need_version"; then
+ 	  major=
+ 	  versuffix=
++	  versuffix2=
+ 	  verstring=
+ 	fi
+ 
+@@ -7210,7 +7219,7 @@ func_mode_link ()
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-mirbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *-*-sco3.2v5* | *-*-sco5v6*)
+@@ -7233,12 +7242,14 @@ func_mode_link ()
+ 	libname_save=$libname
+ 	release_save=$release
+ 	versuffix_save=$versuffix
++	versuffix2_save=$versuffix2
+ 	major_save=$major
+ 	# I'm not sure if I'm treating the release correctly.  I think
+ 	# release should show up in the -l (ie -lgmp5) so we don't want to
+ 	# add it in twice.  Is that correct?
+ 	release=
+ 	versuffix=
++	versuffix2=
+ 	major=
+ 	newdeplibs=
+ 	droppeddeps=no
+@@ -7515,6 +7526,7 @@ EOF
+ 	  ;;
+ 	esac
+ 	versuffix=$versuffix_save
++	versuffix2=$versuffix2_save
+ 	major=$major_save
+ 	release=$release_save
+ 	libname=$libname_save
+@@ -9000,7 +9012,7 @@ dlpreopen='$dlprefiles'
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test no,yes = "$installed,$need_relink"; then
++	  if test no,yes = "$installed,$need_relink" && test -n "$relink_command"; then
+ 	    $ECHO >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
diff --git a/devel/libtool/patches/manual-ltmain.m4sh b/devel/libtool/patches/manual-ltmain.m4sh
deleted file mode 100644
index 8239994446874..0000000000000
--- a/devel/libtool/patches/manual-ltmain.m4sh
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: manual-ltmain.m4sh,v 1.2 2015/07/18 16:50:51 joerg Exp $
-
---- libltdl/config/ltmain.m4sh.orig	2014-11-27 21:09:59.000000000 +0000
-+++ libltdl/config/ltmain.m4sh
-@@ -6112,7 +6112,11 @@ func_mode_link ()
- 	    # Finalize command for both is simple: just hardcode it.
- 	    if test "$hardcode_direct" = yes &&
- 	       test "$hardcode_direct_absolute" = no; then
--	      add="$libdir/$linklib"
-+	      if test -f "$inst_prefix_dir$libdir/$linklib"; then
-+	        add="$inst_prefix_dir$libdir/$linklib"
-+	      else
-+	        add="$libdir/$linklib"
-+	      fi
- 	    elif test "$hardcode_minus_L" = yes; then
- 	      add_dir="-L$libdir"
- 	      add="-l$name"
-@@ -8632,8 +8636,8 @@ dlpreopen='$dlprefiles'
- 
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
--	  if test "$installed" = no && test "$need_relink" = yes; then
--	    $ECHO >> $output "\
-+	  if test "$installed" = no && test "$need_relink" = yes && \
-+	     test -n "$relink_command"; then
- relink_command=\"$relink_command\""
- 	  fi
- 	done
diff --git a/devel/libtool/patches/manual.README b/devel/libtool/patches/manual.README
index 9b1bf6ea5db85..ecbe4eae18c1d 100644
--- a/devel/libtool/patches/manual.README
+++ b/devel/libtool/patches/manual.README
@@ -20,11 +20,13 @@ cat /usr/pkgsrc/devel/libtool/patches/manual-* | patch -s -p0
 
 [edit *.m4 files and put patches back to manual-*]
 
+cp -f build-aux/ltmain.sh build-aux/ltmain.sh.orig
 cp -f configure configure.orig
 cp -f libltdl/configure libltdl/configure.orig
-./bootstrap
-pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab
-pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad
+./bootstrap --skip-git --force
+pkgdiff build-aux/ltmain.sh >/usr/pkgsrc/devel/libtool/patches/patch-build-aux_ltmain.sh
+pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-configure
+pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-libltdl_configure
 cd /usr/pkgsrc/devel/libtool
 make makepatchsum
 
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-Makefile.in
similarity index 63%
rename from devel/libtool/patches/patch-aa
rename to devel/libtool/patches/patch-Makefile.in
index 779c13afc13f6..b4b9e597a206d 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-Makefile.in
@@ -1,19 +1,21 @@
 $NetBSD: patch-aa,v 1.37 2013/04/12 13:44:08 joerg Exp $
 
---- Makefile.in.orig	2011-10-17 10:18:55.000000000 +0000
+Avoid generating info pages.
+
+--- Makefile.in.orig	2015-02-15 16:14:14.000000000 +0000
 +++ Makefile.in
-@@ -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
+@@ -790,9 +790,7 @@ doc_libtool_TEXINFOS = $(doc_dir)/PLATFO
+ 			  $(notes_texi)
+ 
+ dist_man1_MANS = $(libtool_1) $(libtoolize_1)
 -update_mans = \
 -  PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \
--  $(HELP2MAN) --output=$@
+-  $(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
+ ltdldir = $(srcdir)/libltdl
+ pkgauxdir = $(pkgdatadir)/build-aux
+@@ -1901,7 +1899,7 @@ all-am: Makefile $(INFO_DEPS) $(LTLIBRAR
  		$(HEADERS) config.h all-local
  installdirs: installdirs-recursive
  installdirs-am:
@@ -22,7 +24,7 @@ $NetBSD: patch-aa,v 1.37 2013/04/12 13:44:08 joerg Exp $
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -2104,7 +2102,7 @@ info: info-recursive
+@@ -1973,7 +1971,7 @@ info: info-recursive
  info-am: $(INFO_DEPS)
  
  install-data-am: install-data-local install-includeHEADERS \
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
deleted file mode 100644
index ca0422616929f..0000000000000
--- a/devel/libtool/patches/patch-ac
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD: patch-ac,v 1.35 2015/07/18 16:50:51 joerg Exp $
-
---- libltdl/config/ltmain.sh.orig	Mon Oct 17 10:19:11 2011
-+++ libltdl/config/ltmain.sh
-@@ -133,8 +133,9 @@ $lt_unset CDPATH
- # function.
- progpath="$0"
- 
--
--
-+unset CP
-+unset MV
-+unset RM
- : ${CP="cp -f"}
- test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
- : ${MAKE="make"}
-@@ -6899,7 +6900,11 @@ func_mode_link ()
- 	    # Finalize command for both is simple: just hardcode it.
- 	    if test "$hardcode_direct" = yes &&
- 	       test "$hardcode_direct_absolute" = no; then
--	      add="$libdir/$linklib"
-+	      if test -f "$inst_prefix_dir$libdir/$linklib"; then
-+	        add="$inst_prefix_dir$libdir/$linklib"
-+	      else
-+	        add="$libdir/$linklib"
-+	      fi
- 	    elif test "$hardcode_minus_L" = yes; then
- 	      add_dir="-L$libdir"
- 	      add="-l$name"
-@@ -7391,6 +7396,7 @@ func_mode_link ()
- 	# Calculate the version variables.
- 	major=
- 	versuffix=
-+	versuffix2=
- 	verstring=
- 	case $version_type in
- 	none) ;;
-@@ -7451,6 +7457,7 @@ func_mode_link ()
- 	  func_arith $current - $age
- 	  major=.$func_arith_result
- 	  versuffix="$major.$age.$revision"
-+	  versuffix2="$major.$age"
- 	  ;;
- 
- 	osf)
-@@ -7511,8 +7518,10 @@ func_mode_link ()
- 	  esac
- 	  if test "$need_version" = no; then
- 	    versuffix=
-+	    versuffix2=
- 	  else
- 	    versuffix=".0.0"
-+	    versuffix2=".0.0"
- 	  fi
- 	fi
- 
-@@ -7520,6 +7529,7 @@ func_mode_link ()
- 	if test "$avoid_version" = yes && test "$need_version" = no; then
- 	  major=
- 	  versuffix=
-+	  versuffix2=
- 	  verstring=""
- 	fi
- 
-@@ -7630,7 +7640,7 @@ func_mode_link ()
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-+	  *-*-openbsd* | *-*-mirbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *-*-sco3.2v5* | *-*-sco5v6*)
-@@ -7653,12 +7663,14 @@ func_mode_link ()
- 	libname_save=$libname
- 	release_save=$release
- 	versuffix_save=$versuffix
-+	versuffix2_save=$versuffix2
- 	major_save=$major
- 	# I'm not sure if I'm treating the release correctly.  I think
- 	# release should show up in the -l (ie -lgmp5) so we don't want to
- 	# add it in twice.  Is that correct?
- 	release=""
- 	versuffix=""
-+	versuffix2=""
- 	major=""
- 	newdeplibs=
- 	droppeddeps=no
-@@ -7935,6 +7947,7 @@ EOF
- 	  ;;
- 	esac
- 	versuffix=$versuffix_save
-+	versuffix2=$versuffix2_save
- 	major=$major_save
- 	release=$release_save
- 	libname=$libname_save
-@@ -9419,7 +9432,8 @@ dlpreopen='$dlprefiles'
- 
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
--	  if test "$installed" = no && test "$need_relink" = yes; then
-+	  if test "$installed" = no && test "$need_relink" = yes && \
-+	     test -n "$relink_command"; then
- 	    $ECHO >> $output "\
- relink_command=\"$relink_command\""
- 	  fi
diff --git a/devel/libtool/patches/patch-libltdl_config_depcomp b/devel/libtool/patches/patch-build-aux_depcomp
similarity index 84%
rename from devel/libtool/patches/patch-libltdl_config_depcomp
rename to devel/libtool/patches/patch-build-aux_depcomp
index 61a79501e9120..9cc359169ad92 100644
--- a/devel/libtool/patches/patch-libltdl_config_depcomp
+++ b/devel/libtool/patches/patch-build-aux_depcomp
@@ -4,9 +4,9 @@ Sometimes, the same source file is compiled for both PIC and non-PIC use.
 Avoid using the same temporary file in this case as it will result in
 very hard to debug race conditions for parallel builds otherwise.
 
---- libltdl/config/depcomp.orig	2016-01-25 14:51:26.100348213 +0000
-+++ libltdl/config/depcomp
-@@ -65,7 +65,7 @@ fi
+--- build-aux/depcomp.orig	2016-12-31 10:44:32.000000000 +0000
++++ build-aux/depcomp
+@@ -124,7 +124,7 @@ fi
  # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
  depfile=${depfile-`echo "$object" |
    sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
diff --git a/devel/libtool/patches/patch-build-aux_ltmain.sh b/devel/libtool/patches/patch-build-aux_ltmain.sh
new file mode 100644
index 0000000000000..7edcc63a0e502
--- /dev/null
+++ b/devel/libtool/patches/patch-build-aux_ltmain.sh
@@ -0,0 +1,105 @@
+$NetBSD: patch-ac,v 1.35 2015/07/18 16:50:51 joerg Exp $
+
+Automatically generated using manual-* patches and bootstrap.
+DO NOT MODIFY THIS PATCH MANUALLY!  YOUR CHANGES WILL BE LOST!
+
+--- build-aux/ltmain.sh.orig	2017-02-02 10:07:28.000000000 +0000
++++ build-aux/ltmain.sh
+@@ -2073,7 +2073,7 @@ include the following information:
+        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+ 
+ Report bugs to <bug-libtool@gnu.org>.
+-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
++GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+ General help using GNU software: <http://www.gnu.org/gethelp/>."
+     exit 0
+ }
+@@ -8342,7 +8342,11 @@ func_mode_link ()
+ 	    # Finalize command for both is simple: just hardcode it.
+ 	    if test yes = "$hardcode_direct" &&
+ 	       test no = "$hardcode_direct_absolute"; then
+-	      add=$libdir/$linklib
++	      if test -f "$inst_prefix_dir$libdir/$linklib"; then
++		add="$inst_prefix_dir$libdir/$linklib"
++	      else
++		add="$libdir/$linklib"
++	      fi
+ 	    elif test yes = "$hardcode_minus_L"; then
+ 	      add_dir=-L$libdir
+ 	      add=-l$name
+@@ -8865,6 +8869,7 @@ func_mode_link ()
+ 	# Calculate the version variables.
+ 	major=
+ 	versuffix=
++	versuffix2=
+ 	verstring=
+ 	case $version_type in
+ 	none) ;;
+@@ -8935,6 +8940,7 @@ func_mode_link ()
+ 	  func_arith $current - $age
+ 	  major=.$func_arith_result
+ 	  versuffix=$major.$age.$revision
++	  versuffix2=$major.$age
+ 	  ;;
+ 
+ 	osf)
+@@ -9000,8 +9006,10 @@ func_mode_link ()
+ 	  esac
+ 	  if test no = "$need_version"; then
+ 	    versuffix=
++	    versuffix2=
+ 	  else
+ 	    versuffix=.0.0
++	    versuffix2=.0.0
+ 	  fi
+ 	fi
+ 
+@@ -9009,6 +9017,7 @@ func_mode_link ()
+ 	if test yes,no = "$avoid_version,$need_version"; then
+ 	  major=
+ 	  versuffix=
++	  versuffix2=
+ 	  verstring=
+ 	fi
+ 
+@@ -9122,7 +9131,7 @@ func_mode_link ()
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-mirbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *-*-sco3.2v5* | *-*-sco5v6*)
+@@ -9145,12 +9154,14 @@ func_mode_link ()
+ 	libname_save=$libname
+ 	release_save=$release
+ 	versuffix_save=$versuffix
++	versuffix2_save=$versuffix2
+ 	major_save=$major
+ 	# I'm not sure if I'm treating the release correctly.  I think
+ 	# release should show up in the -l (ie -lgmp5) so we don't want to
+ 	# add it in twice.  Is that correct?
+ 	release=
+ 	versuffix=
++	versuffix2=
+ 	major=
+ 	newdeplibs=
+ 	droppeddeps=no
+@@ -9427,6 +9438,7 @@ EOF
+ 	  ;;
+ 	esac
+ 	versuffix=$versuffix_save
++	versuffix2=$versuffix2_save
+ 	major=$major_save
+ 	release=$release_save
+ 	libname=$libname_save
+@@ -10912,7 +10924,7 @@ dlpreopen='$dlprefiles'
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test no,yes = "$installed,$need_relink"; then
++	  if test no,yes = "$installed,$need_relink" && test -n "$relink_command"; then
+ 	    $ECHO >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-configure
similarity index 62%
rename from devel/libtool/patches/patch-ab
rename to devel/libtool/patches/patch-configure
index 799224cccf55b..1cc27fec7a6b3 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-configure
@@ -1,17 +1,30 @@
 $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 
---- configure.orig	2016-03-10 10:28:17.598171804 +0000
+Automatically generated using manual-* patches and bootstrap.
+DO NOT MODIFY THIS PATCH MANUALLY!  YOUR CHANGES WILL BE LOST!
+
+--- configure.orig	2017-02-02 10:07:28.000000000 +0000
 +++ configure
-@@ -5335,7 +5335,7 @@ else
+@@ -5903,7 +5903,7 @@ else
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
--  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+  netbsd* | freebsd* | openbsd* | mirbsd* | darwin* | dragonfly*)
+-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
++  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd* | mirbsd*)
      # 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`
-@@ -5829,12 +5829,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -6001,6 +6001,9 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+ 
+ 
++unset CP
++unset MV
++unset RM
+ : ${CP="cp -f"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+@@ -6369,12 +6372,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -36,7 +49,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    ;;
  
  newos6*)
-@@ -5844,7 +5851,7 @@ newos6*)
+@@ -6384,7 +6394,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -44,8 +57,8 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$'
    ;;
  
- openbsd*)
-@@ -6473,7 +6480,7 @@ fi
+ openbsd* | bitrig*)
+@@ -7015,7 +7025,7 @@ fi
  
  case $host_os in
    darwin*)
@@ -54,7 +67,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    *)
      lock_old_archive_extraction=no ;;
  esac
-@@ -6562,7 +6569,7 @@ osf*)
+@@ -7104,7 +7114,7 @@ osf*)
    symcode='[BCDEGQRST]'
    ;;
  solaris*)
@@ -63,19 +76,19 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    ;;
  sco3.2v5*)
    symcode='[DT]'
-@@ -8493,7 +8500,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
-+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
- # Only perform the check for file, if the check method requires it
-@@ -8806,9 +8816,16 @@ lt_prog_compiler_static=
+@@ -7500,7 +7510,10 @@ func_cc_basename ()
+         *) break;;
+       esac
+     done
+-    func_cc_basename_result=`$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
++    func_cc_basename_result=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ }
+ 
+ # Check whether --enable-libtool-lock was given.
+@@ -9611,9 +9624,16 @@ lt_prog_compiler_static=
        ;;
  
      darwin* | rhapsody*)
@@ -93,7 +106,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      haiku*)
-@@ -8836,6 +8853,13 @@ lt_prog_compiler_static=
+@@ -9641,6 +9661,13 @@ lt_prog_compiler_static=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -107,7 +120,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -8988,6 +9012,15 @@ lt_prog_compiler_static=
+@@ -9818,6 +9845,15 @@ lt_prog_compiler_static=
        esac
        ;;
  
@@ -123,17 +136,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      newsos6)
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9063,6 +9096,9 @@ lt_prog_compiler_static=
+@@ -9893,6 +9929,9 @@ lt_prog_compiler_static=
  
  case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
+   # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -9608,16 +9644,29 @@ _LT_EOF
+@@ -10471,16 +10510,29 @@ _LT_EOF
        fi
        ;;
  
@@ -143,17 +156,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 -	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'
++        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
--	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
+-	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
        ;;
  
@@ -169,17 +182,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
-@@ -10026,7 +10075,7 @@ fi
-   allow_undefined_flag="$_lt_dar_allow_undefined"
+@@ -10940,7 +10992,7 @@ fi
+   allow_undefined_flag=$_lt_dar_allow_undefined
    case $cc_basename in
-      ifort*) _lt_dar_can_shared=yes ;;
+      ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
-   if test "$_lt_dar_can_shared" = "yes"; then
+   if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -10238,15 +10287,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
-       link_all_deplibs=yes
+@@ -11162,15 +11214,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       esac
        ;;
  
 -    netbsd*)
@@ -212,7 +225,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      newsos6)
-@@ -10258,6 +10320,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -11182,6 +11247,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -223,8 +236,8 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +      hardcode_shlibpath_var=no
        ;;
  
-     openbsd*)
-@@ -11031,7 +11098,7 @@ dgux*)
+     openbsd* | bitrig*)
+@@ -12026,7 +12096,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -233,24 +246,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -11045,7 +11112,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-@@ -11068,13 +11135,24 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
--  *) # from 4.6 on, and DragonFly
-+  *) # from 4.6 on
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
+@@ -12071,6 +12141,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -265,15 +261,15 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +  hardcode_into_libs=yes
 +  ;;
 +
- gnu*)
+ haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -11162,12 +11240,7 @@ interix[3-9]*)
+@@ -12148,12 +12229,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
+-	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
@@ -282,7 +278,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -11266,19 +11339,36 @@ fi
+@@ -12277,19 +12353,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -315,12 +311,12 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    need_lib_prefix=no
    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$shared_ext$versuffix'
 -    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'
+-    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
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -329,25 +325,25 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -11304,7 +11394,7 @@ newsos6)
+@@ -12315,7 +12408,7 @@ newsos6)
    ;;
  
- openbsd*)
+ openbsd* | bitrig*)
 -  version_type=sunos
 +  version_type=linux
-   sys_lib_dlsearch_path_spec="/usr/lib"
+   sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -11312,7 +11402,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-     *)				need_version=no  ;;
-   esac
--  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 test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+@@ -12323,7 +12416,7 @@ openbsd* | bitrig*)
+   else
+     need_version=yes
+   fi
+-  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}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -12847,6 +12937,9 @@ else
+   shlibpath_overrides_runpath=yes
+@@ -13900,6 +13993,9 @@ else
      # at 6.2 and later dlopen does load deplibs.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
@@ -357,39 +353,27 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    netbsd*)
      lt_cv_sys_dlopen_deplibs=yes
      ;;
-@@ -13536,9 +13629,7 @@ func_stripname_cnf ()
+@@ -14589,9 +14685,7 @@ func_stripname_cnf ()
    esac
  } # func_stripname_cnf
  
--      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 no != "$CXX" &&
+-    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test g++ != "$CXX"))); 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'
-@@ -13786,7 +13877,10 @@ $RM -r conftest*
-     *) 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
-+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
-   if test -n "$compiler"; then
-@@ -14282,7 +14376,7 @@ fi
-   allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+@@ -15376,7 +15470,7 @@ fi
+   allow_undefined_flag_CXX=$_lt_dar_allow_undefined
    case $cc_basename in
-      ifort*) _lt_dar_can_shared=yes ;;
+      ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
-   if test "$_lt_dar_can_shared" = "yes"; then
+   if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -14651,6 +14745,22 @@ fi
+@@ -15770,6 +15864,22 @@ fi
          ld_shlibs_CXX=no
  	;;
  
@@ -412,7 +396,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        mvs*)
          case $cc_basename in
            cxx*)
-@@ -14665,15 +14775,13 @@ fi
+@@ -15784,15 +15894,13 @@ fi
  	;;
  
        netbsd*)
@@ -435,63 +419,25 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
  	;;
  
        *nto* | *qnx*)
-@@ -14852,27 +14960,14 @@ fi
+@@ -15966,7 +16074,7 @@ fi
  	    # GNU C++ compiler with Solaris linker
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+ 	    if test yes,no = "$GXX,$with_gnu_ld"; 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_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'
--
--	        # Commands to make compiler produce verbose output that lists
--	        # what "hidden" libraries, object files and flags are used when
--	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
--	      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_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'
--
--	        # Commands to make compiler produce verbose output that lists
--	        # what "hidden" libraries, object files and flags are used when
--	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
--	      fi
-+	      archive_cmds_CXX='$CC -shared $pic_flag $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 ${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
-+	      # linking a shared library.
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- 
- 	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
- 	      case $host_os in
-@@ -15014,13 +15109,11 @@ if { { eval echo "\"\$as_me\":${as_linen
-     case ${prev}${p} in
- 
-     -L* | -R* | -l*)
--       # Some compilers place space between "-{L,R}" and the path.
--       # Remove the space.
--       if test $p = "-L" ||
--          test $p = "-R"; then
--	 prev=$p
--	 continue
--       fi
-+       # Some compilers place space between "-{L,R,l}" and the path or
-+       # library.  Remove the space.
-+       case $p in
-+       -L|-R|-l) prev=$p; continue ;;
-+       esac
- 
-        # Expand the sysroot to ease extracting the directories later.
-        if test -z "$prev"; then
-@@ -15236,9 +15329,15 @@ lt_prog_compiler_static_CXX=
-       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++	      if true; then
+ 	        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 $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+@@ -16131,6 +16239,7 @@ if { { eval echo "\"\$as_me\":${as_linen
+        # Some compilers place space between "-{L,R}" and the path.
+        # Remove the space.
+        if test x-L = "$p" ||
++          test x-l = "$p" ||
+           test x-R = "$p"; then
+ 	 prev=$p
+ 	 continue
+@@ -16311,9 +16420,15 @@ lt_prog_compiler_static_CXX=
+       esac
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -507,7 +453,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -15316,6 +15415,9 @@ lt_prog_compiler_static_CXX=
+@@ -16391,6 +16506,9 @@ lt_prog_compiler_static_CXX=
  	    ;;
  	esac
  	;;
@@ -517,17 +463,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -15513,6 +15615,9 @@ lt_prog_compiler_static_CXX=
+@@ -16588,6 +16706,9 @@ lt_prog_compiler_static_CXX=
  
  case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
+   # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_CXX=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_CXX=
      ;;
-@@ -16184,7 +16289,7 @@ dgux*)
+@@ -17315,7 +17436,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -536,24 +482,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -16198,7 +16303,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-@@ -16221,13 +16326,24 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
--  *) # from 4.6 on, and DragonFly
-+  *) # from 4.6 on
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
+@@ -17360,6 +17481,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -568,15 +497,15 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +  hardcode_into_libs=yes
 +  ;;
 +
- gnu*)
+ haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -16315,12 +16431,7 @@ interix[3-9]*)
+@@ -17437,12 +17569,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
+-	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
@@ -585,7 +514,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -16419,19 +16530,36 @@ fi
+@@ -17566,19 +17693,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -618,12 +547,12 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    need_lib_prefix=no
    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$shared_ext$versuffix'
 -    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'
+-    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
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -632,37 +561,25 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -16457,7 +16585,7 @@ newsos6)
+@@ -17604,7 +17748,7 @@ newsos6)
    ;;
  
- openbsd*)
+ openbsd* | bitrig*)
 -  version_type=sunos
 +  version_type=linux
-   sys_lib_dlsearch_path_spec="/usr/lib"
+   sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16465,7 +16593,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-     *)				need_version=no  ;;
-   esac
--  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 test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+@@ -17612,7 +17756,7 @@ openbsd* | bitrig*)
+   else
+     need_version=yes
+   fi
+-  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}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -17039,7 +17167,10 @@ $RM -r conftest*
-     *) 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
-+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   GCC=$G77
-   if test -n "$compiler"; then
-@@ -17131,9 +17262,16 @@ lt_prog_compiler_static_F77=
+   shlibpath_overrides_runpath=yes
+@@ -18303,9 +18447,16 @@ lt_prog_compiler_static_F77=
        ;;
  
      darwin* | rhapsody*)
@@ -680,7 +597,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      haiku*)
-@@ -17161,6 +17299,13 @@ lt_prog_compiler_static_F77=
+@@ -18333,6 +18484,13 @@ lt_prog_compiler_static_F77=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -694,7 +611,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -17313,6 +17458,15 @@ lt_prog_compiler_static_F77=
+@@ -18510,6 +18668,15 @@ lt_prog_compiler_static_F77=
        esac
        ;;
  
@@ -710,17 +627,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      newsos6)
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -17388,6 +17542,9 @@ lt_prog_compiler_static_F77=
+@@ -18585,6 +18752,9 @@ lt_prog_compiler_static_F77=
  
  case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
+   # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_F77=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_F77=
      ;;
-@@ -17918,16 +18075,29 @@ _LT_EOF
+@@ -19148,16 +19318,29 @@ _LT_EOF
        fi
        ;;
  
@@ -730,17 +647,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 -	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'
++        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
--	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
+-	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
        ;;
  
@@ -756,17 +673,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
-@@ -18324,7 +18494,7 @@ fi
-   allow_undefined_flag_F77="$_lt_dar_allow_undefined"
+@@ -19605,7 +19788,7 @@ fi
+   allow_undefined_flag_F77=$_lt_dar_allow_undefined
    case $cc_basename in
-      ifort*) _lt_dar_can_shared=yes ;;
+      ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
-   if test "$_lt_dar_can_shared" = "yes"; then
+   if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -18498,15 +18668,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
-       link_all_deplibs_F77=yes
+@@ -19789,15 +19972,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       esac
        ;;
  
 -    netbsd*)
@@ -799,7 +716,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      newsos6)
-@@ -18518,6 +18701,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -19809,6 +20005,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -810,8 +727,8 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +      hardcode_shlibpath_var_F77=no
        ;;
  
-     openbsd*)
-@@ -19126,7 +19314,7 @@ dgux*)
+     openbsd* | bitrig*)
+@@ -20481,7 +20682,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -820,24 +737,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -19140,7 +19328,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-@@ -19163,13 +19351,24 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
--  *) # from 4.6 on, and DragonFly
-+  *) # from 4.6 on
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
+@@ -20526,6 +20727,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -852,15 +752,15 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +  hardcode_into_libs=yes
 +  ;;
 +
- gnu*)
+ haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -19257,12 +19456,7 @@ interix[3-9]*)
+@@ -20603,12 +20815,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
+-	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
@@ -869,7 +769,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -19355,19 +19549,36 @@ fi
+@@ -20726,19 +20933,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -902,12 +802,12 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    need_lib_prefix=no
    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$shared_ext$versuffix'
 -    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'
+-    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
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -916,56 +816,33 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -19393,7 +19604,7 @@ newsos6)
+@@ -20764,7 +20988,7 @@ newsos6)
    ;;
  
- openbsd*)
+ openbsd* | bitrig*)
 -  version_type=sunos
 +  version_type=linux
-   sys_lib_dlsearch_path_spec="/usr/lib"
+   sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -19401,7 +19612,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-     *)				need_version=no  ;;
-   esac
--  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 test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+@@ -20772,7 +20996,7 @@ openbsd* | bitrig*)
+   else
+     need_version=yes
+   fi
+-  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}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -19966,7 +20177,10 @@ $RM -r conftest*
-     *) 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
-+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
-   if test -n "$compiler"; then
-@@ -20052,13 +20266,11 @@ if { { eval echo "\"\$as_me\":${as_linen
-     case ${prev}${p} in
- 
-     -L* | -R* | -l*)
--       # Some compilers place space between "-{L,R}" and the path.
--       # Remove the space.
--       if test $p = "-L" ||
--          test $p = "-R"; then
--	 prev=$p
--	 continue
--       fi
-+       # Some compilers place space between "-{L,R,l}" and the path or
-+       # library.  Remove the space.
-+       case $p in
-+       -L|-R|-l) prev=$p; continue ;;
-+       esac
- 
-        # Expand the sysroot to ease extracting the directories later.
-        if test -z "$prev"; then
-@@ -20203,9 +20415,16 @@ lt_prog_compiler_static_FC=
+   shlibpath_overrides_runpath=yes
+@@ -21450,6 +21674,7 @@ if { { eval echo "\"\$as_me\":${as_linen
+        # Some compilers place space between "-{L,R}" and the path.
+        # Remove the space.
+        if test x-L = "$p" ||
++          test x-l = "$p" ||
+           test x-R = "$p"; then
+ 	 prev=$p
+ 	 continue
+@@ -21604,9 +21829,16 @@ lt_prog_compiler_static_FC=
        ;;
  
      darwin* | rhapsody*)
@@ -983,7 +860,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      haiku*)
-@@ -20233,6 +20452,13 @@ lt_prog_compiler_static_FC=
+@@ -21634,6 +21866,13 @@ lt_prog_compiler_static_FC=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -997,7 +874,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -20385,6 +20611,15 @@ lt_prog_compiler_static_FC=
+@@ -21811,6 +22050,15 @@ lt_prog_compiler_static_FC=
        esac
        ;;
  
@@ -1013,17 +890,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      newsos6)
        lt_prog_compiler_pic_FC='-KPIC'
        lt_prog_compiler_static_FC='-Bstatic'
-@@ -20460,6 +20695,9 @@ lt_prog_compiler_static_FC=
+@@ -21886,6 +22134,9 @@ lt_prog_compiler_static_FC=
  
  case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
+   # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_FC=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_FC=
      ;;
-@@ -20990,16 +21228,29 @@ _LT_EOF
+@@ -22449,16 +22700,29 @@ _LT_EOF
        fi
        ;;
  
@@ -1033,17 +910,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 -	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'
++        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
--	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
+-	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
        ;;
  
@@ -1059,17 +936,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_FC=no
-@@ -21396,7 +21647,7 @@ fi
-   allow_undefined_flag_FC="$_lt_dar_allow_undefined"
+@@ -22906,7 +23170,7 @@ fi
+   allow_undefined_flag_FC=$_lt_dar_allow_undefined
    case $cc_basename in
-      ifort*) _lt_dar_can_shared=yes ;;
+      ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
-   if test "$_lt_dar_can_shared" = "yes"; then
+   if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -21570,15 +21821,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
-       link_all_deplibs_FC=yes
+@@ -23090,15 +23354,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       esac
        ;;
  
 -    netbsd*)
@@ -1102,7 +979,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      newsos6)
-@@ -21590,6 +21854,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -23110,6 +23387,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -1113,8 +990,8 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +      hardcode_shlibpath_var_FC=no
        ;;
  
-     openbsd*)
-@@ -22198,7 +22467,7 @@ dgux*)
+     openbsd* | bitrig*)
+@@ -23782,7 +24064,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -1123,24 +1000,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -22212,7 +22481,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-@@ -22235,13 +22504,24 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
--  *) # from 4.6 on, and DragonFly
-+  *) # from 4.6 on
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
+@@ -23827,6 +24109,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -1155,15 +1015,15 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +  hardcode_into_libs=yes
 +  ;;
 +
- gnu*)
+ haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -22329,12 +22609,7 @@ interix[3-9]*)
+@@ -23904,12 +24197,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
+-	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
@@ -1172,7 +1032,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -22427,19 +22702,36 @@ fi
+@@ -24027,19 +24315,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -1205,12 +1065,12 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    need_lib_prefix=no
    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$shared_ext$versuffix'
 -    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'
+-    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
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -1219,37 +1079,25 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -22465,7 +22757,7 @@ newsos6)
+@@ -24065,7 +24370,7 @@ newsos6)
    ;;
  
- openbsd*)
+ openbsd* | bitrig*)
 -  version_type=sunos
 +  version_type=linux
-   sys_lib_dlsearch_path_spec="/usr/lib"
+   sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -22473,7 +22765,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-     *)				need_version=no  ;;
-   esac
--  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 test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+@@ -24073,7 +24378,7 @@ openbsd* | bitrig*)
+   else
+     need_version=yes
+   fi
+-  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}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -22883,7 +23175,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
-+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 +23298,16 @@ lt_prog_compiler_static_GO=
+   shlibpath_overrides_runpath=yes
+@@ -24624,9 +24929,16 @@ lt_prog_compiler_static_GO=
        ;;
  
      darwin* | rhapsody*)
@@ -1267,7 +1115,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      haiku*)
-@@ -23033,6 +23335,13 @@ lt_prog_compiler_static_GO=
+@@ -24654,6 +24966,13 @@ lt_prog_compiler_static_GO=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -1281,7 +1129,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -23185,6 +23494,15 @@ lt_prog_compiler_static_GO=
+@@ -24831,6 +25150,15 @@ lt_prog_compiler_static_GO=
        esac
        ;;
  
@@ -1297,17 +1145,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      newsos6)
        lt_prog_compiler_pic_GO='-KPIC'
        lt_prog_compiler_static_GO='-Bstatic'
-@@ -23260,6 +23578,9 @@ lt_prog_compiler_static_GO=
+@@ -24906,6 +25234,9 @@ lt_prog_compiler_static_GO=
  
  case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
+   # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_GO=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_GO=
      ;;
-@@ -23790,16 +24111,29 @@ _LT_EOF
+@@ -25469,16 +25800,29 @@ _LT_EOF
        fi
        ;;
  
@@ -1317,17 +1165,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 -	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'
++        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
+-	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
        ;;
  
@@ -1343,17 +1191,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GO=no
-@@ -24208,7 +24542,7 @@ fi
-   allow_undefined_flag_GO="$_lt_dar_allow_undefined"
+@@ -25938,7 +26282,7 @@ fi
+   allow_undefined_flag_GO=$_lt_dar_allow_undefined
    case $cc_basename in
-      ifort*) _lt_dar_can_shared=yes ;;
+      ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
-   if test "$_lt_dar_can_shared" = "yes"; then
+   if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -24381,15 +24715,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
-       link_all_deplibs_GO=yes
+@@ -26121,15 +26465,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       esac
        ;;
  
 -    netbsd*)
@@ -1386,7 +1234,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      newsos6)
-@@ -24401,6 +24748,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -26141,6 +26498,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -1397,20 +1245,8 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +      hardcode_shlibpath_var_GO=no
        ;;
  
-     openbsd*)
-@@ -24980,7 +25332,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
-+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- 
- # GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -25100,9 +25455,16 @@ lt_prog_compiler_static_GCJ=
+     openbsd* | bitrig*)
+@@ -26851,9 +27213,16 @@ lt_prog_compiler_static_GCJ=
        ;;
  
      darwin* | rhapsody*)
@@ -1428,7 +1264,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      haiku*)
-@@ -25130,6 +25492,13 @@ lt_prog_compiler_static_GCJ=
+@@ -26881,6 +27250,13 @@ lt_prog_compiler_static_GCJ=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -1442,7 +1278,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -25282,6 +25651,15 @@ lt_prog_compiler_static_GCJ=
+@@ -27058,6 +27434,15 @@ lt_prog_compiler_static_GCJ=
        esac
        ;;
  
@@ -1458,17 +1294,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      newsos6)
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -25357,6 +25735,9 @@ lt_prog_compiler_static_GCJ=
+@@ -27133,6 +27518,9 @@ lt_prog_compiler_static_GCJ=
  
  case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
+   # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic_GCJ=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
      ;;
-@@ -25887,16 +26268,29 @@ _LT_EOF
+@@ -27696,16 +28084,29 @@ _LT_EOF
        fi
        ;;
  
@@ -1478,17 +1314,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 -	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'
++        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
--	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
+-	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
        ;;
  
@@ -1504,17 +1340,17 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
-@@ -26305,7 +26699,7 @@ fi
-   allow_undefined_flag_GCJ="$_lt_dar_allow_undefined"
+@@ -28165,7 +28566,7 @@ fi
+   allow_undefined_flag_GCJ=$_lt_dar_allow_undefined
    case $cc_basename in
-      ifort*) _lt_dar_can_shared=yes ;;
+      ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
-   if test "$_lt_dar_can_shared" = "yes"; then
+   if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -26478,15 +26872,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
-       link_all_deplibs_GCJ=yes
+@@ -28348,15 +28749,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       esac
        ;;
  
 -    netbsd*)
@@ -1547,7 +1383,7 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      newsos6)
-@@ -26498,6 +26905,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -28368,6 +28782,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -1558,16 +1394,16 @@ $NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $
 +      hardcode_shlibpath_var_GCJ=no
        ;;
  
-     openbsd*)
-@@ -27075,7 +27487,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
-+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
- lt_cv_prog_compiler_c_o_RC=yes
+     openbsd* | bitrig*)
+@@ -31933,7 +32352,10 @@ func_cc_basename ()
+         *) break;;
+       esac
+     done
+-    func_cc_basename_result=`$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
++    func_cc_basename_result=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ }
+ 
  
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-libltdl_configure
similarity index 68%
rename from devel/libtool/patches/patch-ad
rename to devel/libtool/patches/patch-libltdl_configure
index bce443e75cd22..d141c3ca8748e 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-libltdl_configure
@@ -1,17 +1,30 @@
 $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
 
---- libltdl/configure.orig	2016-03-10 10:28:17.599514319 +0000
+Automatically generated using manual-* patches and bootstrap.
+DO NOT MODIFY THIS PATCH MANUALLY!  YOUR CHANGES WILL BE LOST!
+
+--- libltdl/configure.orig	2017-02-02 10:07:29.000000000 +0000
 +++ libltdl/configure
-@@ -4548,7 +4548,7 @@ else
+@@ -4788,7 +4788,7 @@ else
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
--  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+  netbsd* | freebsd* | openbsd* | mirbsd* | darwin* | dragonfly*)
+-  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
++  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd* | mirbsd*)
      # This has been around since 386BSD, at least.  Likely further.
      if test -x /sbin/sysctl; then
        lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -5042,12 +5042,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -4886,6 +4886,9 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+ 
+ 
++unset CP
++unset MV
++unset RM
+ : ${CP="cp -f"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+@@ -5254,12 +5257,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -36,7 +49,7 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
    ;;
  
  newos6*)
-@@ -5057,7 +5064,7 @@ newos6*)
+@@ -5269,7 +5279,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -44,8 +57,8 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
 +  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$'
    ;;
  
- openbsd*)
-@@ -5686,7 +5693,7 @@ fi
+ openbsd* | bitrig*)
+@@ -5901,7 +5911,7 @@ fi
  
  case $host_os in
    darwin*)
@@ -54,7 +67,7 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
    *)
      lock_old_archive_extraction=no ;;
  esac
-@@ -5775,7 +5782,7 @@ osf*)
+@@ -5990,7 +6000,7 @@ osf*)
    symcode='[BCDEGQRST]'
    ;;
  solaris*)
@@ -63,19 +76,19 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
    ;;
  sco3.2v5*)
    symcode='[DT]'
-@@ -7843,7 +7850,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
-+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
+@@ -6386,7 +6396,10 @@ func_cc_basename ()
+         *) break;;
+       esac
+     done
+-    func_cc_basename_result=`$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
++    func_cc_basename_result=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ }
  
- # Only perform the check for file, if the check method requires it
-@@ -8156,9 +8166,16 @@ lt_prog_compiler_static=
+ # Check whether --enable-libtool-lock was given.
+@@ -8635,9 +8648,16 @@ lt_prog_compiler_static=
        ;;
  
      darwin* | rhapsody*)
@@ -93,7 +106,7 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      haiku*)
-@@ -8186,6 +8203,13 @@ lt_prog_compiler_static=
+@@ -8665,6 +8685,13 @@ lt_prog_compiler_static=
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -107,7 +120,7 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -8338,6 +8362,15 @@ lt_prog_compiler_static=
+@@ -8842,6 +8869,15 @@ lt_prog_compiler_static=
        esac
        ;;
  
@@ -123,17 +136,17 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
      newsos6)
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -8413,6 +8446,9 @@ lt_prog_compiler_static=
+@@ -8917,6 +8953,9 @@ lt_prog_compiler_static=
  
  case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
+   # For platforms that do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    lt_prog_compiler_pic=
 +    ;;
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -8958,16 +8994,29 @@ _LT_EOF
+@@ -9495,16 +9534,29 @@ _LT_EOF
        fi
        ;;
  
@@ -143,17 +156,17 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
 -	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'
++        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
--	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
+-	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
        ;;
  
@@ -169,17 +182,17 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
-@@ -9376,7 +9425,7 @@ fi
-   allow_undefined_flag="$_lt_dar_allow_undefined"
+@@ -9964,7 +10016,7 @@ fi
+   allow_undefined_flag=$_lt_dar_allow_undefined
    case $cc_basename in
-      ifort*) _lt_dar_can_shared=yes ;;
+      ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 -     *) _lt_dar_can_shared=$GCC ;;
 +     *) _lt_dar_can_shared=yes ;;
    esac
-   if test "$_lt_dar_can_shared" = "yes"; then
+   if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -9588,15 +9637,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
-       link_all_deplibs=yes
+@@ -10186,15 +10238,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+       esac
        ;;
  
 -    netbsd*)
@@ -212,7 +225,7 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
        ;;
  
      newsos6)
-@@ -9608,6 +9670,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -10206,6 +10271,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -223,8 +236,8 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
 +      hardcode_shlibpath_var=no
        ;;
  
-     openbsd*)
-@@ -10381,7 +10448,7 @@ dgux*)
+     openbsd* | bitrig*)
+@@ -11050,7 +11120,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -233,24 +246,7 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -10395,7 +10462,7 @@ freebsd* | dragonfly*)
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-@@ -10418,13 +10485,24 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
--  *) # from 4.6 on, and DragonFly
-+  *) # from 4.6 on
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
+@@ -11095,6 +11165,17 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -265,15 +261,15 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
 +  hardcode_into_libs=yes
 +  ;;
 +
- gnu*)
+ haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -10512,12 +10590,7 @@ interix[3-9]*)
+@@ -11172,12 +11253,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
+-	if test yes = "$lt_cv_prog_gnu_ld"; then
 -		version_type=linux # correct to gnu/linux during the next big refactor
 -	else
 -		version_type=irix
@@ -282,7 +278,7 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -10616,19 +10689,36 @@ fi
+@@ -11301,19 +11377,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -315,12 +311,12 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
    need_lib_prefix=no
    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$shared_ext$versuffix'
 -    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'
+-    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
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -329,25 +325,25 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -10654,7 +10744,7 @@ newsos6)
+@@ -11339,7 +11432,7 @@ newsos6)
    ;;
  
- openbsd*)
+ openbsd* | bitrig*)
 -  version_type=sunos
 +  version_type=linux
-   sys_lib_dlsearch_path_spec="/usr/lib"
+   sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -10662,7 +10752,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-     *)				need_version=no  ;;
-   esac
--  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 test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+@@ -11347,7 +11440,7 @@ openbsd* | bitrig*)
+   else
+     need_version=yes
+   fi
+-  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}'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -12196,6 +12286,9 @@ else
+   shlibpath_overrides_runpath=yes
+@@ -12923,6 +13016,9 @@ else
      # at 6.2 and later dlopen does load deplibs.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
@@ -357,3 +353,15 @@ $NetBSD: patch-ad,v 1.46 2016/03/10 12:43:48 tnn Exp $
    netbsd*)
      lt_cv_sys_dlopen_deplibs=yes
      ;;
+@@ -15440,7 +15536,10 @@ func_cc_basename ()
+         *) break;;
+       esac
+     done
+-    func_cc_basename_result=`$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
++    func_cc_basename_result=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ }
+ 
+