diff --git a/converters/cl-babel-sbcl/Makefile b/converters/cl-babel-sbcl/Makefile
index c2388cbd2201..3f6bcb043909 100644
--- a/converters/cl-babel-sbcl/Makefile
+++ b/converters/cl-babel-sbcl/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	babel
 PORTVERSION=	2010.01.16
-PORTREVISION=	70
+PORTREVISION=	71
 CATEGORIES=	converters lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Charset encoding/decoding library written in Common Lisp
 WWW=		https://www.cliki.net/Babel
 
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/babel/babel.asd:converters/cl-babel \
 		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/alexandria-1/arrays.fasl:devel/cl-alexandria-sbcl \
 		${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
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/babel/babel.asd:converters/cl-babel \
 		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/alexandria-1/arrays.fasl:devel/cl-alexandria-sbcl \
 		${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
 
 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>
diff --git a/devel/cl-alexandria-sbcl/Makefile b/devel/cl-alexandria-sbcl/Makefile
index f774d2c6dc33..b06e6c1aa4db 100644
--- a/devel/cl-alexandria-sbcl/Makefile
+++ b/devel/cl-alexandria-sbcl/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	alexandria
 PORTVERSION=	1.2
-PORTREVISION=	19
+PORTREVISION=	20
 PORTEPOCH=	1
 CATEGORIES=	devel lisp
 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
 
 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-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile
index aa3aff5c0afd..6ce161b4070d 100644
--- a/devel/cl-infix-sbcl/Makefile
+++ b/devel/cl-infix-sbcl/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	infix
 PORTVERSION=	19960628
-PORTREVISION=	74
+PORTREVISION=	75
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Lisp macro to read math statements in infix notation
 WWW=		https://www.cliki.net/infix
 
 # Converted from NO_CDROM
 LICENSE=	infix
 LICENSE_NAME=	infix
 LICENSE_TEXT=	No fees or compensation can be charged
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:devel/cl-infix
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:devel/cl-infix
 
 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-sbcl/Makefile b/devel/cl-port-sbcl/Makefile
index 8b00b66c9b6e..281b0b7124a8 100644
--- a/devel/cl-port-sbcl/Makefile
+++ b/devel/cl-port-sbcl/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	port
 PORTVERSION=	2002.10.02.1
-PORTREVISION=	72
+PORTREVISION=	73
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Cross-Lisp portability package
 WWW=		http://clocc.sourceforge.net
 
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:devel/cl-port
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:devel/cl-port
 
 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-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile
index d1964706ad67..2556eac83288 100644
--- a/devel/cl-split-sequence-sbcl/Makefile
+++ b/devel/cl-split-sequence-sbcl/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	split-sequence
 PORTVERSION=	20011114.1
-PORTREVISION=	71
+PORTREVISION=	72
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Partitioning Common Lisp sequences
 WWW=		https://www.cliki.net/SPLIT-SEQUENCE
 
 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
 
 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-trivial-features-sbcl/Makefile b/devel/cl-trivial-features-sbcl/Makefile
index 03351eb94ad0..f5fa2ee9a7e3 100644
--- a/devel/cl-trivial-features-sbcl/Makefile
+++ b/devel/cl-trivial-features-sbcl/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	trivial-features
 PORTVERSION=	2010.01.16
-PORTREVISION=	71
+PORTREVISION=	72
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Ensures consistent *FEATURES* in Common Lisp
 WWW=		https://www.cliki.net/trivial-features
 
 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
 
 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-trivial-gray-streams-sbcl/Makefile b/devel/cl-trivial-gray-streams-sbcl/Makefile
index fb08274135aa..9d47a46f1568 100644
--- a/devel/cl-trivial-gray-streams-sbcl/Makefile
+++ b/devel/cl-trivial-gray-streams-sbcl/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	trivial-gray-streams
 PORTVERSION=	2008.11.02
-PORTREVISION=	71
+PORTREVISION=	72
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Thin compatibility layer for Gray streams
 WWW=		https://www.cliki.net/trivial-gray-streams
 
 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
 
 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/math/maxima/Makefile b/math/maxima/Makefile
index 2da5a5910ed0..c9495a75f968 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -1,140 +1,140 @@
 PORTNAME=	maxima
 PORTVERSION=	5.46.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math lisp tk
 MASTER_SITES=	SF/maxima/Maxima-source/${PORTVERSION}-source
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	Symbolic mathematics program
 WWW=		http://maxima.sourceforge.net/
 
 LICENSE=	BSD3CLAUSE GPLv2 MAXIMAEXTRACLAUSE
 LICENSE_COMB=	multi
 LICENSE_NAME_MAXIMAEXTRACLAUSE=	Maxima extra clause
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSES/getopt-license.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 LICENSE_FILE_MAXIMAEXTRACLAUSE=	${FILESDIR}/license-extra-clause.txt
 LICENSE_PERMS_MAXIMAEXTRACLAUSE=	dist-mirror dist-sell pkg-mirror \
 					pkg-sell auto-accept
 
 RUN_DEPENDS=	gnuplot:math/gnuplot \
 		rlwrap:devel/rlwrap
 
 USES=		autoreconf gmake makeinfo shared-mime-info
 
 GNU_CONFIGURE=	yes
 
 TEST_TARGET=	check
 
 INFO=		imaxima maxima xmaxima abs_integrate drawutils kovacicODE logic \
 		symplectic_ode
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DOCS EXAMPLES MANPAGES NOUSERINIT SAGE TEST XMAXIMA
 OPTIONS_DEFAULT=	ECL MANPAGES NOUSERINIT SAGE TEST XMAXIMA
 OPTIONS_SINGLE=		LISP
 OPTIONS_SINGLE_LISP=	CCL ECL SBCL
 
 OPTIONS_SUB=	yes
 
 CCL_DESC=		Build with Clozure Common Lisp
 ECL_DESC=		Build with Embedabble Common Lisp
 NOUSERINIT_DESC=	Do not load user init file for lisp (only for sbcl)
 SAGE_DESC=		Build with patches from Sage (implies ECL)
 SBCL_DESC=		Build with Steel Bank Common Lisp
 XMAXIMA_DESC=		Install xmaxima (implies DOCS and TEST)
 
 CCL_BUILD_DEPENDS=	ccl:lang/ccl
 CCL_RUN_DEPENDS=	ccl:lang/ccl
 CCL_CONFIGURE_ON=	--with-ccl=ccl
 CCL_PLIST_SUB=		BINDIR=binary-openmcl \
 			BINNAME=maxima.image
 CCL_VARS=		NO_ARCH=yes
 
 ECL_BUILD_DEPENDS=	ecl:lang/ecl
 ECL_LIB_DEPENDS=	libffi.so:devel/libffi \
 			libgc-threaded.so:devel/boehm-gc-threaded \
 			libgc.so:devel/boehm-gc \
 			libgmp.so:math/gmp
 ECL_RUN_DEPENDS=	ecl:lang/ecl
 # libgc-threaded.so is really only used when ecl is built with THREADS on,
 # which is the default. See https://reviews.freebsd.org/D24959 for more
 # details.
 ECL_CONFIGURE_ON=	--with-ecl=ecl
 ECL_PLIST_SUB=		BINDIR=binary-ecl \
 			BINNAME=maxima
 
 NOUSERINIT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nouserinit-src_maxima.in
 
 SAGE_IMPLIES=		ECL
 SAGE_BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 SAGE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-share_linearalgebra_matrixexp.lisp \
 			${PATCHDIR}/extra-patch-src_grind.lisp \
 			${PATCHDIR}/extra-patch-src_hayat.lisp \
 			${PATCHDIR}/extra-patch-src_init-cl.lisp
 
 SBCL_BUILD_DEPENDS=	sbcl:lang/sbcl
 SBCL_RUN_DEPENDS=	sbcl:lang/sbcl
 SBCL_CONFIGURE_ON=	--enable-sbcl
 SBCL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-sbcl-src_maxima.in
 SBCL_PLIST_SUB=		BINDIR=binary-sbcl \
 			BINNAME=maxima_core
 SBCL_VARS=		NO_ARCH=yes
 
 TEST_BUILD_DEPENDS=	gnuplot:math/gnuplot \
 			rlwrap:devel/rlwrap
 
 XMAXIMA_IMPLIES=		DOCS TEST
 XMAXIMA_USES=			tk
 XMAXIMA_CONFIGURE_WITH=		wish=${WISH}
 XMAXIMA_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-interfaces_Makefile.am
 
 post-patch:
 	${GREP} -Fe '.core' -l -r ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} 's;\.core;_core;g'
 	${REINPLACE_CMD} "s;tclsh;${TCLSH};g" ${WRKSRC}/interfaces/xmaxima/Makefile.in
 	${REINPLACE_CMD} "s;/usr;${LOCALBASE};g" ${WRKSRC}/src/intl.lisp
 
 post-patch-TEST-off:
 	${REINPLACE_CMD} 's;tests;;' ${WRKSRC}/Makefile.am
 
 post-patch-XMAXIMA-on:
 	${REINPLACE_CMD} "s;%%DOCSDIR%%;/${DOCSDIR:S,/, ,g};" \
 	${WRKSRC}/interfaces/xmaxima/Tkmaxima/Paths.tcl
 
 post-configure:
 	${REINPLACE_CMD} '/ld-flags/s|" |"|' ${WRKSRC}/src/autoconf-variables.lisp
 	${REINPLACE_CMD} '/ld-flags/s| ")|")|' ${WRKSRC}/src/autoconf-variables.lisp
 
 pre-build-CCL-on:
 	cd ${WRKSRC}/src/ && ${MKDIR} binary-ccl && ${LN} -s binary-ccl binary-openmcl
 
 post-build-MANPAGES-on:
 	${GZIP_CMD} ${WRKSRC}/doc/man/maxima.1
 
 post-install:
 	for x in "" "-1" "-2" "-3"; do ${INSTALL_MAN} ${WRKSRC}/doc/info/maxima.info$$x ${STAGEDIR}${PREFIX}/${INFO_PATH}; done
 	${INSTALL_MAN} ${WRKSRC}/doc/info/maxima-index.lisp ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/info && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} '-name maxima*\.html'
 
 post-install-ECL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/ecl
 	${INSTALL_LIB} ${WRKSRC}/src/binary-ecl/maxima.fas \
 		${STAGEDIR}${PREFIX}/lib/ecl
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/maxima/${PORTVERSION}/binary-ecl/maxima
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} '-name *\.dem'
 
 post-install-MANPAGES-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/man/man1 && \
 	${INSTALL_MAN} ${WRKSRC}/doc/man/maxima.1.gz ${STAGEDIR}${PREFIX}/man/man1/maxima.1.gz
 
 .include <bsd.port.mk>
