Add MirBSD support to libtool. The patches are based on the ones from MirPorts,

which uses libtool-1.5.

Reviewed by Alistair G Crooks.

6 files changed, 649 insertions, 145 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 475daec9cc9..f7f50335ce7 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.81 2011/03/23 15:46:36 obache Exp $
+$NetBSD: distinfo,v 1.82 2011/05/14 16:49:45 bsiegert Exp $
 
 SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55
 RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef
 Size (libtool-2.2.6b.tar.gz) = 2347317 bytes
 SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751
-SHA1 (patch-ab) = 5944c9a00a964c08e37734af177763f81fa15fb8
-SHA1 (patch-ac) = 95e9aed6036cd98075af6fed4a53ecdd58e1e84c
-SHA1 (patch-ad) = b2a60570d0eec011adc4a662249fd22975487d86
+SHA1 (patch-ab) = 82af69aabcf095bc6eebbaf36ff04e9bd430c48b
+SHA1 (patch-ac) = d4d6987ea14180891737a3defa37689d7c35853e
+SHA1 (patch-ad) = 8bc1435f5b271453b95b766f2d7fe999da5084d3
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 29fa4f9e9a8..b08c3dec6cd 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
+$NetBSD: manual-libtool.m4,v 1.32 2011/05/14 16:49:45 bsiegert Exp $
 
 --- libltdl/m4/libtool.m4.orig	2009-11-16 13:11:59.000000000 +0000
 +++ libltdl/m4/libtool.m4
@@ -14,7 +14,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
  ])
  
  
-@@ -1527,6 +1530,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+@@ -1527,13 +1530,20 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -28,6 +28,14 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  netbsd* | freebsd* | openbsd* | mirbsd* | darwin* | dragonfly*)
+     # This has been around since 386BSD, at least.  Likely further.
+     if test -x /sbin/sysctl; then
+       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
 @@ -2189,6 +2199,7 @@ beos*)
  bsdi[[45]]*)
    version_type=linux
@@ -116,9 +124,33 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -2486,15 +2514,14 @@ linux* | k*bsd*-gnu)
+@@ -2485,16 +2513,38 @@ linux* | k*bsd*-gnu)
+   dynamic_linker='GNU/Linux ld.so'
    ;;
  
++midnightbsd*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++mirbsd*)
++  version_type=linux
++  sys_lib_search_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
@@ -135,7 +167,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -2523,7 +2550,7 @@ newsos6)
+@@ -2523,7 +2573,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -144,7 +176,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -2531,7 +2558,7 @@ openbsd*)
+@@ -2531,7 +2581,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -153,7 +185,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -3038,6 +3065,10 @@ gnu*)
+@@ -3038,6 +3088,10 @@ gnu*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -164,7 +196,25 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
    case $host_cpu in
-@@ -3091,7 +3122,7 @@ newos6*)
+@@ -3076,6 +3130,17 @@ linux* | k*bsd*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++midnightbsd*)
++  # might to use match_pattern like MirBSD, but there is no well-defined
++  # naming scheme for libraries yet, as the current one is deprecated, and
++  # the new one in a state of flux especially between mports and MirPorts
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++mirbsd*)
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
++  ;;
++
+ netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+@@ -3091,7 +3156,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -173,7 +223,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
    ;;
  
  openbsd*)
