Changes 1.5.18:

* Fix regression in 1.5.16 to not install libtldl data files from
  `libtoolize --ltdl'ed software packages.
* Bug Fixes.

Changes 1.5.16:
* Allow shell special characters like `$' in source file names, but not
  in object names, to enhance GCJ support.
* Detection of compiler wrappers like distcc/ccache and $host_alias prefix.
* More robust tests for PIC flag, `-c -o', in presence of warnings.
* Bug Fixes, among others for convenience archives regression on Solaris
  and timestamp-preserving `libtoolize --copy --ltdl'.

6 files changed, 161 insertions, 130 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index f4dac2839d4..7de6f9e36fa 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.61 2005/04/11 21:45:28 tv Exp $
-#
+# $NetBSD: Makefile.common,v 1.62 2005/05/18 11:57:12 adam Exp $
 
-DISTNAME=	libtool-1.5.14
+DISTNAME=	libtool-1.5.18
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
 
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 7f5adb742db..903ee28b8dd 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.57 2005/03/22 15:12:07 tv Exp $
+$NetBSD: distinfo,v 1.58 2005/05/18 11:57:12 adam Exp $
 
-SHA1 (libtool-1.5.14.tar.gz) = 0c8935aa80cd5532aa8e5462157cc07ae26a3862
-RMD160 (libtool-1.5.14.tar.gz) = f26606366a76a5703929ed1785f745f69bceb8c6
-Size (libtool-1.5.14.tar.gz) = 2732031 bytes
-SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = df27e4db60447ccad850dcc3318ffee33f60ad23
-SHA1 (patch-ac) = f98adcd50cc5a62e60a0514d5cac90bebf179157
-SHA1 (patch-ad) = d0aa264da58272e34bfda137875309abf3db37a4
+SHA1 (libtool-1.5.18.tar.gz) = 9eae4a25cf386f2dd3937f215368c9cc090009df
+RMD160 (libtool-1.5.18.tar.gz) = facff15723bb89b0e260def31354fe437430bf3b
+Size (libtool-1.5.18.tar.gz) = 2780846 bytes
+SHA1 (patch-aa) = 36f589c09c492bc688bdfbb97f0d375cd04c008d
+SHA1 (patch-ab) = f717ce4a2c72dc18aaaf05fb07d0c7db2706e752
+SHA1 (patch-ac) = 381f835a8fe188d3b038de074a61502bc8f4a27a
+SHA1 (patch-ad) = 0c2c402fffe43056f8b632ba2e59da26772f3794
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index 68c188acd54..34222fb0180 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.33 2004/02/05 20:14:06 skrll Exp $
+$NetBSD: patch-aa,v 1.34 2005/05/18 11:57:12 adam Exp $
 
---- Makefile.in.orig	2004-01-25 12:36:36.000000000 +0000
+--- Makefile.in.orig	Mon May 16 11:33:40 2005
 +++ Makefile.in
-@@ -202,7 +202,7 @@ subdirs = @subdirs@
+@@ -211,7 +211,7 @@ subdirs = @subdirs@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  AUTOMAKE_OPTIONS = 1.3e gnu
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 3f356e8a9ce..e51172ab3a0 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
+$NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
 
---- configure.orig	2005-02-28 12:31:33.000000000 -0500
+--- configure.orig	Mon May 16 11:33:42 2005
 +++ configure
 @@ -322,11 +322,11 @@ else
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv 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.
-@@ -4534,6 +4534,10 @@ hpux10.20* | hpux11*)
+@@ -4522,6 +4522,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -5690,12 +5694,7 @@ fi
+@@ -5674,12 +5678,7 @@ fi
  
  done
  
@@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
  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'
-@@ -5925,8 +5924,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
+@@ -5909,8 +5908,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
  
  
  
-@@ -6921,9 +6918,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6936,9 +6933,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -63,7 +63,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -6952,6 +6951,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6967,6 +6966,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -75,7 +75,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7349,6 +7353,17 @@ EOF
+@@ -7435,6 +7439,17 @@ EOF
        fi
        ;;
  
@@ -93,7 +93,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7754,7 +7769,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7798,7 +7813,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'
           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 ld's
@@ -102,7 +102,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
            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}'
            ;;
         *)
