In the libtool configure script, the basename of the compiler is used

to make decisions about which compiler is being used (gcc, SunPro, etc).
To make this function "correctly" in the presence of the compiler wrapper
scripts, we need to extract the actual compiler command from the wrapper
frame work.  So adapt the section in the configure script which already
attempts to deal with some other compiler wrappers to deal with the pkgsrc
wrappers.

This should address PR pkg/33467 and PR pkg/34581.

Bump PKGREVISION.

4 files changed, 310 insertions, 349 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index de108cc7fd6..ff281a8be65 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.68 2006/08/23 19:49:12 jschauma Exp $
+$NetBSD: distinfo,v 1.69 2006/12/15 11:28:51 dmcmahill Exp $
 
 SHA1 (libtool-1.5.22.tar.gz) = 17353e66aeaac80ae188ea0a3a90609550ce3254
 RMD160 (libtool-1.5.22.tar.gz) = 7cbe793ee0509908daac928b4dc3a0f16f7293bf
 Size (libtool-1.5.22.tar.gz) = 2921483 bytes
 SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = e8cf42513805e70a96536c55921c230a7e5244b1
+SHA1 (patch-ab) = 146f7c6a3c4b0863246cee70f0294765472bfbc8
 SHA1 (patch-ac) = 40d18dfe690ad7b76f1dae98df55fdc7e46ccd10
-SHA1 (patch-ad) = 22b871497d955b2de26a632513a11f3dd16e7286
+SHA1 (patch-ad) = 70b560a1f419938a6d93358f3f74805df13de3b1
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 1be0bc58ca3..872cad31add 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,9 +1,19 @@
-$NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.20 2006/12/15 11:28:51 dmcmahill Exp $
 
---- libtool.m4.orig	2005-12-18 16:53:17.000000000 -0500
-+++ libtool.m4
-@@ -392,11 +392,11 @@ else
+--- libtool.m4.orig	2005-12-18 21:53:17.000000000 +0000
++++ libtool.m4	2006-12-12 21:49:49.000000000 +0000
+@@ -249,5 +249,9 @@
+   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-%%"`
+ ])
  
+@@ -393,9 +397,9 @@
    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' &&
@@ -15,17 +25,13 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 +      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.
-@@ -1289,6 +1289,7 @@ beos*)
- bsdi[[45]]*)
+@@ -1290,4 +1294,5 @@
    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'
-@@ -1414,15 +1415,16 @@ freebsd* | dragonfly*)
-     *) objformat=elf ;;
+@@ -1415,13 +1420,14 @@
      esac
    fi
 -  version_type=freebsd-$objformat
@@ -46,18 +52,14 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
-   esac
-@@ -1440,7 +1442,7 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
+@@ -1441,5 +1447,5 @@
      hardcode_into_libs=yes
      ;;
 -  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-     ;;
-@@ -1518,12 +1520,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -1519,10 +1525,5 @@
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -69,9 +71,7 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-   need_version=no
-@@ -1600,11 +1597,11 @@ knetbsd*-gnu)
-   ;;
+@@ -1601,9 +1602,9 @@
  
  netbsd*)
 -  version_type=sunos
@@ -83,27 +83,21 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 +    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
-@@ -1635,7 +1632,7 @@ nto-qnx*)
-   ;;
+@@ -1636,5 +1637,5 @@
  
  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.
-@@ -1643,7 +1640,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -1644,5 +1645,5 @@
      *)                         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}${shared_ext}$versuffix2'
    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
-@@ -1832,9 +1829,7 @@ if test -f "$ltmain" && test -n "$tagnam
- 
+@@ -1833,7 +1834,5 @@
        case $tagname in
        CXX)
 -	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
@@ -112,9 +106,7 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 +        if test -n "$CXX" && test "X$CXX" != "Xno"; then
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
- 	  tagname=""
-@@ -2580,22 +2575,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
- # ---------------
+@@ -2581,20 +2580,8 @@
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
 -AC_REQUIRE([_LT_AC_PROG_CXXCPP])
