add DragonFly support from patch sent to libtool-patches:

	http://lists.gnu.org/archive/html/libtool-patches/2004-12/msg00188.html

tested with gcc2 and gcc3 in-tree compilers.

bump PKGREVISION.

4 files changed, 404 insertions, 80 deletions

diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 4f06811648a..6ed8333b638 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.53 2004/12/18 17:42:24 grant Exp $
+$NetBSD: distinfo,v 1.54 2004/12/21 13:50:23 grant 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) = fa1f9d9b879e1c7b44c7c8a9b0b0969750b6de77
-SHA1 (patch-ac) = 2123be2150e7f86980b903574b742454addd7b75
-SHA1 (patch-ad) = 17ae54beead8ed189cf7aab8708d40d499750e7d
+SHA1 (patch-ab) = f8c99bbf05d8ee7de6d2a4e6064706ee438b9938
+SHA1 (patch-ac) = 97e96e4ad5059190985f03b5f3f10a64f7563ebd
+SHA1 (patch-ad) = d0eb258c82bd8d551ed714f9af226e3a9dc688e4
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 34a029a0fdf..ec0ab2420fc 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
+$NetBSD: patch-ab,v 1.48 2004/12/21 13:50:23 grant Exp $
 
 --- configure.orig	2004-09-19 22:22:04.000000000 +1000
 +++ configure
@@ -16,6 +16,22 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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
    ;;
@@ -50,6 +66,15 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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
        ;;
  
@@ -156,7 +181,24 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
        need_version=yes
        ;;
    esac
-@@ -8422,15 +8454,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8366,6 +8398,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  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*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -185,7 +227,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8507,11 +8546,11 @@ knetbsd*-gnu)
+@@ -8507,11 +8556,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -199,7 +241,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -8542,10 +8581,10 @@ nto-qnx*)
+@@ -8542,10 +8591,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -212,7 +254,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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 +10144,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -10105,9 +10154,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -223,7 +265,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10659,7 +10696,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10659,7 +10706,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
@@ -232,7 +274,16 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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}'
            ;;
         *)
-@@ -10817,6 +10854,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -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
  	;;
      esac
      ;;
@@ -249,7 +300,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10934,14 +10981,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10934,14 +10991,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -281,7 +332,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -11324,6 +11386,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11324,6 +11396,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -303,7 +354,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11371,9 +11448,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11371,9 +11458,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -316,7 +367,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11395,6 +11474,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11395,6 +11484,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -327,7 +378,16 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11469,6 +11552,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -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
  	    ;;
  	esac
  	;;
@@ -336,7 +396,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11939,6 +12024,7 @@ beos*)
+@@ -11939,6 +12034,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -344,7 +404,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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 +12139,17 @@ kfreebsd*-gnu)
+@@ -12053,16 +12149,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -368,7 +428,24 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
        need_version=yes
        ;;
    esac
-@@ -12138,15 +12225,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12082,6 +12179,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  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*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -397,7 +474,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12223,11 +12317,11 @@ knetbsd*-gnu)
+@@ -12223,11 +12337,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -411,7 +488,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12258,10 +12352,10 @@ nto-qnx*)
+@@ -12258,10 +12372,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -424,7 +501,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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 +13899,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13805,9 +13919,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -437,7 +514,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13836,6 +13932,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13836,6 +13952,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -449,7 +526,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14221,6 +14322,17 @@ EOF
+@@ -14221,6 +14342,17 @@ EOF
        fi
        ;;
  
@@ -467,7 +544,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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 +14705,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14593,7 +14725,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
@@ -476,7 +553,16 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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}'
            ;;
         *)
-@@ -14708,6 +14820,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -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
        fi
        ;;
  
@@ -498,7 +584,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -15099,6 +15226,7 @@ beos*)
+@@ -15099,6 +15246,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -506,7 +592,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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 +15341,17 @@ kfreebsd*-gnu)
+@@ -15213,16 +15361,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -530,7 +616,24 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
        need_version=yes
        ;;
    esac
-@@ -15298,15 +15427,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15242,6 +15391,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  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*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -559,7 +662,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15383,11 +15519,11 @@ knetbsd*-gnu)
+@@ -15383,11 +15549,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -573,7 +676,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -15418,10 +15554,10 @@ nto-qnx*)
+@@ -15418,10 +15584,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -586,7 +689,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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 +16283,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16147,9 +16313,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -599,7 +702,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16178,6 +16316,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16178,6 +16346,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -611,7 +714,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16563,6 +16706,17 @@ EOF
+@@ -16563,6 +16736,17 @@ EOF
        fi
        ;;
  
