Index: lang/sbcl/Makefile
===================================================================
--- lang/sbcl/Makefile
+++ lang/sbcl/Makefile
@@ -1,33 +1,35 @@
 # $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} \
-		LOCAL/marino:binaries
-DISTFILES=	sbcl-${PORTVERSION}-source.tar.bz2
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
+		SF/${PORTNAME}/${PORTNAME}/${BOOTVERSION}:binaries
+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
+BOOTVERSION=	1.2.7
+SBCL_BOOT_LIST=	${BOOTVERSION}-x86-64-freebsd \
+		${BOOTVERSION}-x86-freebsd \
+		${BOOTVERSION}-x86-64-dragonfly
 
 CONMODULES=	asdf sb-aclrepl sb-bsd-sockets sb-cltl2 sb-concurrency \
 		sb-cover sb-executable sb-gmp sb-grovel sb-introspect \
@@ -91,7 +93,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"
@@ -109,14 +111,14 @@
 
 .include <bsd.port.options.mk>
 
-ARCHOS_PATTERN=	*-${ARCH}-${OPSYS:tl}*
-BOOT_WRKSRC=	${WRKDIR}/sbcl-${SBCL_BOOT_LIST:M${ARCHOS_PATTERN}}
+ARCHOS_PATTERN=	*-${ARCH:S/amd64/x86-64/:S/i386/x86/}-${OPSYS:tl}*
+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 +136,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 +150,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 +160,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/distinfo
===================================================================
--- lang/sbcl/distinfo
+++ lang/sbcl/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1501619805
+TIMESTAMP = 1502973638
 SHA256 (sbcl-1.3.20-source.tar.bz2) = 5282318053b62ff041c14956dd5a2e2e66697482141713c6c5df375d05cd1f62
 SIZE (sbcl-1.3.20-source.tar.bz2) = 5873056
-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-i386-freebsd8-binary.tar.bz2) = fd2348749a2babf301a99449d246b349a1285fc0bca8b83bde0bfa7187cf3dd7
-SIZE (sbcl-1.0.31-i386-freebsd8-binary.tar.bz2) = 8475244
-SHA256 (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 2e32a22ef3a528d7247c0e3a72a3ac672b8b6848ac2d35fbad52a3d1475130dc
-SIZE (sbcl-1.2.9-x86_64-dragonfly4-binary.tar.bz2) = 10224580
+SHA256 (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = c61f5e777e56921d2452d0fa6b71024ccd9b99bc659676498d398b8663176492
+SIZE (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = 10463348
+SHA256 (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = cf68bfab780a14964d9593f5b47fa3e174cf43e95ae3e558712d218f1c37bdbe
+SIZE (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = 10322926
+SHA256 (sbcl-1.2.7-x86-64-dragonfly-binary.tar.bz2) = 4d8d589909d1b003afc5d58276affe2202f4a75d3760737f2ac6ce046a1f905c
+SIZE (sbcl-1.2.7-x86-64-dragonfly-binary.tar.bz2) = 10586301
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")