Restore basename override to get the name of the real compiler for the

decision making in libtool. This was lost during the update and broke
the build of shared C++ libraries with SunPro on Solaris. Bump revision
of libtool-base.

Noticed by salo and dmcmahill, tested by dmcmahill.

3 files changed, 364 insertions, 216 deletions

diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index aa074e03a74..2a39a94dac2 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,8 +1,30 @@
-$NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.22 2007/10/07 12:31: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
 
 --- libtool.m4.orig	2007-06-24 04:19:11.000000000 +0200
 +++ libtool.m4
-@@ -402,11 +402,11 @@ else
+@@ -248,8 +248,11 @@ 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-%%"`
+ ])
+ 
+ 
+ # _LT_COMPILER_BOILERPLATE
+@@ -402,11 +405,11 @@ else
  
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
@@ -16,7 +38,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
      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.
-@@ -1351,6 +1351,7 @@ beos*)
+@@ -1351,6 +1354,7 @@ beos*)
  bsdi[[45]]*)
    version_type=linux
    need_version=no
@@ -24,7 +46,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -1449,7 +1450,7 @@ freebsd1*)
+@@ -1449,7 +1453,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -33,7 +55,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -1463,7 +1464,7 @@ freebsd* | dragonfly*)
+@@ -1463,7 +1467,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -42,7 +64,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -1493,6 +1494,16 @@ freebsd* | dragonfly*)
+@@ -1493,6 +1497,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -59,7 +81,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -1561,15 +1572,22 @@ interix[[3-9]]*)
+@@ -1561,15 +1575,22 @@ interix[[3-9]]*)
    hardcode_into_libs=yes
    ;;
  
@@ -88,7 +110,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -1634,11 +1652,11 @@ linux* | k*bsd*-gnu)
+@@ -1634,11 +1655,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -102,7 +124,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -1663,13 +1681,14 @@ nto-qnx*)
+@@ -1663,13 +1684,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}'
@@ -118,7 +140,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -1677,7 +1696,7 @@ openbsd*)
+@@ -1677,7 +1699,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -127,7 +149,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -1871,9 +1890,7 @@ if test -f "$ltmain" && test -n "$tagnam
+@@ -1871,9 +1893,7 @@ if test -f "$ltmain" && test -n "$tagnam
  
        case $tagname in
        CXX)
@@ -138,7 +160,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -2392,6 +2409,10 @@ interix[[3-9]]*)
+@@ -2392,6 +2412,10 @@ interix[[3-9]]*)
    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
    ;;
  
@@ -149,7 +171,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -2422,7 +2443,7 @@ newos6*)
+@@ -2422,7 +2446,7 @@ newos6*)
    ;;
  
  nto-qnx*)
@@ -158,7 +180,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
    ;;
  
  openbsd*)
-@@ -2629,21 +2650,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+@@ -2629,21 +2653,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -181,7 +203,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -2781,7 +2791,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+@@ -2781,7 +2794,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -190,7 +212,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -3294,6 +3304,16 @@ case $host_os in
+@@ -3294,6 +3307,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'
      ;;
@@ -207,7 +229,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -3447,14 +3467,29 @@ case $host_os in
+@@ -3447,14 +3470,29 @@ case $host_os in
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -239,7 +261,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -3767,6 +3802,11 @@ case $host_os in
+@@ -3767,6 +3805,11 @@ case $host_os in
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -251,7 +273,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
    *)
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3928,6 +3968,21 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3928,6 +3971,21 @@ if AC_TRY_EVAL(ac_compile); then
      esac
    done
  
@@ -273,7 +295,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -4966,9 +5021,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4966,9 +5024,11 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -286,7 +308,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4994,6 +5051,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4994,6 +5054,10 @@ AC_MSG_CHECKING([for $compiler option to
  	;;
        esac
        ;;
@@ -297,7 +319,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5072,6 +5133,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5072,6 +5136,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?
  	;;
@@ -306,7 +328,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC*)
-@@ -5211,6 +5274,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5211,6 +5277,8 @@ AC_MSG_CHECKING([for $compiler option to
  	;;
        vxworks*)
  	;;
@@ -315,7 +337,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
        *)
  	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
  	;;
-@@ -5251,9 +5316,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5251,9 +5319,11 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
  
      darwin* | rhapsody*)