@@ -136,27 +128,21 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 -
  # AC_LIBTOOL_F77
  # --------------
- # enable support for Fortran 77 libraries
-@@ -2732,7 +2715,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+@@ -2733,5 +2720,5 @@
  [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)=
-@@ -3080,7 +3063,7 @@ case $host_os in
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -3081,5 +3068,5 @@
            _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
-@@ -3377,14 +3360,29 @@ case $host_os in
-     ;;
+@@ -3378,12 +3365,27 @@
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +      # a.out is quite broken and goes directly to ld
@@ -186,9 +172,7 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 -    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
-@@ -3872,6 +3870,12 @@ interix3*)
-   _LT_AC_TAGVAR(postdeps,$1)=
+@@ -3873,4 +3875,10 @@
    ;;
  
 +netbsd*)
@@ -199,9 +183,7 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 +
  solaris*)
    case $cc_basename in
-   CC*)
-@@ -4847,9 +4851,11 @@ AC_MSG_CHECKING([for $compiler option to
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -4848,7 +4856,9 @@
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -212,9 +194,7 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 +      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
        ;;
      *djgpp*)
-       # DJGPP does not support shared libraries at all
-@@ -5122,9 +5128,11 @@ AC_MSG_CHECKING([for $compiler option to
-       ;;
+@@ -5123,7 +5133,9 @@
  
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -225,13 +205,10 @@ $NetBSD: manual-libtool.m4,v 1.19 2006/02/06 18:57:30 tv Exp $
 +      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=''
        ;;
  
-     interix3*)
-@@ -5850,7 +5858,7 @@ _LT_EOF
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -5851,5 +5863,5 @@
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index e7e486bc5e2..846bef81baa 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,17 +1,14 @@
-$NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
+$NetBSD: patch-ab,v 1.58 2006/12/15 11:28:51 dmcmahill Exp $
 
---- configure.orig	2006-02-06 13:54:53.000000000 -0500
-+++ configure
-@@ -76,7 +76,6 @@ if test "x$as_myself" = x; then
-   as_myself=$0
+--- configure.orig	2005-12-18 22:13:49.000000000 +0000
++++ configure	2006-12-12 21:54:12.000000000 +0000
+@@ -77,5 +77,4 @@
  fi
  if test ! -f "$as_myself"; then
 -  # FIXME: next line outputs $as_me, which is still unset.
    { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
     { (exit 1); exit 1; }; }
- fi
-@@ -589,11 +588,11 @@ else
- 
+@@ -590,9 +589,9 @@
    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' &&
@@ -23,9 +20,7 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +      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.
-@@ -1918,8 +1917,7 @@ esac
- ## ------------------------ ##
+@@ -1919,6 +1918,5 @@
  ## Automake Initialisation. ##
  ## ------------------------ ##
 -am__api_version='1.9a'
@@ -33,9 +28,7 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +am__api_version="1.9"
  ac_aux_dir=
  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-   if test -f $ac_dir/install-sh; then
-@@ -2096,30 +2094,26 @@ echo "$as_me: WARNING: \`missing' script
- fi
+@@ -2097,28 +2095,24 @@
  
  if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
 -  # We used to define $(mkdir_p) as `mkdir -p -- .', in order to
@@ -78,27 +71,21 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +  # exists.
    for d in ./-p ./--version;
    do
-     test -d $d && rmdir $d
-@@ -2260,7 +2254,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
- 
+@@ -2261,5 +2255,5 @@
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 +install_sh=${install_sh-"$am_aux_dir/install-sh"}
  
  # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'.  However `strip' might not be the right
-@@ -2360,7 +2354,7 @@ else
- fi
+@@ -2361,5 +2355,5 @@
  
  fi
 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
  
  # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
-@@ -6599,12 +6593,7 @@ fi
- 
+@@ -6600,10 +6594,5 @@
  done
  
 -
@@ -110,18 +97,25 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6838,8 +6827,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6839,6 +6828,4 @@
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
 -fi
 -
  
  
+@@ -7566,5 +7553,9 @@
+   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-%%"`
+ 
  
-@@ -7866,9 +7853,11 @@ echo $ECHO_N "checking for $compiler opt
-       ;;
+@@ -7867,7 +7858,9 @@
  
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -132,26 +126,31 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +      lt_prog_compiler_static=''
        ;;
  
-     interix3*)
-@@ -8828,7 +8817,7 @@ if test -z "$aix_libpath"; then aix_libp
-          archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -8273,5 +8266,9 @@
+   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
+@@ -8829,5 +8826,5 @@
           module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
-@@ -9358,6 +9347,7 @@ beos*)
- bsdi[45]*)
+@@ -9359,4 +9356,5 @@
    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'
