 @@ -1,110 +1,122 @@
-$NetBSD: manual-libtool.m4,v 1.24 2009/02/24 10:13:26 abs Exp $
+$NetBSD: manual-libtool.m4,v 1.25 2009/03/23 23:03:59 joerg Exp $
 Local pkgsrc changes:
 - override the basename to point to the actual backend compiler,
   critical e.g. on Solaris
 - portability fixes for print on Interix
 - override for shlib naming policy on various platforms
 - QNX support
 - Interix3 support
 - disable static linkage on OS X by default
 - DragonFly support decoupled from FreeBSD
---- libtool.m4.orig	2008-02-01 16:26:47.000000000 +0000
+--- libtool.m4.orig	2008-02-01 17:26:47.000000000 +0100
-+++ libtool.m4	2009-02-21 23:20:30.000000000 +0000
++++ libtool.m4
-@@ -249,7 +249,10 @@
+@@ -249,7 +249,10 @@ AC_DEFUN([_LT_CC_BASENAME],
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  ])
-@@ -474,11 +477,11 @@
+@@ -474,11 +477,11 @@ else
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
 -    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
 +    if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' &&
         echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
         test "X$echo_testing_string" = "X$echo_test_string"; then
        # This shell has a builtin print -r that does the trick.
 -      echo='print -r'
 +      echo='print -r -'
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
  	 test "X$CONFIG_SHELL" != X/bin/ksh; then
        # If we have ksh, try running configure again with it.
-@@ -820,6 +823,13 @@
+@@ -820,6 +823,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
      lt_cv_sys_max_cmd_len=8192;
      ;;
 +  mint*)
 +    # On MiNT we can support fairly large cmd lengths, but it takes
 +    # a while to run the tests, so let's restrict it to something
 +    # reasonable.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
++
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-@@ -1427,6 +1437,7 @@
+@@ -1427,6 +1437,7 @@ beos*)
  bsdi[[45]]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -1525,7 +1536,7 @@
+@@ -1525,9 +1536,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
 +freebsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -1539,7 +1550,7 @@
+     objformat=`/usr/bin/objformat`
    else
@@ -1539,7 +1548,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
        ;;
-@@ -1569,6 +1580,16 @@
+@@ -1562,13 +1571,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
      ;;
    esac
    ;;
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
++
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -1637,15 +1658,22 @@
+@@ -1637,15 +1657,22 @@ interix[[3-9]]*)
    hardcode_into_libs=yes
    ;;
 +interix3*)
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -113,146 +125,146 @@ Local pkgsrc changes:
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -1710,11 +1738,11 @@
+@@ -1710,11 +1737,11 @@ linux* | k*bsd*-gnu)
    ;;
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    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}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -1739,13 +1767,14 @@
+@@ -1739,13 +1766,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  dynamic_linker='QNX libc.so'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    ;;
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -1753,7 +1782,7 @@
+@@ -1753,7 +1781,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}'
    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
-@@ -1954,9 +1983,7 @@
+@@ -1954,9 +1982,7 @@ if test -f "$ltmain" && test -n "$tagnam
        case $tagname in
        CXX)
 -	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -	    (test "X$CXX" != "Xg++"))) ; then
 +	if test -n "$CXX" && test "X$CXX" != "Xno" ; then
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -2475,6 +2502,10 @@
+@@ -2475,6 +2501,10 @@ interix[[3-9]]*)
    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
    ;;
 +interix3*)
 +  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
 +  ;;
++
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -2505,7 +2536,7 @@
+@@ -2505,7 +2535,7 @@ newos6*)
    ;;
  nto-qnx*)
 -  lt_cv_deplibs_check_method=unknown
 +  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|S\.a)$'
    ;;
  openbsd*)
-@@ -2712,21 +2743,10 @@
+@@ -2712,21 +2742,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 +AC_REQUIRE([AC_PROG_CXXCPP])
  _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
  ])# _LT_AC_LANG_CXX
 -# _LT_AC_PROG_CXXCPP
 -# ------------------
 -AC_DEFUN([_LT_AC_PROG_CXXCPP],
 -[
 -AC_REQUIRE([AC_PROG_CXX])
 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -    (test "X$CXX" != "Xg++"))) ; then
 -  AC_PROG_CXXCPP
 -fi
 -])# _LT_AC_PROG_CXXCPP
  # AC_LIBTOOL_F77
  # --------------
