Attachment 154489 Details for Bug 198688 – unified patch

[patch] unified patch

sbcl-1.2.8.patch (text/plain), 13.15 KB, created by Jack Carrozzo on 2015-03-18 19:03:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack Carrozzo

Created: 2015-03-18 19:03:15 UTC

Size: 13.15 KB

patch

obsolete

>diff -ruN sbcl-orig/Makefile sbcl/Makefile
>--- sbcl-orig/Makefile	2015-03-18 14:41:27.000000000 -0400
>+++ sbcl/Makefile	2015-03-18 14:59:59.000000000 -0400
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/lang/sbcl/Makefile 364741 2014-08-12 20:19:53Z olgeni $
> 
> PORTNAME=	sbcl
>-PORTVERSION=	1.1.12
>+PORTVERSION=	1.2.8
> PORTEPOCH=	1
> CATEGORIES=	lang lisp
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
>@@ -9,7 +9,7 @@
> DISTFILES=	\
> 	${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	jack@crepinc.com
> COMMENT=	Common Lisp development system derived from the CMU CL system
> 
> LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
>@@ -22,7 +22,6 @@
> THREADS_DESC=	Experimental threading support
> 
> CONTRIB_MODULES=	asdf			\
>-			asdf-install		\
> 			sb-aclrepl		\
> 			sb-bsd-sockets		\
> 			sb-cltl2		\
>@@ -33,6 +32,7 @@
> 			sb-grovel		\
> 			sb-introspect		\
> 			sb-md5			\
>+			sb-mpfr			\
> 			sb-posix		\
> 			sb-queue		\
> 			sb-rotate-byte		\
>@@ -69,14 +69,17 @@
> DISTFILES+=	\
> 	${PORTNAME}-${PORTVERSION}-documentation-html${EXTRACT_SUFX}
> MANUALS=	asdf.html sbcl.html
>-MODULESDOCS=	asdf/README asdf/README.SBCL	\
>-		asdf-install/README 		\
>-		sb-aclrepl/README		\
>-		sb-bsd-sockets/FAQ sb-bsd-sockets/NEWS \
>-		sb-md5/README			\
>+MODULESDOCS=	asdf/README asdf/README.SBCL    \
>+		sb-simple-streams/README	\
>+		sb-mpfr/README.md		\
>+		sb-gmp/README.md		\
> 		sb-posix/README			\
>+		sb-md5/README			\
>+		sb-bsd-sockets/NEWS		\
>+		sb-bsd-sockets/FAQ		\
>+		sb-aclrepl/README		\
> 		sb-rotate-byte/README		\
>-		sb-simple-streams/README
>+
> TEXTDOCS=	BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO
> .endif
> 
>@@ -85,8 +88,7 @@
> BOOT_VERSION=	1.0.31
> 
> . if make(makesum)
>-BOOT_ARCH_OS_LIST=	amd64-freebsd8 amd64-freebsd7 i386-freebsd8 \
>-			i386-freebsd7
>+BOOT_ARCH_OS_LIST=	amd64-freebsd8 i386-freebsd8
> . else
> .  if ${OSREL:R} > 8	# We'll use 8.x bootstrap for now
> BOOT_ARCH_OS_LIST=	${ARCH}-freebsd8
>@@ -197,10 +199,12 @@
> 	${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME}/
> .for MOD in ${CONTRIB_MODULES}
> 	${MKDIR} ${STAGEDIR}${SBCL_HOME}/${MOD}
>-	${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.lisp ${STAGEDIR}${SBCL_HOME}/${MOD}/
>-	${INSTALL_DATA} ${WRKSRC}/contrib/${MOD}/*.fasl ${STAGEDIR}${SBCL_HOME}/${MOD}/
>+	(if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.lisp; then ${INSTALL_DATA} \
>+		${WRKSRC}/contrib/${MOD}/*.lisp ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi)
>+	(if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.fasl; then ${INSTALL_DATA} \
>+		${WRKSRC}/contrib/${MOD}/*.fasl ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi)
> 	(if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.asd; then ${INSTALL_DATA} \
>-	    ${WRKSRC}/contrib/${MOD}/${MOD}.asd ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi)
>+		${WRKSRC}/contrib/${MOD}/${MOD}.asd ${STAGEDIR}${SBCL_HOME}/${MOD}/; fi)
> .endfor
> .if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
>diff -ruN sbcl-orig/distinfo sbcl/distinfo
>--- sbcl-orig/distinfo	2015-03-18 14:41:27.000000000 -0400
>+++ sbcl/distinfo	2015-02-15 18:59:48.000000000 -0500
>@@ -1,12 +1,6 @@
>-SHA256 (sbcl-1.1.12-source.tar.bz2) = 8c9412cbdb601b636ff3e3c7908ca46d9d97dcfedec33eb634db13122f357457
>-SIZE (sbcl-1.1.12-source.tar.bz2) = 4217764
>-SHA256 (sbcl-1.1.12-documentation-html.tar.bz2) = 496e5bdd513bd71f99554a599f041a299dff339e803c32d50345f8ffeb26bdcd
>-SIZE (sbcl-1.1.12-documentation-html.tar.bz2) = 186902
>+SHA256 (sbcl-1.2.8-source.tar.bz2) = 2d28a9aed5d8507feb7200b88eb5ae37155b6c8e71f42a33f0c6795300a76929
>+SIZE (sbcl-1.2.8-source.tar.bz2) = 5493384
>+SHA256 (sbcl-1.2.8-documentation-html.tar.bz2) = 05caa716d0f958b704255ce58b9ab3add98d5c67d40f21ca4b723c5261c3b997
>+SIZE (sbcl-1.2.8-documentation-html.tar.bz2) = 214356
> SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e
> SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764
>-SHA256 (sbcl-1.0.31-amd64-freebsd7-binary.tar.bz2) = fcbd5ed1948312a7b6eff7e6daf736e41be945a2c57bcee4b64f172ddde518b8
>-SIZE (sbcl-1.0.31-amd64-freebsd7-binary.tar.bz2) = 8398964
>-SHA256 (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = fd2348749a2babf301a99449d246b349a1285fc0bca8b83bde0bfa7187cf3dd7
>-SIZE (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = 8475244
>-SHA256 (sbcl-1.0.31-i386-freebsd7-binary.tar.bz2) = 5202f6d7a8a1f3b1f19cbd4c65d874b85e8015fc5efec71bffef407c25edbe77
>-SIZE (sbcl-1.0.31-i386-freebsd7-binary.tar.bz2) = 8474568
>diff -ruN sbcl-orig/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp
>--- sbcl-orig/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp	2015-03-18 14:41:27.000000000 -0400
>+++ sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- contrib/sb-concurrency/tests/test-frlock.lisp.orig	2012-12-01 06:32:36.000000000 -0500
>-+++ contrib/sb-concurrency/tests/test-frlock.lisp	2012-12-15 16:23:03.000000000 -0500
>-@@ -80,7 +80,7 @@
>-       (values (cdr w-e!) (cdr r-e!))))
>- 
>- #+sb-thread
>--(deftest* (frlock.1 :fails-on :win32)
>-+(deftest* (frlock.1 :fails-on (or :freebsd :win32))
>-     (handler-case
>-         (sb-ext:with-timeout 60 (test-frlocks))
>-       (sb-ext:timeout (c)
>diff -ruN sbcl-orig/files/patch-contrib__sb-sprof__test.lisp sbcl/files/patch-contrib__sb-sprof__test.lisp
>--- sbcl-orig/files/patch-contrib__sb-sprof__test.lisp	2015-03-18 14:41:27.000000000 -0400
>+++ sbcl/files/patch-contrib__sb-sprof__test.lisp	1969-12-31 19:00:00.000000000 -0500
>@@ -1,14 +0,0 @@
>---- contrib/sb-sprof/test.lisp.orig	2013-02-26 06:42:18.000000000 -0500
>-+++ contrib/sb-sprof/test.lisp	2013-03-22 14:29:52.000000000 -0400
>-@@ -1,9 +1,9 @@
>- (in-package :cl-user)
>- (require :sb-sprof)
>- 
>--#-(or win32 darwin)                    ;not yet
>-+#-(or win32 darwin freebsd)                    ;not yet
>- (sb-sprof::test)
>--#-(or win32 darwin)                    ;not yet
>-+#-(or win32 darwin freebsd)                    ;not yet
>- (sb-sprof::consing-test)
>- 
>- ;; For debugging purposes, print output for visual inspection to see if
>diff -ruN sbcl-orig/pkg-plist sbcl/pkg-plist
>--- sbcl-orig/pkg-plist	2015-03-18 14:41:27.000000000 -0400
>+++ sbcl/pkg-plist	2015-03-18 14:06:17.000000000 -0400
>@@ -1,189 +1,22 @@
> bin/sbcl
>-lib/sbcl/asdf-install/asdf-install.asd
>-lib/sbcl/asdf-install/asdf-install.fasl
>-lib/sbcl/asdf-install/defpackage.fasl
>-lib/sbcl/asdf-install/defpackage.lisp
>-lib/sbcl/asdf-install/installer.fasl
>-lib/sbcl/asdf-install/installer.lisp
>-lib/sbcl/asdf/asdf.fasl
> lib/sbcl/asdf/asdf.lisp
>-lib/sbcl/sb-aclrepl/debug.fasl
>-lib/sbcl/sb-aclrepl/debug.lisp
>-lib/sbcl/sb-aclrepl/inspect.fasl
>-lib/sbcl/sb-aclrepl/inspect.lisp
>-lib/sbcl/sb-aclrepl/repl.fasl
>-lib/sbcl/sb-aclrepl/repl.lisp
>+lib/sbcl/asdf/uiop.lisp
> lib/sbcl/sb-aclrepl/sb-aclrepl.asd
>-lib/sbcl/sb-aclrepl/sb-aclrepl.fasl
>-lib/sbcl/sb-aclrepl/tests.fasl
>-lib/sbcl/sb-aclrepl/tests.lisp
>-lib/sbcl/sb-aclrepl/toplevel.fasl
>-lib/sbcl/sb-aclrepl/toplevel.lisp
>-lib/sbcl/sb-bsd-sockets/constants.fasl
>-lib/sbcl/sb-bsd-sockets/constants.lisp
>-lib/sbcl/sb-bsd-sockets/defpackage.fasl
>-lib/sbcl/sb-bsd-sockets/defpackage.lisp
>-lib/sbcl/sb-bsd-sockets/inet.fasl
>-lib/sbcl/sb-bsd-sockets/inet.lisp
>-lib/sbcl/sb-bsd-sockets/local.fasl
>-lib/sbcl/sb-bsd-sockets/local.lisp
>-lib/sbcl/sb-bsd-sockets/misc.fasl
>-lib/sbcl/sb-bsd-sockets/misc.lisp
>-lib/sbcl/sb-bsd-sockets/name-service.fasl
>-lib/sbcl/sb-bsd-sockets/name-service.lisp
> lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.asd
>-lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.fasl
>-lib/sbcl/sb-bsd-sockets/sockets.fasl
>-lib/sbcl/sb-bsd-sockets/sockets.lisp
>-lib/sbcl/sb-bsd-sockets/sockopt.fasl
>-lib/sbcl/sb-bsd-sockets/sockopt.lisp
>-lib/sbcl/sb-bsd-sockets/split.fasl
>-lib/sbcl/sb-bsd-sockets/split.lisp
>-lib/sbcl/sb-bsd-sockets/tests.fasl
>-lib/sbcl/sb-bsd-sockets/tests.lisp
>-lib/sbcl/sb-bsd-sockets/win32-constants.lisp
>-lib/sbcl/sb-bsd-sockets/win32-lib.lisp
>-lib/sbcl/sb-bsd-sockets/win32-sockets.lisp
>-lib/sbcl/sb-cltl2/compiler-let.fasl
>-lib/sbcl/sb-cltl2/compiler-let.lisp
>-lib/sbcl/sb-cltl2/defpackage.fasl
>-lib/sbcl/sb-cltl2/defpackage.lisp
>-lib/sbcl/sb-cltl2/env.fasl
>-lib/sbcl/sb-cltl2/env.lisp
>-lib/sbcl/sb-cltl2/macroexpand.fasl
>-lib/sbcl/sb-cltl2/macroexpand.lisp
> lib/sbcl/sb-cltl2/sb-cltl2.asd
>-lib/sbcl/sb-cltl2/sb-cltl2.fasl
>-lib/sbcl/sb-cltl2/tests.fasl
>-lib/sbcl/sb-cltl2/tests.lisp
>-lib/sbcl/sb-concurrency/frlock.fasl
>-lib/sbcl/sb-concurrency/frlock.lisp
>-lib/sbcl/sb-concurrency/gate.fasl
>-lib/sbcl/sb-concurrency/gate.lisp
>-lib/sbcl/sb-concurrency/mailbox.fasl
>-lib/sbcl/sb-concurrency/mailbox.lisp
>-lib/sbcl/sb-concurrency/package.fasl
>-lib/sbcl/sb-concurrency/package.lisp
>-lib/sbcl/sb-concurrency/queue.fasl
>-lib/sbcl/sb-concurrency/queue.lisp
> lib/sbcl/sb-concurrency/sb-concurrency.asd
>-lib/sbcl/sb-concurrency/sb-concurrency.fasl
>-lib/sbcl/sb-cover/cover.fasl
>-lib/sbcl/sb-cover/cover.lisp
> lib/sbcl/sb-cover/sb-cover.asd
>-lib/sbcl/sb-cover/sb-cover.fasl
>-lib/sbcl/sb-cover/test-data-1.fasl
>-lib/sbcl/sb-cover/test-data-1.lisp
>-lib/sbcl/sb-cover/test-data-2.fasl
>-lib/sbcl/sb-cover/test-data-2.lisp
>-lib/sbcl/sb-cover/test-data-3.fasl
>-lib/sbcl/sb-cover/test-data-3.lisp
>-lib/sbcl/sb-cover/tests.fasl
>-lib/sbcl/sb-cover/tests.lisp
>-lib/sbcl/sb-executable/sb-executable.fasl
> lib/sbcl/sb-executable/sb-executable.lisp
>-lib/sbcl/sb-gmp/gmp.fasl
>-lib/sbcl/sb-gmp/gmp.lisp
> lib/sbcl/sb-gmp/sb-gmp.asd
>-lib/sbcl/sb-gmp/sb-gmp.fasl
>-lib/sbcl/sb-gmp/tests.fasl
>-lib/sbcl/sb-gmp/tests.lisp
>-lib/sbcl/sb-grovel/def-to-lisp.fasl
>-lib/sbcl/sb-grovel/def-to-lisp.lisp
>-lib/sbcl/sb-grovel/defpackage.fasl
>-lib/sbcl/sb-grovel/defpackage.lisp
>-lib/sbcl/sb-grovel/example-constants.lisp
>-lib/sbcl/sb-grovel/foreign-glue.fasl
>-lib/sbcl/sb-grovel/foreign-glue.lisp
> lib/sbcl/sb-grovel/sb-grovel.asd
>-lib/sbcl/sb-grovel/sb-grovel.fasl
>-lib/sbcl/sb-introspect/introspect.fasl
>-lib/sbcl/sb-introspect/introspect.lisp
>-lib/sbcl/sb-introspect/load-test.lisp
> lib/sbcl/sb-introspect/sb-introspect.asd
>-lib/sbcl/sb-introspect/sb-introspect.fasl
>-lib/sbcl/sb-introspect/test-driver.fasl
>-lib/sbcl/sb-introspect/test-driver.lisp
>-lib/sbcl/sb-introspect/test.fasl
>-lib/sbcl/sb-introspect/test.lisp
>-lib/sbcl/sb-introspect/xref-test-data.fasl
>-lib/sbcl/sb-introspect/xref-test-data.lisp
>-lib/sbcl/sb-introspect/xref-test.fasl
>-lib/sbcl/sb-introspect/xref-test.lisp
>-lib/sbcl/sb-md5/md5-tests.fasl
>-lib/sbcl/sb-md5/md5-tests.lisp
>-lib/sbcl/sb-md5/md5.fasl
>-lib/sbcl/sb-md5/md5.lisp
> lib/sbcl/sb-md5/sb-md5.asd
>-lib/sbcl/sb-md5/sb-md5.fasl
>-lib/sbcl/sb-posix/constants.fasl
>-lib/sbcl/sb-posix/constants.lisp
>-lib/sbcl/sb-posix/defpackage.fasl
>-lib/sbcl/sb-posix/defpackage.lisp
>-lib/sbcl/sb-posix/designator.fasl
>-lib/sbcl/sb-posix/designator.lisp
>-lib/sbcl/sb-posix/interface.fasl
>-lib/sbcl/sb-posix/interface.lisp
>-lib/sbcl/sb-posix/macros.fasl
>-lib/sbcl/sb-posix/macros.lisp
>-lib/sbcl/sb-posix/posix-tests.fasl
>-lib/sbcl/sb-posix/posix-tests.lisp
>+lib/sbcl/sb-mpfr/sb-mpfr.asd
> lib/sbcl/sb-posix/sb-posix.asd
>-lib/sbcl/sb-posix/sb-posix.fasl
>-lib/sbcl/sb-queue/package.fasl
>-lib/sbcl/sb-queue/package.lisp
> lib/sbcl/sb-queue/sb-queue.asd
>-lib/sbcl/sb-queue/sb-queue.fasl
>-lib/sbcl/sb-rotate-byte/compiler.fasl
>-lib/sbcl/sb-rotate-byte/compiler.lisp
>-lib/sbcl/sb-rotate-byte/package.fasl
>-lib/sbcl/sb-rotate-byte/package.lisp
>-lib/sbcl/sb-rotate-byte/ppc-vm.lisp
>-lib/sbcl/sb-rotate-byte/rotate-byte-tests.fasl
>-lib/sbcl/sb-rotate-byte/rotate-byte-tests.lisp
>-lib/sbcl/sb-rotate-byte/rotate-byte.fasl
>-lib/sbcl/sb-rotate-byte/rotate-byte.lisp
> lib/sbcl/sb-rotate-byte/sb-rotate-byte.asd
>-lib/sbcl/sb-rotate-byte/sb-rotate-byte.fasl
>-%%AMD64_ONLY%%lib/sbcl/sb-rotate-byte/x86-64-vm.fasl
>-lib/sbcl/sb-rotate-byte/x86-64-vm.lisp
>-%%I386_ONLY%%lib/sbcl/sb-rotate-byte/x86-vm.fasl
>-lib/sbcl/sb-rotate-byte/x86-vm.lisp
>-lib/sbcl/sb-rt/rt.fasl
>-lib/sbcl/sb-rt/rt.lisp
> lib/sbcl/sb-rt/sb-rt.asd
>-lib/sbcl/sb-rt/sb-rt.fasl
>-lib/sbcl/sb-simple-streams/classes.fasl
>-lib/sbcl/sb-simple-streams/classes.lisp
>-lib/sbcl/sb-simple-streams/direct.fasl
>-lib/sbcl/sb-simple-streams/direct.lisp
>-lib/sbcl/sb-simple-streams/file.fasl
>-lib/sbcl/sb-simple-streams/file.lisp
>-lib/sbcl/sb-simple-streams/fndb.fasl
>-lib/sbcl/sb-simple-streams/fndb.lisp
>-lib/sbcl/sb-simple-streams/impl.fasl
>-lib/sbcl/sb-simple-streams/impl.lisp
>-lib/sbcl/sb-simple-streams/internal.fasl
>-lib/sbcl/sb-simple-streams/internal.lisp
>-lib/sbcl/sb-simple-streams/iodefs.fasl
>-lib/sbcl/sb-simple-streams/iodefs.lisp
>-lib/sbcl/sb-simple-streams/null.fasl
>-lib/sbcl/sb-simple-streams/null.lisp
>-lib/sbcl/sb-simple-streams/package.fasl
>-lib/sbcl/sb-simple-streams/package.lisp
> lib/sbcl/sb-simple-streams/sb-simple-streams.asd
>-lib/sbcl/sb-simple-streams/sb-simple-streams.fasl
>-lib/sbcl/sb-simple-streams/simple-stream-tests.fasl
>-lib/sbcl/sb-simple-streams/simple-stream-tests.lisp
>-lib/sbcl/sb-simple-streams/socket.fasl
>-lib/sbcl/sb-simple-streams/socket.lisp
>-lib/sbcl/sb-simple-streams/strategy.fasl
>-lib/sbcl/sb-simple-streams/strategy.lisp
>-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-sprof/sb-sprof.fasl
> lib/sbcl/sb-sprof/sb-sprof.lisp
> lib/sbcl/sb-sprof/test.lisp
> lib/sbcl/sbcl_core
>@@ -196,7 +29,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/PRINCIPLES
> %%PORTDOCS%%%%DOCSDIR%%/TLA
> %%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%PORTDOCS%%%%DOCSDIR%%/asdf-install/README
> %%PORTDOCS%%%%DOCSDIR%%/asdf.html
> %%PORTDOCS%%%%DOCSDIR%%/asdf/README
> %%PORTDOCS%%%%DOCSDIR%%/asdf/README.SBCL

Actions: View | Diff

Attachments on bug 198688: 154489