Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10

in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.

6 files changed, 390 insertions, 417 deletions

diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 19504c2234a..c2dd2ea72c5 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.52 2004/05/25 18:59:06 skrll Exp $
+# $NetBSD: Makefile.common,v 1.53 2004/10/03 00:13:31 tv Exp $
 #
 
-DISTNAME=	libtool-1.5.6
+DISTNAME=	libtool-1.5.10
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
 
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index dd159063200..68e562c8149 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.44 2004/05/25 15:17:07 grant Exp $
+$NetBSD: distinfo,v 1.45 2004/10/03 00:13:31 tv Exp $
 
-SHA1 (libtool-1.5.6.tar.gz) = 6018b2661725e9689d7f782c5a2a489e928698ba
-Size (libtool-1.5.6.tar.gz) = 2665434 bytes
+SHA1 (libtool-1.5.10.tar.gz) = bb2cab7f405c5eb08ab8ba193cbac59ebe6e6e9e
+Size (libtool-1.5.10.tar.gz) = 2699923 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = fae19da5c435255d9ae262930ed70bc43516a631
-SHA1 (patch-ac) = 998846b81d9e69d4ff469d644377a57f83a1adc1
-SHA1 (patch-ad) = b784b1d67f6e48da6d225d3c7054e5371eab3f56
+SHA1 (patch-ab) = b6602584eb17c343838af13c706961ffeae7745a
+SHA1 (patch-ac) = e5cb5ca2303ebb82bb17db6c785580c23db2c6d3
+SHA1 (patch-ad) = 10c4330056c6a7c20bff0ed81407c21a5ac00b32
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 6318b2093d0..531a269754d 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,30 +1,28 @@
-$NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
+$NetBSD: manual-libtool.m4,v 1.5 2004/10/03 00:13:31 tv Exp $
 
---- libtool.m4.orig	Thu Apr  1 22:46:14 2004
+--- libtool.m4.orig	2004-09-19 08:15:08.000000000 -0400
 +++ libtool.m4
-@@ -1183,8 +1183,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -1201,6 +1201,7 @@ beos*)
+ bsdi[[45]]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -1300,15 +1301,15 @@ kfreebsd*-gnu)
+@@ -1315,16 +1316,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -32,15 +30,16 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -1384,15 +1385,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -1400,15 +1402,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -60,47 +59,38 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -1428,7 +1436,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -1485,11 +1494,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1552,7 +1560,7 @@ sco3.2v5*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -1520,10 +1529,10 @@ nto-qnx*)
    ;;
  
- solaris*)
--  version_type=linux
-+  version_type=sunos
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2110,10 +2118,13 @@ beos*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
-+# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
-+bsdi1*|bsdi2*|bsdi3*)
-+  dynamic_linker=no
-+  ;;  
-+
-+bsdi*)  
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- cygwin*)
-@@ -2171,6 +2182,10 @@ hpux10.20* | hpux11*)
+-  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
+@@ -2198,6 +2207,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -111,7 +101,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -3089,6 +3104,8 @@ case $host_os in
+@@ -3091,6 +3104,8 @@ case $host_os in
  	;;
      esac
      ;;
@@ -120,7 +110,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -3197,6 +3214,13 @@ case $host_os in
+@@ -3210,6 +3225,13 @@ case $host_os in
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
@@ -134,7 +124,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -3622,6 +3646,14 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3651,6 +3673,14 @@ if AC_TRY_EVAL(ac_compile); then
      esac
    done
  