-@@ -9483,15 +9473,16 @@ freebsd* | dragonfly*)
-     *) objformat=elf ;;
+@@ -9484,13 +9482,14 @@
      esac
    fi
 -  version_type=freebsd-$objformat
@@ -172,18 +171,14 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
-   esac
-@@ -9509,7 +9500,7 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
+@@ -9510,5 +9509,5 @@
      hardcode_into_libs=yes
      ;;
 -  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-     ;;
-@@ -9587,12 +9578,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -9588,10 +9587,5 @@
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -195,9 +190,7 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-   need_version=no
-@@ -9669,11 +9655,11 @@ knetbsd*-gnu)
-   ;;
+@@ -9670,9 +9664,9 @@
  
  netbsd*)
 -  version_type=sunos
@@ -209,27 +202,21 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +    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
-@@ -9704,7 +9690,7 @@ nto-qnx*)
-   ;;
+@@ -9705,5 +9699,5 @@
  
  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.
-@@ -9712,7 +9698,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -9713,5 +9707,5 @@
      *)                         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}${shared_ext}$versuffix2'
    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
-@@ -11304,9 +11290,7 @@ echo "$as_me: error: tag name \"$tagname
- 
+@@ -11305,7 +11299,5 @@
        case $tagname in
        CXX)
 -	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
@@ -238,18 +225,25 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +        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'
-@@ -11903,7 +11887,7 @@ if test -z "$aix_libpath"; then aix_libp
-           archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -11412,5 +11404,9 @@
+   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-%%"`
+ 
+ 
+@@ -11904,5 +11900,5 @@
            module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
-@@ -12200,14 +12184,29 @@ if test -z "$aix_libpath"; then aix_libp
-     ;;
+@@ -12201,12 +12197,27 @@
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +      # a.out is quite broken and goes directly to ld
@@ -279,9 +273,7 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 -    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
-@@ -12643,6 +12642,12 @@ interix3*)
-   postdeps_CXX=
+@@ -12644,4 +12655,10 @@
    ;;
  
 +netbsd*)
@@ -292,9 +284,7 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +
  solaris*)
    case $cc_basename in
-   CC*)
-@@ -12695,9 +12700,11 @@ echo $ECHO_N "checking for $compiler opt
-       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+@@ -12696,7 +12713,9 @@
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -305,17 +295,13 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +      lt_prog_compiler_static_CXX=''
        ;;
      *djgpp*)
-       # DJGPP does not support shared libraries at all
-@@ -13317,6 +13324,7 @@ beos*)
- bsdi[45]*)
+@@ -13318,4 +13337,5 @@
    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'
-@@ -13442,15 +13450,16 @@ freebsd* | dragonfly*)
-     *) objformat=elf ;;
+@@ -13443,13 +13463,14 @@
      esac
    fi
 -  version_type=freebsd-$objformat
@@ -336,18 +322,14 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
-   esac
-@@ -13468,7 +13477,7 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
+@@ -13469,5 +13490,5 @@
      hardcode_into_libs=yes
      ;;
 -  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-     ;;
-@@ -13546,12 +13555,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -13547,10 +13568,5 @@
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -359,9 +341,7 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-   need_version=no
-@@ -13628,11 +13632,11 @@ knetbsd*-gnu)
-   ;;
+@@ -13629,9 +13645,9 @@
  
  netbsd*)
 -  version_type=sunos
