Attachment #163719 for bug #204942




# $FreeBSD$

PORTNAME=	sbcl
PORTVERSION=	1.3.1
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	lang lisp
BOOTVERSION=	1.2.7
MASTER_SITES=	SF/sbcl/sbcl/${PORTVERSION} SF/sbcl/sbcl/${BOOTVERSION}:binaries
DISTFILES=	sbcl-${PORTVERSION}-source${EXTRACT_SUFX} \
		sbcl-${PORTVERSION}-documentation-html${EXTRACT_SUFX}


MAINTAINER=	ports@FreeBSD.org
COMMENT=	Common Lisp development system derived from the CMU CL system

LICENSE=	sbcl
LICENSE_NAME=	public domain | FreeBSD
LICENSE_FILE=	${WRKSRC}/COPYING
LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept

LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp

USES=		gmake tar:bzip2

ONLY_FOR_ARCHS=	i386 amd64
SBCL_HOME=	${PREFIX}/lib/sbcl
MANUALS=	asdf.html sbcl.html
MODULESDOCS=	asdf/README.md 			\
		asdf/README.SBCL		\
		sb-aclrepl/README		\
		sb-bsd-sockets/FAQ 		\
		sb-bsd-sockets/NEWS 		\
		sb-gmp/README.md 		\
		sb-md5/README			\
		sb-mpfr/README.md		\
		sb-posix/README			\
		sb-rotate-byte/README		\
		sb-simple-streams/README

NM?=		/usr/bin/nm
NMFLAGS?=	-gp