@@ -629,7 +732,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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 +17109,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16955,7 +17139,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
@@ -638,7 +741,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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}'
            ;;
         *)
-@@ -17070,6 +17224,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17070,6 +17254,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -660,7 +763,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
  	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -17461,6 +17630,7 @@ beos*)
+@@ -17461,6 +17660,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -668,7 +771,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant 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 +17745,17 @@ kfreebsd*-gnu)
+@@ -17575,16 +17775,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -692,7 +795,24 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
        need_version=yes
        ;;
    esac
-@@ -17660,15 +17831,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17604,6 +17805,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  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*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -721,7 +841,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17745,11 +17923,11 @@ knetbsd*-gnu)
+@@ -17745,11 +17963,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -735,7 +855,7 @@ $NetBSD: patch-ab,v 1.47 2004/12/18 17:42:24 grant Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -17780,10 +17958,10 @@ nto-qnx*)
+@@ -17780,10 +17998,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index c560013d613..9d60031c837 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.14 2004/12/17 16:24:22 jlam Exp $
+$NetBSD: patch-ac,v 1.15 2004/12/21 13:50:25 grant Exp $
 
---- ltmain.sh.orig	2004-09-19 08:34:44.000000000 -0400
+--- ltmain.sh.orig	2004-09-19 22:34:44.000000000 +1000
 +++ ltmain.sh
 @@ -184,6 +184,31 @@ func_win32_libid () {
  # command doesn't match the default compiler.
@@ -85,7 +85,46 @@ $NetBSD: patch-ac,v 1.14 2004/12/17 16:24:22 jlam Exp $
  	  if test "$prev" = rpath; then
  	    case "$rpath " in
  	    *" $arg "*) ;;
-@@ -3168,6 +3221,7 @@ EOF
+@@ -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
+ 	   ;;
+@@ -3063,7 +3116,7 @@ EOF
+ 	    age="$number_minor"
+ 	    revision="$number_revision"
+ 	    ;;
+-	  freebsd-aout|freebsd-elf|sunos)
++	  freebsd-aout|freebsd-elf|dragonfly|sunos)
+ 	    current="$number_major"
+ 	    revision="$number_minor"
+ 	    age="0"
+@@ -3143,6 +3196,11 @@ EOF
+ 	  versuffix=".$current";
+ 	  ;;
+ 
++	dragonfly)
++	  major=".$current"
++	  versuffix=".$current"
++	  ;;
++
+ 	irix | nonstopux)
+ 	  major=`expr $current - $age + 1`
+ 
+@@ -3168,6 +3226,7 @@ EOF
  	linux)
  	  major=.`expr $current - $age`
  	  versuffix="$major.$age.$revision"
@@ -93,7 +132,16 @@ $NetBSD: patch-ac,v 1.14 2004/12/17 16:24:22 jlam Exp $
  	  ;;
  
  	osf)
-@@ -5364,8 +5418,16 @@ relink_command=\"$relink_command\""
+@@ -3336,7 +3395,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 +5423,16 @@ relink_command=\"$relink_command\""
        exit $EXIT_FAILURE
      fi
  
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 79a10e84042..ae95e20a6cb 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
+$NetBSD: patch-ad,v 1.20 2004/12/21 13:50:25 grant Exp $
 
---- libltdl/configure.orig	2004-09-19 08:23:09.000000000 -0400
+--- libltdl/configure.orig	2004-09-19 22:23:09.000000000 +1000
 +++ libltdl/configure
 @@ -322,11 +322,11 @@ else
  
@@ -16,6 +16,22 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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
    ;;
@@ -50,6 +66,15 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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
        ;;
  
@@ -93,6 +118,15 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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
+          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
+-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           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}'
+           ;;
+        *)
 @@ -7737,6 +7752,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
@@ -147,7 +181,24 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -8327,15 +8359,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8271,6 +8303,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  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*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -176,7 +227,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -8412,11 +8451,11 @@ knetbsd*-gnu)
+@@ -8412,11 +8461,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -190,7 +241,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -8447,10 +8486,10 @@ nto-qnx*)
+@@ -8447,10 +8496,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -203,7 +254,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +10049,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -10010,9 +10059,7 @@ echo "$as_me: error: tag name \"$tagname
  
        case $tagname in
        CXX)
@@ -214,7 +265,25 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10722,6 +10759,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10564,7 +10611,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
+-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           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
  	;;
      esac
      ;;
