4 files changed, 84 insertions, 46 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 77a86d26711b..ffa18221734e 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -9,17 +9,17 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	1.0.16
-PORTREVISION=	1
+PORTVERSION=	1.0.17
+PORTREVISION=	0
 CATEGORIES=	lang lisp
-MASTER_SITES=	SF
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries
+MASTER_SITE_SUBDIR=	sbcl
 DISTFILES=	${DISTNAME}-source${EXTRACT_SUFX}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A Common Lisp development system derived from the CMU CL system
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/*
-
 # More platforms are supported, but on Linux.
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	is a native code compiler, and has not been ported to this architecture yet
@@ -35,6 +35,14 @@ MAN1=		sbcl.1
 INFO=		asdf sbcl
 INFODIR=	${PREFIX}/${INFO_PATH}
 
+OSVER_MAJOR=	${OSVERSION:C/([0-9]).*/\1/}
+
+# Empty dirs in distribution to keep
+EMPTY_DIRS=	sb-posix/test-lab sb-posix/alien \
+		sb-bsd-sockets/alien sb-posix/alien
+
+DYNAMIC_SPACE_SIZE?=	512
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -47,25 +55,42 @@ PLIST_SUB+=	I386_ONLY="@comment "
 .if defined(WITH_SBCL) && exists(${LOCALBASE}/bin/sbcl)
 LISP_CMD=	""
 .else
-BOOT_VERSION=	1.0.6
-.if make(makesum)
-BOOT_ARCH_OS_LIST=	x86-freebsd x86-64-freebsd
-.elif ${ARCH} == "i386"
-BOOT_ARCH_OS_LIST=	x86-freebsd
-LISP_EXTRA_ARG=	--dynamic-space-size 512
-.elif ${ARCH} == "amd64"
-BOOT_ARCH_OS_LIST=	x86-64-freebsd
-LISP_EXTRA_ARG=
-.endif
-.for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
+BOOT_VERSION=	1.0.17
+
+. if make(makesum)
+BOOT_ARCH_OS_LIST=	amd64-freebsd8 amd64-freebsd7 amd64-freebsd6 \
+			i386-freebsd8 i386-freebsd7 i386-freebsd6
+. else
+BOOT_ARCH_OS_LIST=	${ARCH}-freebsd${OSVER_MAJOR}
+. endif
+
+. if ${ARCH} == "i386"
+LISP_EXTRA_ARG=	--dynamic-space-size ${DYNAMIC_SPACE_SIZE}
+. endif
+
+. for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
 BOOT_DISTNAME=	${PORTNAME}-${BOOT_VERSION}-${BOOT_ARCH_OS}
-DISTFILES:=	${DISTFILES} ${BOOT_DISTNAME}-binary${EXTRACT_SUFX}
-.endfor
+DISTFILES:=	${DISTFILES} ${BOOT_DISTNAME}-binary${EXTRACT_SUFX}:binaries
+. endfor
 LISP_CMD=	"${WRKDIR}/${BOOT_DISTNAME}/src/runtime/sbcl --core ${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core ${LISP_EXTRA_ARG} --disable-debugger --userinit /dev/null --sysinit /dev/null"
-.if ${OSVERSION} >= 600000
-BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libc.so.5:${PORTSDIR}/misc/compat5x
-.endif
-.endif
+
+.endif # defined(WITH_SBCL)
+
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "---------------------------------------------------------"
+	@${ECHO_MSG} "You might need to increase memory limits in order to"
+	@${ECHO_MSG} "build SBCL."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can use the DYNAMIC_SPACE_SIZE knob to tweak the size"
+	@${ECHO_MSG} "of SBCL dynamically allocated memory."
+	@${ECHO_MSG} "---------------------------------------------------------"
+	@${ECHO_MSG}
+
+post-extract:
+.for DIR in ${EMPTY_DIRS}
+	@${TOUCH} ${WRKSRC}/contrib/${DIR}/.keep_me
+.endfor
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's|(CFLAGS =) .*|\1 ${CFLAGS}|' \
@@ -88,14 +113,10 @@ do-install:
 		INFO_DIR=${INFODIR} ${SH} install.sh)
 	@${RMDIR} ${DOCSDIR}/html
 
+post-install:
+	@${TOUCH} ${PREFIX}/lib/sbcl/site-systems/.keep_me
+
 test:	build
 	(cd ${WRKSRC}/tests && ${SH} run-tests.sh)
 
