Update to 1.5.14, and switch DragonFly to version_type=linux.

Change summary since 1.5.10: * ltmain.in: Add -pthread like flags when linking executables too. * ltmain.in (func_extract_archives) [darwin]: This didn't actually work on a real fat archive, should do now. * tests/func_extract_archives.test: remove darwin fat tests which did not actually work. * ltmain.in (link mode): Allow five digits in version-info * ltmain.in (link mode): With piecewise (partial) linking, fix intermediate output name for subdir-objects. * ltmain.in [darwin]: Don't add installed libs to temp_rpath when building executables on darwin, or other systems which use hardcode_automatic. It may break our wrapper scripts. * ltmain.in [darwin]: Allow -framework foo through when given on the command line. * ltmain.in [irix]: Preserve processor option for SGI Compiler (-r[0-9][0-9]*). * ltmain.in: Don't pass through compiler-like thread flags when using $LD to do the linking. Use compiler_flags instead. Reported by Mark_Andrews@isc.org. * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: While "parsing" /etc/ld.so.conf, skip comments. * ltmain.in (func_extract_archives): Not all shells grok `read -r' (unnecessary in this case). Reported by Ralf Menzel <menzel@ls6.cs.uni-dortmund.de>. * libtool.m4 [solaris] (AC_LIBTOOL_PROG_LD_SHLIBS): Use ${wl} for whole_archive_flag_spec. Missing backport reported by Ralf Menzel * libtool.m4 [linux] (AC_LIBTOOL_PROG_COMPILER_PIC): match $cc_basename, not $CC against icc. Also, for symmetry match icpc* and ecpc* (ia64 version of icpc). * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: Interpret `include' statements in toplevel ld.so.conf file. * config/ltmain.in (func_mode_link): When linking an installed libtool library on the command line using -lfoo we need to find the library in the search paths and add it's dependency_libs to the link in the conv pass so that any libtool libs listed are correctly expanded in the link pass.
author: tv <tv@pkgsrc.org> 2005-03-22 15:12:07 +0000
committer: tv <tv@pkgsrc.org> 2005-03-22 15:12:07 +0000
commit: b6ec46771aea175c4329605cded3a271e0f913d9 (patch)
tree: d882a66f57b63b42ab07c86d25ff54dee45a733a
parent: 32829df865fb465e890b2c7884838c319863aa83 (diff)
download: pkgsrc-b6ec46771aea175c4329605cded3a271e0f913d9.tar.gz
9 files changed, 192 insertions, 571 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index ccac25247eb..7ab630a5380 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/03/18 15:06:10 tv Exp $
+# $NetBSD: Makefile,v 1.60 2005/03/22 15:12:08 tv Exp $
 #
 
 .include "../../devel/libtool/Makefile.common"
@@ -12,7 +12,6 @@
 # on the next libtool update.
 #
 PKGNAME=	${DISTNAME:S/-/-base-/}
-PKGREVISION=	10
 SVR4_PKGNAME=	ltoob
 
 COMMENT=	Generic shared library support script (the script itself)
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 5a6bdc7f393..565aaaef7b7 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.59 2005/01/19 16:33:55 tv Exp $
+# $NetBSD: Makefile.common,v 1.60 2005/03/22 15:12:07 tv Exp $
 #
 
-DISTNAME=	libtool-1.5.10
+DISTNAME=	libtool-1.5.14
 CATEGORIES=	devel pkgtools
 MASTER_SITES=	${MASTER_SITE_GNU:=libtool/}
 
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index f0283fcfab1..7f5adb742db 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.56 2005/02/23 22:24:20 agc Exp $
+$NetBSD: distinfo,v 1.57 2005/03/22 15:12:07 tv Exp $
 
-SHA1 (libtool-1.5.10.tar.gz) = bb2cab7f405c5eb08ab8ba193cbac59ebe6e6e9e
-RMD160 (libtool-1.5.10.tar.gz) = de782f5ff25e73e0a548a1b8271ba6b69ac7a751
-Size (libtool-1.5.10.tar.gz) = 2699923 bytes
+SHA1 (libtool-1.5.14.tar.gz) = 0c8935aa80cd5532aa8e5462157cc07ae26a3862
+RMD160 (libtool-1.5.14.tar.gz) = f26606366a76a5703929ed1785f745f69bceb8c6
+Size (libtool-1.5.14.tar.gz) = 2732031 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = a41b9ba60018759bd875ace18ac01b39bcfecd24
-SHA1 (patch-ac) = c1951ce25a285aee75a2984ee45db2f2e99dac4d
-SHA1 (patch-ad) = 4007775711ba48b57abb3965f25335080da27750
+SHA1 (patch-ab) = df27e4db60447ccad850dcc3318ffee33f60ad23
+SHA1 (patch-ac) = f98adcd50cc5a62e60a0514d5cac90bebf179157
+SHA1 (patch-ad) = d0aa264da58272e34bfda137875309abf3db37a4
diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4
index 04d3c8b52e5..d8cf50cfd63 100644
--- a/devel/libtool/patches/manual-libtool.m4
+++ b/devel/libtool/patches/manual-libtool.m4
@@ -1,8 +1,8 @@
-$NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.13 2005/03/22 15:12:08 tv Exp $
 
---- libtool.m4.orig	2004-09-19 08:15:08.000000000 -0400
+--- libtool.m4.orig	2005-02-12 07:18:34.000000000 -0500
 +++ libtool.m4
-@@ -361,11 +361,11 @@ else
+@@ -346,11 +346,11 @@ else
  
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
@@ -16,16 +16,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
  	 test "X$CONFIG_SHELL" != X/bin/ksh; then
        # If we have ksh, try running configure again with it.
-@@ -678,7 +678,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
--  netbsd* | freebsd* | openbsd* | darwin* )
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-     # This has been around since 386BSD, at least.  Likely further.
-     if test -x /sbin/sysctl; then
-       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -1201,6 +1201,7 @@ beos*)
+@@ -1198,6 +1198,7 @@ beos*)
  bsdi[[45]]*)
    version_type=linux
    need_version=no
@@ -33,16 +24,15 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 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'
-@@ -1315,16 +1316,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -1315,15 +1316,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  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=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -52,29 +42,12 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv 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
-@@ -1344,6 +1346,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -1400,15 +1412,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -1399,15 +1401,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -103,7 +76,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -1485,11 +1504,11 @@ knetbsd*-gnu)
+@@ -1484,11 +1493,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -117,7 +90,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -1520,10 +1539,10 @@ nto-qnx*)
+@@ -1519,10 +1528,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -130,34 +103,18 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 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
-@@ -1688,9 +1707,7 @@ if test -f "$ltmain" && test -n "$tagnam
+@@ -1687,9 +1696,7 @@ if test -f "$ltmain" && test -n "$tagnam
  
        case $tagname in
        CXX)
 -	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
+-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -	    (test "X$CXX" != "Xg++"))) ; then
-+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++        if test -n "$CXX" && test "X$CXX" != "Xno"; then
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -2160,13 +2177,13 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -2198,6 +2215,10 @@ hpux10.20* | hpux11*)
+@@ -2197,6 +2204,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -168,7 +125,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -2425,21 +2446,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+@@ -2424,22 +2435,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -183,15 +140,16 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
 -[
 -AC_REQUIRE([AC_PROG_CXX])
 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -    (test "X$CXX" != "Xg++"))) ; then
 -  AC_PROG_CXXCPP
 -fi
 -])# _LT_AC_PROG_CXXCPP
- 
+-
  # AC_LIBTOOL_F77
  # --------------
-@@ -2604,7 +2614,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+ # enable support for Fortran 77 libraries
+@@ -2603,7 +2602,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -200,7 +158,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2933,7 +2943,7 @@ case $host_os in
+@@ -2935,7 +2934,7 @@ case $host_os in
            _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
            _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -209,16 +167,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -2967,7 +2977,7 @@ case $host_os in
-   freebsd-elf*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -3091,6 +3101,16 @@ case $host_os in
+@@ -3093,6 +3092,16 @@ case $host_os in
  	;;
      esac
      ;;
@@ -235,7 +184,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -3208,14 +3228,29 @@ case $host_os in
+@@ -3222,14 +3231,29 @@ case $host_os in
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -267,7 +216,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -3651,6 +3686,21 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3665,6 +3689,21 @@ if AC_TRY_EVAL(ac_compile); then
      esac
    done
  
@@ -289,7 +238,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -4591,9 +4641,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4611,9 +4650,11 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -302,7 +251,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4615,6 +4667,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4635,6 +4676,10 @@ AC_MSG_CHECKING([for $compiler option to
  	;;
        esac
        ;;
@@ -313,16 +262,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -4661,7 +4717,7 @@ AC_MSG_CHECKING([for $compiler option to
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -4689,6 +4745,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4709,6 +4754,8 @@ AC_MSG_CHECKING([for $compiler option to
  	    ;;
  	esac
  	;;
@@ -331,7 +271,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -4854,9 +4912,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4880,9 +4927,11 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
  
      darwin* | rhapsody*)
@@ -344,7 +284,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -4885,6 +4945,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4911,6 +4960,11 @@ AC_MSG_CHECKING([for $compiler option to
        esac
        ;;
  
@@ -356,7 +296,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -5187,6 +5252,17 @@ EOF
+@@ -5225,6 +5279,17 @@ EOF
        fi
        ;;
  
@@ -374,7 +314,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 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'
-@@ -5477,7 +5553,7 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5528,7 +5593,7 @@ $echo "local: *; };" >> $output_objdir/$
           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -383,16 +323,7 @@ $NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -5517,7 +5593,7 @@ $echo "local: *; };" >> $output_objdir/$
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -5592,6 +5668,21 @@ $echo "local: *; };" >> $output_objdir/$
+@@ -5643,6 +5708,21 @@ $echo "local: *; };" >> $output_objdir/$
        fi
        ;;
  
diff --git a/devel/libtool/patches/manual-ltdl.m4 b/devel/libtool/patches/manual-ltdl.m4
index 58170d3cbf1..f73eb1874c8 100644
--- a/devel/libtool/patches/manual-ltdl.m4
+++ b/devel/libtool/patches/manual-ltdl.m4
@@ -1,8 +1,8 @@
-$NetBSD: manual-ltdl.m4,v 1.1 2004/04/20 18:29:34 tv Exp $
+$NetBSD: manual-ltdl.m4,v 1.2 2005/03/22 15:12:08 tv Exp $
 
---- ltdl.m4.orig	Sun Sep 21 08:51:38 2003
+--- ltdl.m4.orig	2005-02-12 07:18:34.000000000 -0500
 +++ ltdl.m4
-@@ -149,6 +149,9 @@ AC_CACHE_CHECK([whether deplibs are load
+@@ -134,6 +134,9 @@ AC_CACHE_CHECK([whether deplibs are load
    hpux10*|hpux11*)
      libltdl_cv_sys_dlopen_deplibs=yes
      ;;
diff --git a/devel/libtool/patches/manual.README b/devel/libtool/patches/manual.README
index ec087c38182..596e553c913 100644
--- a/devel/libtool/patches/manual.README
+++ b/devel/libtool/patches/manual.README
@@ -1,4 +1,4 @@
-$NetBSD: manual.README,v 1.6 2005/01/18 18:44:14 tv Exp $
+$NetBSD: manual.README,v 1.7 2005/03/22 15:12:08 tv Exp $
 
 The "manual-*" patch files are used to maintain the pkgsrc version of
 libtool.  These files contain patches for the .m4 files in libtool which are
@@ -12,12 +12,14 @@ libtool, the following process should be used:
 =====
 
 cd /usr/pkgsrc/devel/libtool-base
-make patch
+make extract         # not "make patch"
 cd work*/libtool-*
 cat /usr/pkgsrc/devel/libtool/patches/manual-* | patch -s
 
 [edit *.m4 files and put patches back to manual-*]
 
+cp -f configure configure.orig
+cp -f libltdl/configure libltdl/configure.orig
 ./configure
 make ./configure
 pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 17aae0357ac..3f356e8a9ce 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
+$NetBSD: patch-ab,v 1.50 2005/03/22 15:12:08 tv Exp $
 
---- configure.orig	2004-09-19 08:22:04.000000000 -0400
+--- configure.orig	2005-02-28 12:31:33.000000000 -0500
 +++ configure
 @@ -322,11 +322,11 @@ else
  
@@ -16,22 +16,6 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
  	 test "X$CONFIG_SHELL" != X/bin/ksh; then
        # If we have ksh, try running configure again with it.
-@@ -4496,13 +4496,13 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
 @@ -4534,6 +4534,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
@@ -66,16 +50,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
  
  
  
-@@ -5974,7 +5971,7 @@ else
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
--  netbsd* | freebsd* | openbsd* | darwin* )
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-     # This has been around since 386BSD, at least.  Likely further.
-     if test -x /sbin/sysctl; then
-       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -6909,9 +6906,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6921,9 +6918,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -88,7 +63,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -6940,6 +6939,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6952,6 +6951,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -100,7 +75,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7325,6 +7329,17 @@ EOF
+@@ -7349,6 +7353,17 @@ EOF
        fi
        ;;
  
@@ -118,7 +93,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7717,7 +7732,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7754,7 +7769,7 @@ if test -z "$aix_libpath"; then aix_libp
           archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
           module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -127,16 +102,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
            module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -7757,7 +7772,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -7832,6 +7847,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7869,6 +7884,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -158,7 +124,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -8223,6 +8253,7 @@ beos*)
+@@ -8260,6 +8290,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -166,16 +132,15 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 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'
-@@ -8337,16 +8368,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -8377,15 +8408,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  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=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -190,24 +155,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -8366,6 +8398,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -8422,15 +8464,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8461,15 +8493,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -236,7 +184,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8507,11 +8556,11 @@ knetbsd*-gnu)
+@@ -8546,11 +8585,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -250,7 +198,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -8542,10 +8591,10 @@ nto-qnx*)
+@@ -8581,10 +8620,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -263,18 +211,18 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 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
-@@ -10105,9 +10154,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -10150,9 +10189,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
 -	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -	    (test "X$CXX" != "Xg++"))) ; then
-+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++        if test -n "$CXX" && test "X$CXX" != "Xno"; then
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10659,7 +10706,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10707,7 +10744,7 @@ if test -z "$aix_libpath"; then aix_libp
            archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
            module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -283,16 +231,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -10693,7 +10740,7 @@ if test -z "$aix_libpath"; then aix_libp
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -10817,6 +10864,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10865,6 +10902,16 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -309,7 +248,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10934,14 +10991,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10994,14 +11041,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -341,7 +280,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -11324,6 +11396,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11384,6 +11446,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -363,7 +302,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11371,9 +11458,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11431,9 +11508,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -376,7 +315,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11395,6 +11484,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11455,6 +11534,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -387,16 +326,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11441,7 +11534,7 @@ echo $ECHO_N "checking for $compiler opt
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -11469,6 +11562,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11529,6 +11612,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -405,7 +335,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11939,6 +12034,7 @@ beos*)
+@@ -12005,6 +12090,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -413,16 +343,15 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 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 +12149,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -12122,15 +12208,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  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=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -437,24 +366,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -12082,6 +12179,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -12138,15 +12245,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12206,15 +12293,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -483,7 +395,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12223,11 +12337,11 @@ knetbsd*-gnu)
+@@ -12291,11 +12385,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -497,7 +409,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12258,10 +12372,10 @@ nto-qnx*)
+@@ -12326,10 +12420,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -510,7 +422,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 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 +13919,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13879,9 +13973,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -523,7 +435,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13836,6 +13952,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13910,6 +14006,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -535,7 +447,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14221,6 +14342,17 @@ EOF
+@@ -14307,6 +14408,17 @@ EOF
        fi
        ;;
  
@@ -553,7 +465,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14593,7 +14725,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14692,7 +14804,7 @@ if test -z "$aix_libpath"; then aix_libp
           archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
           module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -562,16 +474,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
            module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -14633,7 +14765,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -14708,6 +14840,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14807,6 +14919,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -593,7 +496,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 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 +15246,7 @@ beos*)
+@@ -15198,6 +15325,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -601,16 +504,15 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 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 +15361,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -15315,15 +15443,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  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=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -625,24 +527,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -15242,6 +15391,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -15298,15 +15457,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15399,15 +15528,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -671,7 +556,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15383,11 +15549,11 @@ knetbsd*-gnu)
+@@ -15484,11 +15620,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -685,7 +570,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -15418,10 +15584,10 @@ nto-qnx*)
+@@ -15519,10 +15655,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -698,7 +583,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 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 +16313,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16254,9 +16390,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -711,7 +596,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16178,6 +16346,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16285,6 +16423,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -723,7 +608,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16563,6 +16736,17 @@ EOF
+@@ -16682,6 +16825,17 @@ EOF
        fi
        ;;
  
@@ -741,7 +626,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16955,7 +17139,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17087,7 +17241,7 @@ if test -z "$aix_libpath"; then aix_libp
           archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
           module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -750,16 +635,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
            module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -16995,7 +17179,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -17070,6 +17254,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17202,6 +17356,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -781,7 +657,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 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 +17660,7 @@ beos*)
+@@ -17593,6 +17762,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -789,16 +665,15 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 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 +17775,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -17710,15 +17880,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  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=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -813,24 +688,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -17604,6 +17805,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -17660,15 +17871,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17794,15 +17965,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -859,7 +717,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17745,11 +17963,11 @@ knetbsd*-gnu)
+@@ -17879,11 +18057,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -873,7 +731,7 @@ $NetBSD: patch-ab,v 1.49 2005/01/18 18:51:15 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -17780,10 +17998,10 @@ nto-qnx*)
+@@ -17914,10 +18092,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index c6c54613d6b..093de057ad0 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.16 2005/01/18 18:51:15 tv Exp $
+$NetBSD: patch-ac,v 1.17 2005/03/22 15:12:08 tv Exp $
 
---- ltmain.sh.orig	2004-09-19 08:34:44.000000000 -0400
+--- ltmain.sh.orig	2005-02-12 07:30:57.000000000 -0500
 +++ ltmain.sh
-@@ -184,6 +184,31 @@ func_win32_libid () {
- # command doesn't match the default compiler.
+@@ -187,6 +187,31 @@ func_win32_libid ()
  # arg is usually of the form 'gcc ...'
- func_infer_tag () {
+ func_infer_tag ()
+ {
 +    # Set the commonly-used compilers for some tags.
 +    tag_compilers_CC="*cc *xlc"
 +    tag_compilers_CXX="*++ *CC"
@@ -15,26 +15,26 @@ $NetBSD: patch-ac,v 1.16 2005/01/18 18:51:15 tv Exp $
 +    # "CC" tag applies by matching up the base compile command to some
 +    # compilers commonly used for the "CC" tag.
 +    if test -z "$tagname"; then
-+      z=CC
-+      eval "tag_compilers=\$tag_compilers_${z}"
-+      if test -n "$tag_compilers"; then
-+	for zp in $tag_compilers; do
-+	  case $base_compiler in 
-+	    $zp)
-+	    # The compiler in the base compile command matches
-+	    # one of the common compilers for the current tag.
-+	    # Assume this is the tagged configuration we want.
-+	    tagname=$z
-+	    break
-+	    ;;
-+	  esac
-+	done
-+      fi
++        z=CC
++        eval "tag_compilers=\$tag_compilers_${z}"
++        if test -n "$tag_compilers"; then
++        for zp in $tag_compilers; do
++          case $base_compiler in
++            $zp)
++            # The compiler in the base compile command matches
++            # one of the common compilers for the current tag.
++            # Assume this is the tagged configuration we want.
++            tagname=$z
++            break
++            ;;
++          esac
++        done
++        fi
 +    fi
      if test -n "$available_tags" && test -z "$tagname"; then
        CC_quoted=
        for arg in $CC; do
-@@ -224,6 +249,27 @@ func_infer_tag () {
+@@ -227,6 +252,27 @@ func_infer_tag ()
  	      break
  	      ;;
  	    esac
@@ -62,16 +62,16 @@ $NetBSD: patch-ac,v 1.16 2005/01/18 18:51:15 tv Exp $
  	  fi
  	done
  	# If $tagname still isn't set, then no tagged configuration
-@@ -522,7 +568,7 @@ if test -z "$show_help"; then
+@@ -534,7 +580,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
+     $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
      case $nonopt in
 -    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
 +    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc* | *CC)
        mode=link
        for arg
        do
-@@ -1306,6 +1352,13 @@ EOF
+@@ -1321,6 +1367,13 @@ EOF
  	    exit $EXIT_FAILURE
  	    ;;
  	  esac
@@ -85,25 +85,7 @@ $NetBSD: patch-ac,v 1.16 2005/01/18 18:51:15 tv Exp $
  	  if test "$prev" = rpath; then
  	    case "$rpath " in
  	    *" $arg "*) ;;
-@@ -1466,7 +1519,7 @@ EOF
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -1477,7 +1530,7 @@ EOF
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -3168,6 +3221,7 @@ EOF
+@@ -3206,6 +3259,7 @@ EOF
  	linux)
  	  major=.`expr $current - $age`
  	  versuffix="$major.$age.$revision"
@@ -111,16 +93,7 @@ $NetBSD: patch-ac,v 1.16 2005/01/18 18:51:15 tv Exp $
  	  ;;
  
  	osf)
-@@ -3336,7 +3390,7 @@ EOF
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd* | *-*-freebsd*)
-+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -5364,8 +5418,16 @@ relink_command=\"$relink_command\""
+@@ -5422,8 +5476,16 @@ relink_command=\"$relink_command\""
        exit $EXIT_FAILURE
      fi
  
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 53786662b0c..14837d1d7f9 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
+$NetBSD: patch-ad,v 1.22 2005/03/22 15:12:08 tv Exp $
 
---- libltdl/configure.orig	2004-09-19 08:23:09.000000000 -0400
+--- libltdl/configure.orig	2005-02-28 12:31:43.000000000 -0500
 +++ libltdl/configure
 @@ -322,11 +322,11 @@ else
  
@@ -16,22 +16,6 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
  	 test "X$CONFIG_SHELL" != X/bin/ksh; then
        # If we have ksh, try running configure again with it.
-@@ -3701,13 +3701,13 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
 @@ -3739,6 +3739,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
@@ -66,16 +50,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
  
  ac_ext=f
  ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-@@ -5879,7 +5876,7 @@ else
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
--  netbsd* | freebsd* | openbsd* | darwin* )
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-     # This has been around since 386BSD, at least.  Likely further.
-     if test -x /sbin/sysctl; then
-       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -6814,9 +6811,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6826,9 +6823,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -88,7 +63,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -6845,6 +6844,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6857,6 +6856,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -100,7 +75,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      *)
        lt_prog_compiler_pic='-fPIC'
        ;;
-@@ -7230,6 +7234,17 @@ EOF
+@@ -7254,6 +7258,17 @@ EOF
        fi
        ;;
  
@@ -118,7 +93,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7622,7 +7637,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7659,7 +7674,7 @@ if test -z "$aix_libpath"; then aix_libp
           archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
           module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -127,16 +102,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
            module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -7662,7 +7677,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -7737,6 +7752,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7774,6 +7789,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -158,7 +124,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -8128,6 +8158,7 @@ beos*)
+@@ -8165,6 +8195,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -166,16 +132,15 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 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'
-@@ -8242,16 +8273,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -8282,15 +8313,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  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=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -190,24 +155,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -8271,6 +8303,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -8327,15 +8369,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8366,15 +8398,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -236,7 +184,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8412,11 +8461,11 @@ knetbsd*-gnu)
+@@ -8451,11 +8490,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -250,7 +198,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -8447,10 +8496,10 @@ nto-qnx*)
+@@ -8486,10 +8525,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -263,18 +211,18 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 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
-@@ -10010,9 +10059,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -10055,9 +10094,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
 -	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -	    (test "X$CXX" != "Xg++"))) ; then
-+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++        if test -n "$CXX" && test "X$CXX" != "Xno"; then
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10564,7 +10611,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10612,7 +10649,7 @@ if test -z "$aix_libpath"; then aix_libp
            archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
            module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -283,16 +231,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -10598,7 +10645,7 @@ if test -z "$aix_libpath"; then aix_libp
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -10722,6 +10769,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10770,6 +10807,16 @@ if test -z "$aix_libpath"; then aix_libp
  	;;
      esac
      ;;
@@ -309,7 +248,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10839,14 +10896,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10899,14 +10946,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -341,7 +280,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -11229,6 +11301,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11289,6 +11351,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -363,7 +302,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11276,9 +11363,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11336,9 +11413,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -376,7 +315,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11300,6 +11389,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11360,6 +11439,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -387,16 +326,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11346,7 +11439,7 @@ echo $ECHO_N "checking for $compiler opt
- 	    ;;
- 	esac
- 	;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -11374,6 +11467,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11434,6 +11517,8 @@ echo $ECHO_N "checking for $compiler opt
  	    ;;
  	esac
  	;;
@@ -405,7 +335,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11844,6 +11939,7 @@ beos*)
+@@ -11910,6 +11995,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -413,16 +343,15 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 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 +12054,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -12027,15 +12113,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  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=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -437,24 +366,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -11987,6 +12084,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -12043,15 +12150,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12111,15 +12198,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -483,7 +395,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12128,11 +12242,11 @@ knetbsd*-gnu)
+@@ -12196,11 +12290,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -497,7 +409,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12163,10 +12277,10 @@ nto-qnx*)
+@@ -12231,10 +12325,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -510,7 +422,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 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 +13824,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13784,9 +13878,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -523,7 +435,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13741,6 +13857,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13815,6 +13911,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -535,7 +447,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14126,6 +14247,17 @@ EOF
+@@ -14212,6 +14313,17 @@ EOF
        fi
        ;;
  
@@ -553,7 +465,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14498,7 +14630,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14597,7 +14709,7 @@ if test -z "$aix_libpath"; then aix_libp
           archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
           module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -562,16 +474,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
            module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -14538,7 +14670,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -14613,6 +14745,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14712,6 +14824,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -593,7 +496,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 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 +15151,7 @@ beos*)
+@@ -15103,6 +15230,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -601,16 +504,15 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 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 +15266,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -15220,15 +15348,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  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=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -625,24 +527,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -15147,6 +15296,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -15203,15 +15362,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15304,15 +15433,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -671,7 +556,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15288,11 +15454,11 @@ knetbsd*-gnu)
+@@ -15389,11 +15525,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -685,7 +570,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -15323,10 +15489,10 @@ nto-qnx*)
+@@ -15424,10 +15560,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -698,7 +583,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 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 +16218,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16159,9 +16295,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -711,7 +596,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16083,6 +16251,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16190,6 +16328,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -723,7 +608,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16468,6 +16641,17 @@ EOF
+@@ -16587,6 +16730,17 @@ EOF
        fi
        ;;
  
@@ -741,7 +626,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16860,7 +17044,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16992,7 +17146,7 @@ if test -z "$aix_libpath"; then aix_libp
           archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
           module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -750,16 +635,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
            module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -16900,7 +17084,7 @@ if test -z "$aix_libpath"; then aix_libp
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu)
-+    freebsd* | kfreebsd*-gnu | dragonfly*)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -16975,6 +17159,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17107,6 +17261,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -781,7 +657,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 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 +17565,7 @@ beos*)
+@@ -17498,6 +17667,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -789,16 +665,15 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 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 +17680,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -17615,15 +17785,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  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=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -813,24 +688,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -17509,6 +17710,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -17565,15 +17776,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17699,15 +17870,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -859,7 +717,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17650,11 +17868,11 @@ knetbsd*-gnu)
+@@ -17784,11 +17962,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -873,7 +731,7 @@ $NetBSD: patch-ad,v 1.21 2005/01/18 18:51:15 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -17685,10 +17903,10 @@ nto-qnx*)
+@@ -17819,10 +17997,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
author	tv <tv@pkgsrc.org>	2005-03-22 15:12:07 +0000
committer	tv <tv@pkgsrc.org>	2005-03-22 15:12:07 +0000
commit	b6ec46771aea175c4329605cded3a271e0f913d9 (patch)
tree	d882a66f57b63b42ab07c86d25ff54dee45a733a
parent	32829df865fb465e890b2c7884838c319863aa83 (diff)
download	pkgsrc-b6ec46771aea175c4329605cded3a271e0f913d9.tar.gz