@@ -149,7 +139,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -4555,9 +4587,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4591,9 +4621,11 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -162,7 +152,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4579,6 +4613,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4615,6 +4647,10 @@ AC_MSG_CHECKING([for $compiler option to
  	;;
        esac
        ;;
@@ -173,7 +163,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -4643,6 +4681,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4689,6 +4725,8 @@ AC_MSG_CHECKING([for $compiler option to
  	    ;;
  	esac
  	;;
@@ -182,7 +172,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -4808,9 +4848,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4854,9 +4892,11 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
  
      darwin* | rhapsody*)
@@ -195,7 +185,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
        ;;
  
      msdosdjgpp*)
-@@ -4839,6 +4881,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4885,6 +4925,11 @@ AC_MSG_CHECKING([for $compiler option to
        esac
        ;;
  
@@ -207,7 +197,7 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5131,6 +5178,17 @@ EOF
+@@ -5187,6 +5232,17 @@ EOF
        fi
        ;;
  
@@ -225,12 +215,10 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw 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'
-@@ -5534,6 +5592,20 @@ $echo "local: *; };" >> $output_objdir/$
- 	  ;;
- 	esac
+@@ -5592,6 +5648,20 @@ $echo "local: *; };" >> $output_objdir/$
        fi
-+      ;;
-+
+       ;;
+ 
 +    interix3*)
 +      # Oy, what a hack.
 +      # Because shlibs are not compiled -fPIC due to broken code, we must
@@ -243,6 +231,8 @@ $NetBSD: manual-libtool.m4,v 1.4 2004/04/23 01:17:25 danw Exp $
 +      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-h,$libdir'
 +      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
++      ;;
++
      irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 3f92c20f725..ba8a0c1e12b 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,26 +1,8 @@
-$NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
+$NetBSD: patch-ab,v 1.40 2004/10/03 00:13:31 tv Exp $
 
---- configure.orig	2004-04-11 15:35:42.000000000 +1000
+--- configure.orig	2004-09-19 08:22:04.000000000 -0400
 +++ configure
-@@ -4440,10 +4440,13 @@ beos*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
--  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
-+# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
-+bsdi1*|bsdi2*|bsdi3*)
-+  dynamic_linker=no
-+  ;;
-+
-+bsdi*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- cygwin*)
-@@ -4501,6 +4504,10 @@ hpux10.20* | hpux11*)
+@@ -4534,6 +4534,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -31,7 +13,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -6857,9 +6864,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6909,9 +6913,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -44,7 +26,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        ;;
  
      msdosdjgpp*)
-@@ -6888,6 +6897,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6940,6 +6946,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -56,7 +38,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7263,6 +7277,17 @@ EOF
+@@ -7325,6 +7336,17 @@ EOF
        fi
        ;;
  
@@ -74,7 +56,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7770,6 +7795,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7832,6 +7854,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -95,29 +77,27 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant 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'
-@@ -8158,8 +8197,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -8223,6 +8259,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -8275,15 +8315,15 @@ kfreebsd*-gnu)
+@@ -8337,16 +8374,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -125,15 +105,16 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -8359,15 +8399,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8422,15 +8460,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -153,38 +134,38 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8403,7 +8450,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8507,11 +8552,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8482,7 +8529,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -8542,10 +8587,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  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
-@@ -8527,7 +8574,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10777,6 +10824,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10817,6 +10862,8 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -193,7 +174,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10885,6 +10934,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10936,6 +10983,13 @@ if test -z "$aix_libpath"; then aix_libp
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
@@ -207,7 +188,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        hardcode_libdir_flag_spec_CXX='-R$libdir'
        hardcode_direct_CXX=yes
        hardcode_shlibpath_var_CXX=no
-@@ -11257,6 +11313,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11324,6 +11378,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -222,7 +203,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11304,9 +11368,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11371,9 +11433,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -235,7 +216,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11328,6 +11394,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11395,6 +11459,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -246,7 +227,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11392,6 +11462,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11469,6 +11537,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -255,29 +236,27 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11860,8 +11932,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -11939,6 +12009,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -11977,15 +12050,15 @@ kfreebsd*-gnu)
+@@ -12053,16 +12124,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -285,15 +264,16 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -12061,15 +12134,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12138,15 +12210,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -313,38 +293,38 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12105,7 +12185,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -12223,11 +12302,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12184,7 +12264,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -12258,10 +12337,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  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
-@@ -12229,7 +12309,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -13728,9 +13808,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13805,9 +13884,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -357,7 +337,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13759,6 +13841,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13836,6 +13917,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -369,7 +349,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14134,6 +14221,17 @@ EOF
+@@ -14221,6 +14307,17 @@ EOF
        fi
        ;;
  
