- Update to 1.85 (share lib version bumped)

PR:		ports/125435
Submitted by:	Yi-Jheng Lin <yzlin at cs.nctu.edu.tw>
Approved by:	Amatus <c11h15no2 at yahoo.com> (maintainer)

7 files changed, 53 insertions, 30 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 1d7d0f6e9685..deddcffb7168 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -6,8 +6,7 @@
 #    $MCom: ports/lang/guile/Makefile,v 1.1 2006/09/12 14:57:06 ahze Exp $
 
 PORTNAME=	guile
-PORTVERSION=	1.8.4
-PORTREVISION=	3
+PORTVERSION=	1.8.5
 CATEGORIES=	lang scheme
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	guile
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index c999247e6657..9820401e9f4c 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,3 +1,3 @@
-MD5 (guile-1.8.4.tar.gz) = aacc6a384af88a85574717a9221f5c6e
-SHA256 (guile-1.8.4.tar.gz) = ca03762565291708b6fbcda4224570e59889795651d3bbb5a380ff6d2c69e1b3
-SIZE (guile-1.8.4.tar.gz) = 3821388
+MD5 (guile-1.8.5.tar.gz) = a3f8216544509a74a4441f689a0410d2
+SHA256 (guile-1.8.5.tar.gz) = e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289
+SIZE (guile-1.8.5.tar.gz) = 3933369
diff --git a/lang/guile/files/patch-Makefile.in b/lang/guile/files/patch-Makefile.in
new file mode 100644
index 000000000000..0baedd074ff9
--- /dev/null
+++ b/lang/guile/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2008-07-09 15:28:14.000000000 +0800
++++ Makefile.in	2008-07-09 15:29:13.000000000 +0800
+@@ -318,7 +318,7 @@
+ TESTS = check-guile
+ ACLOCAL_AMFLAGS = -I guile-config
+ DISTCLEANFILES = check-guile.log
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = guile-1.8.pc
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/lang/guile/files/patch-configure.in b/lang/guile/files/patch-configure.in
index f3ad80b8a6a9..ccc925b6116f 100644
--- a/lang/guile/files/patch-configure.in
+++ b/lang/guile/files/patch-configure.in
@@ -1,19 +1,21 @@
---- configure.in	2008-02-16 17:15:18.000000000 -0600
-+++ configure.in	2008-02-27 10:32:56.298707356 -0600
-@@ -692,10 +692,11 @@
+--- configure.in	2008-07-09 14:38:42.000000000 +0800
++++ configure.in	2008-07-09 14:41:01.000000000 +0800
+@@ -692,12 +692,13 @@
  #   sys/param.h - not in mingw
  #   pthread.h - only available with pthreads.  ACX_PTHREAD doesn't
  #       check this specifically, we need it for the timespec test below.
 +#   pthread_np.h - available on FreeBSD
  #   sethostname - the function itself check because it's not in mingw,
  #       the DECL is checked because Solaris 10 doens't have in any header
+ #   strncasecmp - on NetBSD 1.6 the symbol is available in libc but the
+ #       declaration cannot be found
  #
 -AC_CHECK_HEADERS(crypt.h netdb.h pthread.h sys/param.h sys/resource.h sys/file.h)
 +AC_CHECK_HEADERS(crypt.h netdb.h pthread.h pthread_np.h sys/param.h sys/resource.h sys/file.h)
  AC_CHECK_FUNCS(chroot flock getlogin cuserid getpriority setpriority getpass sethostname gethostname)
- AC_CHECK_DECLS([sethostname])
+ AC_CHECK_DECLS([sethostname, strncasecmp])
  
-@@ -1185,9 +1186,11 @@
+@@ -1190,9 +1191,11 @@
      #         all; not present on MacOS X or Solaris 10
      #     pthread_get_stackaddr_np - "np" meaning "non portable" says it
      #         all; specific to MacOS X
