diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 304a018fe479..8329b4ab78d1 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -1,436 +1,435 @@
 #-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # Please view me with 4 column tabs!
 
 # ======================= USERS =================================
 #
 # There are no significant user-definable settings in here.
 # This file is a framework to make it easier to create GNOME ports.
 #
 # ======================= /USERS ================================
 
 # Please make sure all changes to this file are passed through the maintainer.
 # Do not commit them yourself (unless of course you're the Port's Wraith ;).
 
 # This section defines possible names of GNOME components and all information
 # necessary for ports to use those components.
 
 # Ports can use this as follows:
 #
 # USE_GNOME=	glib20 introspection:build
 #
 # .include <bsd.port.mk>
 #
 # As a result proper LIB_DEPENDS/RUN_DEPENDS will be added and CONFIGURE_ENV
 # and MAKE_ENV defined.
 #
 #
 # GCONF_SCHEMAS		- Set the following to list of all the gconf schema files
 #				that your port installs. These schema files and
 #				%gconf.xml files will be automatically added to
 #				the ${PLIST}. For example, if your port has
 #				"etc/gconf/schemas/(foo.schemas and bar.schemas)",
 #				add the following to your Makefile:
 #				"GCONF_SCHEMAS=foo.schemas bar.schemas".
 #
 # GLIB_SCHEMAS		- Set the following to list of all gsettings schema files
 #				(*.gschema.xml) that your ports installs. The 
 #				schema files will be automatically added to 
 #				the ${PLIST}. For example, if your port has 
 #				"share/glib-2.0/schemas/(foo.gschema.xml and bar.gschema.xml)", 
 #				add the following to your Makefile:
 #				"GLIB_SCHEMAS=foo.gschema.xml bar.gschema.xml".
 #
 # MAINTAINER: gnome@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GNOME_MK)
 _INCLUDE_USES_GNOME_MK=        yes
 
 _USES_POST+=	gnome
 
 .if !empty(gnome_ARGS)
 IGNORE=	USES=gnome takes no arguments
 .endif
 
 # non-version specific components
 _USE_GNOME_ALL= intlhack intltool introspection \
 		referencehack gnomemimedata \
 		gnomeprefix
 
 # GNOME 2 components
 _USE_GNOME_ALL+= atk cairo \
 		gdkpixbuf2 gconf2 glib20 \
 		gtk-update-icon-cache gtk20 \
 		gtksharp20 gtksourceview2 gvfs libartlgpl2 \
 		libglade2 libgnomecanvas \
 		libgsf libidl librsvg2 libwnck \
 		libxml2 libxslt \
 		orbit2 pango pangox-compat \
 		vte
 
 # GNOME 3 components
 _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
 		gnomemenus3 gsound gtk30 gtkhtml4 gtksourceview3 \
 		gtksourceview4 libgda5 \
 		libgda5-ui libgnomekbd libwnck3 metacity nautilus3 \
 		pygobject3 vte3
 
 # GNOME 40 components
 _USE_GNOME_ALL+=gtk40 libadwaita
 
 # C++ bindings
 _USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm gtkmm24 \
 		gtkmm30 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \
 		pangomm
 
 # glib-mkenums often fails with C locale
 # https://gitlab.gnome.org/GNOME/glib/issues/1430
 USE_LOCALE?=	en_US.UTF-8
 
 GNOME_MAKEFILEIN?=	Makefile.in
