Merge remote-tracking branch 'upstream/master'

22 files changed, 463 insertions, 378 deletions

diff --git a/Mk/Scripts/depends-list.sh b/Mk/Scripts/depends-list.sh
index ce4f4b75a094..843bedd03958 100644
--- a/Mk/Scripts/depends-list.sh
+++ b/Mk/Scripts/depends-list.sh
@@ -37,7 +37,7 @@ while getopts "fmrw" FLAG; do
 done
 shift $((OPTIND-1))
 
-validate_env PORTSDIR dp_PKGNAME
+validate_env PORTSDIR dp_OVERLAYS dp_PKGNAME
 if [ ${recursive} -eq 1 -o ${requires_wrkdir} -eq 1 ]; then
 	validate_env dp_MAKE
 	# Cache command executions to avoid looking them up again in every
@@ -65,16 +65,25 @@ check_dep() {
 
 		case "${2}" in
 		/*) d=${2} ;;
-		*) d=${PORTSDIR}/${2} ;;
+		*) for overlay in ${dp_OVERLAYS} ${PORTSDIR}; do
+			d=${overlay}/${2}
+			f=
+			case "${d}" in
+			*@*/*) ;; # Ignore @ in the path which would not be a flavor
+			*@*)
+				f=${d##*@}
+				d=${d%@*}
+				;;
+			esac
+			if [ -f ${d}/Makefile ]; then
+				if [ -n $f ]; then
+					export FLAVOR=$f
+				fi
+				break
+			fi
+		done
 		esac
 
-		case "${d}" in
-		*@*/*) ;; # Ignore @ in the path which would not be a flavor
-		*@*)
-			export FLAVOR=${d##*@}
-			d=${d%@*}
-			;;
-		esac
 		if [ ${flavors} -eq 1 -a -n "${FLAVOR:-}" ]; then
 			port_display="${d}@${FLAVOR}"
 		else
diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh
index 163570052a54..af93ec646a74 100644
--- a/Mk/Scripts/do-depends.sh
+++ b/Mk/Scripts/do-depends.sh
@@ -11,7 +11,7 @@ validate_env dp_RAWDEPENDS dp_DEPTYPE dp_DEPENDS_TARGET dp_DEPENDS_PRECLEAN \
 	dp_DEPENDS_CLEAN dp_DEPENDS_ARGS dp_USE_PACKAGE_DEPENDS \
 	dp_USE_PACKAGE_DEPENDS_ONLY dp_PKG_ADD dp_PKG_INFO dp_WRKDIR \
 	dp_PKGNAME dp_STRICT_DEPENDS dp_LOCALBASE dp_LIB_DIRS dp_SH \
-	dp_SCRIPTSDIR PORTSDIR dp_MAKE dp_MAKEFLAGS
+	dp_SCRIPTSDIR PORTSDIR dp_MAKE dp_MAKEFLAGS dp_OVERLAYS
 
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DO_DEPENDS}" ] && set -x
 
@@ -125,7 +125,15 @@ for _line in ${dp_RAWDEPENDS} ; do
 
 	case "${origin}" in
 	/*) ;;
-	*) origin="${PORTSDIR}/${origin}" ;;
+	*)
+		for overlay in ${dp_OVERLAYS} ${PORTSDIR}; do
+			orig="${overlay}/${origin}"
+			if [ -f "${orig}/Makefile" ]; then
+				break
+			fi
+		done
+		origin="${orig}"
+		;;
 	esac
 	case "${origin}" in
 	*@*/*) ;; # Ignore @ in the path which would not be a flavor
diff --git a/Mk/Scripts/functions.sh b/Mk/Scripts/functions.sh
index 63ba4b06ce98..c3e296a95700 100644
--- a/Mk/Scripts/functions.sh
+++ b/Mk/Scripts/functions.sh
@@ -153,9 +153,11 @@ parse_plist() {
 validate_env() {
 	local envfault
 	for i ; do
+		set -f
 		if ! (eval ": \${${i}?}" ) >/dev/null; then
 			envfault="${envfault}${envfault:+" "}${i}"
 		fi
+		set +f
 	done
 	if [ -n "${envfault}" ]; then
 		echo "Environment variable ${envfault} undefined. Aborting." \
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
index 4186db94f015..7cf3d8b84708 100644
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -77,6 +77,7 @@ shebangonefile() {
 	/usr/bin/nawk) ;;
 	/usr/bin/sed) ;;
 	/usr/sbin/dtrace) ;;
+	/usr/bin/make) ;;
 	*)
 		badinterp="${interp}"
 		;;
@@ -613,9 +614,6 @@ proxydeps_suggest_uses() {
 	# openal
 	elif [ ${pkg} = "audio/openal" -o ${pkg} = "audio/openal-soft" -o ${pkg} = "audio/freealut" ]; then
 		warn "you need USES+=openal"
-	# pure
-	elif [ ${pkg} = "lang/pure" ]; then
-		warn "you need USES+=pure"
 	# readline
 	elif [ ${pkg} = "devel/readline" ]; then
 		warn "you need USES+=readline"
diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index b114a9911633..d893c9895e90 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -56,13 +56,6 @@
 _INCLUDE_USES_AUTORECONF_MK=	yes
 _USES_POST+=	autoreconf
 
-BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
-		automake>=1.16.1:devel/automake
-
-.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
-BUILD_DEPENDS+=	libtoolize:devel/libtool
-.endif
-
 AUTORECONF?=	${LOCALBASE}/bin/autoreconf
 AUTORECONF_WRKSRC?=	${WRKSRC}
 
@@ -71,6 +64,13 @@ AUTORECONF_WRKSRC?=	${WRKSRC}
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK)
 _INCLUDE_USES_AUTORECONF_POST_MK=	yes
 
+BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
+		automake>=1.16.1:devel/automake
+
+.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
+BUILD_DEPENDS+=	libtoolize:devel/libtool
+.endif
+
 .if empty(autoreconf_ARGS)
 _USES_configure+=	470:do-autoreconf
 do-autoreconf:
diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
index c16db36ab456..04bb981a8b37 100644
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -106,7 +106,7 @@ EMACS_FLAVOR=	full
 EMACS_VER=			27.0.50
 EMACS_PORTDIR=		editors/emacs-devel
 .else
-EMACS_VER=		26.2
+EMACS_VER=		26.3
 EMACS_PORTDIR=		editors/emacs
 .endif
 
diff --git a/Mk/Uses/fpc.mk b/Mk/Uses/fpc.mk
index f7761f606689..2438fca5ec15 100644
--- a/Mk/Uses/fpc.mk
+++ b/Mk/Uses/fpc.mk
@@ -61,7 +61,8 @@ ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 .endif
 
-BUILD_DEPENDS+=		${PPNAME}:lang/fpc
+BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			${PPNAME}:lang/fpc
 
 BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
 UNITSDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk
index 4d34c045c977..ed8ed0c2015c 100644
--- a/Mk/Uses/gl.mk
+++ b/Mk/Uses/gl.mk
@@ -46,5 +46,10 @@ LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
 .endif
 .endfor
 
