Another Interix fubar workaround: C++ libs weren't linking in libtool

because Interix installs completely hosed .la files for libstdc++ and
libsupc++.  Make libtool instead trust g++ to DTRT.

6 files changed, 132 insertions, 87 deletions

diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index c8a04b28031..e55a996c03f 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2004/10/11 16:51:56 tv Exp $
+# $NetBSD: Makefile,v 1.43 2004/10/12 04:41:39 tv Exp $
 #
 
 PKGNAME=	${DISTNAME:C/-/-base-/}
-PKGREVISION=	3
+PKGREVISION=	4
 SVR4_PKGNAME=	ltoob
 
 COMMENT=	Generic shared library support script (the script itself)
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 28b36339a96..42b4ca596e1 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.49 2004/10/11 17:19:53 tv Exp $
+$NetBSD: distinfo,v 1.50 2004/10/12 04:41:39 tv Exp $
 
 SHA1 (libtool-1.5.10.tar.gz) = bb2cab7f405c5eb08ab8ba193cbac59ebe6e6e9e
 Size (libtool-1.5.10.tar.gz) = 2699923 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = 9176d6add4b76a0541b7c7eb0a7dc0f5a5b22e4a
+SHA1 (patch-ab) = eb46985d419849a5bb5aab150ba761fe0113777c
 SHA1 (patch-ac) = e5cb5ca2303ebb82bb17db6c785580c23db2c6d3
-SHA1 (patch-ad) = 44d53b1733ccd1e2f887e7844c66d7119e3ca9de
+SHA1 (patch-ad) = 530dc8b47e2c8d60ef203e07d972e96f64c54df3
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 872aec92f65..a33774bed85 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,4 +1,4 @@
-$NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.10 2004/10/12 04:41:39 tv Exp $
 
 --- libtool.m4.orig	2004-09-19 08:15:08.000000000 -0400
 +++ libtool.m4
@@ -120,7 +120,7 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv Exp $
    ;;
  
 +interix3*)
-+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
 +  ;;
 +
  irix5* | irix6* | nonstopux*)
@@ -158,16 +158,24 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv Exp $
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -3091,6 +3091,8 @@ case $host_os in
+@@ -3091,6 +3091,16 @@ case $host_os in
  	;;
      esac
      ;;
 +  interix3*)
++    # Oy, what a hack.
++    # Because shlibs are not compiled -fPIC due to broken code, we must
++    # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++    # all libraries, leading to runtime relocations -- slow and very
++    # memory consuming.  To do this, we pick a random 256KB-aligned
++    # start address between 0x50000000 and 0x6ffc0000 at link time.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +    ;;
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -3210,6 +3212,13 @@ case $host_os in
+@@ -3210,6 +3220,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=
@@ -181,7 +189,7 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv 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
-@@ -3651,6 +3660,14 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3651,6 +3668,21 @@ if AC_TRY_EVAL(ac_compile); then
      esac
    done
  
@@ -191,12 +199,19 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv Exp $
 +      predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
 +    fi
 +    ;;