-SCROLLKEEPER_DIR=	/var/db/rarian
 
 referencehack_PRE_PATCH=	${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} -e \
 				"s|test \"\$$\$$installfiles\" = '\$$(srcdir)/html/\*'|:|"
 
 GNOME_HTML_DIR?=	${PREFIX}/share/doc
 GCONF_CONFIG_OPTIONS?=	merged
 GCONF_CONFIG_DIRECTORY?=etc/gconf/gconf.xml.defaults
 GCONF_CONFIG_SOURCE?=xml:${GCONF_CONFIG_OPTIONS}:${PREFIX}/${GCONF_CONFIG_DIRECTORY}
 GNOME_LOCALSTATEDIR?=	${PREFIX}/share
 gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
 gnomeprefix_CONFIGURE_ARGS=--localstatedir=${GNOME_LOCALSTATEDIR} \
 			   --with-html-dir=${GNOME_HTML_DIR} \
 			   --disable-gtk-doc \
 			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 
 atkmm_LIB_DEPENDS=	libatkmm-1.6.so:accessibility/atkmm
 atkmm_USE_GNOME_IMPL=	glibmm atk
 
 libxml++26_LIB_DEPENDS=		libxml++-2.6.so:textproc/libxml++26
 libxml++26_USE_GNOME_IMPL=	glibmm libxml2
 
 cairo_LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 cairomm_LIB_DEPENDS=	libcairomm-1.0.so:graphics/cairomm
 cairomm_USE_GNOME_IMPL=	cairo libxml++26
 
 gconfmm26_LIB_DEPENDS=		libgconfmm-2.6.so:devel/gconfmm26
 gconfmm26_USE_GNOME_IMPL=	glibmm gconf2
 
 glibmm_LIB_DEPENDS=	libglibmm-2.4.so:devel/glibmm
 glibmm_USE_GNOME_IMPL=	libsigc++20 glib20
 
 gsound_BUILD_DEPENDS=	gsound-play:audio/gsound
 gsound_LIB_DEPENDS=	libgsound.so:audio/gsound
 gsound_RUN_DEPENDS=	gsound-play:audio/gsound
 gsound_USE_GNOME_IMPL=	glib20
 
 gtkmm24_LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
 gtkmm24_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk20
 
 gtkmm30_LIB_DEPENDS=	libgtkmm-3.0.so:x11-toolkits/gtkmm30
 gtkmm30_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk30
 
 gtksourceviewmm3_LIB_DEPENDS=		libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3
 gtksourceviewmm3_USE_GNOME_IMPL=	gtkmm30 gtksourceview3
 
 libgdamm5_LIB_DEPENDS=		libgdamm-5.0.so:databases/libgdamm5
 libgdamm5_USE_GNOME_IMPL=	libgda5 glibmm
 
 libsigc++20_LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20
 
 pangomm_LIB_DEPENDS=	libpangomm-1.4.so:x11-toolkits/pangomm
 pangomm_USE_GNOME_IMPL=	pango glibmm cairomm
 
 gnomemimedata_BUILD_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data
 gnomemimedata_RUN_DEPENDS=${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:misc/gnome-mime-data
 
 glib20_LIB_DEPENDS=	libglib-2.0.so:devel/glib20 \
 					libintl.so:devel/gettext-runtime
 
 atk_LIB_DEPENDS=	libatk-1.0.so:accessibility/atk
 atk_USE_GNOME_IMPL=	glib20
 
 dconf_BUILD_DEPENDS=	dconf:devel/dconf
 dconf_LIB_DEPENDS=	libdconf.so:devel/dconf
 dconf_RUN_DEPENDS=	dconf:devel/dconf
 dconf_USE_GNOME_IMPL=	glib20
 
 pango_LIB_DEPENDS=	libpango-1.0.so:x11-toolkits/pango
 pango_USE_GNOME_IMPL=	glib20
 
 pangox-compat_LIB_DEPENDS=	libpangox-1.0.so:x11-toolkits/pangox-compat
 pangox-compat_USE_GNOME_IMPL=	glib20 pango
 
 gdkpixbuf2_LIB_DEPENDS=	libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
 gdkpixbuf2_USE_GNOME_IMPL=glib20
 
 gtk-update-icon-cache_RUN_DEPENDS=	gtk-update-icon-cache:graphics/gtk-update-icon-cache
 gtk-update-icon-cache_USE_GNOME_IMPL=	atk pango gdkpixbuf2
 
 gtk20_LIB_DEPENDS=	libgtk-x11-2.0.so:x11-toolkits/gtk20
 gtk20_USE_GNOME_IMPL=	atk pango
 GTK2_VERSION=		2.10.0
 
 gtk30_LIB_DEPENDS=	libgtk-3.so:x11-toolkits/gtk30
 gtk30_USE_GNOME_IMPL=	atk pango
 GTK3_VERSION=		3.0.0
 
 gtk40_LIB_DEPENDS=	libgtk-4.so:x11-toolkits/gtk40
 gtk40_USE_GNOME_IMPL=	atk pango
 GTK4_VERSION=		4.0.0
 
 libidl_LIB_DEPENDS=	libIDL-2.so:devel/libIDL
 libidl_USE_GNOME_IMPL=	glib20
 
 orbit2_LIB_DEPENDS=	libORBit-2.so:devel/ORBit2
 orbit2_USE_GNOME_IMPL=	libidl
 
 libglade2_LIB_DEPENDS=	libglade-2.0.so:devel/libglade2
 libglade2_USE_GNOME_IMPL=libxml2 gtk20
 
 libxml2_BUILD_DEPENDS=	xml2-config:textproc/libxml2
 libxml2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 libxml2_RUN_DEPENDS=	xml2-config:textproc/libxml2
 
 libxslt_BUILD_DEPENDS=	xsltproc:textproc/libxslt
 libxslt_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 libxslt_RUN_DEPENDS=	${libxslt_BUILD_DEPENDS}
 libxslt_USE_GNOME_IMPL=	libxml2
 
 introspection_BUILD_DEPENDS=	g-ir-scanner:devel/gobject-introspection
 introspection_LIB_DEPENDS=	libgirepository-1.0.so:devel/gobject-introspection
 introspection_RUN_DEPENDS=	g-ir-scanner:devel/gobject-introspection
 introspection_USE_GNOME_IMPL=	glib20
 introspection_MAKE_ENV=		GI_SCANNER_DISABLE_CACHE=1
 
 gconf2_LIB_DEPENDS=	libgconf-2.so:devel/gconf2
 gconf2_USE_GNOME_IMPL=	orbit2 libxml2 gtk20
 
 libgnomecanvas_LIB_DEPENDS=	libgnomecanvas-2.so:graphics/libgnomecanvas
 libgnomecanvas_USE_GNOME_IMPL=	libglade2 libartlgpl2
 
 libartlgpl2_LIB_DEPENDS=	libart_lgpl_2.so:graphics/libart_lgpl
 
 gnomedesktop3_LIB_DEPENDS=	libgnome-desktop-3.so:x11/gnome-desktop
 gnomedesktop3_USE_GNOME_IMPL=	gtk30
 
 libwnck_LIB_DEPENDS=	libwnck-1.so:x11-toolkits/libwnck
 libwnck_USE_GNOME_IMPL=	gtk20
 
 libwnck3_LIB_DEPENDS=	libwnck-3.so:x11-toolkits/libwnck3
 libwnck3_USE_GNOME_IMPL=gtk30
 
 vte_LIB_DEPENDS=	libvte.so:x11-toolkits/vte
 vte_USE_GNOME_IMPL=	gtk20
 
 vte3_LIB_DEPENDS=	libvte-2.91.so:x11-toolkits/vte3
 vte3_USE_GNOME_IMPL=	gtk30
 
 libadwaita_LIB_DEPENDS=		libadwaita-1.so:x11-toolkits/libadwaita
 libadwaita_USE_GNOME_IMPL=	gtk40
 
 # Use librsvg2-rust where lang/rust is available
 .if ${LIBRSVG2_DEFAULT:Mrust}
 librsvg2_BUILD_DEPENDS=	librsvg2-rust>=0:graphics/librsvg2-rust
 librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2-rust
 librsvg2_RUN_DEPENDS=	librsvg2-rust>=0:graphics/librsvg2-rust
 .else
 librsvg2_BUILD_DEPENDS=	librsvg2>=0:graphics/librsvg2
 librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 librsvg2_RUN_DEPENDS=	librsvg2>=0:graphics/librsvg2
 .endif
 librsvg2_USE_GNOME_IMPL=gdkpixbuf2 pango
 
 nautilus3_LIB_DEPENDS=	libnautilus-extension.so:x11-fm/nautilus
 nautilus3_USE_GNOME_IMPL=gnomedesktop3 libxml2
 
 metacity_LIB_DEPENDS=	libmetacity.so:x11-wm/metacity
 
 gnomecontrolcenter3_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
 gnomecontrolcenter3_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc:sysutils/gnome-control-center
 gnomecontrolcenter3_USE_GNOME_IMPL=	gnomedesktop3
 
 libgda5_LIB_DEPENDS=	libgda-5.0.so:databases/libgda5
 libgda5_USE_GNOME_IMPL=	glib20 libxslt
 
 libgda5-ui_LIB_DEPENDS=	libgda-ui-5.0.so:databases/libgda5-ui
 libgda5-ui_USE_GNOME_IMPL=glib20 libxslt libgda5
 
 gtksourceview2_LIB_DEPENDS=	libgtksourceview-2.0.so:x11-toolkits/gtksourceview2
 gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2
 
 gtksourceview3_LIB_DEPENDS=	libgtksourceview-3.0.so:x11-toolkits/gtksourceview3
 gtksourceview3_USE_GNOME_IMPL=gtk30 libxml2
 
 gtksourceview4_LIB_DEPENDS=	libgtksourceview-4.so:x11-toolkits/gtksourceview4
 gtksourceview4_USE_GNOME_IMPL=gtk30 libxml2
 
 libgsf_LIB_DEPENDS=	libgsf-1.so:devel/libgsf
 libgsf_USE_GNOME_IMPL=	glib20 libxml2
 
 pygobject3_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
 pygobject3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
 pygobject3_USE_GNOME_IMPL=	glib20
 
 intltool_BUILD_DEPENDS=	${LOCALBASE}/bin/intltool-extract:textproc/intltool
 
 intlhack_PRE_PATCH=	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} \
 			's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
 			 s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \
 			 s|/usr/bin/iconv|${ICONV_CMD}|g ; \
 			 s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|' ; \
 			${FIND} ${WRKSRC} -name configure | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} \
 			's/DATADIRNAME=lib/DATADIRNAME=share/'
 intlhack_USE_GNOME_IMPL=intltool
 
 gtkhtml4_LIB_DEPENDS=	libgtkhtml-4.0.so:www/gtkhtml4
 gtkhtml4_USE_GNOME_IMPL=gtk30 libxml2
 
 evolutiondataserver3_LIB_DEPENDS=	libedataserver-1.2.so:databases/evolution-data-server
 evolutiondataserver3_USE_GNOME_IMPL=	libxml2 gtk30
 
 gnomemenus3_BUILD_DEPENDS=	gnome-menus>=3.2.0:x11/gnome-menus
 gnomemenus3_RUN_DEPENDS=	gnome-menus>=3.2.0:x11/gnome-menus
 gnomemenus3_USE_GNOME_IMPL=	glib20
 
 gtksharp20_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-sharp-2.0.pc:x11-toolkits/gtk-sharp20
 gtksharp20_RUN_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/gtk-sharp-2.0.pc:x11-toolkits/gtk-sharp20
 gtksharp20_USE_GNOME_IMPL=	gtk20
 
 libgnomekbd_LIB_DEPENDS=	libgnomekbd.so:x11/libgnomekbd
 libgnomekbd_USE_GNOME_IMPL=	gtk30 libxml2
 
 gvfs_BUILD_DEPENDS=	gvfs>=0:devel/gvfs
 gvfs_RUN_DEPENDS=	gvfs>=0:devel/gvfs
 gvfs_USE_GNOME_IMPL=	glib20
 
 # End component definition section
 
 .if defined(USE_GNOME)
 # First of all expand all USE_GNOME_IMPL recursively
 . for component in ${_USE_GNOME_ALL}
 .  for subcomponent in ${${component}_USE_GNOME_IMPL}
 ${component}_USE_GNOME_IMPL+=${${subcomponent}_USE_GNOME_IMPL}
 .  endfor
 . endfor
 
 # Then use already expanded USE_GNOME_IMPL to expand USE_GNOME.
 # Also, check to see if each component has a desktop requirement.  If it does,
 # and if the user's chosen desktop is not of the same version, mark the
 # port as IGNORE.
 . for component in ${USE_GNOME:C/^([^:]+).*/\1/}
 .  if ${_USE_GNOME_ALL:M${component}}==""
 IGNORE=	cannot install: Unknown component ${component}
 .  endif
 _USE_GNOME+=	${${component}_USE_GNOME_IMPL} ${component}
 . endfor
 
 # Setup the GTK+ API version for pixbuf loaders, input method modules,
 # and theme engines.
 PLIST_SUB+=			GTK2_VERSION="${GTK2_VERSION}" \
 				GTK3_VERSION="${GTK3_VERSION}" \
 				GTK4_VERSION="${GTK4_VERSION}"
 
 .if defined(_USE_GNOME) && empty(_USE_GNOME:Mglib20:u) && defined(GLIB_SCHEMAS)
 IGNORE=		GLIB_SCHEMAS is set, but needs USE_GNOME=glib20 to work
 .endif
 
 .if defined(_USE_GNOME) && empty(_USE_GNOME:Mgconf2:u) && defined(GCONF_SCHEMAS)
 IGNORE=		GCONF_SCHEMAS is set, but needs USE_GNOME=gconf2 to work
 .endif
 
 # Then traverse through all components, check which of them
 # exist in ${_USE_GNOME} and set variables accordingly
 .ifdef _USE_GNOME
 
 . for component in ${_USE_GNOME:O:u}
 .  if defined(${component}_PATCH_DEPENDS)
 PATCH_DEPENDS+=	${${component}_PATCH_DEPENDS}
 .  endif
 
 .  if ${USE_GNOME:M${component}\:build} && defined(${component}_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
 .  elif ${USE_GNOME:M${component}\:run} && defined(${component}_RUN_DEPENDS)
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
 .  else
 .   if defined(${component}_LIB_DEPENDS)
 LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
 .   else
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
 .   endif
 .  endif
 
 .  if defined(${component}_CONFIGURE_ARGS)
 CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS}
 .  endif
 
 .  if defined(${component}_CONFIGURE_ENV)
 CONFIGURE_ENV+=	${${component}_CONFIGURE_ENV}
 .  endif
 
 .  if defined(${component}_MAKE_ENV)
 MAKE_ENV+=	${${component}_MAKE_ENV}
 .  endif
 
 .  if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET)
 CONFIGURE_TARGET=	${${component}_CONFIGURE_TARGET}
 .  endif
 
 .  if defined(${component}_PRE_PATCH)
 GNOME_PRE_PATCH+=	; ${${component}_PRE_PATCH}
 .  endif
 . endfor
 .endif
 
 . if defined(GCONF_SCHEMAS)
 MAKE_ENV+=	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 . endif
 .endif
 
 .if defined(USE_GNOME_SUBR)
 GNOME_SUBR=		${LOCALBASE}/etc/gnome.subr
 RUN_DEPENDS+=	${GNOME_SUBR}:sysutils/gnome_subr
 SUB_LIST+=		GNOME_SUBR=${GNOME_SUBR}
 .endif
 
 .endif
 # end of the part
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_GNOME_POST_MK)
 _INCLUDE_USES_GNOME_POST_MK=     yes
 
 .if defined(GNOME_PRE_PATCH)
 _USES_patch+=	290:gnome-pre-patch
 gnome-pre-patch:
 	@${GNOME_PRE_PATCH:C/^;//1}
 .endif
 
 .if defined(GCONF_SCHEMAS)
 _USES_install+=	690:gnome-post-gconf-schemas
 gnome-post-gconf-schemas:
 	@for i in ${GCONF_SCHEMAS}; do \
 		${ECHO_CMD} "@preunexec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/${GCONF_CONFIG_DIRECTORY} HOME=${WRKDIR} gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \
 			>> ${TMPPLIST}; \
 		${ECHO_CMD} "etc/gconf/schemas/$${i}" >> ${TMPPLIST}; \
 		${ECHO_CMD} "@postexec env GCONF_CONFIG_SOURCE=xml:${GCONF_CONFIG_OPTIONS}:%D/${GCONF_CONFIG_DIRECTORY} HOME=${WRKDIR} gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/$${i} > /dev/null || /usr/bin/true" \
 			>> ${TMPPLIST}; \
 	done
 .endif
 
 # we put the @glib-schemas behind the plist schema entry, because it compiles files 
 # in the directory. So we should remove the port file first before recompiling.
 .if defined(GLIB_SCHEMAS)
 _USES_install+=	690:gnome-post-glib-schemas
 gnome-post-glib-schemas:
 	@for i in ${GLIB_SCHEMAS}; do \
 		${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \
 	done
 	@${ECHO_CMD} "@glib-schemas" >> ${TMPPLIST};
 .endif
 
 .endif
 # End of use part.
diff --git a/Mk/Uses/mate.mk b/Mk/Uses/mate.mk
index add32a68b547..a94ed49112b9 100644
--- a/Mk/Uses/mate.mk
+++ b/Mk/Uses/mate.mk
@@ -1,227 +1,225 @@
 #-*- tab-width: 4; -*-
 # ex:ts=4
 #
 # Please view me with 4 column tabs!
 
 # ======================= USERS =================================
 #
 # There are no significant user-definable settings in here.
 # This file is a framework to make it easier to create MATE ports.
 #
 # ======================= /USERS ================================
 #
 # Please make sure all changes to this file are passed through the maintainer.
 # Do not commit them yourself (unless of course you're the Port's Wraith ;).
 #
 # MAINTAINER: gnome@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_MATE_MK)
 _INCLUDE_USES_MATE_MK= yes
 
 _USES_POST+=	mate
 
 .if !empty(mate_ARGS)
 IGNORE=	USES=mate takes no arguments
 .endif
 
 # This section defines possible names of MATE components and all information
 # necessary for ports to use those components.
 
 # Ports can use this as follows:
 #
 # USE_MATE=	caja common desktop
 #
 # .include <bsd.port.mk>
 #
 # As a result proper LIB_DEPENDS/RUN_DEPENDS will be added and CONFIGURE_ENV
 # and MAKE_ENV defined.
 #
 
 # non-version specific components. Do not use :build/:run on those.
 _USE_MATE_ALL=	autogen intlhack intltool
 
 # MATE components, you can use the :build or :run if need. Without the :build
 # and :run, it will be added in both build and run dependency. It will check
 # for the library dependency first. If not exists then do the build/run on
 # the *.pc file instead.
 _USE_MATE_ALL+=	caja common controlcenter desktop dialogs docutils icontheme \
 		libmatekbd libmateweather \
 		marco menus mixer notificationdaemon panel polkit pluma \
 		session settingsdaemon
 
-SCROLLKEEPER_DIR=	/var/db/rarian
-
 caja_DETECT=		${LOCALBASE}/libdata/pkgconfig/libcaja-extension.pc
 caja_BUILD_DEPENDS=	${caja_DETECT}:x11-fm/caja
 caja_LIB_DEPENDS=	libcaja-extension.so:x11-fm/caja
 caja_RUN_DEPENDS=	${caja_DETECT}:x11-fm/caja
 
 common_DETECT=		${LOCALBASE}/bin/mate-autogen
 common_BUILD_DEPENDS=	${common_DETECT}:devel/mate-common
 common_RUN_DEPENDS=	${common_DETECT}:devel/mate-common
 
 controlcenter_DETECT=		${LOCALBASE}/libdata/pkgconfig/mate-window-settings-2.0.pc
 controlcenter_BUILD_DEPENDS=	${controlcenter_DETECT}:sysutils/mate-control-center
 controlcenter_LIB_DEPENDS=	libmate-window-settings.so:sysutils/mate-control-center
 controlcenter_RUN_DEPENDS=	${controlcenter_DETECT}:sysutils/mate-control-center
 
 desktop_DETECT=		${LOCALBASE}/libdata/pkgconfig/mate-desktop-2.0.pc
 desktop_BUILD_DEPENDS=	${desktop_DETECT}:x11/mate-desktop
 desktop_LIB_DEPENDS=	libmate-desktop-2.so:x11/mate-desktop
 desktop_RUN_DEPENDS=	${desktop_DETECT}:x11/mate-desktop
 
 dialogs_DETECT=		${LOCALBASE}/bin/matedialog
 dialogs_BUILD_DEPENDS=	${dialogs_DETECT}:x11/mate-dialogs
 dialogs_RUN_DEPENDS=	${dialogs_DETECT}:x11/mate-dialogs
 
 docutils_DETECT=	${LOCALBASE}/libdata/pkgconfig/mate-doc-utils.pc
 docutils_BUILD_DEPENDS=	${docutils_DETECT}:textproc/mate-doc-utils
 docutils_RUN_DEPENDS=	${docutils_DETECT}:textproc/mate-doc-utils
 
 icontheme_DETECT=	${LOCALBASE}/share/icons/mate/index.theme
 icontheme_BUILD_DEPENDS=${icontheme_DETECT}:x11-themes/mate-icon-theme
 icontheme_RUN_DEPENDS=	${icontheme_DETECT}:x11-themes/mate-icon-theme
 
 intltool_DETECT=	${LOCALBASE}/bin/intltool-extract
 intltool_BUILD_DEPENDS=	${intltool_DETECT}:textproc/intltool
 
 intlhack_PRE_PATCH=		${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \
 				's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
 				 s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \
 				 s|/usr/bin/iconv|${LOCALBASE}/bin/iconv|g ; \
 				 s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|'
 .if ${USE_MATE:Mintlhack}!=""
 USE_MATE+=				intltool
 .endif
 
 libmatekbd_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmatekbd.pc
 libmatekbd_BUILD_DEPENDS=	${libmatekbd_DETECT}:x11/libmatekbd
 libmatekbd_LIB_DEPENDS=		libmatekbd.so:x11/libmatekbd
 libmatekbd_RUN_DEPENDS=		${libmatekbd_DETECT}:x11/libmatekbd
 
 libmateweather_DETECT=		${LOCALBASE}/libdata/pkgconfig/mateweather.pc
 libmateweather_BUILD_DEPENDS=	${libmateweather_DETECT}:net/libmateweather
 libmateweather_LIB_DEPENDS=	libmateweather.so:net/libmateweather
 libmateweather_RUN_DEPENDS=	${libmateweather_DETECT}:net/libmateweather
 
 marco_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmarco-private.pc
 marco_BUILD_DEPENDS=	${marco_DETECT}:x11-wm/marco
 marco_LIB_DEPENDS=	libmarco-private.so:x11-wm/marco
 marco_RUN_DEPENDS=	${marco_DETECT}:x11-wm/marco
 
 menus_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmate-menu.pc
 menus_BUILD_DEPENDS=	${menus_DETECT}:x11/mate-menus
 menus_LIB_DEPENDS=	libmate-menu.so:x11/mate-menus
 menus_RUN_DEPENDS=	${menus_DETECT}:x11/mate-menus
 
 mixer_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmatemixer.pc
 mixer_BUILD_DEPENDS=	${mixer_DETECT}:audio/libmatemixer
 mixer_LIB_DEPENDS=	libmatemixer.so:audio/libmatemixer
 mixer_RUN_DEPENDS=	${mixer_DETECT}:audio/libmatemixer
 
 notificationdaemon_DETECT=		${LOCALBASE}/libexec/mate-notification-daemon
 notificationdaemon_BUILD_DEPENDS=	${notificationdaemon_DETECT}:deskutils/mate-notification-daemon
 notificationdaemon_RUN_DEPENDS=		${notificationdaemon_DETECT}:deskutils/mate-notification-daemon
 
 panel_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmatepanelapplet-4.0.pc
 panel_BUILD_DEPENDS=	${panel_DETECT}:x11/mate-panel
 panel_LIB_DEPENDS=	libmate-panel-applet-4.so:x11/mate-panel
 panel_RUN_DEPENDS=	${panel_DETECT}:x11/mate-panel
 
 polkit_DETECT=		${LOCALBASE}/libexec/polkit-mate-authentication-agent-1
 polkit_BUILD_DEPENDS=	${polkit_DETECT}:sysutils/mate-polkit
 polkit_RUN_DEPENDS=	${polkit_DETECT}:sysutils/mate-polkit
 
 pluma_DETECT=		${LOCALBASE}/libdata/pkgconfig/pluma.pc
 pluma_BUILD_DEPENDS=	${pluma_DETECT}:editors/pluma
 pluma_RUN_DEPENDS=	${pluma_DETECT}:editors/pluma
 
 session_DETECT=		${LOCALBASE}/bin/mate-session
 session_BUILD_DEPENDS=	${session_DETECT}:x11/mate-session-manager
 session_RUN_DEPENDS=	${session_DETECT}:x11/mate-session-manager
 
 settingsdaemon_DETECT=		${LOCALBASE}/libdata/pkgconfig/mate-settings-daemon.pc
 settingsdaemon_BUILD_DEPENDS=	${settingsdaemon_DETECT}:sysutils/mate-settings-daemon
 settingsdaemon_RUN_DEPENDS=	${settingsdaemon_DETECT}:sysutils/mate-settings-daemon
 
 # End component definition section
 
 .if defined(USE_MATE)
 # Comparing between USE_MATE and _USE_MATE_ALL to make sure the component
 # exists in _USE_MATE_ALL. If it does not exist then give an error about it.
 #. for component in ${USE_MATE:O:u:C/^([^:]+).*/\1/}
 . for component in ${USE_MATE:C/^([^:]+).*/\1/}
 #. for component in ${USE_GNOME:C/^([^:]+).*/\1/}
 .  if ${_USE_MATE_ALL:M${component}}==""
 .error cannot install: Unknown component USE_MATE=${component}
 .  endif
 . endfor
 
 . for component in ${USE_MATE:O:u:C/^([^:]+).*/\1/}
 .  if defined(${component}_PATCH_DEPENDS)
 PATCH_DEPENDS+=	${${component}_PATCH_DEPENDS}
 .  endif
 
 .  if defined(${component}_DETECT)
 .   if ${USE_MATE:M${component}\:build}!=""
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
 .   elif ${USE_MATE:M${component}\:run}!=""
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
 .   else
 .    if defined(${component}_LIB_DEPENDS)
 LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
 .    else
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
 RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
 .    endif
 .   endif
 .  endif
 
 .  if defined(${component}_CONFIGURE_TARGET)
 CONFIGURE_ARGS+=${${component}_CONFIGURE_ARGS}
 .  endif
 
 .  if defined(${component}_CONFIGURE_ENV)
 CONFIGURE_ENV+=	${${component}_CONFIGURE_ENV}
 .  endif
 
 .  if defined(${component}_MAKE_ENV)
 MAKE_ENV+=	${${component}_MAKE_ENV}
 .  endif
 
 .  if !defined(CONFIGURE_TARGET) && defined(${component}_CONFIGURE_TARGET)
 CONFIGURE_TARGET=	${${component}_CONFIGURE_TARGET}
 .  endif
 
 .  if defined(${component}_PRE_PATCH)
 MATE_PRE_PATCH+=	; ${${component}_PRE_PATCH}
 .  endif
 . endfor
 .endif # USE_MATE check
 
 .endif
 # End of optional part.
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_MATE_POST_MK)
 _INCLUDE_USES_MATE_POST_MK=     yes
 
 .if ${USE_MATE:Mautogen}!=""
 
 CONFIGURE_ENV+=	NOCONFIGURE=yes
 
 _USES_configure+=	295:mate-pre-configure
 
 mate-pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
 .endif
 
 .if defined(MATE_PRE_PATCH)
 
 _USES_configure+=	445:mate-pre-configure-script
 
 mate-pre-configure-script:
 	@${MATE_PRE_PATCH:C/^;//1}
 .endif
 
 .endif
 # End of use part.
diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk
index ca982f131088..07ede991db54 100644
--- a/Mk/Uses/pathfix.mk
+++ b/Mk/Uses/pathfix.mk
@@ -1,61 +1,60 @@
 # Lookup common paths in Makefile.in, configure and similar files, and replace
 # their values to respect FreeBSD hier(7) for file installation.
 #
 # Feature:	pathfix
 # Usage:	USES=pathfix
 # Valid ARGS:	does not require args
 #
 # MAINTAINER: portmgr@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PATHFIX_MK)
 _INCLUDE_USES_PATHFIX_MK=	yes
 
 .if !empty(pathfix_ARGS)
 IGNORE=	USES=pathfix does not require args
 .endif
 
 PATHFIX_CMAKELISTSTXT?=	CMakeLists.txt
 .if ${USES:Mautoreconf*}
 PATHFIX_MAKEFILEIN?=	Makefile.am Makefile.in
 .else
 PATHFIX_MAKEFILEIN?=	Makefile.in
 .endif
 PATHFIX_WRKSRC?=	${WRKSRC}
 
 _USES_patch+=	190:pathfix
 pathfix:
 .if ${USES:Mcmake*}
 .for file in ${PATHFIX_CMAKELISTSTXT}
 	@${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} -e \
 		's|[{]CMAKE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]CMAKE_INSTALL_DATAROOTDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]INSTALL_LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]LIB_DESTINATION[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]LIB_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]LIB_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]KDE_INSTALL_LIBDIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]LIBRARY_INSTALL_DIR[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|[{]libdir[}]/pkgconfig|{CMAKE_INSTALL_PREFIX}/libdata/pkgconfig|g ; \
 		s|lib/pkgconfig|libdata/pkgconfig|g'
 .endfor
 .else
 .for file in ${PATHFIX_MAKEFILEIN}
 	@${FIND} ${PATHFIX_WRKSRC} -name "${file}" -type f | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} -e \
 		's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
 		s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
 		s|@libdir@/locale|@prefix@/share/locale|g ; \
 		s|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g ; \
 		s|[{]libdir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[{]LIBDIR[}]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
 		s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[{]datadir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
 		s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \
-		s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \
 		s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
 .endfor
 .endif
 
 .endif