-@@ -2864,7 +2884,7 @@
+@@ -2864,7 +2883,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 +AC_REQUIRE([AC_PROG_CXXCPP])
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -3350,6 +3370,16 @@
+@@ -3350,6 +3369,16 @@ case $host_os in
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
 +  interix3*)
 +    # Oy, what a hack.
 +    # Because shlibs are not compiled -fPIC due to broken code, we must
 +    # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +    # all libraries, leading to runtime relocations -- slow and very
 +    # memory consuming.  To do this, we pick a random 256KB-aligned
 +    # start address between 0x50000000 and 0x6ffc0000 at link time.
 +    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +    ;;
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -3503,14 +3533,29 @@
+@@ -3503,14 +3532,29 @@ case $host_os in
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +      # a.out is quite broken and goes directly to ld
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
 +      # Determine if we need to override the c++rt0 that is
 +      # picked up by analysing output_verbose_link_cmds
 +      if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
 +        cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
 +      else
 +        cpprt0_file=
 +      fi
 @@ -264,229 +276,229 @@ Local pkgsrc changes:
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +    elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then
 +      # Workaround some broken pre-1.5 ELF toolchains
 +      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +    else
 +      # Modern ELF works sanely as-is
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      output_verbose_link_cmd='echo'
 +    fi
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -3823,6 +3868,11 @@
+@@ -3823,6 +3867,11 @@ case $host_os in
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
 +  nto-qnx*)
 +    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +    output_verbose_link_cmd='echo'
 +    ;;
    *)
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3985,6 +4035,21 @@
+@@ -3985,6 +4034,21 @@ if AC_TRY_EVAL(ac_compile); then
      esac
    done
 +  case "$host_os" in
 +  netbsd*)
 +    if test -n "$cpprt0_file"; then
 +      predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
 +    fi
 +    ;;
 +  interix3*)
 +    # Interix installs completely hosed .la files for C++, so rather than
 +    # hack all around it, let's just trust "g++" to DTRT.
 +    predep_objects_CXX=
 +    postdep_objects_CXX=
 +    postdeps_CXX=
 +    ;;
 +  esac
++
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -5033,9 +5098,15 @@
+@@ -5033,9 +5097,15 @@ AC_MSG_CHECKING([for $compiler option to
  	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
 +      ;;
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -5061,6 +5132,10 @@
+@@ -5061,6 +5131,10 @@ AC_MSG_CHECKING([for $compiler option to
  	;;
        esac
        ;;
 +    interix3*)
 +      # Interix 3.0-3.5 -fPIC option generates borked code.
 +      # (Instead, shlibs are relocated at runtime.)
 +      ;;
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5107,6 +5182,9 @@
+@@ -5107,6 +5181,9 @@ AC_MSG_CHECKING([for $compiler option to
  	    ;;
  	esac
  	;;
 +      mint*)
 +	# FreeMiNT uses GNU C++
 +	;;
        freebsd* | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
-@@ -5139,6 +5217,8 @@
+@@ -5139,6 +5216,8 @@ AC_MSG_CHECKING([for $compiler option to
  	# This is c89, which is MS Visual C++ (no shared libs)
  	# Anyone wants to do a port?
  	;;
 +      interix3*)
 +	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC*)
-@@ -5278,6 +5358,8 @@
+@@ -5278,6 +5357,8 @@ AC_MSG_CHECKING([for $compiler option to
  	;;
        vxworks*)
  	;;
 +      nto-qnx*)
 +	;;
        *)
  	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
  	;;
-@@ -5319,9 +5401,11 @@
+@@ -5319,9 +5400,11 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
        ;;
      interix[[3-9]]*)
-@@ -5329,6 +5413,13 @@
+@@ -5329,6 +5412,13 @@ AC_MSG_CHECKING([for $compiler option to
        # Instead, we relocate shared libraries at runtime.
        ;;
 +    mint*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
 +      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +      enable_shared=no
 +      ;;
++
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -5355,6 +5446,11 @@
+@@ -5355,6 +5445,11 @@ AC_MSG_CHECKING([for $compiler option to
        esac
        ;;
 +    interix3*)
 +      # Interix 3.0-3.5 -fPIC option generates borked code.
 +      # (Instead, shlibs are relocated at runtime.)
 +      ;;
++
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5510,6 +5606,10 @@
+@@ -5510,6 +5605,10 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
 +    nto-qnx*)
 +      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +      ;;
++
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
        ;;
-@@ -5534,6 +5634,9 @@
+@@ -5534,6 +5633,9 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compi
  fi
  case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
 +  mint*)
 +    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
 +    ;;
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;
-@@ -5791,6 +5894,17 @@
+@@ -5791,6 +5893,17 @@ EOF
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
++
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -5856,6 +5970,11 @@
+@@ -5856,6 +5969,11 @@ _LT_EOF
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
 +    nto-qnx*)
 +       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +       ;;
++
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -6210,6 +6329,21 @@
+@@ -6210,6 +6328,21 @@ _LT_EOF
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-h,$libdir'
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
++
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -6435,6 +6569,13 @@
+@@ -6435,6 +6568,13 @@ _LT_EOF
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
 +    nto-qnx*)
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
++
      *)
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;

 @@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.61 2008/11/19 01:26:52 chuck Exp $
+$NetBSD: patch-ab,v 1.62 2009/03/23 23:03:59 joerg Exp $
---- configure.orig	2008-11-18 16:39:10.000000000 -0500
+--- configure.orig	2008-02-01 17:38:42.000000000 +0100
 +++ configure
 @@ -630,11 +630,11 @@ else
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
 -    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
 +    if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' &&
         echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
         test "X$echo_testing_string" = "X$echo_test_string"; then
        # This shell has a builtin print -r that does the trick.
 -      echo='print -r'
 +      echo='print -r -'
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
 @@ -183,62 +183,73 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:2
 +      ;;