-@@ -3256,7 +3287,7 @@ AC_DEFUN([LT_LIB_M],
+@@ -3256,7 +3321,7 @@ AC_DEFUN([LT_LIB_M],
  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
  LIBM=
  case $host in
@@ -182,7 +232,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
    # These system don't have libm, or don't need it
    ;;
  *-ncr-sysv4.3*)
-@@ -3580,14 +3611,25 @@ m4_if([$1], [CXX], [
+@@ -3580,14 +3645,25 @@ m4_if([$1], [CXX], [
  	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
        ;;
      darwin* | rhapsody*)
@@ -209,7 +259,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
      interix[[3-9]]*)
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
-@@ -3650,6 +3692,9 @@ m4_if([$1], [CXX], [
+@@ -3650,6 +3726,9 @@ m4_if([$1], [CXX], [
  	    ;;
  	esac
  	;;
@@ -219,7 +269,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -3888,9 +3933,17 @@ m4_if([$1], [CXX], [
+@@ -3888,9 +3967,17 @@ m4_if([$1], [CXX], [
        ;;
  
      darwin* | rhapsody*)
@@ -238,7 +288,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
        ;;
  
      hpux*)
-@@ -3912,6 +3965,13 @@ m4_if([$1], [CXX], [
+@@ -3912,6 +3999,13 @@ m4_if([$1], [CXX], [
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -252,7 +302,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -4110,6 +4170,9 @@ m4_if([$1], [CXX], [
+@@ -4110,6 +4204,9 @@ m4_if([$1], [CXX], [
  ])
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -262,7 +312,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
    *djgpp*)
      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;
-@@ -4343,6 +4406,11 @@ _LT_EOF
+@@ -4343,6 +4440,11 @@ _LT_EOF
        fi
        ;;
  
@@ -274,7 +324,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
      interix[[3-9]]*)
        _LT_TAGVAR(hardcode_direct, $1)=no
        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4429,7 +4497,7 @@ _LT_EOF
+@@ -4429,7 +4531,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -283,7 +333,40 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -4861,6 +4929,8 @@ _LT_EOF
+@@ -4735,6 +4837,11 @@ _LT_EOF
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
++      haiku*)
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(link_all_deplibs, $1)=yes
++        ;;
++
+     hpux9*)
+       if test "$GCC" = yes; then
+ 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+@@ -4841,6 +4948,20 @@ _LT_EOF
+       _LT_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	_LT_TAGVAR(hardcode_direct, $1)=yes
++	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -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(ld_shlibs, $1)=no
++      fi
++      ;;
++
+     netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+@@ -4861,6 +4982,8 @@ _LT_EOF
        ;;
  
      *nto* | *qnx*)
@@ -292,7 +375,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
        ;;
  
      openbsd*)
-@@ -5318,9 +5388,7 @@ m4_defun([_LT_PROG_CXX],
+@@ -5318,9 +5441,7 @@ m4_defun([_LT_PROG_CXX],
  [
  pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
  AC_PROG_CXX
@@ -303,19 +386,30 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
    AC_PROG_CXXCPP
  else
    _lt_caught_CXX_error=yes
-@@ -5685,6 +5753,11 @@ if test "$_lt_caught_CXX_error" != yes; 
-       gnu*)
-         ;;
+@@ -5993,6 +6114,22 @@ if test "$_lt_caught_CXX_error" != yes; 
+         _LT_TAGVAR(ld_shlibs, $1)=no
+ 	;;
  
-+      haiku*)
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(link_all_deplibs, $1)=yes
-+        ;;
++      mirbsd*)
++	if test -f /usr/libexec/ld.so; then
++	  _LT_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	  output_verbose_link_cmd='echo'
++	else
++	  _LT_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
 +
-       hpux9*)
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -6008,18 +6081,37 @@ if test "$_lt_caught_CXX_error" != yes; 
+       mvs*)
+         case $cc_basename in
+           cxx*)
+@@ -6008,18 +6145,37 @@ if test "$_lt_caught_CXX_error" != yes; 
  
        netbsd*)
          if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
@@ -357,7 +451,7 @@ $NetBSD: manual-libtool.m4,v 1.31 2011/03/23 15:46:36 obache Exp $
  	;;
  
        openbsd2*)
-@@ -6481,6 +6573,11 @@ $RM -f confest.$objext
+@@ -6481,6 +6637,11 @@ $RM -f confest.$objext
  # PORTME: override above test on systems where it is broken
  m4_if([$1], [CXX],
  [case $host_os in
diff --git a/devel/libtool/patches/manual-ltdl.m4 b/devel/libtool/patches/manual-ltdl.m4
new file mode 100644
index 00000000000..9e9aeddbbdc
--- /dev/null
+++ b/devel/libtool/patches/manual-ltdl.m4
@@ -0,0 +1,14 @@
+$NetBSD: manual-ltdl.m4,v 1.4 2011/05/14 16:49:45 bsiegert Exp $
+
+--- libltdl/m4/ltdl.m4.orig	2009-11-16 14:11:59.000000000 +0100
++++ libltdl/m4/ltdl.m4	2010-12-30 17:04:01.000000000 +0100
+@@ -487,6 +487,9 @@
+     # at 6.2 and later dlopen does load deplibs.
+     lt_cv_sys_dlopen_deplibs=yes
+     ;;
++  mirbsd*)
++    lt_cv_sys_dlopen_deplibs=yes
++    ;;
+   netbsd*)
+     lt_cv_sys_dlopen_deplibs=yes
+     ;;
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index e0465386ca8..78a39f7c373 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.69 2011/03/23 15:46:36 obache Exp $
+$NetBSD: patch-ab,v 1.70 2011/05/14 16:49:45 bsiegert Exp $
 
 The last two chunks work around bugs in ksh on NetBSD.
 The problem manifests with wl and no_builtin_flag containing newlines.
 
---- configure.orig	2010-06-19 07:24:20.000000000 +0000
+--- configure.orig	2011-04-14 15:39:05.000000000 +0000
 +++ configure
-@@ -5293,6 +5293,13 @@ else
+@@ -5293,13 +5293,20 @@ else
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -19,6 +19,14 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  netbsd* | freebsd* | openbsd* | mirbsd* | darwin* | dragonfly*)
+     # This has been around since 386BSD, at least.  Likely further.
+     if test -x /sbin/sysctl; then
+       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
 @@ -5665,6 +5672,10 @@ gnu*)
    lt_cv_deplibs_check_method=pass_all
    ;;
@@ -30,7 +38,25 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
    case $host_cpu in
-@@ -5718,7 +5729,7 @@ newos6*)
+@@ -5703,6 +5714,17 @@ linux* | k*bsd*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++midnightbsd*)
++  # might to use match_pattern like MirBSD, but there is no well-defined
++  # naming scheme for libraries yet, as the current one is deprecated, and
++  # the new one in a state of flux especially between mports and MirPorts
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++mirbsd*)
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
++  ;;
++
+ netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+@@ -5718,7 +5740,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -39,7 +65,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    ;;
  
  openbsd*)