++  interix3*)
++    # Interix installs completely hosed .la files for C++, so rather than
++    # hack all around it, let's just trust "g++" to DTRT.
++    predep_objects_CXX=
++    postdep_objects_CXX=
++    postdeps_CXX=
++    ;;
 +  esac
 +
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -4591,9 +4608,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4591,9 +4623,11 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -209,7 +224,7 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4615,6 +4634,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4615,6 +4649,10 @@ AC_MSG_CHECKING([for $compiler option to
  	;;
        esac
        ;;
@@ -220,7 +235,7 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -4689,6 +4712,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4689,6 +4727,8 @@ AC_MSG_CHECKING([for $compiler option to
  	    ;;
  	esac
  	;;
@@ -229,7 +244,7 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -4854,9 +4879,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4854,9 +4894,11 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
  
      darwin* | rhapsody*)
@@ -242,7 +257,7 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -4885,6 +4912,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4885,6 +4927,11 @@ AC_MSG_CHECKING([for $compiler option to
        esac
        ;;
  
@@ -254,7 +269,7 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5187,6 +5219,17 @@ EOF
+@@ -5187,6 +5234,17 @@ EOF
        fi
        ;;
  
@@ -272,7 +287,7 @@ $NetBSD: manual-libtool.m4,v 1.9 2004/10/11 17:19:53 tv 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'
-@@ -5592,6 +5635,21 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5592,6 +5650,21 @@ $echo "local: *; };" >> $output_objdir/$
        fi
        ;;
  
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index f7e8702f324..df19e77d85b 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
+$NetBSD: patch-ab,v 1.45 2004/10/12 04:41:39 tv Exp $
 
 --- configure.orig	2004-09-19 08:22:04.000000000 -0400
 +++ configure
@@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
    ;;
  
 +interix3*)
-+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
 +  ;;
 +
  irix5* | irix6* | nonstopux*)
@@ -105,7 +105,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
-+      archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec='${wl}-E'
 +      hardcode_direct=yes
 +      hardcode_libdir_flag_spec='${wl}-h,$libdir'
@@ -214,16 +214,24 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10817,6 +10854,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10817,6 +10854,16 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
 +  interix3*)
++    # Oy, what a hack.
++    # Because shlibs are not compiled -fPIC due to broken code, we must
++    # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++    # all libraries, leading to runtime relocations -- slow and very
++    # memory consuming.  To do this, we pick a random 256KB-aligned
++    # start address between 0x50000000 and 0x6ffc0000 at link time.
++    archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++    archive_expsym_cmds_CXX='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +    ;;
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10936,6 +10975,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=
@@ -237,7 +245,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
        hardcode_libdir_flag_spec_CXX='-R$libdir'
        hardcode_direct_CXX=yes
        hardcode_shlibpath_var_CXX=no
-@@ -11324,6 +11370,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11324,6 +11378,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -247,12 +255,19 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
 +      predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
 +    fi
 +    ;;
++  interix3*)
++    # Interix installs completely hosed .la files for C++, so rather than
++    # hack all around it, let's just trust "g++" to DTRT.
++    predep_objects_CXX=
++    postdep_objects_CXX=
++    postdeps_CXX=
++    ;;
 +  esac
 +
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11371,9 +11425,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11371,9 +11440,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -265,7 +280,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11395,6 +11451,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11395,6 +11466,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -276,7 +291,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11469,6 +11529,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11469,6 +11544,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -285,7 +300,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11939,6 +12001,7 @@ beos*)
+@@ -11939,6 +12016,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -293,7 +308,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 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'
-@@ -12053,16 +12116,17 @@ kfreebsd*-gnu)
+@@ -12053,16 +12131,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -317,7 +332,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -12138,15 +12202,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12138,15 +12217,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -346,7 +361,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12223,11 +12294,11 @@ knetbsd*-gnu)
+@@ -12223,11 +12309,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -360,7 +375,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12258,10 +12329,10 @@ nto-qnx*)
+@@ -12258,10 +12344,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -373,7 +388,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -13805,9 +13876,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13805,9 +13891,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -386,7 +401,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13836,6 +13909,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13836,6 +13924,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -398,7 +413,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14221,6 +14299,17 @@ EOF
+@@ -14221,6 +14314,17 @@ EOF
        fi
        ;;
  
@@ -416,7 +431,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14708,6 +14797,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14708,6 +14812,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -428,7 +443,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
-+      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_F77='${wl}-E'
 +      hardcode_direct_F77=yes
 +      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
@@ -438,7 +453,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 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'
-@@ -15099,6 +15203,7 @@ beos*)
+@@ -15099,6 +15218,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -446,7 +461,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 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'
-@@ -15213,16 +15318,17 @@ kfreebsd*-gnu)
+@@ -15213,16 +15333,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -470,7 +485,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -15298,15 +15404,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15298,15 +15419,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -499,7 +514,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15383,11 +15496,11 @@ knetbsd*-gnu)
+@@ -15383,11 +15511,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -513,7 +528,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -15418,10 +15531,10 @@ nto-qnx*)
+@@ -15418,10 +15546,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -526,7 +541,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -16147,9 +16260,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16147,9 +16275,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -539,7 +554,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16178,6 +16293,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16178,6 +16308,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -551,7 +566,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16563,6 +16683,17 @@ EOF
+@@ -16563,6 +16698,17 @@ EOF
        fi
        ;;
  
@@ -569,7 +584,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -17070,6 +17201,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17070,6 +17216,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -581,7 +596,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
-+      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_GCJ='${wl}-E'
 +      hardcode_direct_GCJ=yes
 +      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
@@ -591,7 +606,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 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'
-@@ -17461,6 +17607,7 @@ beos*)
+@@ -17461,6 +17622,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -599,7 +614,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 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'
-@@ -17575,16 +17722,17 @@ kfreebsd*-gnu)
+@@ -17575,16 +17737,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -623,7 +638,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -17660,15 +17808,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17660,15 +17823,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -652,7 +667,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17745,11 +17900,11 @@ knetbsd*-gnu)
+@@ -17745,11 +17915,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -666,7 +681,7 @@ $NetBSD: patch-ab,v 1.44 2004/10/11 17:19:53 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -17780,10 +17935,10 @@ nto-qnx*)
+@@ -17780,10 +17950,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 2c772e4533b..9dac380528b 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
+$NetBSD: patch-ad,v 1.18 2004/10/12 04:41:39 tv Exp $
 
 --- libltdl/configure.orig	2004-09-19 08:23:09.000000000 -0400
 +++ libltdl/configure
@@ -21,7 +21,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
    ;;
  
 +interix3*)
-+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
 +  ;;
 +
  irix5* | irix6* | nonstopux*)
@@ -105,7 +105,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
-+      archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec='${wl}-E'
 +      hardcode_direct=yes
 +      hardcode_libdir_flag_spec='${wl}-h,$libdir'
@@ -214,16 +214,24 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10722,6 +10759,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10722,6 +10759,16 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
 +  interix3*)