diff --git a/security/cl-md5-sbcl/Makefile b/security/cl-md5-sbcl/Makefile
index 2d0721479698..6247c9429b24 100644
--- a/security/cl-md5-sbcl/Makefile
+++ b/security/cl-md5-sbcl/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	md5
 PORTVERSION=	1.8.5
-PORTREVISION=	71
+PORTREVISION=	72
 CATEGORIES=	security lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Native MD5 implementation in Common Lisp
 WWW=		https://www.cliki.net/MD5
 
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/md5/md5.asd:security/cl-md5
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/md5/md5.asd:security/cl-md5
 
 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-sbcl/Makefile b/textproc/cl-meta-sbcl/Makefile
index eca1c04a62fb..03c4f68fd54e 100644
--- a/textproc/cl-meta-sbcl/Makefile
+++ b/textproc/cl-meta-sbcl/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	meta
 PORTVERSION=	0.1
-PORTREVISION=	72
+PORTREVISION=	73
 PORTEPOCH=	1
 CATEGORIES=	textproc lisp
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Parser generator for Common Lisp
 WWW=		http://home.pipeline.com/~hbaker1/Prag-Parse.html
 
 BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:textproc/cl-meta
 RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:textproc/cl-meta
 
 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-sbcl/Makefile b/textproc/cl-ppcre-sbcl/Makefile