-@@ -7900,7 +7911,10 @@ for cc_temp in $compiler""; do
+@@ -7900,7 +7922,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -51,7 +77,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
  # Only perform the check for file, if the check method requires it
-@@ -8210,9 +8224,17 @@ $as_echo_n "checking for $compiler optio
+@@ -8210,9 +8235,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -70,7 +96,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      hpux*)
-@@ -8234,6 +8256,13 @@ $as_echo_n "checking for $compiler optio
+@@ -8234,6 +8267,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -84,7 +110,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -8431,6 +8460,9 @@ $as_echo_n "checking for $compiler optio
+@@ -8431,6 +8471,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -94,7 +120,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -8844,6 +8876,11 @@ _LT_EOF
+@@ -8844,6 +8887,11 @@ _LT_EOF
        fi
        ;;
  
@@ -106,7 +132,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      interix[3-9]*)
        hardcode_direct=no
        hardcode_shlibpath_var=no
-@@ -8930,7 +8967,7 @@ _LT_EOF
+@@ -8930,7 +8978,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -115,7 +141,40 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -9450,6 +9487,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9317,6 +9365,11 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var=no
+       ;;
+ 
++      haiku*)
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        link_all_deplibs=yes
++        ;;
++
+     hpux9*)
+       if test "$GCC" = yes; then
+ 	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+@@ -9430,6 +9483,20 @@ rm -f core conftest.err conftest.$ac_obj
+       link_all_deplibs=yes
+       ;;
+ 
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	hardcode_direct_absolute=yes
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec='${wl}-E'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
+     netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+@@ -9450,6 +9517,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -124,7 +183,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      openbsd*)
-@@ -10064,6 +10103,7 @@ beos*)
+@@ -10064,6 +10133,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -132,7 +191,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -10165,9 +10205,7 @@ freebsd1*)
+@@ -10165,9 +10235,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -143,7 +202,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -10179,7 +10217,7 @@ freebsd* | dragonfly*)
+@@ -10179,7 +10247,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -152,7 +211,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -10202,13 +10240,24 @@ freebsd* | dragonfly*)
+@@ -10202,13 +10270,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -178,7 +237,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -10219,6 +10268,19 @@ gnu*)
+@@ -10219,6 +10298,19 @@ gnu*)
    hardcode_into_libs=yes
    ;;
  
@@ -198,7 +257,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -10280,12 +10342,7 @@ interix[3-9]*)
+@@ -10280,12 +10372,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -212,9 +271,33 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -10376,15 +10433,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10375,16 +10462,38 @@ rm -f core conftest.err conftest.$ac_obj
+   dynamic_linker='GNU/Linux ld.so'
    ;;
  
