Simplified diff (i.e. without removed ports themselves) of no-py27 against r565250, INDEX builds
No One
Actions

Authored By

	rene
	Feb 14 2021, 7:12 PM

Size

78 KB

Referenced Files

None

Subscribers

None

Simplified diff (i.e. without removed ports themselves) of no-py27 against r565250, INDEX builds
View Options

	diff --git a/MOVED b/MOVED
	index badc3cd65e07..751bd6c5de99 100644
	--- a/MOVED
	+++ b/MOVED
	@@ -16167,3 +16167,16 @@ security/greenbone-security-assistant9\|security/greenbone-security-assistant\|202
	misc/pnpids\|misc/hwdata\|2021-02-14\|Rename package to upstreams name
	misc/cdcollect\|\|2021-02-14\|Has expired: Unmaintained and dead upstream (12+ years) depends on deprecated libraries as www/gtkhtml3
	security/krb5-116\|security/krb5-118\|2021-02-14\|Has expired: EOL one year after the release of krb5 1.18
	+#### PYTHON 2.7 ####
	+devel/godot2\|devel/godot\|9999-12-31\|Move to suported version
	+devel/godot2-tools\|devel/godot-tools\|9999-12-31\|Move to suported version
	+devel/llvm60\|devel/llvm80\|9999-12-31\|Move to suported version
	+devel/llvm70\|devel/llvm80\|9999-12-31\|Move to suported version
	+devel/subversion-lts\|devel/subversion\|9999-12-31\|Move to suported version
	+devel/viewvc\|devel/viewvc-devel\|9999-12-31\|Move to suported version
	+lang/spidermonkey185\|lang/spidermonkey78\|9999-12-31\|Move to suported version
	+lang/spidermonkey52\|lang/spidermonkey78\|9999-12-31\|Move to suported version
	+lang/spidermonkey60\|lang/spidermonkey78\|9999-12-31\|Move to suported version
	+www/node10\|www/node14\|9999-12-31\|Move to suported version
	+www/node12\|www/node14\|9999-12-31\|Move to suported version
	+#### PYTHON 2.7 ####
	diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
	index 8d34d0ccdf02..4a988e1cc36c 100644
	--- a/Mk/Scripts/qa.sh
	+++ b/Mk/Scripts/qa.sh
	@@ -50,7 +50,7 @@ shebangonefile() {
	/bin/rc)
	# whitelist some interpreters
	;;
	- ${LOCALBASE}/bin/python\|${PREFIX}/bin/python\|${LOCALBASE}/bin/python2\|${PREFIX}/bin/python2\|${LOCALBASE}/bin/python3\|${PREFIX}/bin/python3)
	+ ${LOCALBASE}/bin/python\|${PREFIX}/bin/python\|${LOCALBASE}/bin/python3\|${PREFIX}/bin/python3)
	badinterp="${interp}"
	;;
	${LINUXBASE}/*) ;;
	@@ -71,7 +71,7 @@ shebangonefile() {
	/usr/bin/env)
	interparg=$(sed -n -e '1s/^#![[:space:]][^[:space:]][[:space:]]$[^[:space:]]$.*/\1/p;2q' "${f}")
	case "${interparg}" in
	- python\|python2\|python3)
	+ python\|python3)
	badinterp="${interp} ${interparg}"
	;;
	esac
	@@ -962,7 +962,7 @@ depends_blacklist()
	instead=""

	case "$origin" in
	- lang/python\|lang/python2\|lang/python3)
	+ lang/python\|lang/python3)
	# lang/python depends on lang/pythonX, but it's
	# ok, it is also in the blacklist.
	if [ ${PKGORIGIN} != lang/python ]; then
	diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk
	index 212acd7db889..850343c33b6f 100644
	--- a/Mk/Uses/fortran.mk
	+++ b/Mk/Uses/fortran.mk
	@@ -4,7 +4,7 @@
	#
	# Feature: fortran
	# Usage: USES=fortran
	-# Valid ARGS: flang, gfortran (default)
	+# Valid ARGS: gfortran (default)
	#
	# MAINTAINER: fortran@FreeBSD.org

	@@ -15,17 +15,7 @@ _INCLUDE_USES_FORTRAN_MK= yes
	fortran_ARGS= ${FORTRAN_DEFAULT}
	.endif

	-.if ${fortran_ARGS} == flang
	-.if ${ARCH} == amd64
	-BUILD_DEPENDS+= flang>0:devel/flang
	-RUN_DEPENDS+= flang>0:devel/flang
	-F77= flang
	-FC= flang
	-LDFLAGS+= -L${LOCALBASE}/flang/lib -Wl,--as-needed -lflang -lexecinfo -Wl,--no-as-needed
	-.else
	-IGNORE= USES=fortran: flang argument only available for amd64
	-.endif
	-.elif ${fortran_ARGS} == gfortran
	+.if ${fortran_ARGS} == gfortran
	_GCC_VER= ${GCC_DEFAULT:S/.//}
	BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
	RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
	diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
	index 8fe19724fde7..f83679030b7b 100644
	--- a/Mk/Uses/python.mk
	+++ b/Mk/Uses/python.mk
	@@ -18,7 +18,6 @@
	#
	# Examples:
	#
	-# USES=python:2.7 # Supports Python 2.7 Only
	# USES=python:3.6+ # Supports Python 3.6 or later
	# USES=python:3.6-3.9 # Supports Python 3.6 to 3.9
	# USES=python:-3.8 # Supports Python up to 3.8
	@@ -31,7 +30,7 @@
	#
	# Not specifying a <version-spec> should only be used when a more specific
	# <version-spec> cannot be specified due to syntax limitations, for
	-# example: 2.7,3.4-3.6, but even in this case, X.Y+ (2.7+), or -X.Y (-3.6)
	+# example: 3.6,3.8-3.9, but even in this case, X.Y+ (3.6+), or -X.Y (-3.9)
	# is preferred and likely more correct.
	#
	# patch Python is needed at patch time. Adds dependency to PATCH_DEPENDS.
	@@ -52,7 +51,7 @@
	# Exported variables:
	#
	# PYTHON_VERSION - The chosen Python interpreter including the version,
	-# e.g. python2.7, python3.5, etc.
	+# e.g. python3.6, python3.7, etc.
	#
	# Variables, which can be set by the port:
	#
	@@ -82,13 +81,13 @@
	#
	# are linked from the prefixed version to the
	# prefix-less original name, e.g.
	-# bin/foo-2.7 --> bin/foo.
	+# bin/foo-3.6 --> bin/foo.
	#
	# cython - Depend on lang/cython at build-time.
	#
	# cython_run - Depend on lang/cython at run-time.
	#
	-# flavors - Force creation of flavors for Python 2 and 3 default
	+# flavors - Force creation of flavors for Python 3 default
	# versions, where applicable.
	#
	# noflavors - Disable automatic creation of flavors if they would
	@@ -109,7 +108,7 @@
	# port that uses distutils when defined.
	# requires: distutils
	#
	-# py3kplist - Automatically generates Python 3.x compatible
	+# * py3kplist * - Automatically generates Python 3.x compatible
	# __pycache__ entries from a Python 2.x packaging list
	# when defined. Use this for ports that do not use
	# standard Python packaging mechanisms such as
	@@ -176,17 +175,17 @@
	# PYTHON_PORTSDIR - The port directory of the chosen Python interpreter
	#
	# PYTHON_REL - The release number of the chosen Python interpreter
	-# without dots, e.g. 2706, 3401, ...
	+# without dots, e.g. 3709, 3807, ...
	#
	# PYTHON_SUFFIX - The major-minor release number of the chosen Python
	-# interpreter without dots, e.g. 27, 36, ...
	+# interpreter without dots, e.g. 36, 38, ...
	# Used for prefixes and suffixes.
	#
	# PYTHON_MAJOR_VER - The major release version of the chosen Python
	-# interpreter, e.g. 2, 3, ...
	+# interpreter, e.g. 3, ...
	#
	# PYTHON_VER - The major-minor release version of the chosen Python
	-# interpreter, e.g. 2.7, 3.6, ...
	+# interpreter, e.g. 3.7, 3.8, ...
	#
	# PYTHON_ABIVER - Additional ABI flags set by the chosen Python
	# interpreter, e.g. md
	@@ -234,11 +233,6 @@
	# PYTHON_VER=${PYTHON_VER}
	# PYTHON_VERSION=${PYTHON_VERSION}
	#
	-# and PYTHON2 and PYTHON3 will be set according to the Python version:
	-#
	-# PYTHON2="" PYTHON3="@comment " for Python 2.x
	-# PYTHON2="@comment " PYTHON3="" for Python 3.x
	-#
	# PYDISTUTILS_INSTALLNOSINGLE
	# - Deprecated without replacement
	#
	@@ -250,8 +244,8 @@ _INCLUDE_USES_PYTHON_MK= yes
	# What Python version and what Python interpreters are currently supported?
	# When adding a version, please keep the comment in
	# Mk/bsd.default-versions.mk in sync.
	-_PYTHON_VERSIONS= 2.7 3.7 3.8 3.9 3.6 # preferred first
	-_PYTHON_PORTBRANCH= 2.7 # ${_PYTHON_VERSIONS:[1]}
	+_PYTHON_VERSIONS= 3.7 3.8 3.9 3.6 # preferred first
	+_PYTHON_PORTBRANCH= 3.7 # ${_PYTHON_VERSIONS:[1]}
	_PYTHON_BASECMD= ${LOCALBASE}/bin/python
	_PYTHON_RELPORTDIR= lang/python

	@@ -320,17 +314,13 @@ _PYTHON_RUN_DEP= yes
	_PYTHON_TEST_DEP= yes
	.endif

	-.if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}
	-WARNING+= "PYTHON_DEFAULT must be a version present in PYTHON2_DEFAULT or PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"
	+.if ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT}
	+WARNING+= "PYTHON_DEFAULT must be a version present in PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf"
	.endif

	-.if ${_PYTHON_ARGS} == 2.7
	-DEV_WARNING+= "lang/python27 reached End of Life and will be removed on 2020-12-31, consider converting to a modern version of python"
	-.elif ${_PYTHON_ARGS} == 2
	-DEV_ERROR+= "USES=python:2 is no longer supported, use USES=python:2.7"
	-.elif ${_PYTHON_ARGS} == 3
	+.if ${_PYTHON_ARGS} == 3
	DEV_ERROR+= "USES=python:3 is no longer supported, use USES=python:3.6+ or an appropriate version range"
	-.endif # ${_PYTHON_ARGS} == 2.7
	+.endif # ${_PYTHON_ARGS} == 3

	_PYTHON_VERSION:= ${PYTHON_DEFAULT}

	@@ -362,7 +352,7 @@ _PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most
	# If we have an unsupported version of Python, try another.
	.if defined(_PYTHON_VERSION_NONSUPPORTED)
	.undef _PYTHON_VERSION
	-.for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
	+.for ver in ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
	__VER= ${ver}
	.if !defined(_PYTHON_VERSION) && \
	!(!empty(_PYTHON_VERSION_MINIMUM) && ( \
	@@ -380,7 +370,7 @@ IGNORE= needs an unsupported version of Python
	# Automatically generates FLAVORS if empty
	.if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS)
	. undef _VALID_PYTHON_VERSIONS
	-. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
	+. for ver in ${PYTHON_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
	__VER= ${ver}
	. if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
	${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \
	@@ -402,7 +392,7 @@ _ALL_PYTHON_FLAVORS= ${_PYTHON_VERSIONS:S/.//:S/^/py/}
	. if defined(BUILD_ALL_PYTHON_FLAVORS) \|\| defined(_PYTHON_FEATURE_ALLFLAVORS)
	FLAVORS= ${_ALL_PYTHON_FLAVORS}
	. else
	-. for _v in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT}
	+. for _v in ${PYTHON_DEFAULT} ${PYTHON3_DEFAULT}
	_f= py${_v:S/.//}
	. if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}}
	.if !empty(FLAVORS)
	@@ -418,7 +408,7 @@ FLAVOR= ${FLAVORS:[1]}
	. endif
	.endif

	-.if ${FLAVOR:Mpy[23][0-9]}
	+.if ${FLAVOR:Mpy3[0-9]}
	_PYTHON_VERSION= ${FLAVOR:S/py//:C/(.)/\1./}
	.endif

	@@ -465,19 +455,12 @@ PYTHON_REL= ${PYTHON_PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9]+)$

	# Might be overridden by calling ports
	PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION}
	-.if ${PYTHON_VER} != 2.7
	.if exists(${PYTHON_CMD}-config)
	PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags
	.elif ${PYTHON_REL} < 3800
	# Default ABI flags for lang/python3[67] ports
	PYTHON_ABIVER= m
	.endif
	-.endif
	-
	-.if ${PYTHON_MAJOR_VER} == 2
	-DEPRECATED?= Uses Python 2.7 which is EOLed upstream
	-EXPIRATION_DATE?= 2020-12-31
	-.endif

	.if !defined(PYTHONBASE)
	PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \
	@@ -528,8 +511,8 @@ RUN_DEPENDS+= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
	.endif

	.if defined(_PYTHON_FEATURE_CONCURRENT)
	-.if !defined(_PYTHON_FEATURE_FLAVORS) && (${_PYTHON_VERSION_MINIMUM:M3} \|\| ${_PYTHON_VERSION_MAXIMUM:M2})
	-DEV_WARNING+= "USE_PYTHON=concurrent when only one of Python 2 or 3 is supported AND not using flavors does not make any sense"
	+.if !defined(_PYTHON_FEATURE_FLAVORS) && ${_PYTHON_VERSION_MINIMUM:M3*}
	+DEV_WARNING+= "USE_PYTHON=concurrent when only Python 3 is supported AND not using flavors does not make any sense"
	.endif
	_USES_POST+= uniquefiles:dirs
	.if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]}
	@@ -616,8 +599,8 @@ add-plist-pymod:
	${_PYTHONPKGLIST} \| ${SORT} >> ${TMPPLIST}

	.else
	-.if ${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST)
	-# When Python version is 3.2+ we rewrite all the filenames
	+.if defined(_PYTHON_FEATURE_PY3KPLIST)
	+# We rewrite all the filenames
	# of TMPPLIST that end with .py[co], so that they conform
	# to PEP 3147 (see https://www.python.org/dev/peps/pep-3147/)
	PYMAGICTAG= ${PYTHON_CMD} -c 'import sys; print(sys.implementation.cache_tag)'
	@@ -632,7 +615,7 @@ add-plist-python:
	pc="__pycache__" mt="$$(${PYMAGICTAG})" pyo="opt-1.pyc" \
	${TMPPLIST} > ${TMPPLIST}.pyc_tmp
	@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
	-.endif # ${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST)
	+.endif # defined(_PYTHON_FEATURE_PY3KPLIST)
	.endif # defined(_PYTHON_FEATURE_AUTOPLIST) && defined(_PYTHON_FEATURE_DISTUTILS)

	# Fix for programs that build python from a GNU auto* environment
	@@ -647,18 +630,10 @@ PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}
	PYNUMPY= ${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.20,1:math/py-numpy@${PY_FLAVOR}

	# Common Python modules that can be needed but only for some versions of Python.
	-.if ${PYTHON_REL} < 3500
	-PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments-25>=2.5.1<3:textproc/py-pygments-25@${PY_FLAVOR}
	-.else
	PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
	PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.1<3:textproc/py-pygments@${PY_FLAVOR}
	-.endif

	-.if ${PYTHON_REL} < 3400
	-PY_ENUM34= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1<2.0:devel/py-enum34@${PY_FLAVOR}
	-.else
	PY_ENUM34=
	-.endif

	.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
	PY_MERCURIAL= ${PYTHON_PKGNAMEPREFIX}mercurial>=5.5:devel/mercurial@${PY_FLAVOR}
	@@ -693,11 +668,6 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
	PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
	PYTHON_VER=${PYTHON_VER} \
	PYTHON_VERSION=${PYTHON_VERSION}
	-.if ${PYTHON_REL} < 3000
	-PLIST_SUB+= PYTHON2="" PYTHON3="@comment "
	-.else
	-PLIST_SUB+= PYTHON2="@comment " PYTHON3=""
	-.endif

	_USES_POST+= python
	.endif # _INCLUDE_USES_PYTHON_MK
	diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
	index 5cfbd3356a73..0aa0ed895bc2 100644
	--- a/Mk/Uses/qt-dist.mk
	+++ b/Mk/Uses/qt-dist.mk
	@@ -28,7 +28,7 @@ _QT5_DISTS= 3d activeqt androidextras base charts connectivity datavis3d \
	lottie macextras multimedia networkauth purchasing quick3d quickcontrols \
	quickcontrols2 quicktimeline remoteobjects script scxml sensors serialbus \
	serialport speech svg tools translations virtualkeyboard wayland \
	- webchannel webengine webglplugin websockets webview winextras \
	+ webchannel webglplugin websockets webview winextras \
	x11extras xmlpatterns
	_QT_DISTS= ${_QT${_QT_VER}_DISTS}

	@@ -73,12 +73,7 @@ DESTDIRNAME= INSTALL_ROOT

	. if ${_QT_VER:M5}
	MASTER_SITE_SUBDIR?= official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
	-# www/qt5-webengine hackery: The tarballs of 5.9.5 had a different naming scheme.
	-. if ${QT5_VERSION} == "5.9.5"
	-DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-opensource-src-${DISTVERSION},}
	-. else
	DISTNAME= ${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},}
	-. endif
	DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},}
	DIST_SUBDIR= KDE/Qt/${_QT_VERSION}

	diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
	index 3cf09bd62bae..746abc633a9a 100644
	--- a/Mk/Uses/qt.mk
	+++ b/Mk/Uses/qt.mk
	@@ -142,7 +142,7 @@ _USE_QT5_ONLY= 3d buildtools charts concurrent connectivity \
	qdbus qdoc qdoc-data qev quick3d quickcontrols quickcontrols2 \
	quicktimeline remoteobjects scxml sensors serialbus serialport speech \
	sql-tds uiplugin uitools virtualkeyboard wayland webchannel webglplugin \
	- webengine websockets websockets-qml webview widgets x11extras
	+ websockets websockets-qml webview widgets x11extras

	# Dependency tuples: _LIB should be preferred if possible.
	qt-3d_PORT= graphics/${_QT_RELNAME}-3d
	@@ -330,9 +330,6 @@ qt-wayland_LIB= libQt${_QT_LIBVER}WaylandClient.so
	qt-webchannel_PORT= www/${_QT_RELNAME}-webchannel
	qt-webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so

	-qt-webengine_PORT= www/${_QT_RELNAME}-webengine
	-qt-webengine_LIB= libQt${_QT_LIBVER}WebEngine.so
	-
	qt-webglplugin_PORT= www/${_QT_RELNAME}-webglplugin
	qt-webglplugin_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforms/libqwebgl.so

	diff --git a/Mk/Uses/scons.mk b/Mk/Uses/scons.mk
	index 2c2eaf7a3f0c..b6b63f2bfcc8 100644
	--- a/Mk/Uses/scons.mk
	+++ b/Mk/Uses/scons.mk
	@@ -4,9 +4,8 @@
	#
	# Feature: scons
	# Usage: USES=scons[:ARGS]
	-# Valid ARGS: python2 python3
	+# Valid ARGS: python3
	#
	-# python2: Use default python 2.x to run scons
	# python3: Use default python 3.x to run scons (default)
	#
	# MAINTAINER: python@FreeBSD.org
	@@ -20,10 +19,6 @@ scons_ARGS= python3

	.if ${scons_ARGS} == python3
	_SCONS_PYTHON_VER= ${PYTHON3_DEFAULT}
	-.elif ${scons_ARGS} == python2
	-_SCONS_PYTHON_VER= ${PYTHON2_DEFAULT}
	-DEPRECATED?= Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
	-EXPIRATION_DATE?= 2020-12-31
	.else
	IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' usage
	.endif
	diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
	index b5c8bd323d51..eb2c690f41f5 100644
	--- a/Mk/bsd.default-versions.mk
	+++ b/Mk/bsd.default-versions.mk
	@@ -20,8 +20,8 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes
	LOCALBASE?= /usr/local

	.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
	- IMAGEMAGICK JAVA JULIA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL PERL5 \
	- PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
	+ IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL PERL5 \
	+ PGSQL PHP PYTHON PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
	.if defined(${lang}_DEFAULT)
	ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
	.endif
	@@ -71,7 +71,7 @@ LIBRSVG2_DEFAULT?= legacy
	.endif
	# Possible values: c7
	LINUX_DEFAULT?= c7
	-# Possible values: 60, 70, 80, 90, 10, 11, -devel (to be used when non-base compiler is required)
	+# Possible values: 80, 90, 10, 11, -devel (to be used when non-base compiler is required)
	# Please give notice to the Graphics Team (x11@FreeBSD.org) in advance before
	# bumping the LLVM version.
	LLVM_DEFAULT?= 90
	@@ -102,8 +102,6 @@ PGSQL_DEFAULT?= 12
	PHP_DEFAULT?= 7.4
	# Possible values: 2.7, 3.6, 3.7, 3.8, 3.9
	PYTHON_DEFAULT?= 3.7
	-# Possible values: 2.7
	-PYTHON2_DEFAULT?= 2.7
	# Possible values: 3.6, 3.7, 3.8, 3.9
	PYTHON3_DEFAULT?= 3.7
	# Possible values: 2.5, 2.6, 2.7, 3.0
	diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk
	index 7202c3bfb40f..d8ed5bd8c30b 100644
	--- a/Mk/bsd.options.desc.mk
	+++ b/Mk/bsd.options.desc.mk
	@@ -416,7 +416,6 @@ PTH_DESC?= Threading/multiprocessing via GNU Pth
	PULSEAUDIO_DESC?= PulseAudio sound server support
	PYMALLOC_DESC?= Use Python's internal malloc()
	PYTHON_DESC?= Python bindings or support
	-PYTHON2_DESC?= Python 2.x bindings or support
	PYTHON3_DESC?= Python 3.x bindings or support
	QT5_DESC?= Qt 5 toolkit support
	QUICKTIME_DESC?= QuickTime media support
	diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
	index ec2758e70aab..05ccbebfbd14 100644
	--- a/Mk/bsd.sanity.mk
	+++ b/Mk/bsd.sanity.mk
	@@ -17,7 +17,7 @@ WARNING+= "WITHOUT_${opt} is unsupported, use WITHOUT=${opt} on the command
	ALL_UNSUPPORTED= WITHOUT_NLS NOPORTDOCS NOPORTEXAMPLES WITH_BDB_VER \
	OVERRIDE_LINUX_BASE_PORT WITH_OPENSSL_PORT \
	WITH_OPENSSL_BASE PYTHON_DEFAULT_VERSION \
	- PYTHON2_DEFAULT_VERSION PYTHON3_DEFAULT_VERSION
	+ PYTHON2 PYTHON2_DEFAULT_VERSION PYTHON3_DEFAULT_VERSION
	ALL_DEPRECATED=
	ALL_NOTNEEDED= WITH_NEW_XORG WITHOUT_NEW_XORG WITH_KMS WITHOUT_KMS

	@@ -33,7 +33,6 @@ WITHOUT_NEW_XORG_ALT= ${WITH_NEW_XORG_ALT}
	WITH_MKS_ALT= "removed and has no effect"
	WITHOUT_MKS_ALT= ${WITH_MKS_ALT}
	PYTHON_DEFAULT_VERSION_ALT= "DEFAULT_VERSIONS=python=${PYTHON_DEFAULT_VERSION:S/^python//}"
	-PYTHON2_DEFAULT_VERSION_ALT= "DEFAULT_VERSIONS=python2=${PYTHON2_DEFAULT_VERSION:S/^python//}"
	PYTHON3_DEFAULT_VERSION_ALT= "DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//}"

	.for a in ${ALL_DEPRECATED}
	diff --git a/Tools/scripts/checkcats.py b/Tools/scripts/checkcats.py
	index c00812c8cc01..4573d2fbc215 100755
	--- a/Tools/scripts/checkcats.py
	+++ b/Tools/scripts/checkcats.py
	@@ -33,10 +33,10 @@ if __name__ == '__main__':
	try:
	mastercat = categories.split()[0]
	except IndexError:
	- print '%s: categories list is empty' % dirname
	+ print('%s: categories list is empty' % dirname)
	continue
	mastercat_real = os.path.basename(os.path.dirname(dirname))
	if mastercat != mastercat_real:
	- print '%s: specified master category `%s\' doesn\'t match real one `%s\'' \
	- % (dirname, mastercat, mastercat_real)
	+ print('%s: specified master category `%s\' doesn\'t match real one `%s\'' \
	+ % (dirname, mastercat, mastercat_real))

	diff --git a/Tools/scripts/getpatch b/Tools/scripts/getpatch
	index 4799c6aa5a4c..7b4e4f5fd218 100755
	--- a/Tools/scripts/getpatch
	+++ b/Tools/scripts/getpatch
	@@ -37,7 +37,7 @@ import sys
	if sys.version_info.major == 3:
	import urllib.request as urllib2
	else:
	- import urllib2
	+ import urllib.request, urllib.error, urllib.parse

	"""
	FreeBSD getpatch handles Gnats and Bugzilla patch attachments
	@@ -89,7 +89,7 @@ class GetPatch(object):
	url = patch['url']
	p = patch['name']

	- data = urllib2.urlopen(url, context=self.ssl_context).read()
	+ data = urllib.request.urlopen(url, context=self.ssl_context).read()

	if self.output_stdout:
	sys.stdout.write(data.decode(self.default_locale))
	@@ -119,7 +119,7 @@ class GnatsGetPatch(GetPatch):
	"{}".format(self.pr))[category == '']
	self.out("[+] Fetching patch for pr {}".format(target))
	pattern = re.compile(self.REGEX)
	- u = urllib2.urlopen("{}{}".format(self.URL, target),
	+ u = urllib.request.urlopen("{}{}".format(self.URL, target),
	context=self.ssl_context)
	data = u.read()
	if data is None:
	@@ -143,7 +143,7 @@ class BzGetPatch(GetPatch):
	GetPatch.__init__(self, pr, category)

	def _get_patch_name(self, url):
	- data = urllib2.urlopen(url, context=self.ssl_context).read()
	+ data = urllib.request.urlopen(url, context=self.ssl_context).read()
	match = re.search(self.REGEX, str(data))
	if match is None:
	return None
	@@ -180,7 +180,7 @@ class BzGetPatch(GetPatch):
	target = ("{}/{}".format(category, self.pr),
	"{}".format(self.pr))[category == '']
	self.out("[+] Fetching patch for pr {}".format(target))
	- u = urllib2.urlopen("{}{}".format(self.URL_SHOW, self.pr),
	+ u = urllib.request.urlopen("{}{}".format(self.URL_SHOW, self.pr),
	context=self.ssl_context)
	data = u.read()

	@@ -193,7 +193,7 @@ class BzGetPatch(GetPatch):
	self.out("[-] No patch found")
	sys.exit(os.EX_UNAVAILABLE)

	- for url, file_name in patch_urls.items():
	+ for url, file_name in list(patch_urls.items()):
	self.add_patch(url, file_name)


	diff --git a/Tools/scripts/patchtool.py b/Tools/scripts/patchtool.py
	index 201b64bfbb96..1ddf8cb5e24c 100755
	--- a/Tools/scripts/patchtool.py
	+++ b/Tools/scripts/patchtool.py
	@@ -33,7 +33,7 @@ if sys.version_info < (3,):

	def isStr(obj):
	try:
	- return isinstance(obj, basestring)
	+ return isinstance(obj, str)
	except NameError:
	return isinstance(obj, str)

	@@ -277,7 +277,7 @@ def query_yn(message, default = False):
	return False
	elif reply == '' and default in (True, False):
	return default
	- print('Wrong answer "%s", please try again' % reply)
	+ print(('Wrong answer "%s", please try again' % reply))
	return default


	@@ -467,13 +467,13 @@ class PatchesCollection:

	def lookupbytarget(self, wrksrc, relpath):
	wrksrc = os.path.abspath(wrksrc)
	- for patch in self.patches.values():
	+ for patch in list(self.patches.values()):
	if wrksrc == patch.wrksrc and relpath == patch.plus3file:
	return patch
	return None

	def getpatchobjs(self):
	- return self.patches.values()
	+ return list(self.patches.values())


	#
	diff --git a/astro/Makefile b/astro/Makefile
	index b7c60d2af8dd..9f2d92e43a7b 100644
	--- a/astro/Makefile
	+++ b/astro/Makefile
	@@ -92,7 +92,6 @@
	SUBDIR += py-ro
	SUBDIR += py-spacetrack
	SUBDIR += pyweather
	- SUBDIR += qmapshack
	SUBDIR += readosm
	SUBDIR += rmap
	SUBDIR += roadmap
	diff --git a/astro/marble/Makefile b/astro/marble/Makefile
	index 9078ba41597d..d531fcdb5f68 100644
	--- a/astro/marble/Makefile
	+++ b/astro/marble/Makefile
	@@ -26,20 +26,15 @@ USE_LDCONFIG= yes
	MAKE_ENV= XDG_CONFIG_HOME=/dev/null
	# We have to set QT_IMPORTS_PATH, as it does not get picked up
	CMAKE_ARGS= -DMOBILE:BOOL=FALSE \
	- -DQT_IMPORTS_DIR:PATH=${QT_IMPORTDIR}
	+ -DQT_IMPORTS_DIR:PATH=${QT_IMPORTDIR} \
	+ CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets

	-OPTIONS_DEFINE= GPS DOCS WEBENGINE
	+OPTIONS_DEFINE= GPS DOCS
	OPTIONS_DEFAULT=GPS
	-OPTIONS_DEFAULT_amd64= WEBENGINE
	-OPTIONS_DEFAULT_i386= WEBENGINE
	OPTIONS_SUB= yes

	GPS_DESC= Support for GPS position provider
	GPS_LIB_DEPENDS= libgps.so:astro/gpsd
	GPS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_libgps

	-WEBENGINE_DESC= Add dependency on qt5-webengine
	-WEBENGINE_USE= QT=webengine
	-WEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets
	-
	.include <bsd.port.mk>
	diff --git a/astro/marble/pkg-plist b/astro/marble/pkg-plist
	index df1e29d29009..47ea13de996e 100644
	--- a/astro/marble/pkg-plist
	+++ b/astro/marble/pkg-plist
	@@ -106,12 +106,11 @@ include/marble/MarbleMap.h
	include/marble/MarbleMath.h
	include/marble/MarbleModel.h
	include/marble/MarbleNavigator.h
	-%%WEBENGINE%%include/marble/MarbleWebView.h
	include/marble/MarbleWidget.h
	include/marble/MarbleWidgetInputHandler.h
	include/marble/MarbleWidgetPopupMenu.h
	-%%NO_WEBENGINE%%include/marble/NullMarbleWebView.h
	-%%NO_WEBENGINE%%include/marble/NullTinyWebBrowser.h
	+include/marble/NullMarbleWebView.h
	+include/marble/NullTinyWebBrowser.h
	include/marble/OsmcSymbol.h
	include/marble/ParseRunnerPlugin.h
	include/marble/ParsingRunner.h
	@@ -156,7 +155,6 @@ include/marble/TileCreator.h
	include/marble/TileCreatorDialog.h
	include/marble/TileId.h
	include/marble/TileLevelRangeWidget.h
	-%%WEBENGINE%%include/marble/TinyWebBrowser.h
	include/marble/TourControlEditWidget.h
	include/marble/TourItemDelegate.h
	include/marble/TourPlayback.h
	@@ -220,12 +218,10 @@ lib/marble/plugins/NominatimReverseGeocodingPlugin.so
	lib/marble/plugins/NominatimSearchPlugin.so
	lib/marble/plugins/NotesPlugin.so
	lib/marble/plugins/OSRMPlugin.so
	-%%WEBENGINE%%lib/marble/plugins/OpenDesktopPlugin.so
	lib/marble/plugins/OpenLocationCodeSearchPlugin.so
	lib/marble/plugins/OpenRouteServicePlugin.so
	lib/marble/plugins/OsmPlugin.so
	lib/marble/plugins/OverviewMap.so
	-%%WEBENGINE%%lib/marble/plugins/Photo.so
	lib/marble/plugins/Pn2Plugin.so
	lib/marble/plugins/PntPlugin.so
	lib/marble/plugins/PositionMarker.so
	@@ -238,8 +234,6 @@ lib/marble/plugins/SatellitesPlugin.so
	lib/marble/plugins/Speedometer.so
	lib/marble/plugins/StarsPlugin.so
	lib/marble/plugins/SunPlugin.so
	-%%WEBENGINE%%lib/marble/plugins/Weather.so
	-%%WEBENGINE%%lib/marble/plugins/Wikipedia.so
	lib/marble/plugins/YoursPlugin.so
	lib/plugins/designer/LatLonEditPlugin.so
	lib/plugins/designer/MarbleNavigatorPlugin.so
	diff --git a/audio/Makefile b/audio/Makefile
	index 496004cf7edb..c861ab02d541 100644
	--- a/audio/Makefile
	+++ b/audio/Makefile
	@@ -81,7 +81,6 @@
	SUBDIR += cdplay
	SUBDIR += celt
	SUBDIR += checkmate
	- SUBDIR += cheesecutter
	SUBDIR += chordpack
	SUBDIR += chromaprint
	SUBDIR += clementine-player
	@@ -150,9 +149,6 @@
	SUBDIR += fapg
	SUBDIR += fasttracker2
	SUBDIR += faudio
	- SUBDIR += faust
	- SUBDIR += faust-lv2
	- SUBDIR += faustlive
	SUBDIR += fcplay
	SUBDIR += fdk-aac
	SUBDIR += fdmf
	@@ -288,10 +284,8 @@
	SUBDIR += gtkpod
	SUBDIR += gtmixer
	SUBDIR += guidolib
	- SUBDIR += guitarix-lv2
	SUBDIR += guspat
	SUBDIR += gvolwheel
	- SUBDIR += gxmms2
	SUBDIR += gxplugins-lv2
	SUBDIR += harp
	SUBDIR += headsetcontrol
	@@ -452,7 +446,6 @@
	SUBDIR += lv2lint
	SUBDIR += lv2proc
	SUBDIR += lvtk
	- SUBDIR += lxmusic
	SUBDIR += mac
	SUBDIR += madfufw
	SUBDIR += madplay
	@@ -844,7 +837,6 @@
	SUBDIR += xmix
	SUBDIR += xmixer
	SUBDIR += xmmix
	- SUBDIR += xmms2
	SUBDIR += xmp
	SUBDIR += xmradio
	SUBDIR += xoscope
	diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
	index 24488dd388a6..4dccc214ea78 100644
	--- a/audio/amarok/Makefile
	+++ b/audio/amarok/Makefile
	@@ -42,16 +42,15 @@ KDE_INVENT= 3e11ccdd1417e70486eaaa84d8475182eec44c20 multimedia
	CONFIGURE_ENV= MYSQL_DIR=${LOCALBASE}

	SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
	-CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLBASE}
	+CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLBASE} \
	+ CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine
	CMAKE_ON= WITH_DESKTOP_UI
	CMAKE_OFF= WITH_FFmpeg

	BROKEN_sparc64= does not build (GCC-related error)

	-OPTIONS_DEFINE= IPOD MP3TUNES MTP QTWEBENGINE
	+OPTIONS_DEFINE= IPOD MP3TUNES MTP
	OPTIONS_DEFAULT= IPOD MP3TUNES MTP
	-OPTIONS_DEFAULT_amd64= QTWEBENGINE
	-OPTIONS_DEFAULT_i386= QTWEBENGINE
	OPTIONS_SUB= yes

	IPOD_DESC= Apple iPod support
	@@ -75,10 +74,6 @@ MP3TUNES_CMAKE_BOOL_OFF= WITH_Libgcrypt
	MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp
	MTP_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Mtp

	-QTWEBENGINE_DESC= Add dependency on qt5-webengine
	-QTWEBENGINE_USE= qt=webengine
	-QTWEBENGINE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine
	-
	post-patch:
	@${REINPLACE_CMD} -e 's\|/usr/include\|${LOCALBASE}/include\|' \
	${WRKSRC}/cmake/modules/FindLoudmouth.cmake
	diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
	index 4ab3bfeec210..dd193756e2ce 100644
	--- a/audio/amarok/pkg-plist
	+++ b/audio/amarok/pkg-plist
	@@ -58,12 +58,8 @@ lib/libampache_account_login.so
	%%QT_QMLDIR%%/org/kde/amarok/qml/AppletHeader.qml
	%%QT_QMLDIR%%/org/kde/amarok/qml/libqml_plugin.so
	%%QT_QMLDIR%%/org/kde/amarok/qml/qmldir
	-%%QTWEBENGINE%%%%QT_QMLDIR%%/org/kde/amarok/wikipedia/libamarok_context_applet_wikipedia.so
	-%%QTWEBENGINE%%%%QT_QMLDIR%%/org/kde/amarok/wikipedia/qmldir
	%%DATADIR%%/data/DefaultPlaylistLayouts.xml
	%%DATADIR%%/data/InfoParserLoading.html
	-%%QTWEBENGINE%%%%DATADIR%%/data/WikipediaCustomStyle.css
	-%%QTWEBENGINE%%%%DATADIR%%/data/bullet.gif
	%%DATADIR%%/data/first_run_jingle.ogg
	%%DATADIR%%/data/hover_info_template.html
	%%DATADIR%%/data/podcast_directory.opml
	@@ -662,8 +658,6 @@ share/kpackage/amarok/org.kde.amarok.lyrics/contents.rcc
	share/kpackage/amarok/org.kde.amarok.lyrics/metadata.json
	share/kpackage/amarok/org.kde.amarok.photos/contents.rcc
	share/kpackage/amarok/org.kde.amarok.photos/metadata.json
	-%%QTWEBENGINE%%share/kpackage/amarok/org.kde.amarok.wikipedia/contents.rcc
	-%%QTWEBENGINE%%share/kpackage/amarok/org.kde.amarok.wikipedia/metadata.json
	share/kpackage/genericqml/org.kde.amarok.context/contents.rcc
	share/kpackage/genericqml/org.kde.amarok.context/metadata.json
	share/kservices5/ServiceMenus/amarok_append.desktop
	diff --git a/audio/csound/Makefile b/audio/csound/Makefile
	index ef1244d64c85..f48f67d62397 100644
	--- a/audio/csound/Makefile
	+++ b/audio/csound/Makefile
	@@ -30,6 +30,7 @@ CFLAGS_powerpcspe= -DPFFFT_SIMD_DISABLE
	CFLAGS_powerpc64= -maltivec
	CMAKE_ARGS= -DBUILD_CSOUNDVST:BOOL=OFF \
	-DBUILD_PD_CLASS:BOOL=OFF \
	+ -DBUILD_FAUST_OPCODES:BOOL=false \
	-DPYTHON_MODULE_INSTALL_DIR:PATH="${PYTHONPREFIX_SITELIBDIR}" \
	-DOPSYS:STRING="${OPSYS}"
	CMAKE_OFF= USE_ALSA BUILD_JAVA_INTERFACE BUILD_TESTS
	@@ -40,9 +41,9 @@ SUB_FILES= pkg-message

	OPTIONS_DEFINE= CURL FLTK HDF5 NLS OPENMP PORTAUDIO PULSEAUDIO
	OPTIONS_GROUP= PLUGINS
	-OPTIONS_GROUP_PLUGINS= BUCHLA CHUA DSSI EXCITER FAUST FLUIDSYNTH IMAGE JACK LUA LINALG OSC P5GLOVE PADSYNTH PLATEREV PVSGENDY SCANSYN SELECT SERIAL STACK STK WIIMOTE # Opcodes/CMakeLists.txt, Opcodes/stk/CMakeLists.txt
	+OPTIONS_GROUP_PLUGINS= BUCHLA CHUA DSSI EXCITER FLUIDSYNTH IMAGE JACK LUA LINALG OSC P5GLOVE PADSYNTH PLATEREV PVSGENDY SCANSYN SELECT SERIAL STACK STK WIIMOTE # Opcodes/CMakeLists.txt, Opcodes/stk/CMakeLists.txt
	OPTIONS_DEFAULT= FLTK OPENMP
	-OPTIONS_DEFAULT+= BUCHLA CHUA DSSI EXCITER FAUST IMAGE JACK LINALG OSC P5GLOVE PADSYNTH PLATEREV SCANSYN SELECT SERIAL STACK STK # for PLUGINS
	+OPTIONS_DEFAULT+= BUCHLA CHUA DSSI EXCITER IMAGE JACK LINALG OSC P5GLOVE PADSYNTH PLATEREV SCANSYN SELECT SERIAL STACK STK # for PLUGINS
	OPTIONS_SUB= yes

	BUCHLA_DESC= Build the Buchla filter opcode
	@@ -73,15 +74,6 @@ FLTK_CMAKE_OFF= -DBUILD_CSOUND_AC:BOOL=OFF \
	-DBUILD_VIRTUAL_KEYBOARD:BOOL=OFF \
	-DUSE_FLTK:BOOL=OFF

	-FAUST_DESC= Build the Faust opcodes
	-FAUST_USES= ssl
	-FAUST_LLVM_VERSION= 60
	-FAUST_BUILD_DEPENDS= faust>0:audio/faust
	-FAUST_RUN_DEPENDS= faust>0:audio/faust \
	- llvm${FAUST_LLVM_VERSION}>0:devel/llvm${FAUST_LLVM_VERSION}
	-FAUST_CMAKE_BOOL= BUILD_FAUST_OPCODES
	-FAUST_CMAKE_ON= -DFAUST_LLVM_VERSION:STRING=${FAUST_LLVM_VERSION}
	-
	FLUIDSYNTH_DESC= Building FluidSynth opcodes
	FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth
	FLUIDSYNTH_CMAKE_BOOL= BUILD_FLUID_OPCODES
	diff --git a/audio/csound/pkg-plist b/audio/csound/pkg-plist
	index 7d6670611385..bc6cdf230e2f 100644
	--- a/audio/csound/pkg-plist
	+++ b/audio/csound/pkg-plist
	@@ -75,7 +75,6 @@ lib/csound/plugins64-6.0/libdoppler.so
	lib/csound/plugins64-6.0/libemugens.so
	%%EXCITER%%lib/csound/plugins64-6.0/libexciter.so
	lib/csound/plugins64-6.0/libfareygen.so
	-%%FAUST%%lib/csound/plugins64-6.0/libfaustcsound.so
	%%FLUIDSYNTH%%lib/csound/plugins64-6.0/libfluidOpcodes.so
	lib/csound/plugins64-6.0/libfractalnoise.so
	lib/csound/plugins64-6.0/libframebuffer.so
	diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
	index bcda601ea2f9..9e93bfc59448 100644
	--- a/audio/musescore/Makefile
	+++ b/audio/musescore/Makefile
	@@ -42,14 +42,8 @@ CMAKE_OFF= BUILD_PORTMIDI BUILD_PCH MSCORE_UNSTABLE
	CMAKE_ON= USE_SYSTEM_FREETYPE
	CMAKE_BUILD_TYPE= release

	-# WebEngine is only available on i386/amd64, amd ppc64 starting FreeBSD 13.0.
	-# If enabled on arches that don't have WebEngine, the build breaks.
	-OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO WEBENGINE
	+OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO
	OPTIONS_DEFAULT= PORTAUDIO
	-OPTIONS_DEFAULT_amd64= WEBENGINE
	-OPTIONS_DEFAULT_i386= WEBENGINE
	-
	-WEBENGINE_DESC= Use WebEngine in the welcome panel

	ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
	ALSA_CMAKE_BOOL= BUILD_ALSA
	@@ -59,8 +53,6 @@ PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
	PORTAUDIO_CMAKE_BOOL= BUILD_PORTAUDIO
	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
	PULSEAUDIO_CMAKE_BOOL= BUILD_PULSEAUDIO
	-WEBENGINE_USE= qt=webengine
	-WEBENGINE_CMAKE_BOOL= BUILD_WEBENGINE

	.include <bsd.port.pre.mk>

	diff --git a/chinese/Makefile b/chinese/Makefile
	index 465da7bcc5b1..7edd8e62c6b0 100644
	--- a/chinese/Makefile
	+++ b/chinese/Makefile
	@@ -34,7 +34,6 @@
	SUBDIR += fcitx-configtool
	SUBDIR += fcitx-libpinyin
	SUBDIR += fcitx-rime
	- SUBDIR += fcitx-sunpinyin
	SUBDIR += fcitx-table-extra
	SUBDIR += fcitx-ui-light
	SUBDIR += fcitx5-chewing
	@@ -130,7 +129,6 @@
	SUBDIR += sourcehansans-tc-otf
	SUBDIR += sourcehanserif-sc-otf
	SUBDIR += sourcehanserif-tc-otf
	- SUBDIR += sunpinyin
	SUBDIR += taipeisanstc
	SUBDIR += tin
	SUBDIR += tintin++
	diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
	index 33726f2a8773..5bc817d294a9 100644
	--- a/comms/hamlib/pkg-plist
	+++ b/comms/hamlib/pkg-plist
	@@ -51,8 +51,7 @@ share/aclocal/hamlib.m4
	%%PORTDOCS%%%%DOCSDIR%%/README.developer
	%%PORTDOCS%%%%DOCSDIR%%/README.win32
	%%PORTDOCS%%%%DOCSDIR%%/THANKS
	-%%PYTHON2%%%%PORTDOCS%%%%DOCSDIR%%/examples/pytest.py
	-%%PYTHON3%%%%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py
	+%%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py
	%%PORTDOCS%%%%DOCSDIR%%/examples/perltest.pl
	%%PORTDOCS%%%%DOCSDIR%%/examples/tcltest.tcl
	%%PORTDOCS%%%%DOCSDIR%%/html/Hamlib_design.png
	diff --git a/databases/Makefile b/databases/Makefile
	index 229d6a5ee077..a7c1957b84a2 100644
	--- a/databases/Makefile
	+++ b/databases/Makefile
	@@ -41,8 +41,6 @@
	SUBDIR += cegobridge
	SUBDIR += clickhouse
	SUBDIR += cockroach
	- SUBDIR += couchdb2
	- SUBDIR += couchdb3
	SUBDIR += courier-authlib-mysql
	SUBDIR += courier-authlib-pgsql
	SUBDIR += courier-authlib-sqlite
	@@ -244,7 +242,6 @@
	SUBDIR += p5-Amazon-SimpleDB
	SUBDIR += p5-Amon2-DBI
	SUBDIR += p5-AnyEvent-BDB
	- SUBDIR += p5-AnyEvent-CouchDB
	SUBDIR += p5-AnyEvent-DBD-Pg
	SUBDIR += p5-AnyEvent-Memcached
	SUBDIR += p5-AnyEvent-Redis
	@@ -829,8 +826,6 @@
	SUBDIR += py-xapian
	SUBDIR += py-zodbpickle
	SUBDIR += pymongo
	- SUBDIR += pypy-gdbm
	- SUBDIR += pypy-sqlite3
	SUBDIR += qdbm
	SUBDIR += qdbm-plus
	SUBDIR += qof
	diff --git a/databases/postgresql10-server/pkg-plist-plpython b/databases/postgresql10-server/pkg-plist-plpython
	index 592925659278..4883fd4eec2a 100644
	--- a/databases/postgresql10-server/pkg-plist-plpython
	+++ b/databases/postgresql10-server/pkg-plist-plpython
	@@ -1,17 +1,10 @@
	include/postgresql/server/plpy_util.h
	include/postgresql/server/plpython.h
	%%DOCSDIR%%/README-plpython
	-%%PYTHON2%%lib/postgresql/plpython2.so
	-%%PYTHON3%%lib/postgresql/plpython3.so
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
	+lib/postgresql/plpython3.so
	+%%DATADIR%%/extension/plpython3u--1.0.sql
	+%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	+%%DATADIR%%/extension/plpython3u.control
	lib/postgresql/hstore_plpython3.so
	lib/postgresql/ltree_plpython3.so
	%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
	diff --git a/databases/postgresql11-server/pkg-plist-plpython b/databases/postgresql11-server/pkg-plist-plpython
	index 8ecdbbea15a3..17de39cb5cef 100644
	--- a/databases/postgresql11-server/pkg-plist-plpython
	+++ b/databases/postgresql11-server/pkg-plist-plpython
	@@ -13,17 +13,10 @@ include/postgresql/server/plpy_util.h
	include/postgresql/server/plpython.h
	lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
	%%DOCSDIR%%/README-plpython
	-%%PYTHON2%%lib/postgresql/plpython2.so
	-%%PYTHON3%%lib/postgresql/plpython3.so
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
	+lib/postgresql/plpython3.so
	+%%DATADIR%%/extension/plpython3u--1.0.sql
	+%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	+%%DATADIR%%/extension/plpython3u.control
	lib/postgresql/hstore_plpython3.so
	lib/postgresql/jsonb_plpython3.so
	lib/postgresql/ltree_plpython3.so
	diff --git a/databases/postgresql12-server/pkg-plist-plpython b/databases/postgresql12-server/pkg-plist-plpython
	index 8ecdbbea15a3..17de39cb5cef 100644
	--- a/databases/postgresql12-server/pkg-plist-plpython
	+++ b/databases/postgresql12-server/pkg-plist-plpython
	@@ -13,17 +13,10 @@ include/postgresql/server/plpy_util.h
	include/postgresql/server/plpython.h
	lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
	%%DOCSDIR%%/README-plpython
	-%%PYTHON2%%lib/postgresql/plpython2.so
	-%%PYTHON3%%lib/postgresql/plpython3.so
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
	+lib/postgresql/plpython3.so
	+%%DATADIR%%/extension/plpython3u--1.0.sql
	+%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	+%%DATADIR%%/extension/plpython3u.control
	lib/postgresql/hstore_plpython3.so
	lib/postgresql/jsonb_plpython3.so
	lib/postgresql/ltree_plpython3.so
	diff --git a/databases/postgresql13-server/pkg-plist-plpython b/databases/postgresql13-server/pkg-plist-plpython
	index c7e8217d6332..1609ef7150b7 100644
	--- a/databases/postgresql13-server/pkg-plist-plpython
	+++ b/databases/postgresql13-server/pkg-plist-plpython
	@@ -13,14 +13,9 @@ include/postgresql/server/plpy_util.h
	include/postgresql/server/plpython.h
	lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
	%%DOCSDIR%%/README-plpython
	-%%PYTHON2%%lib/postgresql/plpython2.so
	-%%PYTHON3%%lib/postgresql/plpython3.so
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
	+lib/postgresql/plpython3.so
	+%%DATADIR%%/extension/plpython3u--1.0.sql
	+%%DATADIR%%/extension/plpython3u.control
	lib/postgresql/hstore_plpython3.so
	lib/postgresql/jsonb_plpython3.so
	lib/postgresql/ltree_plpython3.so
	diff --git a/databases/postgresql95-server/pkg-plist-plpython b/databases/postgresql95-server/pkg-plist-plpython
	index 592925659278..4883fd4eec2a 100644
	--- a/databases/postgresql95-server/pkg-plist-plpython
	+++ b/databases/postgresql95-server/pkg-plist-plpython
	@@ -1,17 +1,10 @@
	include/postgresql/server/plpy_util.h
	include/postgresql/server/plpython.h
	%%DOCSDIR%%/README-plpython
	-%%PYTHON2%%lib/postgresql/plpython2.so
	-%%PYTHON3%%lib/postgresql/plpython3.so
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
	+lib/postgresql/plpython3.so
	+%%DATADIR%%/extension/plpython3u--1.0.sql
	+%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	+%%DATADIR%%/extension/plpython3u.control
	lib/postgresql/hstore_plpython3.so
	lib/postgresql/ltree_plpython3.so
	%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
	diff --git a/databases/postgresql96-server/pkg-plist-plpython b/databases/postgresql96-server/pkg-plist-plpython
	index 592925659278..4883fd4eec2a 100644
	--- a/databases/postgresql96-server/pkg-plist-plpython
	+++ b/databases/postgresql96-server/pkg-plist-plpython
	@@ -1,17 +1,10 @@
	include/postgresql/server/plpy_util.h
	include/postgresql/server/plpython.h
	%%DOCSDIR%%/README-plpython
	-%%PYTHON2%%lib/postgresql/plpython2.so
	-%%PYTHON3%%lib/postgresql/plpython3.so
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
	-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
	+lib/postgresql/plpython3.so
	+%%DATADIR%%/extension/plpython3u--1.0.sql
	+%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
	+%%DATADIR%%/extension/plpython3u.control
	lib/postgresql/hstore_plpython3.so
	lib/postgresql/ltree_plpython3.so
	%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
	diff --git a/databases/py-xapian/pkg-plist b/databases/py-xapian/pkg-plist
	index a5027b4685bc..1fa08a52ca13 100644
	--- a/databases/py-xapian/pkg-plist
	+++ b/databases/py-xapian/pkg-plist
	@@ -1,7 +1,5 @@
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
	+%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	+%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
	%%PYTHON_SITELIBDIR%%/xapian/__init__.py
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyc
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyo
	%%PYTHON_SITELIBDIR%%/xapian/_xapian.a
	%%PYTHON_SITELIBDIR%%/xapian/_xapian.so
	diff --git a/devel/Makefile b/devel/Makefile
	index a04daea2bec6..3743f4f540ea 100644
	--- a/devel/Makefile
	+++ b/devel/Makefile
	@@ -383,7 +383,6 @@
	SUBDIR += configkit
	SUBDIR += cons
	SUBDIR += cons-test
	- SUBDIR += containers
	SUBDIR += cook
	SUBDIR += corrade
	SUBDIR += courier-unicode
	@@ -456,7 +455,6 @@
	SUBDIR += cxxtest
	SUBDIR += cxxtools
	SUBDIR += d-feet
	- SUBDIR += d-scanner
	SUBDIR += darts
	SUBDIR += dash.el
	SUBDIR += datadraw
	@@ -468,8 +466,6 @@
	SUBDIR += dbus-sharp
	SUBDIR += dbus-sharp-glib
	SUBDIR += dbus-tcl
	- SUBDIR += dcd-client
	- SUBDIR += dcd-server
	SUBDIR += dconf
	SUBDIR += dconf-editor
	SUBDIR += debugedit
	@@ -480,8 +476,6 @@
	SUBDIR += delve
	SUBDIR += dep
	SUBDIR += deployer
	- SUBDIR += derelict-sdl2
	- SUBDIR += derelict-util
	SUBDIR += desed
	SUBDIR += desktop-file-utils
	SUBDIR += dev86
	@@ -497,7 +491,6 @@
	SUBDIR += distel
	SUBDIR += distorm
	SUBDIR += djgpp-binutils
	- SUBDIR += dlib
	SUBDIR += dmake
	SUBDIR += dmalloc
	SUBDIR += dmlc-core
	@@ -512,9 +505,7 @@
	SUBDIR += dparser
	SUBDIR += dragon
	SUBDIR += ds2
	- SUBDIR += dsymbol
	SUBDIR += dtool
	- SUBDIR += dub
	SUBDIR += dulwich
	SUBDIR += dupl
	SUBDIR += duplo
	@@ -536,7 +527,6 @@
	SUBDIR += efl
	SUBDIR += egypt
	SUBDIR += eiffelstudio
	- SUBDIR += electron11
	SUBDIR += elf
	SUBDIR += elfio
	SUBDIR += elfkickers
	@@ -654,8 +644,6 @@
	SUBDIR += fire-hpp
	SUBDIR += firmware-utils
	SUBDIR += fistgen
	- SUBDIR += flang
	- SUBDIR += flang-clang
	SUBDIR += flatbuffers
	SUBDIR += flatcc
	SUBDIR += flatzebra
	@@ -840,7 +828,6 @@
	SUBDIR += glui
	SUBDIR += gmake
	SUBDIR += gn
	- SUBDIR += gnatpython
	SUBDIR += gnome-builder
	SUBDIR += gnome-common
	SUBDIR += gnome-vfs
	@@ -861,8 +848,6 @@
	SUBDIR += gocheese
	SUBDIR += godot
	SUBDIR += godot-tools
	- SUBDIR += godot2
	- SUBDIR += godot2-tools
	SUBDIR += goffice
	SUBDIR += gogs
	SUBDIR += golangci-lint
	@@ -916,7 +901,6 @@
	SUBDIR += heimdall
	SUBDIR += hexcompare
	SUBDIR += hexd
	- SUBDIR += hgreviewboard
	SUBDIR += hgsvn
	SUBDIR += hhdate
	SUBDIR += highlighterkit
	@@ -958,7 +942,6 @@
	SUBDIR += ice37
	SUBDIR += icestorm
	SUBDIR += icmake
	- SUBDIR += icontheme
	SUBDIR += icu
	SUBDIR += icu-le-hb
	SUBDIR += icu-lx
	@@ -973,9 +956,7 @@
	SUBDIR += inastemp
	SUBDIR += include-what-you-use
	SUBDIR += indicators
	- SUBDIR += inifiled
	SUBDIR += inilib
	- SUBDIR += inilike
	SUBDIR += iniparser
	SUBDIR += initutil
	SUBDIR += injeqt
	@@ -986,7 +967,6 @@
	SUBDIR += ipython5
	SUBDIR += ireport
	SUBDIR += isa-l
	- SUBDIR += isfreedesktop
	SUBDIR += isl
	SUBDIR += ispc
	SUBDIR += itext
	@@ -1125,7 +1105,6 @@
	SUBDIR += libcii
	SUBDIR += libcircllhist
	SUBDIR += libcjson
	- SUBDIR += libclc
	SUBDIR += libcli
	SUBDIR += libconcurrent
	SUBDIR += libconfig
	@@ -1139,7 +1118,6 @@
	SUBDIR += libdatrie
	SUBDIR += libdbusmenu
	SUBDIR += libdbusmenu-qt
	- SUBDIR += libddoc
	SUBDIR += libdevq
	SUBDIR += libdfui
	SUBDIR += libdill
	@@ -1150,7 +1128,6 @@
	SUBDIR += libdlna
	SUBDIR += libdnsres
	SUBDIR += libdombey
	- SUBDIR += libdparse
	SUBDIR += libds
	SUBDIR += libdsp
	SUBDIR += libdwarf
	@@ -1217,7 +1194,6 @@
	SUBDIR += libgudev
	SUBDIR += libgutenfetch
	SUBDIR += libhash
	- SUBDIR += libhid
	SUBDIR += libhoard
	SUBDIR += libhtp
	SUBDIR += libhyve-remote
	@@ -1270,8 +1246,6 @@
	SUBDIR += libopkele
	SUBDIR += liborcus
	SUBDIR += libosinfo
	- SUBDIR += libosmo-abis
	- SUBDIR += libosmocore
	SUBDIR += libowfat
	SUBDIR += libpafe
	SUBDIR += libpafe-ruby
	@@ -1420,8 +1394,6 @@
	SUBDIR += llvm-devel
	SUBDIR += llvm10
	SUBDIR += llvm11
	- SUBDIR += llvm60
	- SUBDIR += llvm70
	SUBDIR += llvm80
	SUBDIR += llvm90
	SUBDIR += lm4tools
	@@ -1518,7 +1490,6 @@
	SUBDIR += mips-xtoolchain-gcc
	SUBDIR += mips64-gcc
	SUBDIR += mips64-xtoolchain-gcc
	- SUBDIR += mir-core
	SUBDIR += mk-configure
	SUBDIR += mm
	SUBDIR += mm-common
	@@ -1531,7 +1502,6 @@
	SUBDIR += mph
	SUBDIR += msbuild
	SUBDIR += msgpack
	- SUBDIR += msgpack-d
	SUBDIR += msgpuck
	SUBDIR += msitools
	SUBDIR += msp430-debug-stack
	@@ -4365,7 +4335,6 @@
	SUBDIR += py-enlighten
	SUBDIR += py-entrypoints
	SUBDIR += py-enum-compat
	- SUBDIR += py-enum34
	SUBDIR += py-envisage
	SUBDIR += py-epdb
	SUBDIR += py-epsilon
	@@ -5377,7 +5346,6 @@
	SUBDIR += rapidjson
	SUBDIR += raylib
	SUBDIR += rbenv
	- SUBDIR += rbtools
	SUBDIR += rclint
	SUBDIR += rcs
	SUBDIR += rcs57
	@@ -6795,7 +6763,6 @@
	SUBDIR += statik
	SUBDIR += statsvn
	SUBDIR += stb
	- SUBDIR += stdx-allocator
	SUBDIR += stfl
	SUBDIR += stlfilt
	SUBDIR += stlink
	@@ -6806,7 +6773,6 @@
	SUBDIR += stxxl
	SUBDIR += subversion
	SUBDIR += subversion-book
	- SUBDIR += subversion-lts
	SUBDIR += subversive
	SUBDIR += svk
	SUBDIR += svn2git
	@@ -6915,7 +6881,6 @@
	SUBDIR += vcglib
	SUBDIR += vera++
	SUBDIR += vexcl
	- SUBDIR += viewvc
	SUBDIR += viewvc-devel
	SUBDIR += violet
	SUBDIR += vitables
	@@ -6940,7 +6905,6 @@
	SUBDIR += xcscope.el
	SUBDIR += xdg-user-dirs
	SUBDIR += xdg-utils
	- SUBDIR += xdgpaths
	SUBDIR += xeus
	SUBDIR += xeus-cling
	SUBDIR += xfce4-dev-tools
	diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
	index 147e99370cc0..0e4d6db6265e 100644
	--- a/devel/mercurial/pkg-plist
	+++ b/devel/mercurial/pkg-plist
	@@ -1,8 +1,6 @@
	%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.py
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.pyc
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.pyo
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/mercurial/__pycache__/__modulepolicy__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/mercurial/__pycache__/__modulepolicy__.cpython-%%PYTHON_SUFFIX%%.pyc
	+%%PYTHON_SITELIBDIR%%/mercurial/__pycache__/__modulepolicy__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	+%%PYTHON_SITELIBDIR%%/mercurial/__pycache__/__modulepolicy__.cpython-%%PYTHON_SUFFIX%%.pyc
	%%DATA%%%%DATADIR%%/contrib/bash_completion
	%%DATA%%%%DATADIR%%/contrib/casesmash.py
	%%DATA%%%%DATADIR%%/contrib/check-code.py
	diff --git a/devel/omniORB/pkg-plist b/devel/omniORB/pkg-plist
	index 3eb259dd3877..3344471b8622 100644
	--- a/devel/omniORB/pkg-plist
	+++ b/devel/omniORB/pkg-plist
	@@ -263,12 +263,9 @@ man/man8/omniMapper.8.gz
	man/man8/omniNames.8.gz
	man/man1/omnicpp.1.gz
	man/man1/omniidl.1.gz
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniidlmodule.so.4.2
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl.so
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl.so.4
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniidl.so.4.2
	+%%PYTHON_SITELIBDIR%%/_omniidl.so
	+%%PYTHON_SITELIBDIR%%/_omniidl.so.4
	+%%PYTHON_SITELIBDIR%%/_omniidl.so.4.2
	%%PYTHON_SITELIBDIR%%/omniidl/__init__.py
	%%PYTHON_SITELIBDIR%%/omniidl/__init__.pyc
	%%PYTHON_SITELIBDIR%%/omniidl/idlast.py
	diff --git a/devel/py-dbus/pkg-plist b/devel/py-dbus/pkg-plist
	index 71d2a86a8dd7..8d271d9f6d3c 100644
	--- a/devel/py-dbus/pkg-plist
	+++ b/devel/py-dbus/pkg-plist
	@@ -30,9 +30,6 @@
	%%PYTHON_SITELIBDIR%%/dbus/glib.py
	%%PYTHON_SITELIBDIR%%/dbus/glib.pyc
	%%PYTHON_SITELIBDIR%%/dbus/glib.pyo
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dbus/gobject_service.py
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyc
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyo
	%%PYTHON_SITELIBDIR%%/dbus/lowlevel.py
	%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc
	%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyo
	diff --git a/devel/py-omniorb/pkg-plist b/devel/py-omniorb/pkg-plist
	index 6759fe873d98..b87c1b2637a7 100644
	--- a/devel/py-omniorb/pkg-plist
	+++ b/devel/py-omniorb/pkg-plist
	@@ -12,36 +12,21 @@ include/omniORBpy.h
	%%PYTHON_SITELIBDIR%%/PortableServer.pyc
	%%PYTHON_SITELIBDIR%%/PortableServer__POA.py
	%%PYTHON_SITELIBDIR%%/PortableServer__POA.pyc
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.4
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniConnMgmtmodule.so.4.%%SONUM%%
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt.so
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt.so.4
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniConnMgmt.so.4.2
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so.4
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omniZIOPmodule.so.4.%%SONUM%%
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP.so
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP.so.4
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omniZIOP.so.4.2
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnicodesetsmodule.so.4.%%SONUM%%
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets.so
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets.so.4
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnicodesets.so.4.2
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnipymodule.so
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnipymodule.so.4.%%SONUM%%
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy.so
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy.so.4
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnipy.so.4.2
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/_omnisslTPmodule.so.4.%%SONUM%%
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP.so
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP.so.4
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_omnisslTP.so.4.2
	+%%PYTHON_SITELIBDIR%%/_omniConnMgmt.so
	+%%PYTHON_SITELIBDIR%%/_omniConnMgmt.so.4
	+%%PYTHON_SITELIBDIR%%/_omniConnMgmt.so.4.2
	+%%PYTHON_SITELIBDIR%%/_omniZIOP.so
	+%%PYTHON_SITELIBDIR%%/_omniZIOP.so.4
	+%%PYTHON_SITELIBDIR%%/_omniZIOP.so.4.2
	+%%PYTHON_SITELIBDIR%%/_omnicodesets.so
	+%%PYTHON_SITELIBDIR%%/_omnicodesets.so.4
	+%%PYTHON_SITELIBDIR%%/_omnicodesets.so.4.2
	+%%PYTHON_SITELIBDIR%%/_omnipy.so
	+%%PYTHON_SITELIBDIR%%/_omnipy.so.4
	+%%PYTHON_SITELIBDIR%%/_omnipy.so.4.2
	+%%PYTHON_SITELIBDIR%%/_omnisslTP.so
	+%%PYTHON_SITELIBDIR%%/_omnisslTP.so.4
	+%%PYTHON_SITELIBDIR%%/_omnisslTP.so.4.2
	%%PYTHON_SITELIBDIR%%/omniORB.pth
	%%PYTHON_SITELIBDIR%%/omniORB/BiDirPolicy.py
	%%PYTHON_SITELIBDIR%%/omniORB/BiDirPolicy.pyc
	diff --git a/devel/tortoisehg/pkg-plist b/devel/tortoisehg/pkg-plist
	index 21e92ac1d0c9..baf1f14b007f 100644
	--- a/devel/tortoisehg/pkg-plist
	+++ b/devel/tortoisehg/pkg-plist
	@@ -1,7 +1,5 @@
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/tortoisehg/util/__pycache__/config.cpython-37.opt-1.pyc
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/tortoisehg/util/__pycache__/config.cpython-37.pyc
	+%%PYTHON_SITELIBDIR%%/tortoisehg/util/__pycache__/config.cpython-37.opt-1.pyc
	+%%PYTHON_SITELIBDIR%%/tortoisehg/util/__pycache__/config.cpython-37.pyc
	%%PYTHON_SITELIBDIR%%/tortoisehg/util/config.py
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/tortoisehg/util/config.pyc
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/tortoisehg/util/config.pyo
	share/applications/tortoisehg.desktop
	%%DATADIR%%/mergetools.rc
	diff --git a/editors/Makefile b/editors/Makefile
	index ac203792d6bb..07423c365153 100644
	--- a/editors/Makefile
	+++ b/editors/Makefile
	@@ -255,7 +255,6 @@
	SUBDIR += vim
	SUBDIR += vim-console
	SUBDIR += vim-tiny
	- SUBDIR += vscode
	SUBDIR += web-mode
	SUBDIR += with-editor
	SUBDIR += wordgrinder
	diff --git a/games/Makefile b/games/Makefile
	index 68ec5bc54efd..7388cf7617df 100644
	--- a/games/Makefile
	+++ b/games/Makefile
	@@ -3,7 +3,6 @@

	COMMENT = Games and related software

	- SUBDIR += 0ad
	SUBDIR += 0verkill
	SUBDIR += 2048
	SUBDIR += 2048-qt
	@@ -606,7 +605,6 @@
	SUBDIR += minerbold
	SUBDIR += minetest
	SUBDIR += minetest_game
	- SUBDIR += minilens
	SUBDIR += mirrormagic
	SUBDIR += miscom
	SUBDIR += mkhexgrid
	@@ -824,7 +822,6 @@
	SUBDIR += redorblack
	SUBDIR += regoth
	SUBDIR += reminiscence
	- SUBDIR += renpy
	SUBDIR += rescue
	SUBDIR += residualvm
	SUBDIR += retroarch
	@@ -910,7 +907,6 @@
	SUBDIR += stonesoup
	SUBDIR += stormbaancoureur
	SUBDIR += stransball2
	- SUBDIR += stratagus
	SUBDIR += stuntrally
	SUBDIR += sudsol
	SUBDIR += super_methane_brothers
	@@ -924,7 +920,6 @@
	SUBDIR += taisei
	SUBDIR += tali
	SUBDIR += tanglet
	- SUBDIR += tanks-of-freedom
	SUBDIR += tbclock
	SUBDIR += tecnoballz
	SUBDIR += teeworlds
	@@ -1004,7 +999,6 @@
	SUBDIR += vultures-eye
	SUBDIR += vvvvvv
	SUBDIR += wanderer
	- SUBDIR += wargus
	SUBDIR += warmux
	SUBDIR += warzone2100
	SUBDIR += wesnoth
	@@ -1021,8 +1015,6 @@
	SUBDIR += worldofpadman
	SUBDIR += wtf
	SUBDIR += wxlauncher
	- SUBDIR += wyrmgus
	- SUBDIR += wyrmsun
	SUBDIR += xasteroids
	SUBDIR += xataxx
	SUBDIR += xbat
	diff --git a/graphics/Makefile b/graphics/Makefile
	index 667ba145f8b2..5b7e59b2b695 100644
	--- a/graphics/Makefile
	+++ b/graphics/Makefile
	@@ -126,7 +126,6 @@
	SUBDIR += deegree-wps
	SUBDIR += deegree-wpvs
	SUBDIR += delaboratory
	- SUBDIR += derelict-gl3
	SUBDIR += devil
	SUBDIR += dia
	SUBDIR += diff-pdf
	diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
	index af9fb7bd3eae..94e05be18fb9 100644
	--- a/graphics/cegui/Makefile
	+++ b/graphics/cegui/Makefile
	@@ -15,19 +15,21 @@ LICENSE= MIT
	WRKSRC= ${WRKDIR}/${DISTNAME:S/2b/2/}
	CONFIGURE_ENV+= TOLUA_INC="${LUA_INCDIR}"
	CMAKE_ARGS= -DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
	- -DCEGUI_BUILD_TESTS=OFF
	+ -DCEGUI_BUILD_TESTS=OFF \
	+ -DCEGUI_BUILD_LUA_MODULE=OFF \
	+ -DCEGUI_BUILD_LUA_GENERATOR=OFF
	USE_LDCONFIG= yes
	USES= cmake compiler:c++11-lib iconv localbase pkgconfig tar:bzip2

	PORTDOCS= *

	-OPTIONS_DEFINE= FREETYPE PCRE LUA FRIBIDI DOCS
	+OPTIONS_DEFINE= FREETYPE PCRE FRIBIDI DOCS
	OPTIONS_GROUP= XMLPARSER IMAGECODEC RENDERER
	OPTIONS_GROUP_XMLPARSER= EXPAT XERCES LIBXML2 RAPIDXML TINYXML
	OPTIONS_GROUP_IMAGECODEC= DEVIL FREEIMAGE SDL2
	OPTIONS_GROUP_RENDERER= OPENGL OPENGL3 OGRE IRRLICHT

	-OPTIONS_DEFAULT= FREETYPE PCRE LUA FRIBIDI
	+OPTIONS_DEFAULT= FREETYPE PCRE FRIBIDI
	OPTIONS_DEFAULT+= EXPAT LIBXML2 TINYXML
	OPTIONS_DEFAULT+= DEVIL FREEIMAGE SDL2
	OPTIONS_DEFAULT+= OPENGL OPENGL3 OGRE
	@@ -40,10 +42,6 @@ FREETYPE_CMAKE_OFF= -DCEGUI_HAS_FREETYPE=OFF
	PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
	PCRE_CMAKE_ON= -DCEGUI_HAS_PCRE_REGEX=ON
	PCRE_CMAKE_OFF= -DCEGUI_HAS_PCRE_REGEX=OFF
	-LUA_USES= lua:51
	-LUA_LIB_DEPENDS= libtolua++-${LUA_VER}.so:lang/tolua++
	-LUA_CMAKE_ON= -DCEGUI_BUILD_LUA_MODULE=ON -DCEGUI_BUILD_LUA_GENERATOR=ON
	-LUA_CMAKE_OFF= -DCEGUI_BUILD_LUA_MODULE=OFF -DCEGUI_BUILD_LUA_GENERATOR=OFF
	FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi
	FRIBIDI_CMAKE_ON= -DCEGUI_USE_FRIBIDI=ON
	FRIBIDI_CMAKE_OFF= -DCEGUI_USE_FRIBIDI=OFF
	diff --git a/graphics/cegui/pkg-plist b/graphics/cegui/pkg-plist
	index e87b2dd7e1c4..2b942fe20654 100644
	--- a/graphics/cegui/pkg-plist
	+++ b/graphics/cegui/pkg-plist
	@@ -1,4 +1,3 @@
	-%%LUA%%bin/toluappcegui-0.8
	include/cegui-0/CEGUI/Affector.h
	include/cegui-0/CEGUI/Animation.h
	include/cegui-0/CEGUI/AnimationInstance.h
	@@ -160,8 +159,6 @@ include/cegui-0/CEGUI/Scheme.h
	include/cegui-0/CEGUI/SchemeManager.h
	include/cegui-0/CEGUI/Scheme_xmlHandler.h
	include/cegui-0/CEGUI/ScriptModule.h
	-%%LUA%%include/cegui-0/CEGUI/ScriptModules/Lua/Functor.h
	-%%LUA%%include/cegui-0/CEGUI/ScriptModules/Lua/ScriptModule.h
	include/cegui-0/CEGUI/SimpleTimer.h
	include/cegui-0/CEGUI/Singleton.h
	include/cegui-0/CEGUI/Size.h
	@@ -326,9 +323,6 @@ lib/libCEGUICommonDialogs-0.so.2.4.2
	%%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so
	%%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2
	%%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2.4.2
	-%%LUA%%lib/libCEGUILuaScriptModule-0.so
	-%%LUA%%lib/libCEGUILuaScriptModule-0.so.2
	-%%LUA%%lib/libCEGUILuaScriptModule-0.so.2.4.2
	%%OGRE%%lib/libCEGUIOgreRenderer-0.so
	%%OGRE%%lib/libCEGUIOgreRenderer-0.so.2
	%%OGRE%%lib/libCEGUIOgreRenderer-0.so.2.4.2
	@@ -336,7 +330,6 @@ lib/libCEGUICommonDialogs-0.so.2.4.2
	%%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2
	%%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2.4.2
	%%IRRLICHT%%libdata/pkgconfig/CEGUI-0-IRRLICHT.pc
	-%%LUA%%libdata/pkgconfig/CEGUI-0-LUA.pc
	%%OGRE%%libdata/pkgconfig/CEGUI-0-OGRE.pc
	%%OPENGL%%libdata/pkgconfig/CEGUI-0-OPENGL.pc
	%%OPENGL3%%libdata/pkgconfig/CEGUI-0-OPENGL3.pc
	diff --git a/graphics/py-cairo/pkg-plist b/graphics/py-cairo/pkg-plist
	index 02fce6c3bcb4..58e62942e0d0 100644
	--- a/graphics/py-cairo/pkg-plist
	+++ b/graphics/py-cairo/pkg-plist
	@@ -1,16 +1,13 @@
	-%%PYTHON2%%include/pycairo/pycairo.h
	-%%PYTHON3%%include/pycairo/py3cairo.h
	+include/pycairo/py3cairo.h
	%%PYTHON_SITELIBDIR%%/cairo/__init__.py
	%%PYTHON_SITELIBDIR%%/cairo/__init__.pyc
	%%PYTHON_SITELIBDIR%%/cairo/__init__.pyi
	%%PYTHON_SITELIBDIR%%/cairo/__init__.pyo
	%%PYTHON_SITELIBDIR%%/cairo/_cairo%%PYTHON_EXT_SUFFIX%%.so
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/cairo/include/pycairo.h
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/cairo/include/py3cairo.h
	+%%PYTHON_SITELIBDIR%%/cairo/include/py3cairo.h
	%%PYTHON_SITELIBDIR%%/cairo/py.typed
	%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
	%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
	%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
	%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
	-%%PYTHON2%%libdata/pkgconfig/pycairo.pc
	-%%PYTHON3%%libdata/pkgconfig/py3cairo.pc
	+libdata/pkgconfig/py3cairo.pc
	diff --git a/korean/ibus-hangul/pkg-plist b/korean/ibus-hangul/pkg-plist
	index f65e8e19d7cc..4202c56da774 100644
	--- a/korean/ibus-hangul/pkg-plist
	+++ b/korean/ibus-hangul/pkg-plist
	@@ -12,8 +12,6 @@ share/applications/ibus-setup-hangul.desktop
	%%DATADIR%%/setup/keycapturedialog.pyc
	%%DATADIR%%/setup/keycapturedialog.pyo
	%%DATADIR%%/setup/main.py
	-%%PYTHON2%%%%DATADIR%%/setup/main.pyc
	-%%PYTHON2%%%%DATADIR%%/setup/main.pyo
	%%DATADIR%%/setup/setup.ui
	share/ibus/component/hangul.xml
	share/icons/hicolor/64x64/apps/ibus-hangul.png
	diff --git a/lang/Makefile b/lang/Makefile
	index 864f8a44c17c..7dda21a07fa2 100644
	--- a/lang/Makefile
	+++ b/lang/Makefile
	@@ -36,7 +36,6 @@
	SUBDIR += clisp
	SUBDIR += clojure
	SUBDIR += clojure-mode.el
	- SUBDIR += clover
	SUBDIR += cmucl
	SUBDIR += cmucl-extra
	SUBDIR += cocor
	@@ -45,7 +44,6 @@
	SUBDIR += crystal
	SUBDIR += csharp-mode.el
	SUBDIR += cython
	- SUBDIR += dlang-tools
	SUBDIR += dlv
	SUBDIR += duktape
	SUBDIR += duktape-lib
	@@ -151,7 +149,6 @@
	SUBDIR += kturtle
	SUBDIR += lafontaine
	SUBDIR += lci
	- SUBDIR += ldc
	SUBDIR += lfe
	SUBDIR += libhx
	SUBDIR += libobjc2
	@@ -266,15 +263,12 @@
	SUBDIR += plexil
	SUBDIR += pocl
	SUBDIR += polyml
	- SUBDIR += ponyc
	SUBDIR += ptoc
	SUBDIR += purescript
	SUBDIR += py-hy
	SUBDIR += py-lupa
	SUBDIR += py-qt5-qml
	SUBDIR += py-textX
	- SUBDIR += pypy
	- SUBDIR += pypy3
	SUBDIR += python
	SUBDIR += python-doc-html
	SUBDIR += python-doc-pdf-a4
	@@ -282,8 +276,6 @@
	SUBDIR += python-doc-text
	SUBDIR += python-mode.el
	SUBDIR += python-tools
	- SUBDIR += python2
	- SUBDIR += python27
	SUBDIR += python3
	SUBDIR += python36
	SUBDIR += python37
	@@ -321,7 +313,6 @@
	SUBDIR += sdcc
	SUBDIR += see
	SUBDIR += seed7
	- SUBDIR += silq
	SUBDIR += siod
	SUBDIR += sisc
	SUBDIR += sketchy
	@@ -334,9 +325,6 @@
	SUBDIR += snobol4
	SUBDIR += solidity
	SUBDIR += spidermonkey17
	- SUBDIR += spidermonkey185
	- SUBDIR += spidermonkey52
	- SUBDIR += spidermonkey60
	SUBDIR += spidermonkey78
	SUBDIR += spl
	SUBDIR += squeak
	@@ -352,7 +340,6 @@
	SUBDIR += tcl87
	SUBDIR += tclX
	SUBDIR += tolua
	- SUBDIR += tolua++
	SUBDIR += tuareg-mode.el
	SUBDIR += twelf
	SUBDIR += ucc
	diff --git a/mail/Makefile b/mail/Makefile
	index 4cba1ea49131..3e09e0d97f6f 100644
	--- a/mail/Makefile
	+++ b/mail/Makefile
	@@ -201,7 +201,6 @@
	SUBDIR += mailfront
	SUBDIR += mailgraph
	SUBDIR += mailhog
	- SUBDIR += mailman
	SUBDIR += mailman3
	SUBDIR += mailscanner
	SUBDIR += mailsync
	diff --git a/math/Makefile b/math/Makefile
	index d16ad4c2e12f..9cc07fca24a3 100644
	--- a/math/Makefile
	+++ b/math/Makefile
	@@ -149,7 +149,6 @@
	SUBDIR += arpack++
	SUBDIR += arpack-ng
	SUBDIR += ascent
	- SUBDIR += aspcud
	SUBDIR += asymptote
	SUBDIR += atlas
	SUBDIR += barvinok
	@@ -321,7 +320,6 @@
	SUBDIR += graphthing
	SUBDIR += gretl
	SUBDIR += gri
	- SUBDIR += gringo
	SUBDIR += grpn
	SUBDIR += gsl
	SUBDIR += half
	@@ -376,7 +374,6 @@
	SUBDIR += libnormaliz
	SUBDIR += libocas
	SUBDIR += liborigin
	- SUBDIR += libpgmath
	SUBDIR += libpoly
	SUBDIR += libqalculate
	SUBDIR += libranlip
	@@ -822,7 +819,6 @@
	SUBDIR += py-pplpy
	SUBDIR += py-primme
	SUBDIR += py-pyFFTW
	- SUBDIR += py-pyasp
	SUBDIR += py-pybloom
	SUBDIR += py-pyclipper
	SUBDIR += py-pycosat
	@@ -832,7 +828,6 @@
	SUBDIR += py-pyipopt
	SUBDIR += py-pymc3
	SUBDIR += py-pyneqsys
	- SUBDIR += py-pynleq2
	SUBDIR += py-pynndescent
	SUBDIR += py-pyodeint
	SUBDIR += py-pyodesys
	diff --git a/multimedia/Makefile b/multimedia/Makefile
	index c93b56dfca4e..16bf8aa6ae5a 100644
	--- a/multimedia/Makefile
	+++ b/multimedia/Makefile
	@@ -61,7 +61,6 @@
	SUBDIR += ffaudioconverter
	SUBDIR += ffdec
	SUBDIR += ffmpeg
	- SUBDIR += ffmpeg2theora
	SUBDIR += ffmpegthumbnailer
	SUBDIR += ffms2
	SUBDIR += flvmeta
	@@ -75,7 +74,6 @@
	SUBDIR += gdialog
	SUBDIR += get_iplayer
	SUBDIR += gmerlin
	- SUBDIR += gmimms
	SUBDIR += gmmlib
	SUBDIR += gmp-api
	SUBDIR += gmtk
	@@ -130,7 +128,6 @@
	SUBDIR += gstreamer1-validate
	SUBDIR += gstreamermm
	SUBDIR += gtk-youtube-viewer
	- SUBDIR += gxine
	SUBDIR += handbrake
	SUBDIR += harvid
	SUBDIR += hypnotix
	@@ -224,7 +221,6 @@
	SUBDIR += makemkv
	SUBDIR += mediainfo
	SUBDIR += mencoder
	- SUBDIR += mimms
	SUBDIR += minisatip
	SUBDIR += minitube
	SUBDIR += mjpegtools
	diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
	index 4acdbc084cd5..2170b20de958 100644
	--- a/net-mgmt/Makefile
	+++ b/net-mgmt/Makefile
	@@ -93,7 +93,6 @@
	SUBDIR += icingaweb2-module-idoreports
	SUBDIR += icingaweb2-module-ipl
	SUBDIR += icingaweb2-module-map
	- SUBDIR += icingaweb2-module-pdfexport
	SUBDIR += icingaweb2-module-reactbundle
	SUBDIR += icingaweb2-module-reporting
	SUBDIR += icingaweb2-module-vsphere
	diff --git a/net-mgmt/icingaweb2-module-reporting/Makefile b/net-mgmt/icingaweb2-module-reporting/Makefile
	index 3fadb3cc58df..611f3cd6509c 100644
	--- a/net-mgmt/icingaweb2-module-reporting/Makefile
	+++ b/net-mgmt/icingaweb2-module-reporting/Makefile
	@@ -3,7 +3,7 @@
	PORTNAME= icingaweb2-module-reporting
	DISTVERSIONPREFIX= v
	DISTVERSION= 0.9.2
	-PORTREVISION= 1
	+PORTREVISION= 2
	CATEGORIES= net-mgmt www
	PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}

	@@ -22,11 +22,6 @@ USES= php:web,flavors
	USE_GITHUB= yes
	GH_ACCOUNT= icinga

	-OPTIONS_DEFINE= PDF
	-PDF_DESC= Use Chromium to export PDFs
	-OPTIONS_DEFAULT= PDF
	-PDF_RUN_DEPENDS= icingaweb2-module-pdfexport${PHP_PKGNAMESUFFIX}>=0.9:net-mgmt/icingaweb2-module-pdfexport@${PHP_FLAVOR}
	-
	NO_BUILD= yes
	NO_ARCH= yes

	diff --git a/net/Makefile b/net/Makefile
	index 3519b62de8a4..977c13eefd78 100644
	--- a/net/Makefile
	+++ b/net/Makefile
	@@ -387,7 +387,6 @@
	SUBDIR += libproxy
	SUBDIR += libproxy-gnome3
	SUBDIR += libproxy-kde
	- SUBDIR += libproxy-mozjs
	SUBDIR += libproxy-perl
	SUBDIR += libproxy-python
	SUBDIR += libproxy-webkit3
	@@ -524,7 +523,6 @@
	SUBDIR += ocserv
	SUBDIR += olsrd
	SUBDIR += omnitty
	- SUBDIR += onedrive
	SUBDIR += onenetd
	SUBDIR += onioncat
	SUBDIR += ooni-mini
	@@ -533,7 +531,6 @@
	SUBDIR += open-isns
	SUBDIR += openbgpd
	SUBDIR += openbgpd6
	- SUBDIR += openggsn
	SUBDIR += openldap24-client
	SUBDIR += openldap24-sasl-client
	SUBDIR += openldap24-server
	diff --git a/net/kamailio/pkg-plist b/net/kamailio/pkg-plist
	index b5747a23aef1..1de77fed5efd 100644
	--- a/net/kamailio/pkg-plist
	+++ b/net/kamailio/pkg-plist
	@@ -394,8 +394,8 @@
	%%PRESENCE%%lib/kamailio/modules/rls.so
	%%PRESENCE%%lib/kamailio/modules/xcap_client.so
	%%PRESENCE%%lib/kamailio/modules/xcap_server.so
	-%%PYTHON3%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_python3
	-%%PYTHON3%%lib/kamailio/modules/app_python3.so
	+%%PORTDOCS%%%%DOCSDIR%%/modules/README.app_python3
	+lib/kamailio/modules/app_python3.so
	%%RADIUS%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.acc_radius
	%%RADIUS%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.auth_radius
	%%RADIUS%%%%PORTDOCS%%%%DOCSDIR%%/modules/README.misc_radius
	diff --git a/print/Makefile b/print/Makefile
	index 4c0d62ff7a07..c74a41a142ce 100644
	--- a/print/Makefile
	+++ b/print/Makefile
	@@ -30,7 +30,6 @@
	SUBDIR += cups-pk-helper
	SUBDIR += cups-smb-backend
	SUBDIR += deforaos-pdfviewer
	- SUBDIR += derelict-ft
	SUBDIR += detex
	SUBDIR += dot2tex
	SUBDIR += dvi2tty
	diff --git a/science/py-dlib/Makefile b/science/py-dlib/Makefile
	index 8a3fe703ca2f..3616dce5ba7d 100644
	--- a/science/py-dlib/Makefile
	+++ b/science/py-dlib/Makefile
	@@ -49,6 +49,4 @@ AVX_VARS_OFF= avxargs="--no USE_AVX_INSTRUCTIONS"

	PYDISTUTILS_BUILDARGS= --set BOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX} ${X11ARGS} ${JPEGARGS} ${PNGARGS} ${GIFARGS} ${SQLITEARGS} ${BLASLAPACKARGS} ${AVXARGS} ${BLASLAPACK}

	-PLIST_SUB= PYTHON2="@comment " PYTHON3=""
	-
	.include <bsd.port.mk>
	diff --git a/science/py-dlib/pkg-plist b/science/py-dlib/pkg-plist
	index 6dd59d547748..cca765735f7f 100644
	--- a/science/py-dlib/pkg-plist
	+++ b/science/py-dlib/pkg-plist
	@@ -1,5 +1,3 @@
	%%PYTHON_SITELIBDIR%%/dlib/__init__.py
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dlib/__init__.pyc
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dlib/__init__.pyo
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/dlib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/dlib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
	+%%PYTHON_SITELIBDIR%%/dlib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	+%%PYTHON_SITELIBDIR%%/dlib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
	diff --git a/sysutils/Makefile b/sysutils/Makefile
	index 010f31d39d94..8ba4882abcb3 100644
	--- a/sysutils/Makefile
	+++ b/sysutils/Makefile
	@@ -114,7 +114,6 @@
	SUBDIR += beats6
	SUBDIR += beats7
	SUBDIR += bfs
	- SUBDIR += bhyve-firmware
	SUBDIR += bhyve-rc
	SUBDIR += biosfont
	SUBDIR += bkpupsd
	@@ -137,7 +136,6 @@
	SUBDIR += burp
	SUBDIR += burp-devel
	SUBDIR += busybox
	- SUBDIR += bvm
	SUBDIR += byobu
	SUBDIR += catfish
	SUBDIR += cbsd
	@@ -1413,9 +1411,6 @@
	SUBDIR += ucspi-tcp
	SUBDIR += ucspi-unix
	SUBDIR += udfclient
	- SUBDIR += uefi-edk2-bhyve
	- SUBDIR += uefi-edk2-bhyve-csm
	- SUBDIR += uefi-edk2-bhyve-devel
	SUBDIR += uefi-edk2-qemu
	SUBDIR += ufetch
	SUBDIR += ufs_copy
	@@ -1431,7 +1426,6 @@
	SUBDIR += uptimed
	SUBDIR += usb_modeswitch
	SUBDIR += usbhid-dump
	- SUBDIR += usbhotkey
	SUBDIR += usbtop
	SUBDIR += usbutils
	SUBDIR += uschedule
	diff --git a/sysutils/py-salt-2019/pkg-plist b/sysutils/py-salt-2019/pkg-plist
	index 8af3d8958fa3..64e13fed1a50 100644
	--- a/sysutils/py-salt-2019/pkg-plist
	+++ b/sysutils/py-salt-2019/pkg-plist
	@@ -1,7 +1,5 @@
	@sample %%ETCDIR%%/master.sample
	@sample %%ETCDIR%%/minion.sample
	%%PYTHON_SITELIBDIR%%/salt/_syspaths.py
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	+%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc
	+%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist
	index 8af3d8958fa3..64e13fed1a50 100644
	--- a/sysutils/py-salt/pkg-plist
	+++ b/sysutils/py-salt/pkg-plist
	@@ -1,7 +1,5 @@
	@sample %%ETCDIR%%/master.sample
	@sample %%ETCDIR%%/minion.sample
	%%PYTHON_SITELIBDIR%%/salt/_syspaths.py
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	+%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.pyc
	+%%PYTHON_SITELIBDIR%%/salt/__pycache__/_syspaths.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	diff --git a/textproc/Makefile b/textproc/Makefile
	index 76ba83363f18..73548382790e 100644
	--- a/textproc/Makefile
	+++ b/textproc/Makefile
	@@ -329,8 +329,6 @@
	SUBDIR += kf5-kcodecs
	SUBDIR += kf5-sonnet
	SUBDIR += kf5-syntax-highlighting
	- SUBDIR += kibana6
	- SUBDIR += kibana7
	SUBDIR += kiss-templates
	SUBDIR += kmfl-european-latin
	SUBDIR += kmfl-khmer
	diff --git a/www/Makefile b/www/Makefile
	index 7c3268ea1ae1..0294fe402c13 100644
	--- a/www/Makefile
	+++ b/www/Makefile
	@@ -38,8 +38,6 @@
	SUBDIR += asql
	SUBDIR += authelia
	SUBDIR += awffull
	- SUBDIR += aws
	- SUBDIR += aws-demos
	SUBDIR += awstats
	SUBDIR += axis2
	SUBDIR += bacula-web
	@@ -79,7 +77,6 @@
	SUBDIR += choqok
	SUBDIR += chpasswd
	SUBDIR += chrome-gnome-shell
	- SUBDIR += chromium
	SUBDIR += ckeditor
	SUBDIR += cl-lml
	SUBDIR += cl-lml-sbcl
	@@ -411,7 +408,6 @@
	SUBDIR += mod_xmlns
	SUBDIR += mod_xsendfile
	SUBDIR += mohawk
	- SUBDIR += moinmoin
	SUBDIR += moinmoincli
	SUBDIR += mongoose
	SUBDIR += mongrel2
	@@ -457,8 +453,6 @@
	SUBDIR += nibbleblog
	SUBDIR += nift
	SUBDIR += node
	- SUBDIR += node10
	- SUBDIR += node12
	SUBDIR += node14
	SUBDIR += nostromo
	SUBDIR += novnc
	@@ -466,8 +460,6 @@
	SUBDIR += npapi-xine
	SUBDIR += npc
	SUBDIR += npm
	- SUBDIR += npm-node10
	- SUBDIR += npm-node12
	SUBDIR += npm-node14
	SUBDIR += nspluginwrapper
	SUBDIR += oauth2-proxy
	@@ -1773,7 +1765,6 @@
	SUBDIR += qdecoder
	SUBDIR += qhttpengine
	SUBDIR += qt5-webchannel
	- SUBDIR += qt5-webengine
	SUBDIR += qt5-webglplugin
	SUBDIR += qt5-webkit
	SUBDIR += qt5-websockets
	@@ -2303,8 +2294,6 @@
	SUBDIR += yabb
	SUBDIR += yanopaste
	SUBDIR += yarn
	- SUBDIR += yarn-node10
	- SUBDIR += yarn-node12
	SUBDIR += yarn-node14
	SUBDIR += yaws
	SUBDIR += you-get
	diff --git a/www/npm/Makefile b/www/npm/Makefile
	index 616a2e431d51..3850ad520507 100644
	--- a/www/npm/Makefile
	+++ b/www/npm/Makefile
	@@ -20,14 +20,12 @@ NO_ARCH= yes
	NO_BUILD= yes
	REINPLACE_ARGS= -i ''

	-CONFLICTS_INSTALL?= npm-node10 npm-node12 npm-node14
	+CONFLICTS_INSTALL?= npm-node14

	OPTIONS_SINGLE= BACKEND
	-OPTIONS_SINGLE_BACKEND= NODE NODE10 NODE12 NODE14
	+OPTIONS_SINGLE_BACKEND= NODE NODE14
	OPTIONS_DEFAULT=NODE
	NODE_DESC= Use Node.js 15.x (www/node) as backend
	-NODE10_DESC= Use Node.js 10.x (www/node10) as backend
	-NODE12_DESC= Use Node.js 12.x (www/node12) as backend
	NODE14_DESC= Use Node.js 14.x (www/node14) as backend

	CPE_VENDOR= npmjs
	@@ -37,8 +35,6 @@ SHEBANG_GLOB= *.py
	SHEBANG_FILES= lib/node_modules/npm/node_modules/node-gyp/gyp/samples/samples

	NODE_RUN_DEPENDS= node>=0.8.0:www/node
	-NODE10_RUN_DEPENDS= node10>=0.8.0:www/node10
	-NODE12_RUN_DEPENDS= node12>=0.8.0:www/node12
	NODE14_RUN_DEPENDS= node14>=0.8.0:www/node14

	.include <bsd.port.pre.mk>
	diff --git a/www/sahi/Makefile b/www/sahi/Makefile
	index 3f3ca208ce63..306c952e00d3 100644
	--- a/www/sahi/Makefile
	+++ b/www/sahi/Makefile
	@@ -3,8 +3,7 @@

	PORTNAME= sahi
	PORTVERSION= 3.5.${SAHI_BUILD}
	-#PORTREVISION= 0
	-PORTREVISION= 2
	+PORTREVISION= 3
	CATEGORIES= www
	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-v${PORTVERSION:R:R:R:S,.,,}/${SAHI_BUILD:S,.,,g}/
	DISTNAME= ${PORTNAME}_${SAHI_BUILD:S,.,,g}
	@@ -25,11 +24,10 @@ JAVA_RUN= yes
	NO_BUILD= yes

	OPTIONS_DEFINE= DOCS
	-OPTIONS_DEFAULT= CHROME
	+OPTIONS_DEFAULT= FIREFOX
	OPTIONS_SINGLE= BROWSER
	-OPTIONS_SINGLE_BROWSER= CHROME FIREFOX OPERA
	+OPTIONS_SINGLE_BROWSER= FIREFOX OPERA

	-CHROME_DESC= Use Chrome as default browser
	FIREFOX_DESC= Use Firefox as default browser
	OPERA_DESC= Use Opera as default browser

	@@ -54,7 +52,6 @@ post-patch:
	@${FIND} ${WRKSRC} -type f \( -name "*.sh" -or -name "linux.xml" \
	-or -name "sahi.properties" \) -print0 \
	\| ${XARGS} -0 ${REINPLACE_CMD} -E \
	- -e 's,%%CHROME%%,${LOCALBASE}/bin/chrome,g' \
	-e 's,%%DATADIR%%,${DATADIR},g' \
	-e 's,%%FIREFOX%%,${LOCALBASE}/bin/firefox,g' \
	-e 's,%%JAVA%%,${JAVA},g' \
	@@ -80,11 +77,6 @@ do-install:

	.include <bsd.port.pre.mk>

	-.if ${PORT_OPTIONS:MCHROME}
	-BROWSER= chrome
	-RUN_DEPENDS+= chrome:www/chromium
	-.endif
	-
	.if ${PORT_OPTIONS:MFIREFOX}
	BROWSER= firefox
	RUN_DEPENDS+= firefox:www/firefox
	diff --git a/www/yarn/Makefile b/www/yarn/Makefile
	index 5cf89a222587..2a474a3021fc 100644
	--- a/www/yarn/Makefile
	+++ b/www/yarn/Makefile
	@@ -12,24 +12,20 @@ COMMENT= Package manager for node, alternative to npm
	LICENSE= BSD2CLAUSE
	LICENSE_FILE= ${WRKSRC}/LICENSE

	-CONFLICTS_INSTALL?= yarn-node14 yarn-node12 yarn-node10
	+CONFLICTS_INSTALL?= yarn-node14

	OPTIONS_DEFINE= HADOOPCOMPAT
	OPTIONS_SINGLE= BACKEND
	-OPTIONS_SINGLE_BACKEND= NODE10 NODE12 NODE14 NODE
	+OPTIONS_SINGLE_BACKEND= NODE14 NODE
	OPTIONS_DEFAULT= NODE
	HADOOPCOMPAT_DESC= hadoop2 compatibility, the yarn script is excluded
	NODE_DESC= Use www/node as backend
	NODE14_DESC= Use www/node14 as backend
	-NODE12_DESC= Use www/node12 as backend
	-NODE10_DESC= Use www/node10 as backend

	OPTIONS_SUB= yes

	NODE_RUN_DEPENDS= node>=0.8.0:www/node
	NODE14_RUN_DEPENDS= node14>=14.0.0:www/node14
	-NODE12_RUN_DEPENDS= node12>=12.0.0:www/node12
	-NODE10_RUN_DEPENDS= node10>=10.0.0:www/node10

	HADOOPCOMPAT_CONFLICTS_INSTALL_OFF= hadoop2*

	diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
	index 3cac756048d4..e3da66e7e7f9 100644
	--- a/x11-toolkits/Makefile
	+++ b/x11-toolkits/Makefile
	@@ -36,7 +36,6 @@
	SUBDIR += gtk30
	SUBDIR += gtkada
	SUBDIR += gtkada3
	- SUBDIR += gtkd
	SUBDIR += gtkdatabox
	SUBDIR += gtkextra
	SUBDIR += gtkglarea2
	@@ -171,7 +170,6 @@
	SUBDIR += py-tktreectrl
	SUBDIR += py-wxPython40
	SUBDIR += py-xlib
	- SUBDIR += pypy-tkinter
	SUBDIR += qml-box2d
	SUBDIR += qt5-charts
	SUBDIR += qt5-datavis3d
	diff --git a/x11/Makefile b/x11/Makefile
	index fbf5c4da7d60..b8e49625c1db 100644
	--- a/x11/Makefile
	+++ b/x11/Makefile
	@@ -339,7 +339,6 @@
	SUBDIR += thinglaunch
	SUBDIR += thingylaunch
	SUBDIR += tilda
	- SUBDIR += tilix
	SUBDIR += tint
	SUBDIR += trayer
	SUBDIR += tycoon
	diff --git a/x11/py-xcffib/pkg-plist b/x11/py-xcffib/pkg-plist
	index e8aaecab66f0..49af87ad0541 100644
	--- a/x11/py-xcffib/pkg-plist
	+++ b/x11/py-xcffib/pkg-plist
	@@ -1,5 +1,3 @@
	%%PYTHON_SITELIBDIR%%/xcffib/_ffi.py
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcffib/_ffi.pyc
	-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xcffib/_ffi.pyo
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcffib/__pycache__/_ffi.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xcffib/__pycache__/_ffi.cpython-%%PYTHON_SUFFIX%%.pyc
	+%%PYTHON_SITELIBDIR%%/xcffib/__pycache__/_ffi.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
	+%%PYTHON_SITELIBDIR%%/xcffib/__pycache__/_ffi.cpython-%%PYTHON_SUFFIX%%.pyc

File Metadata

Mime Type: text/plain; charset=utf-8
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3463537
Default Alt Text: Simplified diff (i.e. without removed ports themselves) of no-py27 against r565250, INDEX builds (78 KB)

Simplified diff (i.e. without removed ports themselves) of no-py27 against r565250, INDEX buildsNo OneActions

Simplified diff (i.e. without removed ports themselves) of no-py27 against r565250, INDEX buildsView Options

File Metadata

Event Timeline

Simplified diff (i.e. without removed ports themselves) of no-py27 against r565250, INDEX builds
No One
Actions

Simplified diff (i.e. without removed ports themselves) of no-py27 against r565250, INDEX builds
View Options