index 72cdce4ebc41..1490f7dffccf 100644
--- a/textproc/cl-ppcre-sbcl/Makefile
+++ b/textproc/cl-ppcre-sbcl/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	cl-ppcre
 PORTVERSION=	2.1.1
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	textproc lisp
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable Perl-Compatible Regular Expression for Common Lisp
 WWW=		http://www.weitz.de/cl-ppcre/
 
 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
 
 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-sbcl/Makefile b/www/cl-lml-sbcl/Makefile
index 70804c0f907b..f54fef45092f 100644
--- a/www/cl-lml-sbcl/Makefile
+++ b/www/cl-lml-sbcl/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	lml
 PORTVERSION=	2.5.7
-PORTREVISION=	69
+PORTREVISION=	70
 CATEGORIES=	www textproc
 PKGNAMEPREFIX=	cl-
 DISTFILES=	# none
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Lisp Markup Language
 WWW=		http://lml.b9.com/
 
 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
 
 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/x11-wm/stumpwm/Makefile b/x11-wm/stumpwm/Makefile
index c17a59f163a1..2d9184690ee7 100644
--- a/x11-wm/stumpwm/Makefile
+++ b/x11-wm/stumpwm/Makefile
@@ -1,94 +1,95 @@
 PORTNAME=	stumpwm
 DISTVERSION=	22.05-157
 DISTVERSIONSUFFIX=	-g740e945