-@@ -7869,6 +7884,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7913,6 +7928,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -124,7 +124,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv 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'
-@@ -8260,6 +8290,7 @@ beos*)
+@@ -8316,6 +8346,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -132,7 +132,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv 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'
-@@ -8377,15 +8408,16 @@ freebsd* | dragonfly*)
+@@ -8433,15 +8464,16 @@ freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -155,7 +155,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -8461,15 +8493,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8517,15 +8549,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -184,7 +184,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8546,11 +8585,11 @@ knetbsd*-gnu)
+@@ -8602,11 +8641,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -198,20 +198,24 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -8581,10 +8620,10 @@ nto-qnx*)
+@@ -8637,14 +8676,14 @@ nto-qnx*)
    ;;
  
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    need_lib_prefix=no
-   need_version=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   case $host_os in
+     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+     *)                         need_version=no  ;;
+   esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${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
-@@ -10150,9 +10189,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -10203,9 +10242,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -222,7 +226,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10707,7 +10744,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10781,7 +10818,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'
            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 ld's
@@ -231,7 +235,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
            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}'
            ;;
         *)
-@@ -10865,6 +10902,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10939,6 +10976,16 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -247,8 +251,8 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
 +    ;;
    irix5* | irix6*)
      case $cc_basename in
-       CC)
-@@ -10994,14 +11041,29 @@ if test -z "$aix_libpath"; then aix_libp
+       CC*)
+@@ -11069,14 +11116,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -280,7 +284,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -11384,6 +11446,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11463,6 +11525,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -302,7 +306,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11431,9 +11508,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11510,9 +11587,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -315,7 +319,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11455,6 +11534,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11534,6 +11613,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -326,7 +330,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11529,6 +11612,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11608,6 +11691,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -334,8 +338,8 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
 +	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
- 	  CC)
-@@ -12005,6 +12090,7 @@ beos*)
+ 	  CC*)
+@@ -12088,6 +12173,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -343,7 +347,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv 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'
-@@ -12122,15 +12208,16 @@ freebsd* | dragonfly*)
+@@ -12205,15 +12291,16 @@ freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -366,7 +370,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -12206,15 +12293,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12289,15 +12376,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -395,7 +399,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12291,11 +12385,11 @@ knetbsd*-gnu)
+@@ -12374,11 +12468,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -409,20 +413,24 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12326,10 +12420,10 @@ nto-qnx*)
+@@ -12409,14 +12503,14 @@ nto-qnx*)
    ;;
  
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    need_lib_prefix=no
-   need_version=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   case $host_os in
+     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+     *)                         need_version=no  ;;
+   esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${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
-@@ -13879,9 +13973,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13984,9 +14078,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -435,7 +443,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13910,6 +14006,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14015,6 +14111,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -447,7 +455,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14307,6 +14408,17 @@ EOF
+@@ -14483,6 +14584,17 @@ EOF
        fi
        ;;
  
@@ -465,7 +473,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14692,7 +14804,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14826,7 +14938,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'
           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 ld's
@@ -474,7 +482,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
            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}'
            ;;
         *)
-@@ -14807,6 +14919,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14941,6 +15053,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -496,7 +504,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv 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'
-@@ -15198,6 +15325,7 @@ beos*)
+@@ -15344,6 +15471,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -504,7 +512,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv 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'
-@@ -15315,15 +15443,16 @@ freebsd* | dragonfly*)
+@@ -15461,15 +15589,16 @@ freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -527,7 +535,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -15399,15 +15528,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15545,15 +15674,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -556,7 +564,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15484,11 +15620,11 @@ knetbsd*-gnu)
+@@ -15630,11 +15766,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -570,20 +578,24 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -15519,10 +15655,10 @@ nto-qnx*)
+@@ -15665,14 +15801,14 @@ nto-qnx*)
    ;;
  
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    need_lib_prefix=no
-   need_version=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   case $host_os in
+     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+     *)                         need_version=no  ;;
+   esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${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
-@@ -16254,9 +16390,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16432,9 +16568,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -596,7 +608,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16285,6 +16423,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16463,6 +16601,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -608,7 +620,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16682,6 +16825,17 @@ EOF
+@@ -16931,6 +17074,17 @@ EOF
        fi
        ;;
  
@@ -626,7 +638,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -17087,7 +17241,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17294,7 +17448,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'
           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 ld's
@@ -635,7 +647,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
            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}'
            ;;
         *)
-@@ -17202,6 +17356,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17409,6 +17563,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -657,7 +669,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv 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'
-@@ -17593,6 +17762,7 @@ beos*)
+@@ -17812,6 +17981,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -665,7 +677,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv 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'
-@@ -17710,15 +17880,16 @@ freebsd* | dragonfly*)
+@@ -17929,15 +18099,16 @@ freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -688,7 +700,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -17794,15 +17965,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -18013,15 +18184,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -717,7 +729,7 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17879,11 +18057,11 @@ knetbsd*-gnu)
+@@ -18098,11 +18276,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -731,14 +743,18 @@ $NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -17914,10 +18092,10 @@ nto-qnx*)
+@@ -18133,14 +18311,14 @@ nto-qnx*)
    ;;
  
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    need_lib_prefix=no
-   need_version=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   case $host_os in
+     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+     *)                         need_version=no  ;;
+   esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 093de057ad0..4bccf3d3336 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.17 2005/03/22 15:12:08 tv Exp $
+$NetBSD: patch-ac,v 1.18 2005/05/18 11:57:12 adam Exp $
 
