Remove redundant code and variables from the cl-* ports.

Introduce bsd.cl-asdf.mk to automate the compilation and installation
of Common Lisp libraries using the ASDF framework.

Currently it supports building FASL files on SBCL and CLISP, to
support the ports that already exist in the ports tree.

This should help bringing in more cl-* ports from the ASDF repository
without excessive code duplication.

24 files changed, 312 insertions, 349 deletions

diff --git a/devel/cl-asdf-clisp/Makefile b/devel/cl-asdf-clisp/Makefile
index c25f5f2037d8..579495702792 100644
--- a/devel/cl-asdf-clisp/Makefile
+++ b/devel/cl-asdf-clisp/Makefile
@@ -1,4 +1,4 @@
-# New ports collection Makefile for:	cl-asdf-sbcl
+# New ports collection Makefile for:	cl-asdf-clisp
 # Date created:				10 May 2003
 # Whom:					Henrik Motakef <henrik.motakef@web.de>
 #
@@ -6,34 +6,24 @@
 
 PORTNAME=	asdf
 PORTVERSION=	1.374
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-clisp
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A system definition facility for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf \
-		clisp:${PORTSDIR}/lang/clisp
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf \
-		clisp:${PORTSDIR}/lang/clisp
+# Even if this port builds FASL files, it is slightly different from
+# other FASL ports because it uses USE_ASDF rather than USE_ASDF_FASL.
 
-ASDF_MODULES=	asdf.lisp wild-modules.lisp
+USE_ASDF=	yes
+FASL_TARGET=	clisp
+FASL_BUILD=	yes
 
 post-extract:
 	@${MKDIR} ${WRKSRC}
 
-do-build:
-	@clisp -q -ansi -norc \
-		-x "(compile-file \"${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp\" :output-file \"${WRKSRC}/asdf.fasl\")" \
-		-x "(compile-file \"${LOCALBASE}/lib/common-lisp/asdf/wild-modules.lisp\" :output-file \"${WRKSRC}/wild-modules.fasl\")" \
-		-x "(quit)";
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/asdf/clispfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/asdf/clispfasl
-
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-asdf-clisp/pkg-plist b/devel/cl-asdf-clisp/pkg-plist
index 9c82491b042c..9ab70a3fc4e5 100644
--- a/devel/cl-asdf-clisp/pkg-plist
+++ b/devel/cl-asdf-clisp/pkg-plist
@@ -1,3 +1,2 @@
 lib/common-lisp/asdf/clispfasl/asdf.fasl
-lib/common-lisp/asdf/clispfasl/wild-modules.fasl
 @dirrm lib/common-lisp/asdf/clispfasl
diff --git a/devel/cl-asdf/Makefile b/devel/cl-asdf/Makefile
index c592fa325994..26f27631bd3a 100644
--- a/devel/cl-asdf/Makefile
+++ b/devel/cl-asdf/Makefile
@@ -9,36 +9,30 @@
 
 PORTNAME=	asdf
 PORTVERSION=	1.374
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel lisp
+PKGNAMEPREFIX=	cl-
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	olgeni
-PKGNAMEPREFIX=	cl-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A system definition facility for Common Lisp
 
-SUB_FILES+=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}
-NO_BUILD=	yes # Sources only
-DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUENAME}
+NO_BUILD=	yes
 
-CL_LIBDIR=		${PREFIX}/lib/common-lisp
-ASDF_SYSTEM_REGISTRY=	${CL_LIBDIR}/system-registry
+SUB_FILES+=	pkg-message
 
 do-install:
-	@${MKDIR} ${CL_LIBDIR}/asdf
-	@${MKDIR} ${ASDF_SYSTEM_REGISTRY}
-
-	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${CL_LIBDIR}/asdf/
-	@${INSTALL_DATA} ${WRKSRC}/*.asd ${CL_LIBDIR}/asdf/
-
-	@${LN} -sf ${CL_LIBDIR}/asdf/*.asd ${ASDF_SYSTEM_REGISTRY}
-
-	@${SED}	-i '' -e 's|%%PREFIX%%|${PREFIX}|' ${CL_LIBDIR}/asdf/asdf.lisp
-	@${SED}	-e 's|%%ASDF_PATHNAME%%|${CL_LIBDIR}/asdf/asdf|' \
-		-e 's|%%ASDF_SYSTEM_REGISTRY%%|${ASDF_SYSTEM_REGISTRY}|' \
+	@${MKDIR} ${ASDF_PATHNAME}
+	@${MKDIR} ${ASDF_REGISTRY}
+	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/*.asd ${ASDF_PATHNAME}
+	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
+	@${SED}	-i '' -e 's|%%PREFIX%%|${PREFIX}|' ${ASDF_PATHNAME}/asdf.lisp
+	@${SED}	-e 's|%%ASDF_PATHNAME%%|${ASDF_PATHNAME}/asdf|' \
+		-e 's|%%ASDF_REGISTRY%%|${ASDF_REGISTRY}|' \
 		-e 's|%%PREFIX%%|${PREFIX}|' \
 		${FILESDIR}/asdf-init.lisp > \
 		${PREFIX}/etc/asdf-init.lisp.default
@@ -47,11 +41,12 @@ do-install:
 		${PREFIX}/etc/asdf-init.lisp
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
-	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
+.include <bsd.cl-asdf.mk>
 .include <bsd.port.mk>
diff --git a/devel/cl-asdf/bsd.cl-asdf.mk b/devel/cl-asdf/bsd.cl-asdf.mk
new file mode 100644
index 000000000000..bd647e3ccaf6
--- /dev/null
+++ b/devel/cl-asdf/bsd.cl-asdf.mk
@@ -0,0 +1,110 @@
+# $FreeBSD$
+#
+# 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
+# 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 UNIQUENAME (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 chosed 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/${UNIQUENAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUENAME}
+
+.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:${PORTSDIR}/lang/sbcl
+RUN_DEPENDS+=	sbcl:${PORTSDIR}/lang/sbcl
+.elif defined(USE_CLISP)
+BUILD_DEPENDS+=	clisp:${PORTSDIR}/lang/clisp
+RUN_DEPENDS+=	clisp:${PORTSDIR}/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.lisp:${PORTSDIR}/devel/cl-asdf
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.lisp:${PORTSDIR}/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:${PORTSDIR}/devel/cl-asdf-clisp
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:${PORTSDIR}/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 WRKSRC=${WRKSRC}/ \
+		${SBCL}	--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 WRKSRC=${WRKSRC}/ \
+		${CLISP} -q -ansi -norc \
+		-i ${LOCALBASE}/etc/asdf-init \
+		-x "(asdf:oos 'asdf:compile-op :${MODULE})"
+.endif # USE_CLISP
+
+.endfor
+
+.endif # !target(do-build)
+
+.if !target(do-install)
+
+do-install:
+	@${MKDIR} ${FASL_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${FASL_PATHNAME}
+
+.endif # !target(do-install)
+
+.endif # FASL_BUILD
diff --git a/devel/cl-asdf/pkg-plist b/devel/cl-asdf/pkg-plist
index 25bf8ebe19f6..62832838b437 100644
--- a/devel/cl-asdf/pkg-plist
+++ b/devel/cl-asdf/pkg-plist
@@ -14,6 +14,6 @@ etc/asdf-init.lisp.default
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%LIB32DIR%%/common-lisp/system-registry
-@dirrm %%LIB32DIR%%/common-lisp/asdf
-@dirrm %%LIB32DIR%%/common-lisp
+@dirrmtry %%LIB32DIR%%/common-lisp/system-registry
+@dirrmtry %%LIB32DIR%%/common-lisp/asdf
+@dirrmtry %%LIB32DIR%%/common-lisp
diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile
index e8df4d47d8e8..2970e833b41f 100644
--- a/devel/cl-infix-sbcl/Makefile
+++ b/devel/cl-infix-sbcl/Makefile
@@ -5,36 +5,27 @@
 # $FreeBSD$
 
 PORTNAME=	infix
-DISTVERSION=	19960628
+PORTVERSION=	19960628
+PORTREVISION=	1
 CATEGORIES=	devel lisp
 MASTER_SITES=	http://ftp.linux.org.uk/pub/lisp/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
 		http://thingamy.com/cclan/ \
 		http://www-jcsu.jesus.cam.ac.uk/ftp/pub/cclan/
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-sbcl
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A lisp macro to read math statements in infix notation
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/infix/infix.asd:${PORTSDIR}/devel/cl-infix \
-		sbcl:${PORTSDIR}/lang/sbcl
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/port/port.asd:${PORTSDIR}/devel/cl-port \
-		sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:${PORTSDIR}/devel/cl-infix
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
 
 NO_CDROM=	No fees or compensation can be charged
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	sbcl	--noinform --userinit /dev/null \
-		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
-		--eval "(asdf:oos 'asdf:compile-op :infix)" \
-		--eval "(quit)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/infix/sbclfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/infix/sbclfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	sbcl
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-infix/Makefile b/devel/cl-infix/Makefile
index 1fd87d4487b7..ba7856331853 100644
--- a/devel/cl-infix/Makefile
+++ b/devel/cl-infix/Makefile
@@ -5,7 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	infix
-DISTVERSION=	19960628
+PORTVERSION=	19960628
+PORTREVISION=	1
 CATEGORIES=	devel lisp
 MASTER_SITES=	http://ftp.linux.org.uk/pub/lisp/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
@@ -17,29 +18,24 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A lisp macro for reading math expressions in infix form
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-CL_LIBDIR=	${PREFIX}/lib/common-lisp
-
 NO_BUILD=	yes
 NO_CDROM=	No fees or compensation can be charged
 
-LPORTDOCS=	COPYING infix.3lisp
+USE_ASDF=	yes
 
 do-install:
-	@${MKDIR} ${CL_LIBDIR}/infix
-	@${INSTALL_DATA} ${WRKSRC}/infix.asd   ${CL_LIBDIR}/infix/
-	@${INSTALL_DATA} ${WRKSRC}/*.cl ${CL_LIBDIR}/infix/
-	@${INSTALL_DATA} ${WRKSRC}/infix.system ${CL_LIBDIR}/infix/
-	@${LN} -sf ${CL_LIBDIR}/infix/infix.asd ${CL_LIBDIR}/system-registry/infix.asd
+	@${MKDIR} ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/*.cl ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/infix.asd ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/infix.system ${ASDF_PATHNAME}
+	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
 .if !defined(NOPORTDOCS)
-.for FILE in ${LPORTDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/
+.for FILE in COPYING infix.3lisp
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 .endif
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-port-clisp/Makefile b/devel/cl-port-clisp/Makefile
index f4b52b373653..9f053437d6c4 100644
--- a/devel/cl-port-clisp/Makefile
+++ b/devel/cl-port-clisp/Makefile
@@ -6,34 +6,23 @@
 
 PORTNAME=	port
 PORTVERSION=	2002.10.02.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lisp
 MASTER_SITES=	ftp://ftp.linux.org.uk/pub/lisp/experimental/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
 		http://www-jcsu.jesus.cam.ac.uk/ftp/pub/cclan/
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-clisp
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Cross-Lisp portability package
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/port/port.asd:${PORTSDIR}/devel/cl-port \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/port/port.asd:${PORTSDIR}/devel/cl-port \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	clisp	-q -ansi -norc \
-		-i ${LOCALBASE}/etc/asdf-init \
-		-x "(asdf:oos 'asdf:compile-op :port)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/port/clispfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/port/clispfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	clisp
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-port-sbcl/Makefile b/devel/cl-port-sbcl/Makefile
index 4d0d00184a6f..9ad8bd1e8238 100644
--- a/devel/cl-port-sbcl/Makefile
+++ b/devel/cl-port-sbcl/Makefile
@@ -6,32 +6,23 @@
 
 PORTNAME=	port
 PORTVERSION=	2002.10.02.1
+PORTREVISION=	1
 CATEGORIES=	devel lisp
 MASTER_SITES=	ftp://ftp.linux.org.uk/pub/lisp/experimental/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
 		http://www-jcsu.jesus.cam.ac.uk/ftp/pub/cclan/
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-sbcl
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Cross-Lisp portability package
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/port/port.asd:${PORTSDIR}/devel/cl-port \
-		sbcl:${PORTSDIR}/lang/sbcl
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/port/port.asd:${PORTSDIR}/devel/cl-port \
-		sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	sbcl	--noinform --userinit /dev/null \
-		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
-		--eval "(asdf:oos 'asdf:compile-op :port)" \
-		--eval "(quit)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/port/sbclfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/port/sbclfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	sbcl
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-port/Makefile b/devel/cl-port/Makefile
index 32a1849a8d26..4764df62e17f 100644
--- a/devel/cl-port/Makefile
+++ b/devel/cl-port/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	port
 PORTVERSION=	2002.10.02.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel lisp
 MASTER_SITES=	ftp://ftp.linux.org.uk/pub/lisp/experimental/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
@@ -17,23 +17,21 @@ DISTNAME=	clocc-${PORTNAME}_2002-10-02-1
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Cross-Lisp portability package
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-
 WRKSRC=		${WRKDIR}/clocc-${PORTNAME}
-DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 NO_BUILD=	yes
-CL_LIBDIR=	${PREFIX}/lib/common-lisp
+
+USE_ASDF=	yes
 
 do-install:
-	@${MKDIR} ${CL_LIBDIR}/port
-	@${INSTALL_DATA} ${WRKSRC}/clocc-port.asd ${CL_LIBDIR}/port/port.asd
-	@${INSTALL_DATA} ${WRKSRC}/port.system ${CL_LIBDIR}/port/port.system
-	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${CL_LIBDIR}/port/
-	@${LN} -sf ${CL_LIBDIR}/port/port.asd ${CL_LIBDIR}/system-registry/port.asd
+	@${MKDIR} ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/clocc-port.asd ${ASDF_PATHNAME}/port.asd
+	@${INSTALL_DATA} ${WRKSRC}/port.system ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${ASDF_PATHNAME}
+	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/port.html ${DOCSDIR}
 .endif
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-split-sequence-clisp/Makefile b/devel/cl-split-sequence-clisp/Makefile
index 980a2d2d7188..a0232d11ff1f 100644
--- a/devel/cl-split-sequence-clisp/Makefile
+++ b/devel/cl-split-sequence-clisp/Makefile
@@ -6,34 +6,23 @@
 
 PORTNAME=	split-sequence
 PORTVERSION=	20011114.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lisp
 MASTER_SITES=	ftp://ftp.linux.org.uk/pub/lisp/experimental/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
 		http://www-jcsu.jesus.cam.ac.uk/ftp/pub/cclan/
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-clisp
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Partitioning Common Lisp sequences
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	clisp	-q -ansi -norc \
-		-i ${LOCALBASE}/etc/asdf-init \
-		-x "(asdf:oos 'asdf:compile-op :split-sequence)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/split-sequence/clispfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/split-sequence/clispfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	clisp
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-split-sequence-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile
index 9a6a04d1b447..fadbb679ba85 100644
--- a/devel/cl-split-sequence-sbcl/Makefile
+++ b/devel/cl-split-sequence-sbcl/Makefile
@@ -6,32 +6,23 @@
 
 PORTNAME=	split-sequence
 PORTVERSION=	20011114.1
+PORTREVISION=	1
 CATEGORIES=	devel lisp
 MASTER_SITES=	ftp://ftp.linux.org.uk/pub/lisp/experimental/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
 		http://www-jcsu.jesus.cam.ac.uk/ftp/pub/cclan/
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-sbcl
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Partitioning Common Lisp sequences
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence \
-		sbcl:${PORTSDIR}/lang/sbcl
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence \
-		sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	sbcl	--noinform --userinit /dev/null \
-		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
-		--eval "(asdf:oos 'asdf:compile-op :split-sequence)" \
-		--eval "(quit)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/split-sequence/sbclfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/split-sequence/sbclfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	sbcl
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-split-sequence/Makefile b/devel/cl-split-sequence/Makefile
index 20d0e9b19fc9..327679b4f956 100644
--- a/devel/cl-split-sequence/Makefile
+++ b/devel/cl-split-sequence/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	split-sequence
 PORTVERSION=	20011114.1
+PORTREVISION=	1
 CATEGORIES=	devel lisp
 MASTER_SITES=	ftp://ftp.linux.org.uk/pub/lisp/experimental/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
@@ -16,17 +17,16 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Partitioning Common Lisp sequences
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
-CL_LIBDIR=	${PREFIX}/lib/common-lisp
+
+USE_ASDF=	yes
 
 do-install:
-	@${MKDIR} ${CL_LIBDIR}/split-sequence
-	@${INSTALL_DATA} ${WRKSRC}/split-sequence.lisp ${CL_LIBDIR}/split-sequence/
-	@${INSTALL_DATA} ${WRKSRC}/split-sequence.asd ${CL_LIBDIR}/split-sequence/
-	@${LN} -sf ${CL_LIBDIR}/split-sequence/split-sequence.asd ${CL_LIBDIR}/system-registry/split-sequence.asd
+	@${MKDIR} ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/split-sequence.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/split-sequence.asd ${ASDF_PATHNAME}
+	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-uffi-sbcl/Makefile b/devel/cl-uffi-sbcl/Makefile
index a087af427ed0..88746c9ae262 100644
--- a/devel/cl-uffi-sbcl/Makefile
+++ b/devel/cl-uffi-sbcl/Makefile
@@ -6,32 +6,24 @@
 
 PORTNAME=	uffi
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	devel lisp
-MASTER_SITES=	# use installed sources from CL_LIBDIR
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-sbcl
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Universal Foreign Function Interface for Common Lisp (SBCL binaries)
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/uffi/uffi.asd:${PORTSDIR}/devel/cl-uffi \
-		sbcl:${PORTSDIR}/lang/sbcl
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/port/port.asd:${PORTSDIR}/devel/cl-port \
-		sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/uffi/uffi.asd:${PORTSDIR}/devel/cl-uffi
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
 
-CL_LIBDIR?=	${LOCALBASE}/lib/common-lisp
-
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	sbcl	--noinform --userinit /dev/null --disable-debugger \
-		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
-		--eval "(asdf:oos 'asdf:compile-op :uffi)" \
-		--eval "(quit)"
+USE_ASDF_FASL=	yes
+FASL_TARGET=	sbcl
+FASL_BUILD=	yes
 
 do-install:
-	@${MKDIR} ${CL_LIBDIR}/uffi/src/sbclfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${CL_LIBDIR}/uffi/src/sbclfasl/
+	@${MKDIR} ${ASDF_PATHNAME}/src/${FASL_DIR_REL}
+	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${ASDF_PATHNAME}/src/${FASL_DIR_REL}
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/devel/cl-uffi/Makefile b/devel/cl-uffi/Makefile
index f30d8b88a0a3..700602772eb6 100644
--- a/devel/cl-uffi/Makefile
+++ b/devel/cl-uffi/Makefile
@@ -6,26 +6,24 @@
 
 PORTNAME=	uffi
 PORTVERSION=	1.6.2
+PORTREVISION=	2
 CATEGORIES=	devel lisp
-MASTER_SITES=	http://files.b9.com/uffi/
 PKGNAMEPREFIX=	cl-
+MASTER_SITES=	http://files.b9.com/uffi/
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Universal Foreign Function Interface for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-
-DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 NO_BUILD=	yes
-CL_LIBDIR?=	${LOCALBASE}/lib/common-lisp
+
+USE_ASDF=	yes
 
 do-install:
-	@${MKDIR} ${CL_LIBDIR}/uffi
-	@${MKDIR} ${CL_LIBDIR}/uffi/src
-	@${INSTALL_DATA} ${WRKSRC}/uffi.asd   ${CL_LIBDIR}/uffi/
-	@${INSTALL_DATA} ${WRKSRC}/src/*.lisp ${CL_LIBDIR}/uffi/src/
-	@${LN} -sf ${CL_LIBDIR}/uffi/uffi.asd ${CL_LIBDIR}/system-registry/uffi.asd
+	@${MKDIR} ${ASDF_PATHNAME}
+	@${MKDIR} ${ASDF_PATHNAME}/src
+	@${INSTALL_DATA} ${WRKSRC}/uffi.asd   ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/src/*.lisp ${ASDF_PATHNAME}/src
+	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${TAR} -C ${DOCSDIR} -xf ${WRKSRC}/doc/html.tar.gz
@@ -42,4 +40,5 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/textproc/cl-meta-clisp/Makefile b/textproc/cl-meta-clisp/Makefile
index b53fbe646a42..e570aeda63d4 100644
--- a/textproc/cl-meta-clisp/Makefile
+++ b/textproc/cl-meta-clisp/Makefile
@@ -6,34 +6,23 @@
 
 PORTNAME=	meta
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc lisp
 MASTER_SITES=	ftp://ftp.linux.org.uk/pub/lisp/experimental/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
 		http://www-jcsu.jesus.cam.ac.uk/ftp/pub/cclan/
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-clisp
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A parser generator for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/meta/meta.asd:${PORTSDIR}/textproc/cl-meta \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/meta/meta.asd:${PORTSDIR}/textproc/cl-meta \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:${PORTSDIR}/textproc/cl-meta
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:${PORTSDIR}/textproc/cl-meta
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	clisp	-q -ansi -norc -E ISO-8859-1 \
-		-i ${LOCALBASE}/etc/asdf-init \
-		-x "(asdf:oos 'asdf:compile-op :meta)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/meta/clispfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/meta/clispfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	clisp
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/textproc/cl-meta-sbcl/Makefile b/textproc/cl-meta-sbcl/Makefile
index 53a55357bb1a..4338a608eccc 100644
--- a/textproc/cl-meta-sbcl/Makefile
+++ b/textproc/cl-meta-sbcl/Makefile
@@ -6,32 +6,23 @@
 
 PORTNAME=	meta
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	textproc lisp
 MASTER_SITES=	ftp://ftp.linux.org.uk/pub/lisp/experimental/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
 		http://www-jcsu.jesus.cam.ac.uk/ftp/pub/cclan/
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-sbcl
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A parser generator for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/meta/meta.asd:${PORTSDIR}/textproc/cl-meta \
-		sbcl:${PORTSDIR}/lang/sbcl
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/meta/meta.asd:${PORTSDIR}/textproc/cl-meta \
-		sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:${PORTSDIR}/textproc/cl-meta
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:${PORTSDIR}/textproc/cl-meta
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	sbcl	--noinform --userinit /dev/null \
-		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
-		--eval "(asdf:oos 'asdf:compile-op :meta)" \
-		--eval "(quit)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/meta/sbclfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/meta/sbclfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	sbcl
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/textproc/cl-meta/Makefile b/textproc/cl-meta/Makefile
index fabcfdaebe1d..776deda75add 100644
--- a/textproc/cl-meta/Makefile
+++ b/textproc/cl-meta/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	meta
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	textproc lisp
 MASTER_SITES=	ftp://ftp.linux.org.uk/pub/lisp/experimental/cclan/ \
 		ftp://ftp.ntnu.no/pub/lisp/cclan/ \
@@ -16,23 +17,21 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A parser generator for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 NO_BUILD=	yes
-CL_LIBDIR=	${PREFIX}/lib/common-lisp
+
+USE_ASDF=	yes
 
 do-install:
-	@${MKDIR} ${CL_LIBDIR}/meta
-	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${CL_LIBDIR}/meta/
-	@${INSTALL_DATA} ${WRKSRC}/meta.asd ${CL_LIBDIR}/meta/
-	@${LN} -sf ${CL_LIBDIR}/meta/meta.asd ${CL_LIBDIR}/system-registry/meta.asd
+	@${MKDIR} ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/meta.asd ${ASDF_PATHNAME}
+	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/Prag-Parse.* ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/textproc/cl-ppcre-clisp/Makefile b/textproc/cl-ppcre-clisp/Makefile
index 38b57fcfe133..9f72054d5158 100644
--- a/textproc/cl-ppcre-clisp/Makefile
+++ b/textproc/cl-ppcre-clisp/Makefile
@@ -6,31 +6,20 @@
 
 PORTNAME=	cl-ppcre
 PORTVERSION=	0.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc lisp
 MASTER_SITES=	http://weitz.de/files/
-PKGNAMESUFFIX=	-clisp
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable Perl-Compatible Regular Expression for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	clisp	-q -ansi -norc \
-		-i ${LOCALBASE}/etc/asdf-init \
-		-x "(asdf:oos 'asdf:compile-op :cl-ppcre)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/cl-ppcre/clispfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/cl-ppcre/clispfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	clisp
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/textproc/cl-ppcre-sbcl/Makefile b/textproc/cl-ppcre-sbcl/Makefile
index fdb79d8b02de..8b22dd853f75 100644
--- a/textproc/cl-ppcre-sbcl/Makefile
+++ b/textproc/cl-ppcre-sbcl/Makefile
@@ -6,29 +6,20 @@
 
 PORTNAME=	cl-ppcre
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	textproc lisp
 MASTER_SITES=	http://weitz.de/files/
-PKGNAMESUFFIX=	-sbcl
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable Perl-Compatible Regular Expression for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre \
-		sbcl:${PORTSDIR}/lang/sbcl
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre \
-		sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	sbcl	--noinform --userinit /dev/null \
-		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
-		--eval "(asdf:oos 'asdf:compile-op :cl-ppcre)" \
-		--eval "(quit)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/cl-ppcre/sbclfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/cl-ppcre/sbclfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	sbcl
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/textproc/cl-ppcre/Makefile b/textproc/cl-ppcre/Makefile
index 0c61daaa7bf4..92cee86eb4f3 100644
--- a/textproc/cl-ppcre/Makefile
+++ b/textproc/cl-ppcre/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	cl-ppcre
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 CATEGORIES=	textproc lisp
 MASTER_SITES=	http://weitz.de/files/
 EXTRACT_SUFX=	.tgz
@@ -13,42 +14,35 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable Perl-Compatible Regular Expression for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
+NO_BUILD=	yes
 
-NO_BUILD=	yes # installs the sources only
-CL_LIBDIR=	${PREFIX}/lib/common-lisp
+USE_ASDF=	yes
 
 do-install:
-	@${MKDIR} ${CL_LIBDIR}/cl-ppcre
-
-	@${INSTALL_DATA} ${WRKSRC}/api.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/closures.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/convert.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/lexer.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/load.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/optimize.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/packages.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/parser.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/regex-class.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/repetition-closures.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/scanner.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/specials.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/util.lisp ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/cl-ppcre.asd ${CL_LIBDIR}/cl-ppcre/
-	@${INSTALL_DATA} ${WRKSRC}/cl-ppcre.system ${CL_LIBDIR}/cl-ppcre/
-
-	@${LN} -sf ${CL_LIBDIR}/cl-ppcre/cl-ppcre.asd ${CL_LIBDIR}/system-registry/cl-ppcre.asd
-	@${LN} -sf ${CL_LIBDIR}/cl-ppcre/cl-ppcre.system ${CL_LIBDIR}/system-registry/cl-ppcre.system
-
+	@${MKDIR} ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/api.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/closures.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/convert.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/lexer.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/load.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/optimize.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/packages.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/parser.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/regex-class.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/repetition-closures.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/scanner.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/specials.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/util.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/cl-ppcre.asd ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/cl-ppcre.system ${ASDF_PATHNAME}
+	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
+	@${LN} -sf ${ASDF_PATHNAME}/*.system ${ASDF_REGISTRY}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-
 	@${MKDIR} ${DOCSDIR}/doc
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/doc/
-
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/cl-ppcre-test.* ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/perltest.pl ${EXAMPLESDIR}
@@ -57,4 +51,5 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/testinput ${EXAMPLESDIR}
 .endif
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/www/cl-lml-clisp/Makefile b/www/cl-lml-clisp/Makefile
index be4c47b3e934..c9a769877026 100644
--- a/www/cl-lml-clisp/Makefile
+++ b/www/cl-lml-clisp/Makefile
@@ -6,31 +6,20 @@
 
 PORTNAME=	lml
 PORTVERSION=	2.5.7
+PORTREVISION=	1
 CATEGORIES=	www textproc
-MASTER_SITES=	http://files.b9.com/lml/
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-clisp
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Lisp Markup Language
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/system-registry/lml.asd:${PORTSDIR}/www/cl-lml \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/system-registry/lml.asd:${PORTSDIR}/www/cl-lml \
-		${LOCALBASE}/lib/common-lisp/asdf/clispfasl/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp \
-		clisp:${PORTSDIR}/lang/clisp
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:${PORTSDIR}/www/cl-lml
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:${PORTSDIR}/www/cl-lml
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	clisp	-q -ansi -norc \
-		-i ${LOCALBASE}/etc/asdf-init \
-		-x "(asdf:oos 'asdf:compile-op :lml)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/lml/clispfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/lml/clispfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	clisp
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/www/cl-lml-sbcl/Makefile b/www/cl-lml-sbcl/Makefile
index 1393b275145f..3e54a97a2369 100644
--- a/www/cl-lml-sbcl/Makefile
+++ b/www/cl-lml-sbcl/Makefile
@@ -6,30 +6,21 @@
 
 PORTNAME=	lml
 PORTVERSION=	2.5.7
+PORTREVISION=	1
 CATEGORIES=	www textproc
 MASTER_SITES=	http://files.b9.com/lml/
 PKGNAMEPREFIX=	cl-
-PKGNAMESUFFIX=	-sbcl
-DISTFILES=	# use installed sources from CL_LIBDIR
-EXTRACT_ONLY=	# use installed sources from CL_LIBDIR
+DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Lisp Markup Language
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/system-registry/lml.asd:${PORTSDIR}/www/cl-lml \
-		sbcl:${PORTSDIR}/lang/sbcl
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/system-registry/lml.asd:${PORTSDIR}/www/cl-lml \
-		sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:${PORTSDIR}/www/cl-lml
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/system-registry/lml.asd:${PORTSDIR}/www/cl-lml
 
-do-build:
-	@FBSD_ASDF_COMPILE_PORT=t WRKSRC=${WRKSRC}/ \
-	sbcl	--noinform --userinit /dev/null \
-		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
-		--eval "(asdf:oos 'asdf:compile-op :lml)" \
-		--eval "(quit)"
-
-do-install:
-	@${MKDIR} ${PREFIX}/lib/common-lisp/lml/sbclfasl
-	@${INSTALL_DATA} ${WRKSRC}/*.fasl ${PREFIX}/lib/common-lisp/lml/sbclfasl/
+USE_ASDF_FASL=	yes
+FASL_TARGET=	sbcl
+FASL_BUILD=	yes
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/www/cl-lml/Makefile b/www/cl-lml/Makefile
index 578e694a24f1..959532d79b78 100644
--- a/www/cl-lml/Makefile
+++ b/www/cl-lml/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	lml
 PORTVERSION=	2.5.7
+PORTREVISION=	1
 CATEGORIES=	www textproc
 MASTER_SITES=	http://files.b9.com/lml/ \
 		http://people.bsdgroup.de/~as/freebsd/distfiles/
@@ -14,22 +15,19 @@ PKGNAMEPREFIX=	cl-
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Lisp Markup Language
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
-RUN_DEPENDS=	${LOCALBASE}/lib/common-lisp/asdf/asdf.lisp:${PORTSDIR}/devel/cl-asdf
+NO_BUILD=	yes
 
-NO_BUILD=	yes # installs the sources only
-CL_LIBDIR=	${PREFIX}/lib/common-lisp
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+USE_ASDF=	yes
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	Makefile make.lisp readme.html readme.lml
 .endif
 
 do-install:
-	@${MKDIR} ${CL_LIBDIR}/lml
-	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${CL_LIBDIR}/lml
-	@${INSTALL_DATA} ${WRKSRC}/lml.asd ${CL_LIBDIR}/lml
-	@${LN} -sf ${CL_LIBDIR}/lml/lml.asd ${CL_LIBDIR}/system-registry/lml.asd
+	@${MKDIR} ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/*.lisp ${ASDF_PATHNAME}
+	@${INSTALL_DATA} ${WRKSRC}/lml.asd ${ASDF_PATHNAME}
+	@${LN} -sf ${ASDF_PATHNAME}/*.asd ${ASDF_REGISTRY}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${PORTDOCS}
@@ -37,4 +35,5 @@ do-install:
 .endfor
 .endif
 
+.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>