@@ -387,7 +367,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14621,6 +14719,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14708,6 +14805,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -408,29 +388,27 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant 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'
-@@ -15009,8 +15121,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -15099,6 +15210,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -15126,15 +15239,15 @@ kfreebsd*-gnu)
+@@ -15213,16 +15325,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -438,15 +416,16 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -15210,15 +15323,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15298,15 +15411,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -466,38 +445,38 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15254,7 +15374,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -15383,11 +15503,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15333,7 +15453,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -15418,10 +15538,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  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
-@@ -15378,7 +15498,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -16059,9 +16179,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16147,9 +16267,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -510,7 +489,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16090,6 +16212,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16178,6 +16300,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -522,7 +501,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16465,6 +16592,17 @@ EOF
+@@ -16563,6 +16690,17 @@ EOF
        fi
        ;;
  
@@ -540,7 +519,7 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16972,6 +17110,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17070,6 +17208,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -561,29 +540,27 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant 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'
-@@ -17360,8 +17512,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -17461,6 +17613,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -17477,15 +17630,15 @@ kfreebsd*-gnu)
+@@ -17575,16 +17728,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -591,15 +568,16 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -17561,15 +17714,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17660,15 +17814,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -619,34 +597,34 @@ $NetBSD: patch-ab,v 1.39 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17605,7 +17765,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -17745,11 +17906,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17684,7 +17844,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -17780,10 +17941,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  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
-@@ -17729,7 +17889,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 61704587a41..d3d87622abe 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
+$NetBSD: patch-ac,v 1.13 2004/10/03 00:13:31 tv Exp $
 
---- ltmain.sh.orig	Sun Apr 11 01:44:45 2004
+--- ltmain.sh.orig	2004-09-19 08:34:44.000000000 -0400
 +++ ltmain.sh
-@@ -192,10 +192,26 @@ func_infer_tag () {
+@@ -197,10 +197,26 @@ func_infer_tag () {
        case $@ in
        # Blanks in the command may have been stripped by the calling shell,
        # but not from the CC environment variable when configure was run.
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
  	for z in $available_tags; do
  	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
  	    # Evaluate the configuration.
-@@ -231,8 +247,6 @@ func_infer_tag () {
+@@ -236,8 +252,6 @@ func_infer_tag () {
  #        else
  #          $echo "$modename: using $tagname tagged configuration"
  	fi
@@ -38,8 +38,8 @@ $NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
 -      esac
      fi
  }
- # End of Shell function definitions
-@@ -401,7 +415,7 @@ if test -z "$show_help"; then
+ 
+@@ -522,7 +536,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
@@ -48,7 +48,7 @@ $NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
        mode=link
        for arg
        do
-@@ -1185,6 +1199,13 @@ EOF
+@@ -1306,6 +1320,13 @@ EOF
  	    exit $EXIT_FAILURE
  	    ;;
  	  esac
@@ -62,18 +62,15 @@ $NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $
  	  if test "$prev" = rpath; then
  	    case "$rpath " in
  	    *" $arg "*) ;;
-@@ -2983,8 +3004,8 @@ EOF
- 	darwin)
- 	  # Like Linux, but with the current version available in
- 	  # verstring for coding it into the library header
--	  major=.`expr $current - $age`
--	  versuffix="$major.$age.$revision"
-+	  major=".$current"
-+	  versuffix=".$current.$revision"
- 	  # Darwin ld doesn't like 0 for these options...
- 	  minor_current=`expr $current + 1`
- 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-@@ -5384,8 +5405,16 @@ relink_command=\"$relink_command\""
+@@ -3168,6 +3189,7 @@ EOF
+ 	linux)
+ 	  major=.`expr $current - $age`
+ 	  versuffix="$major.$age.$revision"
++	  versuffix2="$major.$age"
+ 	  ;;
+ 
+ 	osf)
+@@ -5364,8 +5386,16 @@ relink_command=\"$relink_command\""
        exit $EXIT_FAILURE
      fi
  
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 0cae03c5f8e..f98815b732c 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,26 +1,8 @@
-$NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
+$NetBSD: patch-ad,v 1.13 2004/10/03 00:13:31 tv Exp $
 