@@ -373,27 +353,32 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +    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
-@@ -13663,7 +13667,7 @@ nto-qnx*)
-   ;;
+@@ -13664,5 +13680,5 @@
  
  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.
-@@ -13671,7 +13675,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -13672,5 +13688,5 @@
      *)                         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}${shared_ext}$versuffix2'
    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
-@@ -14436,9 +14440,11 @@ echo $ECHO_N "checking for $compiler opt
-       ;;
+@@ -14358,5 +14374,9 @@
+   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-%%"`
+ 
+ 
+@@ -14437,7 +14457,9 @@
  
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -404,26 +389,31 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +      lt_prog_compiler_static_F77=''
        ;;
  
-     interix3*)
-@@ -15378,7 +15384,7 @@ if test -z "$aix_libpath"; then aix_libp
-          archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -14843,5 +14865,9 @@
+   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
+@@ -15379,5 +15405,5 @@
           module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
-@@ -15908,6 +15914,7 @@ beos*)
- bsdi[45]*)
+@@ -15909,4 +15935,5 @@
    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'
-@@ -16033,15 +16040,16 @@ freebsd* | dragonfly*)
-     *) objformat=elf ;;
+@@ -16034,13 +16061,14 @@
      esac
    fi
 -  version_type=freebsd-$objformat
@@ -444,18 +434,14 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
-   esac
-@@ -16059,7 +16067,7 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
+@@ -16060,5 +16088,5 @@
      hardcode_into_libs=yes
      ;;
 -  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-     ;;
-@@ -16137,12 +16145,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -16138,10 +16166,5 @@
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -467,9 +453,7 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-   need_version=no
-@@ -16219,11 +16222,11 @@ knetbsd*-gnu)
-   ;;
+@@ -16220,9 +16243,9 @@
  
  netbsd*)
 -  version_type=sunos
@@ -481,27 +465,32 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +    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
-@@ -16254,7 +16257,7 @@ nto-qnx*)
-   ;;
+@@ -16255,5 +16278,5 @@
  
  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.
-@@ -16262,7 +16265,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -16263,5 +16286,5 @@
      *)                         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}${shared_ext}$versuffix2'
    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
-@@ -17018,9 +17021,11 @@ echo $ECHO_N "checking for $compiler opt
-       ;;
+@@ -16916,5 +16939,9 @@
+   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-%%"`
+ 
+ 
+@@ -17019,7 +17046,9 @@
  
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -512,26 +501,31 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +      lt_prog_compiler_static_GCJ=''
        ;;
  
-     interix3*)
-@@ -17980,7 +17985,7 @@ if test -z "$aix_libpath"; then aix_libp
-          archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -17425,5 +17454,9 @@
+   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
+@@ -17981,5 +18014,5 @@
           module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
-@@ -18510,6 +18515,7 @@ beos*)
- bsdi[45]*)
+@@ -18511,4 +18544,5 @@
    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'
-@@ -18635,15 +18641,16 @@ freebsd* | dragonfly*)
-     *) objformat=elf ;;
+@@ -18636,13 +18670,14 @@
      esac
    fi
 -  version_type=freebsd-$objformat
@@ -552,18 +546,14 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
-   esac
-@@ -18661,7 +18668,7 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
+@@ -18662,5 +18697,5 @@
      hardcode_into_libs=yes
      ;;
 -  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-     ;;
-@@ -18739,12 +18746,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -18740,10 +18775,5 @@
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -575,9 +565,7 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-   need_version=no
-@@ -18821,11 +18823,11 @@ knetbsd*-gnu)
-   ;;
+@@ -18822,9 +18852,9 @@
  
  netbsd*)
 -  version_type=sunos
@@ -589,30 +577,34 @@ $NetBSD: patch-ab,v 1.57 2006/02/06 18:57:30 tv Exp $
 +    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