@@ -328,7 +350,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
        ;;
  
      interix[[3-9]]*)
-@@ -5287,6 +5354,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5287,6 +5357,11 @@ AC_MSG_CHECKING([for $compiler option to
        esac
        ;;
  
@@ -340,7 +362,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5441,6 +5513,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -5441,6 +5516,10 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -351,7 +373,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
        ;;
-@@ -5719,6 +5795,17 @@ EOF
+@@ -5719,6 +5798,17 @@ EOF
        fi
        ;;
  
@@ -369,7 +391,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
      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'
-@@ -5784,6 +5871,11 @@ _LT_EOF
+@@ -5784,6 +5874,11 @@ _LT_EOF
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
@@ -381,7 +403,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
      *)
        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'
-@@ -6139,6 +6231,21 @@ _LT_EOF
+@@ -6139,6 +6234,21 @@ _LT_EOF
        fi
        ;;
  
@@ -403,7 +425,7 @@ $NetBSD: manual-libtool.m4,v 1.21 2007/09/15 12:11:45 joerg Exp $
      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'
-@@ -6364,6 +6471,13 @@ _LT_EOF
+@@ -6364,6 +6474,13 @@ _LT_EOF
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 0d70d9462f9..10f4ed3d93e 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
+$NetBSD: patch-ab,v 1.60 2007/10/07 12:31:59 joerg Exp $
 
---- configure.orig	2007-09-14 11:49:46.000000000 +0200
+--- configure.orig	2007-10-05 18:47:50.000000000 +0200
 +++ configure
 @@ -630,11 +630,11 @@ else
  
@@ -59,18 +59,19 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
  
  
  
-@@ -7668,10 +7665,6 @@ _lt_linker_boilerplate=`cat conftest.err
- $rm conftest*
- 
- 
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
+@@ -7462,7 +7459,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_prog_compiler_no_builtin_flag=
  
-@@ -7765,9 +7758,11 @@ echo $ECHO_N "checking for $compiler opt
+ # Only perform the check for file, if the check method requires it
+@@ -7765,9 +7765,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -83,7 +84,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -7801,6 +7796,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7801,6 +7803,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -95,7 +96,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7955,6 +7955,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7955,6 +7962,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -106,7 +107,19 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared=no
        ;;
-@@ -8360,6 +8364,17 @@ EOF
+@@ -8191,7 +8202,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*)
+@@ -8360,6 +8374,17 @@ EOF
        fi
        ;;
  
@@ -124,7 +137,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -8425,6 +8440,11 @@ _LT_EOF
+@@ -8425,6 +8450,11 @@ _LT_EOF
        hardcode_shlibpath_var=no
        ;;
  
@@ -136,7 +149,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -8892,6 +8912,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8892,6 +8922,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -158,7 +171,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds='$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'
-@@ -9117,6 +9152,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9117,6 +9162,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        ;;
  
@@ -172,7 +185,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        ld_shlibs=no
        ;;
-@@ -9333,6 +9375,7 @@ beos*)
+@@ -9333,6 +9385,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -180,7 +193,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -9431,7 +9474,7 @@ freebsd1*)
+@@ -9431,7 +9484,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -189,7 +202,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -9445,7 +9488,7 @@ freebsd* | dragonfly*)
+@@ -9445,7 +9498,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -198,7 +211,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -9475,6 +9518,16 @@ freebsd* | dragonfly*)
+@@ -9475,6 +9528,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -215,7 +228,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -9543,15 +9596,22 @@ interix[3-9]*)
+@@ -9543,15 +9606,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -244,7 +257,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -9616,11 +9676,11 @@ linux* | k*bsd*-gnu)
+@@ -9616,11 +9686,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -258,7 +271,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -9645,13 +9705,14 @@ nto-qnx*)
+@@ -9645,13 +9715,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}'
@@ -274,7 +287,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -9659,7 +9720,7 @@ openbsd*)
+@@ -9659,7 +9730,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -283,7 +296,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -11229,9 +11290,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -11229,9 +11300,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -294,7 +307,19 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
  	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11999,6 +12058,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11336,7 +11405,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
+@@ -11999,6 +12071,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'
      ;;
@@ -311,7 +336,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -12152,14 +12221,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12152,14 +12234,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -343,7 +368,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -12472,6 +12556,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12472,6 +12569,11 @@ if test -z "$aix_libpath"; then aix_libp
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -355,18 +380,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    *)
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
-@@ -12484,10 +12573,6 @@ test "$ld_shlibs_CXX" = no && can_build_
- GCC_CXX="$GXX"
- LD_CXX="$LD"
- 
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
- 
- cat > conftest.$ac_ext <<EOF
- class Foo
-@@ -12582,6 +12667,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -12582,6 +12684,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -388,7 +402,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -12687,9 +12787,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12687,9 +12804,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -401,7 +415,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -12715,6 +12817,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12715,6 +12834,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -412,7 +426,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -12793,6 +12899,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12793,6 +12916,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?
  	;;
@@ -421,7 +435,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC*)
-@@ -12932,6 +13040,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12932,6 +13057,8 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        vxworks*)
  	;;
@@ -430,7 +444,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        *)
  	lt_prog_compiler_can_build_shared_CXX=no
  	;;
-@@ -13304,6 +13414,7 @@ beos*)
+@@ -13304,6 +13431,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -438,7 +452,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -13401,7 +13512,7 @@ freebsd1*)
+@@ -13401,7 +13529,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -447,7 +461,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -13415,7 +13526,7 @@ freebsd* | dragonfly*)
+@@ -13415,7 +13543,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -456,7 +470,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -13445,6 +13556,16 @@ freebsd* | dragonfly*)
+@@ -13445,6 +13573,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -473,7 +487,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -13513,15 +13634,22 @@ interix[3-9]*)
+@@ -13513,15 +13651,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -502,7 +516,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -13586,11 +13714,11 @@ linux* | k*bsd*-gnu)
+@@ -13586,11 +13731,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -516,7 +530,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -13615,13 +13743,14 @@ nto-qnx*)
+@@ -13615,13 +13760,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}'
@@ -532,7 +546,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -13629,7 +13758,7 @@ openbsd*)
+@@ -13629,7 +13775,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -541,7 +555,19 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -14408,9 +14537,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14327,7 +14473,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
+@@ -14408,9 +14557,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -554,7 +580,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -14444,6 +14575,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14444,6 +14595,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -566,7 +592,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14598,6 +14734,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14598,6 +14754,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -577,7 +603,19 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared_F77=no
        ;;
-@@ -15003,6 +15143,17 @@ EOF
+@@ -14834,7 +14994,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*)
+@@ -15003,6 +15166,17 @@ EOF
        fi
        ;;
  
@@ -595,7 +633,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -15068,6 +15219,11 @@ _LT_EOF
+@@ -15068,6 +15242,11 @@ _LT_EOF
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -607,7 +645,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        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'
-@@ -15515,6 +15671,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15515,6 +15694,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -629,7 +667,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      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'
-@@ -15740,6 +15911,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15740,6 +15934,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -643,7 +681,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        ld_shlibs_F77=no
        ;;
-@@ -15905,6 +16083,7 @@ beos*)
+@@ -15905,6 +16106,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -651,7 +689,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -16002,7 +16181,7 @@ freebsd1*)
+@@ -16002,7 +16204,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -660,7 +698,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -16016,7 +16195,7 @@ freebsd* | dragonfly*)
+@@ -16016,7 +16218,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -669,7 +707,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -16046,6 +16225,16 @@ freebsd* | dragonfly*)
+@@ -16046,6 +16248,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -686,7 +724,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -16114,15 +16303,22 @@ interix[3-9]*)
+@@ -16114,15 +16326,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -715,7 +753,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -16187,11 +16383,11 @@ linux* | k*bsd*-gnu)
+@@ -16187,11 +16406,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -729,7 +767,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -16216,13 +16412,14 @@ nto-qnx*)
+@@ -16216,13 +16435,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}'
@@ -745,7 +783,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16230,7 +16427,7 @@ openbsd*)
+@@ -16230,7 +16450,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -754,18 +792,19 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -16896,10 +17093,6 @@ archive_cmds_need_lc_GCJ=no
- 
- old_archive_cmds_GCJ=$old_archive_cmds
- 
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
+@@ -16888,7 +17108,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_prog_compiler_no_builtin_flag_GCJ=
  
-@@ -16993,9 +17186,11 @@ echo $ECHO_N "checking for $compiler opt
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+@@ -16993,9 +17216,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -778,7 +817,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -17029,6 +17224,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17029,6 +17254,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -790,7 +829,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -17183,6 +17383,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17183,6 +17413,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -801,7 +840,19 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared_GCJ=no
        ;;
-@@ -17588,6 +17792,17 @@ EOF
+@@ -17419,7 +17653,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*)
+@@ -17588,6 +17825,17 @@ EOF
        fi
        ;;
  
@@ -819,7 +870,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -17653,6 +17868,11 @@ _LT_EOF
+@@ -17653,6 +17901,11 @@ _LT_EOF
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -831,7 +882,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        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'
-@@ -18120,6 +18340,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18120,6 +18373,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -853,7 +904,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      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'
-@@ -18345,6 +18580,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18345,6 +18613,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -867,7 +918,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      *)
        ld_shlibs_GCJ=no
        ;;
-@@ -18510,6 +18752,7 @@ beos*)
+@@ -18510,6 +18785,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -875,7 +926,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -18607,7 +18850,7 @@ freebsd1*)
+@@ -18607,7 +18883,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -884,7 +935,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -18621,7 +18864,7 @@ freebsd* | dragonfly*)
+@@ -18621,7 +18897,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -893,7 +944,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -18651,6 +18894,16 @@ freebsd* | dragonfly*)
+@@ -18651,6 +18927,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -910,7 +961,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -18719,15 +18972,22 @@ interix[3-9]*)
+@@ -18719,15 +19005,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -939,7 +990,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -18792,11 +19052,11 @@ linux* | k*bsd*-gnu)
+@@ -18792,11 +19085,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -953,7 +1004,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -18821,13 +19081,14 @@ nto-qnx*)
+@@ -18821,13 +19114,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}'
@@ -969,7 +1020,7 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -18835,7 +19096,7 @@ openbsd*)
+@@ -18835,7 +19129,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -978,3 +1029,15 @@ $NetBSD: patch-ab,v 1.59 2007/09/15 12:11:45 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -19492,7 +19786,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
+ 
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 70b77400116..890f68c0b6a 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
+$NetBSD: patch-ad,v 1.32 2007/10/07 12:31:59 joerg Exp $
 
---- libltdl/configure.orig	2007-09-14 11:49:53.000000000 +0200
+--- libltdl/configure.orig	2007-10-05 18:47:59.000000000 +0200
 +++ libltdl/configure
 @@ -630,11 +630,11 @@ else
  
@@ -59,18 +59,19 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
  
  ac_ext=f
  ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-@@ -7535,10 +7532,6 @@ _lt_linker_boilerplate=`cat conftest.err
- $rm conftest*
- 
- 
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
+@@ -7329,7 +7326,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_prog_compiler_no_builtin_flag=
  
-@@ -7632,9 +7625,11 @@ echo $ECHO_N "checking for $compiler opt
+ # Only perform the check for file, if the check method requires it
+@@ -7632,9 +7632,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -83,7 +84,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -7668,6 +7663,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7668,6 +7670,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -95,7 +96,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7822,6 +7822,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -7822,6 +7829,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -106,7 +107,19 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared=no
        ;;
-@@ -8227,6 +8231,17 @@ EOF
+@@ -8058,7 +8069,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*)
+@@ -8227,6 +8241,17 @@ EOF
        fi
        ;;
  