+# We only need USES=xorg if we want USE_XORG modules
+.if defined(USE_XORG) && !empty(USE_XORG)
+.include "${USESDIR}/xorg.mk"
+.endif
+
 # _INCLUDE_USES_GL_MK
 .endif
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 49a14b65355a..72408e259593 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -54,7 +54,7 @@ _KDE_RELNAME=		KDE${_KDE_VERSION}
 
 # === VERSIONS OF THE DIFFERENT COMPONENTS =====================================
 # Current KDE desktop.
-KDE_PLASMA_VERSION?=		5.16.4
+KDE_PLASMA_VERSION?=		5.16.5
 KDE_PLASMA_BRANCH?=		stable
 
 # Current KDE frameworks.
@@ -62,8 +62,8 @@ KDE_FRAMEWORKS_VERSION?=	5.61.0
 KDE_FRAMEWORKS_BRANCH?= 	stable
 
 # Current KDE applications.
-KDE_APPLICATIONS_VERSION?=	19.08.0
-KDE_APPLICATIONS_SHLIB_VER?=	5.12.0
+KDE_APPLICATIONS_VERSION?=	19.08.1
+KDE_APPLICATIONS_SHLIB_VER?=	5.12.1
 KDE_APPLICATIONS_BRANCH?=	stable
 # Upstream moves old software to Attic/. Specify the newest applications release there.
 # Only the major version is used for the comparison.
@@ -533,7 +533,7 @@ kde-ksysguard_PORT=		sysutils/plasma5-ksysguard
 kde-ksysguard_PATH=		${KDE_PREFIX}/bin/ksysguard
 
 kde-kwallet-pam_PORT=		security/plasma5-kwallet-pam
-kde-kwallet-pam_PATH=		${KDE_PREFIX}/lib/security/pam_kwallet5.so
+kde-kwallet-pam_PATH=		${KDE_PREFIX}/lib/pam_kwallet5.so
 
 kde-kwayland-integration_PORT=	x11/plasma5-kwayland-integration
 kde-kwayland-integration_PATH=	${QT_PLUGINDIR}/kf5/org.kde.kidletime.platforms/KF5IdleTimeKWaylandPlugin.so
diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk
index d6151d51aa4f..d619be008a1d 100644
--- a/Mk/Uses/lazarus.mk
+++ b/Mk/Uses/lazarus.mk
@@ -72,7 +72,8 @@ LAZARUS_DIR?=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 
-BUILD_DEPENDS+=		fpcres:lang/fpc-utils
+BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+			fpcres:lang/fpc-utils
 
 BUILDNAME=		${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_UNITS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 4aab7e4fa368..7e622517cece 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -64,6 +64,8 @@ linux_dbusglib_DEP=		linux-${linux_ARGS}-dbus-glib>0:devel/linux-${linux_ARGS}-d
 linux_dbuslibs_DEP=		linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs
 linux_devtools_DEP=		linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools
 linux_dri_DEP=			linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri
+linux_elfutils-libelf_DEP=	linux-${linux_ARGS}-elfutils-libelf>0:devel/linux-${linux_ARGS}-elfutils-libelf
+linux_elfutils-libs_DEP=	linux-${linux_ARGS}-elfutils-libs>0:devel/linux-${linux_ARGS}-elfutils-libs
 linux_expat_DEP=		linux-${linux_ARGS}-expat>0:textproc/linux-${linux_ARGS}-expat
 .if ${linux_ARGS} == c6
 linux_flac_DEP=			linux-${linux_ARGS}-flac>0:audio/linux-${linux_ARGS}-flac
@@ -88,7 +90,6 @@ linux_libaudiofile_DEP=		linux-${linux_ARGS}-audiofile>0:audio/linux-${linux_ARG
 .else
 linux_libaudiofile_DEP=		linux-${linux_ARGS}-audiofile>0:audio/linux-${linux_ARGS}-audiofile
 .endif
-linux_libelf_DEP=		linux-${linux_ARGS}-elfutils-libelf>0:devel/linux-${linux_ARGS}-libelf
 linux_libgcrypt_DEP=		linux-${linux_ARGS}-libgcrypt>0:security/linux-${linux_ARGS}-libgcrypt
 linux_libgfortran_DEP=		linux-${linux_ARGS}-libgfortran>0:devel/linux-${linux_ARGS}-libgfortran
 linux_libglvnd_DEP=		linux-${linux_ARGS}-libglvnd>0:graphics/linux-${linux_ARGS}-libglvnd
@@ -107,6 +108,7 @@ linux_libv4l_DEP=		linux-${linux_ARGS}-libv4l>0:multimedia/linux-${linux_ARGS}-l
 linux_libvorbis_DEP=		linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-libvorbis
 linux_libxml2_DEP=		linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2
 linux_lttng-ust_DEP=		linux-${linux_ARGS}-lttng-ust>0:sysutils/linux-${linux_ARGS}-lttng-ust
+linux_lz4_DEP=			linux-${linux_ARGS}-lz4>0:archivers/linux-${linux_ARGS}-lz4
 linux_mikmod_DEP=		linux-${linux_ARGS}-libmikmod>0:audio/linux-${linux_ARGS}-mikmod
 linux_naslibs_DEP=		linux-${linux_ARGS}-nas>0:audio/linux-${linux_ARGS}-nas-libs
 linux_nettle_DEP=		linux-${linux_ARGS}-nettle>0:security/linux-${linux_ARGS}-nettle
@@ -123,7 +125,7 @@ linux_openmotif_DEP=		linux-${linux_ARGS}-motif>0:x11-toolkits/linux-${linux_ARG
 .if ${linux_ARGS} == c6
 linux_openssl_DEP=		linux-${linux_ARGS}-openssl>0:security/linux-${linux_ARGS}-openssl
 .else
-linux_openssl_DEP=		linux-${linux_ARGS}-openssl-libs>0:security/linux-${linux_ARGS}-openssl
+linux_openssl_DEP=		# empty
 .endif
 linux_p11-kit_DEP=		linux-${linux_ARGS}-p11-kit>0:security/linux-${linux_ARGS}-p11-kit
 linux_pango_DEP=		linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango
@@ -144,6 +146,7 @@ linux_sdl12_DEP=		linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12
 linux_sdlimage_DEP=		linux-${linux_ARGS}-sdl_image>0:graphics/linux-${linux_ARGS}-sdl_image
 linux_sdlmixer_DEP=		linux-${linux_ARGS}-sdl_mixer>0:audio/linux-${linux_ARGS}-sdl_mixer
 linux_sqlite3_DEP=		linux-${linux_ARGS}-sqlite>0:databases/linux-${linux_ARGS}-sqlite3
+linux_systemd-libs_DEP=		linux-${linux_ARGS}-systemd-libs>0:devel/linux-${linux_ARGS}-systemd-libs
 linux_tcl85_DEP=		linux-${linux_ARGS}-tcl85>0:lang/linux-${linux_ARGS}-tcl85
 linux_tcp_wrappers-libs_DEP=	linux-${linux_ARGS}-tcp_wrappers-libs>0:net/linux-${linux_ARGS}-tcp_wrappers-libs
 linux_tiff_DEP=			linux-${linux_ARGS}-libtiff>0:graphics/linux-${linux_ARGS}-tiff
diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk
index eb0dd5d7ce38..fcf55a203983 100644
--- a/Mk/Uses/motif.mk
+++ b/Mk/Uses/motif.mk
@@ -27,4 +27,9 @@ LIB_DEPENDS+=		libXm.so.4:x11-toolkits/open-motif
 MOTIFLIB?=	-L${LOCALBASE}/lib -lXm -lXp
 MAKE_ENV+=	MOTIFLIB="${MOTIFLIB}"
 
+# We only need USES=xorg if we want USE_XORG modules
+.if defined(USE_XORG) && !empty(USE_XORG)
+.include "${USESDIR}/xorg.mk"
+.endif
+
 .endif
diff --git a/Mk/Uses/pure.mk b/Mk/Uses/pure.mk
deleted file mode 100644
index a3d6a5fb0d40..000000000000
--- a/Mk/Uses/pure.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: Rusmir Dusko <nemysis@FreeBSD.org>
-# $FreeBSD$
-#
-# Provide support for Pure Programming Language based projects
-#
-# Feature:		pure
-# Usage:		USES=pure or USES=pure:ARGS
-# Valid ARGS:		ffi
-# ARGS description:
-# ffi			makes the port depends on pure-ffi at runtime
-#
-# MAINTAINER= ports@FreeBSD.org
-
-.if !defined(_INCLUDE_USES_PURE_MK)
-_INCLUDE_USES_PURE_MK=	yes
-
-_valid_ARGS=		ffi
-
-# Sanity check
-.for arg in ${pure_ARGS}
-.    if empty(_valid_ARGS:M${arg})
-IGNORE= Incorrect 'USES+= pure:${pure_ARGS}' usage: argument [${arg}] is not recognized
-.    endif
-.endfor
-
-LIB_DEPENDS+=	libpure.so:lang/pure
-.include "${USESDIR}/gmake.mk"
-
-.if ${pure_ARGS:Mffi}
-RUN_DEPENDS+=	${LOCALBASE}/lib/pure/ffi.pure:devel/pure-ffi
-.endif
-
-MAKE_ARGS+=	prefix=${PREFIX} mandir=${PREFIX}/man \
-		CC=${CC} CFLAGS="${CFLAGS}" \
-		CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
-		CPPFLAGS+=-I${LOCALBASE}/include \
-		LDFLAGS+=-L${LOCALBASE}/lib
-
-.endif #!defined(_INCLUDE_USES_PURE_MK)
diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk
new file mode 100644
index 000000000000..787d7b45d47d
--- /dev/null
+++ b/Mk/Uses/xorg-cat.mk
@@ -0,0 +1,185 @@
+# $FreeBSD$
+# 
+# xorg ports categories and other things needed to build xorg ports.
+# This is intended only for ports of xorg and freedesktop.org applications.
+#
+# Use USES=xorg and USE_XORG to depend on various xorg components.
+#
+# Feature:	xorg-cat
+# Usage:	USES=xorg-cat:category[,buildsystem]
+#
+# 		category is one of:
+# 		* app      Installs applications, no shared libraries.
+# 		* data     Installs only data.
+# 		* doc      no particular notes
+# 		* driver   depends on xorgproto at least
+# 		* font     don't install .pc file
+# 		* lib      various dependencies, install .pc file, needs
+# 		           pathfix
+# 		* proto    install .pc file, needs pathfix, most only needed at
+# 		           build time.
+# 		* util     no particular notes
+# 		* xserver  xorg x servers
+#
+# 		These categories has to match upstream categories.  Don't invent
+# 		your own.
+#
+# 		builsystem is one of:
+# 		* autotools (default)
+# 		* meson (experimental)
+#
+#
+# By defining USE_GITLAB and GL_COMMIT, it is possible to pull code straight
+# from the freedesktop.org gitlab, instead of official release tarballs.
+#
+#.MAINTAINER:	x11@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_XORG_CAT_MK)
+_INCLUDE_USES_XORG_CAT_MK=yes
+
+_XORG_CATEGORIES=	app data doc driver font lib proto util xserver
+_XORG_BUILDSYSTEMS=	autotools meson
+
+_XORG_CAT=		# empty
+_XORG_BUILDSYS=		# empty
+
+.  if empty(xorg-cat_ARGS)
+IGNORE=		no arguments specified to xorg-cat
+.  endif
+
+.  for _arg in ${xorg-cat_ARGS}
+.    if ${_XORG_CATEGORIES:M${_arg}}
+.      if empty(_XORG_CAT)
+_XORG_CAT=	${_arg}
+.      else
+IGNORE=		multipe xorg categories specified via xorg-cat:${xorg-cat_ARGS:ts,}
+.      endif
+.    elif ${_XORG_BUILDSYSTEMS:M${_arg}}
+.      if empty(_XORG_BUILDSYS)
+_XORG_BUILDSYS=	${_arg}
+.      else
+IGNORE=		multipe xorg build systems specified via xorg-cat:${xorg-cat_ARGS:ts,}
+.      endif
+.    else
+IGNORE=		unknown argument specified via xorg-cat:${xorg-cat_ARGS:ts,}
+.    endif
+.  endfor
+
+# Default to the autotools build system
+.  if empty(_XORG_BUILDSYS)
+_XORG_BUILDSYS=		autotools
+.  endif
+
+# Default variables, common to all new modular xorg ports.
+.  if empty(USES:Mtar)
+EXTRACT_SUFX?=		.tar.bz2
+.  endif
+
+DIST_SUBDIR=	xorg/${_XORG_CAT}
+
+.  if ${_XORG_BUILDSYS} == meson
+IGNORE=		meson build not supported yet
+.include "${USESDIR}/meson.mk"
+.  elif ${_XORG_BUILDSYS} == autotools
+GNU_CONFIGURE=		yes
+.  else
+# This should not happen
+IGNORE=		unknown build system specified via xorg-cat:${xorg-cat_ARGS:ts,}
+.  endif
+
+.  if defined(USE_GITLAB)
+# Set up things for fetching from freedesktop.org gitlab.
+# This can be overridden using normal GL_* macros in the ports Makefile.
+# We make a best guess for GL_ACCOUNT and GL_PROJECT.
+GL_SITE?=		https://gitlab.freedesktop.org/xorg
+GL_ACCOUNT?=		${_XORG_CAT}
+GL_PROJECT?=		${PORTNAME:tl}
+.    if ${_XORG_BUILDSYS} == meson
+# set up meson stuff here
+.    else
+# Things from GL doesn't come with pre-generated configure, add dependency on
+# autoreconf and run it, if we're using autotools.
+.include "${USESDIR}/autoreconf.mk"
+.    endif
+.  else
+MASTER_SITES?=		XORG/individual/${_XORG_CAT}
+.  endif
+
+#
+## All xorg ports needs pkgconfig to build, but some ports look for pkgconfig
+## and then continues the build.
+.include "${USESDIR}/pkgconfig.mk"
+
+#
+## All xorg ports needs xorg-macros.
+.  if ${PORTNAME} != xorg-macros
+USE_XORG+=      xorg-macros
+.  endif
+
+.  if ${_XORG_CAT} == app
+# Nothing at the moment
+
+.  elif ${_XORG_CAT} == data
+# Nothing at the moment.
+
+.  elif ${_XORG_CAT} == driver
+USE_XORG+=	xi xorg-server xorgproto
+.    if ${_XORG_BUILDSYS} == meson
+# Put special stuff for meson here
+.    else
+CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
+libtool_ARGS?=	# empty
+.include "${USESDIR}/libtool.mk"
+INSTALL_TARGET=	install-strip
+.    endif
+
+.  elif ${_XORG_CAT} == font
+FONTNAME?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
+.    if ${_XORG_BUILDSYS} == meson
+# Put special stuff for meson here
+.    else
+CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts
+CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/share/fonts
+.    endif
+.    if !defined(NOFONT)
+.include "${USESDIR}/fonts.mk"
+BUILD_DEPENDS+=	mkfontscale>=0:x11-fonts/mkfontscale \
+		bdftopcf:x11-fonts/bdftopcf
+PLIST_FILES+=	"@comment ${FONTSDIR}/fonts.dir" \
+		"@comment ${FONTSDIR}/fonts.scale"
+.    endif
+
+.  elif ${_XORG_CAT} == lib
+.include "${USESDIR}/pathfix.mk"
+.    if ${_XORG_BUILDSYS} == meson
+# put meson stuff here
+.    else
+libtool_ARGS?=	# empty
+.include "${USESDIR}/libtool.mk"
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS+=--enable-malloc0returnsnull
+.    endif
+
+.  elif ${_XORG_CAT} == proto
+.include "${USESDIR}/pathfix.mk"
+
+.  elif ${_XORG_CAT} == xserver
+DISTNAME?=	xorg-server-${PORTVERSION}
+.include "${USESDIR}/pathfix.mk"
+.    if ${_XORG_BUILDSYS} == meson
+# put meson stuff here
+.    else
+CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
+			--with-fontrootdir=${LOCALBASE}/share/fonts
+.    endif
+LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
+USE_XORG+=	fontutil
+
+.  endif # ${_XORG_CAT} == <category>
+
+# We only need USES=xorg if we want USE_XORG modules
+.  if defined(USE_XORG) && !empty(USE_XORG)
+.include "${USESDIR}/xorg.mk"
+.  endif
+
+.endif
diff --git a/Mk/bsd.xorg.mk b/Mk/Uses/xorg.mk
index a5621f081386..2a2dea2b8989 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/Uses/xorg.mk
@@ -1,171 +1,101 @@
-#-*- tab-width: 4; -*-
-# ex:ts=4
-#
-# bsd.xorg.mk - Support for X.Org ports and dependencies
+# $FreeBSD$
 #
+# Originally from bsd.xorg.mk
 # Created by: Florent Thoumie <flz@FreeBSD.org>
 #
-# !!! Here be dragons !!! (yeah, here as well...)
+# Feature:		xorg
+# Usage:		USES=xorg
+# 			USE_XORG=<component>
 #
-# $FreeBSD$
+# 			Not specifying USE_XORG with USES=xorg is an error.
+#			
+#			Components can be found in the XORG_MODULES list below.
 #
-
-.if !defined(_POSTMKINCLUDED) && !defined(Xorg_Pre_Include)
-
-Xorg_Include_MAINTAINER=	x11@FreeBSD.org
-Xorg_Pre_Include=		bsd.xorg.mk
-
-# Some notes:
 #
-# app - Installs applications, no shared libraries.
-# data - Installs only data.
-# doc - no particular notes
-# driver - depends on xorgproto at least
-# font - don't install .pc file
-# lib - various dependencies, install .pc file, needs pathfix
-# proto - install .pc file, needs pathfix, most only needed at build time.
-# xserver - there's only one atm, I guess everything can fit into the port itself
+# If you feel something is missing from the list, please let us know.
+#
+# MAINTAINER:	x11@FreeBSD.org
 
-.if defined(XORG_CAT)
-# Default variables, common to all new modular xorg ports.
-.if !defined(USES) || ! ${USES:Mtar*}
-USES+=		tar:bzip2
+.if !defined(_INCLUDE_USES_XORG_MK)
+_INCLUDE_USES_XORG_MK=		yes
+_USES_POST+=	xorg
 .endif
-GNU_CONFIGURE= 	yes
-# for some reason this makes mkfontscale and others fail in the install target
-#INSTALL_TARGET=	install-strip
-DIST_SUBDIR=	xorg/${XORG_CAT}
-
-MASTER_SITES?=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR?=	individual/${XORG_CAT}
 
-# All xorg ports needs pkgconfig to build, but some ports look for pkgconfig and
-# then continues the build.
-USES+=		pkgconfig
+# Set up things after bsd.port.post.mk.
+# This way ports can add things to USE_XORG even after bsd.port.pre.mk is
+# included.
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_XORG_POST_MK)
+_INCLUDE_USES_XORG_POST_MK=	yes
 
-# All xorg ports needs xorg-macros.
-. if ${PORTNAME} != xorg-macros
-USE_XORG+=      xorg-macros
-. endif
-
-. if ${XORG_CAT} == "app"
-# Nothing at the moment
-. endif
-
-. if ${XORG_CAT} == "data"
-# Nothing at the moment.
-. endif
-
-. if ${XORG_CAT} == "driver"
-USE_XORG+=	xorg-server xorgproto xi
-CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
-USES+=		libtool
-INSTALL_TARGET=	install-strip
-. endif
-
-. if ${XORG_CAT} == "font"
-FONTNAME?=	${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/}
-CONFIGURE_ARGS+=	--with-fontrootdir=${PREFIX}/share/fonts
-CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/share/fonts
-.    if !defined(NOFONT)
-USES+=	fonts
-BUILD_DEPENDS+=	mkfontscale>=0:x11-fonts/mkfontscale \
-				bdftopcf:x11-fonts/bdftopcf
-PLIST_FILES+=	"@comment ${FONTSDIR}/fonts.dir" \
-				"@comment ${FONTSDIR}/fonts.scale"
-.    endif
+.  if !empty(xorg_ARGS)
+IGNORE=		USES=xorg takes no arguments
 .  endif
 
-. if ${XORG_CAT} == "lib"
-USES+=		pathfix libtool
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=--enable-malloc0returnsnull
-. endif
-
-. if ${XORG_CAT} == "proto"
-USES+=	pathfix
-. endif
-
-. if ${XORG_CAT} == "xserver"
-DISTFILES?=	xorg-server-${PORTVERSION}.tar.bz2
-WRKSRC=		${WRKDIR}/xorg-server-${PORTVERSION}
-USES+=	pathfix
-CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
-					--with-fontrootdir=${LOCALBASE}/share/fonts
-
-LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
-USE_XORG+=	fontutil:build
-. endif
-
-.endif
-
-.endif
-
-.if defined(_POSTMKINCLUDED) && !defined(Xorg_Post_Include)
+.  if !defined(USE_XORG)
+IGNORE=		need to specify xorg modules with USE_XORG
+.  endif
 
-Xorg_Post_Include=		bsd.xorg.mk
+# List of xorg modules
+XORG_MODULES=	dmx \
+		fontenc \
+		fontutil \
+		ice \
+		libfs \
+		oldx \
+		pciaccess \
+		pixman \
+		sm \
+		x11 \
+		xau \
+		xaw \
+		xaw6 \
+		xaw7 \
+		xbitmaps \
+		xcb \
+		xcomposite \
+		xcursor \
+		xdamage \
+		xdmcp \
+		xevie \
+		xext \
+		xfixes \
+		xfont \
+		xfont2 \
+		xfontcache \
+		xft \
+		xi \
+		xinerama \
+		xkbfile \
+		xkbui \
+		xmu \
+		xmuu \
+		xorg-macros \
+		xorg-server \
+		xorgproto \
+		xp \
+		xpm \
+		xprintapputil \
+		xprintutil \
+		xrandr \
+		xrender \
+		xres \
+		xscrnsaver \
+		xshmfence \
+		xt \
+		xtrans \
+		xtrap \
+		xtst \
+		xv \
+		xvmc \
+		xxf86dga \
+		xxf86misc \
+		xxf86vm
 
 # Register all xorg .pc files here.
 # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS.
-
-XORG_MODULES=	dmx \
-				fontenc \
-				fontutil \
-				ice \
-				libfs \
-				oldx \
-				pciaccess \
-				pixman \
-				sm \
-				x11 \
-				xau \
-				xaw \
-				xaw6 \
-				xaw7 \
-				xbitmaps \
-				xcb \
-				xcomposite \
-				xcursor \
-				xdamage \
-				xdmcp \
-				xevie \
-				xext \
-				xfixes \
-				xfont \
-				xfont2 \
-				xfontcache \
-				xft \
-				xi \
-				xinerama \
-				xkbfile \
-				xkbui \
-				xmu \
-				xmuu \
-				xorg-macros \
-				xorg-server \
-				xorgproto \
-				xp \
-				xpm \
-				xprintapputil \
-				xprintutil \
-				xrandr \
-				xrender \
-				xres \
-				xscrnsaver \
-				xshmfence \
-				xt \
-				xtrans \
-				xtrap \
-				xtst \
-				xv \
-				xvmc \
-				xxf86dga \
-				xxf86misc \
-				xxf86vm
-
 dmx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx
 fontenc_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc
-fontutil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util
+fontutil_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util
 ice_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE
 libfs_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS
 oldx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX
@@ -198,7 +128,7 @@ xmu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu
 xmuu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmuu.pc:x11-toolkits/libXmu
 xorg-macros_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:devel/xorg-macros
 xorg-server_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:x11-servers/xorg-server
-xorgproto_BUILD_DEPENDS=		xorgproto>=0:x11/xorgproto
+xorgproto_BUILD_DEPENDS=	xorgproto>=0:x11/xorgproto
 xp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp
 xpm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm
 xprintapputil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:x11/libXprintAppUtil
@@ -218,22 +148,27 @@ xxf86dga_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:x11/libXxf86
 xxf86misc_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc
 xxf86vm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm
 
-.for _module in ${USE_XORG:M*\:both:C/\:.*//g}
-. if ${XORG_MODULES:M${_module}} == ""
-IGNORE=				requires unknown xorg module (${_module})
-. endif
-RUN_DEPENDS+=			${${_module}_BUILD_DEPENDS}
-.endfor
+# Add explicit X options to avoid problems with false positives in configure
+.  if defined(GNU_CONFIGURE)
+CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
+.  endif
 
-.for _module in ${USE_XORG:C/\:.*//g}
-. if ${XORG_MODULES:M${_module}} == ""
-IGNORE=				requires unknown xorg module (${_module})
-. endif
-LIB_PC_DEPENDS+=		${${_module}_LIB_PC_DEPENDS}
-BUILD_DEPENDS+=			${${_module}_BUILD_DEPENDS}
-.endfor
+.  for _module in ${USE_XORG:M*\:both:C/\:.*//g}
+.    if ${XORG_MODULES:M${_module}} == ""
+IGNORE=		requires unknown xorg module (${_module})
+.    endif
+RUN_DEPENDS+=	${${_module}_BUILD_DEPENDS}
+.  endfor
+
+.  for _module in ${USE_XORG:C/\:both$//g}
+.    if ${XORG_MODULES:M${_module}} == ""
+IGNORE=		requires unknown xorg module (${_module})
+.    endif
+LIB_PC_DEPENDS+=${${_module}_LIB_PC_DEPENDS}
+BUILD_DEPENDS+=	${${_module}_BUILD_DEPENDS}
+.  endfor
 
-RUN_DEPENDS+=			${LIB_PC_DEPENDS}
-BUILD_DEPENDS+=			${LIB_PC_DEPENDS}
+RUN_DEPENDS+=	${LIB_PC_DEPENDS}
+BUILD_DEPENDS+=	${LIB_PC_DEPENDS}
 
 .endif
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 132e9f1de4f9..d8feded2404f 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -81,7 +81,7 @@ _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .endif
 # Possible values: 9.4, 9.5, 9.6, 10, 11, 12
-PGSQL_DEFAULT?=		9.5
+PGSQL_DEFAULT?=		11
 # Possible values: 7.1, 7.2, 7.3
 PHP_DEFAULT?=		7.2
 # Possible values: 2.7, 3.5, 3.6, 3.7
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index ff8bcd99728a..a527cb561836 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -71,14 +71,23 @@ USE_PERL5=	build
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrender xt
 HAS_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
+LDFLAGS+=		-Wl,--as-needed
 
 BUNDLE_LIBS=	yes
 
-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.34:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
+				rust-cbindgen>=0.8.7:devel/rust-cbindgen \
+				${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \
+				${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
+				node:www/node
+MOZ_EXPORT+=	${CONFIGURE_ENV} \
+				LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
+				PERL="${PERL}" \
+				PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}" \
+				RUSTFLAGS="${RUSTFLAGS}"
+MOZ_OPTIONS+=	--prefix="${PREFIX}"
+MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}"
 
-.if ${MOZILLA_VER:R:R} >= 56
-BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
-MOZ_EXPORT+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
 # Require newer Clang than what's in base system unless user opted out
 . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
@@ -87,21 +96,6 @@ CC=				${LOCALBASE}/bin/clang${LLVM_DEFAULT}
 CXX=			${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
 USES:=			${USES:Ncompiler\:*} # XXX avoid warnings
 . endif
-.endif
-
-.if ${MOZILLA_VER:R:R} >= 61
-BUILD_DEPENDS+=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g}
-MOZ_EXPORT+=	PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}"
-.endif
-
-.if ${MOZILLA_VER:R:R} >= 63
-BUILD_DEPENDS+=	rust-cbindgen>=0.8.7:devel/rust-cbindgen \
-				node:www/node
-.endif
-
-.if ${MOZILLA_VER:R:R} < 64
-MOZ_OPTIONS+=	--enable-pie
-.endif
 
 MOZSRC?=	${WRKSRC}
 PLISTF?=	${WRKDIR}/plist_files
@@ -109,14 +103,6 @@ PLISTF?=	${WRKDIR}/plist_files
 MOZCONFIG?=		${WRKSRC}/.mozconfig
 MOZILLA_PLIST_DIRS?=	bin lib share/pixmaps share/applications
 
-MOZ_EXPORT+=	${CONFIGURE_ENV} \
-				RUSTFLAGS="${RUSTFLAGS}" \
-				PERL="${PERL}"
-MOZ_OPTIONS+=	--prefix="${PREFIX}"
-MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}"
-
-LDFLAGS+=		-Wl,--as-needed
-
 # Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk
 .if ${ARCH} == amd64 || ${ARCH} == i386
 RUSTFLAGS+=	${CFLAGS:M-march=*:S/-march=/-C target-cpu=/}
@@ -199,7 +185,6 @@ BUILD_DEPENDS+=	${-${dep}_BUILD_DEPENDS}
 
 # Standard options
 MOZ_OPTIONS+=	\
-		--enable-default-toolkit=cairo-gtk3${PORT_OPTIONS:MWAYLAND:tl:C/.+/-&/} \
 		--enable-update-channel=${PKGNAMESUFFIX:Urelease:S/^-//} \
 		--disable-updater \
 		--with-system-zlib \
@@ -218,13 +203,11 @@ MOZ_EXPORT+=	MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
 MOZ_OPTIONS+=	--enable-optimize
 .else
 MOZ_OPTIONS+=	--disable-optimize
-. if ${MOZILLA_VER:R:R} >= 56
 .  if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
 # ld 2.17 barfs on Stylo built with -C opt-level=0
 USE_BINUTILS=	yes
 LDFLAGS+=		-B${LOCALBASE}/bin
 .  endif
-. endif
 .endif
 
 .if ${PORT_OPTIONS:MCANBERRA}
@@ -247,7 +230,8 @@ RUN_DEPENDS+=	ffmpeg>=0.8,1:multimedia/ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+=		gconf2
+# XXX USE_GNOME+=gconf2:build is not supported
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libgconf-2.so:devel/gconf2
 MOZ_OPTIONS+=	--enable-gconf
 .else
 MOZ_OPTIONS+=	--disable-gconf
@@ -285,20 +269,8 @@ post-patch-SNDIO-on:
 	@${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \
 		${MOZSRC}/media/libcubeb/src/moz.build \
 		${MOZSRC}/toolkit/library/moz.build
-. for tests in tests gtest
-	@if [ -f "${MOZSRC}/media/libcubeb/${tests}/moz.build" ]; then \
-		${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \
-			 ${MOZSRC}/media/libcubeb/${tests}/moz.build; \
-	fi
-. endfor
-	@if [ -f "${MOZSRC}/media/webrtc/trunk/webrtc/build/common.gypi" ]; then \
-		${REINPLACE_CMD} -e 's|OS==\"openbsd\"|OS==\"${OPSYS:tl}\"|g' \
-			${MOZSRC}/media/webrtc/trunk/webrtc/build/common.gypi; \
-	fi
-	@if [ -f "${MOZSRC}/media/webrtc/signaling/test/common.build" ]; then \
-		${ECHO_CMD} "OS_LIBS += ['sndio']" >> \
-			${MOZSRC}/media/webrtc/signaling/test/common.build; \
-	fi
+	@${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \
+			 ${MOZSRC}/media/libcubeb/gtest/moz.build
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -306,7 +278,7 @@ MOZ_OPTIONS+=	--enable-debug --disable-release
 STRIP=	# ports/184285
 .else
 MOZ_OPTIONS+=	--disable-debug --disable-debug-symbols --enable-release
-. if ${MOZILLA_VER:R:R} >= 68 && (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2})
+. if ${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}
 MOZ_OPTIONS+=	--enable-rust-simd
 . endif
 .endif
@@ -406,21 +378,6 @@ gecko-post-patch:
 		-e 's|share/mozilla/extensions|lib/xpi|g' \
 		${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \
 		${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp
-.if ${MOZILLA_VER:R:R} < 61
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${MOZSRC}/extensions/spellcheck/hunspell/*/mozHunspell.cpp
-.endif
-
-pre-configure: gecko-pre-configure
-
-gecko-pre-configure:
-.if ${PORT_OPTIONS:MWAYLAND}
-# .if !exists() evaluates too early before gtk3 has a chance to be installed
-	@if ! pkg-config --exists gtk+-wayland-3.0; then \
-		${ECHO_MSG} "${PKGNAME}: Needs gtk3 with WAYLAND support enabled."; \
-		${FALSE}; \
-	fi
-.endif
 
 post-install-script: gecko-create-plist
 
diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk
index 1b01fe9ad345..e61e35fe1df5 100644
--- a/Mk/bsd.options.desc.mk
+++ b/Mk/bsd.options.desc.mk
@@ -22,6 +22,7 @@ AALIB_DESC?=		AAlib graphics library support
 ACOUSTID_DESC?=		AcoustID audio fingerprinting support
 ALAC_DESC?=		Apple Lossless audio format support
 ALSA_DESC?=		ALSA audio architecture support
+ALTIVEC_DESC?=		Use Altivec optimized routines
 AMR_DESC?=		AMR 3GPP speech codec support (opencore)
 AMR_NB_DESC?=		AMR Narrow Band audio support (opencore)
 AMR_WB_DESC?=		AMR Wide Band audio support (opencore)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 5cdc0051e2ca..7db88d34989a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -396,9 +396,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  Implies NO_LICENSES_INSTALL=yes, NO_MTREE=yes, and causes
 #				  Linux ldconfig to be used when USE_LDCONFIG is defined.
 ##
-# USE_XORG			- Set to a list of X.org module dependencies.
-#				  Implies inclusion of bsd.xorg.mk.
-##
 # USE_TEX			- A list of the TeX dependencies the port has.
 #
 ##
@@ -613,8 +610,8 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  scripts or nothing, depending on what's available.
 # build			- Actually compile the sources.
 # install		- Install the results of a build.
-# reinstall		- Install the results of a build, ignoring "already installed"
-#				  flag.
+# reinstall		- Install the results of a build, deinstalling any previous
+#				  installation if needed.
 # deinstall		- Remove the installation.
 # deinstall-all	- Remove all installations with the same PKGORIGIN.
 # test			- Run tests for the port.
@@ -1032,6 +1029,7 @@ STAGEDIR?=	${WRKDIR}/stage
 NOTPHONY?=
 FLAVORS?=
 FLAVOR?=
+OVERLAYS?=
 # Disallow forced FLAVOR as make argument since we cannot change it to the
 # proper default.
 .if empty(FLAVOR) && !empty(.MAKEOVERRIDES:MFLAVOR)
@@ -1041,7 +1039,9 @@ FLAVOR?=
 .if !defined(_FLAVOR)
 _FLAVOR:=	${FLAVOR}
 .endif
+.if !defined(PORTS_FEATURES) && empty(${PORTS_FEATURES:MFLAVORS})
 PORTS_FEATURES+=	FLAVORS
+.endif
 MINIMAL_PKG_VERSION=	1.6.0
 
 _PORTS_DIRECTORIES+=	${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \
@@ -1331,10 +1331,6 @@ DISTNAME?=	${PORTNAME}-${DISTVERSIONFULL}
 
 INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
 
-.if defined(USE_XORG) || defined(XORG_CAT)
-.include "${PORTSDIR}/Mk/bsd.xorg.mk"
-.endif
-
 PACKAGES?=		${PORTSDIR}/packages
 TEMPLATES?=		${PORTSDIR}/Templates
 KEYWORDS?=		${PORTSDIR}/Keywords
@@ -1352,6 +1348,18 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 .include "${PORTSDIR}/Mk/bsd.local.mk"
 .endif
 
+.if defined(USE_XORG) && (!defined(USES) || !${USES:Mxorg})
+DEV_WARNING+=		"Using USE_XORG alone is deprecated, please use USES=xorg"
+USES+=	xorg
+.endif
+
+.if defined(XORG_CAT)
+DEV_WARNING+=		"Using XORG_CAT is deprecated, please use USES=xorg-cat:category"
+.if !defined(USES) || !${USES:Mxorg-cat*}
+USES+=	xorg-cat:${XORG_CAT}
+.endif
+.endif
+
 .if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))
 DEV_WARNING+=		"Using USE_PHP alone is deprecated, please use USES=php"
 USES+=	php
@@ -1445,7 +1453,17 @@ ${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
 .endif
 .endfor
 .for f in ${USES}
-.include "${USESDIR}/${f:C/\:.*//}.mk"
+.undef _usefound
+.for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
+_usefile=	${udir}/${f:C/\:.*//}.mk
+.if exists(${_usefile}) && !defined(_usefound)
+_usefound=
+.include "${_usefile}"
+.endif
+.endfor
+.if !defined(_usefound)
+ERROR+=	"Unkonwn USES=${f:C/\:.*//}"
+.endif
 .endfor
 
 .if !empty(FLAVORS)
@@ -1914,8 +1932,9 @@ _FORCE_POST_PATTERNS=	rmdir kldxref mkfontscale mkfontdir fc-cache \
 .include "${PORTSDIR}/Mk/bsd.local.mk"
 .endif
 
-.if defined(USE_XORG) || defined(XORG_CAT)
-.include "${PORTSDIR}/Mk/bsd.xorg.mk"
+.if defined(USE_XORG) && (!defined(USES) || ( defined(USES) && !${USES:Mxorg} ))
+DEV_WARNING+=	"Using USE_XORG alone is deprecated, please use USES=xorg"
+_USES_POST+=	xorg
 .endif
 
 .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER1)
@@ -1956,7 +1975,17 @@ ${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
 .endif
 .endfor
 .for f in ${_USES_POST}
-.include "${USESDIR}/${f:C/\:.*//}.mk"
+.undef _usefound
+.for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
+_usefile=	${udir}/${f:C/\:.*//}.mk
+.if exists(${_usefile}) && !defined(_usefound)
+_usefound=
+.include "${_usefile}"
+.endif
+.endfor
+.if !defined(_usefound)
+ERROR+=	"Unkonwn USES=${f:C/\:.*//}"
+.endif
 .endfor
 
 .if defined(PORTNAME)
@@ -1968,13 +1997,6 @@ CONFIGURE_ENV+=	LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
 MAKE_ENV+=		LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE}
 .endif
 
-.if defined(USE_XORG)
-# Add explicit X options to avoid problems with false positives in configure
-.if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
-.endif
-.endif
-
 # Macro for doing in-place file editing using regexps
 REINPLACE_ARGS?=	-i.bak
 REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}
@@ -3213,8 +3235,7 @@ do-configure:
 .endif
 
 # Build
-# XXX: ${MAKE_ARGS:N${DESTDIRNAME}=*} would be easier but it is not valid with the old fmake
-DO_MAKE_BUILD?=	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}
+DO_MAKE_BUILD?=	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*}
 .if !target(do-build)
 do-build:
 	@(cd ${BUILD_WRKSRC}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \
@@ -3334,7 +3355,7 @@ do-install:
 # Test
 
 .if !target(do-test) && defined(TEST_TARGET)
-DO_MAKE_TEST?=	${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS:C,^${DESTDIRNAME}=.*,,g}
+DO_MAKE_TEST?=	${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*}
 do-test:
 	@(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \
 		if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \
@@ -3651,7 +3672,7 @@ checkpatch:
 .if !target(reinstall)
 reinstall:
 	@${RM} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
-	@cd ${.CURDIR} && DEPENDS_TARGET="${DEPENDS_TARGET}" ${MAKE} -DFORCE_PKG_REGISTER install
+	@cd ${.CURDIR} && DEPENDS_TARGET="${DEPENDS_TARGET}" ${MAKE} deinstall install
 .endif
 
 .if !target(restage)
@@ -3966,6 +3987,7 @@ ${deptype:tl}-depends:
 		dp_SH="${SH}" \
 		dp_SCRIPTSDIR="${SCRIPTSDIR}" \
 		PORTSDIR="${PORTSDIR}" \
+		dp_OVERLAYS="${OVERLAYS}" \
 		dp_MAKE="${MAKE}" \
 		dp_MAKEFLAGS='${.MAKEFLAGS}' \
 		${SH} ${SCRIPTSDIR}/do-depends.sh
@@ -4020,11 +4042,13 @@ DEPENDS-LIST= \
 			dp_PKGNAME="${PKGNAME}" \
 			dp_PKG_INFO="${PKG_INFO}" \
 			dp_SCRIPTSDIR="${SCRIPTSDIR}" \
+			dp_OVERLAYS="${OVERLAYS}" \
 			${SH} ${SCRIPTSDIR}/depends-list.sh \
 			${DEPENDS_SHOW_FLAVOR:D-f}
 
 ALL-DEPENDS-LIST=			${DEPENDS-LIST} -r ${_UNIFIED_DEPENDS:Q}
 ALL-DEPENDS-FLAVORS-LIST=	${DEPENDS-LIST} -f -r ${_UNIFIED_DEPENDS:Q}
+DEINSTALL-DEPENDS-FLAVORS-LIST=	${DEPENDS-LIST} -f -r ${_UNIFIED_DEPENDS:N${PKG_DEPENDS}:Q}
 MISSING-DEPENDS-LIST=		${DEPENDS-LIST} -m ${_UNIFIED_DEPENDS:Q}
 BUILD-DEPENDS-LIST=			${DEPENDS-LIST} "${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}"
 RUN-DEPENDS-LIST=			${DEPENDS-LIST} "${LIB_DEPENDS} ${RUN_DEPENDS}"
@@ -4049,7 +4073,7 @@ limited-clean-depends:
 .if !target(deinstall-depends)
 deinstall-depends:
 	@recursive_cmd="deinstall"; \
-	    recursive_dirs="$$(${ALL-DEPENDS-FLAVORS-LIST})"; \
+		recursive_dirs="$$(${DEINSTALL-DEPENDS-FLAVORS-LIST})"; \
 		${_FLAVOR_RECURSIVE_SH}
 .endif
 
@@ -4640,12 +4664,9 @@ STAGE_ARGS=		-i ${STAGEDIR}
 fake-pkg:
 .if defined(INSTALLS_DEPENDS)
 	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME} as automatic"
-.else
-	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
-.endif
-.if defined(INSTALLS_DEPENDS)
 	@${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} -d ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
 .else
+	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
 	@${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
 .endif
 	@${RM} -r ${METADIR}
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 049b972e2aad..632b7c752eb9 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -154,8 +154,8 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 #
 # Ruby 2.4
 #
-RUBY_RELVERSION=	2.4.6
-RUBY_PORTREVISION=	2
+RUBY_RELVERSION=	2.4.7
+RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY24=			""	# PLIST_SUB helpers
@@ -164,8 +164,8 @@ RUBY24=			""	# PLIST_SUB helpers
 #
 # Ruby 2.5
 #
-RUBY_RELVERSION=	2.5.5
-RUBY_PORTREVISION=	3
+RUBY_RELVERSION=	2.5.6
+RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY25=			""	# PLIST_SUB helpers
@@ -174,8 +174,8 @@ RUBY25=			""	# PLIST_SUB helpers
 #
 # Ruby 2.6
 #
-RUBY_RELVERSION=	2.6.3
-RUBY_PORTREVISION=	4
+RUBY_RELVERSION=	2.6.4
+RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY26=			""	# PLIST_SUB helpers
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index 04542537d798..7323b30dfbfa 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -58,7 +58,7 @@ ERROR+=	"${a} is unsupported, please use ${${a}_ALT}"
 
 # Warnings only when DEVELOPER=yes
 
-.if exists(${.CURDIR}/../../Mk/bsd.port.mk)
+.if exists(${.CURDIR}/../../Mk/bsd.port.mk) || ${OVERLAYS:tA:M${.CURDIR:H:H}} == ${.CURDIR:H:H}
 .if ${.CURDIR:H:T} != ${PKGCATEGORY}
 DEV_ERROR+=	"The first entry in CATEGORIES should be the directory where the port lives"
 .endif
@@ -287,7 +287,7 @@ APACHE_PORT_ALT=	DEFAULT_VERSIONS+=apache=${APACHE_PORT:S/www\/apache//:C/2(0-9)
 USE_FPC_RUN_ALT=	USES=fpc:run
 WANT_FPC_BASE_ALT=	USES=fpc:base
 WANT_FPC_ALL_ALT=	USES=fpc:all
-USE_QT4_ALT=		USES=qt:5 and USE_QT=${USE_QT4} (beware) as Qt4 has been removed
+USE_QT4_ALT=		USES=qt:5 and USE_QT=${USE_QT4} \(beware\) as Qt4 has been removed
 USE_QT5_ALT=		USES=qt:5 and USE_QT=${USE_QT5}
 QT_NONSTANDARD_ALT=	USES=qmake:no_env
 
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 946614fdcedd..f611c5d8c0bb 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -137,43 +137,39 @@ MASTER_SITE_CRATESIO+=	https://crates.io/api/v1/crates/%SUBDIR%/download?dummy=/
 .if !defined(IGNORE_MASTER_SITE_DEBIAN)
 MASTER_SITE_DEBIAN+= \
 	http://cdn.debian.net/debian/%SUBDIR%/ \
+	http://http.debian.net/debian/%SUBDIR%/ \
 	http://www.gtlib.gatech.edu/pub/debian/%SUBDIR%/ \
 	ftp://ftp.us.debian.org/debian/%SUBDIR%/ \
-	${MASTER_SITE_DEBIAN_NON_US:S,/debian-non-US/,/debian/,}
-.endif
-
-.if !defined(IGNORE_MASTER_SITE_DEBIAN_NON_US)
-MASTER_SITE_DEBIAN_NON_US+= \
-	http://ftp.au.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.bg.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.br.debian.org/debian-non-US/%SUBDIR%/ \
-	http://ftp.cl.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.cz.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.de.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.ee.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.es.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.fi.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.fr.debian.org/debian-non-US/%SUBDIR%/ \
-	http://ftp.hk.debian.org/debian-non-US/%SUBDIR%/ \
-	http://ftp.hr.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.hu.debian.org/debian-non-US/%SUBDIR%/ \
-	http://ftp.ie.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.is.debian.org/debian-non-US/%SUBDIR%/ \
-	http://ftp.it.debian.org/debian-non-US/%SUBDIR%/ \
-	http://ftp.jp.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.nl.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.no.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.pl.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.ru.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.se.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.si.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.sk.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.uk.debian.org/debian-non-US/%SUBDIR%/ \
-	http://ftp.wa.au.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp2.de.debian.org/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.snt.utwente.nl/pub/linux/debian-non-US/%SUBDIR%/ \
-	ftp://ftp.acc.umu.se/debian-non-US/%SUBDIR%/ \
-	ftp://mirror.symnds.com/debian-non-US/%SUBDIR%/
+	http://ftp.au.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.bg.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.br.debian.org/debian/%SUBDIR%/ \
+	http://ftp.cl.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.cz.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.de.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.ee.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.es.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.fi.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.fr.debian.org/debian/%SUBDIR%/ \
+	http://ftp.hk.debian.org/debian/%SUBDIR%/ \
+	http://ftp.hr.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.hu.debian.org/debian/%SUBDIR%/ \
+	http://ftp.ie.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.is.debian.org/debian/%SUBDIR%/ \
+	http://ftp.it.debian.org/debian/%SUBDIR%/ \
+	http://ftp.jp.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.nl.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.no.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.pl.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.ru.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.se.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.si.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.sk.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.uk.debian.org/debian/%SUBDIR%/ \
+	http://ftp.wa.au.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp2.de.debian.org/debian/%SUBDIR%/ \
+	ftp://ftp.snt.utwente.nl/pub/linux/debian/%SUBDIR%/ \
+	ftp://ftp.acc.umu.se/debian/%SUBDIR%/ \
+	ftp://mirror.symnds.com/debian/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_DEBIAN_POOL)
@@ -855,15 +851,12 @@ MASTER_SITE_MYSQL+= \
 
 .if !defined(IGNORE_MASTER_SITE_NETBSD)
 MASTER_SITE_NETBSD+= \
-	https://ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.iastate.edu/pub/netbsd/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.plig.net/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.proxad.net/mirrors/ftp.netbsd.org/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.unina.it/pub/Unix/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.uninett.no/bsd/unix/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://sunsite.uio.no/bsd/unix/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.demon.co.uk/pub/mirrors/NetBSD/packages/distfiles/%SUBDIR%/ \
-	ftp://ftp.funet.fi/pub/NetBSD/packages/distfiles/%SUBDIR%/
+	https://ftp.netbsd.org/pub/pkgsrc/distfiles/%SUBDIR%/ \
+	http://ftp.fr.netbsd.org/pub/pkgsrc/%SUBDIR%/ \
+	ftp://ftp2.fr.netbsd.org/pub/pkgsrc/%SUBDIR%/ \
+	ftp://ftp3.de.netbsd.org/pub/pkgsrc/%SUBDIR%/ \
+	ftp://ftp2.jp.netbsd.org/pub/pkgsrc/%SUBDIR%/ \
+	ftp://ftp7.jp.netbsd.org/pub/pkgsrc/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_NETLIB)