++
      *)
        ld_shlibs=no
        ;;
 @@ -9650,6 +9702,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -9748,7 +9801,7 @@ freebsd1*)
+@@ -9748,9 +9801,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
 +freebsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -9762,7 +9815,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
    else
@@ -9762,7 +9813,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
        ;;
-@@ -9792,6 +9845,16 @@ freebsd* | dragonfly*)
+@@ -9785,13 +9836,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
      ;;
    esac
    ;;
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
++
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -9860,15 +9923,22 @@ interix[3-9]*)
+@@ -9860,15 +9922,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
 +interix3*)
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -247,106 +258,106 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:2
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -9933,11 +10003,11 @@ linux* | k*bsd*-gnu)
+@@ -9933,11 +10002,11 @@ linux* | k*bsd*-gnu)
    ;;
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    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}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -9962,13 +10032,14 @@ nto-qnx*)
+@@ -9962,13 +10031,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  dynamic_linker='QNX libc.so'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    ;;
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -9976,7 +10047,7 @@ openbsd*)
+@@ -9976,7 +10046,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}'
    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
-@@ -11566,9 +11637,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -11566,9 +11636,7 @@ echo "$as_me: error: tag name \"$tagname
        case $tagname in
        CXX)
 -	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -	    (test "X$CXX" != "Xg++"))) ; then
 +	if test -n "$CXX" && test "X$CXX" != "Xno" ; then
  	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11674,7 +11743,10 @@ for cc_temp in $compiler""; do
+@@ -11674,7 +11742,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  # We don't want -fno-exception wen compiling C++ code, so set the
-@@ -12309,6 +12381,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12309,6 +12380,16 @@ if test -z "$aix_libpath"; then aix_libp
      archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
 +  interix3*)
 +    # Oy, what a hack.
 +    # Because shlibs are not compiled -fPIC due to broken code, we must
 +    # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +    # all libraries, leading to runtime relocations -- slow and very
 +    # memory consuming.  To do this, we pick a random 256KB-aligned
 +    # start address between 0x50000000 and 0x6ffc0000 at link time.
 +    archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +    archive_expsym_cmds_CXX='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +    ;;
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -12462,14 +12544,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12462,14 +12543,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +      # a.out is quite broken and goes directly to ld
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
 +      # Determine if we need to override the c++rt0 that is
 +      # picked up by analysing output_verbose_link_cmds
 +      if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
 +        cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
 +      else
 +        cpprt0_file=
 +      fi
 @@ -358,146 +369,157 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:2
 +      # Workaround some broken pre-1.5 ELF toolchains
 +      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +    else
 +      # Modern ELF works sanely as-is
 +      archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      output_verbose_link_cmd='echo'
      fi
 -    # Workaround some broken pre-1.5 toolchains
 -    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -12782,6 +12879,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12782,6 +12878,11 @@ if test -z "$aix_libpath"; then aix_libp
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
 +  nto-qnx*)
 +    archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +    archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +    output_verbose_link_cmd='echo'
 +    ;;
    *)
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
-@@ -12891,6 +12993,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -12891,6 +12992,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
 +  case "$host_os" in
 +  netbsd*)
 +    if test -n "$cpprt0_file"; then
 +      predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
 +    fi
 +    ;;
 +  interix3*)
 +    # Interix installs completely hosed .la files for C++, so rather than
 +    # hack all around it, let's just trust "g++" to DTRT.
 +    predep_objects_CXX=
 +    postdep_objects_CXX=
 +    postdeps_CXX=
 +    ;;
 +  esac
++
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -13000,9 +13117,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13000,9 +13116,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_CXX='-fno-common'
 +      lt_prog_compiler_static_CXX=''
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -13028,6 +13147,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13028,6 +13146,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
 +    interix3*)
 +      # Interix 3.0-3.5 -fPIC option generates borked code.
 +      # (Instead, shlibs are relocated at runtime.)
 +      ;;
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -13106,6 +13229,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13106,6 +13228,8 @@ echo $ECHO_N "checking for $compiler opt
  	# This is c89, which is MS Visual C++ (no shared libs)
  	# Anyone wants to do a port?
  	;;
 +      interix3*)
 +	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC*)
-@@ -13245,6 +13370,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13245,6 +13369,8 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        vxworks*)
  	;;
 +      nto-qnx*)
 +	;;
        *)
  	lt_prog_compiler_can_build_shared_CXX=no
  	;;
-@@ -13618,6 +13745,7 @@ beos*)
+@@ -13618,6 +13744,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -13715,7 +13843,7 @@ freebsd1*)
+@@ -13715,9 +13842,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
 +freebsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -13729,7 +13857,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
    else
@@ -13729,7 +13854,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
        ;;