++midnightbsd*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++mirbsd*)
++  version_type=linux
++  sys_lib_search_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
@@ -231,7 +314,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10413,7 +10469,7 @@ newsos6)
+@@ -10413,7 +10522,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -240,7 +323,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -10421,7 +10477,7 @@ openbsd*)
+@@ -10421,7 +10530,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -249,7 +332,17 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -12587,9 +12643,7 @@ else
+@@ -11910,6 +12019,9 @@ else
+     # at 6.2 and later dlopen does load deplibs.
+     lt_cv_sys_dlopen_deplibs=yes
+     ;;
++  mirbsd*)
++    lt_cv_sys_dlopen_deplibs=yes
++    ;;
+   netbsd*)
+     lt_cv_sys_dlopen_deplibs=yes
+     ;;
+@@ -12587,9 +12699,7 @@ else
  fi
  
  
@@ -260,7 +353,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12836,7 +12890,10 @@ $RM -r conftest*
+@@ -12836,7 +12946,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -272,19 +365,30 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
    if test -n "$compiler"; then
-@@ -13305,6 +13362,11 @@ if test -z "$aix_libpath"; then aix_libp
-       gnu*)
-         ;;
+@@ -13613,6 +13726,22 @@ if test -z "$aix_libpath"; then aix_libp
+         ld_shlibs_CXX=no
+ 	;;
  
-+      haiku*)
-+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        link_all_deplibs_CXX=yes
-+        ;;
++      mirbsd*)
++	if test -f /usr/libexec/ld.so; then
++	  hardcode_direct_CXX=yes
++	  hardcode_shlibpath_var_CXX=no
++	  hardcode_direct_absolute_CXX=yes
++	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++	  archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_CXX='${wl}-E'
++	  whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	  output_verbose_link_cmd='echo'
++	else
++	  ld_shlibs_CXX=no
++	fi
++	;;
 +
-       hpux9*)
-         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-         hardcode_libdir_separator_CXX=:
-@@ -13628,18 +13690,37 @@ if test -z "$aix_libpath"; then aix_libp
+       mvs*)
+         case $cc_basename in
+           cxx*)
+@@ -13628,18 +13757,37 @@ if test -z "$aix_libpath"; then aix_libp
  
        netbsd*)
          if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
@@ -326,7 +430,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	;;
  
        openbsd2*)
-@@ -14036,6 +14117,11 @@ $RM -f confest.$objext
+@@ -14036,6 +14184,11 @@ $RM -f confest.$objext
  
  # PORTME: override above test on systems where it is broken
  case $host_os in
@@ -338,7 +442,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  interix[3-9]*)
    # Interix 3.5 installs completely hosed .la files for C++, so rather than
    # hack all around it, let's just trust "g++" to DTRT.
-@@ -14176,14 +14262,25 @@ $as_echo_n "checking for $compiler optio
+@@ -14176,14 +14329,25 @@ $as_echo_n "checking for $compiler optio
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -365,7 +469,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      interix[3-9]*)
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
-@@ -14246,6 +14343,9 @@ $as_echo_n "checking for $compiler optio
+@@ -14246,6 +14410,9 @@ $as_echo_n "checking for $compiler optio
  	    ;;
  	esac
  	;;
@@ -375,7 +479,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -14443,6 +14543,9 @@ $as_echo_n "checking for $compiler optio
+@@ -14443,6 +14610,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -385,7 +489,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_CXX=
      ;;
-@@ -14948,6 +15051,7 @@ beos*)
+@@ -14948,6 +15118,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -393,7 +497,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -15048,9 +15152,7 @@ freebsd1*)
+@@ -15048,9 +15219,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -404,7 +508,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -15062,7 +15164,7 @@ freebsd* | dragonfly*)
+@@ -15062,7 +15231,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -413,7 +517,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -15085,13 +15187,24 @@ freebsd* | dragonfly*)
+@@ -15085,13 +15254,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -439,7 +543,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -15102,6 +15215,19 @@ gnu*)
+@@ -15102,6 +15282,19 @@ gnu*)
    hardcode_into_libs=yes
    ;;
  