@@ -231,7 +300,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -10839,14 +10886,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10839,14 +10896,29 @@ if test -z "$aix_libpath"; then aix_libp
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -263,7 +332,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -11229,6 +11291,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11229,6 +11301,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
      esac
    done
  
@@ -285,7 +354,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -11276,9 +11353,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11276,9 +11363,11 @@ echo $ECHO_N "checking for $compiler opt
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -298,7 +367,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -11300,6 +11379,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11300,6 +11389,10 @@ echo $ECHO_N "checking for $compiler opt
  	;;
        esac
        ;;
@@ -309,7 +378,16 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
      *)
        lt_prog_compiler_pic_CXX='-fPIC'
        ;;
-@@ -11374,6 +11457,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -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
  	    ;;
  	esac
  	;;
@@ -318,7 +396,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
  	  CC)
-@@ -11844,6 +11929,7 @@ beos*)
+@@ -11844,6 +11939,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -326,7 +404,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +12044,17 @@ kfreebsd*-gnu)
+@@ -11958,16 +12054,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -350,7 +428,24 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -12043,15 +12130,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -11987,6 +12084,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  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*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -379,7 +474,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -12128,11 +12222,11 @@ knetbsd*-gnu)
+@@ -12128,11 +12242,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -393,7 +488,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -12163,10 +12257,10 @@ nto-qnx*)
+@@ -12163,10 +12277,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -406,7 +501,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +13804,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13710,9 +13824,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -419,7 +514,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -13741,6 +13837,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13741,6 +13857,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -431,7 +526,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
      *)
        lt_prog_compiler_pic_F77='-fPIC'
        ;;
-@@ -14126,6 +14227,17 @@ EOF
+@@ -14126,6 +14247,17 @@ EOF
        fi
        ;;
  
@@ -449,7 +544,25 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +14725,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14498,7 +14630,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
+-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           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
        fi
        ;;
  
@@ -471,7 +584,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +15131,7 @@ beos*)
+@@ -15004,6 +15151,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -479,7 +592,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +15246,17 @@ kfreebsd*-gnu)
+@@ -15118,16 +15266,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -503,7 +616,24 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -15203,15 +15332,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15147,6 +15296,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  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*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -532,7 +662,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -15288,11 +15424,11 @@ knetbsd*-gnu)
+@@ -15288,11 +15454,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -546,7 +676,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -15323,10 +15459,10 @@ nto-qnx*)
+@@ -15323,10 +15489,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -559,7 +689,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +16188,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16052,9 +16218,11 @@ echo $ECHO_N "checking for $compiler opt
        ;;
  
      darwin* | rhapsody*)
@@ -572,7 +702,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
        ;;
  
      msdosdjgpp*)
-@@ -16083,6 +16221,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16083,6 +16251,11 @@ echo $ECHO_N "checking for $compiler opt
        esac
        ;;
  
@@ -584,7 +714,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
      *)
        lt_prog_compiler_pic_GCJ='-fPIC'
        ;;
-@@ -16468,6 +16611,17 @@ EOF
+@@ -16468,6 +16641,17 @@ EOF
        fi
        ;;
  
@@ -602,7 +732,16 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +17129,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16860,7 +17044,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
+-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+           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}'
+           ;;
+        *)
+@@ -16975,6 +17159,21 @@ if test -z "$aix_libpath"; then aix_libp
        fi
        ;;
  
@@ -624,7 +763,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +17535,7 @@ beos*)
+@@ -17366,6 +17565,7 @@ beos*)
  bsdi[45]*)
    version_type=linux
    need_version=no
@@ -632,7 +771,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 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 +17650,17 @@ kfreebsd*-gnu)
+@@ -17480,16 +17680,17 @@ kfreebsd*-gnu)
    ;;
  
  freebsd*)
@@ -656,7 +795,24 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
        need_version=yes
        ;;
    esac
-@@ -17565,15 +17736,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17509,6 +17710,16 @@ freebsd*)
+   esac
+   ;;
+ 
++dragonfly*)
++  version_type=dragonfly
++  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*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -685,7 +841,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
    esac
    need_lib_prefix=no
    need_version=no
-@@ -17650,11 +17828,11 @@ knetbsd*-gnu)
+@@ -17650,11 +17868,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -699,7 +855,7 @@ $NetBSD: patch-ad,v 1.19 2004/11/11 22:29:03 tv Exp $
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -17685,10 +17863,10 @@ nto-qnx*)
+@@ -17685,10 +17903,10 @@ nto-qnx*)
    ;;
  
  openbsd*)