-@@ -13759,6 +13887,16 @@ freebsd* | dragonfly*)
+@@ -13752,13 +13877,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
      ;;
    esac
    ;;
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
++
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -13827,15 +13965,22 @@ interix[3-9]*)
+@@ -13827,15 +13963,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
 +interix3*)
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -506,235 +528,246 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:2
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -13900,11 +14045,11 @@ linux* | k*bsd*-gnu)
+@@ -13900,11 +14043,11 @@ linux* | k*bsd*-gnu)
    ;;
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    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}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -13929,13 +14074,14 @@ nto-qnx*)
+@@ -13929,13 +14072,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  dynamic_linker='QNX libc.so'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    ;;
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -13943,7 +14089,7 @@ openbsd*)
+@@ -13943,7 +14087,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}'
    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
-@@ -14661,7 +14807,10 @@ for cc_temp in $compiler""; do
+@@ -14661,7 +14805,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-@@ -14742,9 +14891,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14742,9 +14889,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_F77='-fno-common'
 +      lt_prog_compiler_static_F77=''
        ;;
      interix[3-9]*)
-@@ -14778,6 +14929,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14778,6 +14927,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
 +    interix3*)
 +      # Interix 3.0-3.5 -fPIC option generates borked code.
 +      # (Instead, shlibs are relocated at runtime.)
 +      ;;
++
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14932,6 +15088,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14932,6 +15086,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
 +    nto-qnx*)
 +      lt_prog_compiler_pic_F77='-fPIC'
 +      ;;
++
      *)
        lt_prog_compiler_can_build_shared_F77=no
        ;;
-@@ -15169,7 +15329,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -15169,7 +15327,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -15338,6 +15501,17 @@ EOF
+@@ -15338,6 +15499,17 @@ EOF
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
++
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -15403,6 +15577,11 @@ _LT_EOF
+@@ -15403,6 +15575,11 @@ _LT_EOF
        hardcode_shlibpath_var_F77=no
        ;;
 +    nto-qnx*)
 +       archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +       archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +       ;;
++
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -15849,6 +16028,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15849,6 +16026,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_F77='${wl}-E'
 +      hardcode_direct_F77=yes
 +      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
 +      hardcode_shlibpath_var_F77=no
 +      ;;
++
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -16074,6 +16268,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16074,6 +16266,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_F77=no
        ;;
 +    nto-qnx*)
 +      archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_libdir_flag_spec_F77='-R$libdir'
 +      hardcode_direct_F77=yes
 +      hardcode_shlibpath_var_F77=no
 +      ;;
++
      *)
        ld_shlibs_F77=no
        ;;
-@@ -16239,6 +16440,7 @@ beos*)
+@@ -16239,6 +16438,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -16336,7 +16538,7 @@ freebsd1*)
+@@ -16336,9 +16536,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
 +freebsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -16350,7 +16552,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
    else
@@ -16350,7 +16548,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
        ;;
-@@ -16380,6 +16582,16 @@ freebsd* | dragonfly*)
+@@ -16373,13 +16571,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
      ;;
    esac
    ;;
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
++
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -16448,15 +16660,22 @@ interix[3-9]*)
+@@ -16448,15 +16657,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
 +interix3*)
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -743,235 +776,246 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:2
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -16521,11 +16740,11 @@ linux* | k*bsd*-gnu)
+@@ -16521,11 +16737,11 @@ linux* | k*bsd*-gnu)
    ;;
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    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}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -16550,13 +16769,14 @@ nto-qnx*)
+@@ -16550,13 +16766,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  dynamic_linker='QNX libc.so'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    ;;
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16564,7 +16784,7 @@ openbsd*)
+@@ -16564,7 +16781,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}'
    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
-@@ -17242,7 +17462,10 @@ for cc_temp in $compiler""; do
+@@ -17242,7 +17459,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +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.
-@@ -17347,9 +17570,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17347,9 +17567,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_GCJ='-fno-common'
 +      lt_prog_compiler_static_GCJ=''
        ;;
      interix[3-9]*)
-@@ -17383,6 +17608,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17383,6 +17605,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
 +    interix3*)
 +      # Interix 3.0-3.5 -fPIC option generates borked code.
 +      # (Instead, shlibs are relocated at runtime.)
 +      ;;
++
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -17537,6 +17767,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17537,6 +17764,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
 +    nto-qnx*)
 +      lt_prog_compiler_pic_GCJ='-fPIC'
 +      ;;
++
      *)
        lt_prog_compiler_can_build_shared_GCJ=no
        ;;
-@@ -17774,7 +18008,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -17774,7 +18005,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -17943,6 +18180,17 @@ EOF
+@@ -17943,6 +18177,17 @@ EOF
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
++
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -18008,6 +18256,11 @@ _LT_EOF
+@@ -18008,6 +18253,11 @@ _LT_EOF
        hardcode_shlibpath_var_GCJ=no
        ;;
 +    nto-qnx*)
 +       archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +       archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +       ;;