@@ -459,7 +563,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -15163,12 +15289,7 @@ interix[3-9]*)
+@@ -15163,12 +15356,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -473,9 +577,33 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15259,15 +15380,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -15258,16 +15446,38 @@ rm -f core conftest.err conftest.$ac_obj
+   dynamic_linker='GNU/Linux ld.so'
    ;;
  
++midnightbsd*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++mirbsd*)
++  version_type=linux
++  sys_lib_search_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
@@ -492,7 +620,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -15296,7 +15416,7 @@ newsos6)
+@@ -15296,7 +15506,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -501,7 +629,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -15304,7 +15424,7 @@ openbsd*)
+@@ -15304,7 +15514,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -510,7 +638,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -15877,7 +15997,10 @@ $RM -r conftest*
+@@ -15877,7 +16087,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -522,7 +650,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
    GCC=$G77
    if test -n "$compiler"; then
-@@ -15971,9 +16094,17 @@ $as_echo_n "checking for $compiler optio
+@@ -15971,9 +16184,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -541,7 +669,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      hpux*)
-@@ -15995,6 +16126,13 @@ $as_echo_n "checking for $compiler optio
+@@ -15995,6 +16216,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -555,7 +683,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16192,6 +16330,9 @@ $as_echo_n "checking for $compiler optio
+@@ -16192,6 +16420,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -565,7 +693,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_F77=
      ;;
-@@ -16590,6 +16731,11 @@ _LT_EOF
+@@ -16590,6 +16821,11 @@ _LT_EOF
        fi
        ;;
  
@@ -577,7 +705,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      interix[3-9]*)
        hardcode_direct_F77=no
        hardcode_shlibpath_var_F77=no
-@@ -16676,7 +16822,7 @@ _LT_EOF
+@@ -16676,7 +16912,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -586,7 +714,40 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -17183,6 +17329,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -17051,6 +17287,11 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var_F77=no
+       ;;
+ 
++      haiku*)
++        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        link_all_deplibs_F77=yes
++        ;;
++
+     hpux9*)
+       if test "$GCC" = yes; then
+ 	archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+@@ -17163,6 +17404,20 @@ rm -f core conftest.err conftest.$ac_obj
+       link_all_deplibs_F77=yes
+       ;;
+ 
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_F77=yes
++	hardcode_shlibpath_var_F77=no
++	hardcode_direct_absolute_F77=yes
++	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_F77='${wl}-E'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
+     netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+@@ -17183,6 +17438,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -595,7 +756,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      openbsd*)
-@@ -17644,6 +17792,7 @@ beos*)
+@@ -17644,6 +17901,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -603,7 +764,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -17744,9 +17893,7 @@ freebsd1*)
+@@ -17744,9 +18002,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -614,7 +775,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -17758,7 +17905,7 @@ freebsd* | dragonfly*)
+@@ -17758,7 +18014,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -623,7 +784,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -17781,13 +17928,24 @@ freebsd* | dragonfly*)
+@@ -17781,13 +18037,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -649,7 +810,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -17798,6 +17956,19 @@ gnu*)
+@@ -17798,6 +18065,19 @@ gnu*)
    hardcode_into_libs=yes
    ;;
  
@@ -669,7 +830,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -17859,12 +18030,7 @@ interix[3-9]*)
+@@ -17859,12 +18139,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -683,9 +844,33 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17949,15 +18115,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -17948,16 +18223,38 @@ rm -f core conftest.err conftest.$ac_obj
+   dynamic_linker='GNU/Linux ld.so'
    ;;
  
++midnightbsd*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++mirbsd*)
++  version_type=linux
++  sys_lib_search_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
@@ -702,7 +887,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17986,7 +18151,7 @@ newsos6)
+@@ -17986,7 +18283,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -711,7 +896,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -17994,7 +18159,7 @@ openbsd*)
+@@ -17994,7 +18291,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -720,7 +905,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -18557,7 +18722,10 @@ $RM -r conftest*
+@@ -18557,7 +18854,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -732,7 +917,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
    if test -n "$compiler"; then
-@@ -18776,9 +18944,17 @@ $as_echo_n "checking for $compiler optio
+@@ -18776,9 +19076,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -751,7 +936,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      hpux*)
-@@ -18800,6 +18976,13 @@ $as_echo_n "checking for $compiler optio
+@@ -18800,6 +19108,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -765,7 +950,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18997,6 +19180,9 @@ $as_echo_n "checking for $compiler optio
+@@ -18997,6 +19312,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -775,7 +960,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_FC=
      ;;
