[Midnightbsd-cvs] mports: lang/guile: Update guile to 1.8.4.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 23 16:16:06 EDT 2008
Log Message:
-----------
Update guile to 1.8.4. Also switch off autoconf253
Modified Files:
--------------
mports/lang/guile:
Makefile (r1.1 -> r1.2)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/lang/guile/files:
patch-libguile___scm.h (r1.1 -> r1.2)
patch-libguile_gc_os_dep.c (r1.1 -> r1.2)
Added Files:
-----------
mports/lang/guile/files:
patch-config.h.in (r1.1)
patch-configure.in (r1.1)
patch-libguile_eval.c (r1.1)
patch-libguile_gen-scmconfig.c (r1.1)
patch-libguile_numbers.c (r1.1)
patch-libguile_pthread-threads.h (r1.1)
patch-libguile_read.c (r1.1)
patch-libguile_threads.c (r1.1)
Removed Files:
-------------
mports/lang/guile/files:
extra-patch-ia64
patch-ag
patch-libguile_load.c
patch-slib_slib.scm
patch-srfi_srfi-4.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/lang/guile/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/guile/pkg-plist -L lang/guile/pkg-plist -u -r1.1 -r1.2
--- lang/guile/pkg-plist
+++ lang/guile/pkg-plist
@@ -2,11 +2,13 @@
bin/guile-config
bin/guile-snarf
bin/guile-tools
-include/guile-readline/readline.h
include/guile/gh.h
+include/guile/readline.h
+include/guile/srfi/srfi-1.h
include/guile/srfi/srfi-13.h
include/guile/srfi/srfi-14.h
include/guile/srfi/srfi-4.h
+include/guile/srfi/srfi-60.h
include/libguile.h
include/libguile/__scm.h
include/libguile/alist.h
@@ -16,10 +18,12 @@
include/libguile/boolean.h
include/libguile/chars.h
include/libguile/continuations.h
-include/libguile/coop-defs.h
+include/libguile/convert.h
include/libguile/debug-malloc.h
include/libguile/debug.h
+include/libguile/deprecated.h
include/libguile/deprecation.h
+include/libguile/discouraged.h
include/libguile/dynl.h
include/libguile/dynwind.h
include/libguile/environments.h
@@ -32,6 +36,7 @@
include/libguile/filesys.h
include/libguile/fluids.h
include/libguile/fports.h
+include/libguile/futures.h
include/libguile/gc.h
include/libguile/gdb_interface.h
include/libguile/gdbint.h
@@ -41,7 +46,9 @@
include/libguile/hash.h
include/libguile/hashtab.h
include/libguile/hooks.h
+include/libguile/i18n.h
include/libguile/init.h
+include/libguile/inline.h
include/libguile/ioext.h
include/libguile/iselect.h
include/libguile/keywords.h
@@ -52,6 +59,7 @@
include/libguile/mallocs.h
include/libguile/modules.h
include/libguile/net_db.h
+include/libguile/null-threads.h
include/libguile/numbers.h
include/libguile/objects.h
include/libguile/objprop.h
@@ -63,6 +71,7 @@
include/libguile/procprop.h
include/libguile/procs.h
include/libguile/properties.h
+include/libguile/pthread-threads.h
include/libguile/ramap.h
include/libguile/random.h
include/libguile/rdelim.h
@@ -79,11 +88,13 @@
include/libguile/socket.h
include/libguile/sort.h
include/libguile/srcprop.h
+include/libguile/srfi-13.h
+include/libguile/srfi-14.h
+include/libguile/srfi-4.h
include/libguile/stackchk.h
include/libguile/stacks.h
include/libguile/stime.h
include/libguile/strings.h
-include/libguile/strop.h
include/libguile/strorder.h
include/libguile/strports.h
include/libguile/struct.h
@@ -99,35 +110,33 @@
include/libguile/version.h
include/libguile/vports.h
include/libguile/weaks.h
-lib/libguile-ltdl.a
-lib/libguile-ltdl.la
-lib/libguile-ltdl.so
-lib/libguile-ltdl.so.1
-lib/libguile-srfi-srfi-13-14-v-1.a
-lib/libguile-srfi-srfi-13-14-v-1.la
-lib/libguile-srfi-srfi-13-14-v-1.so
-lib/libguile-srfi-srfi-13-14-v-1.so.1
-lib/libguile-srfi-srfi-4-v-1.a
-lib/libguile-srfi-srfi-4-v-1.la
-lib/libguile-srfi-srfi-4-v-1.so
-lib/libguile-srfi-srfi-4-v-1.so.1
+lib/libguile-srfi-srfi-1-v-3.a
+lib/libguile-srfi-srfi-1-v-3.la
+lib/libguile-srfi-srfi-1-v-3.so
+lib/libguile-srfi-srfi-1-v-3.so.3
+lib/libguile-srfi-srfi-13-14-v-3.a
+lib/libguile-srfi-srfi-13-14-v-3.la
+lib/libguile-srfi-srfi-13-14-v-3.so
+lib/libguile-srfi-srfi-13-14-v-3.so.3
+lib/libguile-srfi-srfi-4-v-3.a
+lib/libguile-srfi-srfi-4-v-3.la
+lib/libguile-srfi-srfi-4-v-3.so
+lib/libguile-srfi-srfi-4-v-3.so.3
+lib/libguile-srfi-srfi-60-v-2.a
+lib/libguile-srfi-srfi-60-v-2.la
+lib/libguile-srfi-srfi-60-v-2.so
+lib/libguile-srfi-srfi-60-v-2.so.2
lib/libguile.a
lib/libguile.la
lib/libguile.so
-lib/libguile.so.15
-lib/libguilereadline-v-12.a
-lib/libguilereadline-v-12.la
-lib/libguilereadline-v-12.so
-lib/libguilereadline-v-12.so.15
-%%THREADS:%%lib/libqthreads.a
-%%THREADS:%%lib/libqthreads.la
-%%THREADS:%%lib/libqthreads.so
-%%THREADS:%%lib/libqthreads.so.15
+lib/libguile.so.18
+lib/libguilereadline-v-17.a
+lib/libguilereadline-v-17.la
+lib/libguilereadline-v-17.so
+lib/libguilereadline-v-17.so.17
share/aclocal/guile.m4
%%DATADIR%%/%%GUILE_VER%%/guile-procedures.txt
-%%DATADIR%%/%%GUILE_VER%%/ice-9/and-let*.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/and-let-star.scm
-%%DATADIR%%/%%GUILE_VER%%/ice-9/arrays.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/boot-9.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/buffered-input.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/calling.scm
@@ -135,20 +144,29 @@
%%DATADIR%%/%%GUILE_VER%%/ice-9/common-list.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/debug.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/debugger.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/command-loop.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/debugger/commands.scm
+%%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/deprecated.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/documentation.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/emacs.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/expect.scm
%%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/getopt-long.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/hcons.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/history.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/lineio.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/list.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/ls.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/mapping.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/match.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/networking.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/null.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/occam-channel.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/optargs.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/poe.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/popen.scm
@@ -167,6 +185,7 @@
%%DATADIR%%/%%GUILE_VER%%/ice-9/rw.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/safe-r5rs.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/safe.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/serialize.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/session.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/slib.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/stack-catch.scm
@@ -175,7 +194,43 @@
%%DATADIR%%/%%GUILE_VER%%/ice-9/syncase.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/threads.scm
%%DATADIR%%/%%GUILE_VER%%/ice-9/time.scm
+%%DATADIR%%/%%GUILE_VER%%/ice-9/weak-vector.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/base.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/example.el
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/interface.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/evaluation.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/format.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/fset.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/lambda.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/load.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/null.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/set.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/signal.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/time.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals/trace.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/buffers.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/char-table.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/features.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/fns.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/format.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/guile.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/keymaps.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/lists.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/load.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/match.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/numbers.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/pure.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/read.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/signal.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/strings.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/symprop.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/syntax.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/system.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives/time.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/transform.scm
+%%DATADIR%%/%%GUILE_VER%%/lang/elisp/variables.scm
%%DATADIR%%/%%GUILE_VER%%/oop/goops.scm
+%%DATADIR%%/%%GUILE_VER%%/oop/goops/accessors.scm
%%DATADIR%%/%%GUILE_VER%%/oop/goops/active-slot.scm
%%DATADIR%%/%%GUILE_VER%%/oop/goops/compile.scm
%%DATADIR%%/%%GUILE_VER%%/oop/goops/composite-slot.scm
@@ -184,9 +239,11 @@
%%DATADIR%%/%%GUILE_VER%%/oop/goops/internal.scm
%%DATADIR%%/%%GUILE_VER%%/oop/goops/old-define-method.scm
%%DATADIR%%/%%GUILE_VER%%/oop/goops/save.scm
+%%DATADIR%%/%%GUILE_VER%%/oop/goops/simple.scm
%%DATADIR%%/%%GUILE_VER%%/oop/goops/stklos.scm
%%DATADIR%%/%%GUILE_VER%%/oop/goops/util.scm
%%DATADIR%%/%%GUILE_VER%%/scripts/PROGRAM
+%%DATADIR%%/%%GUILE_VER%%/scripts/api-diff
%%DATADIR%%/%%GUILE_VER%%/scripts/autofrisk
%%DATADIR%%/%%GUILE_VER%%/scripts/display-commentary
%%DATADIR%%/%%GUILE_VER%%/scripts/doc-snarf
@@ -194,9 +251,13 @@
%%DATADIR%%/%%GUILE_VER%%/scripts/generate-autoload
%%DATADIR%%/%%GUILE_VER%%/scripts/lint
%%DATADIR%%/%%GUILE_VER%%/scripts/punify
+%%DATADIR%%/%%GUILE_VER%%/scripts/read-rfc822
%%DATADIR%%/%%GUILE_VER%%/scripts/read-scheme-source
+%%DATADIR%%/%%GUILE_VER%%/scripts/read-text-outline
+%%DATADIR%%/%%GUILE_VER%%/scripts/scan-api
%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-check-and-output-texi
%%DATADIR%%/%%GUILE_VER%%/scripts/snarf-guile-m4-docs
+%%DATADIR%%/%%GUILE_VER%%/scripts/summarize-guile-TODO
%%DATADIR%%/%%GUILE_VER%%/scripts/use2dot
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-1.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-10.scm
@@ -207,20 +268,30 @@
%%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-26.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-31.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-34.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-35.scm
+%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-37.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-39.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-4.scm
%%DATADIR%%/%%GUILE_VER%%/srfi/srfi-6.scm
+%%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-9.scm
@dirrm %%DATADIR%%/%%GUILE_VER%%/srfi
@dirrm %%DATADIR%%/%%GUILE_VER%%/scripts
@dirrm %%DATADIR%%/%%GUILE_VER%%/oop/goops
@dirrm %%DATADIR%%/%%GUILE_VER%%/oop
+ at dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp/primitives
+ at dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp/internals
+ at dirrm %%DATADIR%%/%%GUILE_VER%%/lang/elisp
+ at dirrm %%DATADIR%%/%%GUILE_VER%%/lang
+ at dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9/debugger
@dirrm %%DATADIR%%/%%GUILE_VER%%/ice-9
@dirrm %%DATADIR%%/%%GUILE_VER%%
@dirrm %%DATADIR%%
@dirrm include/libguile
@dirrm include/guile/srfi
- at dirrm include/guile-readline
@dirrm include/guile
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/guile/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/guile/Makefile -L lang/guile/Makefile -u -r1.1 -r1.2
--- lang/guile/Makefile
+++ lang/guile/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= guile
-PORTVERSION= 1.6.7
-PORTREVISION= 1
+PORTVERSION= 1.8.4
CATEGORIES= lang scheme
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= guile
@@ -16,36 +15,29 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= GNU Ubiquitous Intelligent Language for Extension
-USE_AUTOTOOLS= libltdl:15
+LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
+
+USE_AUTOTOOLS= autoconf:261 libltdl:15
+USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_GNOME= gnometarget
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-GUILE_VER= 1.6
+GUILE_VER= 1.8
PLIST_SUB= GUILE_VER=${GUILE_VER}
-REINPLACE_FILES= libguile/gc.c libguile/mallocs.c \
- libguile/ports.c libguile/smob.c
+REINPLACE_FILES= libguile/smob.c libguile/filesys.c libguile/gc.c \
+ libguile/mallocs.c libguile/eval.c libguile/gc-malloc.c \
+ libguile/ports.c libguile/gc-mark.c libguile/gc_os_dep.c
+
INFO= goops guile-tut guile r5rs
.include <bsd.port.pre.mk>
-.if ${ARCH} == "ia64"
-BROKEN= Does not install on ${ARCH}
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-ia64
-.endif
-
-.if ${ARCH} != "ia64" && ${ARCH} != "amd64" && ${ARCH} != "powerpc"
-CONFIGURE_ARGS+=--with-threads
-PLIST_SUB+= THREADS:=""
-.else
-PLIST_SUB+= THREADS:="@comment "
-.endif
-
post-extract:
cd ${WRKSRC}; ${CHMOD} u+w ${REINPLACE_FILES}
@${FIND} ${WRKSRC}/doc -name "*.info*" -delete
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/lang/guile/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/guile/distinfo -L lang/guile/distinfo -u -r1.1 -r1.2
--- lang/guile/distinfo
+++ lang/guile/distinfo
@@ -1,3 +1,3 @@
-MD5 (guile-1.6.7.tar.gz) = c2ff2a2231f0cbb2e838dd8701a587c5
-SHA256 (guile-1.6.7.tar.gz) = 8faeeac282b9d4175d15923a6bd0b6603653fdd744967b15d9577b5748555734
-SIZE (guile-1.6.7.tar.gz) = 3039294
+MD5 (guile-1.8.4.tar.gz) = aacc6a384af88a85574717a9221f5c6e
+SHA256 (guile-1.8.4.tar.gz) = ca03762565291708b6fbcda4224570e59889795651d3bbb5a380ff6d2c69e1b3
+SIZE (guile-1.8.4.tar.gz) = 3821388
--- lang/guile/files/patch-slib_slib.scm
+++ /dev/null
@@ -1,85 +0,0 @@
-Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date: 2005-10-04
-Initial Package Version: 1.6.7
-Upstream Status: Unknown
-Origin: http://article.gmane.org/gmane.comp.gnome.apps.gnucash.devel/13956
-Description: Fixes Guile with SLIB >= 3a2
-
-diff -Naur guile-1.6.7-orig/ice-9/slib.scm guile-1.6.7/ice-9/slib.scm
---- ice-9/slib.scm 2004-08-11 20:04:21.000000000 -0500
-+++ ice-9/slib.scm 2005-10-04 19:48:04.000000000 -0500
-@@ -388,3 +388,74 @@
-
- (define (make-exchanger obj)
- (lambda (rep) (let ((old obj)) (set! obj rep) old)))
-+
-+(define software-type
-+ (if (string<? (version) "1.6")
-+ (lambda () 'UNIX)
-+ (lambda () 'unix)))
-+
-+(define (user-vicinity)
-+ (case (software-type)
-+ ((VMS) "[.]")
-+ (else "")))
-+
-+(define vicinity:suffix?
-+ (let ((suffi
-+ (case (software-type)
-+ ((amiga) '(#\: #\/))
-+ ((macos thinkc) '(#\:))
-+ ((ms-dos windows atarist os/2) '(#\\ #\/))
-+ ((nosve) '(#\: #\.))
-+ ((unix coherent plan9) '(#\/))
-+ ((vms) '(#\: #\]))
-+ (else
-+ (warn "require.scm" 'unknown 'software-type (software-type))
-+ "/"))))
-+ (lambda (chr) (and (memv chr suffi) #t))))
-+
-+(define (pathname->vicinity pathname)
-+ (let loop ((i (- (string-length pathname) 1)))
-+ (cond ((negative? i) "")
-+ ((vicinity:suffix? (string-ref pathname i))
-+ (substring pathname 0 (+ i 1)))
-+ (else (loop (- i 1))))))
-+
-+(define (program-vicinity)
-+ (define clp (current-load-port))
-+ (if clp
-+ (pathname->vicinity (port-filename clp))
-+ (slib:error 'program-vicinity " called; use slib:load to load")))
-+
-+(define sub-vicinity
-+ (case (software-type)
-+ ((VMS) (lambda
-+ (vic name)
-+ (let ((l (string-length vic)))
-+ (if (or (zero? (string-length vic))
-+ (not (char=? #\] (string-ref vic (- l 1)))))
-+ (string-append vic "[" name "]")
-+ (string-append (substring vic 0 (- l 1))
-+ "." name "]")))))
-+ (else (let ((*vicinity-suffix*
-+ (case (software-type)
-+ ((NOSVE) ".")
-+ ((MACOS THINKC) ":")
-+ ((MS-DOS WINDOWS ATARIST OS/2) "\\")
-+ ((unix COHERENT PLAN9 AMIGA) "/"))))
-+ (lambda (vic name)
-+ (string-append vic name *vicinity-suffix*))))))
-+
-+(define with-load-pathname
-+ (let ((exchange
-+ (lambda (new)
-+ (let ((old program-vicinity))
-+ (set! program-vicinity new)
-+ old))))
-+ (lambda (path thunk)
-+ (define old #f)
-+ (define vic (pathname->vicinity path))
-+ (dynamic-wind
-+ (lambda () (set! old (exchange (lambda () vic))))
-+ thunk
-+ (lambda () (exchange old))))))
-+
--- /dev/null
+++ lang/guile/files/patch-libguile_threads.c
@@ -0,0 +1,27 @@
+--- libguile/threads.c 2008-02-27 10:17:41.531443640 -0600
++++ libguile/threads.c 2008-02-27 10:25:44.309334685 -0600
+@@ -593,7 +593,7 @@
+
+ #if SCM_USE_PTHREAD_THREADS
+
+-#if HAVE_PTHREAD_ATTR_GETSTACK && HAVE_PTHREAD_GETATTR_NP
++#if HAVE_PTHREAD_ATTR_GETSTACK && (HAVE_PTHREAD_GETATTR_NP || HAVE_PTHREAD_ATTR_GET_NP)
+ /* This method for GNU/Linux and perhaps some other systems.
+ It's not for MacOS X or Solaris 10, since pthread_getattr_np is not
+ available on them. */
+@@ -606,8 +606,15 @@
+ void *start, *end;
+ size_t size;
+
++#if HAVE_PTHREAD_ATTR_GET_NP
++ pthread_attr_init (&attr);
++ pthread_attr_get_np (pthread_self (), &attr);
++ pthread_attr_getstack (&attr, &start, &size);
++ pthread_attr_destroy (&attr);
++#elif HAVE_PTHREAD_GETATTR_NP
+ pthread_getattr_np (pthread_self (), &attr);
+ pthread_attr_getstack (&attr, &start, &size);
++#endif
+ end = (char *)start + size;
+
+ /* XXX - pthread_getattr_np from LinuxThreads does not seem to work
--- /dev/null
+++ lang/guile/files/patch-libguile_gen-scmconfig.c
@@ -0,0 +1,10 @@
+--- libguile/gen-scmconfig.c 2008-02-23 21:38:39.310330888 -0600
++++ libguile/gen-scmconfig.c 2008-02-23 21:39:32.909873567 -0600
+@@ -123,6 +123,7 @@
+
+ #include "gen-scmconfig.h"
+
++#define _ANSI_SOURCE
+ #include <stdio.h>
+ #include <string.h>
+
--- /dev/null
+++ lang/guile/files/patch-libguile_eval.c
@@ -0,0 +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
--- lang/guile/files/patch-srfi_srfi-4.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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;
--- /dev/null
+++ lang/guile/files/patch-config.h.in
@@ -0,0 +1,18 @@
+--- config.h.in 2008-02-16 16:12:15.000000000 -0600
++++ config.h.in 2008-02-27 10:33:27.327021569 -0600
+@@ -432,9 +432,15 @@
+ /* Define to 1 if you have the `pthread_get_stackaddr_np' function. */
+ #undef HAVE_PTHREAD_GET_STACKADDR_NP
+
++/* Define to 1 if you have the `pthread_attr_get_np' function. */
++#undef HAVE_PTHREAD_ATTR_GET_NP
++
+ /* Define to 1 if you have the <pthread.h> header file. */
+ #undef HAVE_PTHREAD_H
+
++/* Define to 1 if you have the <pthread_np.h> header file. */
++#undef HAVE_PTHREAD_NP_H
++
+ /* Define to 1 if you have the `pthread_sigmask' function. */
+ #undef HAVE_PTHREAD_SIGMASK
+
--- lang/guile/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt/Makefile.in.orig Mon Apr 24 14:53:57 2000
-+++ qt/Makefile.in Mon Apr 24 14:54:33 2000
-@@ -407,7 +407,7 @@
-
-
- .s.lo:
-- $(LIBTOOL) --mode=compile $(COMPILE) $(qthread_asflags) -c $<
-+ $(LIBTOOL) --mode=compile $(CC) $(qthread_asflags) -c $<
- qtmds.s:
- ${LN_S} ${srcdir}/${qtmds_s} qtmds.s
- qtmdc.c:
--- /dev/null
+++ lang/guile/files/patch-libguile_numbers.c
@@ -0,0 +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
+
+ /* Convert a C "complex double" to an SCM value. */
+-#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)
+ {
--- lang/guile/files/extra-patch-ia64
+++ /dev/null
@@ -1,94 +0,0 @@
---- 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;
- }
-
--#ifdef __ia64__
--struct rv
--{
-- long retval;
-- long first_return;
--};
--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. */
-@@ -135,9 +126,6 @@
- scm_t_contregs *rootcont = SCM_CONTREGS (scm_rootcont);
- long stack_size;
- SCM_STACKITEM * src;
--#ifdef __ia64__
-- struct rv rv;
--#endif
-
- SCM_ENTER_A_SECTION;
- SCM_FLUSH_REGISTER_WINDOWS;
-@@ -162,17 +150,15 @@
- memcpy (continuation->stack, src, sizeof (SCM_STACKITEM) * stack_size);
-
- #ifdef __ia64__
-- rv = ia64_getcontext (&continuation->ctx);
-- if (rv.first_return)
-+ continuation->backing_store = NULL;
-+ getcontext(&continuation->ctx);
-+ if (continuation->backing_store == NULL)
- {
- continuation->backing_store_size =
-- continuation->ctx.uc_mcontext.sc_ar_bsp -
-- __libc_ia64_register_backing_store_base;
-- continuation->backing_store = NULL;
-+ continuation->ctx.uc_mcontext.mc_special.bspstore - (4UL << 61);
- continuation->backing_store =
- 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),
- continuation->backing_store_size);
- *first = 1;
- return cont;
-@@ -235,8 +221,7 @@
-
- continuation->throw_value = val;
- #ifdef __ia64__
-- memcpy ((void *) __libc_ia64_register_backing_store_base,
-- continuation->backing_store,
-+ memcpy ((void *)(4UL << 61), continuation->backing_store,
- continuation->backing_store_size);
- setcontext (&continuation->ctx);
- #else
---- 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); \
-+ 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 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),
- "continuation");
-+ memset(contregs, 0, sizeof(*contregs));
- contregs->num_stack_items = 0;
- contregs->seq = 0;
- SCM_NEWSMOB (scm_rootcont, scm_tc16_continuation, contregs);
---- 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;
- contregs->base = stack_start;
Index: patch-libguile___scm.h
===================================================================
RCS file: /home/cvs/mports/lang/guile/files/patch-libguile___scm.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/guile/files/patch-libguile___scm.h -L lang/guile/files/patch-libguile___scm.h -u -r1.1 -r1.2
--- lang/guile/files/patch-libguile___scm.h
+++ lang/guile/files/patch-libguile___scm.h
@@ -1,7 +1,7 @@
---- libguile/__scm.h.orig Sat Apr 12 14:16:08 2003
-+++ libguile/__scm.h Sun Jun 1 16:32:36 2003
-@@ -354,7 +354,8 @@
- * that all the state of the process is contained in the stack.
+--- libguile/__scm.h 2008-02-23 18:14:28.106264450 -0600
++++ libguile/__scm.h 2008-02-23 18:15:41.306005478 -0600
+@@ -411,7 +411,8 @@
+ * that all the state of the process is contained in the stack.
*/
-#if defined (sparc) || defined (__sparc__) || defined (__sparc)
Index: patch-libguile_gc_os_dep.c
===================================================================
RCS file: /home/cvs/mports/lang/guile/files/patch-libguile_gc_os_dep.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/guile/files/patch-libguile_gc_os_dep.c -L lang/guile/files/patch-libguile_gc_os_dep.c -u -r1.1 -r1.2
--- lang/guile/files/patch-libguile_gc_os_dep.c
+++ lang/guile/files/patch-libguile_gc_os_dep.c
@@ -1,21 +1,19 @@
---- libguile/gc_os_dep.c.orig Wed Apr 16 22:16:21 2003
-+++ libguile/gc_os_dep.c Sun Sep 12 15:18:00 2004
-@@ -93,6 +93,14 @@
- # define OPENBSD
+--- libguile/gc_os_dep.c.orig 2008-02-16 19:50:24.000000000 +0100
++++ libguile/gc_os_dep.c 2008-03-06 16:21:40.000000000 +0100
+@@ -115,6 +115,12 @@
+ # define NETBSD
# define mach_type_known
# endif
+# if defined(__FreeBSD__) && defined(__sparc__)
++# define SPARC
+# define FREEBSD
+# include <machine/frame.h>
-+# define ALIGNMENT 8
-+# define CPP_WORDSZ 64
-+# define ALIGN_DOUBLE
+# define mach_type_known
+# endif
# if defined(__NetBSD__) && defined(__powerpc__)
# define POWERPC
# define NETBSD
-@@ -225,7 +233,21 @@
+@@ -249,7 +255,21 @@
# define ARM32
# define mach_type_known
# endif
@@ -36,9 +34,26 @@
+# define mach_type_known
+# elif defined(__alpha) || defined(__alpha__)
# define ALPHA
- # if !defined(LINUX)
+ # if !defined(LINUX) && !defined (NETBSD)
# define OSF1 /* a.k.a Digital Unix */
-@@ -1125,6 +1147,13 @@
+@@ -701,8 +721,6 @@
+
+ # ifdef SPARC
+ # define MACH_TYPE "SPARC"
+-# define ALIGNMENT 4 /* Required by hardware */
+-# define ALIGN_DOUBLE
+ extern int etext;
+ # ifdef SUNOS5
+ # define OS_TYPE "SUNOS5"
+@@ -750,7 +768,6 @@
+ # define DYNAMIC_LOADING
+ # endif
+ # ifdef DRSNX
+-# define CPP_WORDSZ 32
+ # define OS_TYPE "DRSNX"
+ extern char * GC_SysVGetDataStart();
+ extern int etext;
+@@ -1159,6 +1176,13 @@
# endif
# endif
@@ -52,16 +67,24 @@
# ifdef IA64
# define MACH_TYPE "IA64"
# define ALIGN_DOUBLE
-@@ -1468,7 +1497,7 @@
+@@ -1504,8 +1528,15 @@
# include <setjmp.h>
#endif
-#ifdef FREEBSD
+#if defined(FREEBSD) && defined(I386)
# include <machine/trap.h>
++# define ALIGNMENT 4
++# define CPP_WORDSZ 32
++#endif
++
++#if defined(FREEBSD) && defined(SPARC)
++# define ALIGNMENT 8
++# define ALIGN_DOUBLE
#endif
-@@ -1501,7 +1530,7 @@
+ #ifdef AMIGA
+@@ -1537,7 +1568,7 @@
#endif
#ifdef SUNOS5SIGS
@@ -70,3 +93,76 @@
# undef setjmp
# undef longjmp
# define setjmp(env) sigsetjmp(env, 1)
+@@ -1716,11 +1747,13 @@
+ /* static */ jmp_buf GC_jmp_buf;
+
+ /*ARGSUSED*/
++#if !(defined(FREEBSD) && defined(SPARC))
+ static void GC_fault_handler(sig)
+ int sig;
+ {
+ longjmp(GC_jmp_buf, 1);
+ }
++#endif
+
+ # ifdef __STDC__
+ typedef void (*handler)(int);
+@@ -1728,6 +1761,7 @@
+ typedef void (*handler)();
+ # endif
+
++#if !(defined(FREEBSD) && defined(SPARC))
+ # if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1)
+ static struct sigaction old_segv_act;
+ # if defined(_sigargs) || defined(HPUX) /* !Irix6.x */
+@@ -1736,7 +1770,9 @@
+ # else
+ static handler old_segv_handler, old_bus_handler;
+ # endif
++#endif
+
++#if !(defined(FREEBSD) && defined(SPARC))
+ static void GC_setup_temporary_fault_handler()
+ {
+ # if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1)
+@@ -1773,7 +1809,9 @@
+ # endif
+ # endif
+ }
++#endif
+
++#if !(defined(FREEBSD) && defined(SPARC))
+ static void GC_reset_fault_handler()
+ {
+ # if defined(SUNOS5SIGS) || defined(IRIX5) || defined(OSF1)
+@@ -1789,8 +1827,10 @@
+ # endif
+ # endif
+ }
++#endif
+
+ /* Single argument version, robust against whole program analysis. */
++#if !(defined(FREEBSD) && defined(SPARC))
+ static void
+ GC_noop1(x)
+ word x;
+@@ -1798,9 +1838,11 @@
+ static VOLATILE word sink;
+ sink = x;
+ }
++#endif
+
+ /* Return the first nonaddressible location > p (up) or */
+ /* the smallest location q s.t. [q,p] is addressible (!up). */
++#if !(defined(FREEBSD) && defined(SPARC))
+ static ptr_t GC_find_limit(p, up)
+ ptr_t p;
+ GC_bool up;
+@@ -1831,6 +1873,7 @@
+ }
+ return(result);
+ }
++#endif
+
+ # endif
+
--- lang/guile/files/patch-libguile_load.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- libguile/load.c.orig Sat Dec 7 17:41:32 2002
-+++ libguile/load.c Wed Apr 30 22:55:23 2003
-@@ -247,9 +247,11 @@
- SCM path = SCM_EOL;
-
- #ifdef SCM_LIBRARY_DIR
-- path = scm_list_3 (scm_makfrom0str (SCM_SITE_DIR),
-+ path = scm_list_5 (scm_makfrom0str (SCM_SITE_DIR),
- scm_makfrom0str (SCM_LIBRARY_DIR),
-- scm_makfrom0str (SCM_PKGDATA_DIR));
-+ scm_makfrom0str (SCM_PKGDATA_DIR),
-+ scm_makfrom0str ("%%X11BASE%%/share/guile"),
-+ scm_makfrom0str ("%%LOCALBASE%%/share/guile"));
- #endif /* SCM_LIBRARY_DIR */
-
- path = scm_internal_parse_path (getenv ("GUILE_LOAD_PATH"), path);
--- /dev/null
+++ lang/guile/files/patch-libguile_read.c
@@ -0,0 +1,11 @@
+--- libguile/read.c 2008-02-23 18:05:20.175715735 -0600
++++ libguile/read.c 2008-02-23 18:06:27.495397147 -0600
+@@ -27,7 +27,7 @@
+ #include <ctype.h>
+ #include <string.h>
+ #ifdef HAVE_STRINGS_H
+-# include <strings.h>
++# include "/usr/include/strings.h"
+ #endif
+
+ #include "libguile/_scm.h"
--- /dev/null
+++ lang/guile/files/patch-libguile_pthread-threads.h
@@ -0,0 +1,12 @@
+--- libguile/pthread-threads.h 2008-02-27 10:31:41.564950412 -0600
++++ libguile/pthread-threads.h 2008-02-27 10:36:08.383652510 -0600
+@@ -26,6 +26,9 @@
+ */
+
+ #include <pthread.h>
++#if HAVE_PTHREAD_NP_H
++# include <pthread_np.h>
++#endif
+ #include <sched.h>
+
+ /* Threads
--- /dev/null
+++ lang/guile/files/patch-configure.in
@@ -0,0 +1,28 @@
+--- configure.in 2008-02-16 17:15:18.000000000 -0600
++++ configure.in 2008-02-27 10:32:56.298707356 -0600
+@@ -692,10 +692,11 @@
+ # 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
+ #
+-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])
+
+@@ -1185,9 +1186,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
++ # pthread_attr_get_np - "np" meaning "non portable" says it
++ # all; specific to FreeBSD
+ # pthread_sigmask - not available on mingw
+ #
+- AC_CHECK_FUNCS(pthread_attr_getstack pthread_getattr_np pthread_get_stackaddr_np pthread_sigmask)
++ AC_CHECK_FUNCS(pthread_attr_getstack pthread_getattr_np pthread_get_stackaddr_np pthread_attr_get_np pthread_sigmask)
+
+ # On past versions of Solaris, believe 8 through 10 at least, you
+ # had to write "pthread_once_t foo = { PTHREAD_ONCE_INIT };".
More information about the Midnightbsd-cvs
mailing list