@@ -124,7 +137,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -8292,6 +8307,11 @@ _LT_EOF
+@@ -8292,6 +8317,11 @@ _LT_EOF
        hardcode_shlibpath_var=no
        ;;
  
@@ -136,7 +149,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -8759,6 +8779,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8759,6 +8789,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -158,7 +171,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds='$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'
-@@ -8984,6 +9019,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8984,6 +9029,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        ;;
  
@@ -172,7 +185,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        ld_shlibs=no
        ;;
-@@ -9200,6 +9242,7 @@ beos*)
+@@ -9200,6 +9252,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -180,7 +193,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -9298,7 +9341,7 @@ freebsd1*)
+@@ -9298,7 +9351,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -189,7 +202,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -9312,7 +9355,7 @@ freebsd* | dragonfly*)
+@@ -9312,7 +9365,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -198,7 +211,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -9342,6 +9385,16 @@ freebsd* | dragonfly*)
+@@ -9342,6 +9395,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -215,7 +228,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -9410,15 +9463,22 @@ interix[3-9]*)
+@@ -9410,15 +9473,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -244,7 +257,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -9483,11 +9543,11 @@ linux* | k*bsd*-gnu)
+@@ -9483,11 +9553,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -258,7 +271,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -9512,13 +9572,14 @@ nto-qnx*)
+@@ -9512,13 +9582,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}'
@@ -274,7 +287,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -9526,7 +9587,7 @@ openbsd*)
+@@ -9526,7 +9597,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -283,7 +296,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -11096,9 +11157,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -11096,9 +11167,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -294,7 +307,19 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
  	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11866,6 +11925,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11203,7 +11272,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
