diff --git a/Keywords/fcfontsdir.ucl b/Keywords/fcfontsdir.ucl
deleted file mode 100644
index 81f9d4e716ab..000000000000
--- a/Keywords/fcfontsdir.ucl
+++ /dev/null
@@ -1,27 +0,0 @@
-# MAINTAINER: x11@FreeBSD.org
-
-actions: [dir]
-post-install: <<EOD
-  case "%@" in
-  /*) fontsdir="%@" ;;
-  *) fontsdir="%D/%@" ;;
-  esac
-  fc-cache -fs ${fontsdir} 2>/dev/null || true
-  mkfontscale ${fontsdir} 2>/dev/null || true
-  mkfontdir ${fontsdir} 2>/dev/null || true
-EOD
-post-deinstall: <<EOD
-  case "%@" in
-  /*) fontsdir="%@" ;;
-  *) fontsdir="%D/%@" ;;
-  esac
-  fc-cache -fs ${fontsdir} 2>/dev/null || true
-  mkfontscale ${fontsdir} 2>/dev/null || true
-  if [ -e ${fontsdir}/fonts.scale -a "`stat -f '%%z' ${fontsdir}/fonts.scale 2>/dev/null`" = '2' ]; then
-    rm ${fontsdir}/fonts.scale
-  fi
-  mkfontdir ${fontsdir} 2>/dev/null || true
-  if [ -e ${fontsdir}/fonts.dir -a "`stat -f '%%z' ${fontsdir}/fonts.dir 2>/dev/null`" = '2' ]; then
-    rm ${fontsdir}/fonts.dir
-  fi
-EOD
diff --git a/Keywords/fontsdir.ucl b/Keywords/fontsdir.ucl
index 09c31572bf50..8c0701223e53 100644
--- a/Keywords/fontsdir.ucl
+++ b/Keywords/fontsdir.ucl
@@ -1,25 +1,19 @@
 # MAINTAINER: x11@FreeBSD.org
 
 actions: [dir]
-post-install: <<EOD
-  case "%@" in
-  /*) fontsdir="%@" ;;
-  *) fontsdir="%D/%@" ;;
-  esac
-  mkfontscale ${fontsdir} 2>/dev/null || true
-  mkfontdir ${fontsdir} 2>/dev/null || true
+post-install-lua: <<EOD
+  fontdir = pkg.prefixed_path("%@")
+  pkg.exec({"mkfontscale", fontdir})
+  pkg.exec({"mkfontdir", fontdir})
 EOD
-post-deinstall: <<EOD
-  case "%@" in
-  /*) fontsdir="%@" ;;
-  *) fontsdir="%D/%@" ;;
-  esac
-  mkfontscale ${fontsdir} 2>/dev/null || true
-  if [ -e ${fontsdir}/fonts.scale -a "`stat -f '%%z' ${fontsdir}/fonts.scale 2>/dev/null`" = '2' ]; then
-    rm ${fontsdir}/fonts.scale
-  fi
-  mkfontdir ${fontsdir} 2>/dev/null || true
-  if [ -e ${fontsdir}/fonts.dir -a "`stat -f '%%z' ${fontsdir}/fonts.dir 2>/dev/null`" = '2' ]; then
-    rm ${fontsdir}/fonts.dir
-  fi
+post-deinstall-lua: <<EOD
+  fontdir = pkg.prefixed_path("%@")
+  pkg.exec({"mkfontscale", fontdir})
+  pkg.exec({"mkfontdir", fontdir})
+  for _, v in pairs {"/fonts.scale", "/fonts.dir" } do
+    local st = pkg.stat(fontdir .. v)
+    if st and st.type == "reg" and st.size == 2 then
+      os.remove(fontdir .. v)
+    end
+  end
 EOD
diff --git a/Mk/Uses/fonts.mk b/Mk/Uses/fonts.mk
index acc751b5be2f..1547744747bc 100644
--- a/Mk/Uses/fonts.mk
+++ b/Mk/Uses/fonts.mk
@@ -1,74 +1,74 @@
 # handle fonts
 # Feature:	fonts
 # Usage:	USES=fonts
 # Valid ARGS:	fc, fontsdir, fcfontsdir, none (empty means fcfontsdir)
 
 #  fc		Add @fc ${FONTSDIR} to PLIST_FILES
 #  fontsdir	Add @fontsdir ${FONTSDIR} to PLIST_FILES
 #  fcfontsdir	Add @fcfontsdir ${FONTSDIR} to PLIST_FILES
 #  none		No special handling of ${FONTSDIR} in PLIST_FILES
 
 # Ports should use USES=fonts with an argument only when necessary.
 # By default, @fcfontsdir ${FONTSDIR} is added and it updates font
 # information cache file of fontconfig library, and XLFD entries
 # in fonts.dir and fonts.scale file, which are directly used by
 # X server and xfs font server.
 #
 # Xorg supports TrueType and OpenType via either of the two font
 # subsystems.  @fcfontsdir is designed to update configuration files for
 # both of them to register a font file.  Specifically, fc-cache and
 # mkfontdir utilities are used, respectively.
 #
 # Ports to install fonts with which mkfontdir or fc-cache do not work well
 # should use :fc and/or :fontsdir argument.  fc-cache and mkfontdir
 # get information such as fontname, encoding, etc. from a font file.
 # However, mkfontdir does not understand information in some scalable
 # fonts.  Typical examples are TrueType Collection format and
 # CJK (Chinese, Japanese, and Korean) TrueType font.  The former is
 # a format which contains multiple fonts in a single file.
 # While Xorg supports it, mkfontdir does not generate correct
 # fonts.dir entries from a TTC font.  CJK fonts often require
 # modifiers in a XFLD entry to enable special feature which mkfontdir
 # does not support, either.
 #
 # Note that ports which do not want mkfontdir need to use
 # a separate FONTSDIR, not shared ones such as misc or TTF.
 # This is because other ports using @fcfontsdir or @fontsdir
 # update fonts.dir in these font directories upon installation
 # and deinstallation.  mkfontdir will overwrite manually-added entries.
 
 .if !defined(_INCLUDE_USES_FONTS_MK)
 _INCLUDE_USES_FONTS_MK=	yes
 
 .if empty(fonts_ARGS)
-fonts_ARGS=	fcfontsdir
+fonts_ARGS=	fontsdir
 .endif
 
-.if !empty(fonts_ARGS:Nfc:Nfontsdir:Nfcfontsdir:Nnone)
+.if !empty(fonts_ARGS:Nfc:Nfontsdir:Nnone)
 IGNORE=	USES=fonts - invalid ARGS (${fonts_ARGS})
 .endif
 
-.if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfcfontsdir)
+.if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfontsdir)
 RUN_DEPENDS+=	fc-cache:x11-fonts/fontconfig
 .endif
-.if !empty(fonts_ARGS:Mfontsdir) || !empty(fonts_ARGS:Mfcfontsdir)
+.if !empty(fonts_ARGS:Mfontsdir)
 RUN_DEPENDS+=	mkfontscale:x11-fonts/mkfontscale
 .endif
 
 FONTNAME?=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/share/fonts/${FONTNAME}
-.if !empty(fonts_ARGS:Nnone)
+.if !empty(fonts_ARGS:Mfontsdir)
 PLIST_FILES+=	"@${fonts_ARGS} ${FONTSDIR}"
 .endif
 .if defined(FONTPATHSPEC) && !empty(FONTPATHSPEC)
 FONTPATHD?=	${LOCALBASE}/etc/X11/fontpath.d
 PLIST_FILES+=	"${FONTPATHD}/${FONTPATHSPEC}"
 _USES_install+=	690:fonts-install-fontpathd
 fonts-install-fontpathd:
 	@${MKDIR} ${STAGEDIR}${FONTPATHD}
 	${RLN} ${STAGEDIR}${FONTSDIR} ${STAGEDIR}${FONTPATHD}/${FONTPATHSPEC}
 .endif
 SUB_LIST+=	FONTSDIR="${FONTSDIR}"
 PLIST_SUB+=	FONTSDIR="${FONTSDIR:S,^${PREFIX}/,,}"
 .endif
 
diff --git a/x11-fonts/font-misc-ethiopic/pkg-plist b/x11-fonts/font-misc-ethiopic/pkg-plist
index 94cfc23c0419..d90a9cea8586 100644
--- a/x11-fonts/font-misc-ethiopic/pkg-plist
+++ b/x11-fonts/font-misc-ethiopic/pkg-plist
@@ -1,5 +1,5 @@
-@fcfontsdir share/fonts/OTF
+@fontsdir share/fonts/OTF
 share/fonts/OTF/GohaTibebZemen.otf
 share/fonts/TTF/GohaTibebZemen.ttf
 @comment share/fonts/OTF/fonts.dir
 @comment share/fonts/OTF/fonts.scale
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 8977dc2dabd8..5672a999d63d 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -1,88 +1,87 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	fontconfig
 DISTVERSION=	2.13.94
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://www.freedesktop.org/software/fontconfig/release/
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	XML-based font configuration API for X Windows
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libexpat.so:textproc/expat2
 
-USES=		cpe gperf meson pkgconfig python:3.6+,build shebangfix tar:xz
+USES=		cpe gperf meson pkgconfig python:3.6+,build shebangfix tar:xz \
+		trigger
 CPE_VENDOR=	fontconfig_project
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	conf.d/link_confs.py \
 		conf.d/write-35-lang-normalize-conf.py \
 		fc-case/fc-case.py \
 		fc-lang/fc-lang.py
 
 TEST_TARGET=	test
-SUB_FILES=	pkg-install
-SUB_LIST=	PREFIX=${PREFIX}
 
 # Custom configuration variables
 FCDEFAULTFONTS=	${PREFIX}/share/fonts
 FCADDFONTS=	${LOCALBASE}/lib/X11/fonts
 
 # To avoid circular dependency rebuild of docs (including manpages) needs to be
 # disabled as they depend on textproc/docbook-utils which requires fontconfig
 MESON_ARGS=	-Ddefault_library=both -Ddoc=disabled -Dfc-cache=disabled
 
 PLIST_SUB=	PREFERRED_HINTING=${PREFERRED_HINTING}
 PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
 
 OPTIONS_DEFINE=	DOCS NLS BITMAPS TEST
 OPTIONS_DEFAULT=BITMAPS HINTING_SLIGHT
 OPTIONS_SUB=	yes
 
 OPTIONS_SINGLE=	HINTING
 .for opt in NONE SLIGHT MEDIUM FULL
 OPTIONS_SINGLE_HINTING+=	HINTING_${opt}
 HINTING_${opt}_DESC=	${opt:tl}
 HINTING_${opt}_VARS=	PREFERRED_HINTING=${opt:tl}
 .endfor
 
 BITMAPS_DESC=	Enable bitmap fonts by default
 HINTING_DESC=	Preferred pixel hinting configuration
 
 NLS_USES=		gettext-tools
 NLS_MESON_ENABLED=	nls
 
 TEST_MESON_ENABLED=	tests
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%FCDEFAULTFONTS%%|${FCDEFAULTFONTS}|g' \
 	    ${PATCH_WRKSRC}/meson.build
 	@${REINPLACE_CMD} -e 's|%%FCADDFONTS%%|${FCADDFONTS}|g' \
 	    ${PATCH_WRKSRC}/meson.build
 	@${REINPLACE_CMD} -e 's|%%FCPREFERREDHINTING%%|${PREFERRED_HINTING}|g' \
 	    ${PATCH_WRKSRC}/conf.d/meson.build
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5
 	${MV} ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/db/fontconfig
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-BITMAPS-off:
 	${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-no-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf
 
 post-install-BITMAPS-on:
 	${RM} ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf
 	${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-yes-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-yes-bitmaps.conf
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fontconfig/files/fontconfig.ucl.in b/x11-fonts/fontconfig/files/fontconfig.ucl.in
new file mode 100644
index 000000000000..4f7c1909e63e
--- /dev/null
+++ b/x11-fonts/fontconfig/files/fontconfig.ucl.in
@@ -0,0 +1,9 @@
+path: [ "%%PREFIX%%/share/fonts", %%PREFIX%%/etc/fonts/conf.d ]
+trigger: {
+	type: lua
+	sandbox: false
+	script: <<EOS
+print("Running fc-cache to build fontconfig cache...")
+pkg.exec({"%%PREFIX%%/bin/fc-cache", "-s" })
+EOS
+}
diff --git a/x11-fonts/fontconfig/files/pkg-install.in b/x11-fonts/fontconfig/files/pkg-install.in
deleted file mode 100644
index 4dc92cbbbe33..000000000000
--- a/x11-fonts/fontconfig/files/pkg-install.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%PREFIX%%/bin
-export PATH
-
-if [ "$2" = "POST-INSTALL" ]; then
-    echo "Running fc-cache to build fontconfig cache..."
-    fc-cache -f -s -v
-    exit 0
-fi