---- libltdl/configure.orig	2004-04-11 15:36:50.000000000 +1000
+--- libltdl/configure.orig	2004-09-19 08:23:09.000000000 -0400
 +++ libltdl/configure
-@@ -3652,10 +3652,13 @@ beos*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
--  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
-+# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
-+bsdi1*|bsdi2*|bsdi3*)
-+  dynamic_linker=no
-+  ;;
-+
-+bsdi*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- cygwin*)
-@@ -3713,6 +3716,10 @@ hpux10.20* | hpux11*)
+@@ -3739,6 +3739,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -31,7 +13,20 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -6795,6 +6802,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6814,9 +6818,11 @@ echo $ECHO_N "checking for $compiler opt
+       ;;
+ 
+     darwin* | rhapsody*)
+-      # PIC is the default on this platform
++      # PIC is the default on this platform, and static linking of
++      # binaries generally doesn't work
+       # Common symbols not allowed in MH_DYLIB files
+       lt_prog_compiler_pic='-fno-common'
++      lt_prog_compiler_static=''
+       ;;
+ 
+     msdosdjgpp*)
+@@ -6845,6 +6851,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -43,7 +38,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7170,6 +7182,17 @@ EOF
+@@ -7230,6 +7241,17 @@ EOF
        fi
        ;;
  
@@ -61,7 +56,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7677,6 +7700,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7737,6 +7759,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -82,29 +77,27 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant 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'
-@@ -8065,8 +8102,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -8128,6 +8164,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -8182,15 +8220,15 @@ kfreebsd*-gnu)
+@@ -8242,16 +8279,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -112,15 +105,16 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -8266,15 +8304,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8327,15 +8365,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -140,38 +134,38 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8310,7 +8355,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8412,11 +8457,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8389,7 +8434,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -8447,10 +8492,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  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
-@@ -8434,7 +8479,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10684,6 +10729,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10722,6 +10767,8 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -180,7 +174,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10792,6 +10839,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10841,6 +10888,13 @@ if test -z "$aix_libpath"; then aix_libp
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
@@ -194,7 +188,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
        hardcode_libdir_flag_spec_CXX='-R$libdir'
        hardcode_direct_CXX=yes
        hardcode_shlibpath_var_CXX=no
-@@ -11164,6 +11218,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11229,6 +11283,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -209,7 +203,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11211,9 +11273,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11276,9 +11338,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -222,7 +216,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11235,6 +11299,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11300,6 +11364,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -233,7 +227,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11299,6 +11367,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11374,6 +11442,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -242,29 +236,27 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11767,8 +11837,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -11844,6 +11914,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -11884,15 +11955,15 @@ kfreebsd*-gnu)
+@@ -11958,16 +12029,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -272,15 +264,16 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -11968,15 +12039,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12043,15 +12115,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -300,38 +293,51 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12012,7 +12090,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -12128,11 +12207,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12091,7 +12169,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -12163,10 +12242,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  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
-@@ -12136,7 +12214,7 @@ sco3.2v5*)
-   ;;
+@@ -13710,9 +13789,11 @@ echo $ECHO_N "checking for $compiler opt
+       ;;
  
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -13666,6 +13744,11 @@ echo $ECHO_N "checking for $compiler opt
+     darwin* | rhapsody*)
+-      # PIC is the default on this platform
++      # PIC is the default on this platform, and static linking of
++      # binaries generally doesn't work
+       # Common symbols not allowed in MH_DYLIB files
+       lt_prog_compiler_pic_F77='-fno-common'
++      lt_prog_compiler_static_F77=''
+       ;;
+ 
+     msdosdjgpp*)
+@@ -13741,6 +13822,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -343,7 +349,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14041,6 +14124,17 @@ EOF
+@@ -14126,6 +14212,17 @@ EOF
        fi
        ;;
  
