diff --git a/devel/cl-cffi/Makefile b/devel/cl-cffi/Makefile
index db1e4f12ec85..9dbfa30a0847 100644
--- a/devel/cl-cffi/Makefile
+++ b/devel/cl-cffi/Makefile
@@ -1,70 +1,100 @@
 PORTNAME=	cffi
-PORTVERSION=	0.16.1
+PORTVERSION=	0.24.1
 CATEGORIES=	devel lisp
-MASTER_SITES=	http://common-lisp.net/project/cffi/releases/:src \
-		http://olgeni.olgeni.com/~olgeni/cffi/${PORTVERSION}/:doc
+MASTER_SITES=	http://common-lisp.net/project/cffi/releases/
 PKGNAMEPREFIX=	cl-
 DISTNAME=	${PORTNAME}_${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
-		cffi-manual.html:doc \
-		cffi-manual.txt:doc \
-		cffi-manual.pdf:doc \
-		cffi-sys-spec.html:doc \
-		cffi-sys-spec.txt:doc \
-		cffi-sys-spec.pdf:doc
-DIST_SUBDIR=	cffi/${PORTVERSION}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable foreign function interface for Common Lisp
 WWW=		https://common-lisp.net/project/cffi/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 BUILD_DEPENDS=	cl-alexandria>=0:devel/cl-alexandria \
-		cl-trivial-features>=0:devel/cl-trivial-features \
-		cl-babel>=0:converters/cl-babel
+		cl-babel>=0:converters/cl-babel \
+		cl-trivial-features>=0:devel/cl-trivial-features
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
-
 USES=		cl
 USE_ASDF=	yes
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES PDF
+
+PDF_DESC=	Build and install PDF documentation
+
+DOCS_USES=	makeinfo
+
+PDF_IMPLIES=		DOCS
+PDF_BUILD_DEPENDS=	texi2pdf:print/texinfo
+PDF_USES=		tex
+PDF_USE=		TEX=dvipdfmx:build
+PDF_PLIST_FILES=	${DOCSDIR}/cffi-manual.pdf \
+			${DOCSDIR}/cffi-sys-spec.pdf
+
+DOCUMENTS=	cffi-manual cffi-sys-spec
+
+do-build:
+	@${DO_NADA}
+
+do-build-DOCS-on:
+.for FILE in ${DOCUMENTS}
+	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKEINFO} \
+		--html --no-split --css-include=style.css \
+		-o ${FILE}.html ${FILE}.texinfo
+	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKEINFO} \
+		--plaintext -o ${FILE}.txt ${FILE}.texinfo
+.endfor
+
+do-build-PDF-on:
+.for FILE in ${DOCUMENTS}
+	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} texi2pdf -q -o ${FILE}.pdf ${FILE}.texinfo
+.endfor
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}
-	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/src
-	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/grovel
-	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/uffi-compat
-	@${MKDIR} ${STAGEDIR}${ASDF_REGISTRY}
+	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/src/c2ffi \
+		${STAGEDIR}${ASDF_PATHNAME}/grovel \
+		${STAGEDIR}${ASDF_PATHNAME}/toolchain \
+		${STAGEDIR}${ASDF_PATHNAME}/uffi-compat \
+		${STAGEDIR}${ASDF_REGISTRY}
 	${INSTALL_DATA} ${WRKSRC}/src/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/src