++
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -18474,6 +18727,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18474,6 +18724,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_GCJ='${wl}-E'
 +      hardcode_direct_GCJ=yes
 +      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
++
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -18699,6 +18967,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18699,6 +18964,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_GCJ=no
        ;;
 +    nto-qnx*)
 +      archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 +      hardcode_direct_GCJ=yes
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
++
      *)
        ld_shlibs_GCJ=no
        ;;
-@@ -18864,6 +19139,7 @@ beos*)
+@@ -18864,6 +19136,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -18961,7 +19237,7 @@ freebsd1*)
+@@ -18961,9 +19234,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
 +freebsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -18975,7 +19251,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
    else
@@ -18975,7 +19246,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
        ;;
-@@ -19005,6 +19281,16 @@ freebsd* | dragonfly*)
+@@ -18998,13 +19269,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
      ;;
    esac
    ;;
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
++
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -19073,15 +19359,22 @@ interix[3-9]*)
+@@ -19073,15 +19355,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
 +interix3*)
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -980,73 +1024,73 @@ $NetBSD: patch-ab,v 1.61 2008/11/19 01:2
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -19146,11 +19439,11 @@ linux* | k*bsd*-gnu)
+@@ -19146,11 +19435,11 @@ linux* | k*bsd*-gnu)
    ;;
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    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}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -19175,13 +19468,14 @@ nto-qnx*)
+@@ -19175,13 +19464,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  dynamic_linker='QNX libc.so'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    ;;
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -19189,7 +19483,7 @@ openbsd*)
+@@ -19189,7 +19479,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}'
    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
-@@ -19866,7 +20160,10 @@ for cc_temp in $compiler""; do
+@@ -19866,7 +20156,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  lt_cv_prog_compiler_c_o_RC=yes
-@@ -21547,7 +21844,7 @@ echo "$as_me: executing $ac_file command
+@@ -21547,7 +21840,7 @@ echo "$as_me: executing $ac_file command
    # each Makefile.in and add a new line on top of each file to say so.
    # Grep'ing the whole file is not good either: AIX grep has a line
    # limit of 2048, but all sed's we know have understand at least 4000.
 -  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
 +  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
      dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$mf" : 'X\(//\)[^/]' \| \

 @@ -1,16 +1,16 @@
-$NetBSD: patch-ad,v 1.33 2008/11/19 01:26:52 chuck Exp $
+$NetBSD: patch-ad,v 1.34 2009/03/23 23:03:59 joerg Exp $
---- libltdl/configure.orig	2008-11-18 16:39:34.000000000 -0500
+--- libltdl/configure.orig	2008-02-01 17:38:49.000000000 +0100
 +++ libltdl/configure
 @@ -630,11 +630,11 @@ else
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
 -    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
 +    if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' &&
         echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
         test "X$echo_testing_string" = "X$echo_test_string"; then
        # This shell has a builtin print -r that does the trick.
 -      echo='print -r'
 +      echo='print -r -'
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
 @@ -183,62 +183,73 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:2
 +      ;;
++
      *)
        ld_shlibs=no
        ;;
 @@ -9517,6 +9569,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -9615,7 +9668,7 @@ freebsd1*)
+@@ -9615,9 +9668,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
 +freebsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -9629,7 +9682,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
    else
@@ -9629,7 +9680,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
        ;;
-@@ -9659,6 +9712,16 @@ freebsd* | dragonfly*)
+@@ -9652,13 +9703,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
      ;;
    esac
    ;;
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
++
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -9727,15 +9790,22 @@ interix[3-9]*)
+@@ -9727,15 +9789,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
 +interix3*)
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -247,106 +258,106 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:2
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -9800,11 +9870,11 @@ linux* | k*bsd*-gnu)
+@@ -9800,11 +9869,11 @@ linux* | k*bsd*-gnu)
    ;;
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    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}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -9829,13 +9899,14 @@ nto-qnx*)
+@@ -9829,13 +9898,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  dynamic_linker='QNX libc.so'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    ;;
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -9843,7 +9914,7 @@ openbsd*)
+@@ -9843,7 +9913,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}'
    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
-@@ -11433,9 +11504,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -11433,9 +11503,7 @@ echo "$as_me: error: tag name \"$tagname
        case $tagname in
        CXX)
 -	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -	    (test "X$CXX" != "Xg++"))) ; then
 +	if test -n "$CXX" && test "X$CXX" != "Xno" ; then
  	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11541,7 +11610,10 @@ for cc_temp in $compiler""; do
