- Update to 0.9.8

PR:		ports/91012
Submitted by:	NIIMI Satoshi <sa2c@sa2c.net> (maintainer)

4 files changed, 94 insertions, 11 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 82379fe035b..64780dc2fcf 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	0.9.7
+PORTVERSION=	0.9.8
 CATEGORIES=	lang lisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sbcl
@@ -18,14 +18,17 @@ DISTFILES+=	${DISTNAME}-html${EXTRACT_SUFX}
 MAINTAINER=	sa2c@sa2c.net
 COMMENT=	A Common Lisp development system derived from the CMU CL system
 
+.undef BOOT_VERSION
 # If you have a previous version of SBCL installed, you can use it
 # instead of CMUCL to build the port, then deinstall it before
 # installing the new version.
 .if defined(WITH_SBCL)
 LISP_CMD=	""
-.else
+.elif defined(WITH_CMUCL)
 BUILD_DEPENDS=	lisp:${PORTSDIR}/lang/cmucl
 LISP_CMD=	"lisp -noinit -batch"
+.else
+BOOT_VERSION=	${PORTVERSION}
 .endif
 
 USE_REINPLACE=	yes
@@ -51,6 +54,18 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-contrib_asdf-install_installer.lisp
 RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
+.if defined(BOOT_VERSION)
+MASTER_SITES+=	http://www.and.or.jp/sbcl/:boot
+BOOT_ARCH=	${ARCH}
+BOOT_OS=	${OPSYS:L}
+BOOT_DISTNAME=	${PORTNAME}-${BOOT_VERSION}-${BOOT_ARCH}-${BOOT_OS}
+DISTFILES+=	${BOOT_DISTNAME}-binary${EXTRACT_SUFX}:boot
+LISP_CMD=	"${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl --core ${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core --disable-debugger --userinit /dev/null --sysinit /dev/null"
+.if ${OSVERSION} >= 500000
+BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libc.so.4:${PORTSDIR}/misc/compat4x
+.endif
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -E -e \
 		's|CFLAGS = .*|CFLAGS = ${CFLAGS} -DSBCL_HOME=\\"${PREFIX}/lib/sbcl/\\"|' \
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 4f89c5a6fe7..a7c0fc65b82 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,9 +1,9 @@
-MD5 (sbcl-0.9.7-source.tar.bz2) = d5e5e4ae500f12b7523989222cb4cc88
-SHA256 (sbcl-0.9.7-source.tar.bz2) = dc9f823d8b7abd1523bb5571683332c0b15944533b20152e045cfa56af052267
-SIZE (sbcl-0.9.7-source.tar.bz2) = 2674470
-MD5 (sbcl-0.9.7-html.tar.bz2) = 5d176eb894d6f8bbbe5afff9c75b1452
-SHA256 (sbcl-0.9.7-html.tar.bz2) = 4c5d75b8450e8c216608b57da3827e0f4401533cc0c04d34da1a369bce7cf46c
-SIZE (sbcl-0.9.7-html.tar.bz2) = 117773
-MD5 (sbcl-0.9.7-x86-freebsd-binary.tar.bz2) = 06ca3d34495caaa69a50b49225ab54aa
-SHA256 (sbcl-0.9.7-x86-freebsd-binary.tar.bz2) = 13a538ae5acaac493258960fd544008a7888fa4e96f48d41e3be0717510e1efd
-SIZE (sbcl-0.9.7-x86-freebsd-binary.tar.bz2) = 8144165
+MD5 (sbcl-0.9.8-source.tar.bz2) = 4a8a3de71aff073b4e23e5bc2e432b27
+SHA256 (sbcl-0.9.8-source.tar.bz2) = 08a02e2db4a20446282cd6475d17aaf2625a35080f5bac5e7833fe31186bb2d6
+SIZE (sbcl-0.9.8-source.tar.bz2) = 2674853
+MD5 (sbcl-0.9.8-html.tar.bz2) = 598bc9c1fe88b8ea0d97082fc528fba4
+SHA256 (sbcl-0.9.8-html.tar.bz2) = 4edd847864f1ac0b1e9d039d0559d2d534540bd66d0c71d25b0bb8723c97502d
+SIZE (sbcl-0.9.8-html.tar.bz2) = 119641
+MD5 (sbcl-0.9.8-i386-freebsd-binary.tar.bz2) = 8012db9ebc4d06b93e934ca94fb9f1fe
+SHA256 (sbcl-0.9.8-i386-freebsd-binary.tar.bz2) = 87332cf3e51910eabe195cf70b32669083d1b49b419b191e0b901354401d1f45
+SIZE (sbcl-0.9.8-i386-freebsd-binary.tar.bz2) = 7250813
diff --git a/lang/sbcl/files/patch-sigsegv b/lang/sbcl/files/patch-sigsegv
new file mode 100644
index 00000000000..9e83e2f17c2
--- /dev/null
+++ b/lang/sbcl/files/patch-sigsegv
@@ -0,0 +1,61 @@
+Index: src/runtime/bsd-os.c
+===================================================================
+RCS file: /cvsroot/sbcl/sbcl/src/runtime/bsd-os.c,v
+retrieving revision 1.29
+diff -u -r1.29 bsd-os.c
+--- src/runtime/bsd-os.c	4 Dec 2005 22:25:07 -0000	1.29
++++ src/runtime/bsd-os.c	28 Dec 2005 01:24:17 -0000
+@@ -204,6 +204,10 @@
+     SHOW("os_install_interrupt_handlers()/bsd-os/defined(GENCGC)");
+     undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT,
+                                                  memory_fault_handler);
++#ifdef SIG_MEMORY_FAULT2
++    undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT2,
++                                                 memory_fault_handler);
++#endif
+     SHOW("leaving os_install_interrupt_handlers()");
+ }
+ 
+@@ -230,6 +234,10 @@
+     SHOW("os_install_interrupt_handlers()/bsd-os/!defined(GENCGC)");
+     undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT,
+                                                  sigsegv_handler);
++#ifdef SIG_MEMORY_FAULT2
++    undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT2,
++                                                 sigsegv_handler);
++#endif
+ }
+ 
+ #endif /* defined GENCGC */
+Index: src/runtime/bsd-os.h
+===================================================================
+RCS file: /cvsroot/sbcl/sbcl/src/runtime/bsd-os.h,v
+retrieving revision 1.14
+diff -u -r1.14 bsd-os.h
+--- src/runtime/bsd-os.h	17 Apr 2005 19:41:28 -0000	1.14
++++ src/runtime/bsd-os.h	28 Dec 2005 01:24:17 -0000
+@@ -55,6 +55,7 @@
+  * so we need to implement single stepping in a more roundabout way. */
+ #define CANNOT_GET_TO_SINGLE_STEP_FLAG
+ #define SIG_MEMORY_FAULT SIGBUS
++#define SIG_MEMORY_FAULT2 SIGSEGV
+ 
+ #elif defined __OpenBSD__
+ 
+Index: src/runtime/interrupt.c
+===================================================================
+RCS file: /cvsroot/sbcl/sbcl/src/runtime/interrupt.c,v
+retrieving revision 1.106
+diff -u -r1.106 interrupt.c
+--- src/runtime/interrupt.c	4 Dec 2005 22:25:07 -0000	1.106
++++ src/runtime/interrupt.c	28 Dec 2005 01:24:17 -0000
+@@ -1140,6 +1140,9 @@
+         (sigaction_nodefer_works ? SA_NODEFER : 0);
+ #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
+     if((signal==SIG_MEMORY_FAULT)
++#ifdef SIG_MEMORY_FAULT2
++       || (signal==SIG_MEMORY_FAULT2)
++#endif
+ #ifdef SIG_INTERRUPT_THREAD
+        || (signal==SIG_INTERRUPT_THREAD)
+ #endif
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index fff1f4268da..30c2ef4e45a 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -118,9 +118,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003alock_002dpackage.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003amake_002dtimer.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003amake_002dweak_002dpointer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003anative_002dnamestring.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003anative_002dpathname.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003apackage_002dimplemented_002dby_002dlist.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003apackage_002dimplements_002dlist.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003apackage_002dlocked_002dp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003aparse_002dnative_002dnamestring.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003aposix_002dgetenv.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003apurify.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dext_003aquit.html
@@ -215,6 +218,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Introduction-to-the-Foreign-Function-Interface.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Language-Reference.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Lisp-Pathnames.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Loading-Shared-Object-Files.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Local-Foreign-Variables.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Local-_0028Unix_0029-Domain-Sockets.html
@@ -234,6 +238,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/More-SBCL-Information.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Mutex-Support.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Name-Service.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Native-Filenames.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Networking.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Note-On-Lexical-Variable-Access.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Online-Documentation.html
@@ -246,6 +251,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Package-Lock-Violations.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Package-Locks-in-Compiled-Code.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Package-Locks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Pathnames.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Precise-Type-Checking.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Profiling.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Quit.html
@@ -518,6 +524,7 @@ lib/sbcl/sb-simple-streams/string.fasl
 lib/sbcl/sb-simple-streams/string.lisp
 lib/sbcl/sb-simple-streams/terminal.fasl
 lib/sbcl/sb-simple-streams/terminal.lisp
+lib/sbcl/sb-simple-streams/test-data.tmp
 lib/sbcl/sb-simple-streams/test-passed
 lib/sbcl/sb-sprof/sb-sprof.fasl
 lib/sbcl/sbcl.core