Index: devel/cl-alexandria-sbcl/Makefile
===================================================================
--- devel/cl-alexandria-sbcl/Makefile
+++ devel/cl-alexandria-sbcl/Makefile
@@ -1,12 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	alexandria
-PORTVERSION=	2010.01.16
-PORTREVISION=	51
+PORTVERSION=	1.2
+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
 
Index: devel/cl-alexandria/Makefile
===================================================================
--- devel/cl-alexandria/Makefile
+++ devel/cl-alexandria/Makefile
@@ -1,28 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	alexandria
-PORTVERSION=	2010.01.16
-PORTREVISION=	3
+DISTVERSION=	1.2
+PORTEPOCH=	1
 CATEGORIES=	devel lisp
 PKGNAMEPREFIX=	cl-
-MASTER_SITES=	LOCAL/olgeni
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Collection of portable public domain utilities for Common Lisp
 
-NO_BUILD=	yes
+LICENSE=	PD
+LICENSE_FILE=	${WRKSRC}/LICENCE
 
 USE_ASDF=	yes
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.common-lisp.net
+GL_COMMIT=	f35e232ceb2ada8d10e7fdf27ccac07f781eea0e
 
-OPTIONS_DEFINE=	DOCS
+NO_BUILD=	yes
 
 do-install:
-	@${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}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/alexandria.pdf ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-1 \
+		${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-2 \
+		${STAGEDIR}${ASDF_REGISTRY}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-1/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-1
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-2/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-2
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.asd ${STAGEDIR}${ASDF_PATHNAME}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-tests.asd ${STAGEDIR}${ASDF_PATHNAME}
+	${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}.asd ${STAGEDIR}${ASDF_REGISTRY}
+	${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}-tests.asd ${STAGEDIR}${ASDF_REGISTRY}
 
 .include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk"
 .include <bsd.port.mk>
Index: devel/cl-alexandria/distinfo
===================================================================
--- devel/cl-alexandria/distinfo
+++ devel/cl-alexandria/distinfo
@@ -1,2 +1,3 @@
-SHA256 (alexandria-2010.01.16.tar.gz) = 021953e995f99aa15606d964fdf5c0880817429715b40f72bf0c2b34b86ebb08
-SIZE (alexandria-2010.01.16.tar.gz) = 107839
+TIMESTAMP = 1607376342
+SHA256 (alexandria-alexandria-f35e232ceb2ada8d10e7fdf27ccac07f781eea0e_GL0.tar.gz) = d235dc3a110eb844440e8b008172ca09752446d238095369fda14bdb7089b17c
+SIZE (alexandria-alexandria-f35e232ceb2ada8d10e7fdf27ccac07f781eea0e_GL0.tar.gz) = 56512
Index: devel/cl-alexandria/pkg-plist
===================================================================
--- devel/cl-alexandria/pkg-plist
+++ devel/cl-alexandria/pkg-plist
@@ -1,21 +1,27 @@
-%%LIB32DIR%%/common-lisp/alexandria/alexandria.asd
-%%LIB32DIR%%/common-lisp/alexandria/arrays.lisp
-%%LIB32DIR%%/common-lisp/alexandria/binding.lisp
-%%LIB32DIR%%/common-lisp/alexandria/conditions.lisp
-%%LIB32DIR%%/common-lisp/alexandria/control-flow.lisp
-%%LIB32DIR%%/common-lisp/alexandria/definitions.lisp
-%%LIB32DIR%%/common-lisp/alexandria/features.lisp
-%%LIB32DIR%%/common-lisp/alexandria/functions.lisp
-%%LIB32DIR%%/common-lisp/alexandria/hash-tables.lisp
-%%LIB32DIR%%/common-lisp/alexandria/io.lisp
-%%LIB32DIR%%/common-lisp/alexandria/lists.lisp
-%%LIB32DIR%%/common-lisp/alexandria/macros.lisp
-%%LIB32DIR%%/common-lisp/alexandria/numbers.lisp
-%%LIB32DIR%%/common-lisp/alexandria/package.lisp
-%%LIB32DIR%%/common-lisp/alexandria/sequences.lisp
-%%LIB32DIR%%/common-lisp/alexandria/strings.lisp
-%%LIB32DIR%%/common-lisp/alexandria/symbols.lisp
-%%LIB32DIR%%/common-lisp/alexandria/tests.lisp
-%%LIB32DIR%%/common-lisp/alexandria/types.lisp
-%%LIB32DIR%%/common-lisp/system-registry/alexandria.asd
-%%PORTDOCS%%%%DOCSDIR%%/alexandria.pdf
+lib/common-lisp/alexandria/alexandria-1/arrays.lisp
+lib/common-lisp/alexandria/alexandria-1/binding.lisp
+lib/common-lisp/alexandria/alexandria-1/conditions.lisp
+lib/common-lisp/alexandria/alexandria-1/control-flow.lisp
+lib/common-lisp/alexandria/alexandria-1/definitions.lisp
+lib/common-lisp/alexandria/alexandria-1/features.lisp
+lib/common-lisp/alexandria/alexandria-1/functions.lisp
+lib/common-lisp/alexandria/alexandria-1/hash-tables.lisp
+lib/common-lisp/alexandria/alexandria-1/io.lisp
+lib/common-lisp/alexandria/alexandria-1/lists.lisp
+lib/common-lisp/alexandria/alexandria-1/macros.lisp
+lib/common-lisp/alexandria/alexandria-1/numbers.lisp
+lib/common-lisp/alexandria/alexandria-1/package.lisp
+lib/common-lisp/alexandria/alexandria-1/sequences.lisp
+lib/common-lisp/alexandria/alexandria-1/strings.lisp
+lib/common-lisp/alexandria/alexandria-1/symbols.lisp
+lib/common-lisp/alexandria/alexandria-1/tests.lisp
+lib/common-lisp/alexandria/alexandria-1/types.lisp
+lib/common-lisp/alexandria/alexandria-2/control-flow.lisp
+lib/common-lisp/alexandria/alexandria-2/lists.lisp
+lib/common-lisp/alexandria/alexandria-2/package.lisp
+lib/common-lisp/alexandria/alexandria-2/sequences.lisp
+lib/common-lisp/alexandria/alexandria-2/tests.lisp
+lib/common-lisp/alexandria/alexandria-tests.asd
+lib/common-lisp/alexandria/alexandria.asd
+lib/common-lisp/system-registry/alexandria-tests.asd
+lib/common-lisp/system-registry/alexandria.asd