-@@ -19395,6 +19581,11 @@ _LT_EOF
+@@ -19395,6 +19713,11 @@ _LT_EOF
        fi
        ;;
  
@@ -787,7 +972,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      interix[3-9]*)
        hardcode_direct_FC=no
        hardcode_shlibpath_var_FC=no
-@@ -19481,7 +19672,7 @@ _LT_EOF
+@@ -19481,7 +19804,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -796,7 +981,40 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -19988,6 +20179,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -19856,6 +20179,11 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var_FC=no
+       ;;
+ 
++      haiku*)
++        archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        link_all_deplibs_FC=yes
++        ;;
++
+     hpux9*)
+       if test "$GCC" = yes; then
+ 	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+@@ -19968,6 +20296,20 @@ rm -f core conftest.err conftest.$ac_obj
+       link_all_deplibs_FC=yes
+       ;;
+ 
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_FC=yes
++	hardcode_shlibpath_var_FC=no
++	hardcode_direct_absolute_FC=yes
++	archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_FC='${wl}-E'
++      else
++	ld_shlibs_FC=no
++      fi
++      ;;
++
+     netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+@@ -19988,6 +20330,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -805,7 +1023,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      openbsd*)
-@@ -20449,6 +20642,7 @@ beos*)
+@@ -20449,6 +20793,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -813,7 +1031,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -20549,9 +20743,7 @@ freebsd1*)
+@@ -20549,9 +20894,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -824,7 +1042,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -20563,7 +20755,7 @@ freebsd* | dragonfly*)
+@@ -20563,7 +20906,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -833,7 +1051,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -20586,13 +20778,24 @@ freebsd* | dragonfly*)
+@@ -20586,13 +20929,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -859,7 +1077,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -20603,6 +20806,19 @@ gnu*)
+@@ -20603,6 +20957,19 @@ gnu*)
    hardcode_into_libs=yes
    ;;
  
@@ -879,7 +1097,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -20664,12 +20880,7 @@ interix[3-9]*)
+@@ -20664,12 +21031,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -893,9 +1111,33 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    esac
    need_lib_prefix=no
    need_version=no
-@@ -20754,15 +20965,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -20753,16 +21115,38 @@ rm -f core conftest.err conftest.$ac_obj
+   dynamic_linker='GNU/Linux ld.so'
    ;;
  
++midnightbsd*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++mirbsd*)
++  version_type=linux
++  sys_lib_search_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
@@ -912,7 +1154,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -20791,7 +21001,7 @@ newsos6)
+@@ -20791,7 +21175,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -921,7 +1163,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -20799,7 +21009,7 @@ openbsd*)
+@@ -20799,7 +21183,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -930,7 +1172,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -21205,7 +21415,10 @@ for cc_temp in $compiler""; do
+@@ -21205,7 +21589,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -942,7 +1184,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  
  # GCJ did not exist at the time GCC didn't implicitly link libc in.
-@@ -21320,9 +21533,17 @@ $as_echo_n "checking for $compiler optio
+@@ -21320,9 +21707,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -961,7 +1203,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      hpux*)
-@@ -21344,6 +21565,13 @@ $as_echo_n "checking for $compiler optio
+@@ -21344,6 +21739,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -975,7 +1217,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -21541,6 +21769,9 @@ $as_echo_n "checking for $compiler optio
+@@ -21541,6 +21943,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -985,7 +1227,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
      ;;
-@@ -21939,6 +22170,11 @@ _LT_EOF
+@@ -21939,6 +22344,11 @@ _LT_EOF
        fi
        ;;
  
@@ -997,7 +1239,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
      interix[3-9]*)
        hardcode_direct_GCJ=no
        hardcode_shlibpath_var_GCJ=no
-@@ -22025,7 +22261,7 @@ _LT_EOF
+@@ -22025,7 +22435,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -1006,7 +1248,40 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -22545,6 +22781,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -22412,6 +22822,11 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var_GCJ=no
+       ;;
+ 
++      haiku*)
++        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        link_all_deplibs_GCJ=yes
++        ;;
++
+     hpux9*)
+       if test "$GCC" = yes; then
+ 	archive_cmds_GCJ='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+@@ -22525,6 +22940,20 @@ rm -f core conftest.err conftest.$ac_obj
+       link_all_deplibs_GCJ=yes
+       ;;
+ 
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_GCJ=yes
++	hardcode_shlibpath_var_GCJ=no
++	hardcode_direct_absolute_GCJ=yes
++	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_GCJ='${wl}-E'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
+     netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+@@ -22545,6 +22974,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -1015,7 +1290,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
        ;;
  
      openbsd*)
