Fix libtool fragment on DragonFly, so that LTDL_SHLIBPATH_VAR gets

correctly defined. Use isnan and isinf on DragonFly and not the
non-standard isinff/isnanf.

4 files changed, 192 insertions, 1 deletions

diff --git a/emulators/tme/distinfo b/emulators/tme/distinfo
index da750d3ada7..19e6b8380cd 100644
--- a/emulators/tme/distinfo
+++ b/emulators/tme/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/12/05 20:50:12 rillig Exp $
+$NetBSD: distinfo,v 1.6 2006/09/24 15:20:28 joerg Exp $
 
 SHA1 (tme-0.4.tar.gz) = 7a1a2c6aa05527b11f81925e4931e7250f5be308
 RMD160 (tme-0.4.tar.gz) = a5b5ac56c8247f94cd96c92a04a6cb132ba92931
@@ -7,3 +7,6 @@ SHA1 (patch-aa) = 0fe6c37472caa876c253b9e8bb4e09cd278e5def
 SHA1 (patch-ac) = 885286eb6893d5af9769791805d054212b6d0db5
 SHA1 (patch-ad) = 3f5adbaa94e5b97ded14e9a05cce912ed01f406f
 SHA1 (patch-ae) = 2f472a55f5afd1c0079349ce49bd3eb251ea9d76