+@@ -11541,7 +11609,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  # We don't want -fno-exception wen compiling C++ code, so set the
-@@ -12176,6 +12248,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12176,6 +12247,16 @@ if test -z "$aix_libpath"; then aix_libp
      archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
      ;;
 +  interix3*)
 +    # Oy, what a hack.
 +    # Because shlibs are not compiled -fPIC due to broken code, we must
 +    # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +    # all libraries, leading to runtime relocations -- slow and very
 +    # memory consuming.  To do this, we pick a random 256KB-aligned
 +    # start address between 0x50000000 and 0x6ffc0000 at link time.
 +    archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +    archive_expsym_cmds_CXX='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +    ;;
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -12329,14 +12411,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12329,14 +12410,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +      # a.out is quite broken and goes directly to ld
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
 +      # Determine if we need to override the c++rt0 that is
 +      # picked up by analysing output_verbose_link_cmds
 +      if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
 +        cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
 +      else
 +        cpprt0_file=
 +      fi
 @@ -358,146 +369,157 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:2
 +      # Workaround some broken pre-1.5 ELF toolchains
 +      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +    else
 +      # Modern ELF works sanely as-is
 +      archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      output_verbose_link_cmd='echo'
      fi
 -    # Workaround some broken pre-1.5 toolchains
 -    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -12649,6 +12746,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12649,6 +12745,11 @@ if test -z "$aix_libpath"; then aix_libp
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
 +  nto-qnx*)
 +    archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +    archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +    output_verbose_link_cmd='echo'
 +    ;;
    *)
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
-@@ -12758,6 +12860,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -12758,6 +12859,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
 +  case "$host_os" in
 +  netbsd*)
 +    if test -n "$cpprt0_file"; then
 +      predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
 +    fi
 +    ;;
 +  interix3*)
 +    # Interix installs completely hosed .la files for C++, so rather than
 +    # hack all around it, let's just trust "g++" to DTRT.
 +    predep_objects_CXX=
 +    postdep_objects_CXX=
 +    postdeps_CXX=
 +    ;;
 +  esac
++
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -12867,9 +12984,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12867,9 +12983,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_CXX='-fno-common'
 +      lt_prog_compiler_static_CXX=''
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -12895,6 +13014,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12895,6 +13013,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
 +    interix3*)
 +      # Interix 3.0-3.5 -fPIC option generates borked code.
 +      # (Instead, shlibs are relocated at runtime.)
 +      ;;
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -12973,6 +13096,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12973,6 +13095,8 @@ echo $ECHO_N "checking for $compiler opt
  	# This is c89, which is MS Visual C++ (no shared libs)
  	# Anyone wants to do a port?
  	;;
 +      interix3*)
 +	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC*)
-@@ -13112,6 +13237,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13112,6 +13236,8 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        vxworks*)
  	;;
 +      nto-qnx*)
 +	;;
        *)
  	lt_prog_compiler_can_build_shared_CXX=no
  	;;
-@@ -13485,6 +13612,7 @@ beos*)
+@@ -13485,6 +13611,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -13582,7 +13710,7 @@ freebsd1*)
+@@ -13582,9 +13709,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
 +freebsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -13596,7 +13724,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
    else
@@ -13596,7 +13721,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
        ;;
-@@ -13626,6 +13754,16 @@ freebsd* | dragonfly*)
+@@ -13619,13 +13744,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
      ;;
    esac
    ;;
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
++
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -13694,15 +13832,22 @@ interix[3-9]*)
+@@ -13694,15 +13830,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
 +interix3*)
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -506,235 +528,246 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:2
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -13767,11 +13912,11 @@ linux* | k*bsd*-gnu)
+@@ -13767,11 +13910,11 @@ linux* | k*bsd*-gnu)
    ;;
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    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}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -13796,13 +13941,14 @@ nto-qnx*)
+@@ -13796,13 +13939,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  dynamic_linker='QNX libc.so'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    ;;
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -13810,7 +13956,7 @@ openbsd*)
+@@ -13810,7 +13954,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}'
    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
-@@ -14528,7 +14674,10 @@ for cc_temp in $compiler""; do
+@@ -14528,7 +14672,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-@@ -14609,9 +14758,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14609,9 +14756,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_F77='-fno-common'
 +      lt_prog_compiler_static_F77=''
        ;;
      interix[3-9]*)
-@@ -14645,6 +14796,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14645,6 +14794,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
 +    interix3*)
 +      # Interix 3.0-3.5 -fPIC option generates borked code.
 +      # (Instead, shlibs are relocated at runtime.)
 +      ;;
++
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14799,6 +14955,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14799,6 +14953,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
 +    nto-qnx*)
 +      lt_prog_compiler_pic_F77='-fPIC'
 +      ;;
++
      *)
        lt_prog_compiler_can_build_shared_F77=no
        ;;
-@@ -15036,7 +15196,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -15036,7 +15194,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -15205,6 +15368,17 @@ EOF
+@@ -15205,6 +15366,17 @@ EOF
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
++
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -15270,6 +15444,11 @@ _LT_EOF
+@@ -15270,6 +15442,11 @@ _LT_EOF
        hardcode_shlibpath_var_F77=no
        ;;
 +    nto-qnx*)
 +       archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +       archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +       ;;
++
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -15716,6 +15895,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15716,6 +15893,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_F77='${wl}-E'
 +      hardcode_direct_F77=yes
 +      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
 +      hardcode_shlibpath_var_F77=no
 +      ;;
