Index: lang/sbcl/Makefile
===================================================================
--- lang/sbcl/Makefile
+++ lang/sbcl/Makefile
@@ -1,30 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	sbcl
-PORTVERSION=	1.3.20
+DISTVERSION=	1.3.20
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
-MASTER_SITES=	SF/sbcl/sbcl/${PORTVERSION} \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
 		LOCAL/marino:binaries
-DISTFILES=	sbcl-${PORTVERSION}-source.tar.bz2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	Common Lisp development system derived from the CMU CL system
 
-LICENSE=	sbcl
+LICENSE=	${PORTNAME}
 LICENSE_NAME=	public domain | FreeBSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept dist-sell pkg-sell
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
+RUN_DEPENDS=	cl-asdf>=0:devel/cl-asdf
 
 USES=		gmake makeinfo tar:bzip2
 
-ONLY_FOR_ARCHS=	i386 amd64
-
 SBCL_BOOT_LIST=	1.0.31-amd64-freebsd8 \
 		1.0.31-i386-freebsd8 \
 		1.2.9-x86_64-dragonfly4
@@ -91,7 +92,7 @@
 SAFEPOINT_IMPLIES=	THREADS
 
 SBCL_VARS=		XC_HOST="${BOOT_WRKSRC}/src/runtime/sbcl --core ${BOOT_WRKSRC}/output/${CORE} --noinform --disable-debugger --no-sysinit --no-userinit"
-SBCL_DISTFILES=		sbcl-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}-binary.tar.bz2:binaries
+SBCL_DISTFILES=		${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}-binary${EXTRACT_SUFX}:binaries
 
 THREADS_VARS=		MAKE_SH_ARGS+="--with-sb-thread --with-restore-fs-segment-register-from-tls"
 THREADS_VARS_OFF=	MAKE_SH_ARGS+="--without-sb-thread --without-restore-fs-segment-register-from-tls"
@@ -110,13 +111,13 @@
 .include <bsd.port.options.mk>
 
 ARCHOS_PATTERN=	*-${ARCH}-${OPSYS:tl}*
-BOOT_WRKSRC=	${WRKDIR}/sbcl-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}
+BOOT_WRKSRC=	${WRKDIR}/${PORTNAME}-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}
 
 # for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1"
 .if defined (PLUS_BOOTSTRAPS)
 . for B in ${SBCL_BOOT_LIST}
 .  if ! ${DISTFILES:Msbcl-${B}-*}
-DISTFILES:=	${DISTFILES} sbcl-${B}-binary.tar.bz2:binaries
+DISTFILES:=	${DISTFILES} ${PORTNAME}-${B}-binary${EXTRACT_SUFX}:binaries
 .  endif
 . endfor
 .endif
@@ -134,7 +135,7 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
 		${WRKSRC}/src/code/toplevel.lisp \
-		${WRKSRC}/doc/sbcl.1 \
+		${WRKSRC}/doc/${PORTNAME}.1 \
 		${WRKSRC}/doc/manual/start-stop.texinfo
 
 do-build:
@@ -148,9 +149,9 @@
 	DOC_DIR="${STAGEDIR}${DOCSDIR}" \
 	${SH} install.sh)
 .for M in ${CONMODULES}
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/sbcl/${M}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${M}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${M}/*.[la]* \
-		${STAGEDIR}${PREFIX}/lib/sbcl/${M}/
+		${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${M}/
 .endfor
 	${INSTALL_DATA} ${WRKDIR}/sbclrc ${STAGEDIR}${PREFIX}/etc/sbclrc.sample
 
@@ -158,7 +159,7 @@
 	${DO_MAKE_BUILD} -C ${WRKSRC}/doc/manual info html
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sbcl
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	${RM} ${STAGEDIR}${PREFIX}/${INFO_PATH}/dir # don't requered with INFO=
Index: lang/sbcl/files/sbclrc.in
===================================================================
--- lang/sbcl/files/sbclrc.in
+++ lang/sbcl/files/sbclrc.in
@@ -1,6 +1 @@
-(require "asdf")
-
-(setf asdf:*central-registry*
-       (list* '*default-pathname-defaults*
-              #p"%%PREFIX%%/lib/common-lisp/system-registry/"
-              asdf:*central-registry*))
+(load "%%PREFIX%%/etc/asdf-init.lisp")