From 80b1f4d9543a8ab4c884814e87605ae359c60553 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 23 Mar 2022 20:13:16 +0100
Subject: [PATCH] Framework: partially sync with upstream

Taken from: FreeBSD
---
 Keywords/fcfontsdir.ucl | 27 ---------------------------
 Keywords/fontsdir.ucl   | 34 ++++++++++++++--------------------
 MOVED                   |  3 +++
 Mk/Uses/fonts.mk        | 10 +++++-----
 Mk/Uses/gnome.mk        |  5 ++++-
 Mk/Uses/linux.mk        |  2 +-
 Mk/bsd.port.mk          |  3 +--
 7 files changed, 28 insertions(+), 56 deletions(-)
 delete mode 100644 Keywords/fcfontsdir.ucl

diff --git a/Keywords/fcfontsdir.ucl b/Keywords/fcfontsdir.ucl
deleted file mode 100644
index 81f9d4e716a..00000000000
--- 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 09c31572bf5..8c0701223e5 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/MOVED b/MOVED
index 2911db5fe7c..271a7714791 100644
--- a/MOVED
+++ b/MOVED
@@ -16965,3 +16965,6 @@ games/pushover|games/domino-chain|2022-03-17|Chase upstream rename
 graphics/darktable38|graphics/darktable|2022-03-19|Darktable was upgraded to 3.8, separate port no longer needed
 security/1password-client-devel|security/1password-client2|2022-03-19|cli version 2 is now released.
 x11-toolkits/pangoxsl||2022-03-20|Has expired: Abandonware and not used by any port
+print/lgrind||2022-03-22|Has expired: Abandonware as last release was in 2001
+devel/py-decorator4||2022-03-22|Has expired: Legacy version, use devel/py-decorator instead
+devel/p5-Log-Any-Adapter-Callback|devel/p5-Log-Any|2022-03-22|Has expired: Use devel/p5-Log-Any (Log::Any::Adapter::Capture) instead
diff --git a/Mk/Uses/fonts.mk b/Mk/Uses/fonts.mk
index acc751b5be2..1547744747b 100644
--- a/Mk/Uses/fonts.mk
+++ b/Mk/Uses/fonts.mk
@@ -41,23 +41,23 @@
 _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)
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 5bde97919ff..f79319ebd25 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -76,7 +76,7 @@ _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
 		pygobject3 vte3
 
 # GNOME 40 components
-_USE_GNOME_ALL+=gtk40 libadwaita
+_USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5
 
 # C++ bindings
 _USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm gtkmm24 \
@@ -258,6 +258,9 @@ gtksourceview3_USE_GNOME_IMPL=gtk30 libxml2
 gtksourceview4_LIB_DEPENDS=	libgtksourceview-4.so:x11-toolkits/gtksourceview4
 gtksourceview4_USE_GNOME_IMPL=gtk30 libxml2
 
+gtksourceview5_LIB_DEPENDS=	libgtksourceview-5.so:x11-toolkits/gtksourceview5
+gtksourceview5_USE_GNOME_IMPL=gtk40 libxml2
+
 libgsf_LIB_DEPENDS=	libgsf-1.so:devel/libgsf
 libgsf_USE_GNOME_IMPL=	glib20 libxml2
 
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index f1fbd6ca49f..28ce77dc89b 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -236,7 +236,7 @@ SRC_DISTFILES?=		${DISTNAME}${SRC_SUFX}:SOURCE
 .ifdef USE_LINUX_RPM_BAD_PERMS
 EXTRACT_DEPENDS+=	rpm2archive:archivers/rpm4
 EXTRACT_CMD=		rpm2archive
-EXTRACT_BEFORE_ARGS=	<
+EXTRACT_BEFORE_ARGS=	- <
 EXTRACT_AFTER_ARGS=	| ${TAR} xf - --no-same-owner --no-same-permissions
 .endif
 
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 7419f99e4a4..58a03b2fb64 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1177,8 +1177,7 @@ OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
 .endif
 _EXPORTED_VARS+=	OSVERSION
 
-.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1202000) || \
-    (${OPSYS} == DragonFly && ${DFLYVERSION} < 400400)
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1202000
 _UNSUPPORTED_SYSTEM_MESSAGE=	Ports Collection support for your ${OPSYS} version has ended, and no ports\
 								are guaranteed to build on this system. Please upgrade to a supported release.
 . if defined(ALLOW_UNSUPPORTED_SYSTEM)