-@@ -23115,7 +23353,10 @@ for cc_temp in $compiler""; do
+@@ -23115,7 +23546,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -1027,7 +1302,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  
  lt_cv_prog_compiler_c_o_RC=yes
  
-@@ -24296,6 +24537,9 @@ LTCC='$LTCC'
+@@ -24296,6 +24730,9 @@ LTCC='$LTCC'
  LTCFLAGS='$LTCFLAGS'
  compiler='$compiler_DEFAULT'
  
@@ -1037,7 +1312,7 @@ The problem manifests with wl and no_builtin_flag containing newlines.
  # Quote evaled strings.
  for var in SED \
  GREP \
-@@ -24580,6 +24824,9 @@ case \$lt_ECHO in
+@@ -24580,6 +25017,9 @@ case \$lt_ECHO in
    ;;
  esac
  
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 152f995f859..615b0f7ec1b 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.25 2011/03/23 15:46:36 obache Exp $
+$NetBSD: patch-ac,v 1.26 2011/05/14 16:49:45 bsiegert Exp $
 
 --- libltdl/config/ltmain.sh.orig	2009-11-16 13:23:18.000000000 +0000
 +++ libltdl/config/ltmain.sh
@@ -24,7 +24,34 @@ $NetBSD: patch-ac,v 1.25 2011/03/23 15:46:36 obache Exp $
  	    # These systems don't actually have a C or math library (as such)
  	    continue
  	    ;;
-@@ -6476,7 +6476,7 @@ func_mode_link ()
+@@ -6308,6 +6308,7 @@ func_mode_link ()
+ 	  func_arith $current - $age
+ 	  major=.$func_arith_result
+ 	  versuffix="$major.$age.$revision"
++	  versuffix2="$major.$age"
+ 	  ;;
+ 
+ 	osf)
+@@ -6368,8 +6369,10 @@ func_mode_link ()
+ 	  esac
+ 	  if test "$need_version" = no; then
+ 	    versuffix=
++	    versuffix2=
+ 	  else
+ 	    versuffix=".0.0"
++	    versuffix2=".0.0"
+ 	  fi
+ 	fi
+ 
+@@ -6377,6 +6380,7 @@ func_mode_link ()
+ 	if test "$avoid_version" = yes && test "$need_version" = no; then
+ 	  major=
+ 	  versuffix=
++	  versuffix2=
+ 	  verstring=""
+ 	fi
+ 
+@@ -6476,7 +6480,7 @@ func_mode_link ()
        if test "$build_libtool_libs" = yes; then
  	if test -n "$rpath"; then
  	  case $host in
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 2bd0a06474f..3b75099dffd 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
+$NetBSD: patch-ad,v 1.39 2011/05/14 16:49:45 bsiegert Exp $
 
---- libltdl/configure.orig	2010-06-19 07:24:26.000000000 +0000
+--- libltdl/configure.orig	2011-04-14 15:39:09.000000000 +0000
 +++ libltdl/configure
-@@ -4542,6 +4542,13 @@ else
+@@ -4542,13 +4542,20 @@ else
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -16,6 +16,14 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  netbsd* | freebsd* | openbsd* | mirbsd* | darwin* | dragonfly*)
+     # This has been around since 386BSD, at least.  Likely further.
+     if test -x /sbin/sysctl; then
+       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
 @@ -4914,6 +4921,10 @@ gnu*)
    lt_cv_deplibs_check_method=pass_all
    ;;
@@ -27,7 +35,25 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
    case $host_cpu in
-@@ -4967,7 +4978,7 @@ newos6*)
+@@ -4952,6 +4963,17 @@ linux* | k*bsd*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
++midnightbsd*)
++  # might to use match_pattern like MirBSD, but there is no well-defined
++  # naming scheme for libraries yet, as the current one is deprecated, and
++  # the new one in a state of flux especially between mports and MirPorts
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++mirbsd*)
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
++  ;;
++
+ netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+@@ -4967,7 +4989,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -36,7 +62,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
    ;;
  
  openbsd*)
