看板 DFBSD_submit 關於我們 聯絡資訊
I'm sorry it's so big, but here's a diff for a libtool15 dfport. Theres a couple problems. I use USE_AUTOMAKE_VERSION because we have to do the bootstrap again for this to work, but it doesn't clean with this in the Makefile, so it's commented out. It will grind for a minute, then give shell errors about argument list too long with it in. Also, I had to be creative with the post-patch, because some patches needed to be done after bootstrapping it again, but the dragonfly patches need to go in before the bootstrap. A cleaner method has to exist than the way I did it. -Craig diff -uNr /usr/ports/devel/libtool15/Makefile devel/libtool15/Makefile --- /usr/ports/devel/libtool15/Makefile 2004-10-15 00:58:00.000000000 -0400 +++ devel/libtool15/Makefile 2004-12-16 13:38:57.000000000 -0500 @@ -23,13 +23,14 @@ CONFIGURE_ARGS?= --disable-ltdl-install CONFIGURE_ARGS+= --program-suffix=${BUILD_VERSION} CONFIGURE_ENV= PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION} -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes .if ${PORTNAME} == "libtool" INFO= libtool${BUILD_VERSION} .endif +#USE_AUTOMAKE_VER= 19 + post-patch: @(cd ${WRKSRC}/doc && \ ${RM} -f *.info* && \ @@ -39,6 +40,9 @@ @${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl${BUILD_VERSION}.m4 @${REINPLACE_CMD} -e 's|libtool.m4|libtool${BUILD_VERSION}.m4|g' \ -e 's|ltdl.m4|ltdl${BUILD_VERSION}.m4|g' ${WRKSRC}/Makefile.in + @${ECHO} Rebuilding configure scripts to pick up dragonfly changes + @(cd ${WRKSRC}; ./bootstrap 2> /dev/null) + @(cd ${WRKSRC}; patch < ../../files/after-rebuild.patch) .if ${PORTNAME} == "libtool" post-install: @@ -51,4 +55,4 @@ ${PREFIX}/info/dir .endif -.include <bsd.port.mk> +.include <bsd.dfport.mk> diff -uNr /usr/ports/devel/libtool15/files/after-rebuild.patch devel/libtool15/files/after-rebuild.patch --- /usr/ports/devel/libtool15/files/after-rebuild.patch 1969-12-31 19:00:00.000000000 -0500 +++ devel/libtool15/files/after-rebuild.patch 2004-12-16 12:47:17.000000000 -0500 @@ -0,0 +1,57 @@ +--- configure.orig Mon Apr 14 17:29:24 2003 ++++ configure Fri Apr 18 20:43:44 2003 +@@ -424,4 +424,4 @@ + # Identity of this package. +-PACKAGE_NAME='libtool' +-PACKAGE_TARNAME='libtool' ++PACKAGE_NAME='libtool15' ++PACKAGE_TARNAME='libtool15' + PACKAGE_VERSION='1.5' +@@ -1782,3 +1782,3 @@ + # Define the identity of the package. +- PACKAGE=libtool ++ PACKAGE=libtool15 + VERSION=1.5 +--- libltdl/Makefile.in.orig 2004-12-16 12:35:27.000000000 -0500 ++++ libltdl/Makefile.in 2004-12-16 12:38:04.000000000 -0500 +@@ -428,13 +428,11 @@ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ echo no cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ echo no cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ ++ install -c -o root -g wheel -m 444 $$d/$$file $(distdir/$$file; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ +@@ -644,18 +642,18 @@ + $(SHELL) ./config.status --recheck + + local-install-files: $(DISTFILES) +- -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl +- $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl ++ -rm -rf $(DESTDIR)$(datadir)/libtool15/libltdl ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool15/libltdl + @for file in $(DISTFILES); do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$(srcdir)/||"`;; \ + esac; \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \ ++ cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool15/libltdl/$$file; \ + else \ +- test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \ +- || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \ ++ test -f $(DESTDIR)$(datadir)/libtool15/libltdl/$$file \ ++ || cp $$d/$$file $(DESTDIR)$(datadir)/libtool15/libltdl/$$file || :; \ + fi; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -uNr /usr/ports/devel/libtool15/files/patch-ae devel/libtool15/files/patch-ae --- /usr/ports/devel/libtool15/files/patch-ae 2003-07-02 14:26:53.000000000 -0400 +++ devel/libtool15/files/patch-ae 1969-12-31 19:00:00.000000000 -0500 @@ -1,14 +0,0 @@ ---- configure.orig Mon Apr 14 17:29:24 2003 -+++ configure Fri Apr 18 20:43:44 2003 -@@ -424,4 +424,4 @@ - # Identity of this package. --PACKAGE_NAME='libtool' --PACKAGE_TARNAME='libtool' -+PACKAGE_NAME='libtool15' -+PACKAGE_TARNAME='libtool15' - PACKAGE_VERSION='1.5' -@@ -1782,3 +1782,3 @@ - # Define the identity of the package. -- PACKAGE=libtool -+ PACKAGE=libtool15 - VERSION=1.5 diff -uNr /usr/ports/devel/libtool15/files/patch-af devel/libtool15/files/patch-af --- /usr/ports/devel/libtool15/files/patch-af 2003-07-02 14:26:53.000000000 -0400 +++ devel/libtool15/files/patch-af 1969-12-31 19:00:00.000000000 -0500 @@ -1,32 +0,0 @@ ---- libltdl/Makefile.in.orig Mon Apr 14 17:29:35 2003 -+++ libltdl/Makefile.in Fri Apr 18 20:27:46 2003 -@@ -404,9 +404,7 @@ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ echo no cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ echo no cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -+ install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \ - fi; \ -@@ -586,4 +584,4 @@ - local-install-files: $(DISTFILES) -- -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl -- $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl -+ -rm -rf $(DESTDIR)$(datadir)/libtool15/libltdl -+ $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool15/libltdl - @for file in $(DISTFILES); do \ -@@ -591,6 +589,6 @@ - if test -d $$d/$$file; then \ -- cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \ -+ cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool15/libltdl/$$file; \ - else \ -- test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \ -- || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \ -+ test -f $(DESTDIR)$(datadir)/libtool15/libltdl/$$file \ -+ || cp $$d/$$file $(DESTDIR)$(datadir)/libtool15/libltdl/$$file || :; \ - fi; \ diff -uNr /usr/ports/devel/libtool15/files/patch-bootstrap devel/libtool15/files/patch-bootstrap --- /usr/ports/devel/libtool15/files/patch-bootstrap 1969-12-31 19:00:00.000000000 -0500 +++ devel/libtool15/files/patch-bootstrap 2004-12-16 11:43:15.000000000 -0500 @@ -0,0 +1,38 @@ +--- bootstrap 2004-09-19 08:15:06.000000000 -0400 ++++ bootstrap 2004-12-16 11:24:14.000000000 -0500 +@@ -8,10 +8,10 @@ + # Delete stale acinclude.m4 from previous libtool versions. + rm -f acinclude.m4 + +-: ${ACLOCAL=aclocal} +-: ${AUTOMAKE=automake} +-: ${AUTOCONF=autoconf} +-: ${AUTOHEADER=autoheader} ++: ${ACLOCAL=aclocal19} ++: ${AUTOMAKE=automake19} ++: ${AUTOCONF=autoconf259} ++: ${AUTOHEADER=autoheader259} + + # fake the libtool scripts + touch ltmain.sh +@@ -22,17 +22,17 @@ + case $sub in + .) + top_srcdir=. +- acfiles="$top_srcdir/libtool.m4" ++ acfiles="$top_srcdir/libtool15.m4" + AUTOMAKE_FLAGS="--gnu --add-missing --copy" + ;; + libltdl) + top_srcdir=.. +- acfiles="$top_srcdir/libtool.m4 $top_srcdir/ltdl.m4" ++ acfiles="$top_srcdir/libtool15.m4 $top_srcdir/ltdl15.m4" + AUTOMAKE_FLAGS="--gnits --add-missing --copy" + ;; + *) + top_srcdir=.. +- acfiles="$top_srcdir/libtool.m4" ++ acfiles="$top_srcdir/libtool15.m4" + AUTOMAKE_FLAGS="--gnits --add-missing" + ;; + esac diff -uNr /usr/ports/devel/libtool15/files/patch-dragonfly devel/libtool15/files/patch-dragonfly --- /usr/ports/devel/libtool15/files/patch-dragonfly 1969-12-31 19:00:00.000000000 -0500 +++ devel/libtool15/files/patch-dragonfly 2004-12-16 11:44:21.000000000 -0500 @@ -0,0 +1,831 @@ +--- acinclude.m4 2004-09-19 08:21:26.000000000 -0400 ++++ acinclude.m4 2004-12-16 10:45:01.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- cdemo/acinclude.m4 2004-09-19 08:23:10.000000000 -0400 ++++ cdemo/acinclude.m4 2004-12-16 10:45:29.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- demo/acinclude.m4 2004-09-19 08:23:54.000000000 -0400 ++++ demo/acinclude.m4 2004-12-16 10:45:38.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- depdemo/acinclude.m4 2004-09-19 08:24:35.000000000 -0400 ++++ depdemo/acinclude.m4 2004-12-16 10:45:49.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- f77demo/acinclude.m4 2004-09-19 08:28:07.000000000 -0400 ++++ f77demo/acinclude.m4 2004-12-16 10:46:40.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- libltdl/acinclude.m4 2004-09-19 08:22:04.000000000 -0400 ++++ libltdl/acinclude.m4 2004-12-16 10:45:12.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- libtool.m4 2004-09-19 08:15:08.000000000 -0400 ++++ libtool.m4 2004-12-16 10:27:30.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- ltmain.in 2004-09-19 08:15:12.000000000 -0400 ++++ ltmain.in 2004-12-16 10:32:25.000000000 -0500 +@@ -1466,7 +1466,7 @@ + # 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 +1477,7 @@ + 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 +3063,7 @@ + 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 +3143,11 @@ + versuffix=".$current"; + ;; + ++ dragonfly) ++ major=".$current" ++ versuffix=".$current"; ++ ;; ++ + irix | nonstopux) + major=`expr $current - $age + 1` + +@@ -3336,7 +3341,7 @@ + *-*-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 + ;; +--- mdemo/acinclude.m4 2004-09-19 08:25:20.000000000 -0400 ++++ mdemo/acinclude.m4 2004-12-16 10:46:01.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- mdemo2/acinclude.m4 2004-09-19 08:26:02.000000000 -0400 ++++ mdemo2/acinclude.m4 2004-12-16 10:46:11.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- pdemo/acinclude.m4 2004-09-19 08:26:44.000000000 -0400 ++++ pdemo/acinclude.m4 2004-12-16 10:46:21.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 +--- tagdemo/acinclude.m4 2004-09-19 08:27:26.000000000 -0400 ++++ tagdemo/acinclude.m4 2004-12-16 10:46:31.000000000 -0500 +@@ -678,7 +678,7 @@ + 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` +@@ -1344,6 +1344,16 @@ + 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 +@@ -2160,13 +2170,13 @@ + 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.*` + ;; +@@ -2967,7 +2977,7 @@ + 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 +@@ -4661,7 +4671,7 @@ + ;; + esac + ;; +- freebsd* | kfreebsd*-gnu) ++ freebsd* | kfreebsd*-gnu | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) +@@ -5517,7 +5527,7 @@ + ;; + + # 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 -- ----------------------------------------------------------------------- Craig Dooley <xlnxminusx@gmail.com>