@@ -361,7 +367,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14528,6 +14622,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14613,6 +14710,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -382,29 +388,27 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant 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'
-@@ -14916,8 +15024,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -15004,6 +15115,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -15033,15 +15142,15 @@ kfreebsd*-gnu)
+@@ -15118,16 +15230,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -412,15 +416,16 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -15117,15 +15226,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15203,15 +15316,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -440,38 +445,51 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15161,7 +15277,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -15288,11 +15408,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15240,7 +15356,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -15323,10 +15443,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  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
-@@ -15285,7 +15401,7 @@ sco3.2v5*)
-   ;;
+@@ -16052,9 +16172,11 @@ echo $ECHO_N "checking for $compiler opt
+       ;;
  
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15997,6 +16113,11 @@ echo $ECHO_N "checking for $compiler opt
+     darwin* | rhapsody*)
+-      # PIC is the default on this platform
++      # PIC is the default on this platform, and static linking of
++      # binaries generally doesn't work
+       # Common symbols not allowed in MH_DYLIB files
+       lt_prog_compiler_pic_GCJ='-fno-common'
++      lt_prog_compiler_static_GCJ=''
+       ;;
+ 
+     msdosdjgpp*)
+@@ -16083,6 +16205,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -483,7 +501,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16372,6 +16493,17 @@ EOF
+@@ -16468,6 +16595,17 @@ EOF
        fi
        ;;
  
@@ -501,7 +519,7 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16879,6 +17011,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16975,6 +17113,20 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -522,29 +540,27 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant 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'
-@@ -17267,8 +17413,9 @@ beos*)
-   ;;
- 
- bsdi4*)
--  version_type=linux
-+  version_type=sunos
+@@ -17366,6 +17518,7 @@ beos*)
+ bsdi[45]*)
+   version_type=linux
    need_version=no
 +  need_lib_prefix=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -17384,15 +17531,15 @@ kfreebsd*-gnu)
+@@ -17480,16 +17633,17 @@ kfreebsd*-gnu)
+   ;;
  
  freebsd*)
++  version_type=linux
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  case $objformat in
 +    elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +      soname_spec='${libname}${release}${shared_ext}$major'
        need_version=no
        need_lib_prefix=no
@@ -552,15 +568,16 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 +    *)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -17468,15 +17615,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17565,15 +17719,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
 +interix3*)
-+  version_type=sunos
++  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -580,43 +597,34 @@ $NetBSD: patch-ad,v 1.12 2004/05/25 15:17:07 grant Exp $
 -	else
 -		version_type=irix
 -	fi ;;
-+    *) version_type=sunos ;;
++    *) version_type=irix ;;
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17512,7 +17666,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -17650,11 +17811,11 @@ knetbsd*-gnu)
+   ;;
  
- # This must be Linux ELF.
- linux*)
--  version_type=linux
-+  version_type=sunos
+ netbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
    need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17591,7 +17745,7 @@ openbsd*)
-   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -17685,10 +17846,10 @@ nto-qnx*)
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
++  version_type=linux
    need_lib_prefix=no
-   need_version=yes
+   need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  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
-@@ -17636,7 +17790,7 @@ sco3.2v5*)
-   ;;
- 
- solaris*)
--  version_type=linux
-+  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19858,7 +20012,7 @@ if test "${libltdl_cv_shlibext+set}" = s
- else
- 
- module=yes
--eval libltdl_cv_shlibext=$shrext_cmds
-+eval libltdl_cv_shlibext=$shrext
- 
- fi
- echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5