---- ltmain.sh.orig	2005-02-12 07:30:57.000000000 -0500
+--- ltmain.sh.orig	Mon May 16 11:39:29 2005
 +++ ltmain.sh
-@@ -187,6 +187,31 @@ func_win32_libid ()
+@@ -188,6 +188,31 @@ func_win32_libid ()
  # arg is usually of the form 'gcc ...'
  func_infer_tag ()
  {
@@ -34,7 +34,7 @@ $NetBSD: patch-ac,v 1.17 2005/03/22 15:12:08 tv Exp $
      if test -n "$available_tags" && test -z "$tagname"; then
        CC_quoted=
        for arg in $CC; do
-@@ -227,6 +252,27 @@ func_infer_tag ()
+@@ -228,6 +253,27 @@ func_infer_tag ()
  	      break
  	      ;;
  	    esac
@@ -62,7 +62,7 @@ $NetBSD: patch-ac,v 1.17 2005/03/22 15:12:08 tv Exp $
  	  fi
  	done
  	# If $tagname still isn't set, then no tagged configuration
-@@ -534,7 +580,7 @@ if test -z "$show_help"; then
+@@ -512,7 +558,7 @@ if test -z "$show_help"; then
      $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
      $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
      case $nonopt in
@@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.17 2005/03/22 15:12:08 tv Exp $
        mode=link
        for arg
        do
-@@ -1321,6 +1367,13 @@ EOF
+@@ -1313,6 +1359,13 @@ EOF
  	    exit $EXIT_FAILURE
  	    ;;
  	  esac
@@ -85,7 +85,7 @@ $NetBSD: patch-ac,v 1.17 2005/03/22 15:12:08 tv Exp $
  	  if test "$prev" = rpath; then
  	    case "$rpath " in
  	    *" $arg "*) ;;
-@@ -3206,6 +3259,7 @@ EOF
+@@ -3202,6 +3255,7 @@ EOF
  	linux)
  	  major=.`expr $current - $age`
  	  versuffix="$major.$age.$revision"
@@ -93,7 +93,7 @@ $NetBSD: patch-ac,v 1.17 2005/03/22 15:12:08 tv Exp $
  	  ;;
  
  	osf)
-@@ -5422,8 +5476,16 @@ relink_command=\"$relink_command\""
+@@ -5462,8 +5516,16 @@ relink_command=\"$relink_command\""
        exit $EXIT_FAILURE
      fi
  
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 14837d1d7f9..f91d3c67073 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
+$NetBSD: patch-ad,v 1.23 2005/05/18 11:57:12 adam Exp $
 
---- libltdl/configure.orig	2005-02-28 12:31:43.000000000 -0500
+--- libltdl/configure.orig	Mon May 16 11:34:15 2005
 +++ libltdl/configure
 @@ -322,11 +322,11 @@ else
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv 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.
-@@ -3739,6 +3739,10 @@ hpux10.20* | hpux11*)
+@@ -3731,6 +3731,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -5359,12 +5363,7 @@ else
+@@ -5343,12 +5347,7 @@ else
  fi
  
  
@@ -41,7 +41,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
  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'
-@@ -5594,8 +5593,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
+@@ -5578,8 +5577,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
  
  ac_ext=f
  ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-@@ -6826,9 +6823,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6839,9 +6836,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -63,7 +63,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -6857,6 +6856,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6870,6 +6869,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -75,7 +75,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7254,6 +7258,17 @@ EOF
+@@ -7338,6 +7342,17 @@ EOF
        fi
        ;;
  
@@ -93,7 +93,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7659,7 +7674,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7701,7 +7716,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'
           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 ld's
@@ -102,7 +102,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
            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}'
            ;;
         *)
-@@ -7774,6 +7789,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7816,6 +7831,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -124,7 +124,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv 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'
-@@ -8165,6 +8195,7 @@ beos*)
+@@ -8219,6 +8249,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -132,7 +132,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv 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'
-@@ -8282,15 +8313,16 @@ freebsd* | dragonfly*)
+@@ -8336,15 +8367,16 @@ freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -155,7 +155,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -8366,15 +8398,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8420,15 +8452,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -184,7 +184,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8451,11 +8490,11 @@ knetbsd*-gnu)
+@@ -8505,11 +8544,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -198,20 +198,24 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -8486,10 +8525,10 @@ nto-qnx*)
+@@ -8540,14 +8579,14 @@ nto-qnx*)
    ;;
  
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    need_lib_prefix=no
-   need_version=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   case $host_os in
+     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+     *)                         need_version=no  ;;
+   esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${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
-@@ -10055,9 +10094,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -10106,9 +10145,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -222,7 +226,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10612,7 +10649,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10684,7 +10721,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'
            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 ld's
@@ -231,7 +235,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
            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}'
            ;;
         *)
