3 files changed, 49 insertions, 36 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index c10b07f41111..dc448f5fdd54 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -6,22 +6,26 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	lang lisp
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	sbcl
+MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}-source${EXTRACT_SUFX}
 
 MAINTAINER=	sa2c@sa2c.net
 COMMENT=	A Common Lisp development system derived from the CMU CL system
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/*
 
-# SBCL is a native code compiler: it must be ported per architecture.
+# 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
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+CFLAGS+=	-DSBCL_HOME=\\"${PREFIX}/lib/sbcl/\\"
+
+OPTIONS=	SBCL "Use installed SBCL binary if available" off \
+		THREADS "Enable experimental theading support" off
 
 MAN1=		sbcl.1
 INFO=		asdf sbcl
@@ -29,17 +33,22 @@ INFODIR=	${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.pre.mk>
 
-# If you have a previous version of SBCL installed, you can use it
-# instead of the binary distribution.
-.if defined(WITH_SBCL)
+.if ${ARCH} == "i386"
+PLIST_SUB+=	I386_ONLY=""
+.else
+PLIST_SUB+=	I386_ONLY="@comment "
+.endif
+
+# If WITH_SBCL is defined, try to use existing "sbcl" first.
+.if defined(WITH_SBCL) && exists(${LOCALBASE}/bin/sbcl)
 LISP_CMD=	""
 .else
 BOOT_VERSION=	${PORTVERSION}
 .if make(makesum)
 BOOT_ARCH_OS_LIST=	x86-freebsd x86-64-freebsd
-.elif ${ARCH} == i386
+.elif ${ARCH} == "i386"
 BOOT_ARCH_OS_LIST=	x86-freebsd
-.elif ${ARCH} == amd64
+.elif ${ARCH} == "amd64"
 BOOT_ARCH_OS_LIST=	x86-64-freebsd
 .endif
 .for BOOT_ARCH_OS in ${BOOT_ARCH_OS_LIST}
@@ -52,17 +61,10 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libc.so.5:${PORTSDIR}/misc/compat5x
 .endif
 .endif
 
-.if ${ARCH} == i386
-PLIST_SUB+=	I386_ONLY=""
-.else
-PLIST_SUB+=	I386_ONLY="@comment "
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -E -e \
-		's|CFLAGS = .*|CFLAGS = ${CFLAGS} -g -DSBCL_HOME=\\"${PREFIX}/lib/sbcl/\\"|' \
+	@${REINPLACE_CMD} -E -e 's|(CFLAGS =) .*|\1 ${CFLAGS}|' \
 		${WRKSRC}/src/runtime/GNUmakefile
-	@${FIND} ${WRKSRC} -name '*.orig' -o -name '*.bak' | ${XARGS} ${RM}
+	@${FIND} ${WRKSRC} -name '*.orig' -o -name '*.bak' -delete
 .if defined(WITH_THREADS)
 	@${CP} ${FILESDIR}/customize-target-features.lisp ${WRKSRC}
 .endif
@@ -70,24 +72,21 @@ post-patch:
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} INSTALL_ROOT=${PREFIX} \
 		${SH} make.sh ${LISP_CMD})
+	@${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output
 	@(cd ${WRKSRC}/doc/manual && \
 		${GMAKE} MAKEINFO='makeinfo --no-split' info)
 
 do-install:
 	(cd ${WRKSRC} && ${SETENV} INSTALL_ROOT=${PREFIX} \
 		MAN_DIR=${PREFIX}/man DOC_DIR=${DOCSDIR} \
-		INFO_DIR=${INFODIR}  ${SH} install.sh)
+		INFO_DIR=${INFODIR} ${SH} install.sh)
 	@${RMDIR} ${DOCSDIR}/html
 
 test:	build
 	(cd ${WRKSRC}/tests && ${SH} run-tests.sh)
 
+.if defined(WITH_THREADS) && ${OSVERSION} < 600000
 pre-everything::
-.if !defined(WITH_THREADS) && ${OSVERSION} >= 600000
-	@${ECHO_MSG} "====>"
-	@${ECHO_MSG} "====> To enable experimental threading support, define WITH_THREADS."
-	@${ECHO_MSG} "====>"
-.elif defined(WITH_THREADS) && ${OSVERSION} < 600000
 	@${ECHO_MSG} "====>"
 	@${ECHO_MSG} "====> WARNING: Current threading support is very unstable on FreeBSD 5.x."
 	@${ECHO_MSG} "====>"
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index bce4aef495dc..31dbe1dec074 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,9 +1,9 @@
-MD5 (sbcl-1.0.5-source.tar.bz2) = 43ff31244853e1f1a5ecc8533c4b95a9
-SHA256 (sbcl-1.0.5-source.tar.bz2) = 9dd9914eaa5d48feb46ef67e362dee0c97943e09daa78a098d1eb18279428079
-SIZE (sbcl-1.0.5-source.tar.bz2) = 3115687
-MD5 (sbcl-1.0.5-x86-freebsd-binary.tar.bz2) = 63ee4c4df1f5e28bc6463a86300485b1
-SHA256 (sbcl-1.0.5-x86-freebsd-binary.tar.bz2) = c67b6762df1f64f5ad1022fd2776d1418b16c8e29aae962759d4797b8651231e
-SIZE (sbcl-1.0.5-x86-freebsd-binary.tar.bz2) = 7839226
-MD5 (sbcl-1.0.5-x86-64-freebsd-binary.tar.bz2) = 5113343b555d639239b178a274db2732
-SHA256 (sbcl-1.0.5-x86-64-freebsd-binary.tar.bz2) = 1c5d47017fa108bbf2dce4966f547e5fb8c3d918c18d8121b55dd3cb67f51fb8
-SIZE (sbcl-1.0.5-x86-64-freebsd-binary.tar.bz2) = 7616574
+MD5 (sbcl-1.0.6-source.tar.bz2) = e8803f82e607dbabc1c8cc618314067a
+SHA256 (sbcl-1.0.6-source.tar.bz2) = 41b40e8ac3ae6dc27f02a76dcfe90efb4c250bafa49795c92fb8d85bed5308f0
+SIZE (sbcl-1.0.6-source.tar.bz2) = 3116968
+MD5 (sbcl-1.0.6-x86-freebsd-binary.tar.bz2) = 5bab7372003ae385d436bec88443c897
+SHA256 (sbcl-1.0.6-x86-freebsd-binary.tar.bz2) = 0e6a0befbbd5da42a02a8d280836814433f544d57b2b425291b03afa37f1f6f5
+SIZE (sbcl-1.0.6-x86-freebsd-binary.tar.bz2) = 7860437
+MD5 (sbcl-1.0.6-x86-64-freebsd-binary.tar.bz2) = 1b4aa3a600a1ce2d00dfebd73a5f00ed
+SHA256 (sbcl-1.0.6-x86-64-freebsd-binary.tar.bz2) = 154277a45531c60294c03d93b2f6509bd622f863f10c65cd079ee3f007a92de0
+SIZE (sbcl-1.0.6-x86-64-freebsd-binary.tar.bz2) = 7634730
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index 2a8a1b954c8c..bbd74e38d6f5 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -82,6 +82,19 @@ lib/sbcl/sb-cltl2/sb-cltl2.fasl
 lib/sbcl/sb-cltl2/test-passed
 lib/sbcl/sb-cltl2/tests.fasl
 lib/sbcl/sb-cltl2/tests.lisp
+lib/sbcl/sb-cover/Makefile
+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/test-data-1.fasl
+lib/sbcl/sb-cover/test-data-2.fasl
+lib/sbcl/sb-cover/test-passed
 lib/sbcl/sb-executable/sb-executable.fasl
 lib/sbcl/sb-grovel/.cvsignore
 lib/sbcl/sb-grovel/Makefile
@@ -208,6 +221,7 @@ lib/sbcl/sbcl.core
 @dirrm lib/sbcl/sb-introspect
 @dirrm lib/sbcl/sb-grovel
 @dirrm lib/sbcl/sb-executable
+@dirrm lib/sbcl/sb-cover
 @dirrm lib/sbcl/sb-cltl2
 @dirrm lib/sbcl/sb-bsd-sockets
 @dirrm lib/sbcl/sb-aclrepl