diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:35:50 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:35:50 +0000 |
commit | f1bb12de8e50bf76ae21f37debda60994ec7fd99 (patch) | |
tree | 1671d4beef381f12d939e34b344eb385a3af4f19 /lang/guile | |
parent | - Mark BROKEN on 6.x and below: this port uses posix_memalign(3) (diff) |
Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive
amount of work by the FreeBSD GNOME Team and our testers.
On top of the usual GNOME update, we have taken this opportunity to move
GNOME from X11BASE to LOCALBASE. This means roughly 600 ports NOT part of
the GNOME Desktop also need to be changed. The bulk of the move was carried
out by ahze, mezz, and pav, but it would not have been possible without
cooperation from the FreeBSD KDE team who worked with us to make sure
GNOME and KDE can still coexist happily. We would also like to send a
shout out to kris and pointyhat for putting up with multiple test runs
until we got something that was solid.
Back to GNOME 2.16. This release brings a huge amount of new functionality
to FreeBSD. The standard release notes can be read at
http://www.gnome.org/start/2.16/ . But on top of what you will read there,
jylefort and marcus have completed work on a port of HAL to FreeBSD. This
will allow FreeBSD to take advantage of closer hardware interaction such
as auto-mounting CD-ROMs, USB drives, and music players; auto-playing
audio CDs; and managing laptop power consumption.
But where would this all be without our loyal testers and contributors?
Therefore, the FreeBSD GNOME team would like to thank the following users:
Phillip Neumann <pneumann@gmail.com>
tmclaugh
mux
Yuri Pankov <yuri.pankov@gmail.com>
chinsan
Thomas <freebsdlists@bsdunix.ch>
Brian Gruber <knightbg@yahoo.com>
Franz Klammer <klammer@webonaut.com>
Dominique Goncalves <dominique.goncalves@gmail.com>
Pascal Hofstee <caelian@gmail.com>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
backyard <backyard1454-bsd@yahoo.com>
Andris Raugulis <endrju@null.lv> <endrju@null.lv>
Eric L. Chen <d9364104@mail.nchu.edu.tw>
Pawel Worach <pawel.worach@gmail.com>
QuiRK on #freebsd-gnome
Shane Bell <decept0@gmail.com>
luigi
sajd on #freebsd-gnome
sat
Chris Coleman <chrisc@vmunix.com>
kaeru on #freebsd-gnome
crsd_ via irc.freenode.org/#FreeBSD-GNOME
Joel Diaz <joeldiaz@mac.com>
Enjoy!
Approved by: portmgr (implicit, kris)
Notes
Notes:
svn path=/head/; revision=175253
Diffstat (limited to 'lang/guile')
-rw-r--r-- | lang/guile/Makefile | 12 | ||||
-rw-r--r-- | lang/guile/distinfo | 6 | ||||
-rw-r--r-- | lang/guile/files/extra-patch-ia64 | 94 | ||||
-rw-r--r-- | lang/guile/files/patch-slib_slib.scm | 85 | ||||
-rw-r--r-- | lang/guile/pkg-plist | 1 |
5 files changed, 7 insertions, 191 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile index b30eb2eb5d3b..b22736499ee8 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -3,11 +3,10 @@ # Whom: jseger@FreeBSD.org # # $FreeBSD$ -# +# $MCom: ports/lang/guile/Makefile,v 1.1 2006/09/12 14:57:06 ahze Exp $ PORTNAME= guile -PORTVERSION= 1.6.7 -PORTREVISION= 1 +PORTVERSION= 1.6.8 CATEGORIES= lang scheme MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= guile @@ -18,7 +17,7 @@ COMMENT= GNU Ubiquitous Intelligent Language for Extension USE_AUTOTOOLS= libltdl:15 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" @@ -33,11 +32,6 @@ 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:="" diff --git a/lang/guile/distinfo b/lang/guile/distinfo index d4b52d1acf77..35e18a0bd089 100644 --- a/lang/guile/distinfo +++ b/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.6.8.tar.gz) = 2756b01f428b910d33267aeaa0e2d59a +SHA256 (guile-1.6.8.tar.gz) = 3d4ab874f90f5c2003229be29488ba2aa6fe1f0317774283360530d5d9236011 +SIZE (guile-1.6.8.tar.gz) = 3114052 diff --git a/lang/guile/files/extra-patch-ia64 b/lang/guile/files/extra-patch-ia64 deleted file mode 100644 index 87035da6dcfe..000000000000 --- a/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; diff --git a/lang/guile/files/patch-slib_slib.scm b/lang/guile/files/patch-slib_slib.scm deleted file mode 100644 index ec1380da4e63..000000000000 --- a/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)))))) -+ diff --git a/lang/guile/pkg-plist b/lang/guile/pkg-plist index 8a3ec64fa25b..88bc9ffdc4ff 100644 --- a/lang/guile/pkg-plist +++ b/lang/guile/pkg-plist @@ -169,6 +169,7 @@ share/aclocal/guile.m4 %%DATADIR%%/%%GUILE_VER%%/ice-9/safe.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/session.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/slib.scm +%%DATADIR%%/%%GUILE_VER%%/ice-9/slib-old.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/stack-catch.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/streams.scm %%DATADIR%%/%%GUILE_VER%%/ice-9/string-fun.scm |