-.if defined(WITH_THREADS) && ${OSVERSION} < 600000
-pre-everything::
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> WARNING: Current threading support is very unstable on FreeBSD 5.x."
-	@${ECHO_MSG} "====>"
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index c4878868ab60..758a4f35d7b2 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,9 +1,21 @@
-MD5 (sbcl-1.0.16-source.tar.bz2) = 7256bed59a34b0a3efef540711bd3786
-MD5 (sbcl-1.0.6-x86-64-freebsd-binary.tar.bz2) = 1b4aa3a600a1ce2d00dfebd73a5f00ed
-MD5 (sbcl-1.0.6-x86-freebsd-binary.tar.bz2) = 5bab7372003ae385d436bec88443c897
-SHA256 (sbcl-1.0.16-source.tar.bz2) = 02eb4713c8c16b3fcb3590ea51bed63da312ccc83990f0d5741e4524c9b8a876
-SHA256 (sbcl-1.0.6-x86-64-freebsd-binary.tar.bz2) = 154277a45531c60294c03d93b2f6509bd622f863f10c65cd079ee3f007a92de0
-SHA256 (sbcl-1.0.6-x86-freebsd-binary.tar.bz2) = 0e6a0befbbd5da42a02a8d280836814433f544d57b2b425291b03afa37f1f6f5
-SIZE (sbcl-1.0.16-source.tar.bz2) = 3213890
-SIZE (sbcl-1.0.6-x86-64-freebsd-binary.tar.bz2) = 7634730
-SIZE (sbcl-1.0.6-x86-freebsd-binary.tar.bz2) = 7860437
+MD5 (sbcl-1.0.17-source.tar.bz2) = 6f1858c98370e06f5cca7bd95227c69e
+SHA256 (sbcl-1.0.17-source.tar.bz2) = c9b7b9270f709266e27e2b32d50c59d71aac909fe2d72ec4846d5932754f7487
+SIZE (sbcl-1.0.17-source.tar.bz2) = 3251964
+MD5 (sbcl-1.0.17-amd64-freebsd8-binary.tar.bz2) = 97c0acdaab6a0ad0101cf6d23e03176f
+SHA256 (sbcl-1.0.17-amd64-freebsd8-binary.tar.bz2) = 19f7a1311e2b0c7a174cce2182c9a240f0b1fe12eeb61de6e1cc253d47c4dc27
+SIZE (sbcl-1.0.17-amd64-freebsd8-binary.tar.bz2) = 7786927
+MD5 (sbcl-1.0.17-amd64-freebsd7-binary.tar.bz2) = aa169cd4267dab365b16352009d68c8c
+SHA256 (sbcl-1.0.17-amd64-freebsd7-binary.tar.bz2) = 79952f24e0689c9ceafcc6aa13e2985a9faf9a6324c88e7fbf9ce1faf71dc060
+SIZE (sbcl-1.0.17-amd64-freebsd7-binary.tar.bz2) = 7795687
+MD5 (sbcl-1.0.17-amd64-freebsd6-binary.tar.bz2) = 55626d08248ac55c2cb2e8c2f51b5b5c
+SHA256 (sbcl-1.0.17-amd64-freebsd6-binary.tar.bz2) = e143eab56c5a49bfba1c4131c3a38112daa5085db1650d68ab41a581b242c755
+SIZE (sbcl-1.0.17-amd64-freebsd6-binary.tar.bz2) = 7790406
+MD5 (sbcl-1.0.17-i386-freebsd8-binary.tar.bz2) = d3307cce2034d7a5d0fb5256c15371c4
+SHA256 (sbcl-1.0.17-i386-freebsd8-binary.tar.bz2) = c77aa0d0be14a773af9d87a5aff83f09d85349aa2eae1eec36877514167b8e19
+SIZE (sbcl-1.0.17-i386-freebsd8-binary.tar.bz2) = 8041425
+MD5 (sbcl-1.0.17-i386-freebsd7-binary.tar.bz2) = ae41ac24e247ae54c0063d0244c0a0cd
+SHA256 (sbcl-1.0.17-i386-freebsd7-binary.tar.bz2) = 2f11ea08b5ac5bfd5ca6bfb35e8af6ec4fa88273234b5f8ef56a2ef15e1bc459
+SIZE (sbcl-1.0.17-i386-freebsd7-binary.tar.bz2) = 8040556
+MD5 (sbcl-1.0.17-i386-freebsd6-binary.tar.bz2) = 80e8cd4d52e35d85706cc6299c2d137e
+SHA256 (sbcl-1.0.17-i386-freebsd6-binary.tar.bz2) = 6895fb44164a4fc0eb780444b1b6cfdcd5de92bcb24e282404023b4640894c9c
+SIZE (sbcl-1.0.17-i386-freebsd6-binary.tar.bz2) = 8036252
diff --git a/lang/sbcl/files/customize-target-features.lisp b/lang/sbcl/files/customize-target-features.lisp
index 299995966fca..e4e7bc26f603 100644
--- a/lang/sbcl/files/customize-target-features.lisp
+++ b/lang/sbcl/files/customize-target-features.lisp
@@ -4,4 +4,5 @@
          (disable (x)
            (setf features (remove x features))))
     (enable :sb-thread)