++    # Oy, what a hack.
++    # Because shlibs are not compiled -fPIC due to broken code, we must
++    # choose an --image-base.  Otherwise, 0x10000000 will be chosen for
++    # all libraries, leading to runtime relocations -- slow and very
++    # memory consuming.  To do this, we pick a random 256KB-aligned
++    # start address between 0x50000000 and 0x6ffc0000 at link time.
++    archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++    archive_expsym_cmds_CXX='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +    ;;
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10841,6 +10880,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=
@@ -237,7 +245,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
        hardcode_libdir_flag_spec_CXX='-R$libdir'
        hardcode_direct_CXX=yes
        hardcode_shlibpath_var_CXX=no
-@@ -11229,6 +11275,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11229,6 +11283,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -247,12 +255,19 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
 +      predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
 +    fi
 +    ;;
++  interix3*)
++    # Interix installs completely hosed .la files for C++, so rather than
++    # hack all around it, let's just trust "g++" to DTRT.
++    predep_objects_CXX=
++    postdep_objects_CXX=
++    postdeps_CXX=
++    ;;
 +  esac
 +
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11276,9 +11330,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11276,9 +11345,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -265,7 +280,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11300,6 +11356,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11300,6 +11371,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -276,7 +291,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11374,6 +11434,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11374,6 +11449,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -285,7 +300,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11844,6 +11906,7 @@ beos*)
+@@ -11844,6 +11921,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -293,7 +308,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 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'
-@@ -11958,16 +12021,17 @@ kfreebsd*-gnu)
+@@ -11958,16 +12036,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -317,7 +332,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -12043,15 +12107,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12043,15 +12122,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -346,7 +361,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12128,11 +12199,11 @@ knetbsd*-gnu)
+@@ -12128,11 +12214,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -360,7 +375,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12163,10 +12234,10 @@ nto-qnx*)
+@@ -12163,10 +12249,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -373,7 +388,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -13710,9 +13781,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13710,9 +13796,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -386,7 +401,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13741,6 +13814,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13741,6 +13829,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -398,7 +413,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14126,6 +14204,17 @@ EOF
+@@ -14126,6 +14219,17 @@ EOF
        fi
        ;;
  
@@ -416,7 +431,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14613,6 +14702,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14613,6 +14717,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -428,7 +443,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
-+      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_F77='${wl}-E'
 +      hardcode_direct_F77=yes
 +      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
@@ -438,7 +453,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 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'
-@@ -15004,6 +15108,7 @@ beos*)
+@@ -15004,6 +15123,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -446,7 +461,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 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'
-@@ -15118,16 +15223,17 @@ kfreebsd*-gnu)
+@@ -15118,16 +15238,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -470,7 +485,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -15203,15 +15309,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15203,15 +15324,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -499,7 +514,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15288,11 +15401,11 @@ knetbsd*-gnu)
+@@ -15288,11 +15416,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -513,7 +528,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -15323,10 +15436,10 @@ nto-qnx*)
+@@ -15323,10 +15451,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -526,7 +541,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -16052,9 +16165,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16052,9 +16180,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -539,7 +554,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16083,6 +16198,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16083,6 +16213,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -551,7 +566,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16468,6 +16588,17 @@ EOF
+@@ -16468,6 +16603,17 @@ EOF
        fi
        ;;
  
@@ -569,7 +584,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16975,6 +17106,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16975,6 +17121,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -581,7 +596,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
 +      # memory consuming.  To do this, we pick a random 256KB-aligned
 +      # start address between 0x50000000 and 0x6ffc0000 at link time.
 +      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
-+      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
++      archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
 +      export_dynamic_flag_spec_GCJ='${wl}-E'
 +      hardcode_direct_GCJ=yes
 +      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
@@ -591,7 +606,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 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'
-@@ -17366,6 +17512,7 @@ beos*)
+@@ -17366,6 +17527,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -599,7 +614,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 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'
-@@ -17480,16 +17627,17 @@ kfreebsd*-gnu)
+@@ -17480,16 +17642,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -623,7 +638,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -17565,15 +17713,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17565,15 +17728,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -652,7 +667,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17650,11 +17805,11 @@ knetbsd*-gnu)
+@@ -17650,11 +17820,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -666,7 +681,7 @@ $NetBSD: patch-ad,v 1.17 2004/10/11 17:19:53 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -17685,10 +17840,10 @@ nto-qnx*)
+@@ -17685,10 +17855,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 44f1cc5e7e8..f092db309ff 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.4 2004/10/11 16:51:56 tv Exp $
+# $NetBSD: Interix.mk,v 1.5 2004/10/12 04:41:39 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -134,7 +134,7 @@ _OPSYS_HAS_INET6=	no	# IPv6 is not standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
-_OPSYS_LIBTOOL_REQD=	1.5.10nb3
+_OPSYS_LIBTOOL_REQD=	1.5.10nb4
 _OPSYS_PERL_REQD=	5.8.3nb1 # base version of perl required
 _OPSYS_PKGTOOLS_REQD=	20040330
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads