4 files changed, 36 insertions, 23 deletions

diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index b5c6c503c933..f7752a7dbef7 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sbcl
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 CATEGORIES=	lang lisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sbcl
@@ -31,10 +31,14 @@ LISP_CMD=	"lisp -noinit -batch"
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/*
+
 # Can currently only bootstrap using cmucl, which is i386-only
 ONLY_FOR_ARCHS=	i386
 
 MAN1=		sbcl.1
+INFO=		asdf sbcl
+INFODIR=	${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.pre.mk>
 
@@ -46,29 +50,24 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-contrib_asdf-install_installer.lisp
 BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
-post-extract:
-	(${FIND} ${WRKSRC} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -rf)
+post-patch:
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 do-build:
-	(cd ${WRKSRC} && ${SH} make.sh ${LISP_CMD})
+	(cd ${WRKSRC} && ${SETENV} INSTALL_ROOT=${PREFIX} \
+		${SH} make.sh ${LISP_CMD})
+	(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=${DOCSDIR}/info NO_DOCS=${NO_DOCS} \
-	    ${SH} install.sh)
-	# sbcl creates these directories even when they're not needed
+		MAN_DIR=${PREFIX}/man DOC_DIR=${DOCSDIR} \
+		INFO_DIR=${INFODIR}  ${SH} install.sh)
 .if defined(NOPORTDOCS)
-	${RMDIR} ${DOCSDIR}/html
+	@${RMDIR} ${DOCSDIR}/html
 .endif
-	# we do not build the documentation
-	# perhaps this should be configurable
-	${RMDIR} ${DOCSDIR}/info
 
-test:
+test:	build
 	(cd ${WRKSRC}/tests && ${SH} run-tests.sh)
 
-post-patch:
-	${FIND} ${WRKSRC} -name '*.orig' -delete
-
 .include <bsd.port.post.mk>
diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo
index 3ae2544ecfa4..abb9b42c146d 100644
--- a/lang/sbcl/distinfo
+++ b/lang/sbcl/distinfo
@@ -1,4 +1,4 @@
-MD5 (sbcl-0.9.5-source.tar.bz2) = f594f18813c08f262a6df9a36288adcb
-SIZE (sbcl-0.9.5-source.tar.bz2) = 2658381
-MD5 (sbcl-0.9.5-html.tar.bz2) = 7b768d3299248be8f41fa856fa335b81
-SIZE (sbcl-0.9.5-html.tar.bz2) = 117514
+MD5 (sbcl-0.9.6-source.tar.bz2) = 5e94122e73bc59c1411ff93fee948bfb
+SIZE (sbcl-0.9.6-source.tar.bz2) = 2664152
+MD5 (sbcl-0.9.6-html.tar.bz2) = e2d56c8df81e73f7085791e9ef89a2b3
+SIZE (sbcl-0.9.6-html.tar.bz2) = 117398
diff --git a/lang/sbcl/files/patch-src__runtime__GNUmakefile b/lang/sbcl/files/patch-src__runtime__GNUmakefile
new file mode 100644
index 000000000000..814f4ef00a8a
--- /dev/null
+++ b/lang/sbcl/files/patch-src__runtime__GNUmakefile
@@ -0,0 +1,15 @@
+--- src/runtime/GNUmakefile.orig	Fri Aug 19 09:15:15 2005
++++ src/runtime/GNUmakefile	Mon Nov  7 13:35:10 2005
+@@ -22,7 +22,11 @@
+ DEPEND_FLAGS = -MM
+ GREP = grep
+ 
+-CFLAGS = -g -Wall -O3
++ifeq ($(strip $(INSTALL_ROOT)),)
++INSTALL_ROOT = /usr/local
++endif
++TMPCFLAGS = $(CFLAGS)
++CFLAGS = -g -Wall $(TMPCFLAGS) -DSBCL_HOME=\"$(INSTALL_ROOT)/lib/sbcl/\"
+ ASFLAGS = $(CFLAGS)
+ CPPFLAGS = -I.
+ 
diff --git a/lang/sbcl/pkg-plist b/lang/sbcl/pkg-plist
index c395ed261def..fff1f4268da2 100644
--- a/lang/sbcl/pkg-plist
+++ b/lang/sbcl/pkg-plist
@@ -148,7 +148,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dthread_003acondition_002dwait.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dthread_003aget_002dmutex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dthread_003ainterrupt_002dthread.html
-%%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dthread_003ainterrupt_002dthread_002derror_002derrno.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dthread_003ainterrupt_002dthread_002derror_002dthread.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dthread_003alist_002dall_002dthreads.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sbcl/Function-sb_002dthread_003amake_002dmutex.html
@@ -532,11 +531,11 @@ lib/sbcl/systems/sb-posix.asd
 lib/sbcl/systems/sb-rotate-byte.asd
 lib/sbcl/systems/sb-rt.asd
 lib/sbcl/systems/sb-simple-streams.asd
+@exec mkdir -p %D/lib/sbcl/site-systems
+@exec mkdir -p %D/lib/sbcl/sb-posix/test-lab
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/sbcl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/asdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@exec mkdir -p %D/lib/sbcl/site-systems
-@exec mkdir -p %D/lib/sbcl/sb-posix/test-lab
 @dirrm %%DOCSDIR%%
 @dirrm lib/sbcl/systems
 @dirrm lib/sbcl/site-systems