-@@ -18856,7 +18858,7 @@ nto-qnx*)
-   ;;
+@@ -18857,5 +18887,5 @@
  
  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.
-@@ -18864,7 +18866,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -18865,5 +18895,5 @@
      *)                         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}${shared_ext}$versuffix2'
    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
-@@ -20250,7 +20252,6 @@ if test "x$as_myself" = x; then
-   as_myself=$0
+@@ -19517,5 +19547,9 @@
+   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
+@@ -20251,5 +20285,4 @@
  fi
  if test ! -f "$as_myself"; then
 -  # FIXME: next line outputs $as_me, which is still unset.
    { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
     { (exit 1); exit 1; }; }
- fi
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 4e4c899cc4b..4b481b44edf 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,17 +1,14 @@
-$NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
+$NetBSD: patch-ad,v 1.30 2006/12/15 11:28:52 dmcmahill Exp $
 
---- libltdl/configure.orig	2006-02-06 13:54:53.000000000 -0500
-+++ libltdl/configure
-@@ -76,7 +76,6 @@ if test "x$as_myself" = x; then
-   as_myself=$0
+--- libltdl/configure.orig	2005-12-18 22:13:59.000000000 +0000
++++ libltdl/configure	2006-12-12 21:55:15.000000000 +0000
+@@ -77,5 +77,4 @@
  fi
  if test ! -f "$as_myself"; then
 -  # FIXME: next line outputs $as_me, which is still unset.
    { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
     { (exit 1); exit 1; }; }
- fi
-@@ -589,11 +588,11 @@ else
- 
+@@ -590,9 +589,9 @@
    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' &&
@@ -23,9 +20,7 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +      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.
-@@ -1927,8 +1926,7 @@ fi
- ## ------------------------ ##
+@@ -1928,6 +1927,5 @@
  ## Automake Initialisation. ##
  ## ------------------------ ##
 -am__api_version='1.9a'
@@ -33,9 +28,7 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +am__api_version="1.9"
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -2080,30 +2078,26 @@ echo "$as_me: WARNING: \`missing' script
- fi
+@@ -2081,28 +2079,24 @@
  
  if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
 -  # We used to define $(mkdir_p) as `mkdir -p -- .', in order to
@@ -78,27 +71,21 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +  # exists.
    for d in ./-p ./--version;
    do
-     test -d $d && rmdir $d
-@@ -2235,7 +2229,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
- 
+@@ -2236,5 +2230,5 @@
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 +install_sh=${install_sh-"$am_aux_dir/install-sh"}
  
  # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'.  However `strip' might not be the right
-@@ -2335,7 +2329,7 @@ else
- fi
+@@ -2336,5 +2330,5 @@
  
  fi
 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
  
  # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
-@@ -6221,12 +6215,7 @@ else
- fi
+@@ -6222,10 +6216,5 @@
  
  
 -
@@ -110,18 +97,25 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6460,8 +6449,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6461,6 +6450,4 @@
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
 -fi
 -
  
  ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-@@ -7739,9 +7726,11 @@ echo $ECHO_N "checking for $compiler opt
-       ;;
+@@ -7439,5 +7426,9 @@
+   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-%%"`
+ 
+ 
+@@ -7740,7 +7731,9 @@
  
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -132,26 +126,31 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +      lt_prog_compiler_static=''
        ;;
  
-     interix3*)
-@@ -8701,7 +8690,7 @@ if test -z "$aix_libpath"; then aix_libp
-          archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -8146,5 +8139,9 @@
+   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
+@@ -8702,5 +8699,5 @@
           module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
-@@ -9231,6 +9220,7 @@ beos*)
- bsdi[45]*)
+@@ -9232,4 +9229,5 @@
    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'
-@@ -9356,15 +9346,16 @@ freebsd* | dragonfly*)
-     *) objformat=elf ;;
+@@ -9357,13 +9355,14 @@
      esac
    fi
 -  version_type=freebsd-$objformat
@@ -172,18 +171,14 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
-   esac
-@@ -9382,7 +9373,7 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
+@@ -9383,5 +9382,5 @@
      hardcode_into_libs=yes
      ;;
 -  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-     ;;
