| From: | Hiroki Sato <hrs@xxxxxxxxxx> |
| Date: | Wed, 29 Dec 2004 22:07:13 +0900 (JST) |
Hi, Here is a patch to update dfports/lang/guile from 1.6.4 to 1.6.5.
Index: Makefile
===================================================================
RCS file: /cvs/dfports/lang/guile/Makefile,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 Makefile
--- Makefile 30 Nov 2004 15:19:00 -0000 1.2
+++ Makefile 29 Dec 2004 10:01:14 -0000
@@ -7,8 +7,8 @@
#
PORTNAME= guile
-PORTVERSION= 1.6.4
-PORTREVISION= 6
+PORTVERSION= 1.6.5
+PORTREVISION= 0
CATEGORIES= lang scheme
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= guile
Index: distinfo
===================================================================
RCS file: /cvs/dfports/lang/guile/distinfo,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 distinfo
--- distinfo 24 May 2004 15:57:58 -0000 1.1
+++ distinfo 29 Dec 2004 10:07:38 -0000
@@ -1,2 +1,2 @@
-MD5 (guile-1.6.4.tar.gz) = a4aceb5f185878c1de4e8aa7c38b6d1d
-SIZE (guile-1.6.4.tar.gz) = 2778075
+MD5 (guile-1.6.5.tar.gz) = 5fc12555279d2062715877b7304a9b36
+SIZE (guile-1.6.5.tar.gz) = 3031556
Index: pkg-plist
===================================================================
RCS file: /cvs/dfports/lang/guile/pkg-plist,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 pkg-plist
--- pkg-plist 24 May 2004 15:57:58 -0000 1.1
+++ pkg-plist 29 Dec 2004 10:01:48 -0000
@@ -207,6 +207,7 @@
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-17.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-19.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-2.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-31.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-4.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-6.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-8.scm
Index: files/extra-patch-ia64
===================================================================
RCS file: /cvs/dfports/lang/guile/files/extra-patch-ia64,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 extra-patch-ia64
--- files/extra-patch-ia64 24 May 2004 15:57:58 -0000 1.1
+++ files/extra-patch-ia64 29 Dec 2004 12:48:34 -0000
@@ -1,6 +1,6 @@
---- libguile/continuations.c.orig Sat Dec 7 14:41:31 2002
-+++ libguile/continuations.c Sun Oct 19 21:44:01 2003
-@@ -114,16 +114,6 @@
+--- libguile/continuations.c.orig Fri Sep 12 18:58:00 2003
++++ libguile/continuations.c Wed Nov 24 07:50:54 2004
+@@ -114,15 +114,6 @@
return 1;
}
@@ -10,14 +10,13 @@
- long retval;
- long first_return;
-};
--extern struct rv getcontext (ucontext_t *);
--extern int setcontext (ucontext_t *);
+-extern struct rv ia64_getcontext (ucontext_t *) __asm__ ("getcontext");
-#endif /* __ia64__ */
-
/* this may return more than once: the first time with the escape
procedure, then subsequently with the value to be passed to the
continuation. */
-@@ -136,9 +126,6 @@
+@@ -135,9 +126,6 @@
scm_t_contregs *rootcont = SCM_CONTREGS (scm_rootcont);
long stack_size;
SCM_STACKITEM * src;
@@ -27,11 +26,11 @@
SCM_ENTER_A_SECTION;
SCM_FLUSH_REGISTER_WINDOWS;
-@@ -163,17 +150,15 @@
+@@ -162,17 +150,15 @@
memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
#ifdef __ia64__
-- rv = getcontext (&continuation->ctx);
+- rv = ia64_getcontext (&continuation->ctx);
- if (rv.first_return)
+ continuation->backing_store = NULL;
+ getcontext(&continuation->ctx);
@@ -46,11 +45,11 @@
scm_must_malloc (continuation->backing_store_size, FUNC_NAME);
- memcpy (continuation->backing_store,
- (void *) __libc_ia64_register_backing_store_base,
-+ memcpy (continuation->backing_store, (void *)(4UL << 61),
++ memcpy (continuation->backing_store, (void *)(4UL << 61),
continuation->backing_store_size);
*first = 1;
return cont;
-@@ -236,8 +221,7 @@
+@@ -235,8 +221,7 @@
continuation->throw_value = val;
#ifdef __ia64__
@@ -60,21 +59,21 @@
continuation->backing_store_size);
setcontext (&continuation->ctx);
#else
---- libguile/gc.c.orig Sun Apr 20 11:16:59 2003
-+++ libguile/gc.c Sun Oct 19 21:44:01 2003
+--- libguile/gc.c.orig Wed Nov 24 07:41:44 2004
++++ libguile/gc.c Wed Nov 24 07:53:51 2004
@@ -1041,8 +1041,8 @@
scm_mark_locations ((SCM_STACKITEM *) &ctx.uc_mcontext, \
((size_t) (sizeof (SCM_STACKITEM) - 1 + sizeof ctx.uc_mcontext) \
/ sizeof (SCM_STACKITEM))); \
- bot = (SCM_STACKITEM *) __libc_ia64_register_backing_store_base; \
- top = (SCM_STACKITEM *) ctx.uc_mcontext.sc_ar_bsp; \
-+ bot = (SCM_STACKITEM *) (4UL << 61); \
++ bot = (SCM_STACKITEM *) (4UL << 61); \
+ top = (SCM_STACKITEM *) ctx.uc_mcontext.mc_special.bspstore; \
scm_mark_locations (bot, top - bot); } while (0)
#else
# define SCM_MARK_BACKING_STORE()
---- libguile/init.c.orig Sat Dec 7 14:41:32 2002
-+++ libguile/init.c Sun Oct 19 21:44:01 2003
+--- libguile/init.c.orig Sun Sep 5 23:05:37 2004
++++ libguile/init.c Wed Nov 24 07:59:48 2004
@@ -188,6 +188,7 @@
{
scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs),
@@ -83,13 +82,12 @@
contregs->num_stack_items = 0;
contregs->seq = 0;
SCM_NEWSMOB (scm_rootcont, scm_tc16_continuation, contregs);
---- libguile/root.c.orig Sat Dec 7 14:41:32 2002
-+++ libguile/root.c Sun Oct 19 21:44:01 2003
-@@ -253,7 +253,7 @@
- {
+--- libguile/root.c.orig Sat Dec 7 22:41:32 2002
++++ libguile/root.c Wed Nov 24 08:00:14 2004
+@@ -254,6 +254,7 @@
scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs),
"inferior root continuation");
--
+
+ memset(contregs, 0, sizeof(*contregs));
contregs->num_stack_items = 0;
contregs->dynenv = SCM_EOL;
Index: files/patch-libguile::posix.c
===================================================================
RCS file: files/patch-libguile::posix.c
diff -N files/patch-libguile::posix.c
--- files/patch-libguile::posix.c 24 May 2004 15:57:58 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
---- libguile/posix.c.orig Mon Dec 8 17:26:35 2003
-+++ libguile/posix.c Mon Dec 8 17:31:20 2003
-@@ -147,10 +147,6 @@
- #include <locale.h>
- #endif
-
--#if HAVE_LIBCRYPT && HAVE_CRYPT_H
--# include <crypt.h>
--#endif
--
- #if HAVE_SYS_RESOURCE_H
- # include <sys/resource.h>
- #endif
-@@ -1343,7 +1339,7 @@
- #undef FUNC_NAME
- #endif /* HAVE_SYNC */
-
--#if HAVE_LIBCRYPT && HAVE_CRYPT_H
-+#if HAVE_LIBCRYPT
- SCM_DEFINE (scm_crypt, "crypt", 2, 0, 0,
- (SCM key, SCM salt),
- "Encrypt @var{key} using @var{salt} as the salt value to the\n"
-@@ -1361,7 +1357,7 @@
- return scm_makfrom0str (p);
- }
- #undef FUNC_NAME
--#endif /* HAVE_LIBCRYPT && HAVE_CRYPT_H */
-+#endif /* HAVE_LIBCRYPT */
-
- #if HAVE_CHROOT
- SCM_DEFINE (scm_chroot, "chroot", 1, 0, 0,
Index: files/patch-srfi_srfi-4.c
===================================================================
RCS file: files/patch-srfi_srfi-4.c
diff -N files/patch-srfi_srfi-4.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-srfi_srfi-4.c 29 Dec 2004 10:04:25 -0000
@@ -0,0 +1,13 @@
+--- srfi/srfi-4.c.orig Sat Nov 20 17:30:56 2004
++++ srfi/srfi-4.c Sat Nov 20 17:31:55 2004
+@@ -50,6 +50,10 @@
+ #include <string.h>
+ #include <stdio.h>
+
++#ifndef SIZE_MAX
++#define SIZE_MAX ((size_t) (-1))
++#endif
++
+ /* For brevity and maintainability, we define our own types for the
+ various integer and floating point types. */
+ typedef unsigned char int_u8;
Attachment:
pgp00028.pgp
Description: PGP signature