Make it build systems where there is no isnan() symbol in the libc/libm (it

should be macro according to standards).

4 files changed, 36 insertions, 3 deletions

diff --git a/lang/see/Makefile b/lang/see/Makefile
index 06d6bdbfee0..856b78ed97b 100644
--- a/lang/see/Makefile
+++ b/lang/see/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/05/20 00:58:20 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/03 06:03:50 hasso Exp $
 #
 
 DISTNAME=	see-3.0.1376
@@ -15,12 +15,15 @@ INSTALLATION_DIRS+=	share/doc/see
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config perl
+USE_TOOLS+=		pkg-config perl aclocal autoconf automake
 
 CONFIGURE_ARGS+=	--with-readline
 
 PKGCONFIG_OVERRIDE+=	libsee/see.pc.in
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -vif
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/USAGE.html ${DESTDIR}${PREFIX}/share/doc/see/
 
diff --git a/lang/see/distinfo b/lang/see/distinfo
index c3c81d6ca23..808f0cd7038 100644
--- a/lang/see/distinfo
+++ b/lang/see/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/02/12 15:24:14 he Exp $
+$NetBSD: distinfo,v 1.3 2009/06/03 06:03:50 hasso Exp $
 
 SHA1 (see-3.0.1376.tar.gz) = d803adac6298a0f556d59f501f0376d9196d0821
 RMD160 (see-3.0.1376.tar.gz) = 1fb3eb7a796ba96fe68fbc3225bcaafff5692f6f
 Size (see-3.0.1376.tar.gz) = 1066852 bytes
 SHA1 (patch-aa) = 00d5260d023bc4f03239aa42eff0ced616a9691f
+SHA1 (patch-ab) = aabd85db43cfd9faa6ed28472582f1bd0f65e8dc
+SHA1 (patch-ac) = 387fcc2139fe2b558ea1556770b40bc339b195ff
diff --git a/lang/see/patches/patch-ab b/lang/see/patches/patch-ab
new file mode 100644
index 00000000000..d6f7ea71fe7
--- /dev/null
+++ b/lang/see/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2009/06/03 06:03:50 hasso Exp $
+
+--- configure.ac.orig	2009-06-03 05:59:44 +0300
++++ configure.ac	2009-06-03 06:03:54 +0300
+@@ -333,6 +333,10 @@ AC_CHECK_FUNCS([isnan _isnan],[have_isna
+ AC_CHECK_FUNCS([finite _finite isfinite],[have_finite=yes])
+ AC_CHECK_FUNCS([copysign _copysign],[have_copysign=yes])
+ 
++if test $have_isnan = no; then
++    AC_CHECK_DECLS([isnan],[have_isnan=yes],,[#include <math.h>])
++fi
++
+ dnl -- when using double isnan/finite must be available
+ if test $ac_cv_sizeof_float -ne 8; then
+     test $have_isnan = no && missing_funcs="$missing_funcs isnan";
diff --git a/lang/see/patches/patch-ac b/lang/see/patches/patch-ac
new file mode 100644
index 00000000000..1b037b4af2f
--- /dev/null
+++ b/lang/see/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2009/06/03 06:03:50 hasso Exp $
+
+--- libsee/math.c.orig	2009-06-03 06:31:41 +0300
++++ libsee/math.c	2009-06-03 06:33:02 +0300
+@@ -47,7 +47,7 @@ _SEE_isnan(n)
+ {
+ #if SEE_NUMBER_IS_FLOAT && HAVE_ISNANF
+ 	return isnanf(n);
+-#elif HAVE_ISNAN
++#elif HAVE_ISNAN || HAVE_DECL_ISNAN
+ 	return isnan(n);
+ #elif HAVE__ISNAN
+ 	return _isnan(n);