Index: Mk/Uses/cl.mk
===================================================================
--- /dev/null
+++ Mk/Uses/cl.mk
@@ -0,0 +1,124 @@
+# Provide support for Common Lisp ports.
+#
+# Feature:	cl
+# Usage:	USES=cl
+# Valid ARGS:	none
+#
+# Variables:
+# SBCL           - Path to the Steel Bank Common Lisp compiler
+# CLISP          - Path to the GNU Common Lisp compiler
+# LISP_EXTRA_ARG - Extra arguments for compiler used by FASL_BUILD ports
+# CL_LIBDIR_REL  - Common Lisp library directory, relative to LOCALBASE or PREFIX
+# ASDF_PATHNAME  - Where to install compiled FASL files (depends on FASL_DIR_REL)
+# ASDF_REGISTRY  - Path to ASDF registry
+# DOCSDIR        - DOCSDIR using PKGBASE (to account for optional cl- PKGNAMEPREFIX)
+# EXAMPLESDIR    - Same as above, for EXAMPLESDIR
+# FASL_DIR_REL   - Relative path to compiled FASL files; depends on FASL_TARGET
+# FASL_TARGET    - Platform for building FASL files (currently "sbcl" or "clisp")
+# USE_SBCL       - If set, depend on lang/sbcl
+# USE_CLISP      - If set, depend on lang/clisp
+# USE_ASDF       - If set, depend on devel/cl-asdf
+# USE_ASDF_FASL  - If set, set dependency on compiled ASDF files (only if
+#                  required by the chosen FASL_TARGET)
+# FASL_BUILD     - If set, compile FASL files using the ASDF framework
+# ASDF_MODULES   - If FASL_BUILD is set: list of ASDF modules to compile
+#
+
+.if !defined(_INCLUDE_USES_CL_MK)
+_INCLUDE_USES_CL_MK=	yes
+
+CL_ASDF_Include_MAINTAINER=	olgeni@FreeBSD.org
+
+SBCL?=		${LOCALBASE}/bin/sbcl
+CLISP?=		${LOCALBASE}/bin/clisp
+
+CL_LIBDIR_REL=	lib/common-lisp
+
+ASDF_PATHNAME=	${PREFIX}/${CL_LIBDIR_REL}/${PORTNAME}
+FASL_PATHNAME=	${PREFIX}/${CL_LIBDIR_REL}/${PORTNAME}/${FASL_DIR_REL}
+ASDF_REGISTRY=	${PREFIX}/${CL_LIBDIR_REL}/system-registry
+
+# Include PKGNAMEPREFIX in DOCSDIR and EXAMPLESDIR
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
+
+.  if ${PORTNAME} != "ccl"
+NO_ARCH=	yes
+.  endif
+
+.  if defined(FASL_TARGET)
+FASL_DIR_REL=	${FASL_TARGET}fasl
+PKGNAMESUFFIX=	-${FASL_TARGET}
+.    if ${FASL_TARGET} == "sbcl"
+USE_SBCL=	yes
+.    elif ${FASL_TARGET} == "clisp"
+USE_CLISP=	yes
+.    endif
+.  endif # defined(FASL_TARGET)
+
+.  if defined(USE_SBCL)
+BUILD_DEPENDS+=	sbcl:lang/sbcl
+RUN_DEPENDS+=	sbcl:lang/sbcl
+.  elif defined(USE_CLISP)
+BUILD_DEPENDS+=	clisp:lang/clisp
+RUN_DEPENDS+=	clisp:lang/clisp
+.  endif # defined(USE_CLISP)
+
+.  if defined(USE_ASDF)
+# Prefer the ASDF port, even if the Common Lisp compiler already has a bundled
+# ASDF framework.  We also require the asdf-init file installed by the port.
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
+.  endif # defined(USE_ASDF)
+
+.  if defined(USE_ASDF_FASL)
+.    if defined(USE_SBCL)
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/build/asdf.fasl:devel/cl-asdf-sbcl
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/build/asdf.fasl:devel/cl-asdf-sbcl
+.    elif defined(USE_CLISP)
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:devel/cl-asdf-clisp
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:devel/cl-asdf-clisp
+.    endif
+.  endif # defined(USE_ASDF_FASL)
+
+.  if defined(FASL_BUILD)
+
+ASDF_MODULES?=	${PORTNAME}
+
+.    if !target(do-build)
+# See devel/cl-asdf/files/asdf-init.lisp for the meaning of FBSD_ASDF_COMPILE_PORT.
+do-build:
+.      for MODULE in ${ASDF_MODULES}
+.        if defined(USE_SBCL)
+	@FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
+		${SBCL} ${LISP_EXTRA_ARG} --noinform --userinit /dev/null --disable-debugger \
+		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
+		--eval "(asdf:oos 'asdf:compile-op :${MODULE})" \
+		--eval "(quit)"
+.        endif # USE_SBCL
+
+.        if defined(USE_CLISP)
+	@FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
+		${CLISP} ${LISP_EXTRA_ARG} -ansi -norc \
+		-i ${LOCALBASE}/etc/asdf-init \
+		-x "(asdf:oos 'asdf:compile-op :${MODULE})"
+	@${FIND} ${WRKSRC} -name "*.lib" | ${XARGS} ${RM}
+.        endif # USE_CLISP
+.      endfor
+.    endif # !target(do-build)
+
+.    if !target(do-install)
+do-install:
+	@${MKDIR} ${STAGEDIR}${FASL_PATHNAME}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${FASL_PATHNAME}
+
+.    endif # !target(do-install)
+post-install:
+	@cd ${WRKSRC} && ${FIND} * -type f \
+		| ${SORT} \
+		| ${AWK} '{ print "${CL_LIBDIR_REL}/${PORTNAME}/${FASL_DIR_REL}/" $$1 }' \
+		>> ${TMPPLIST}
+
+.  endif # FASL_BUILD
+
+.endif # _INCLUDE_USES_ASDF_MK
Index: converters/cl-babel-sbcl/Makefile
===================================================================
--- converters/cl-babel-sbcl/Makefile
+++ converters/cl-babel-sbcl/Makefile
@@ -18,10 +18,10 @@
 		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/sbclfasl/src/tf-sbcl.fasl:devel/cl-trivial-features-sbcl \
 		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/sbclfasl/package.fasl:devel/cl-trivial-gray-streams-sbcl
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 ASDF_MODULES=	babel babel-streams
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: converters/cl-babel/Makefile
===================================================================
--- converters/cl-babel/Makefile
+++ converters/cl-babel/Makefile
@@ -18,6 +18,7 @@
 
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
@@ -36,5 +37,4 @@
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/tests/* ${STAGEDIR}${EXAMPLESDIR}
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-alexandria-sbcl/Makefile
===================================================================
--- devel/cl-alexandria-sbcl/Makefile
+++ devel/cl-alexandria-sbcl/Makefile
@@ -6,18 +6,18 @@
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
-LICENSE=	PD
-
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Collection of portable public domain utilities for Common Lisp
 WWW=		https://common-lisp.net/project/alexandria/
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria
+LICENSE=	PD
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria
+
 .include <bsd.port.mk>
Index: devel/cl-alexandria/Makefile
===================================================================
--- devel/cl-alexandria/Makefile
+++ devel/cl-alexandria/Makefile
@@ -12,6 +12,7 @@
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
+USES=		cl
 USE_ASDF=	yes
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.common-lisp.net
@@ -46,5 +47,4 @@
 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.html ${WRKSRC}/doc/${PORTNAME}.pdf \
 		${STAGEDIR}${DOCSDIR}
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-asdf-sbcl/Makefile
===================================================================
--- devel/cl-asdf-sbcl/Makefile
+++ devel/cl-asdf-sbcl/Makefile
@@ -2,18 +2,17 @@
 PORTVERSION=	3.3.7
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-sbcl
 DISTFILES=	# none
 
-LICENSE=	PD
-
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	System definition facility for Common Lisp
 WWW=		https://common-lisp.net/project/asdf/
 
+LICENSE=	PD
+
+USES=		cl
 USE_ASDF=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-asdf/Makefile
===================================================================
--- devel/cl-asdf/Makefile
+++ devel/cl-asdf/Makefile
@@ -11,7 +11,7 @@
 
 LICENSE=	MIT
 
-USES=		gmake
+USES=		cl gmake
 
 ALL_TARGET=	build/asdf.lisp
 SUB_FILES=	pkg-message
@@ -48,5 +48,4 @@
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	(cd ${STAGEDIR}${DOCSDIR} && ${RM} .htaccess Changelog Makefile)
 
-.include <bsd.cl-asdf.mk>
 .include <bsd.port.mk>
Index: devel/cl-asdf/bsd.cl-asdf.mk
===================================================================
--- devel/cl-asdf/bsd.cl-asdf.mk
+++ /dev/null
@@ -1,122 +0,0 @@
-# bsd.cl-asdf.mk - Common Lisp related macros
-#
-# SBCL		- Path to the Steel Bank Common Lisp compiler
-# CLISP		- Path to the GNU Common Lisp compiler
-# LISP_EXTRA_ARG - Extra arguments for compiler used by FASL_BUILD ports
-# CL_LIBDIR_REL	- Common Lisp library directory, relative to LOCALBASE or PREFIX
-# ASDF_PATHNAME	- Where to install compiled FASL files (depends on FASL_DIR_REL)
-# ASDF_REGISTRY	- Path to ASDF registry
-# DOCSDIR	- DOCSDIR using PKGBASE (to account for optional cl- PKGNAMEPREFIX)
-# EXAMPLESDIR	- Same as above, for EXAMPLESDIR
-# FASL_DIR_REL	- Relative path to compiled FASL files; depends on FASL_TARGET
-# FASL_TARGET	- Platform for building FASL files (currently "sbcl" or "clisp")
-# USE_SBCL	- If set, depend on lang/sbcl
-# USE_CLISP	- If set, depend on lang/clisp
-# USE_ASDF	- If set, depend on devel/cl-asdf
-# USE_ASDF_FASL - If set, set dependency on compiled ASDF files (only if
-#                 required by the chosen FASL_TARGET)
-# FASL_BUILD	- If set, compile FASL files using the ASDF framework
-# ASDF_MODULES	- If FASL_BUILD is set: list of ASDF modules to compile
-
-CL_ASDF_Include_MAINTAINER=	olgeni@FreeBSD.org
-
-SBCL?=		${LOCALBASE}/bin/sbcl
-CLISP?=		${LOCALBASE}/bin/clisp
-
-CL_LIBDIR_REL=	lib/common-lisp
-
-ASDF_PATHNAME=	${PREFIX}/${CL_LIBDIR_REL}/${PORTNAME}
-FASL_PATHNAME=	${PREFIX}/${CL_LIBDIR_REL}/${PORTNAME}/${FASL_DIR_REL}
-ASDF_REGISTRY=	${PREFIX}/${CL_LIBDIR_REL}/system-registry
-
-# Include PKGNAMEPREFIX in DOCSDIR and EXAMPLESDIR
-DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGBASE}
-
-.if ${PORTNAME} != "ccl"
-NO_ARCH=	yes
-.endif
-
-.if defined(FASL_TARGET)
-FASL_DIR_REL=	${FASL_TARGET}fasl
-PKGNAMESUFFIX=	-${FASL_TARGET}
-.if ${FASL_TARGET} == "sbcl"
-USE_SBCL=	yes
-.elif ${FASL_TARGET} == "clisp"
-USE_CLISP=	yes
-.endif
-.endif # defined(FASL_TARGET)
-
-.if defined(USE_SBCL)
-BUILD_DEPENDS+=	sbcl:lang/sbcl
-RUN_DEPENDS+=	sbcl:lang/sbcl
-.elif defined(USE_CLISP)
-BUILD_DEPENDS+=	clisp:lang/clisp
-RUN_DEPENDS+=	clisp:lang/clisp
-.endif # defined(USE_CLISP)
-
-.if defined(USE_ASDF)
-# Even if the Common Lisp compiler already has a bundled ASDF framework,
-# we still need the asdf-init file.
-
-BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
-RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
-
-.endif # defined(USE_ASDF)
-
-.if defined(USE_ASDF_FASL)
-.if defined(USE_SBCL)
-# SBCL already has a bundled ASDF framework
-.elif defined(USE_CLISP)
-BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:devel/cl-asdf-clisp
-RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:devel/cl-asdf-clisp
-.endif # defined(USE_CLISP)
-.endif # defined(USE_ASDF_FASL)
-
-.if defined(FASL_BUILD)
-
-ASDF_MODULES?=	${PORTNAME}
-
-.if !target(do-build)
-
-# See devel/cl-asdf/files/asdf-init.lisp for the meaning of FBSD_ASDF_COMPILE_PORT.
-
-do-build:
-
-.for MODULE in ${ASDF_MODULES}
-
-.if defined(USE_SBCL)
-	@FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
-		${SBCL} ${LISP_EXTRA_ARG} --noinform --userinit /dev/null --disable-debugger \
-		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
-		--eval "(asdf:oos 'asdf:compile-op :${MODULE})" \
-		--eval "(quit)"
-.endif # USE_SBCL
-
-.if defined(USE_CLISP)
-	@FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
-		${CLISP} ${LISP_EXTRA_ARG} -ansi -norc \
-		-i ${LOCALBASE}/etc/asdf-init \
-		-x "(asdf:oos 'asdf:compile-op :${MODULE})"
-	@${FIND} ${WRKSRC} -name "*.lib" | ${XARGS} ${RM}
-.endif # USE_CLISP
-
-.endfor
-
-.endif # !target(do-build)
-
-.if !target(do-install)
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${FASL_PATHNAME}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${FASL_PATHNAME}
-
-.endif # !target(do-install)
-
-post-install:
-	@cd ${WRKSRC} && ${FIND} * -type f \
-		| ${SORT} \
-		| ${AWK} '{ print "${CL_LIBDIR_REL}/${PORTNAME}/${FASL_DIR_REL}/" $$1 }' \
-		>> ${TMPPLIST}
-
-.endif # FASL_BUILD
Index: devel/cl-cffi/Makefile
===================================================================
--- devel/cl-cffi/Makefile
+++ devel/cl-cffi/Makefile
@@ -29,6 +29,7 @@
 
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
@@ -46,8 +47,10 @@
 	${INSTALL_DATA} ${WRKSRC}/cffi.asd ${STAGEDIR}${ASDF_PATHNAME}
 	${INSTALL_DATA} ${WRKSRC}/cffi-uffi-compat.asd ${STAGEDIR}${ASDF_PATHNAME}
 	${INSTALL_DATA} ${WRKSRC}/cffi-grovel.asd ${STAGEDIR}${ASDF_PATHNAME}
-	${LN} -sf ${ASDF_PATHNAME}/cffi.asd ${ASDF_PATHNAME}/cffi-uffi-compat.asd \
-		${ASDF_PATHNAME}/cffi-grovel.asd ${STAGEDIR}${ASDF_REGISTRY}
+	${RLN} ${STAGEDIR}${ASDF_PATHNAME}/cffi.asd \
+		${STAGEDIR}${ASDF_PATHNAME}/cffi-uffi-compat.asd \
+		${STAGEDIR}${ASDF_PATHNAME}/cffi-grovel.asd \
+		${STAGEDIR}${ASDF_REGISTRY}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 .for FILE in shareable-vectors.txt allegro-internals.txt mem-vector.txt
@@ -64,5 +67,4 @@
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/tests/* ${STAGEDIR}${EXAMPLESDIR}/tests
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-infix-sbcl/Makefile
===================================================================
--- devel/cl-infix-sbcl/Makefile
+++ devel/cl-infix-sbcl/Makefile
@@ -18,9 +18,9 @@
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:devel/cl-infix
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:devel/cl-infix
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-infix/Makefile
===================================================================
--- devel/cl-infix/Makefile
+++ devel/cl-infix/Makefile
@@ -22,6 +22,7 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 OPTIONS_DEFINE=	DOCS
@@ -34,11 +35,10 @@
 	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${STAGEDIR}${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/infix.asd ${STAGEDIR}${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/infix.system ${STAGEDIR}${ASDF_PATHNAME}
-	@${LN} -sf ${ASDF_PATHNAME}/infix.asd ${STAGEDIR}${ASDF_REGISTRY}
+	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/infix.asd ${STAGEDIR}${ASDF_REGISTRY}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in COPYING infix.3lisp
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-port-sbcl/Makefile
===================================================================
--- devel/cl-port-sbcl/Makefile
+++ devel/cl-port-sbcl/Makefile
@@ -12,9 +12,9 @@
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:devel/cl-port
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:devel/cl-port
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-port/Makefile
===================================================================
--- devel/cl-port/Makefile
+++ devel/cl-port/Makefile
@@ -15,6 +15,7 @@
 WRKSRC=		${WRKDIR}/clocc-${PORTNAME}
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 OPTIONS_DEFINE=	DOCS
@@ -24,9 +25,8 @@
 	@${INSTALL_DATA} ${WRKSRC}/clocc-port.asd ${STAGEDIR}${ASDF_PATHNAME}/port.asd
 	@${INSTALL_DATA} ${WRKSRC}/port.system ${STAGEDIR}${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	@${LN} -sf ${ASDF_PATHNAME}/port.asd ${STAGEDIR}${ASDF_REGISTRY}
+	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/port.asd ${STAGEDIR}${ASDF_REGISTRY}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/port.html ${STAGEDIR}${DOCSDIR}
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-split-sequence-sbcl/Makefile
===================================================================
--- devel/cl-split-sequence-sbcl/Makefile
+++ devel/cl-split-sequence-sbcl/Makefile
@@ -12,9 +12,9 @@
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:devel/cl-split-sequence
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:devel/cl-split-sequence
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-split-sequence/Makefile
===================================================================
--- devel/cl-split-sequence/Makefile
+++ devel/cl-split-sequence/Makefile
@@ -15,13 +15,13 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} ${STAGEDIR}${ASDF_REGISTRY}
 	@${INSTALL_DATA} ${WRKSRC}/split-sequence.lisp ${STAGEDIR}${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/split-sequence.asd ${STAGEDIR}${ASDF_PATHNAME}
-	@${LN} -sf ${ASDF_PATHNAME}/split-sequence.asd ${STAGEDIR}${ASDF_REGISTRY}
+	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/split-sequence.asd ${STAGEDIR}${ASDF_REGISTRY}
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-trivial-features-sbcl/Makefile
===================================================================
--- devel/cl-trivial-features-sbcl/Makefile
+++ devel/cl-trivial-features-sbcl/Makefile
@@ -12,9 +12,9 @@
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:devel/cl-trivial-features
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:devel/cl-trivial-features
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-trivial-features/Makefile
===================================================================
--- devel/cl-trivial-features/Makefile
+++ devel/cl-trivial-features/Makefile
@@ -11,6 +11,7 @@
 
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
@@ -20,7 +21,7 @@
 	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/src
 	@${INSTALL_DATA} ${WRKSRC}/src/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/src
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.asd ${STAGEDIR}${ASDF_PATHNAME}
-	@${LN} -sf ${ASDF_PATHNAME}/${PORTNAME}.asd ${STAGEDIR}${ASDF_REGISTRY}
+	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}.asd ${STAGEDIR}${ASDF_REGISTRY}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in README SPEC
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
@@ -28,5 +29,4 @@
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/tests/* ${STAGEDIR}${EXAMPLESDIR}
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-trivial-gray-streams-sbcl/Makefile
===================================================================
--- devel/cl-trivial-gray-streams-sbcl/Makefile
+++ devel/cl-trivial-gray-streams-sbcl/Makefile
@@ -12,9 +12,9 @@
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:devel/cl-trivial-gray-streams
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:devel/cl-trivial-gray-streams
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-trivial-gray-streams/Makefile
===================================================================
--- devel/cl-trivial-gray-streams/Makefile
+++ devel/cl-trivial-gray-streams/Makefile
@@ -11,6 +11,7 @@
 
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 OPTIONS_DEFINE=	DOCS
@@ -19,9 +20,8 @@
 	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} ${STAGEDIR}${ASDF_REGISTRY}
 	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${STAGEDIR}${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.asd ${STAGEDIR}${ASDF_PATHNAME}
-	@${LN} -sf ${ASDF_PATHNAME}/${PORTNAME}.asd ${STAGEDIR}${ASDF_REGISTRY}
+	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}.asd ${STAGEDIR}${ASDF_REGISTRY}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: lang/ccl/Makefile
===================================================================
--- lang/ccl/Makefile
+++ lang/ccl/Makefile
@@ -22,12 +22,11 @@
 # the following files will not be installed
 EXCLUDE=	cocoa-ide lisp-kernel scripts fx86cl fx86cl.image
 
+USES=		cl
 USE_ASDF=	yes
 
 CONFLICTS_INSTALL=	cclive # bin/ccl
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
-
 BUILD_DEPENDS+=	as:devel/binutils
 
 LISP_ARCH=	x8664
Index: security/cl-md5-sbcl/Makefile
===================================================================
--- security/cl-md5-sbcl/Makefile
+++ security/cl-md5-sbcl/Makefile
@@ -12,9 +12,9 @@
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/md5/md5.asd:security/cl-md5
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/md5/md5.asd:security/cl-md5
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: security/cl-md5/Makefile
===================================================================
--- security/cl-md5/Makefile
+++ security/cl-md5/Makefile
@@ -13,13 +13,13 @@
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSION}
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} ${STAGEDIR}${ASDF_REGISTRY}
 	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${STAGEDIR}${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/*.asd ${STAGEDIR}${ASDF_PATHNAME}
-	@${LN} -sf ${ASDF_PATHNAME}/md5.asd ${STAGEDIR}${ASDF_REGISTRY}
+	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/md5.asd ${STAGEDIR}${ASDF_REGISTRY}
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: textproc/cl-meta-sbcl/Makefile
===================================================================
--- textproc/cl-meta-sbcl/Makefile
+++ textproc/cl-meta-sbcl/Makefile
@@ -13,9 +13,9 @@
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:textproc/cl-meta
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:textproc/cl-meta
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: textproc/cl-meta/Makefile
===================================================================
--- textproc/cl-meta/Makefile
+++ textproc/cl-meta/Makefile
@@ -20,6 +20,7 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 OPTIONS_DEFINE=	DOCS
@@ -33,5 +34,4 @@
 	@${INSTALL_DATA} ${WRKSRC}/Prag-Parse.* ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: textproc/cl-ppcre-sbcl/Makefile
===================================================================
--- textproc/cl-ppcre-sbcl/Makefile
+++ textproc/cl-ppcre-sbcl/Makefile
@@ -11,9 +11,9 @@
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:textproc/cl-ppcre
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:textproc/cl-ppcre
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: textproc/cl-ppcre/Makefile
===================================================================
--- textproc/cl-ppcre/Makefile
+++ textproc/cl-ppcre/Makefile
@@ -9,6 +9,7 @@
 
 LICENSE=	BSD2CLAUSE
 
+USES=		cl
 USE_ASDF=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	edicl
@@ -60,5 +61,4 @@
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/index.html ${STAGEDIR}${DOCSDIR}
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: www/cl-lml-sbcl/Makefile
===================================================================
--- www/cl-lml-sbcl/Makefile
+++ www/cl-lml-sbcl/Makefile
@@ -12,9 +12,9 @@
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:www/cl-lml
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:www/cl-lml
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: www/cl-lml/Makefile
===================================================================
--- www/cl-lml/Makefile
+++ www/cl-lml/Makefile
@@ -12,6 +12,7 @@
 
 NO_BUILD=	yes
 
+USES=		cl
 USE_ASDF=	yes
 
 PORTDOCS=	Makefile make.lisp readme.html readme.lml
@@ -22,11 +23,10 @@
 	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} ${STAGEDIR}${ASDF_REGISTRY}
 	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${STAGEDIR}${ASDF_PATHNAME}
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.asd ${STAGEDIR}${ASDF_PATHNAME}
-	@${LN} -sf ${ASDF_PATHNAME}/${PORTNAME}.asd ${STAGEDIR}${ASDF_REGISTRY}
+	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}.asd ${STAGEDIR}${ASDF_REGISTRY}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: x11-wm/stumpwm/Makefile
===================================================================
--- x11-wm/stumpwm/Makefile
+++ x11-wm/stumpwm/Makefile
@@ -19,7 +19,7 @@
 BUILD_DEPENDS=	sbcl:lang/sbcl \
 		texinfo>=0:print/texinfo
 
-USES=		autoreconf gmake
+USES=		autoreconf cl gmake
 USE_GITHUB=	yes
 USE_SBCL=	yes
 
Index: x11/cl-clx-sbcl/Makefile
===================================================================
--- x11/cl-clx-sbcl/Makefile
+++ x11/cl-clx-sbcl/Makefile
@@ -15,9 +15,9 @@
 BUILD_DEPENDS=	${PKGNAMEPREFIX}${PORTNAME}>=0:x11/${PKGNAMEPREFIX}${PORTNAME}
 RUN_DEPENDS=	${PKGNAMEPREFIX}${PORTNAME}>=0:x11/${PKGNAMEPREFIX}${PORTNAME}
 
+USES=		cl
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: x11/cl-clx/Makefile
===================================================================
--- x11/cl-clx/Makefile
+++ x11/cl-clx/Makefile
@@ -9,7 +9,7 @@
 
 LICENSE=	MIT
 
-USES=		makeinfo tar:tgz
+USES=		cl makeinfo tar:tgz
 USE_ASDF=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	sharplispers
@@ -53,5 +53,4 @@
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
-.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>