+@@ -11866,6 +11938,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'
      ;;
@@ -311,7 +336,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC*)
-@@ -12019,14 +12088,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12019,14 +12101,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -343,7 +368,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -12339,6 +12423,11 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12339,6 +12436,11 @@ if test -z "$aix_libpath"; then aix_libp
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -355,18 +380,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    *)
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
-@@ -12351,10 +12440,6 @@ test "$ld_shlibs_CXX" = no && can_build_
- GCC_CXX="$GXX"
- LD_CXX="$LD"
- 
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
- 
- cat > conftest.$ac_ext <<EOF
- class Foo
-@@ -12449,6 +12534,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -12449,6 +12551,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -388,7 +402,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -12554,9 +12654,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12554,9 +12671,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -401,7 +415,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -12582,6 +12684,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12582,6 +12701,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -412,7 +426,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -12660,6 +12766,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12660,6 +12783,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?
  	;;
@@ -421,7 +435,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC*)
-@@ -12799,6 +12907,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12799,6 +12924,8 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        vxworks*)
  	;;
@@ -430,7 +444,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        *)
  	lt_prog_compiler_can_build_shared_CXX=no
  	;;
-@@ -13171,6 +13281,7 @@ beos*)
+@@ -13171,6 +13298,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -438,7 +452,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -13268,7 +13379,7 @@ freebsd1*)
+@@ -13268,7 +13396,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -447,7 +461,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -13282,7 +13393,7 @@ freebsd* | dragonfly*)
+@@ -13282,7 +13410,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -456,7 +470,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -13312,6 +13423,16 @@ freebsd* | dragonfly*)
+@@ -13312,6 +13440,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -473,7 +487,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -13380,15 +13501,22 @@ interix[3-9]*)
+@@ -13380,15 +13518,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -502,7 +516,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -13453,11 +13581,11 @@ linux* | k*bsd*-gnu)
+@@ -13453,11 +13598,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -516,7 +530,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -13482,13 +13610,14 @@ nto-qnx*)
+@@ -13482,13 +13627,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}'
@@ -532,7 +546,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -13496,7 +13625,7 @@ openbsd*)
+@@ -13496,7 +13642,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -541,7 +555,19 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -14275,9 +14404,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14194,7 +14340,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
+@@ -14275,9 +14424,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -554,7 +580,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -14311,6 +14442,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14311,6 +14462,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -566,7 +592,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14465,6 +14601,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14465,6 +14621,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -577,7 +603,19 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared_F77=no
        ;;