-@@ -9460,12 +9451,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -9461,10 +9460,5 @@
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -195,9 +190,7 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-   need_version=no
-@@ -9542,11 +9528,11 @@ knetbsd*-gnu)
-   ;;
+@@ -9543,9 +9537,9 @@
  
  netbsd*)
 -  version_type=sunos
@@ -209,27 +202,21 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +    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
-@@ -9577,7 +9563,7 @@ nto-qnx*)
-   ;;
+@@ -9578,5 +9572,5 @@
  
  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.
-@@ -9585,7 +9571,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -9586,5 +9580,5 @@
      *)                         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}${shared_ext}$versuffix2'
    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
-@@ -11177,9 +11163,7 @@ echo "$as_me: error: tag name \"$tagname
- 
+@@ -11178,7 +11172,5 @@
        case $tagname in
        CXX)
 -	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
@@ -238,18 +225,25 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +        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'
-@@ -11776,7 +11760,7 @@ if test -z "$aix_libpath"; then aix_libp
-           archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -11285,5 +11277,9 @@
+   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-%%"`
+ 
+ 
+@@ -11777,5 +11773,5 @@
            module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
-@@ -12073,14 +12057,29 @@ if test -z "$aix_libpath"; then aix_libp
-     ;;
+@@ -12074,12 +12070,27 @@
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +      # a.out is quite broken and goes directly to ld
@@ -279,9 +273,7 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 -    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
-@@ -12516,6 +12515,12 @@ interix3*)
-   postdeps_CXX=
+@@ -12517,4 +12528,10 @@
    ;;
  
 +netbsd*)
@@ -292,9 +284,7 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +
  solaris*)
    case $cc_basename in
-   CC*)
-@@ -12568,9 +12573,11 @@ echo $ECHO_N "checking for $compiler opt
-       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+@@ -12569,7 +12586,9 @@
        ;;
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -305,17 +295,13 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +      lt_prog_compiler_static_CXX=''
        ;;
      *djgpp*)
-       # DJGPP does not support shared libraries at all
-@@ -13190,6 +13197,7 @@ beos*)
- bsdi[45]*)
+@@ -13191,4 +13210,5 @@
    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'
-@@ -13315,15 +13323,16 @@ freebsd* | dragonfly*)
-     *) objformat=elf ;;
+@@ -13316,13 +13336,14 @@
      esac
    fi
 -  version_type=freebsd-$objformat
@@ -336,18 +322,14 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
-   esac
-@@ -13341,7 +13350,7 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
+@@ -13342,5 +13363,5 @@
      hardcode_into_libs=yes
      ;;
 -  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-     ;;
-@@ -13419,12 +13428,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -13420,10 +13441,5 @@
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -359,9 +341,7 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-   need_version=no
-@@ -13501,11 +13505,11 @@ knetbsd*-gnu)
-   ;;
+@@ -13502,9 +13518,9 @@
  
  netbsd*)
 -  version_type=sunos
@@ -373,27 +353,32 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +    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
-@@ -13536,7 +13540,7 @@ nto-qnx*)
-   ;;
+@@ -13537,5 +13553,5 @@
  
  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.
-@@ -13544,7 +13548,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -13545,5 +13561,5 @@
      *)                         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}${shared_ext}$versuffix2'
    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
-@@ -14309,9 +14313,11 @@ echo $ECHO_N "checking for $compiler opt
-       ;;
+@@ -14231,5 +14247,9 @@
+   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-%%"`
+ 
+ 
+@@ -14310,7 +14330,9 @@
  
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -404,26 +389,31 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +      lt_prog_compiler_static_F77=''
        ;;
  
-     interix3*)
-@@ -15251,7 +15257,7 @@ if test -z "$aix_libpath"; then aix_libp
-          archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -14716,5 +14738,9 @@
+   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
+@@ -15252,5 +15278,5 @@
           module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