-@@ -10770,6 +10807,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10842,6 +10879,16 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -247,8 +251,8 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
 +    ;;
    irix5* | irix6*)
      case $cc_basename in
-       CC)
-@@ -10899,14 +10946,29 @@ if test -z "$aix_libpath"; then aix_libp
+       CC*)
+@@ -10972,14 +11019,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -280,7 +284,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -11289,6 +11351,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11366,6 +11428,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -302,7 +306,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11336,9 +11413,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11413,9 +11490,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -315,7 +319,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11360,6 +11439,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11437,6 +11516,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -326,7 +330,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11434,6 +11517,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11511,6 +11594,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -334,8 +338,8 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
 +	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
- 	  CC)
-@@ -11910,6 +11995,7 @@ beos*)
+ 	  CC*)
+@@ -11991,6 +12076,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -343,7 +347,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv 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'
-@@ -12027,15 +12113,16 @@ freebsd* | dragonfly*)
+@@ -12108,15 +12194,16 @@ freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -366,7 +370,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -12111,15 +12198,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12192,15 +12279,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -395,7 +399,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12196,11 +12290,11 @@ knetbsd*-gnu)
+@@ -12277,11 +12371,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -409,20 +413,24 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12231,10 +12325,10 @@ nto-qnx*)
+@@ -12312,14 +12406,14 @@ nto-qnx*)
    ;;
  
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    need_lib_prefix=no
-   need_version=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   case $host_os in
+     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+     *)                         need_version=no  ;;
+   esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${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
-@@ -13784,9 +13878,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13887,9 +13981,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -435,7 +443,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13815,6 +13911,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13918,6 +14014,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -447,7 +455,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14212,6 +14313,17 @@ EOF
+@@ -14386,6 +14487,17 @@ EOF
        fi
        ;;
  
@@ -465,7 +473,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14597,7 +14709,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14729,7 +14841,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'
           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 ld's
@@ -474,7 +482,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
            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}'
            ;;
         *)
-@@ -14712,6 +14824,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14844,6 +14956,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -496,7 +504,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv 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'
-@@ -15103,6 +15230,7 @@ beos*)
+@@ -15247,6 +15374,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -504,7 +512,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv 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'
-@@ -15220,15 +15348,16 @@ freebsd* | dragonfly*)
+@@ -15364,15 +15492,16 @@ freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -527,7 +535,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -15304,15 +15433,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15448,15 +15577,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -556,7 +564,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15389,11 +15525,11 @@ knetbsd*-gnu)
+@@ -15533,11 +15669,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -570,20 +578,24 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -15424,10 +15560,10 @@ nto-qnx*)
+@@ -15568,14 +15704,14 @@ nto-qnx*)
    ;;
  
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    need_lib_prefix=no
-   need_version=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   case $host_os in
+     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+     *)                         need_version=no  ;;
+   esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${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
-@@ -16159,9 +16295,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16335,9 +16471,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -596,7 +608,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16190,6 +16328,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16366,6 +16504,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -608,7 +620,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16587,6 +16730,17 @@ EOF
+@@ -16834,6 +16977,17 @@ EOF
        fi
        ;;
  
@@ -626,7 +638,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16992,7 +17146,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17197,7 +17351,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'
           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 ld's
@@ -635,7 +647,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
            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}'
            ;;
         *)
-@@ -17107,6 +17261,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17312,6 +17466,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -657,7 +669,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv 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'
-@@ -17498,6 +17667,7 @@ beos*)
+@@ -17715,6 +17884,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -665,7 +677,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv 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'
-@@ -17615,15 +17785,16 @@ freebsd* | dragonfly*)
+@@ -17832,15 +18002,16 @@ freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -688,7 +700,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -17699,15 +17870,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17916,15 +18087,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -717,7 +729,7 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17784,11 +17962,11 @@ knetbsd*-gnu)
+@@ -18001,11 +18179,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -731,14 +743,18 @@ $NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -17819,10 +17997,10 @@ nto-qnx*)
+@@ -18036,14 +18214,14 @@ nto-qnx*)
    ;;
  
  openbsd*)
 -  version_type=sunos
 +  version_type=linux
    need_lib_prefix=no
-   need_version=no
+   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   case $host_os in
+     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+     *)                         need_version=no  ;;
+   esac
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'