-@@ -14870,6 +15010,17 @@ EOF
+@@ -14701,7 +14861,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*)
+@@ -14870,6 +15033,17 @@ EOF
        fi
        ;;
  
@@ -595,7 +633,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14935,6 +15086,11 @@ _LT_EOF
+@@ -14935,6 +15109,11 @@ _LT_EOF
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -607,7 +645,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        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'
-@@ -15382,6 +15538,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15382,6 +15561,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -629,7 +667,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      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'
-@@ -15607,6 +15778,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -15607,6 +15801,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -643,7 +681,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        ld_shlibs_F77=no
        ;;
-@@ -15772,6 +15950,7 @@ beos*)
+@@ -15772,6 +15973,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -651,7 +689,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -15869,7 +16048,7 @@ freebsd1*)
+@@ -15869,7 +16071,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -660,7 +698,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -15883,7 +16062,7 @@ freebsd* | dragonfly*)
+@@ -15883,7 +16085,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -669,7 +707,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -15913,6 +16092,16 @@ freebsd* | dragonfly*)
+@@ -15913,6 +16115,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -686,7 +724,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -15981,15 +16170,22 @@ interix[3-9]*)
+@@ -15981,15 +16193,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -715,7 +753,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -16054,11 +16250,11 @@ linux* | k*bsd*-gnu)
+@@ -16054,11 +16273,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -729,7 +767,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -16083,13 +16279,14 @@ nto-qnx*)
+@@ -16083,13 +16302,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}'
@@ -745,7 +783,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -16097,7 +16294,7 @@ openbsd*)
+@@ -16097,7 +16317,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -754,18 +792,19 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -16763,10 +16960,6 @@ archive_cmds_need_lc_GCJ=no
- 
- old_archive_cmds_GCJ=$old_archive_cmds
- 
--## CAVEAT EMPTOR:
--## There is no encapsulation within the following macros, do not change
--## the running order or otherwise move them around unless you know exactly
--## what you are doing...
+@@ -16755,7 +16975,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_prog_compiler_no_builtin_flag_GCJ=
  