-	${INSTALL_DATA} ${WRKSRC}/grovel/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/grovel
+	${INSTALL_DATA} ${WRKSRC}/src/c2ffi/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/src/c2ffi
+	${INSTALL_DATA} ${WRKSRC}/grovel/*.lisp ${WRKSRC}/grovel/common.h \
+		${STAGEDIR}${ASDF_PATHNAME}/grovel
+	${INSTALL_DATA} ${WRKSRC}/toolchain/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/toolchain
 	${INSTALL_DATA} ${WRKSRC}/uffi-compat/*.asd ${STAGEDIR}${ASDF_PATHNAME}/uffi-compat
 	${INSTALL_DATA} ${WRKSRC}/uffi-compat/*.lisp ${STAGEDIR}${ASDF_PATHNAME}/uffi-compat
 	${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}
+	${INSTALL_DATA} ${WRKSRC}/cffi-toolchain.asd ${STAGEDIR}${ASDF_PATHNAME}
 	${RLN} ${STAGEDIR}${ASDF_PATHNAME}/cffi.asd \
 		${STAGEDIR}${ASDF_PATHNAME}/cffi-uffi-compat.asd \
 		${STAGEDIR}${ASDF_PATHNAME}/cffi-grovel.asd \
+		${STAGEDIR}${ASDF_PATHNAME}/cffi-toolchain.asd \
 		${STAGEDIR}${ASDF_REGISTRY}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.for FILE in shareable-vectors.txt allegro-internals.txt mem-vector.txt
+.for FILE in allegro-internals.txt mem-vector.txt shareable-vectors.txt
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cffi-manual.html ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cffi-manual.txt ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cffi-manual.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cffi-sys-spec.html ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cffi-sys-spec.txt ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cffi-sys-spec.pdf ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+.for FILE in ${DOCUMENTS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${WRKSRC}/doc/${FILE}.txt \
+		${STAGEDIR}${DOCSDIR}
+.endfor
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/tests
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/tests/* ${STAGEDIR}${EXAMPLESDIR}/tests
 
+do-install-PDF-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for FILE in ${DOCUMENTS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.pdf ${STAGEDIR}${DOCSDIR}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/devel/cl-cffi/distinfo b/devel/cl-cffi/distinfo
index 60786ea98497..313ce2c3638e 100644
--- a/devel/cl-cffi/distinfo
+++ b/devel/cl-cffi/distinfo
@@ -1,14 +1,3 @@
-SHA256 (cffi/0.16.1/cffi_0.16.1.tar.gz) = 8c0d8ccef43c5cc8562b03f3c3020464578a7c92273cde1060e8d9d89c0ccb47
-SIZE (cffi/0.16.1/cffi_0.16.1.tar.gz) = 216037
-SHA256 (cffi/0.16.1/cffi-manual.html) = 7f9c3d9404584728f577ea41e571a2fe1a5793b84319f89a561dbfc0f7bba575
-SIZE (cffi/0.16.1/cffi-manual.html) = 467279
-SHA256 (cffi/0.16.1/cffi-manual.txt) = ca193ca22c625dfcb92ecc51c95334595be90b3aeb1378c622f7fda89b86aabd
-SIZE (cffi/0.16.1/cffi-manual.txt) = 187253
-SHA256 (cffi/0.16.1/cffi-manual.pdf) = 47f18794e6f44b0f59807a3eaa5f0508a0c8348c4be126336a6b30211da40839
-SIZE (cffi/0.16.1/cffi-manual.pdf) = 515157
-SHA256 (cffi/0.16.1/cffi-sys-spec.html) = 6a5ce436812943d59bd9de760305fa9f5c2853b36a5e9b7f0802ac53f13bb961
-SIZE (cffi/0.16.1/cffi-sys-spec.html) = 38024
-SHA256 (cffi/0.16.1/cffi-sys-spec.txt) = beca6e36e6dd7f5d48b5c764792658eea65f61877ded493d2a481426d0cab678
-SIZE (cffi/0.16.1/cffi-sys-spec.txt) = 14057
-SHA256 (cffi/0.16.1/cffi-sys-spec.pdf) = 722858be35a8d7a40e76f1e1440cfb6f8f487b5838218258ef4fed203e454af6
-SIZE (cffi/0.16.1/cffi-sys-spec.pdf) = 180520
+TIMESTAMP = 1787648740
+SHA256 (cffi_0.24.1.tar.gz) = 1023dc97baa0f4c8648c3039f6d147978b37a13310869d914b92469b335128c7
+SIZE (cffi_0.24.1.tar.gz) = 262118
diff --git a/devel/cl-cffi/pkg-plist b/devel/cl-cffi/pkg-plist
index dcfd848629ec..bd2fe28d977a 100644
--- a/devel/cl-cffi/pkg-plist
+++ b/devel/cl-cffi/pkg-plist
@@ -1,75 +1,91 @@
 lib/common-lisp/cffi/cffi-grovel.asd
+lib/common-lisp/cffi/cffi-toolchain.asd
 lib/common-lisp/cffi/cffi-uffi-compat.asd
 lib/common-lisp/cffi/cffi.asd
 lib/common-lisp/cffi/grovel/asdf.lisp
+lib/common-lisp/cffi/grovel/common.h
 lib/common-lisp/cffi/grovel/grovel.lisp
-lib/common-lisp/cffi/grovel/invoke.lisp
 lib/common-lisp/cffi/grovel/package.lisp
+lib/common-lisp/cffi/src/c2ffi/asdf.lisp
+lib/common-lisp/cffi/src/c2ffi/c2ffi.lisp
+lib/common-lisp/cffi/src/c2ffi/generator.lisp
+lib/common-lisp/cffi/src/c2ffi/package.lisp
 lib/common-lisp/cffi/src/cffi-abcl.lisp
 lib/common-lisp/cffi/src/cffi-allegro.lisp
+lib/common-lisp/cffi/src/cffi-clasp.lisp
 lib/common-lisp/cffi/src/cffi-clisp.lisp
 lib/common-lisp/cffi/src/cffi-cmucl.lisp
 lib/common-lisp/cffi/src/cffi-corman.lisp
 lib/common-lisp/cffi/src/cffi-ecl.lisp
 lib/common-lisp/cffi/src/cffi-gcl.lisp
 lib/common-lisp/cffi/src/cffi-lispworks.lisp
 lib/common-lisp/cffi/src/cffi-mcl.lisp
 lib/common-lisp/cffi/src/cffi-mkcl.lisp
 lib/common-lisp/cffi/src/cffi-openmcl.lisp
 lib/common-lisp/cffi/src/cffi-sbcl.lisp
 lib/common-lisp/cffi/src/cffi-scl.lisp
 lib/common-lisp/cffi/src/early-types.lisp
 lib/common-lisp/cffi/src/enum.lisp
 lib/common-lisp/cffi/src/features.lisp
 lib/common-lisp/cffi/src/foreign-vars.lisp
 lib/common-lisp/cffi/src/functions.lisp
 lib/common-lisp/cffi/src/libraries.lisp
 lib/common-lisp/cffi/src/package.lisp
 lib/common-lisp/cffi/src/strings.lisp
 lib/common-lisp/cffi/src/structures.lisp
 lib/common-lisp/cffi/src/types.lisp
 lib/common-lisp/cffi/src/utils.lisp
+lib/common-lisp/cffi/toolchain/bundle.lisp
+lib/common-lisp/cffi/toolchain/c-toolchain.lisp
+lib/common-lisp/cffi/toolchain/package.lisp
+lib/common-lisp/cffi/toolchain/static-link.lisp
 lib/common-lisp/cffi/uffi-compat/uffi-compat.lisp
 lib/common-lisp/cffi/uffi-compat/uffi.asd
 lib/common-lisp/system-registry/cffi-grovel.asd
+lib/common-lisp/system-registry/cffi-toolchain.asd
 lib/common-lisp/system-registry/cffi-uffi-compat.asd
 lib/common-lisp/system-registry/cffi.asd
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/allegro-internals.txt
 %%PORTDOCS%%%%DOCSDIR%%/cffi-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/cffi-manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/cffi-manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/cffi-sys-spec.html
-%%PORTDOCS%%%%DOCSDIR%%/cffi-sys-spec.pdf
 %%PORTDOCS%%%%DOCSDIR%%/cffi-sys-spec.txt
 %%PORTDOCS%%%%DOCSDIR%%/mem-vector.txt
 %%PORTDOCS%%%%DOCSDIR%%/shareable-vectors.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gethostname.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gettimeofday.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grovel-example.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/main-example.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mapping.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/package.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/run-examples.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/GNUmakefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/arrays.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/bindings.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/callbacks.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/compile.bat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/defcfun.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/enum.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/foreign-globals.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/fsbv.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/funcall.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/grovel.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/libfsbv.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/libtest.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/libtest2.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/memory.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/misc-types.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/misc.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/package.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/random-tester.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/run-tests.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/strings.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/struct.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/test-asdf.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/test-static-link.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/union.lisp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/translator-test.lisp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrapper-example.lisp