Attachment 162718 Details for Bug 204234 – Update lang/sbcl to 1.3.0

[patch] Update lang/sbcl to 1.3.0

lang_sbcl-1.3.0.diff (text/plain), 12.39 KB, created by Paulius Stakauskas on 2015-11-03 00:40:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulius Stakauskas

Created: 2015-11-03 00:40:31 UTC

Size: 12.39 KB

patch

obsolete

>diff -ruN sbcl.orig/Makefile sbcl/Makefile
>--- sbcl.orig/Makefile	2015-11-02 11:18:16.804945000 +0000
>+++ sbcl/Makefile	2015-11-02 23:24:07.921187000 +0000
>@@ -1,25 +1,27 @@
> # $FreeBSD: head/lang/sbcl/Makefile 381916 2015-03-22 14:42:11Z marino $
> 
> PORTNAME=	sbcl
>-PORTVERSION=	1.2.9
>+PORTVERSION=	1.3.0
> PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	lang lisp
>-MASTER_SITES=	SF/sbcl/sbcl/${PORTVERSION} LOCAL/marino:binaries
>-DISTFILES=	sbcl-${PORTVERSION}-source${EXTRACT_SUFX} \
>-		sbcl-${PORTVERSION}-documentation-html${EXTRACT_SUFX}
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
>+	 	SF/${PORTNAME}/${PORTNAME}/${BOOTVERSION}/:binaries
>+DISTFILES=	${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX} \
>+		${PORTNAME}-${PORTVERSION}-documentation-html${EXTRACT_SUFX}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	freebsd@punktas.lt
> COMMENT=	Common Lisp development system derived from the CMU CL system
> 
> LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
> 
> USES=		gmake tar:bzip2
> 
>+BOOTVERSION=	1.2.7
> ONLY_FOR_ARCHS=	i386 amd64
> SBCL_HOME=	${PREFIX}/lib/sbcl
> MANUALS=	asdf.html sbcl.html
>-MODULESDOCS=	asdf/README 			\
>+MODULESDOCS=	asdf/README.md 			\
> 		asdf/README.SBCL		\
> 		sb-aclrepl/README		\
> 		sb-bsd-sockets/FAQ 		\
>@@ -27,8 +29,11 @@
> 		sb-md5/README			\
> 		sb-posix/README			\
> 		sb-rotate-byte/README		\
>-		sb-simple-streams/README
>-TEXTDOCS=	BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO
>+		sb-simple-streams/README	\
>+		sb-mpfr/README.md		\
>+		sb-gmp/README.md
>+TEXTDOCS=	BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO \
>+		HACKING OPTIMIZATIONS README
> CFLAGS+=	-fno-omit-frame-pointer
> CPPFLAGS+=	-I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\"
> CONMODULES=	asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency \
>@@ -43,54 +48,40 @@
> NM?=		/usr/bin/nm
> NMFLAGS?=	-gp
> 
>-BOOT_ARCH_OS_LIST=	1.0.31-amd64-freebsd8 1.0.31-i386-freebsd8 \
>-			1.2.9-x86_64-dragonfly4
>+BOOT_ARCH_OS_LIST=	x86-freebsd x86-64-freebsd
> 
>-OPTIONS_DEFINE=		SBCL #THREADS (don't build, see PR 184425)
>+OPTIONS_DEFINE=		SBCL THREADS
> SBCL_DESC=		Bootstrap with installed SBCL binary, if available
> THREADS_DESC=		Experimental threading support
> 
> .include <bsd.port.options.mk>
> 
>-NEWBOOTNAME=	sbcl-${PORTVERSION}-${ARCH}-${OPSYS:tl}${OSREL:R}
>-PATTERN=	*-${ARCH}-${OPSYS:tl}*
>-# FreeBSD hack is to support legacy make, add unrelated core fix while here
>-. if ${OPSYS} == FreeBSD
>-CORE=	sbcl.core
>-BOOT_DISTNAME=	sbcl-1.0.31-${ARCH}-freebsd8
>-. else # newer core format
>-CORE=	sbcl_core
>-BOOT_DISTNAME=	sbcl-${BOOT_ARCH_OS_LIST:M${PATTERN}}
>-. endif
>-
>-.if make(makesum)
>-. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
>-DISTFILES:=	${DISTFILES} sbcl-${BOOT_ARCH_OS}-binary.tar.bz2:binaries
>-. endfor
>-.else
>-DISTFILES:=	${DISTFILES} ${BOOT_DISTNAME}-binary.tar.bz2:binaries
>-.endif
>+NEWBOOTNAME=	${PORTNAME}-${PORTVERSION}-${ARCH}-freebsd${OSREL:R}
> 
> .if ${ARCH} == "i386"
> DYNAMIC_SPACE_SIZE?=	512
> PLIST_SUB+=	I386_ONLY="" AMD64_ONLY="@comment "
>-SBCLCONFIG=	 Config.x86-${OPSYS:tl}
>+SBCLCONFIG=	 Config.x86-freebsd
>+DISTFILES:=	${DISTFILES} ${PORTNAME}-${BOOTVERSION}-x86-freebsd-binary${EXTRACT_SUFX}:binaries
>+BOOT_DISTNAME=	${PORTNAME}-${BOOTVERSION}-x86-freebsd
> .else
> DYNAMIC_SPACE_SIZE?=	1024
> PLIST_SUB+=	I386_ONLY="@comment " AMD64_ONLY=""
>-SBCLCONFIG=	Config.x86-64-${OPSYS:tl}
>+SBCLCONFIG=	Config.x86-64-freebsd
>+DISTFILES:=	${DISTFILES} ${PORTNAME}-${BOOTVERSION}-x86-64-freebsd-binary${EXTRACT_SUFX}:binaries
>+BOOT_DISTNAME=	${PORTNAME}-${BOOTVERSION}-x86-64-freebsd
> .endif
> 
> # If the SBCL option is enabled, try to use existing "sbcl" first:
> .if empty(PORT_OPTIONS:MSBCL) || !exists(${LOCALBASE}/bin/sbcl)
> XC_HOST?=	${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl \
>-		--core ${WRKDIR}/${BOOT_DISTNAME}/output/${CORE} \
>+		--core ${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core \
> 		--dynamic-space-size ${DYNAMIC_SPACE_SIZE} \
> 		--disable-debugger \
> 		--userinit /dev/null \
> 		--sysinit /dev/null
> MAKE_SH_ARGS+=	--xc-host='${XC_HOST}'
>-.endif # SBCL
>+.endif
> 
> .if ${PORT_OPTIONS:MTHREADS}
> MAKE_SH_ARGS+=	--with-sb-thread
>@@ -141,20 +132,12 @@
> 		${WRKSRC}/src/runtime/${SBCLCONFIG}
> 	@${REINPLACE_CMD} -E -e 's,-lthr,-lpthread,g' \
> 		${WRKSRC}/src/runtime/${SBCLCONFIG}
>-	@${GREP} -Fe '.core' -l -r ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
>-		-e 's|\.core|_core|g'
>+.if ${ARCH} == "i386"
>+	@${REINPLACE_CMD} -e '87s/^/\#-freebsd\'$$'\n/' \
>+		${WRKSRC}/contrib/sb-concurrency/tests/test-frlock.lisp
>+.endif
> 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
> 		${WRKSRC}/doc/sbcl.1
>-	@${REINPLACE_CMD} -E -e 's!-sbcl-shared!& ${CFLAGS}!' \
>-		-e 's!\$$(TEST_FILESTEM|x|1)_core!$${\1}_core!g' \
>-		${WRKSRC}/tests/core.test.sh \
>-		${WRKSRC}/tests/foreign.test.sh
>-	@${REINPLACE_CMD} -E -e 's!"-O3"!!' \
>-		-e 's!("-sbcl-(pic|shared)"[[:blank:]]*)+!& ${CFLAGS:C/.*/"&"/}!' \
>-		${WRKSRC}/tests/foreign-stack-alignment.impure.lisp \
>-		${WRKSRC}/tests/kill-non-lisp-thread.impure.lisp \
>-		${WRKSRC}/tests/swap-lispobjs.impure.lisp \
>-		${WRKSRC}/tests/threads.impure.lisp
> 	@${REINPLACE_CMD} -e 's|( cd ./doc ; sh ./clean.sh )|#&|' \
> 		${WRKSRC}/clean.sh
> 	@case "`${CC} --version`" in \
>@@ -180,7 +163,7 @@
> 	${MKDIR} ${STAGEDIR}${SBCL_HOME}/contrib \
> 		${STAGEDIR}${SBCL_HOME}/site-systems
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/runtime/sbcl ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_DATA} ${WRKSRC}/output/sbcl_core ${STAGEDIR}${SBCL_HOME}
>+	${INSTALL_DATA} ${WRKSRC}/output/sbcl.core ${STAGEDIR}${SBCL_HOME}
> 	${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.fasl \
> 		${STAGEDIR}${SBCL_HOME}/contrib/
> 	${INSTALL_DATA} ${WRKSRC}/obj/sbcl-home/contrib/*.asd \
>@@ -198,8 +181,11 @@
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
> 	${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} \
> 		${STAGEDIR}${DOCSDIR}/
>-	${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${STAGEDIR}${DOCSDIR}/
>+. for TEXTDOC in ${TEXTDOCS}
>+	${INSTALL_DATA} ${WRKSRC}/${TEXTDOC} ${STAGEDIR}${DOCSDIR}/
>+. endfor
> 	${MKDIR} ${MODULESDOCS:C,/[^/]+$,,g:u:S,^,${STAGEDIR}${DOCSDIR}/,g}
>+	${MKDIR} ${STAGEDIR}${DOCSDIR}/${MODDOC}
> . for MODDOC in ${MODULESDOCS}
> 	${INSTALL_DATA} ${WRKSRC}/contrib/${MODDOC} \
> 		${STAGEDIR}${DOCSDIR}/${MODDOC}
>diff -ruN sbcl.orig/distinfo sbcl/distinfo
>--- sbcl.orig/distinfo	2015-11-02 11:18:16.215360000 +0000
>+++ sbcl/distinfo	2015-11-02 20:25:50.866358000 +0000
>@@ -1,10 +1,8 @@
>-SHA256 (sbcl-1.2.9-source.tar.bz2) = 603e15bf15b0fb644362864d3866e96a4c3328d88de1a7da09b26b4b3d089a5f
>-SIZE (sbcl-1.2.9-source.tar.bz2) = 5518280
>-SHA256 (sbcl-1.2.9-documentation-html.tar.bz2) = d7a75b2e53f60117283fcc344c031b5060d5e1f5867f594287cce168f1021ac2
>-SIZE (sbcl-1.2.9-documentation-html.tar.bz2) = 214153
>-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-i386-freebsd8-binary.tar.bz2) = fd2348749a2babf301a99449d246b349a1285fc0bca8b83bde0bfa7187cf3dd7
>-SIZE (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = 8475244
>-SHA256 (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 2e32a22ef3a528d7247c0e3a72a3ac672b8b6848ac2d35fbad52a3d1475130dc
>-SIZE (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 10224580
>+SHA256 (sbcl-1.3.0-source.tar.bz2) = d60caf6a0a495e41fc9e7f6a797e7c4188cef1f9de84ca263ff654d4d7ae99b3
>+SIZE (sbcl-1.3.0-source.tar.bz2) = 5722767
>+SHA256 (sbcl-1.3.0-documentation-html.tar.bz2) = 1d67b08240b86a6fb137c037414e5a0b6310d86531c2941b9619329542b96676
>+SIZE (sbcl-1.3.0-documentation-html.tar.bz2) = 221018
>+SHA256 (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = c61f5e777e56921d2452d0fa6b71024ccd9b99bc659676498d398b8663176492
>+SIZE (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = 10463348
>+SHA256 (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = cf68bfab780a14964d9593f5b47fa3e174cf43e95ae3e558712d218f1c37bdbe
>+SIZE (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = 10322926
>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-11-02 11:18:16.937421000 +0000
>+++ sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- contrib/sb-concurrency/tests/test-frlock.lisp.orig	2015-02-27 19:49:46.000000000 +0900
>-+++ contrib/sb-concurrency/tests/test-frlock.lisp	2015-03-07 18:14:12.000000000 +0900
>-@@ -85,7 +85,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-11-02 11:18:16.380689000 +0000
>+++ sbcl/files/patch-contrib__sb-sprof__test.lisp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,14 +0,0 @@
>---- contrib/sb-sprof/test.lisp.orig	2015-02-27 19:49:46.000000000 +0900
>-+++ contrib/sb-sprof/test.lisp	2015-03-07 18:19:20.000000000 +0900
>-@@ -41,9 +41,9 @@
>-       (loop while (< (get-universal-time) target)
>-             do (consalot)))))
>- 
>--#-(or win32 darwin)                    ;not yet
>-+#-(or win32 darwin freebsd)                    ;not yet
>- (test)
>--#-(or win32 darwin)                    ;not yet
>-+#-(or win32 darwin freebsd)                    ;not yet
>- (consing-test)
>- 
>- ;; For debugging purposes, print output for visual inspection to see if
>diff -ruN sbcl.orig/files/patch-src__runtime__thread.c sbcl/files/patch-src__runtime__thread.c
>--- sbcl.orig/files/patch-src__runtime__thread.c	2015-11-02 11:18:16.216259000 +0000
>+++ sbcl/files/patch-src__runtime__thread.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,17 +0,0 @@
>---- src/runtime/thread.c.orig	2015-02-27 19:49:49.000000000 +0900
>-+++ src/runtime/thread.c	2015-03-07 18:27:45.000000000 +0900
>-@@ -520,10 +520,13 @@
>-     stack_addr = pthread_get_stackaddr_np(os);
>-     stack_size = pthread_get_stacksize_np(os);
>- #else
>--    pthread_attr_t attr;
>-+/*  pthread_attr_t attr;
>-     int pthread_getattr_np(pthread_t, pthread_attr_t *);
>-     pthread_getattr_np(os, &attr);
>-     pthread_attr_getstack(&attr, &stack_addr, &stack_size);
>-+*/
>-+    pthread_attr_getstackaddr(th->os_attr, &stack_addr);
>-+    pthread_attr_getstacksize(th->os_attr, &stack_size);
>- #endif
>- 
>-     th->control_stack_start = stack_addr;
>diff -ruN sbcl.orig/pkg-descr sbcl/pkg-descr
>--- sbcl.orig/pkg-descr	2015-11-02 11:18:16.938388000 +0000
>+++ sbcl/pkg-descr	2015-10-25 23:10:31.000000000 +0000
>@@ -1,5 +1,7 @@
>-Steel Bank Common Lisp (SBCL) is a Open Source development system for
>-ANSI Common Lisp. It provides an interactive environment including an
>-integrated native compiler, interpreter, and debugger.
>+Steel Bank Common Lisp (SBCL) is a high performance Common Lisp compiler. 
>+It is open source / free software, with a permissive license. 
>+In addition to the compiler and runtime system for ANSI Common Lisp, 
>+it provides an interactive environment including a debugger, 
>+a statistical profiler, a code coverage tool, and many other extensions.
> 
> WWW: http://sbcl.sourceforge.net/
>diff -ruN sbcl.orig/pkg-plist sbcl/pkg-plist
>--- sbcl.orig/pkg-plist	2015-11-02 11:18:16.379744000 +0000
>+++ sbcl/pkg-plist	2015-11-02 20:25:07.499165000 +0000
>@@ -112,6 +112,7 @@
> lib/sbcl/sb-queue/package.lisp
> lib/sbcl/sb-queue/sb-queue.asd
> lib/sbcl/sb-rotate-byte/arm-vm.lisp
>+lib/sbcl/sb-rotate-byte/arm64-vm.lisp
> lib/sbcl/sb-rotate-byte/compiler.lisp
> lib/sbcl/sb-rotate-byte/package.lisp
> lib/sbcl/sb-rotate-byte/ppc-vm.lisp
>@@ -139,22 +140,27 @@
> lib/sbcl/sb-simple-streams/terminal.lisp
> lib/sbcl/sb-sprof/sb-sprof.lisp
> lib/sbcl/sb-sprof/test.lisp
>-lib/sbcl/sbcl_core
>+lib/sbcl/sbcl.core
> man/man1/sbcl.1.gz
> %%PORTDOCS%%%%DOCSDIR%%/BUGS
> %%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/CREDITS
>+%%PORTDOCS%%%%DOCSDIR%%/HACKING
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
>+%%PORTDOCS%%%%DOCSDIR%%/OPTIMIZATIONS
> %%PORTDOCS%%%%DOCSDIR%%/PRINCIPLES
>+%%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/TLA
> %%PORTDOCS%%%%DOCSDIR%%/TODO
> %%PORTDOCS%%%%DOCSDIR%%/asdf.html
>-%%PORTDOCS%%%%DOCSDIR%%/asdf/README
> %%PORTDOCS%%%%DOCSDIR%%/asdf/README.SBCL
>+%%PORTDOCS%%%%DOCSDIR%%/asdf/README.md
> %%PORTDOCS%%%%DOCSDIR%%/sb-aclrepl/README
> %%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/FAQ
> %%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/NEWS
>+%%PORTDOCS%%%%DOCSDIR%%/sb-gmp/README.md
> %%PORTDOCS%%%%DOCSDIR%%/sb-md5/README
>+%%PORTDOCS%%%%DOCSDIR%%/sb-mpfr/README.md
> %%PORTDOCS%%%%DOCSDIR%%/sb-posix/README
> %%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README
> %%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README

Actions: View | Diff

Attachments on bug 204234: 162718