diff --git a/lang/guile/files/patch-libguile_eval.c b/lang/guile/files/patch-libguile_eval.c
index 9a5e3c9b4940..3a7e9a21784e 100644
--- a/lang/guile/files/patch-libguile_eval.c
+++ b/lang/guile/files/patch-libguile_eval.c
@@ -1,11 +1,11 @@
---- libguile/eval.c	2008-02-23 18:14:28.083264040 -0600
-+++ libguile/eval.c	2008-02-23 18:20:55.081183329 -0600
-@@ -40,6 +40,8 @@
- /* This blob per the Autoconf manual (under "Particular Functions"). */
- #if HAVE_ALLOCA_H
- # include <alloca.h>
-+#elif defined __FreeBSD__
-+# include <stdlib.h>
- #elif defined __GNUC__
- # define alloca __builtin_alloca
- #elif defined _AIX
+--- libguile/eval.c	2008-07-09 14:44:29.000000000 +0800
++++ libguile/eval.c	2008-07-09 14:45:45.000000000 +0800
+@@ -42,6 +42,8 @@
+ #ifndef alloca
+ # if HAVE_ALLOCA_H
+ #  include <alloca.h>
++# elif defined __FreeBSD__
++#  include <stdlib.h>
+ # elif defined __GNUC__
+ #  define alloca __builtin_alloca
+ # elif defined _AIX
diff --git a/lang/guile/files/patch-libguile_numbers.c b/lang/guile/files/patch-libguile_numbers.c
index 3a78b4a64c6e..0e37e057045a 100644
--- a/lang/guile/files/patch-libguile_numbers.c
+++ b/lang/guile/files/patch-libguile_numbers.c
@@ -1,11 +1,11 @@
---- libguile/numbers.c	2008-02-23 15:41:35.231371691 -0600
-+++ libguile/numbers.c	2008-02-23 15:44:52.401368437 -0600
-@@ -170,7 +170,7 @@
- #endif
+--- libguile/numbers.c	2008-07-09 14:50:22.000000000 +0800
++++ libguile/numbers.c	2008-07-09 14:53:05.000000000 +0800
+@@ -163,7 +163,7 @@
+ }
  
- /* Convert a C "complex double" to an SCM value. */
+ #if defined (GUILE_I)
 -#if HAVE_COMPLEX_DOUBLE
 +#if HAVE_COMPLEX_DOUBLE && (HAVE_CLOG || HAVE_CLOG10 || HAVE_CEXP || HAVE_USABLE_CSQRT) && defined (SCM_COMPLEX_VALUE)
- static SCM
- scm_from_complex_double (complex double z)
- {
+ 
+ /* For an SCM object Z which is a complex number (ie. satisfies
+    SCM_COMPLEXP), return its value as a C level "complex double". */
diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist
index c47afc706e83..ec1c268eba70 100644
--- a/lang/guile/pkg-plist
+++ b/lang/guile/pkg-plist
@@ -129,11 +129,12 @@ lib/libguile-srfi-srfi-60-v-2.so.2
 lib/libguile.a
 lib/libguile.la
 lib/libguile.so
-lib/libguile.so.18
+lib/libguile.so.19
 lib/libguilereadline-v-17.a
 lib/libguilereadline-v-17.la
 lib/libguilereadline-v-17.so
 lib/libguilereadline-v-17.so.17
+libdata/pkgconfig/guile-1.8.pc
 share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt
 %%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm
@@ -149,6 +150,12 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/state.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/trc.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/utils.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugging/example-fns.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugging/ice-9-debugger-extensions.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugging/steps.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugging/trace.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugging/traps.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugging/trc.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/deprecated.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/documentation.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/emacs.scm
@@ -156,6 +163,8 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/ice-9/format.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/ftw.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/gap-buffer.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/gds-client.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/gds-server.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/getopt-long.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/hcons.scm
 %%DATADIR%%/%%GUILE_VER%%/ice-9/history.scm
@@ -279,6 +288,7 @@ share/aclocal/guile.m4
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-60.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-69.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-8.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-88.scm
 %%DATADIR%%/%%GUILE_VER%%/srfi/srfi-9.scm
 @dirrm %%DATADIR%%/%%GUILE_VER%%/srfi
 @dirrm %%DATADIR%%/%%GUILE_VER%%/scripts
@@ -288,6 +298,7 @@ share/aclocal/guile.m4
 @dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals
 @dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp
 @dirrm %%DATADIR%%/%%GUILE_VER%%/lang
+@dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9/debugging
 @dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9/debugger
 @dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9
 @dirrm %%DATADIR%%/%%GUILE_VER%%