-@@ -15781,6 +15787,7 @@ beos*)
- bsdi[45]*)
+@@ -15782,4 +15808,5 @@
    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'
-@@ -15906,15 +15913,16 @@ freebsd* | dragonfly*)
-     *) objformat=elf ;;
+@@ -15907,13 +15934,14 @@
      esac
    fi
 -  version_type=freebsd-$objformat
@@ -444,18 +434,14 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
-   esac
-@@ -15932,7 +15940,7 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
+@@ -15933,5 +15961,5 @@
      hardcode_into_libs=yes
      ;;
 -  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-     ;;
-@@ -16010,12 +16018,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -16011,10 +16039,5 @@
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -467,9 +453,7 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-   need_version=no
-@@ -16092,11 +16095,11 @@ knetbsd*-gnu)
-   ;;
+@@ -16093,9 +16116,9 @@
  
  netbsd*)
 -  version_type=sunos
@@ -481,27 +465,32 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +    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
-@@ -16127,7 +16130,7 @@ nto-qnx*)
-   ;;
+@@ -16128,5 +16151,5 @@
  
  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.
-@@ -16135,7 +16138,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -16136,5 +16159,5 @@
      *)                         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}${shared_ext}$versuffix2'
    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
-@@ -16891,9 +16894,11 @@ echo $ECHO_N "checking for $compiler opt
-       ;;
+@@ -16789,5 +16812,9 @@
+   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-%%"`
+ 
+ 
+@@ -16892,7 +16919,9 @@
  
      darwin* | rhapsody*)
 -      # PIC is the default on this platform
@@ -512,26 +501,31 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +      lt_prog_compiler_static_GCJ=''
        ;;
  
-     interix3*)
-@@ -17853,7 +17858,7 @@ if test -z "$aix_libpath"; then aix_libp
-          archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+@@ -17298,5 +17327,9 @@
+   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
+@@ -17854,5 +17887,5 @@
           module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
-        *)
-@@ -18383,6 +18388,7 @@ beos*)
- bsdi[45]*)
+@@ -18384,4 +18417,5 @@
    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'
-@@ -18508,15 +18514,16 @@ freebsd* | dragonfly*)
-     *) objformat=elf ;;
+@@ -18509,13 +18543,14 @@
      esac
    fi
 -  version_type=freebsd-$objformat
@@ -552,18 +546,14 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
-   esac
-@@ -18534,7 +18541,7 @@ freebsd* | dragonfly*)
-     shlibpath_overrides_runpath=no
+@@ -18535,5 +18570,5 @@
      hardcode_into_libs=yes
      ;;
 -  freebsd*) # from 4.6 on
 +  *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-     ;;
-@@ -18612,12 +18619,7 @@ interix3*)
- irix5* | irix6* | nonstopux*)
+@@ -18613,10 +18648,5 @@
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
 -    *)
@@ -575,9 +565,7 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +    *) version_type=irix ;;
    esac
    need_lib_prefix=no
-   need_version=no
-@@ -18694,11 +18696,11 @@ knetbsd*-gnu)
-   ;;
+@@ -18695,9 +18725,9 @@
  
  netbsd*)
 -  version_type=sunos
@@ -589,30 +577,34 @@ $NetBSD: patch-ad,v 1.29 2006/02/06 18:57:30 tv Exp $
 +    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
-@@ -18729,7 +18731,7 @@ nto-qnx*)
-   ;;
+@@ -18730,5 +18760,5 @@
  
  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.
-@@ -18737,7 +18739,7 @@ openbsd*)
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+@@ -18738,5 +18768,5 @@
      *)                         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}${shared_ext}$versuffix2'
    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
-@@ -22719,7 +22721,6 @@ if test "x$as_myself" = x; then
-   as_myself=$0
+@@ -19390,5 +19420,9 @@
+   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
+@@ -22720,5 +22754,4 @@
  fi
  if test ! -f "$as_myself"; then
 -  # FIXME: next line outputs $as_me, which is still unset.
    { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
     { (exit 1); exit 1; }; }
- fi