update lang/sbcl to 1.0.58 and switch to the new options format;

adjust dependent ports

2 files changed, 31 insertions, 34 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 170474827872..f5b1450f9ec5 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -5,18 +5,13 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	1.0.57
-PORTREVISION=	1
+PORTVERSION=	1.0.58
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		ftp://ftp.SpringDaemons.com/soft/sbcl-binary/:binaries
 DISTFILES=	\
 	${PORTNAME}-${PORTVERSION}-source${EXTRACT_SUFX}
-.if !defined(NOPORTDOCS) || make(makesum)
-DISTFILES+=	\
-	${PORTNAME}-${PORTVERSION}-documentation-html${EXTRACT_SUFX}
-.endif
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	A Common Lisp development system derived from the CMU CL system
@@ -24,8 +19,10 @@ COMMENT=	A Common Lisp development system derived from the CMU CL system
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
-OPTIONS=	SBCL "Use installed SBCL binary if available" off \
-		THREADS "Enable experimental threading support" off
+OPTIONS_DEFINE =	SBCL THREADS
+
+SBCL_DESC=	Bootstrap with installed SBCL binary, if available
+THREADS_DESC=	Experimental threading support
 
 CONTRIB_MODULES=	asdf			\
 			asdf-install		\
@@ -51,20 +48,7 @@ ONLY_FOR_ARCHS_REASON=	is a native code compiler, and has not been ported to\
 this architecture yet
 SBCL_HOME=	${PREFIX}/lib/sbcl
 
-.if !defined(NOPORTDOCS)
-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			\
-		sb-posix/README			\
-		sb-rotate-byte/README		\
-		sb-simple-streams/README
-TEXTDOCS=	BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO
-.endif
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 CFLAGS+=	-fno-omit-frame-pointer
 CPPFLAGS+=	-I. -DSBCL_PREFIX=\\\"\$$(SBCL_PREFIX)\\\"
@@ -84,8 +68,23 @@ MAKE_SH_ARGS?=	--prefix=${PREFIX} --dynamic-space-size=${DYNAMIC_SPACE_SIZE} \
 NM?=	/usr/bin/nm
 NMFLAGS?=	-gp
 
-# If WITH_SBCL is defined, try to use existing "sbcl" first.
-.if !defined(WITH_SBCL) || !exists(${LOCALBASE}/bin/sbcl) || make(makesum)
+.if ${PORT_OPTIONS:MDOCS} || make(makesum)
+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			\
+		sb-posix/README			\
+		sb-rotate-byte/README		\
+		sb-simple-streams/README
+TEXTDOCS=	BUGS CREDITS COPYING NEWS PRINCIPLES TLA TODO
+.endif
+
+# If the SBCL option is enabled, try to use existing "sbcl" first:
+.if empty(PORT_OPTIONS:MSBCL) || !exists(${LOCALBASE}/bin/sbcl) || make(makesum)
 BOOT_VERSION=	1.0.31
 
 . if make(makesum)
@@ -110,9 +109,9 @@ ${WRKDIR}/${BOOT_DISTNAME}/output/sbcl.core \
 --disable-debugger --userinit /dev/null --sysinit /dev/null
 MAKE_SH_ARGS+=	--xc-host='${XC_HOST}'
 
-.endif # defined(WITH_SBCL)
+.endif # SBCL
 
-.if defined(WITH_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 MAKE_SH_ARGS+=	--with-sb-thread
 .if defined(WITH_FUTEX)
 MAKE_SH_ARGS+=	--with-sb-futex
@@ -153,8 +152,6 @@ post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/usr/local|${PREFIX}|g' \
 		${WRKSRC}/doc/sbcl.1
-	@${REINPLACE_CMD} -e '\|CC?=|s|gcc|${CC}|'  \
-		${WRKSRC}/contrib/asdf-module.mk
 	@${REINPLACE_CMD} -E -e 's!-sbcl-shared!& ${CFLAGS}!' \
 		-e 's!\$$(TEST_FILESTEM|1)_core!$${\1}_core!g' \
 		${WRKSRC}/tests/core.test.sh \
@@ -187,7 +184,7 @@ do-install:
 	(if test -f ${WRKSRC}/contrib/${MOD}/${MOD}.asd; then ${INSTALL_DATA} \
 	    ${WRKSRC}/contrib/${MOD}/${MOD}.asd ${SBCL_HOME}/${MOD}/; fi)
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}/
 	${INSTALL_DATA} ${MANUALS:S,^, ${WRKSRC}/doc/manual/,g} ${DOCSDIR}/
 	${INSTALL_DATA} ${TEXTDOCS:S,^,${WRKSRC}/,g} ${DOCSDIR}/
@@ -209,4 +206,4 @@ bootstrap:
 	    ${WRKDIR}/${NEWBOOTNAME}/binary-distribution.sh ${NEWBOOTNAME})
 	(cd ${WRKDIR}/ && ${BZIP2_CMD} ${NEWBOOTNAME}-binary.tar)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 122c0b8595e2..53f03f4b77a0 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,7 +1,7 @@
-SHA256 (sbcl-1.0.57-source.tar.bz2) = a140862014bdcdd73821a8a0534ff68b0ec89eb6539acfcd35fd2a0ab07771ef
-SIZE (sbcl-1.0.57-source.tar.bz2) = 3611050
-SHA256 (sbcl-1.0.57-documentation-html.tar.bz2) = 65b2cad6a84189c3b6f949bff1d0c164925dbeb7a494d85c34cd8e8ba839d21c
-SIZE (sbcl-1.0.57-documentation-html.tar.bz2) = 174146
+SHA256 (sbcl-1.0.58-source.tar.bz2) = 817972d3f0be2c37ef29a9ea4858e6772cccf87cfcc5b36361a5abe2a149d945
+SIZE (sbcl-1.0.58-source.tar.bz2) = 3618349
+SHA256 (sbcl-1.0.58-documentation-html.tar.bz2) = 7ae4654ef97e81738878474f4fbfd995a2b97c3271039b0f31cc4d525ce782b8
+SIZE (sbcl-1.0.58-documentation-html.tar.bz2) = 175205
 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