+    (enable :sb-lutex)
     features))
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index 9dfd48a04f79..a724ef249a4b 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -38,6 +38,7 @@ lib/sbcl/sb-bsd-sockets/Makefile
 lib/sbcl/sb-bsd-sockets/NEWS
 lib/sbcl/sb-bsd-sockets/TODO
 lib/sbcl/sb-bsd-sockets/a.out
+lib/sbcl/sb-bsd-sockets/alien/.keep_me
 lib/sbcl/sb-bsd-sockets/constants.fasl
 lib/sbcl/sb-bsd-sockets/constants.lisp
 lib/sbcl/sb-bsd-sockets/constants.lisp-temp
@@ -84,20 +85,20 @@ lib/sbcl/sb-cltl2/tests.fasl
 lib/sbcl/sb-cltl2/tests.lisp
 lib/sbcl/sb-cover/.cvsignore
 lib/sbcl/sb-cover/Makefile
+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.texinfo
-lib/sbcl/sb-cover/test-data-1.lisp
-lib/sbcl/sb-cover/test-data-2.lisp
-lib/sbcl/sb-cover/tests.lisp
-lib/sbcl/sb-cover/cover.fasl
-lib/sbcl/sb-cover/tests.fasl
 lib/sbcl/sb-cover/sb-cover.fasl
+lib/sbcl/sb-cover/sb-cover.texinfo
 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/test-passed
+lib/sbcl/sb-cover/tests.fasl
+lib/sbcl/sb-cover/tests.lisp
 lib/sbcl/sb-executable/sb-executable.fasl
 lib/sbcl/sb-grovel/.cvsignore
 lib/sbcl/sb-grovel/Makefile
@@ -129,6 +130,7 @@ lib/sbcl/sb-posix/Makefile
 lib/sbcl/sb-posix/README
 lib/sbcl/sb-posix/TODO
 lib/sbcl/sb-posix/a.out
+lib/sbcl/sb-posix/alien/.keep_me
 lib/sbcl/sb-posix/constants.fasl
 lib/sbcl/sb-posix/constants.lisp
 lib/sbcl/sb-posix/constants.lisp-temp
@@ -146,6 +148,7 @@ lib/sbcl/sb-posix/posix-tests.lisp
 lib/sbcl/sb-posix/sb-posix.asd
 lib/sbcl/sb-posix/sb-posix.fasl
 lib/sbcl/sb-posix/sb-posix.texinfo
+lib/sbcl/sb-posix/test-lab/.keep_me
 lib/sbcl/sb-posix/test-passed
 lib/sbcl/sb-rotate-byte/.cvsignore
 lib/sbcl/sb-rotate-byte/Makefile
@@ -211,14 +214,14 @@ 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
-@exec mkdir -p %D/lib/sbcl/site-systems
-@exec mkdir -p %D/lib/sbcl/sb-posix/test-lab
+lib/sbcl/site-systems/.keep_me
 @dirrm %%DOCSDIR%%
 @dirrm lib/sbcl/site-systems
 @dirrm lib/sbcl/sb-sprof
 @dirrm lib/sbcl/sb-simple-streams
 @dirrm lib/sbcl/sb-rt
 @dirrm lib/sbcl/sb-rotate-byte
+@dirrm lib/sbcl/sb-posix/alien
 @dirrm lib/sbcl/sb-posix/test-lab
 @dirrm lib/sbcl/sb-posix
 @dirrm lib/sbcl/sb-md5
@@ -227,6 +230,7 @@ lib/sbcl/sbcl.core
 @dirrm lib/sbcl/sb-executable
 @dirrm lib/sbcl/sb-cover
 @dirrm lib/sbcl/sb-cltl2
+@dirrm lib/sbcl/sb-bsd-sockets/alien
 @dirrm lib/sbcl/sb-bsd-sockets
 @dirrm lib/sbcl/sb-aclrepl
 @dirrm lib/sbcl/asdf-install