Index: devel/cl-asdf/Makefile
===================================================================
--- devel/cl-asdf/Makefile
+++ devel/cl-asdf/Makefile
@@ -1,32 +1,37 @@
 PORTNAME=	asdf
-DISTVERSION=	3.3.4.7
+DISTVERSION=	3.3.6
 PORTEPOCH=	2
 CATEGORIES=	devel lisp
+MASTER_SITES=	https://asdf.common-lisp.dev/archives/
 PKGNAMEPREFIX=	cl-
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	System definition facility for Common Lisp
-WWW=		https://www.cliki.net/asdf
+WWW=		https://common-lisp.net/project/asdf/
 
 LICENSE=	MIT
 
-USES=		gmake
-USE_GITLAB=	yes
-GL_SITE=	https://gitlab.common-lisp.net
-GL_COMMIT=	a58828745a610c1af841a86587ba197707c89eb3
-
-ALL_TARGET=	build/asdf.lisp
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS
 
+do-build:
+	(cd ${WRKSRC} && /bin/sh make-asdf.sh build_asdf)
+
 do-install:
-	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}
-	@${MKDIR} ${STAGEDIR}${ASDF_REGISTRY}
+	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} \
+		${STAGEDIR}${ASDF_PATHNAME}/contrib \
+		${STAGEDIR}${ASDF_PATHNAME}/uiop \
+		${STAGEDIR}${ASDF_REGISTRY}
+	${INSTALL_DATA} ${WRKSRC}/*.lisp ${STAGEDIR}${ASDF_PATHNAME}
 	${INSTALL_DATA} ${WRKSRC}/build/asdf.lisp ${STAGEDIR}${ASDF_PATHNAME}
-	${INSTALL_DATA} ${WRKSRC}/*.asd ${STAGEDIR}${ASDF_PATHNAME}
+	${INSTALL_DATA} ${WRKSRC}/contrib/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/contrib
+	${INSTALL_DATA} ${WRKSRC}/uiop/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/uiop
+	${INSTALL_DATA} ${WRKSRC}/version.lisp-expr ${STAGEDIR}${ASDF_PATHNAME}
+	${INSTALL_DATA} ${WRKSRC}/asdf.asd ${STAGEDIR}${ASDF_PATHNAME}
+	${INSTALL_DATA} ${WRKSRC}/uiop/uiop.asd ${STAGEDIR}${ASDF_PATHNAME}/uiop
 	${RLN} ${STAGEDIR}${ASDF_PATHNAME}/asdf.asd ${STAGEDIR}${ASDF_REGISTRY}
-	${SED}	-i '' -e 's|%%PREFIX%%|${PREFIX}|' ${STAGEDIR}${ASDF_PATHNAME}/asdf.lisp
+	${RLN} ${STAGEDIR}${ASDF_PATHNAME}/uiop/uiop.asd ${STAGEDIR}${ASDF_REGISTRY}
 	${SED}	-e 's|%%ASDF_PATHNAME%%|${ASDF_PATHNAME}/asdf|' \
 		-e 's|%%ASDF_REGISTRY%%|${ASDF_REGISTRY}|' \
 		-e 's|%%PREFIX%%|${PREFIX}|' \
@@ -35,7 +40,8 @@
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	(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/distinfo
===================================================================
--- devel/cl-asdf/distinfo
+++ devel/cl-asdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617890452
-SHA256 (asdf-asdf-a58828745a610c1af841a86587ba197707c89eb3_GL0.tar.gz) = 4bc15cf1d0fbff629b2d1dae46e695fdf5fe3044832a277ea3f1af5fc7c16623
-SIZE (asdf-asdf-a58828745a610c1af841a86587ba197707c89eb3_GL0.tar.gz) = 514937
+TIMESTAMP = 1670368665
+SHA256 (asdf-3.3.6.tar.gz) = 3648ef3652ea2670407cec42f44093b66b92e4afb4bf96573b0db1b7c97bbe09
+SIZE (asdf-3.3.6.tar.gz) = 526034
Index: devel/cl-asdf/files/asdf-init.lisp
===================================================================
--- devel/cl-asdf/files/asdf-init.lisp
+++ devel/cl-asdf/files/asdf-init.lisp
@@ -36,22 +36,22 @@
 ;; This file takes all necessary actions. The easiest way is to load
 ;; it in your Lisp every time it starts, by putting
 ;;
-;;  (load "/usr/local/etc/asdf-init.lisp")
+;;  (load "%%PREFIX%%/etc/asdf-init.lisp")
 ;;
 ;; in your init file.
 ;;
 ;; Each Lisp implementation has its own files where this can be done:
 ;;
 ;; CLISP:
-;;   /usr/local/lib/clisp/config.lisp
+;;   %%PREFIX%%/lib/clisp/config.lisp
 ;;   ~/.clisprc
 ;;
 ;; CMUCL:
-;;   /usr/local/lib/cmucl/lib/cmucl/lib/site-init.lisp
+;;   %%PREFIX%%/lib/cmucl/lib/cmucl/lib/site-init.lisp
 ;;   ~/.cmucl-init.lisp
 ;;
 ;; SBCL:
-;;   /usr/local/etc/sbclrc
+;;   %%PREFIX%%/etc/sbclrc
 ;;   ~/.sbclrc
 ;;
 ;; CLOZURE CL / OPENMCL:
@@ -71,7 +71,7 @@
 ;; We mess around with asdf:output-files in interesting ways to
 ;; enforce a filesystem layout that works without multiple Lisp
 ;; implementations overwriting their fasls. Basically, each lib has
-;; its own directory in /usr/local/lib/common-lisp, initially
+;; its own directory in %%PREFIX%%/lib/common-lisp, initially
 ;; containing its sources. Each fasl port will create an
 ;; implementation-specific subdirectory where all its fasls go, for
 ;; example ./cmuclfasl, ./clispfasl etc.
@@ -129,16 +129,11 @@
 ;;;; Paths
 
 (defvar *asdf-pathname*
-  ;; Clozure CL's internal asdf
-  #+openmcl "/usr/local/lib/ccl/tools/asdf"
-  ;; SBCL's internal asdf
-  #+sbcl "/usr/local/lib/sbcl/asdf/asdf"
-  ;; CMU and clisp
-  #-(or openmcl sbcl) "/usr/local/lib/common-lisp/asdf/asdf"
+  "%%ASDF_PATHNAME%%"
   "Path of the ASDF library")
 
 (defvar *system-registry*
-  "/usr/local/lib/common-lisp/system-registry/"
+  "%%ASDF_REGISTRY%%/"
   "FreeBSD's contribution to the central registry for ASDF system
 definitions.  This will be added to asdf:*central-registry*, you
 should modify that in order to add other directories.")
@@ -225,7 +220,7 @@
 
 (pushnew :inherit-configuration *freebsd-output-translations*)
 
-(dolist (path (directory "/usr/local/lib/common-lisp/*/"))
+(dolist (path (directory "%%PREFIX%%/lib/common-lisp/*/"))
   (let ((source (make-pathname
                  :directory (append (pathname-directory path)
                                     (list :wild-inferiors))))
@@ -242,7 +237,7 @@
       ;; If we are building a FreeBSD port, all the compiled fasl files
       ;; should be redirected to WRKSRC.
       (let ((source (make-pathname
-		     :directory (append (pathname-directory #P"/usr/local/lib/common-lisp/")
+		     :directory (append (pathname-directory #P"%%PREFIX%%/lib/common-lisp/")
 					(list portname :wild-inferiors))))
             (target (make-pathname
 		     :directory (append (pathname-directory wrksrc)
Index: devel/cl-asdf/pkg-plist
===================================================================
--- devel/cl-asdf/pkg-plist
+++ devel/cl-asdf/pkg-plist
@@ -1,5 +1,75 @@
 @sample etc/asdf-init.lisp.default etc/asdf-init.lisp
-%%LIB32DIR%%/common-lisp/asdf/asdf.asd
-%%LIB32DIR%%/common-lisp/asdf/asdf.lisp
-%%LIB32DIR%%/common-lisp/system-registry/asdf.asd
-%%PORTDOCS%%%%DOCSDIR%%/README.md
+lib/common-lisp/asdf/action.lisp
+lib/common-lisp/asdf/asdf.asd
+lib/common-lisp/asdf/asdf.lisp
+lib/common-lisp/asdf/backward-interface.lisp
+lib/common-lisp/asdf/backward-internals.lisp
+lib/common-lisp/asdf/bundle.lisp
+lib/common-lisp/asdf/component.lisp
+lib/common-lisp/asdf/concatenate-source.lisp
+lib/common-lisp/asdf/contrib/debug-plan.lisp
+lib/common-lisp/asdf/contrib/debug.lisp
+lib/common-lisp/asdf/contrib/detect-multiply-used-files.lisp
+lib/common-lisp/asdf/contrib/fasl-op.lisp
+lib/common-lisp/asdf/contrib/fast-compile-op.lisp
+lib/common-lisp/asdf/contrib/wild-modules.lisp
+lib/common-lisp/asdf/find-component.lisp
+lib/common-lisp/asdf/find-system.lisp
+lib/common-lisp/asdf/footer.lisp
+lib/common-lisp/asdf/forcing.lisp
+lib/common-lisp/asdf/header.lisp
+lib/common-lisp/asdf/interface.lisp
+lib/common-lisp/asdf/lisp-action.lisp
+lib/common-lisp/asdf/operate.lisp
+lib/common-lisp/asdf/operation.lisp
+lib/common-lisp/asdf/output-translations.lisp
+lib/common-lisp/asdf/package-inferred-system.lisp
+lib/common-lisp/asdf/parse-defsystem.lisp
+lib/common-lisp/asdf/plan.lisp
+lib/common-lisp/asdf/session.lisp
+lib/common-lisp/asdf/source-registry.lisp
+lib/common-lisp/asdf/system-registry.lisp
+lib/common-lisp/asdf/system.lisp
+lib/common-lisp/asdf/uiop/backward-driver.lisp
+lib/common-lisp/asdf/uiop/common-lisp.lisp
+lib/common-lisp/asdf/uiop/configuration.lisp
+lib/common-lisp/asdf/uiop/driver.lisp
+lib/common-lisp/asdf/uiop/filesystem.lisp
+lib/common-lisp/asdf/uiop/image.lisp
+lib/common-lisp/asdf/uiop/launch-program.lisp
+lib/common-lisp/asdf/uiop/lisp-build.lisp
+lib/common-lisp/asdf/uiop/os.lisp
+lib/common-lisp/asdf/uiop/package.lisp
+lib/common-lisp/asdf/uiop/pathname.lisp
+lib/common-lisp/asdf/uiop/run-program.lisp
+lib/common-lisp/asdf/uiop/stream.lisp
+lib/common-lisp/asdf/uiop/uiop.asd
+lib/common-lisp/asdf/uiop/utility.lisp
+lib/common-lisp/asdf/uiop/version.lisp
+lib/common-lisp/asdf/upgrade.lisp
+lib/common-lisp/asdf/user.lisp
+lib/common-lisp/asdf/version.lisp-expr
+lib/common-lisp/system-registry/asdf.asd
+lib/common-lisp/system-registry/uiop.asd
+%%PORTDOCS%%%%DOCSDIR%%/asdf.texinfo
+%%PORTDOCS%%%%DOCSDIR%%/best_practices.md
+%%PORTDOCS%%%%DOCSDIR%%/cclan.png
+%%PORTDOCS%%%%DOCSDIR%%/exported-functions
+%%PORTDOCS%%%%DOCSDIR%%/exported-non-function-names
+%%PORTDOCS%%%%DOCSDIR%%/favicon.ico
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lisp-logo120x80.png
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.1.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.1.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.1.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.2.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.2.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.3.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.3.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.3.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.3.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.3.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.3.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-emails/asdf-3.3.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/undocumented-functions