++
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -15941,6 +16135,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15941,6 +16133,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_F77=no
        ;;
 +    nto-qnx*)
 +      archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_libdir_flag_spec_F77='-R$libdir'
 +      hardcode_direct_F77=yes
 +      hardcode_shlibpath_var_F77=no
 +      ;;
++
      *)
        ld_shlibs_F77=no
        ;;
-@@ -16106,6 +16307,7 @@ beos*)
+@@ -16106,6 +16305,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -16203,7 +16405,7 @@ freebsd1*)
+@@ -16203,9 +16403,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
 +freebsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -16217,7 +16419,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
    else
@@ -16217,7 +16415,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
        ;;
-@@ -16247,6 +16449,16 @@ freebsd* | dragonfly*)
+@@ -16240,13 +16438,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
      ;;
    esac
    ;;
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
++
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -16315,15 +16527,22 @@ interix[3-9]*)
+@@ -16315,15 +16524,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
 +interix3*)
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -743,235 +776,246 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:2
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -16388,11 +16607,11 @@ linux* | k*bsd*-gnu)
+@@ -16388,11 +16604,11 @@ linux* | k*bsd*-gnu)
    ;;
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    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}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -16417,13 +16636,14 @@ nto-qnx*)
+@@ -16417,13 +16633,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  dynamic_linker='QNX libc.so'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    ;;
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16431,7 +16651,7 @@ openbsd*)
+@@ -16431,7 +16648,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}'
    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
-@@ -17109,7 +17329,10 @@ for cc_temp in $compiler""; do
+@@ -17109,7 +17326,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +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.
-@@ -17214,9 +17437,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17214,9 +17434,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
 +      # PIC is the default on this platform, and static linking of
 +      # binaries generally doesn't work
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_GCJ='-fno-common'
 +      lt_prog_compiler_static_GCJ=''
        ;;
      interix[3-9]*)
-@@ -17250,6 +17475,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17250,6 +17472,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
 +    interix3*)
 +      # Interix 3.0-3.5 -fPIC option generates borked code.
 +      # (Instead, shlibs are relocated at runtime.)
 +      ;;
++
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -17404,6 +17634,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17404,6 +17631,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
 +    nto-qnx*)
 +      lt_prog_compiler_pic_GCJ='-fPIC'
 +      ;;
++
      *)
        lt_prog_compiler_can_build_shared_GCJ=no
        ;;
-@@ -17641,7 +17875,10 @@ echo $ECHO_N "checking whether the $comp
+@@ -17641,7 +17872,10 @@ echo $ECHO_N "checking whether the $comp
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -17810,6 +18047,17 @@ EOF
+@@ -17810,6 +18044,17 @@ EOF
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      ;;
++
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -17875,6 +18123,11 @@ _LT_EOF
+@@ -17875,6 +18120,11 @@ _LT_EOF
        hardcode_shlibpath_var_GCJ=no
        ;;
 +    nto-qnx*)
 +       archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +       archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +       ;;
++
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -18341,6 +18594,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18341,6 +18591,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
 +      # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
 +      # all libraries, leading to runtime relocations -- slow and very
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_GCJ='${wl}-E'
 +      hardcode_direct_GCJ=yes
 +      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
++
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -18566,6 +18834,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18566,6 +18831,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_GCJ=no
        ;;
 +    nto-qnx*)
 +      archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 +      hardcode_direct_GCJ=yes
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
++
      *)
        ld_shlibs_GCJ=no
        ;;
-@@ -18731,6 +19006,7 @@ beos*)
+@@ -18731,6 +19003,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -18828,7 +19104,7 @@ freebsd1*)
+@@ -18828,9 +19101,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
 -  # versioning mechanism, adjust this.
 +freebsd*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -18842,7 +19118,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
    else
@@ -18842,7 +19113,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
        ;;
-@@ -18872,6 +19148,16 @@ freebsd* | dragonfly*)
+@@ -18865,13 +19136,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
      ;;
    esac
    ;;
 +dragonfly*)
-+  version_type=linux # XXX tv this should be =linux; current selection has problems
++  version_type=linux
 +  need_version=no
 +  need_lib_prefix=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
++
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -18940,15 +19226,22 @@ interix[3-9]*)
+@@ -18940,15 +19222,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
 +interix3*)
 +  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}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  dynamic_linker='Interix 3.x ld.so'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 @@ -980,99 +1024,99 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:2
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
 -	if test "$lt_cv_prog_gnu_ld" = yes; then
 -		version_type=linux
 -	else
 -		version_type=irix
 -	fi ;;
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -19013,11 +19306,11 @@ linux* | k*bsd*-gnu)
+@@ -19013,11 +19302,11 @@ linux* | k*bsd*-gnu)
    ;;
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
    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}$versuffix2'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -19042,13 +19335,14 @@ nto-qnx*)
+@@ -19042,13 +19331,14 @@ nto-qnx*)
    need_lib_prefix=no
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  dynamic_linker='QNX libc.so'
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    ;;
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -19056,7 +19350,7 @@ openbsd*)
+@@ -19056,7 +19346,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}'
    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