-@@ -16860,9 +17053,11 @@ echo $ECHO_N "checking for $compiler opt
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+@@ -16860,9 +17083,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -778,7 +817,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        ;;
  
      interix[3-9]*)
-@@ -16896,6 +17091,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16896,6 +17121,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -790,7 +829,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -17050,6 +17250,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -17050,6 +17280,10 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -801,7 +840,19 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        lt_prog_compiler_can_build_shared_GCJ=no
        ;;
-@@ -17455,6 +17659,17 @@ EOF
+@@ -17286,7 +17520,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*)
+@@ -17455,6 +17692,17 @@ EOF
        fi
        ;;
  
@@ -819,7 +870,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -17520,6 +17735,11 @@ _LT_EOF
+@@ -17520,6 +17768,11 @@ _LT_EOF
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -831,7 +882,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        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'
-@@ -17987,6 +18207,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17987,6 +18240,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -853,7 +904,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      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'
-@@ -18212,6 +18447,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18212,6 +18480,13 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -867,7 +918,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      *)
        ld_shlibs_GCJ=no
        ;;
-@@ -18377,6 +18619,7 @@ beos*)
+@@ -18377,6 +18652,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -875,7 +926,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -18474,7 +18717,7 @@ freebsd1*)
+@@ -18474,7 +18750,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -884,7 +935,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -18488,7 +18731,7 @@ freebsd* | dragonfly*)
+@@ -18488,7 +18764,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -893,7 +944,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -18518,6 +18761,16 @@ freebsd* | dragonfly*)
+@@ -18518,6 +18794,16 @@ freebsd* | dragonfly*)
    esac
    ;;
  
@@ -910,7 +961,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
  gnu*)
    version_type=linux
    need_lib_prefix=no
-@@ -18586,15 +18839,22 @@ interix[3-9]*)
+@@ -18586,15 +18872,22 @@ interix[3-9]*)
    hardcode_into_libs=yes
    ;;
  
@@ -939,7 +990,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -18659,11 +18919,11 @@ linux* | k*bsd*-gnu)
+@@ -18659,11 +18952,11 @@ linux* | k*bsd*-gnu)
    ;;
  
  netbsd*)
@@ -953,7 +1004,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -18688,13 +18948,14 @@ nto-qnx*)
+@@ -18688,13 +18981,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}'
@@ -969,7 +1020,7 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -18702,7 +18963,7 @@ openbsd*)
+@@ -18702,7 +18996,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*) need_version=yes ;;
      *)                         need_version=no  ;;
    esac
@@ -978,3 +1029,15 @@ $NetBSD: patch-ad,v 1.31 2007/09/15 12:11:45 joerg Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -19359,7 +19653,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
+