-@@ -7286,7 +7297,10 @@ for cc_temp in $compiler""; do
+@@ -7286,7 +7308,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -48,7 +74,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
  
  
  # Only perform the check for file, if the check method requires it
-@@ -7596,9 +7610,17 @@ $as_echo_n "checking for $compiler optio
+@@ -7596,9 +7621,17 @@ $as_echo_n "checking for $compiler optio
        ;;
  
      darwin* | rhapsody*)
@@ -67,7 +93,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
        ;;
  
      hpux*)
-@@ -7620,6 +7642,13 @@ $as_echo_n "checking for $compiler optio
+@@ -7620,6 +7653,13 @@ $as_echo_n "checking for $compiler optio
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -81,7 +107,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -7817,6 +7846,9 @@ $as_echo_n "checking for $compiler optio
+@@ -7817,6 +7857,9 @@ $as_echo_n "checking for $compiler optio
  
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
@@ -91,7 +117,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -8230,6 +8262,11 @@ _LT_EOF
+@@ -8230,6 +8273,11 @@ _LT_EOF
        fi
        ;;
  
@@ -103,7 +129,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
      interix[3-9]*)
        hardcode_direct=no
        hardcode_shlibpath_var=no
-@@ -8316,7 +8353,7 @@ _LT_EOF
+@@ -8316,7 +8364,7 @@ _LT_EOF
        ;;
  
      netbsd*)
@@ -112,7 +138,40 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
        else
-@@ -8836,6 +8873,8 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -8703,6 +8751,11 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var=no
+       ;;
+ 
++      haiku*)
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        link_all_deplibs=yes
++        ;;
++
+     hpux9*)
+       if test "$GCC" = yes; then
+ 	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+@@ -8816,6 +8869,20 @@ rm -f core conftest.err conftest.$ac_obj
+       link_all_deplibs=yes
+       ;;
+ 
++    mirbsd*)
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	hardcode_direct_absolute=yes
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec='${wl}-E'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
+     netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+@@ -8836,6 +8903,8 @@ rm -f core conftest.err conftest.$ac_obj
        ;;
  
      *nto* | *qnx*)
@@ -121,7 +180,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
        ;;
  
      openbsd*)
-@@ -9450,6 +9489,7 @@ beos*)
+@@ -9450,6 +9519,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -129,7 +188,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -9551,9 +9591,7 @@ freebsd1*)
+@@ -9551,9 +9621,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -140,7 +199,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
    if test -x /usr/bin/objformat; then
      objformat=`/usr/bin/objformat`
    else
-@@ -9565,7 +9603,7 @@ freebsd* | dragonfly*)
+@@ -9565,7 +9633,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -149,7 +208,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -9588,13 +9626,24 @@ freebsd* | dragonfly*)
+@@ -9588,13 +9656,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -175,7 +234,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -9605,6 +9654,19 @@ gnu*)
+@@ -9605,6 +9684,19 @@ gnu*)
    hardcode_into_libs=yes
    ;;
  
@@ -195,7 +254,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -9666,12 +9728,7 @@ interix[3-9]*)
+@@ -9666,12 +9758,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -209,17 +268,42 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -9762,15 +9819,14 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -9761,16 +9848,38 @@ rm -f core conftest.err conftest.$ac_obj
+   dynamic_linker='GNU/Linux ld.so'
    ;;
  
++midnightbsd*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++mirbsd*)
++  version_type=linux
++  sys_lib_search_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    need_lib_prefix=no
    need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -227,7 +311,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -9799,7 +9855,7 @@ newsos6)
+@@ -9799,7 +9908,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -236,7 +320,7 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -9807,7 +9863,7 @@ openbsd*)
+@@ -9807,7 +9916,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
      *)				need_version=no  ;;
    esac
@@ -245,3 +329,13 @@ $NetBSD: patch-ad,v 1.38 2011/03/23 15:46:36 obache Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -11295,6 +11404,9 @@ else
+     # at 6.2 and later dlopen does load deplibs.
+     lt_cv_sys_dlopen_deplibs=yes
+     ;;
++  mirbsd*)
++    lt_cv_sys_dlopen_deplibs=yes
++    ;;
+   netbsd*)
+     lt_cv_sys_dlopen_deplibs=yes
+     ;;