+PORTREVISION=	1
 CATEGORIES=	x11-wm lisp
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Tiling, keyboard driven Window Manager written in Common Lisp
 WWW=		https://www.nongnu.org/stumpwm/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	cl-alexandria>=0:devel/cl-alexandria \
 		cl-alexandria-sbcl>=0:devel/cl-alexandria-sbcl \
 		cl-clx>=0:x11/cl-clx \
 		cl-clx-sbcl>=0:x11/cl-clx-sbcl \
 		cl-ppcre>=0:textproc/cl-ppcre \
 		cl-ppcre-sbcl>=0:textproc/cl-ppcre-sbcl \
 		texinfo>=0:print/texinfo
 RUN_DEPENDS=	cl-alexandria>=0:devel/cl-alexandria \
 		cl-alexandria-sbcl>=0:devel/cl-alexandria-sbcl \
 		cl-clx>=0:x11/cl-clx \
 		cl-clx-sbcl>=0:x11/cl-clx-sbcl \
 		cl-ppcre>=0:textproc/cl-ppcre \
 		cl-ppcre-sbcl>=0:textproc/cl-ppcre-sbcl
 
 USE_GITHUB=	yes
 USE_SBCL=	yes
 
 SUB_FILES=	stumpwm
 SUB_LIST=	ASDF_REGISTRY=${ASDF_REGISTRY} \
 		SBCL=${SBCL}
 
 INFO=		${PORTNAME}
 PLIST_SUB=	ASDF_PATHNAME="${ASDF_PATHNAME:S,^${PREFIX}/,,}" \
 		ASDF_REGISTRY="${ASDF_REGISTRY:S,^${PREFIX}/,,}"
 PORTDOCS=	AUTHORS COPYING HACKING NEWS README.md
 PORTEXAMPLES=	sample-stumpwmrc.lisp
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${CP} ${WRKSRC}/load-stumpwm.lisp.in ${WRKSRC}/load-stumpwm.lisp
 	@${REINPLACE_CMD} -e 's|@STUMPWM_ASDF_DIR@|${ASDF_PATHNAME}|' \
 		${WRKSRC}/load-stumpwm.lisp
 	${CP} ${WRKSRC}/make-image.lisp.in ${WRKSRC}/make-image.lisp
 	@${REINPLACE_CMD} -e 's|@MODULE_DIR@|${DATADIR}|' \
 		${WRKSRC}/make-image.lisp
 
 do-build:
 	(cd ${WRKSRC} && \
 		CL_SOURCE_REGISTRY="${WRKSRC}" \
 		ASDF_OUTPUT_TRANSLATIONS="/:" \
 		FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
 		${SBCL} \
 		--noinform --non-interactive --no-sysinit --no-userinit \
 		--eval "(setf sb-impl::*default-external-format* :UTF-8)" \
 		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
 		--eval "(asdf:oos 'asdf:compile-op :${PORTNAME} :force t)" \
 		--eval '(load "load-stumpwm.lisp")' \
 		--eval '(load "manual.lisp")' \
 		--eval '(stumpwm::generate-manual)' \
 		--eval '(sb-ext:quit)' && \
 		makeinfo stumpwm.texi)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/dynamic-mixins/src \
 		${STAGEDIR}${ASDF_PATHNAME}/sbclfasl/dynamic-mixins/src \
 		${STAGEDIR}${ASDF_REGISTRY}
 	${INSTALL_SCRIPT} ${WRKDIR}/stumpwm ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/.dir-locals.el ${WRKSRC}/${PORTNAME}.asd \
 		${WRKSRC}/*.lisp ${STAGEDIR}${ASDF_PATHNAME}
 	 ${INSTALL_DATA} ${WRKSRC}/dynamic-mixins/dynamic-mixins.asd \
 		${STAGEDIR}${ASDF_PATHNAME}/dynamic-mixins/
 	${INSTALL_DATA} ${WRKSRC}/dynamic-mixins/src/*.lisp \
 		${STAGEDIR}${ASDF_PATHNAME}/dynamic-mixins/src/
 	${INSTALL_DATA} ${WRKSRC}/*.fasl ${STAGEDIR}${ASDF_PATHNAME}/sbclfasl
 	${INSTALL_DATA} ${WRKSRC}/dynamic-mixins/src/*.fasl \
 		${STAGEDIR}${ASDF_PATHNAME}/sbclfasl/dynamic-mixins/src
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}.asd \
 		${STAGEDIR}${ASDF_REGISTRY}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}/${EXAMPLESDIR}
 
 .include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
diff --git a/x11/cl-clx-sbcl/Makefile b/x11/cl-clx-sbcl/Makefile
index 4c5bed7ddd8d..793bd310c56a 100644
--- a/x11/cl-clx-sbcl/Makefile
+++ b/x11/cl-clx-sbcl/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	clx
 DISTVERSION=	0.7.5.65
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	x11 lisp
 PKGNAMEPREFIX=	cl-
 PKGNAMESUFFIX=	-sbcl
 DISTFILES=	# none
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	X11 client library for Common Lisp
 WWW=		https://www.cliki.net/CLX
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}${PORTNAME}>=0:x11/${PKGNAMEPREFIX}${PORTNAME}
 RUN_DEPENDS=	${PKGNAMEPREFIX}${PORTNAME}>=0:x11/${PKGNAMEPREFIX}${PORTNAME}
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
 FASL_BUILD=	yes
 
 .include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>