BOOT_ARCH_OS_LIST=	${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd ${BOOTVERSION}-x86-64-dragonfly
			1.2.9-x86_64-dragonfly4

OPTIONS_DEFINE=		SBCL #THREADS (don't build, see PR 184425)
SBCL_DESC=		Bootstrap with installed SBCL binary, if available


.include <bsd.port.options.mk>

.if ${ARCH} == amd64
BOOTARCH=	x86-64
.endif
.if ${ARCH} == i386
BOOTARCH=	x86
.endif
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-${BOOTVERSION}-${BOOTARCH}-freebsd
. else # newer core format
CORE=	sbcl_core
BOOT_DISTNAME=	sbcl-${BOOT_ARCH_OS_LIST:M${PATTERN}}
. endif

.if make(makesum) || defined(FETCH_ALL)
. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
DISTFILES:=	${DISTFILES} sbcl-${BOOT_ARCH_OS}-binary.tar.bz2:binaries
. endfor

Lines 1-10 Link Here

(-)lang/sbcl/distinfo (-10 / +10 lines)
1	SHA256 (sbcl-1.2.9-source.tar.bz2) = 603e15bf15b0fb644362864d3866e96a4c3328d88de1a7da09b26b4b3d089a5f	1	SHA256 (sbcl-1.3.1-source.tar.bz2) = a2e547e471a368349a43b1feee78ca6139aae0c60b8fcaa6ab0fd0e5b8e0ed3d
2	SIZE (sbcl-1.2.9-source.tar.bz2) = 5518280	2	SIZE (sbcl-1.3.1-source.tar.bz2) = 5725055
3	SHA256 (sbcl-1.2.9-documentation-html.tar.bz2) = d7a75b2e53f60117283fcc344c031b5060d5e1f5867f594287cce168f1021ac2	3	SHA256 (sbcl-1.3.1-documentation-html.tar.bz2) = 2c1cb5cf404761e4705a83acfe9d495f9716b6d0fe14499ad314e1b78b3cf828
4	SIZE (sbcl-1.2.9-documentation-html.tar.bz2) = 214153	4	SIZE (sbcl-1.3.1-documentation-html.tar.bz2) = 220952
5	SHA256 (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 06a1e4e3a5f5f8e012ff6037a51624d7d1f34bff0979ce45e70418a293412b4e	5	SHA256 (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = c61f5e777e56921d2452d0fa6b71024ccd9b99bc659676498d398b8663176492
6	SIZE (sbcl-1.0.31-amd64-freebsd8-binary.tar.bz2) = 8397764	6	SIZE (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = 10463348
7	SHA256 (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = fd2348749a2babf301a99449d246b349a1285fc0bca8b83bde0bfa7187cf3dd7	7	SHA256 (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = cf68bfab780a14964d9593f5b47fa3e174cf43e95ae3e558712d218f1c37bdbe
8	SIZE (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = 8475244	8	SIZE (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = 10322926
9	SHA256 (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 2e32a22ef3a528d7247c0e3a72a3ac672b8b6848ac2d35fbad52a3d1475130dc	9	SHA256 (sbcl-1.2.7-x86-64-dragonfly-binary.tar.bz2) = 4d8d589909d1b003afc5d58276affe2202f4a75d3760737f2ac6ce046a1f905c
10	SIZE (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 10224580	10	SIZE (sbcl-1.2.7-x86-64-dragonfly-binary.tar.bz2) = 10586301

Lines 1-11 Link Here

(-)lang/sbcl/files/patch-contrib__sb-concurrency__tests__test-frlock.lisp (-11 lines)
1	--- contrib/sb-concurrency/tests/test-frlock.lisp.orig 2015-02-27 19:49:46.000000000 +0900
2	+++ contrib/sb-concurrency/tests/test-frlock.lisp 2015-03-07 18:14:12.000000000 +0900
3	@@ -85,7 +85,7 @@
4	(values (cdr w-e!) (cdr r-e!))))
5
6	#+sb-thread
7	-(deftest* (frlock.1 :fails-on :win32)
8	+(deftest* (frlock.1 :fails-on :(or :freebsd :win32))
9	(handler-case
10	(sb-ext:with-timeout 60 (test-frlocks))
11	(sb-ext:timeout (c)




--- 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




--- 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;




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

%%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

Return to bug 204942

Lines 1-11 Link Here

(-)lang/sbcl/Makefile (-8 / +20 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= sbcl	3	PORTNAME= sbcl
4	PORTVERSION= 1.2.9	4	PORTVERSION= 1.3.1
5	PORTREVISION= 1
6	PORTEPOCH= 1	5	PORTEPOCH= 1
7	CATEGORIES= lang lisp	6	CATEGORIES= lang lisp
8	MASTER_SITES= SF/sbcl/sbcl/${PORTVERSION} LOCAL/marino:binaries	7	BOOTVERSION= 1.2.7
		8	MASTER_SITES= SF/sbcl/sbcl/${PORTVERSION} SF/sbcl/sbcl/${BOOTVERSION}:binaries
9	DISTFILES= sbcl-${PORTVERSION}-source${EXTRACT_SUFX} \	9	DISTFILES= sbcl-${PORTVERSION}-source${EXTRACT_SUFX} \
10	sbcl-${PORTVERSION}-documentation-html${EXTRACT_SUFX}	10	sbcl-${PORTVERSION}-documentation-html${EXTRACT_SUFX}
11		11
Lines 12-17 Link Here
12	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Common Lisp development system derived from the CMU CL system	13	COMMENT= Common Lisp development system derived from the CMU CL system
14		14
		15	LICENSE= sbcl
		16	LICENSE_NAME= public domain \| FreeBSD
		17	LICENSE_FILE= ${WRKSRC}/COPYING
		18	LICENSE_PERMS= dist-mirror pkg-mirror auto-accept
		19
15	LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp	20	LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
16		21
17	USES= gmake tar:bzip2	22	USES= gmake tar:bzip2
Lines 19-30 Link Here
19	ONLY_FOR_ARCHS= i386 amd64	24	ONLY_FOR_ARCHS= i386 amd64
20	SBCL_HOME= ${PREFIX}/lib/sbcl	25	SBCL_HOME= ${PREFIX}/lib/sbcl
21	MANUALS= asdf.html sbcl.html	26	MANUALS= asdf.html sbcl.html
22	MODULESDOCS= asdf/README \	27	MODULESDOCS= asdf/README.md \
23	asdf/README.SBCL \	28	asdf/README.SBCL \
24	sb-aclrepl/README \	29	sb-aclrepl/README \
25	sb-bsd-sockets/FAQ \	30	sb-bsd-sockets/FAQ \
26	sb-bsd-sockets/NEWS \	31	sb-bsd-sockets/NEWS \
		32	sb-gmp/README.md \
27	sb-md5/README \	33	sb-md5/README \
		34	sb-mpfr/README.md \
28	sb-posix/README \	35	sb-posix/README \
29	sb-rotate-byte/README \	36	sb-rotate-byte/README \
30	sb-simple-streams/README	37	sb-simple-streams/README
Lines 43-50 Link Here
43	NM?= /usr/bin/nm	50	NM?= /usr/bin/nm
44	NMFLAGS?= -gp	51	NMFLAGS?= -gp
45		52
46	BOOT_ARCH_OS_LIST= 1.0.31-amd64-freebsd8 1.0.31-i386-freebsd8 \	53	BOOT_ARCH_OS_LIST= ${BOOTVERSION}-x86-64-freebsd ${BOOTVERSION}-x86-freebsd ${BOOTVERSION}-x86-64-dragonfly
47	1.2.9-x86_64-dragonfly4
48		54
49	OPTIONS_DEFINE= SBCL #THREADS (don't build, see PR 184425)	55	OPTIONS_DEFINE= SBCL #THREADS (don't build, see PR 184425)
50	SBCL_DESC= Bootstrap with installed SBCL binary, if available	56	SBCL_DESC= Bootstrap with installed SBCL binary, if available
Lines 52-69 Link Here
52		58
53	.include <bsd.port.options.mk>	59	.include <bsd.port.options.mk>
54		60
		61	.if ${ARCH} == amd64
		62	BOOTARCH= x86-64
		63	.endif
		64	.if ${ARCH} == i386
		65	BOOTARCH= x86
		66	.endif
55	NEWBOOTNAME= sbcl-${PORTVERSION}-${ARCH}-${OPSYS:tl}${OSREL:R}	67	NEWBOOTNAME= sbcl-${PORTVERSION}-${ARCH}-${OPSYS:tl}${OSREL:R}
56	PATTERN= -${ARCH}-${OPSYS:tl}	68	PATTERN= -${ARCH}-${OPSYS:tl}
57	# FreeBSD hack is to support legacy make, add unrelated core fix while here	69	# FreeBSD hack is to support legacy make, add unrelated core fix while here
58	. if ${OPSYS} == FreeBSD	70	. if ${OPSYS} == FreeBSD
59	CORE= sbcl.core	71	CORE= sbcl.core
60	BOOT_DISTNAME= sbcl-1.0.31-${ARCH}-freebsd8	72	BOOT_DISTNAME= sbcl-${BOOTVERSION}-${BOOTARCH}-freebsd
61	. else # newer core format	73	. else # newer core format
62	CORE= sbcl_core	74	CORE= sbcl_core
63	BOOT_DISTNAME= sbcl-${BOOT_ARCH_OS_LIST:M${PATTERN}}	75	BOOT_DISTNAME= sbcl-${BOOT_ARCH_OS_LIST:M${PATTERN}}
64	. endif	76	. endif
65		77
66	.if make(makesum)	78	.if make(makesum) \|\| defined(FETCH_ALL)
67	. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}	79	. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
68	DISTFILES:= ${DISTFILES} sbcl-${BOOT_ARCH_OS}-binary.tar.bz2:binaries	80	DISTFILES:= ${DISTFILES} sbcl-${BOOT_ARCH_OS}-binary.tar.bz2:binaries
69	. endfor	81	. endfor

Lines 1-14 Link Here

(-)lang/sbcl/files/patch-contrib__sb-sprof__test.lisp (-14 lines)
1	--- contrib/sb-sprof/test.lisp.orig 2015-02-27 19:49:46.000000000 +0900
2	+++ contrib/sb-sprof/test.lisp 2015-03-07 18:19:20.000000000 +0900
3	@@ -41,9 +41,9 @@
4	(loop while (< (get-universal-time) target)
5	do (consalot)))))
6
7	-#-(or win32 darwin) ;not yet
8	+#-(or win32 darwin freebsd) ;not yet
9	(test)
10	-#-(or win32 darwin) ;not yet
11	+#-(or win32 darwin freebsd) ;not yet
12	(consing-test)
13
14	;; For debugging purposes, print output for visual inspection to see if

Lines 1-17 Link Here

(-)lang/sbcl/files/patch-src__runtime__thread.c (-17 lines)
1	--- src/runtime/thread.c.orig 2015-02-27 19:49:49.000000000 +0900
2	+++ src/runtime/thread.c 2015-03-07 18:27:45.000000000 +0900
3	@@ -520,10 +520,13 @@
4	stack_addr = pthread_get_stackaddr_np(os);
5	stack_size = pthread_get_stacksize_np(os);
6	#else
7	- pthread_attr_t attr;
8	+/* pthread_attr_t attr;
9	int pthread_getattr_np(pthread_t, pthread_attr_t *);
10	pthread_getattr_np(os, &attr);
11	pthread_attr_getstack(&attr, &stack_addr, &stack_size);
12	+*/
13	+ pthread_attr_getstackaddr(th->os_attr, &stack_addr);
14	+ pthread_attr_getstacksize(th->os_attr, &stack_size);
15	#endif
16
17	th->control_stack_start = stack_addr;

Lines 112-117 Link Here

(-)lang/sbcl/pkg-plist (-1 / +4 lines)
112	lib/sbcl/sb-queue/package.lisp	112	lib/sbcl/sb-queue/package.lisp
113	lib/sbcl/sb-queue/sb-queue.asd	113	lib/sbcl/sb-queue/sb-queue.asd
114	lib/sbcl/sb-rotate-byte/arm-vm.lisp	114	lib/sbcl/sb-rotate-byte/arm-vm.lisp
		115	lib/sbcl/sb-rotate-byte/arm64-vm.lisp
115	lib/sbcl/sb-rotate-byte/compiler.lisp	116	lib/sbcl/sb-rotate-byte/compiler.lisp
116	lib/sbcl/sb-rotate-byte/package.lisp	117	lib/sbcl/sb-rotate-byte/package.lisp
117	lib/sbcl/sb-rotate-byte/ppc-vm.lisp	118	lib/sbcl/sb-rotate-byte/ppc-vm.lisp
Lines 149-160 Link Here
149	%%PORTDOCS%%%%DOCSDIR%%/TLA	150	%%PORTDOCS%%%%DOCSDIR%%/TLA
150	%%PORTDOCS%%%%DOCSDIR%%/TODO	151	%%PORTDOCS%%%%DOCSDIR%%/TODO
151	%%PORTDOCS%%%%DOCSDIR%%/asdf.html	152	%%PORTDOCS%%%%DOCSDIR%%/asdf.html
152	%%PORTDOCS%%%%DOCSDIR%%/asdf/README
153	%%PORTDOCS%%%%DOCSDIR%%/asdf/README.SBCL	153	%%PORTDOCS%%%%DOCSDIR%%/asdf/README.SBCL
		154	%%PORTDOCS%%%%DOCSDIR%%/asdf/README.md
154	%%PORTDOCS%%%%DOCSDIR%%/sb-aclrepl/README	155	%%PORTDOCS%%%%DOCSDIR%%/sb-aclrepl/README
155	%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/FAQ	156	%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/FAQ
156	%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/NEWS	157	%%PORTDOCS%%%%DOCSDIR%%/sb-bsd-sockets/NEWS
		158	%%PORTDOCS%%%%DOCSDIR%%/sb-gmp/README.md
157	%%PORTDOCS%%%%DOCSDIR%%/sb-md5/README	159	%%PORTDOCS%%%%DOCSDIR%%/sb-md5/README
		160	%%PORTDOCS%%%%DOCSDIR%%/sb-mpfr/README.md
158	%%PORTDOCS%%%%DOCSDIR%%/sb-posix/README	161	%%PORTDOCS%%%%DOCSDIR%%/sb-posix/README
159	%%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README	162	%%PORTDOCS%%%%DOCSDIR%%/sb-rotate-byte/README
160	%%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README	163	%%PORTDOCS%%%%DOCSDIR%%/sb-simple-streams/README