-@@ -19733,7 +20027,10 @@ for cc_temp in $compiler""; do
+@@ -19733,7 +20023,10 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +# Return the actual command name, not our pkgsrc wrapper name because several
 +# decisions are made only based on compiler names
 +new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
 +cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  lt_cv_prog_compiler_c_o_RC=yes
-@@ -21414,7 +21711,7 @@ else
+@@ -21414,7 +21707,7 @@ else
      # we want this `case' here to explicitly catch those versions.
      libltdl_cv_sys_dlopen_deplibs=unknown
      ;;
 -  aix[4-9]*)
 +  aix[45]*)
      libltdl_cv_sys_dlopen_deplibs=yes
      ;;
    darwin*)
-@@ -21422,10 +21719,7 @@ else
+@@ -21422,10 +21715,7 @@ else
      # If you are looking for one http://www.opendarwin.org/projects/dlcompat
      libltdl_cv_sys_dlopen_deplibs=yes
      ;;
 -  freebsd* | dragonfly*)
 -    libltdl_cv_sys_dlopen_deplibs=yes
 -    ;;
 -  gnu* | linux* | k*bsd*-gnu)
 +  gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
      # GNU and its variants, using gnu ld.so (Glibc)
      libltdl_cv_sys_dlopen_deplibs=yes
      ;;
-@@ -23981,22 +24275,21 @@ echo "$as_me: $ac_file is unchanged" >&6
+@@ -23981,22 +24271,21 @@ echo "$as_me: $ac_file is unchanged" >&6
    fi
    rm -f "$tmp/out12"
  # Compute $ac_file's index in $config_headers.
 -_am_arg=$ac_file
  _am_stamp_count=1
  for _am_header in $config_headers :; do
    case $_am_header in
 -    $_am_arg | $_am_arg:* )
 +    $ac_file | $ac_file:* )
        break ;;
      * )
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
 @@ -1082,22 +1126,22 @@ $NetBSD: patch-ad,v 1.33 2008/11/19 01:2
 -	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 -	 X"$_am_arg" : 'X\(//\)$' \| \
 -	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
 -echo X"$_am_arg" |
 +echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
 +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X$ac_file : 'X\(//\)[^/]' \| \
 +	 X$ac_file : 'X\(//\)$' \| \
 +	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
 +echo X$ac_file |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
+ 	    q
-@@ -24033,7 +24326,7 @@ echo "$as_me: executing $ac_file command
+@@ -24033,7 +24322,7 @@ echo "$as_me: executing $ac_file command
    # each Makefile.in and add a new line on top of each file to say so.
    # Grep'ing the whole file is not good either: AIX grep has a line
    # limit of 2048, but all sed's we know have understand at least 4000.
 -  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
 +  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
      dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$mf" : 'X\(//\)[^/]' \| \

 @@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.72 2008/11/19 01:26:52 chuck Exp $
+$NetBSD: distinfo,v 1.73 2009/03/23 23:03:59 joerg Exp $
 SHA1 (libtool-1.5.26.tar.gz) = 4c1738351736562a951a345e24f233d00953ec0a
 RMD160 (libtool-1.5.26.tar.gz) = 4d1d7dd0308b98e8f590723ae5daddb8da49ac11
 Size (libtool-1.5.26.tar.gz) = 2961939 bytes
 SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = 4b3befd3cf5629e3b46b4bd100b697d10089d434
+SHA1 (patch-ab) = 9902ccf15b031d04fdca95acbf718a849c6d0a4f
 SHA1 (patch-ac) = 52f22f3f7a58e22d2240d0c6bb77455783ee5d70
-SHA1 (patch-ad) = d3636017fc09a571df6ecb57b7b988867bbbd4ce
+SHA1 (patch-ad) = e3e3164b1e9598deab233450a1f7a8262dd09d66

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.73 2008/11/19 01:26:52 chuck Exp $
+# $NetBSD: Makefile.common,v 1.74 2009/03/23 23:03:58 joerg Exp $
 ###########################################################################
 ###########################################################################
+#
 # HEADS UP!  DO NOT CHANGE THE VERSION OR PKGREVISION WITHOUT READING THIS:
+#
 ###########################################################################
 ###########################################################################
+#
 # This package is maintained specially in order to preserve pkgsrc
 # specific OS changes that diverge from the "out of the box" libtool.
 # In order to keep this package in a maintainable condition, the .m4 files
 # must be manipulated in order to generate the patch-* files.
 @@ -17,27 +17,27 @@
 # 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.
+#
 ###########################################################################
 ###########################################################################
 DISTNAME=	libtool-1.5.26
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
-MAINTAINER=	joerg@NetBSD.org
+OWNER=		joerg@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/libtool/libtool.html
 #LICENSE=	gnu-gpl-v2
 CONFLICTS=	glibtool-[0-9]*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 DISTINFO_FILE=	${.CURDIR}/../libtool/distinfo
 PATCHDIR=	${.CURDIR}/../libtool/patches