Fix failure to build under FreeBSD 6.2 due to lack of C99-required

functions clog and cexp (but presence of complex.h), reported in
pkg/36555.  The patch in the PR is from gentoo and has already been
applied upstream along guile's 1.8 branch.

5 files changed, 48 insertions, 6 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index f3781267a79..477d11865a9 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2007/10/09 19:19:10 martti Exp $
+# $NetBSD: Makefile,v 1.77 2007/12/28 01:00:10 gdt Exp $
 
 DISTNAME=		guile-1.8.2
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index 0c818cb4c4e..97dae50b6b9 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.31 2007/07/20 00:09:21 gdt Exp $
+$NetBSD: distinfo,v 1.32 2007/12/28 01:00:10 gdt Exp $
 
 SHA1 (guile-1.8.2.tar.gz) = b5c624b152a45f302e185e20a468a02f2eb73e38
 RMD160 (guile-1.8.2.tar.gz) = aa7af82866457caa6521817bf49e895f6b1c350c
 Size (guile-1.8.2.tar.gz) = 3762973 bytes
 SHA1 (patch-aa) = 37fdeb8171b13468bfd0fa4e45aaf1770b8668ea
+SHA1 (patch-ab) = d54a49a8cd24cb4925d7f1ef07f4e1ff6be71506
 SHA1 (patch-ae) = 479e1f1452c0589910aa757087743fa18f4de994
 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
 SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3
 SHA1 (patch-aj) = bcb095105f4a956a1766052893f0545f22e8b25f
 SHA1 (patch-ak) = 611701d9e768239b258d6144e451db8dc527945a
-SHA1 (patch-al) = b3cd5064fb3f91ea28fe9375b8fc15de05e4258b
-SHA1 (patch-am) = 396b184df21a89ba8a8be6e887b089f6cbcfa7f7
+SHA1 (patch-al) = 6038b669cebd4e096520b19eae5957364e5a447f
+SHA1 (patch-am) = b3f6a482a1edd2f9ff3ecb99e42e78c69e0a2739
diff --git a/lang/guile/patches/patch-ab b/lang/guile/patches/patch-ab
new file mode 100644
index 00000000000..2a0b14226e2
--- /dev/null
+++ b/lang/guile/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.9 2007/12/28 01:00:11 gdt Exp $
+
+--- libguile/numbers.c.orig	2007-05-09 16:22:03.000000000 -0400
++++ libguile/numbers.c
+@@ -6011,7 +6011,7 @@ SCM_DEFINE (scm_log, "log", 1, 0, 0,
+ {
+   if (SCM_COMPLEXP (z))
+     {
+-#if HAVE_COMPLEX_DOUBLE
++#if HAVE_COMPLEX_DOUBLE && HAVE_CLOG
+       return scm_from_complex_double (clog (SCM_COMPLEX_VALUE (z)));
+ #else
+       double re = SCM_COMPLEX_REAL (z);
+@@ -6077,7 +6077,7 @@ SCM_DEFINE (scm_exp, "exp", 1, 0, 0,
+ {
+   if (SCM_COMPLEXP (z))
+     {
+-#if HAVE_COMPLEX_DOUBLE
++#if HAVE_COMPLEX_DOUBLE && HAVE_CEXP
+       return scm_from_complex_double (cexp (SCM_COMPLEX_VALUE (z)));
+ #else
+       return scm_c_make_polar (exp (SCM_COMPLEX_REAL (z)),
diff --git a/lang/guile/patches/patch-al b/lang/guile/patches/patch-al
index 48a30d87d56..c5af7a3c7af 100644
--- a/lang/guile/patches/patch-al
+++ b/lang/guile/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.2 2007/07/20 00:09:23 gdt Exp $
+$NetBSD: patch-al,v 1.3 2007/12/28 01:00:11 gdt Exp $
 
 Fix the test and fix the output for the braces test needed on
 Solaris.
@@ -8,6 +8,15 @@ and that change seems incorrect.)
 
 --- configure.in.orig	2007-05-09 16:22:03.000000000 -0400
 +++ configure.in
+@@ -635,7 +635,7 @@ AC_CHECK_HEADERS([assert.h crt_externs.h
+ #   isblank - available as a GNU extension or in C99
+ #   _NSGetEnviron - Darwin specific
+ #
+-AC_CHECK_FUNCS([DINFINITY DQNAN chsize clog10 ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron])
++AC_CHECK_FUNCS([DINFINITY DQNAN chsize clog10 clog cexp ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron])
+ 
+ # Reasons for testing:
+ #   netdb.h - not in mingw
 @@ -1120,6 +1120,15 @@ case "$with_threads" in
      # glibc (2.3.6 at least) works both with or without braces, so the
      # test checks whether it works without.
diff --git a/lang/guile/patches/patch-am b/lang/guile/patches/patch-am
index 84eea9cc5bd..95a5edbb3bf 100644
--- a/lang/guile/patches/patch-am
+++ b/lang/guile/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2007/07/20 00:09:23 gdt Exp $
+$NetBSD: patch-am,v 1.3 2007/12/28 01:00:11 gdt Exp $
 
 regen from patched configure.in
 
@@ -17,6 +17,15 @@ regen from patched configure.in
  cross_compiling
  CC_FOR_BUILD
  CCLD_FOR_BUILD
+@@ -34925,7 +34925,7 @@ done
+ 
+ 
+ 
+-for ac_func in DINFINITY DQNAN chsize clog10 ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron
++for ac_func in DINFINITY DQNAN chsize clog10 clog cexp ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
 @@ -41504,7 +41504,6 @@ fi
  
  SCM_I_GSC_NEED_BRACES_ON_PTHREAD_ONCE_INIT=0