+SHA1 (patch-af) = 17bf5f0a52036b50533fdfb9f2b6d74ea9494186
+SHA1 (patch-ag) = 9b88bc76c34320e63f7aa4fda6804b7b2c432c5c
+SHA1 (patch-ah) = c33a0dd4353aac9d7c01a0c9d5d54e5813e8382d
diff --git a/emulators/tme/patches/patch-af b/emulators/tme/patches/patch-af
new file mode 100644
index 00000000000..494c1169e81
--- /dev/null
+++ b/emulators/tme/patches/patch-af
@@ -0,0 +1,101 @@
+$NetBSD: patch-af,v 1.1 2006/09/24 15:20:28 joerg Exp $
+
+--- libltdl/configure.orig	2006-09-24 16:19:12.000000000 +0000
++++ libltdl/configure
+@@ -3518,13 +3518,13 @@ darwin* | rhapsody*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd*)
++freebsd* | 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 (DragonFly|FreeBSD|OpenBSD)/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.*`
+       ;;
+@@ -7289,7 +7289,7 @@ if test -z "$aix_libpath"; then aix_libp
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
++    freebsd* | dragonfly*)
+       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+@@ -7922,7 +7922,7 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+@@ -10086,7 +10086,7 @@ if test -z "$aix_libpath"; then aix_libp
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd*)
++  freebsd* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -10793,7 +10793,7 @@ echo $ECHO_N "checking for $compiler opt
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd*)
++      freebsd* | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -11462,7 +11462,7 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+@@ -13806,7 +13806,7 @@ if test -z "$aix_libpath"; then aix_libp
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
++    freebsd* | dragonfly*)
+       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_F77='-R$libdir'
+       hardcode_direct_F77=yes
+@@ -14439,7 +14439,7 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+@@ -16067,7 +16067,7 @@ if test -z "$aix_libpath"; then aix_libp
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd*)
++    freebsd* | dragonfly*)
+       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_GCJ='-R$libdir'
+       hardcode_direct_GCJ=yes
+@@ -16700,7 +16700,7 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
diff --git a/emulators/tme/patches/patch-ag b/emulators/tme/patches/patch-ag
new file mode 100644
index 00000000000..784164624dc
--- /dev/null
+++ b/emulators/tme/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1 2006/09/24 15:20:28 joerg Exp $
+
+--- ic/ieee754/ieee754-misc-auto.sh.orig	2005-05-11 00:13:33.000000000 +0000
++++ ic/ieee754/ieee754-misc-auto.sh
+@@ -473,7 +473,10 @@ tme_ieee754_${precision}_value_from_buil
+   tme_uint32_t chunk;
+ 
+   /* x must not be a NaN or an infinity: */
+-#if (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_FLOAT)
++#if defined(isnan) && defined(__DragonFly__)
++  assert (!isnan(x_builtin));
++  assert (!isinf(x_builtin));
++#elif (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_FLOAT)
+   assert (!isnanf(x_builtin));
+   assert (!isinff(x_builtin));
+ #elif (TME_FLOAT_FORMAT_IEEE754_${capprecision}_BUILTIN == TME_FLOAT_FORMAT_DOUBLE)
diff --git a/emulators/tme/patches/patch-ah b/emulators/tme/patches/patch-ah
new file mode 100644
index 00000000000..99b66ad34b9
--- /dev/null
+++ b/emulators/tme/patches/patch-ah
@@ -0,0 +1,71 @@
+$NetBSD: patch-ah,v 1.1 2006/09/24 15:20:28 joerg Exp $
+
+--- tme/generic/float.h.orig	2006-09-24 16:50:59.000000000 +0000
++++ tme/generic/float.h
+@@ -334,6 +334,27 @@ tme_float_assert_formats(_tme_const stru
+    | (x)->tme_float_value_ieee754_quad.tme_float_ieee754_quad_lo.tme_value64_uint32_lo)
+ 
+ /* this evaluates to nonzero if the float is a NaN: */
++#if defined(isnan) && defined(__DragonFly__)
++#define tme_float_is_nan(x, formats) \
++  (tme_float_assert_formats(x, formats) \
++   && (tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_SINGLE) \
++       ? (tme_float_value_ieee754_exponent_single(x) == 0xff \
++	  && tme_float_value_ieee754_fracor_single(x) != 0) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_DOUBLE) \
++       ? (tme_float_value_ieee754_exponent_double(x) == 0x7ff \
++	  && tme_float_value_ieee754_fracor_double(x) != 0) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_EXTENDED80) \
++       ? (tme_float_value_ieee754_exponent_extended80(x) == 0x7fff \
++	  && tme_float_value_ieee754_fracor_extended80(x) != 0) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_QUAD) \
++       ? (tme_float_value_ieee754_exponent_quad(x) == 0x7fff \
++	  && tme_float_value_ieee754_fracor_quad(x) != 0) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_FLOAT) \
++       ? isnan((x)->tme_float_value_float) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_DOUBLE) \
++       ? isnan((x)->tme_float_value_double) \
++       : TME_FLOAT_IF_LONG_DOUBLE(isnan((x)->tme_float_value_long_double) ||) FALSE))
++#else
+ #define tme_float_is_nan(x, formats) \
+   (tme_float_assert_formats(x, formats) \
+    && (tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_SINGLE) \
+@@ -353,8 +374,30 @@ tme_float_assert_formats(_tme_const stru
+        : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_DOUBLE) \
+        ? isnan((x)->tme_float_value_double) \
+        : TME_FLOAT_IF_LONG_DOUBLE(isnan((x)->tme_float_value_long_double) ||) FALSE))
++#endif
+ 
+ /* this evaluates to nonzero if the float is an infinity: */
++#if defined(isinf) && defined(__DragonFly__)
++#define tme_float_is_inf(x, formats) \
++  (tme_float_assert_formats(x, formats) \
++   && (tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_SINGLE) \
++       ? (tme_float_value_ieee754_exponent_single(x) == 0xff \
++	  && tme_float_value_ieee754_fracor_single(x) == 0) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_DOUBLE) \
++       ? (tme_float_value_ieee754_exponent_double(x) == 0x7ff \
++	  && tme_float_value_ieee754_fracor_double(x) == 0) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_EXTENDED80) \
++       ? (tme_float_value_ieee754_exponent_extended80(x) == 0x7fff \
++	  && tme_float_value_ieee754_fracor_extended80(x) == 0) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_QUAD) \
++       ? (tme_float_value_ieee754_exponent_quad(x) == 0x7fff \
++	  && tme_float_value_ieee754_fracor_quad(x) == 0) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_FLOAT) \
++       ? isinf((x)->tme_float_value_float) \
++       : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_DOUBLE) \
++       ? isinf((x)->tme_float_value_double) \
++       : TME_FLOAT_IF_LONG_DOUBLE(isinf((x)->tme_float_value_long_double) ||) FALSE))
++#else
+ #define tme_float_is_inf(x, formats) \
+   (tme_float_assert_formats(x, formats) \
+    && (tme_float_is_format(x, formats, TME_FLOAT_FORMAT_IEEE754_SINGLE) \
+@@ -374,6 +417,7 @@ tme_float_assert_formats(_tme_const stru
+        : tme_float_is_format(x, formats, TME_FLOAT_FORMAT_DOUBLE) \
+        ? isinf((x)->tme_float_value_double) \
+        : TME_FLOAT_IF_LONG_DOUBLE(isinf((x)->tme_float_value_long_double) ||) FALSE))
++#endif
+ 
+ /* this evaluates to nonzero if the float is a zero: */
+ #define tme_float_is_zero(x, formats) \