Attachment 218255 Details for Bug 249626 – patch to deprecate port

[patch] patch to deprecate port

py-backports.os-dep-rev0.diff (text/plain), 544.99 KB, created by Steve Wills on 2020-09-24 18:40:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2020-09-24 18:40:53 UTC

Size: 544.99 KB

patch

obsolete

>diff --git Mk/Uses/gmake.mk Mk/Uses/gmake.mk
>index 1a162aa326f9..bd93aefef0f1 100644
>--- Mk/Uses/gmake.mk
>+++ Mk/Uses/gmake.mk
>@@ -17,5 +17,6 @@ IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments
> BUILD_DEPENDS+=		gmake>=4.3:devel/gmake
> CONFIGURE_ENV+=		MAKE=gmake
> MAKE_CMD=		gmake
>+#MAKE_ENV+=		MAKE=${LOCALBASE}/bin/gmake
> 
> .endif
>diff --git Mk/Uses/gnome.mk Mk/Uses/gnome.mk
>index f89ece023da0..8ed3a02eb8ee 100644
>--- Mk/Uses/gnome.mk
>+++ Mk/Uses/gnome.mk
>@@ -81,7 +81,7 @@ _USE_GNOME_ALL+= atk cairo \
> 		libgnomecanvas libgnomekbd \
> 		libgnomeui libgsf libgtkhtml libidl librsvg2 libwnck \
> 		libxml2 libxslt \
>-		orbit2 pango pangox-compat pygobject pygtk2 \
>+		orbit2 pango pangox-compat pygobject \
> 		vte
> 
> # GNOME 3 components
>@@ -303,10 +303,6 @@ pygobject3_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@$
> pygobject3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
> pygobject3_USE_GNOME_IMPL=	glib20
> 
>-pygtk2_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
>-pygtk2_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
>-pygtk2_USE_GNOME_IMPL=	libglade2 pygobject
>-
> intltool_BUILD_DEPENDS=	${LOCALBASE}/bin/intltool-extract:textproc/intltool
> 
> intlhack_PRE_PATCH=	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${FRAMEWORK_REINPLACE_CMD} \
>diff --git Mk/Uses/python.mk Mk/Uses/python.mk
>index 3bc138a67962..5987d395eac6 100644
>--- Mk/Uses/python.mk
>+++ Mk/Uses/python.mk
>@@ -18,10 +18,9 @@
> #
> #		Examples:
> #
>-#			USES=python:2.7		# Supports Python 2.7 Only
>-#			USES=python:3.5+	# Supports Python 3.5 or later
>-#			USES=python:3.5-3.8	# Supports Python 3.5 to 3.8
>-#			USES=python:-3.6	# Supports Python up to 3.6
>+#			USES=python:3.6+	# Supports Python 3.6 or later
>+#			USES=python:3.6-3.8	# Supports Python 3.6 to 3.8
>+#			USES=python:-3.7	# Supports Python up to 3.7
> #			USES=python		# Supports any/all Python versions
> #
> # NOTE:	<version-spec> should be as specific as possible, matching the versions
>@@ -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.4-3.6, but even in this case, X.Y+ (3.4+), or -X.Y (-3.6)
> #	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,7 +81,7 @@
> #
> #			  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.
> #
>@@ -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. 3401, 3709, ...
> #
> # PYTHON_SUFFIX		- The major-minor release number of the chosen Python
>-#			  interpreter without dots, e.g. 27, 36, ...
>+#			  interpreter without dots, e.g. 36, 37, ...
> #			  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.6, 3.7, ...
> #
> # 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.6 # preferred first
>-_PYTHON_PORTBRANCH=		2.7		# ${_PYTHON_VERSIONS:[1]}
>+_PYTHON_VERSIONS=		3.7 3.8 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_VERSION:=	${PYTHON_DEFAULT}
> 
>@@ -358,7 +348,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) && ( \
>@@ -370,13 +360,15 @@ _PYTHON_VERSION=	${ver}
> .endfor
> .if !defined(_PYTHON_VERSION)
> IGNORE=		needs an unsupported version of Python
>+# Set this to not bail out too early
>+_PYTHON_VERSION=	${PYTHON_DEFAULT}
> .endif
> .endif	# defined(_PYTHON_VERSION_NONSUPPORTED)
> 
> # 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})) && \
>@@ -398,7 +390,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)
>@@ -414,7 +406,7 @@ FLAVOR=	${FLAVORS:[1]}
> .  endif
> .endif
> 
>-.if ${FLAVOR:Mpy[23][0-9]}
>+.if ${FLAVOR:Mpy[3][0-9]}
> _PYTHON_VERSION=	${FLAVOR:S/py//:C/(.)/\1./}
> .endif
> 
>@@ -454,19 +446,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)' \
>@@ -489,11 +474,7 @@ PYTHONPREFIX_SITELIBDIR=	${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};}
> _PYTHONPKGLIST=	${WRKDIR}/.PLIST.pymodtmp
> 
> # PEP 0488 (https://www.python.org/dev/peps/pep-0488/)
>-.if ${PYTHON_REL} < 3500
>-PYTHON_PYOEXTENSION=	pyo
>-.else
> PYTHON_PYOEXTENSION=	opt-1.pyc
>-.endif
> 
> # Ports bound to a certain python version SHOULD
> # - use the PYTHON_PKGNAMEPREFIX
>@@ -636,37 +617,16 @@ 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_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR}
>-PY_PYGMENTS=	${PYTHON_PKGNAMEPREFIX}pygments-25>=2.5.1:textproc/py-pygments-25@${PY_FLAVOR}
>-PY_SPHINX=	${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR}
>-PY_TYPING=	${PYTHON_PKGNAMEPREFIX}typing>=3.7.4.1:devel/py-typing@${PY_FLAVOR}
>-.else
> PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
> PY_PYGMENTS=	${PYTHON_PKGNAMEPREFIX}pygments>=2.5.1:textproc/py-pygments@${PY_FLAVOR}
> PY_SPHINX=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
>-PY_TYPING=
>-.endif
> 
>-.if ${PYTHON_REL} < 3400
>-PY_ENUM34=	${PYTHON_PKGNAMEPREFIX}enum34>=1.1<2.0:devel/py-enum34@${PY_FLAVOR}
>-PY_PATHLIB=	${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${PY_FLAVOR}
>-.else
>+# old compat stuff, remove from ports
>+PY_TYPING=
> PY_ENUM34=
> PY_PATHLIB=
>-.endif
>-
>-.if ${PYTHON_REL} < 3300
>-PY_IPADDRESS=	${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.23:net/py-ipaddress@${PY_FLAVOR}
>-.else
> PY_IPADDRESS=
>-.endif
>-
>-.if ${PYTHON_REL} < 3200
>-PY_FUTURES=	${PYTHON_PKGNAMEPREFIX}futures>=3.2:devel/py-futures@${PY_FLAVOR}
>-.else
> PY_FUTURES=
>-.endif
> 
> .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
> PY_MERCURIAL=	${PYTHON_PKGNAMEPREFIX}mercurial>=5.5:devel/mercurial@${PY_FLAVOR}
>@@ -700,11 +660,7 @@ PLIST_SUB+=	PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
> 		PYTHON_SUFFIX=${PYTHON_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 Mk/Uses/scons.mk Mk/Uses/scons.mk
>index 2c2eaf7a3f0c..b6b63f2bfcc8 100644
>--- Mk/Uses/scons.mk
>+++ 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 Mk/Uses/shebangfix.mk Mk/Uses/shebangfix.mk
>index 03a7649f033f..1dc432eb09a2 100644
>--- Mk/Uses/shebangfix.mk
>+++ Mk/Uses/shebangfix.mk
>@@ -31,7 +31,7 @@
> # To override a definition, for example replacing /usr/bin/perl by
> # /usr/bin/env perl, add the following:
> #
>-#   perl_CMD=	${SETENV} perl
>+#   perl_CMD=	/usr/bin/env perl
> #
> # MAINTAINER: portmgr@FreeBSD.org
> 
>diff --git Mk/bsd.default-versions.mk Mk/bsd.default-versions.mk
>index 33cc3359e3b7..bfb926f7ecb5 100644
>--- Mk/bsd.default-versions.mk
>+++ Mk/bsd.default-versions.mk
>@@ -20,7 +20,7 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
> LOCALBASE?=	/usr/local
> 
> .for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
>-	JAVA JULIA LAZARUS LINUX LLVM LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 \
>+	JAVA JULIA LAZARUS 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"
>@@ -90,10 +90,8 @@ PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
> PGSQL_DEFAULT?=		12
> # Possible values: 7.2, 7.3, 7.4
> PHP_DEFAULT?=		7.4
>-# Possible values: 2.7, 3.6, 3.7, 3.8
>+# Possible values: 3.6, 3.7, 3.8
> PYTHON_DEFAULT?=	3.7
>-# Possible values: 2.7
>-PYTHON2_DEFAULT?=	2.7
> # Possible values: 3.6, 3.7, 3.8
> PYTHON3_DEFAULT?=	3.7
> # Possible values: 2.5, 2.6, 2.7
>diff --git Mk/bsd.gecko.mk Mk/bsd.gecko.mk
>index 47e37dcfe0cd..b074928de2c2 100644
>--- Mk/bsd.gecko.mk
>+++ Mk/bsd.gecko.mk
>@@ -210,7 +210,7 @@ LDFLAGS+=		-B${LOCALBASE}/bin
> .endif
> 
> .if ${PORT_OPTIONS:MCANBERRA}
>-RUN_DEPENDS+=	libcanberra>0:audio/libcanberra
>+RUN_DEPENDS+=	libcanberra-gtk3>0:audio/libcanberra-gtk3
> .endif
> 
> .if ${PORT_OPTIONS:MDBUS}
>diff --git Mk/bsd.port.mk Mk/bsd.port.mk
>index 7581ea96e62e..78811b9f83fc 100644
>--- Mk/bsd.port.mk
>+++ Mk/bsd.port.mk
>@@ -1692,17 +1692,15 @@ _WRKDIR=	work-${FLAVOR}
> 
> WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/${_WRKDIR}
> BINARY_LINKDIR=	${WRKDIR}/.bin
>-PATH:=			${BINARY_LINKDIR}:${PATH}
>-.if !${MAKE_ENV:MPATH=*} && !${CONFIGURE_ENV:MPATH=*}
>-MAKE_ENV+=			PATH=${PATH}
>-CONFIGURE_ENV+=		PATH=${PATH}
>-.endif
>+PATH:=			${BINARY_LINKDIR}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:${LOCALBASE}/sbin:${LOCALBASE}/bin:/root/bin
> 
> .if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB) && empty(USE_GITHUB:Mnodefault)
> .if defined(WRKSRC)
> DEV_WARNING+=	"You are using USE_GITHUB and WRKSRC is set which is wrong.  Set GH_PROJECT correctly, set WRKSRC_SUBDIR or remove WRKSRC entirely."
> .endif
>-WRKSRC?=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
>+# PR 246196
>+#WRKSRC?=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
>+WRKSRC?=		${WRKDIR}/${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}
> .endif
> 
> .if !default(IGNORE_MASTER_SITE_GITLAB) && defined(USE_GITLAB) && empty(USE_GITLAB:Mnodefault)
>@@ -2046,6 +2044,10 @@ NONEXISTENT?=	/nonexistent
> CHECKSUM_ALGORITHMS?= sha256
> 
> DISTINFO_FILE?=		${MASTERDIR}/distinfo
>+# _TIMESTAMP=			0
>+# .if exists(${DISTINFO_FILE})
>+# _TIMESTAMP!=	${AWK} -F= -v ts=0 '/^TIMESTAMP/ { gsub(" ", "", $$2); ts=$$2 } END { print ts}' ${DISTINFO_FILE}
>+# .endif
> 
> MAKE_FLAGS?=	-f
> MAKEFILE?=		Makefile
>@@ -2058,6 +2060,10 @@ MAKE_ENV+=		PREFIX=${PREFIX} \
> 			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
> 			MANPREFIX="${MANPREFIX}"
> 
>+# .if ${_TIMESTAMP} != 0
>+# MAKE_ENV+=	SOURCE_DATE_EPOCH="${_TIMESTAMP}"
>+# .endif
>+
> # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.
> # gcc 4.x enable strict aliasing optimization with -O2 which is known to break
> # a lot of ports.
>@@ -3428,6 +3434,9 @@ _EXTRA_PACKAGE_TARGET_DEP+=	${WRKDIR_PKGFILE}
> 
> .if !target(do-package)
> PKG_CREATE_ARGS=	-r ${STAGEDIR}
>+# .if ${_TIMESTAMP} != 0
>+# PKG_CREATE_ARGS+=	-t ${_TIMESTAMP}
>+# .endif
> .  if defined(PKG_CREATE_VERBOSE)
> PKG_CREATE_ARGS+=	-v
> .  endif
>diff --git UPDATING UPDATING
>index 78595284ff81..b1dbe238eacf 100644
>--- UPDATING
>+++ UPDATING
>@@ -126,6 +126,21 @@ you update your ports collection, before attempting any port upgrades.
>   upgrade will do the right thing.  For the other people, follow the
>   instructions in entry 20161103, it should still be the same.
> 
>+20200802:
>+  AFFECTS: users of databases/mdbtools
>+  AUTHOR: rhurlin@gwdg.de
>+
>+  In MDBTools the build process is broken, if mdbtools is installed
>+  already, because it picks up some files from ${LOCALBASE} instead of
>+  the ports working directory.
>+
>+  If you are using a tool like portmaster or portupgrade, please first
>+  deinstall (any version) of mdbtools, then follow the normal upgrade
>+  method.
>+
>+  # pkg delete -f mdbtools
>+  # rm -R /var/db/pkg/mdbtools-*
>+
> 20200726:
>   AFFECTS: users of net-mgmt/librenms
>   AUTHOR:  dvl@FreeBSD.org
>diff --git archivers/dzip/Makefile archivers/dzip/Makefile
>index 2523ce38233b..c48a3764010d 100644
>--- archivers/dzip/Makefile
>+++ archivers/dzip/Makefile
>@@ -24,14 +24,6 @@ PORTDOCS=	Readme
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-extract: .SILENT
>-	${REINPLACE_CMD} -e 's/ifdef BIG_ENDIAN/if BYTE_ORDER == BIG_ENDIAN/' \
>-		-e 's/ifndef BIG_ENDIAN/if BYTE_ORDER == LITTLE_ENDIAN/' \
>-			${WRKSRC}/dzip.h ${WRKSRC}/conmain.c
>-	${REINPLACE_CMD} -e '4s,^,#include <machine/endian.h>,' \
>-		${WRKSRC}/dzip.h
>-	${REINPLACE_CMD} -e '21d;23d' ${WRKSRC}/dzipcon.h
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
> 
>diff --git archivers/lzo2/Makefile archivers/lzo2/Makefile
>index dd1250478f8f..30dcf9582348 100644
>--- archivers/lzo2/Makefile
>+++ archivers/lzo2/Makefile
>@@ -16,12 +16,15 @@ LICENSE=	GPLv2
> 
> USES=		libtool
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-shared --docdir=${DOCSDIR} --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
>+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
>+		--enable-shared \
>+		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
> USE_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-DOCS_INSTALL_TARGET_OFF=	install-exec install-pkgincludeHEADERS install-pkgconfigDATA
>+DOCS_INSTALL_TARGET_OFF=	install-exec install-pkgincludeHEADERS \
>+				install-pkgconfigDATA
> 
> post-build:
> .if !defined(WITHOUT_CHECKS)
>@@ -33,7 +36,6 @@ post-build:
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblzo2.so.2
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,doc/,,' NEWS README
> .for i in AUTHORS BUGS COPYING NEWS README THANKS
> 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
> .endfor
>diff --git archivers/paq/Makefile archivers/paq/Makefile
>index b72a234499c3..3f153cea9edb 100644
>--- archivers/paq/Makefile
>+++ archivers/paq/Makefile
>@@ -79,10 +79,6 @@ post-extract:
> 
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|c:\\res\\zpaq\\||' ${WRKSRC}/bwt[12].cfg \
>-		${WRKSRC}/bwtrle[12].cfg
>-
> do-build:
> 	@cd ${WRKSRC}; for prog in bwt_ bwtpre exe_jo jpeg_jo lazy2 lzpre \
> 	lzppre; do \
>diff --git archivers/ppmd-7z/Makefile archivers/ppmd-7z/Makefile
>index f6d060db5adf..ddd6d9d0520f 100644
>--- archivers/ppmd-7z/Makefile
>+++ archivers/ppmd-7z/Makefile
>@@ -28,8 +28,6 @@ MAKE_ARGS=	PROG=${PORTNAME} CXX="${CXX}" LIB="-pthread"
> TEST_TARGET=	test
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/bool Open(LPCTSTR fileName, DWORD creationDisposition)/,/}/d'\
>-		${WRKSRC}/CPP/7zip/Common/FileStreams.h
> 	@${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|;s|-o |${CFLAGS} -o |'\
> 			${BUILD_WRKSRC}/${MAKEFILE}
> 
>diff --git archivers/snappy-java/Makefile archivers/snappy-java/Makefile
>index 323c70f9989e..1024f034b94c 100644
>--- archivers/snappy-java/Makefile
>+++ archivers/snappy-java/Makefile
>@@ -25,7 +25,8 @@ BROKEN_powerpc64=	fails to build: failed to execute goal org.apache.maven.plugin
> BUILD_DEPENDS=	cmake:devel/cmake \
> 		sbt:devel/sbt
> 
>-USES=		gmake
>+USES=		dos2unix gmake
>+DOS2UNIX_FILES=	Makefile
> USE_JAVA=	yes
> USE_LDCONFIG=	yes
> MAKE_ARGS+=	CXX="${CXX}"
>@@ -43,8 +44,6 @@ GH_TAGNAME=	${PORTVERSION} \
> 		${PORTVERSION:R}:google \
> 		${BITSHUFFLE_V}:masui
> 
>-PLIST_FILES=	${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so
>-
> post-extract:
> 	@${MKDIR} ${WRKSRC}/target
> 	@${RM} ${WRKSRC}/sbt
>diff --git archivers/szip/Makefile archivers/szip/Makefile
>index 2f783cd1a484..fa5ddbf05233 100644
>--- archivers/szip/Makefile
>+++ archivers/szip/Makefile
>@@ -20,11 +20,6 @@ PORTDOCS=	*.txt
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's,more logfile,cat logfile,' \
>-			  -e "s,^CFLAGS.*,CFLAGS= ${CFLAGS}," \
>-		${WRKSRC}/makefile
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
> 
>diff --git archivers/unfoo/Makefile archivers/unfoo/Makefile
>index 095ed641a817..5242d1a7445d 100644
>--- archivers/unfoo/Makefile
>+++ archivers/unfoo/Makefile
>@@ -23,9 +23,6 @@ NO_BUILD=	yes
> NO_ARCH=	yes
> PLIST_FILES=	bin/${PORTNAME}
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e '1s|/.*|/bin/sh|;s|==|=|' ${WRKSRC}/${PORTNAME}
>-
> do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
> 
>diff --git archivers/xmill/Makefile archivers/xmill/Makefile
>index cd2cc068cb9a..15c4d860f7fa 100644
>--- archivers/xmill/Makefile
>+++ archivers/xmill/Makefile
>@@ -9,24 +9,23 @@ MASTER_SITES=	SF
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Efficient compressor for XML
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>-
> USES=		dos2unix zip
>-DOS2UNIX_FILES=	${MAKEFILE} XMill/*.cpp
>-MAKEFILE=	makefile
> 
>+WRKSRC=		${WRKDIR}/${PORTNAME}
>+DOS2UNIX_FILES=	${MAKEFILE} XMill/*.cpp XMill/*.hpp xmillinspect/exprinfo.cpp \
>+		xmillinspect/xmillinspect.h
>+MAKEFILE=	makefile
> PORTDOCS=	*
> PORTEXAMPLES=	*
>-PLIST_FILES=	bin/xcmill bin/xdemill bin/xmilltest bin/xmillexample \
>-		bin/xmillinspect bin/ppmzip
>+PLIST_FILES=	bin/ppmzip \
>+		bin/xcmill \
>+		bin/xdemill \
>+		bin/xmillexample \
>+		bin/xmillinspect \
>+		bin/xmilltest
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-post-patch:
>-# Allow to build with modern GCC
>-	@${REINPLACE_CMD} -e 's,friend,& class,' ${WRKSRC}/XMill/*.?pp \
>-		${WRKSRC}/xmillinspect/xmillinspect.h
>-
> do-install:
> .for p in ${PLIST_FILES:T}
> 	(cd ${WRKSRC}/unix && ${INSTALL_PROGRAM} ${p} ${STAGEDIR}${PREFIX}/bin)
>diff --git archivers/xmill/files/patch-xmillinspect_exprinfo.cpp archivers/xmill/files/patch-xmillinspect_exprinfo.cpp
>index c62579e47251..ce60650a39a4 100644
>--- archivers/xmill/files/patch-xmillinspect_exprinfo.cpp
>+++ archivers/xmill/files/patch-xmillinspect_exprinfo.cpp
>@@ -1,18 +1,18 @@
>-./xmillinspect/exprinfo.cpp:64:10: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
>-                return NULL;
>-                       ^~~~
>-/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
>-#define NULL    nullptr
>-                ^~~~~~~
>-
>---- xmillinspect/exprinfo.cpp.orig	2003-03-23 15:06:16 UTC
>-+++ xmillinspect/exprinfo.cpp
>-@@ -61,7 +61,7 @@ int ExprInfo::getSubContainerType(int sub)
>- 	if (expr) {
>- 		return expr->getContainerType();
>- 	} else {
>--		return NULL;
>-+		return 0;
>- 	}
>- }
>- 
>+./xmillinspect/exprinfo.cpp:64:10: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
>+                return NULL;
>+                       ^~~~
>+/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
>+#define NULL    nullptr
>+                ^~~~~~~
>+
>+--- xmillinspect/exprinfo.cpp.orig	2003-03-23 15:06:16 UTC
>++++ xmillinspect/exprinfo.cpp
>+@@ -61,7 +61,7 @@ int ExprInfo::getSubContainerType(int sub)
>+ 	if (expr) {
>+ 		return expr->getContainerType();
>+ 	} else {
>+-		return NULL;
>++		return 0;
>+ 	}
>+ }
>+ 
>diff --git astro/saoimage/files/patch-btnlib_makefile astro/saoimage/files/patch-btnlib_makefile
>index d65f0aad01c0..d73b3c3c0b72 100644
>--- astro/saoimage/files/patch-btnlib_makefile
>+++ astro/saoimage/files/patch-btnlib_makefile
>@@ -1,4 +1,4 @@
>---- btnlib/makefile.orig	1995-12-06 20:51:17 UTC
>+--- btnlib/makefile.orig	2020-01-26 19:05:22 UTC
> +++ btnlib/makefile
> @@ -8,7 +8,7 @@
>  # the library would build.  It is preferable to build btnlib as part of the
>@@ -9,7 +9,7 @@
>  
>  LINT   = lint
>  RANLIB = ranlib
>-@@ -27,7 +27,7 @@ OBJS =	attach.o	draw.o		event.o		border.
>+@@ -27,7 +27,7 @@ OBJS =	attach.o	draw.o		event.o		border.o \
>  	press.o		remote.o	resize.o	util.o
>  
>  LIB	= libbtn.a
>diff --git astro/saoimage/files/patch-disppsct.c astro/saoimage/files/patch-disppsct.c
>index 0aa347de9877..4df48d437cd0 100644
>--- astro/saoimage/files/patch-disppsct.c
>+++ astro/saoimage/files/patch-disppsct.c
>@@ -1,4 +1,4 @@
>---- disppsct.c.orig	2003-09-03 18:23:08 UTC
>+--- disppsct.c.orig	2020-01-26 19:05:22 UTC
> +++ disppsct.c
> @@ -599,7 +599,7 @@ static char *make_label()
>    char *getenv();
>diff --git astro/saoimage/files/patch-gcc4 astro/saoimage/files/patch-gcc4
>deleted file mode 100644
>index 4483e5e976c3..000000000000
>--- astro/saoimage/files/patch-gcc4
>+++ /dev/null
>@@ -1,2468 +0,0 @@
>---- btnlib/border.c.orig	1995-05-04 17:21:13 UTC
>-+++ btnlib/border.c
>-@@ -35,6 +35,10 @@ static char SccsId[] = "%W%  %G%";
>-  * Note:	For each byte, bit 0 (0x01) appears on the left.
>-  * Note:	For each byte, bit 7 (0x80) appears on the right.
>-  */
>-+
>-+static unsigned char btn_ReverseByte();
>-+static void btn_MakeBdrLine();
>-+
>- void btn_MakeBdrBitmap ( buttonmap, width, height, byte_width, form, inverse )
>-      unsigned char *buttonmap;	/* i,o: pointer to bitmap of button */
>-      int width, height;		/* i: dimensions of button window (to cover) */
>-@@ -52,8 +56,6 @@ void btn_MakeBdrBitmap ( buttonmap, widt
>-   int right_form_bit;		/* l: bit in first right form byte to use */
>-   int right_bdr_byte;		/* l: index of first line byte for right bdr */
>-   int right_bdr_bit;		/* l: bit in first line byte for right bdr */
>--  static unsigned char btn_ReverseByte();
>--  static void btn_MakeBdrLine();
>- 
>-   /* portion of pattern form used (clip overlap if button very small) */
>-   /* middle overlap on odd size counted for height, omitted for width */
>-@@ -119,6 +121,9 @@ void btn_MakeBdrBitmap ( buttonmap, widt
>-  * Subroutine:	btn_MakeBdrLine
>-  * Purpose:	set the bits for one line of the button's border
>-  */
>-+
>-+static void btn_RightBorder();
>-+
>- static void btn_MakeBdrLine ( line, form, byte_width, inverse,
>- 			      right_bdr_byte, right_bdr_bit,
>- 			      right_form_byte, right_form_bit )
>-@@ -131,7 +136,6 @@ static void btn_MakeBdrLine ( line, form
>-      int right_bdr_byte;	/* l: index of first line byte for right bdr */
>-      int right_bdr_bit;		/* l: bit in first line byte for right bdr */
>- {
>--  static void btn_RightBorder();
>-   /* copy in top left, store reverse for top right */
>-   *line = *form;
>-   *(line+1) = *(++form);
>---- btnlib/create.c.orig	1990-04-28 20:17:46 UTC
>-+++ btnlib/create.c
>-@@ -53,6 +53,9 @@ static GC def_gc = NULL;
>-  * Note:	Buttonboxes must later be combined into menus and panels
>-  * Note:	Call TouchButton to activate buttons and submenus when ready
>-  */
>-+
>-+static void btn_CreateWindows();
>-+
>- ButtonBox MakeButtonBox ( parent, gc, visual, background, geo, defs, borders )
>-      BoxParent *parent;		/* i: Parent window info */
>-      GC gc;			/* i: graphics context for drawing labels */
>-@@ -70,7 +73,6 @@ ButtonBox MakeButtonBox ( parent, gc, vi
>-   int x, y;			/* l: coordinates of box in parent */
>-   int i;			/* l: loop counter */
>-   char *btn_Alloc();
>--  static void btn_CreateWindows();
>-   void btn_LabelButtons(), btn_Dimensions();
>- 
>-   /* allocate the space for the new record */
>---- btnlib/draw.c.orig	1991-06-21 23:40:21 UTC
>-+++ btnlib/draw.c
>-@@ -103,11 +103,13 @@ void btn_PutImage ( button, phase )
>-  * Xlib calls:	none
>-  * Method:	Dim this box and all co-menu boxes
>-  */
>-+
>-+static void btn_DimButtons();
>-+
>- void btn_DelightButtons ( buttonbox )
>-      ButtonBox buttonbox;
>- {
>-   int i;
>--  static void btn_DimButtons();
>- 
>-   btn_DimButtons(buttonbox);
>-   for( i=0; i < buttonbox->co_menu_count; i++ ) {
>-@@ -153,11 +155,13 @@ static void btn_DimButtons ( buttonbox )
>-  * Uses:	btn_LightButtons() below
>-  * Xlib calls:	none
>-  */
>-+
>-+static void btn_LightButtons();
>-+
>- void btn_RelightButtons ( buttonbox )
>-      ButtonBox buttonbox;
>- {
>-   int i;
>--  static void btn_LightButtons();
>- 
>-   btn_LightButtons(buttonbox);
>-   for( i=0; i < buttonbox->co_menu_count; i++ ) {
>---- btnlib/event.c.orig	1995-05-04 17:27:33 UTC
>-+++ btnlib/event.c
>-@@ -52,12 +52,14 @@ static int select_size=0;
>-  *		with their active submenus.
>-  * Note:	Must be called with a buttonbox at the base of the menu tree
>-  */
>-+
>-+static int btn_Event();
>-+
>- int ButtonEvent ( buttonbox, event )
>-      ButtonBox buttonbox;	/* i: top handle for button menu group */
>-      XEvent *event;		/* i: pointer to filled event record */
>- {
>-   int i;			/* l: loop counter */
>--  static int btn_Event();
>- 
>-   /* is the event in the primary buttonbox (or its sub-menus) */
>-   if( btn_Event(buttonbox, event) != 0 ) {
>-@@ -139,6 +141,10 @@ static int btn_Event ( buttonbox, event 
>-  *		with their active submenus.
>-  * Note:	Must be called with a buttonbox at the base of the menu tree
>-  */
>-+
>-+static int btn_Event();
>-+static int btn_Control();
>-+
>- int ButtonControl ( buttonbox, event, response )
>-      ButtonBox buttonbox;	/* i: top handle for button menu group */
>-      XEvent *event;		/* i: pointer to filled event record */
>-@@ -147,8 +153,6 @@ int ButtonControl ( buttonbox, event, re
>-   int status;		/* o: reason for return code (-1,0,1) */
>-   int not_found;	/* l: event search status */
>-   int i;		/* l: loop counter */
>--  static int btn_Event();
>--  static int btn_Control();
>- 
>-   status = 1;
>-   *response = NULL;
>-@@ -206,6 +210,9 @@ int ButtonControl ( buttonbox, event, re
>-  *		until one fields it.  If still not, return NULL, else (it
>-  *		was fielded) get the next event and loop again.
>-  */
>-+
>-+static int btn_Event();
>-+
>- static int btn_Control ( buttonbox, event, response )
>-      ButtonBox buttonbox;	/* i: top handle for button menu tree */
>-      XEvent *event;		/* i: pointer to filled event record */
>-@@ -218,7 +225,6 @@ static int btn_Control ( buttonbox, even
>-   int type;		/* l: temp for button response type */
>-   int id;		/* l: temp for button id */
>-   int mask[2];		/* l: temp store for select mask (select changes it) */
>--  static int btn_Event();
>-   int btn_PushButton();
>-   void btn_PutImage(), btn_DrawButton(), btn_ReleaseButton();
>- 
>---- btnlib/image.c.orig	1991-08-03 22:42:11 UTC
>-+++ btnlib/image.c
>-@@ -38,6 +38,9 @@ static char SccsId[] = "%W%  %G%";
>-  * Post-state:	off_out, off_in, on_out, on_in XImage's set in button record.
>-  * Exception:	Only labels present are installed.
>-  */
>-+
>-+static void btn_AddLabel();
>-+
>- void btn_MakeXImages ( button, width, height, byte_width, visual,
>- 		       off_out, off_in, on_out, on_in, mapsz, off, on, motf )
>-      ButtonRecord *button;	/* i: main structure describing button */
>-@@ -56,7 +59,6 @@ void btn_MakeXImages ( button, width, he
>-   unsigned char *data;		/* l: pointer to bitmap currently processing */
>-   XImage *ximage;
>-   char *btn_Alloc();
>--  static void btn_AddLabel();
>- 
>- #ifdef ALLIANT
>-   extern int nbutton;
>-@@ -173,6 +175,9 @@ void btn_MakeXImages ( button, width, he
>-  * Exception:	Label is not stenciled if one dimension would be zero.
>-  * Method:	Get basic alignment parameters and call btn_StencilLabel();
>-  */
>-+
>-+static int btn_LabelX(), btn_LabelY();
>-+
>- static void btn_AddLabel ( label, width, height, byte_width, bitmap, inverse )
>-      ButtonLabel *label;	/* i: record of label bitmap to stencil in */
>-      int width;			/* i: width in pixels of button */
>-@@ -185,7 +190,6 @@ static void btn_AddLabel ( label, width,
>-   int dst_x, dst_y;	/* l: coords of start of stencil in dst (button) */
>-   int xwdth;		/* l: width (cols) to stencil */
>-   int yhght;		/* l: number of lines (rows) to stencil */
>--  static int btn_LabelX(), btn_LabelY();
>-   void btn_StencilLabel();
>- 
>-   if( ((xwdth = btn_LabelX(label, width, &src_x, &dst_x)) > 0) &&
>---- btnlib/label.c.orig	1995-05-04 17:19:37 UTC
>-+++ btnlib/label.c
>-@@ -42,6 +42,10 @@ static unsigned char lmask[8] = { 0x01,0
>-  * Note:	For each byte, bit 0 (0x01) appears on the left.
>-  * Note:	For each byte, bit 7 (0x80) appears on the right.
>-  */
>-+
>-+static void btn_Stencil(), btn_StencilInv();
>-+static void btn_StencilAlligned(),btn_StencilAllignedInv();
>-+
>- void btn_StencilLabel ( src, msk, dst, src_byte_width, dst_byte_width,
>- 		        src_x, src_y, dst_x, dst_y, width, height, inverse )
>-      unsigned char *src;	/* i: ptr to first byte of pattern */
>-@@ -66,9 +70,6 @@ void btn_StencilLabel ( src, msk, dst, s
>-   int first_mask;		/* l: bit mask, with coded sign (see above) */
>-   int last_mask;		/* l: bit mask, with coded sign (see above) */
>- 
>--  static void btn_Stencil(), btn_StencilInv();
>--  static void btn_StencilAlligned(),btn_StencilAllignedInv();
>--
>-   /* advance src and msk to their first used bytes */
>-   byte_offset = (src_y * src_byte_width) + (src_x / 8);
>-   src += byte_offset;
>---- btnlib/mount.c.orig	1990-04-20 21:56:27 UTC
>-+++ btnlib/mount.c
>-@@ -35,11 +35,13 @@ static char SccsId[] = "%W%  %G%";
>-  * Xlib calls:	none
>-  * Note:	This routine moves latterally to cover co-menus
>-  */
>-+
>-+static void btn_MapButtonbox();
>-+
>- void MountButtonMenu ( buttonbox )
>-      ButtonBox buttonbox;
>- {
>-   int i;
>--  static void btn_MapButtonbox();
>- 
>-   btn_MapButtonbox(buttonbox);
>-   for( i = 0; i < buttonbox->co_menu_count; i++ )
>-@@ -109,6 +111,9 @@ static void btn_UnmapButtonbox ( buttonb
>-  *		map submenus of new button.
>-  * Note:	Unmapping submenus is harmless if they were not mapped.
>-  */
>-+
>-+static void btn_UnmapButtonbox(), btn_MapButtonbox();
>-+
>- void btn_ReplaceSubmenus ( buttonbox, btn, op_num, mapping )
>-      ButtonBox buttonbox;
>-      int btn;
>-@@ -116,7 +121,6 @@ void btn_ReplaceSubmenus ( buttonbox, bt
>-      int mapping;		/* i: switch allows suppression of mapping */
>- {
>-   int i;
>--  static void btn_UnmapButtonbox(), btn_MapButtonbox();
>- 
>-   /* clear out the old submenus */
>-   for( i=0; i < buttonbox->submenu_count; i++ )
>-@@ -149,6 +153,9 @@ void btn_ReplaceSubmenus ( buttonbox, bt
>-  * Note:	Requires search through co-menus
>-  * Note:	Unmapping cosubmenus is harmless if they were not mapped.
>-  */
>-+
>-+static void btn_UnmapButtonbox(), btn_MapButtonbox();
>-+
>- void btn_ReplaceCosubmenus ( buttonbox, btn, op_num, mapping )
>-      ButtonBox buttonbox;
>-      int btn;
>-@@ -156,7 +163,6 @@ void btn_ReplaceCosubmenus ( buttonbox, 
>-      int mapping;		/* i: switch allows suppression of mapping */
>- {
>-   int i, j;
>--  static void btn_UnmapButtonbox(), btn_MapButtonbox();
>- 
>-   /* check to see if we have the co-mode submenus */
>-   if( buttonbox->cosubmenu_count > 0 ) {
>---- btnlib/resize.c.orig	1990-04-20 22:15:57 UTC
>-+++ btnlib/resize.c
>-@@ -33,12 +33,14 @@ static char SccsId[] = "%W%  %G%";
>-  * Post-state:	All buttonboxes having given parent are resized to fill
>-  * Method:	Call btn_ChkResize with this menu and then its co-menus.
>-  */
>-+
>-+static void btn_ChkResize();
>-+
>- void ResizeButtons ( buttonbox, parent )
>-      ButtonBox buttonbox;	/* i: top handle for button menu group */
>-      BoxParent *parent;		/* i: record describing parent window */
>- {
>-   int i;		/* l: loop counter */
>--  static void btn_ChkResize();
>- 
>-   /* check this buttonbox */
>-   btn_ChkResize(buttonbox, parent);
>---- clralloc.c.orig	1999-05-12 18:40:45 UTC
>-+++ clralloc.c
>-@@ -39,12 +39,14 @@ static unsigned long overlay_mask;	/* fo
>-  * Method:	Try for at least min cells in default colormap, if failed
>-  *		try to create a private colormap.
>-  */
>-+
>-+static Colormap create_colormap();
>-+static int alloc_color_cells();
>-+
>- int alloc_colors( color )
>-      struct colorRec *color;
>- {
>-   int verify_pseudocolor();
>--  static Colormap create_colormap();
>--  static int alloc_color_cells();
>- 
>-   if( (color->map.default_permit != NO) &&
>-       (color->map.default_enable == YES) &&
>---- clrctrl.c.orig	1990-04-20 14:43:37 UTC
>-+++ clrctrl.c
>-@@ -36,13 +36,15 @@ extern struct cgraphRec cgraph;
>-  * Subroutine:	select_color
>-  * Purpose:	Things to do when a buttonbox color menu button is selected
>-  */
>-+
>-+static void new_color_table();
>-+
>- void select_color ( )
>- {
>-   static int overlay = 0;
>-   static int cells = 0;
>-   static int mode = VOP_PseudoColor;
>-   void invert_rgb(), reinit_color();
>--  static void new_color_table();
>- 
>-   if( control.response[0] == VOP ) {
>-     switch( control.response[1] ) {
>-@@ -218,10 +220,12 @@ static void new_color_table ( map_code )
>-  * Purpose:	Reverse all colors at once (respond to invert button)
>-  * Xlib call:	XStoreColors()
>-  */
>-+
>-+static void invert_table();
>-+
>- void invert_rgb ( )
>- {
>-   void make_cellstore_from_cellmaps(), draw_cgraph();
>--  static void invert_table();
>- 
>-   /* invert color tables and remake storemap */
>-   invert_table(&color.ctable.red);
>---- clrhard.c.orig	1990-04-20 13:54:21 UTC
>-+++ clrhard.c
>-@@ -29,11 +29,13 @@ static char SccsId[] = "%W%  %G%";
>-  * Subroutine:	init_hard_colors
>-  * Purpose:	Set up basic hardware colors
>-  */
>-+
>-+static int get_hard_color();
>-+
>- void init_hard_colors ( color, colormap )
>-      struct colorRec *color;
>-      Colormap colormap;
>- {
>--  static int get_hard_color();
>- 
>-   color->hard.red =
>-     get_hard_color(color->display, colormap, "red", 63000, 0, 0);
>-@@ -58,12 +60,14 @@ void init_hard_colors ( color, colormap 
>-  * Subroutine:	lookup_cursor_colors
>-  * Purpose:	Get color parameters from named cursor colors
>-  */
>-+
>-+static void lookup_color();
>-+
>- void lookup_cursor_colors ( color, colormap, init )
>-      struct colorRec *color;
>-      Colormap colormap;
>-      int init;
>- {
>--  static void lookup_color();
>- 
>-   /* update xcolor structs if needed */
>-   if( init || (color->cur.desired_cur != NULL) ) {
>-@@ -90,12 +94,14 @@ void lookup_cursor_colors ( color, color
>-  * Pre-state:	XColor for cur, one, and two, initialized
>-  * Post-state:	Pixel values for one and two set, that for cur returned.
>-  */
>-+
>-+static int alloc_hard_color();
>-+
>- int alloc_cursor_cell_color ( color, colormap )
>-      struct colorRec *color;
>-      Colormap colormap;
>- {
>-   int val;
>--  static int alloc_hard_color();
>- 
>-   if( (color->cur.disp_one =
>-       alloc_hard_color(color->display, colormap, &color->cur.color_one)) < 0 )
>-@@ -113,10 +119,12 @@ int alloc_cursor_cell_color ( color, col
>-  * Subroutine:	free_cursor_cell_color
>-  * Purpose:	Free cell color overlay colors
>-  */
>-+
>-+static void free_readonly_color();
>-+
>- void free_cursor_cell_color ( color )
>-      struct colorRec *color;
>- {
>--  static void free_readonly_color();
>- 
>-   free_readonly_color(color, (int)color->cur.color_one.pixel);
>-   free_readonly_color(color, (int)color->cur.color_two.pixel);
>---- clrinit.c.orig	2001-12-14 23:17:55 UTC
>-+++ clrinit.c
>-@@ -38,6 +38,9 @@ static Display *display;
>-  * Subroutine:	init_color
>-  * Purpose:	Claim and set up colors (and do any needed initial work)
>-  */
>-+
>-+static int init_visual();
>-+
>- void init_color ( color, init )
>-      struct colorRec *color;
>-      int init;
>-@@ -46,7 +49,6 @@ void init_color ( color, init )
>-   void exit_errmsg(), init_hard_colors(), init_halftone();
>-   void free_color_cells(), lookup_cursor_colors(), free_cursor_cell_color();
>-   void init_overlay_color(), init_cell_color(), init_halftone_color();
>--  static int init_visual();
>- 
>-   if( init ) {
>-     display = color->display;
>---- clrmenu.c.orig	1990-04-28 22:40:14 UTC
>-+++ clrmenu.c
>-@@ -35,14 +35,16 @@ EditStruct *color_edit;	/* key to popup 
>-  * Purpose:	Get a new pre-defined color table and load it for use
>-  * Returns:	1 if succeeded, else 0
>-  */
>-+
>-+static void load_newtable(), write_color_file();
>-+static ColorTable *read_color_file();
>-+
>- int fetch_colortable ( color, table_code, imagefile )
>-      struct colorRec *color;
>-      int table_code;
>-      char *imagefile;		/* i: imagefile name to print in output file */
>- {
>-   ColorTable *newtable;
>--  static void load_newtable(), write_color_file();
>--  static ColorTable *read_color_file();
>- 
>-   switch( table_code ) {
>-   case MOP_Init_A:
>-@@ -111,13 +113,15 @@ static ColorTable *read_color_file ( )
>-  * Subroutine: write_color_file
>-  * Purpose:    Open and write a color table file
>-  */
>-+
>-+static void print_one_color();
>-+
>- static void write_color_file ( imagefile, color )
>-      char *imagefile;
>-      struct colorRec *color;
>- {
>-   FILE *fp;
>-   int error;
>--  static void print_one_color();
>-   EditStruct *init_edit_popup();
>-   int open_output_file();
>-   void timestamp();
>-@@ -189,11 +193,13 @@ static void print_one_color ( fp, table 
>-  * Subroutine:	load_newtable
>-  * Purpose:	Load an internally stored color table for use
>-  */
>-+
>-+static void load_subtable();
>-+
>- static void load_newtable ( ctable, new )
>-      struct colorTable *ctable;
>-      ColorTable *new;
>- {
>--  static void load_subtable();
>- 
>-   load_subtable(&ctable->red, &new->red);
>-   load_subtable(&ctable->green, &new->green);
>---- clrread.c.orig	1990-04-28 23:30:35 UTC
>-+++ clrread.c
>-@@ -25,6 +25,9 @@ static char SccsId[] = "%W%  %G%";
>-  * Subroutine:	parse_color_file
>-  * Purpose:	Parse values after color identifier
>-  */
>-+
>-+static int parse_color_table(), advance_to_ascii();
>-+
>- int parse_color_file ( fp, ctable, max_entries )
>-      ColorTable *ctable;
>-      int max_entries;
>-@@ -35,7 +38,6 @@ int parse_color_file ( fp, ctable, max_e
>-   char line[SZ_LINE];
>-   char cbuf[SZ_LINE];
>-   struct SubTable *table;
>--  static int parse_color_table(), advance_to_ascii();
>- 
>-   line_num = 0;
>-   /* advance to first non-comment line */
>-@@ -95,6 +97,9 @@ int parse_color_file ( fp, ctable, max_e
>-  * Purpose:	Read color table entries for one color
>-  * Note:	Values may start with word "gamma" and its value
>-  */
>-+
>-+static int advance_to_ascii(), prep_alpha();
>-+
>- static int parse_color_table ( fp, line, cbuf, i, len, line_num,
>- 			       farb, max_entries, color_cnt )
>-      FILE *fp;
>-@@ -110,7 +115,6 @@ static int parse_color_table ( fp, line,
>-   float level, intensity;
>-   char *level_token, *intensity_token;
>-   int status, entry;
>--  static int advance_to_ascii(), prep_alpha();
>-   int check_parens();
>-   char *next_token();
>- 
>-@@ -227,6 +231,9 @@ static int parse_color_table ( fp, line,
>-  *		Negative val if string starts with a number or paren
>-  *		0 if file ended, or first character was neither char nor num
>-  */
>-+
>-+static int find_token(), prep_alpha();
>-+
>- static int advance_to_ascii ( fp, line, scratch, len, line_num, dont_end )
>-      FILE *fp;		/* i: file descriptor */
>-      char *line;	/* i: buffer to get entire line */
>-@@ -236,7 +243,6 @@ static int advance_to_ascii ( fp, line, 
>-      int dont_end;	/* flag that more is definitely expected */
>- {
>-   int i;
>--  static int find_token(), prep_alpha();
>-   int check_parens();
>- 
>-   /* advance to first non-comment line */
>---- clrsetup.c.orig	1990-06-03 04:07:29 UTC
>-+++ clrsetup.c
>-@@ -29,12 +29,14 @@ static char SccsId[] = "%W%  %G%";
>-  * Purpose:	Set up color parameters unique to overlay type usage
>-  * Xlib calls:	XStoreColors()
>-  */
>-+
>-+static void set_cursor_overlay_color(), copy_xcolor_rgb(), init_cellstore();
>-+
>- void init_overlay_color ( color )
>-      struct colorRec *color;
>- {
>-   int ncolors;
>-   void make_cellstore_from_tables();
>--  static void set_cursor_overlay_color(), copy_xcolor_rgb(), init_cellstore();
>- 
>-   init_cellstore(color->cellstore, color->pixvalmap, color->ncolors);
>-   /* color in the cursor range of the color map */
>-@@ -75,12 +77,14 @@ void init_overlay_color ( color )
>-  * Purpose:	Set up color parameters unique to cell usage without overlay
>-  * Xlib calls:	XStoreColors()
>-  */
>-+
>-+static void init_cellstore();
>-+
>- void init_cell_color ( color )
>-      struct colorRec *color;
>- {
>-   void make_cellstore_from_tables();
>-   int alloc_cursor_cell_color();
>--  static void init_cellstore();
>- 
>-   init_cellstore(color->cellstore, color->pixvalmap, color->ncolors);
>-   /* Not cursor plane */
>---- clrvary.c.orig	1990-04-20 13:57:20 UTC
>-+++ clrvary.c
>-@@ -130,6 +130,9 @@ void vary_colors ( event, mode, track, x
>-  * Subroutine:	vary_contrast_and_bias
>-  * Purpose:	change color table cell_levels as per new contrast and bias
>-  */
>-+
>-+static void invert_table();
>-+
>- void vary_contrast_and_bias ( table, contrast, bias )
>-      struct subtableRec *table;
>-      double contrast;		/* i: normal = 1.0 */
>-@@ -137,7 +140,6 @@ void vary_contrast_and_bias ( table, con
>- {
>-   double *base_level, *cell_level;
>-   int vertex_cnt;
>--  static void invert_table();
>- 
>-   base_level = table->base_level;
>-   cell_level = table->cell_level;
>---- cmdnew.c.orig	1997-06-06 14:52:04 UTC
>-+++ cmdnew.c
>-@@ -73,9 +73,11 @@ static char *prompt = "Enter new image f
>-  * Called by:	key_response() in MainKey.c
>-  * Called by:	select_environment() in MainSelect.c
>-  */
>-+
>-+static int new_command();
>-+
>- void get_new_cmd ( )
>- {
>--  static int new_command();
>-   int get_edit_input();
>-   EditStruct *init_edit_popup();
>- 
>-@@ -95,6 +97,11 @@ void get_new_cmd ( )
>-  * Purpose:	Given a new command line, parse it and do what is called for
>-  * Returns:	1 = success, 0 = user decided not to do anything, -1 = error
>-  */
>-+
>-+static char **make_argv();
>-+static int new_file(), form_tokens();
>-+static void redo_displays(), clear_params(), reset_dispparams(), free_argv();
>-+
>- static int new_command ( input_line )
>-      char *input_line;
>- {
>-@@ -104,9 +111,6 @@ static int new_command ( input_line )
>-   int headersize;
>-   int parse_cmdline(), check_image();
>-   void reinit_color(), redraw_magnifier(), touch_submenu_button();
>--  static char **make_argv();
>--  static int new_file(), form_tokens();
>--  static void redo_displays(), clear_params(), reset_dispparams(), free_argv();
>- 
>-   /* store some key initial values */
>-   headersize = img.headersize;
>---- cmdparse.c.orig	2002-04-08 19:26:55 UTC
>-+++ cmdparse.c
>-@@ -47,6 +47,9 @@ extern int bad_buttons;
>-  * Purpose:	Process options to set filename and change defaults
>-  * Returns:	-1 on error, 0 OK but no filename, 1 OK and new filename given
>-  */
>-+
>-+static int parse_etc();
>-+
>- int parse_cmdline ( argc, argv, displayname )
>-      int argc;
>-      char *argv[];
>-@@ -58,7 +61,6 @@ int parse_cmdline ( argc, argv, displayn
>-   int parse_rotate(), parse_scale(), parse_color(), parse_fileread(), usage();
>-   int parse_cursor();
>-   void init_cmdline();
>--  static int parse_etc();
>- 
>-   if( displayname != NULL ) {
>-     /* if initial program command line, strip off program name, store line */
>---- crdinvrt.c.orig	1990-04-20 14:00:26 UTC
>-+++ crdinvrt.c
>-@@ -28,12 +28,14 @@ static char SccsId[] = "%W%  %G%";
>-  * Purpose:	Compute parameters of the inverse transform
>-  * Method:	Uses LU decomposition method
>-  */
>-+
>-+static void lu_decompose(), lu_backsub();
>-+
>- void invert_matrix ( old, new )
>-      Transform *old, *new;
>- {
>-   float scratch[3][3], column[3];
>-   int pivots[3];
>--  static void lu_decompose(), lu_backsub();
>- 
>-   scratch[0][0] = old->inx_outx;
>-   scratch[1][0] = old->iny_outx;
>-@@ -65,13 +67,15 @@ void invert_matrix ( old, new )
>-  * Purpose:	Compute the offsets used for integer transforms
>-  * Method:	Uses matrix inversion
>-  */
>-+
>-+static void lu_decompose(), lu_backsub();
>-+
>- void compute_iadd_invert ( old, new, ioff )
>-      Transform *old, *new;
>-      float ioff;
>- {
>-   float scratch[3][3], column[3];
>-   int pivots[3];
>--  static void lu_decompose(), lu_backsub();
>- 
>-   /* set transform equations in matrix form */
>-   scratch[0][0] = old->inx_outx;
>---- crdrot.c.orig	1990-04-20 14:00:51 UTC
>-+++ crdrot.c
>-@@ -55,6 +55,9 @@ static char SccsId[] = "%W%  %G%";
>-  * As each transform is applied to the front, we apply them in reverse order
>-  *  the result is, from img->A,B,C,imgtofile(as given)->file
>-  */
>-+
>-+static void move_mtrx(), flip_mtrx(), turn_mtrx();
>-+
>- void rotate_transform ( img, imgtofile, flip, rotcode )
>-      Coordsys *img;
>-      Transform *imgtofile;
>-@@ -63,7 +66,6 @@ void rotate_transform ( img, imgtofile, 
>- {
>-   double xmove, ymove;
>-   int angle;
>--  static void move_mtrx(), flip_mtrx(), turn_mtrx();
>- 
>-   /* if no rotation, do nothing */
>-   if( (rotcode == 0) && (flip == 0) ) return;
>-@@ -93,6 +95,9 @@ void rotate_transform ( img, imgtofile, 
>-  * Note:	ioff is not used for turn or flip, as it is assumed that both
>-  * 		will be bracketed between two moves (to place origin at center)
>-  */
>-+
>-+static void mult_mtrx();
>-+
>- static void move_mtrx ( mtrx, xtran, ytran, ioff, prior )
>-      Transform *mtrx;
>-      double xtran, ytran;
>-@@ -100,7 +105,6 @@ static void move_mtrx ( mtrx, xtran, ytr
>-      int prior;
>- {
>-   Transform translate;
>--  static void mult_mtrx();
>- 
>-   bzero((char *)(&translate), sizeof(Transform));
>-   translate.inx_outx = 1.0;
>-@@ -119,12 +123,14 @@ static void move_mtrx ( mtrx, xtran, ytr
>-  * Subroutine:	flip_mtrx
>-  * Purpose:	Apply a mirror reflection to the passed Transform
>-  */
>-+
>-+static void mult_mtrx();
>-+
>- static void flip_mtrx ( mtrx, prior )
>-      Transform *mtrx;
>-      int prior;		/* i: 1: move, transform, move, 0: transform, move */
>- {
>-   Transform reflect;
>--  static void mult_mtrx();
>- 
>-   bzero((char *)(&reflect), sizeof(Transform));
>-   reflect.inx_outx = 1.0;
>-@@ -141,6 +147,9 @@ static void flip_mtrx ( mtrx, prior )
>-  * Note:	the pivot is 0,0 of the passed Transform's coordinate system
>-  * Exception:	only multiples of 90 degrees are allowed
>-  */
>-+
>-+static void mult_mtrx();
>-+
>- static void turn_mtrx ( mtrx, angle, prior )
>-      Transform *mtrx;
>-      int angle;
>-@@ -148,7 +157,6 @@ static void turn_mtrx ( mtrx, angle, pri
>- {
>-   Transform rotate;
>-   void exit_errmsg();
>--  static void mult_mtrx();
>- 
>-   while( angle >= 360 ) angle -= 360;
>-   while( angle < 0 ) angle += 360;
>---- crdsynth.c.orig	1990-04-20 14:01:55 UTC
>-+++ crdsynth.c
>-@@ -147,11 +147,13 @@ void combine_transform ( new, first, sec
>-  * Subroutine:	set_trans_speed
>-  * Purpose:	Set parameters for fast integer computation
>-  */
>-+
>-+static int integer_test();
>-+
>- void set_trans_speed ( trans )
>-      Transform *trans;
>- {
>-   int xzm, yzm;
>--  static int integer_test();
>- 
>-   trans->ixzoom = 0;
>-   trans->iyzoom = 0;
>---- crdtemp.c.orig	1996-02-26 20:14:19 UTC
>-+++ crdtemp.c
>-@@ -126,6 +126,9 @@ void set_disptran ( coord )
>-  * Purpose:	set up zoom given edges of desired display and
>-  *		appropriate img transform
>-  */
>-+
>-+static int choose_zoom();
>-+
>- void panedge_zoom ( coord, wintoimgtrans, win_x, win_y )
>-      struct coordRec *coord;	/* i: collected coords */
>-      Transform *wintoimgtrans;	/* i: transform from mouse's window to img */
>-@@ -134,7 +137,6 @@ void panedge_zoom ( coord, wintoimgtrans
>-   float imgX, imgY;
>-   int box_width, box_height;
>-   void i_transform();
>--  static int choose_zoom();
>- 
>-   /* calculate image coordinates of win_x and win_y */
>-   i_transform(wintoimgtrans, win_x, win_y, &imgX, &imgY);
>---- csrarea.c.orig	1990-04-20 14:07:03 UTC
>-+++ csrarea.c
>-@@ -28,13 +28,15 @@ static char SccsId[] = "%W%  %G%";
>-  * Purpose:	Calculate area, in float units file pixels, enclosed by cursor
>-  * Method:	Use mathematical formula appropriate to cursor type
>-  */
>-+
>-+static int test_cross();
>-+
>- double cursor_area ( cursor, user_info )
>-      struct cursorRec *cursor;
>-      int user_info;		/* flag, data is for user info */
>- {
>-   double area;
>-   int i, j;
>--  static int test_cross();
>- 
>-   switch( cursor->type ) {
>-   case COP_Circle:
>-@@ -83,13 +85,15 @@ static double x11, y11, x12, y12;
>-  *		are not tested since neighbors cannot cross but neighbors do
>-  *		share a common point.
>-  */
>-+
>-+static int intercept();
>-+
>- static int test_cross ( pt, cnt, j, i )
>-      PolyPoint *pt;	/* list of vertices */
>-      int cnt;		/* number of vertices */
>-      int j, i;		/* two vertices at ends of edge being tested */
>- {
>-   int k;
>--  static int intercept();
>- 
>-   if( (i+2) >= cnt ) {
>-     return( 0 );
>---- csrgrab.c.orig	1990-04-20 14:08:42 UTC
>-+++ csrgrab.c
>-@@ -38,12 +38,14 @@ extern struct colorRec color;	/* need to
>-  * Purpose:	Change size of cursor to intersect current mouse cursor
>-  *		while keeping aspect ratio of cursor constant
>-  */
>-+
>-+static void size_annulus(), grab_annulus();
>-+
>- void size_annuli ( cursor, event )
>-      struct cursorRec *cursor;
>-      XEvent *event;		/* i: event for location of mouse */
>- {
>-   void draw_cursor(), make_cursor();
>--  static void size_annulus(), grab_annulus();
>- 
>-   /* if this event is initiating tracking, don't erase the cursor */
>-   if( event->type == MotionNotify )
>-@@ -64,13 +66,15 @@ void size_annuli ( cursor, event )
>-  * Purpose:	Respond to a mouse request to delete an annulus
>-  *
>-  */
>-+
>-+static int on_annulus();
>-+static void size_annulus(), remove_annulus();
>-+
>- void delete_annulus ( cursor, event )
>-      struct cursorRec *cursor;
>-      XEvent *event;		/* i: XMotionEvent or XButtonEvent */
>- {
>-   struct cursorRec *parent;
>--  static int on_annulus();
>--  static void size_annulus(), remove_annulus();
>- 
>-   /* if there are two or more annuli */
>-   if( (cursor->next_annulus != 0) &&
>-@@ -169,14 +173,16 @@ static void remove_annulus ( parent )
>-  * Purpose:	Set up cursor to for a size annulus interaction
>-  * Called by:	size_annuli()
>-  */
>-+
>-+static int on_annulus();
>-+static void remove_annulus();
>-+
>- static void grab_annulus ( cursor )
>-      struct cursorRec *cursor;
>- {
>-   double inc;
>-   int code;
>-   struct cursorRec *parent, *annulus;
>--  static int on_annulus();
>--  static void remove_annulus();
>- 
>-   code = on_annulus(cursor, &parent);
>-   /* decide what to draw */
>---- csrpoly1.c.orig	1990-04-20 14:11:54 UTC
>-+++ csrpoly1.c
>-@@ -36,6 +36,9 @@ extern struct colorRec color;	/* need to
>-  *		Used when initiating a move or size action
>-  * Called by:	control_cursor() in CursorCtrl.c
>-  */
>-+
>-+static int on_polygon_vertex();
>-+
>- void grab_polygon_vertex ( cursor, event, size )
>-      struct cursorRec *cursor;
>-      XEvent *event;		/* i: XbuttonEvent (ButtonPress) for x & y */
>-@@ -45,7 +48,6 @@ void grab_polygon_vertex ( cursor, event
>-   int pt;			/* l: index of polygon vertex */
>-   int closest_polygon_line();
>-   void draw_cursor(), add_polygon_vertex();
>--  static int on_polygon_vertex();
>- 
>-   /* erase existing cursor */
>-   draw_cursor(cursor, &color.gcset.undraw);
>-@@ -84,13 +86,15 @@ void grab_polygon_vertex ( cursor, event
>-  * Returns:	1 if image must be redrawn, else 0
>-  * Called by:	control_cursor() in CursorCtrl.c
>-  */
>-+
>-+static int on_polygon_vertex();
>-+
>- int request_delete_polygon_vertex ( cursor, event )
>-      struct cursorRec *cursor;
>-      XEvent *event;		/* i: XbuttonEvent (ButtonPress) for x & y */
>- {
>-   int i;
>-   void delete_polygon_vertex(), draw_cursor();
>--  static int on_polygon_vertex();
>- 
>-   i = on_polygon_vertex((int)event->xbutton.x, (int)event->xbutton.y,
>- 			cursor->points, cursor->poly_cnt);
>---- csrpoly2.c.orig	1998-07-09 16:29:27 UTC
>-+++ csrpoly2.c
>-@@ -72,12 +72,14 @@ void collapse_polygon ( cursor )
>-  * Subroutine:	start_polygon
>-  * Purpose:	Install polygon drawing stuff for the active cursor
>-  */
>-+
>-+static void init_polygon();
>-+
>- void start_polygon ( cursor, coord )
>-      struct cursorRec *cursor;
>-      struct coordRec *coord;
>- {
>-   void set_polygon_from_file_coords();
>--  static void init_polygon();
>- 
>-   if( polysz == 0 )
>-     init_polygon();
>---- csrpoly3.c.orig	1990-04-20 14:11:40 UTC
>-+++ csrpoly3.c
>-@@ -28,6 +28,9 @@ static char SccsId[] = "%W%  %G%";
>-  *		vector from pointer to closest point on segment
>-  * Method:	top down search
>-  */
>-+
>-+static double distance_from_segment(), cos_to_segment();
>-+
>- int closest_polygon_line ( x, y, vertex, cnt )
>-      int x, y;
>-      XPoint *vertex;
>-@@ -38,7 +41,6 @@ int closest_polygon_line ( x, y, vertex,
>-   int min_endpoint, endpoint;
>-   int min_j;
>-   int i, j;
>--  static double distance_from_segment(), cos_to_segment();
>- 
>-   min_distance = 1.0E30;
>-   min_j = 0;
>---- csrshape.c.orig	1998-10-19 18:46:41 UTC
>-+++ csrshape.c
>-@@ -31,9 +31,6 @@ static char SccsId[] = "%W%  %G%";
>- 
>- #include "defs/circle.def"	/*  Define Unit_circles  */
>- 
>--#ifdef ANSIC
>--/*  Exported declarations must be centralized before ANSI C can be used  */
>--
>- void		make_cursor(	struct cursorRec *cursor);
>- static int	make_arrow(	double xtip, double ytip, double xray,
>- 				double rotsin, double rotcos, XPoint *points);
>-@@ -41,28 +38,20 @@ static int	make_boxcur(	double xcen, dou
>- 				double xray, double yray,
>- 				double rotsin, double rotcos, XPoint *points);
>- static int	make_circur(	double xcen, double ycen, double radius,
>--				XPoint *points )
>-+				XPoint *points );
>- static int	make_sqrcur(	double xcen, double ycen, double radius,
>--				XPoint *points )
>-+				XPoint *points );
>- static int	make_diacur(	double xcen, double ycen, double radius,
>--				XPoint *points )
>-+				XPoint *points );
>- static int	make_crosscur(	double xcen, double ycen, double radius,
>--				XPoint *points )
>-+				XPoint *points );
>- static int	make_excur(	double xcen, double ycen, double radius,
>--				XPoint *points )
>-+				XPoint *points );
>- static int	make_ellipse(	double xcen, double ycen,
>- 				double xradius, double yradius,
>- 				double rotsin, double rotcos, XPoint *points);
>- static int	make_piecur(	double xcen, double ycen, double radius,
>--				XPoint *points )
>--
>--#else
>--
>--  static int make_arrow(), make_boxcur(), make_circur();
>--  static int make_ellipse(), make_piecur();
>--
>--#endif
>--
>-+				XPoint *points );
>- 
>- /*  Declare and initialize drawing tools  */
>- double *UnitPieX = Circle12X;
>---- ctrlcntn.c.orig	1998-07-09 16:29:00 UTC
>-+++ ctrlcntn.c
>-@@ -61,6 +61,9 @@ void init_connections ()
>-  * Purpose:	Open a connection to a remote process and update event handlers
>-  * Returns:	-1 on failure, else IPC number
>-  */
>-+
>-+static void init_select();
>-+
>- int open_connection ( connection )
>-      struct connectRec *connection;
>- {
>-@@ -71,7 +74,6 @@ int open_connection ( connection )
>-   extern int ButtonSelectMask(), open_pipe();
>-   extern int open_socket_listener();
>-   extern struct connectRec *accept_socket_connection();
>--  static void init_select();
>- #endif
>- 
>- #ifdef NOPIPEFLUSH
>---- ctrlfile.c.orig	1990-04-20 13:49:12 UTC
>-+++ ctrlfile.c
>-@@ -40,6 +40,9 @@ extern int errno;
>-  * Post state:	Sets pointer to file, open and ready for writing
>-  * Returns:	2 = append, 1 = new file, 0 = user decided not to, -1 = error
>-  */
>-+
>-+static int file_exists();
>-+
>- int open_output_file ( fd, edit, one_popup_row, prompt )
>-      FILE **fd;
>-      EditStruct *edit;
>-@@ -56,7 +59,6 @@ int open_output_file ( fd, edit, one_pop
>-   int get_edit_input();
>-   EditStruct *init_edit_popup();
>-   void clear_edit_buf(), unmap_popwin();
>--  static int file_exists();
>- 
>-   open_type[0] = 0;
>-   if( (get_edit_input(edit, one_popup_row, 1, 0, prompt) <= 0) ||
>-@@ -137,6 +139,9 @@ int open_output_file ( fd, edit, one_pop
>-  * Note:	Sets pointer of file open and ready for reading
>-  * Returns:	1 on success, 0 if user decided not to, -1 on error
>-  */
>-+
>-+static int file_exists();
>-+
>- int open_input_file ( fd, edit, one_popup_row, prompt )
>-      FILE **fd;
>-      EditStruct *edit;
>-@@ -146,7 +151,6 @@ int open_input_file ( fd, edit, one_popu
>-   char filename[132];
>-   int exist;
>-   int get_edit_input();
>--  static int file_exists();
>- 
>-   if( get_edit_input(edit, one_popup_row, 1, 1, prompt) <= 0 )
>-     return( 0 );
>---- ctrlgc.c.orig	1990-05-02 08:19:55 UTC
>-+++ ctrlgc.c
>-@@ -237,10 +237,12 @@ GC set_edit_gc ( font, foreground, backg
>-  * Subroutine:	get_fontstruct
>-  * Returns:	Pointer to the specified fontstruct
>-  */
>-+
>-+static int init_font();
>-+
>- XFontStruct *get_fontstruct ( app_code )
>-      int app_code;	/* i: see comments above */
>- {
>--  static int init_font();
>- 
>-   if( (app_font[app_code] == NULL) && (init_font(app_code) == NULL) )
>-     return( NULL );
>-@@ -253,11 +255,13 @@ XFontStruct *get_fontstruct ( app_code )
>-  * Purpose:	Load the fonts used by this program
>-  * Returns:	Font on success, else 0
>-  */
>-+
>-+static int open_font();
>-+
>- static int init_font ( app_code )
>-      int app_code;	/* i: font application type index */
>- {
>-   int i, name_index;
>--  static int open_font();
>- 
>-   for( i=0; i<OPTION_COUNT; i++ ) {
>-     name_index = preference[app_code][i];
>---- dispblnk.c.orig	1990-04-20 14:23:14 UTC
>-+++ dispblnk.c
>-@@ -181,13 +181,15 @@ static int display_blink ( index )
>-  * For each button release, if it is on top of stack, release it and display
>-  *  one below, else just release it
>-  */
>-+
>-+static int display_blink();
>-+
>- void control_blink ()
>- {
>-   static int oldmode;
>-   static int buttons = 0;
>-   static int btnstack[4];
>-   int i;
>--  static int display_blink();
>- 
>-   if( control.event.type == ButtonPress ) {
>-     /* don't respond if it's with a meta key (window resize) */
>---- dispbtmp.c.orig	1991-06-21 22:58:15 UTC
>-+++ dispbtmp.c
>-@@ -55,9 +55,11 @@ void init_halftone ()
>-  * Subroutine:	select_halftone
>-  * Purpose:	Respond to halftone selection command
>-  */
>-+
>-+static void new_halftone();
>-+
>- void select_halftone ()
>- {
>--  static void new_halftone();
>- 
>-   switch( control.response[1] ) {
>-   case 0:
>---- editctrl.c.orig	1990-06-03 04:07:48 UTC
>-+++ editctrl.c
>-@@ -61,6 +61,9 @@ extern int  XZ_efn;
>-  * Subroutine:	init_edit_popup
>-  * Purpose:	Get everything ready for running editor sessions
>-  */
>-+
>-+static void init_popwin();
>-+
>- EditStruct *init_edit_popup ( string, max_chars )
>-      char *string;
>-      int max_chars;
>-@@ -69,7 +72,6 @@ EditStruct *init_edit_popup ( string, ma
>-   int len;
>-   EditStruct *get_edit_struct();
>-   void init_edit_struct(), load_edit_struct();
>--  static void init_popwin();
>- 
>-   if( init_window ) {
>-     init_popwin(color.gcset.menu.foreground, color.gcset.menu.background);
>-@@ -91,6 +93,9 @@ EditStruct *init_edit_popup ( string, ma
>-  *		(but expose is fielded and configure is saved for end).
>-  * Returns:	1 if user returns with a response, 0 if user cancels session
>-  */
>-+
>-+static void map_popwin();
>-+
>- int get_edit_input ( edit, one_row, map, unmap, prompt )
>-      EditStruct *edit;
>-      int one_row;	/* i: put-edit-after-prompt-on-same-line */
>-@@ -104,7 +109,6 @@ int get_edit_input ( edit, one_row, map,
>-   int emacs_response();
>-   void draw_new_string(), redraw_edit_string();
>-   void adjust_desktop(), redraw_window(), unmap_popwin();
>--  static void map_popwin();
>- 
>-   map_popwin(edit, one_row, prompt, map);
>-   if( !map ) {
>---- grphbtmp.c.orig	1990-04-20 14:31:04 UTC
>-+++ grphbtmp.c
>-@@ -27,6 +27,9 @@ extern struct colorRec color;
>-  * Subroutine:	make_halftone_panimage
>-  * Purpose:	Make halftone bitmap for pan window (panbox)
>-  */
>-+
>-+static void byte_dither_sample(), byte_diffuse_sample();
>-+
>- void make_halftone_colorbar ( bytedata, bitdata,
>- 			      width, height, bytes_per_line )
>-      unsigned char *bytedata;
>-@@ -34,7 +37,6 @@ void make_halftone_colorbar ( bytedata, 
>-      int width, height;
>-      int bytes_per_line;
>- {
>--  static void byte_dither_sample(), byte_diffuse_sample();
>- 
>-   bzero((char *)bitdata, bytes_per_line * height);
>-   if( color.halftone.mode == BOP_Dither ) {
>---- grphgrab.c.orig	1990-04-20 14:33:27 UTC
>-+++ grphgrab.c
>-@@ -30,10 +30,12 @@ extern struct cgraphRec cgraph;
>-  * Subroutine:	grab_cgraph_vertex
>-  * Purpose:	When a mouse button is pressed, assign a vertex to that button
>-  */
>-+
>-+static void get_color_vertex();
>-+
>- void get_cgraph_vertex ( event )
>-      XEvent *event;
>- {
>--  static void get_color_vertex();
>- 
>-   switch( event->xbutton.button ) {
>-   case Button1:
>-@@ -58,10 +60,12 @@ void get_cgraph_vertex ( event )
>-  *		event
>-  * Returns:	1 if a vertex was dropped, else 0
>-  */
>-+
>-+static int drop_color_vertex();
>-+
>- int drop_cgraph_vertex ( event )
>-      XEvent *event;
>- {
>--  static int drop_color_vertex();
>- 
>-   switch( event->xbutton.button ) {
>-   case Button1:
>-@@ -83,13 +87,15 @@ int drop_cgraph_vertex ( event )
>-  * Purpose:	Handle grab vertex event for single color 
>-  * Method:	Grab old vertex or make new vertex - under mouse pointer
>-  */
>-+
>-+static int grab_old_color_vertex();
>-+static void install_new_color_vertex();
>-+
>- static void get_color_vertex ( x, y, col )
>-      int x, y;
>-      struct colgRec *col;
>- {
>-   void install_draw_queue_end();
>--  static int grab_old_color_vertex();
>--  static void install_new_color_vertex();
>- 
>-   /* clip against limits */
>-   if( x < cgraph.graph.xzero )
>-@@ -151,6 +157,9 @@ static int grab_old_color_vertex ( x, y,
>-  * Subroutine:	install_new_color_vertex
>-  * Purpose:	Given hash position, install a new vertex, and make active
>-  */
>-+
>-+static void add_color_vertex(), add_color_vertex_hash();
>-+
>- static void install_new_color_vertex ( x, y, col )
>-      int x, y;			/* i: position of ULcorner of new hash mark */
>-      struct colgRec *col;	/* i: color info structure for one color */
>-@@ -158,7 +167,6 @@ static void install_new_color_vertex ( x
>-   double intensity, cell_level;
>-   int match;
>-   int select_best_hash_position();
>--  static void add_color_vertex(), add_color_vertex_hash();
>- 
>-   col->active_hash = select_best_hash_position(x, y, col->hash, col->hash_cnt,
>- 					       &match, cgraph.vertical);
>-@@ -251,11 +259,13 @@ static void add_color_vertex_hash ( col,
>-  * Purpose:	Delete a color table vertex if one is under the mouse position
>-  * Returns:	1 if vertex was dropped, else 0
>-  */
>-+
>-+  static int grab_old_color_vertex();
>-+
>- static int drop_color_vertex ( col, x, y )
>-      struct colgRec *col;
>-      int x, y;
>- {
>--  static int grab_old_color_vertex();
>- 
>-   /* hash mark positions are upper left corner of hash box */
>-   x -= HASH_RAY;
>---- grphinit.c.orig	1990-04-20 14:40:44 UTC
>-+++ grphinit.c
>-@@ -46,9 +46,11 @@ extern int  XZ_efn;
>-  * Subroutine:	init_colorbox
>-  * Purpose:	Handle program init-time color bar and graph initialization
>-  */
>-+
>-+static void init_main_colorbar();
>-+
>- void init_colorbox ( )
>- {
>--  static void init_main_colorbar();
>- 
>-   cgraph.ncolors = color.ncolors;
>-   cgraph.red.table = &color.ctable.red;
>-@@ -68,10 +70,12 @@ void init_colorbox ( )
>-  * Purpose:	Initialize color bar and related params
>-  * Xlib calls:	XCreateSimpleWindow(), XMapSubwindows()
>-  */
>-+
>-+static void set_colorbar_image(), set_colorbar_params();
>-+
>- static void init_main_colorbar ( )
>- {
>-   char *calloc_errchk();
>--  static void set_colorbar_image(), set_colorbar_params();
>- 
>-   colorbar.display = colorbox.display;
>-   colorbar.ref_width = colorbox.width;
>-@@ -92,10 +96,12 @@ static void init_main_colorbar ( )
>-  * Subroutine:	adjust_main_colorbar
>-  * Purpose:	Adjust color bar size params and/or color data if needed
>-  */
>-+
>-+static void set_colorbar_image(), set_colorbar_params();
>-+
>- void adjust_main_colorbar ( )
>- {
>-   char *calloc_errchk();
>--  static void set_colorbar_image(), set_colorbar_params();
>- 
>-   if( (colorbox.width != colorbar.ref_width) ||
>-       (colorbox.height != colorbar.ref_height) ) {
>-@@ -113,11 +119,13 @@ void adjust_main_colorbar ( )
>-  * Purpose:	Initialize color bar and related params
>-  * Xlib calls:	XMapSubwindows()
>-  */
>-+
>-+static void set_colorbar_image(), set_colorbar_params();
>-+
>- void init_graph_colorbar ( )
>- {
>-   Window create_cgraph_box();
>-   char *calloc_errchk();
>--  static void set_colorbar_image(), set_colorbar_params();
>- 
>-   cgraph.bar.display = graphbox.display;
>-   cgraph.bar.ref_width = graphbox.width;
>-@@ -149,11 +157,13 @@ void init_graph_colorbar ( )
>-  * Subroutine:	adjust_graph_colorbar
>-  * Purpose:	Adjust color bar size params and/or color data if needed
>-  */
>-+
>-+static void set_colorbar_image(), set_colorbar_params();
>-+
>- void adjust_graph_colorbar ( )
>- {
>-   int resize = 0;
>-   char *calloc_errchk();
>--  static void set_colorbar_image(), set_colorbar_params();
>- 
>-   if( cgraph.vertical ) {
>-     if( graphbox.height != cgraph.bar.ref_height ) {
>---- grphmove.c.orig	1990-04-20 14:37:26 UTC
>-+++ grphmove.c
>-@@ -26,12 +26,14 @@ extern struct cgraphRec cgraph;
>-  * Purpose:	Change values (and position) of designated vertices in
>-  *		response to mouse movement
>-  */
>-+
>-+static void move_color_vertex();
>-+
>- void move_cgraph_vertices ( x, y )
>-      int x, y;
>- {
>-   double cell_level, intensity;
>-   int hash_x, hash_y;
>--  static void move_color_vertex();
>- 
>-   /* clip against limits */
>-   if( x < cgraph.graph.xzero )
>---- grpholap.c.orig	1990-04-20 14:36:00 UTC
>-+++ grpholap.c
>-@@ -28,13 +28,15 @@ extern struct cgraphRec cgraph;
>-  * Subroutine:	mark_colorline_overlap
>-  * Purpose:	Make line representing more than one color black (or white)
>-  */
>-+
>-+static void mark_hashmark_overlap();
>-+
>- void mark_colorline_overlap ( )
>- {
>-   int i, j;
>-   int x, y;
>-   int x1, y1;
>-   XSegment line[256];
>--  static void mark_hashmark_overlap();
>- 
>-   j = 0;
>-   if( cgraph.vertical ) {
>---- grphtext.c.orig	1990-04-20 14:39:37 UTC
>-+++ grphtext.c
>-@@ -33,6 +33,9 @@ extern struct cgraphRec cgraph;
>-  * Purpose:	Set labeling pieces according to the graph window size
>-  * Xlib calls:	XMoveWindow(), XResizeWindow(), XMapWindow()
>-  */
>-+
>-+static void init_colorbar_label();
>-+
>- void init_color_graph_label ( )
>- {
>-   int new = 0;
>-@@ -40,7 +43,6 @@ void init_color_graph_label ( )
>-   int resize = 0;
>-   Window create_cgraph_box();
>-   void init_color_graph_label();
>--  static void init_colorbar_label();
>- 
>-   if( cgraph.graphlabel.active == 0 )
>-     return;
>---- histdist.c.orig	1998-07-28 18:56:45 UTC
>-+++ histdist.c
>-@@ -24,6 +24,9 @@ static char SccsId[] = "%W%  %G%";
>-  * Purpose:	Distribute the levels among histogram sub-groups
>-  * Returns:	number of groups with no assigned color levels
>-  */
>-+
>-+static int excess_zgroup(), excess_nzgroup(), range_zgroup();
>-+
>- int distribute_levels ( linklist, pixel_area, color_levels,
>- 		        pmin, pmax, ncolor )
>-      SubrangeLink *linklist;
>-@@ -39,7 +42,6 @@ int distribute_levels ( linklist, pixel_
>- #ifdef DEBUG
>-   int census = 0;
>- #endif
>--  static int excess_zgroup(), excess_nzgroup(), range_zgroup();
>- 
>-   /* if all one group (no strong peaks), allocation is simple */
>-   if( linklist->next == 0 ) {
>---- histeql.c.orig	1990-04-20 14:59:27 UTC
>-+++ histeql.c
>-@@ -24,6 +24,10 @@ static char SccsId[] = "%W%  %G%";
>-  *		output level optimization accounts for large cell counts
>-  *		for single levels (e.g. half of all pixels with value 0)
>-  */
>-+
>-+static int count_nonzero_histogram_entries(), rescan_histogram();
>-+static void unmark_peak_links();
>-+
>- void histogram_equalize ( scalemap, histogram, area, pmin, pmax,
>- 			  color_levels, pixels )
>-      unsigned char *scalemap;	/* i/o: scalemap (for signed indexing) */
>-@@ -42,8 +46,6 @@ void histogram_equalize ( scalemap, hist
>-   char *calloc_errchk();
>-   int distribute_levels();
>-   void generate_scalemap(), scan_histogram_for_peaks(), resolve_zeroes();
>--  static int count_nonzero_histogram_entries(), rescan_histogram();
>--  static void unmark_peak_links();
>- 
>-   /* initialize link list */
>-   linklist = (SubrangeLink *)calloc_errchk(10, sizeof(int), "HElink");
>---- histlist.c.orig	1991-06-21 22:58:44 UTC
>-+++ histlist.c
>-@@ -29,6 +29,12 @@ static char SccsId[] = "%W%  %G%";
>-  * Subroutine:	make_equalized_list
>-  * Purpose:	Distributing levels for a subrange section of the histogram
>-  */
>-+
>-+static int equalize_simply();
>-+#ifdef JIGGLE
>-+static void adjust_list();
>-+#endif
>-+
>- void make_equalized_list ( histogram, list, low_entry, high_entry,
>- 			   pixel_area, color_levels )
>-      int *histogram;
>-@@ -47,10 +53,6 @@ void make_equalized_list ( histogram, li
>-   int best_levels_under;
>-   int best_average_over = 0;	/* average_area used to get best_levels */
>-   int best_average_under = 0;
>--  static int equalize_simply();
>--#ifdef JIGGLE
>--  static void adjust_list();
>--#endif
>- 
>-   /* else allocation distribution must first be determined */
>-   /* run through histgram section making basic allocation and taking notes */
>---- histmap.c.orig	1990-04-20 15:00:13 UTC
>-+++ histmap.c
>-@@ -28,6 +28,9 @@ static char SccsId[] = "%W%  %G%";
>-  *		safely be applied.
>-  * Note:	The original link-list of groups is freed.
>-  */
>-+
>-+static void make_subrange_scalemap();
>-+
>- void generate_scalemap ( hist, subrange, scalemap, pixels )
>-      int *hist;				/* i: histogram (for signed offsets) */
>-      SubrangeLink *subrange;	/* i: linklist of subranges */
>-@@ -36,7 +39,6 @@ void generate_scalemap ( hist, subrange,
>- {
>-   int baselevel;
>-   SubrangeLink *trash;
>--  static void make_subrange_scalemap();
>- 
>-   baselevel = 0;
>-   while( subrange != 0 ) {
>-@@ -54,6 +56,9 @@ void generate_scalemap ( hist, subrange,
>-  * Purpose:	Make a section of scale map using histgroup link as guide 
>-  * Called by:	make_HE_scalemap() in HistEqual.c
>-  */
>-+
>-+static void make_gapped_list(), list_to_map();
>-+
>- static void
>-   make_subrange_scalemap ( histogram, subrange, scalemap, baselevel, pixels )
>-      int *histogram;
>-@@ -67,7 +72,6 @@ static void
>-   unsigned char dispval;
>-   char *calloc_errchk();
>-   void make_equalized_list();
>--  static void make_gapped_list(), list_to_map();
>- 
>-   /* if only one level, make map section */
>-   if( subrange->color_levels <= 1 ) {
>-@@ -135,6 +139,10 @@ static void list_to_map ( scalemap, hist
>-  * Purpose:	Allocate levels for a histogram subrange.  Special process
>-  * 		for situation when more levels than actually used values.
>-  */
>-+
>-+static int first_shortlist_pass();
>-+static void add_level_to_short_list();
>-+
>- static void make_gapped_list ( histogram, list, low, high, levels )
>-      int *histogram;
>-      SubrangeList *list;
>-@@ -142,8 +150,6 @@ static void make_gapped_list ( histogram
>- {
>-   int range_j, max_range;
>-   int levels_used;
>--  static int first_shortlist_pass();
>--  static void add_level_to_short_list();
>- 
>-   levels_used =
>-     first_shortlist_pass(histogram, list, low, high, levels,
>---- histscan.c.orig	1990-04-20 15:00:36 UTC
>-+++ histscan.c
>-@@ -21,6 +21,10 @@ static char SccsId[] = "%W%  %G%";
>-  * Purpose:	Scan the image histogram picking out large cell count values
>-  *		make sub-groups of the histogram between the large count levels
>-  */
>-+
>-+static SubrangeLink *get_new_subrange_record();
>-+static void fill_subrange_record();
>-+
>- void scan_histogram_for_peaks ( subrange, histogram,
>- 			        pixel_area, map_levels, average )
>-      SubrangeLink *subrange;	/* i/o: link (initially covers range) */
>-@@ -36,8 +40,6 @@ void scan_histogram_for_peaks ( subrange
>-   int sr_nzentries;		/* l: number of non-zero entries in subrange */
>-   int sr_pixel_area;		/* l: number of pixels in current subrange */
>-   int sr_max_peak;		/* l: highest peak within current  subrange */
>--  static SubrangeLink *get_new_subrange_record();
>--  static void fill_subrange_record();
>- 
>-   /* set initial pixel_count values */
>-   sr_pixel_area = 0;
>---- histzero.c.orig	1990-04-20 15:01:03 UTC
>-+++ histzero.c
>-@@ -23,13 +23,15 @@ static char SccsId[] = "%W%  %G%";
>-  * Note:	Adjoining groups are large count single level groups
>-  * Called by:	histrogram_equalize() above
>-  */
>-+
>-+static void merge_links();
>-+
>- void resolve_zeroes ( PriorLink, zeroes )
>-      SubrangeLink *PriorLink;
>-      int zeroes;
>- {
>-   SubrangeLink *ThisLink, *NextLink;
>-   int a_count, b_count, z1count, z2count;
>--  static void merge_links();
>- 
>-   /* if very first entry is a zero allocated link */
>-   if( PriorLink->color_levels == 0 ) {
>---- imgcheck.c.orig	2001-03-12 21:31:30 UTC
>-+++ imgcheck.c
>-@@ -46,13 +46,15 @@ static char SccsId[] = "%W%  %G%";
>-  * Purpose:	Do some consistency checks on image type and size
>-  * Returns:	0 if no errors found, else -1
>-  */
>-+
>-+static int check_array();
>-+
>- int check_image ( img, got_status )
>-      struct imageRec *img;
>-      int got_status;
>- {
>-   int len;
>-   char *ext, *mwcs, cext;
>--  static int check_array();
>-   extern int isfits();
>- 
>-   ext = NULL;
>-@@ -148,6 +150,9 @@ int check_image ( img, got_status )
>-  * Purpose:	Check array size vs file size etc
>-  * Returns:	0 if size determined and/or OK, else -1
>-  */
>-+
>-+static long size_imagefile();
>-+
>- static int check_array ( img )
>-      struct imageRec *img;
>- {
>-@@ -156,7 +161,6 @@ static int check_array ( img )
>-   float posdim;		/* possible dimension */
>-   int headersize;	/* size in bytes of header */
>-   int rawsize;
>--  static long size_imagefile();
>- 
>-   /* get header size */
>-   headersize = img->headersize;
>---- imglogo.c.orig	1990-04-26 16:31:48 UTC
>-+++ imglogo.c
>-@@ -372,13 +372,15 @@ static unsigned char logo[LOGO_SZ] = {
>-  * Subroutine:	load_logo
>-  * Purpose:	place logo image in image buffer
>-  */
>-+
>-+static void make_logo();
>-+
>- void load_logo ( shortbuf, bufwd, bufht )
>-      short *shortbuf;
>-      int bufwd, bufht;
>- {
>-   register short *bufpt, *bufend;
>-   register short bkgd;
>--  static void make_logo();
>- 
>-   /* fill buffer with background color */
>-   bufpt = shortbuf;
>---- imgnew.c.orig	1998-10-14 23:01:58 UTC
>-+++ imgnew.c
>-@@ -52,6 +52,9 @@ extern struct windowRec desktop;
>-  *  Purpose:	Create all image coordinate parameters from the beginning
>-  * 		and take care of all that might be affected
>-  */
>-+
>-+static void  load_mainbuf();
>-+
>- void new_display ( dispnow, clear, load, scale )
>-      int dispnow;	/* i: put-display-in-window-now flag */
>-      int clear;		/* i: clear img buf before reading flag */
>-@@ -61,7 +64,6 @@ void new_display ( dispnow, clear, load,
>-   void set_disptran(), new_pancursor(), new_scalemap();
>-   void combine_transform(), set_edges(), set_dispoff(), set_magnifier();
>-   void adjust_cursor_coords(), map_dispbox(), disp_dispbox();
>--  static void  load_mainbuf();
>- 
>-   /*  Set disp to img and disp to file transforms  */
>-   set_disptran(&coord);
>---- imgtrans.c.orig	1990-04-20 15:13:46 UTC
>-+++ imgtrans.c
>-@@ -26,6 +26,9 @@ static char SccsId[] = "%W%  %G%";
>-  * 	4-7 = flip y axis then rotate clockwise by (code - 4) * 90 degrees
>-  * Called by:	load_image() in ImageRead.c
>-  */
>-+
>-+static void square_buf(), unsquare_buf();
>-+
>- void rotate_buf ( buf, flip, rotcode, width, height, buf_squared, buf_doubled )
>-      short *buf;
>-      int flip;
>-@@ -36,7 +39,6 @@ void rotate_buf ( buf, flip, rotcode, wi
>-   int maxdim;
>-   void xflip_buf(), yflip_buf(), zflip_buf(), cwturn_buf(), ccwturn_buf();
>-   void transfer_buf();
>--  static void square_buf(), unsquare_buf();
>- 
>-   if( flip )
>-     rotcode += 4;
>---- irafcrd.c.orig	1990-04-20 15:16:02 UTC
>-+++ irafcrd.c
>-@@ -45,13 +45,15 @@ static char SccsId[] = "%W%  %G%";
>-  *		If found and parsed, compute new transform for file coord.
>-  * Returns:	1 if subsection found and parsed successfully, else 0
>-  */
>-+
>-+static int parse_iraf_subsection();
>-+
>- int guess_true_file_coords ( title )
>-      char *title;
>- {
>-   int xoff, yoff, block;
>-   float fblock;
>-   Transform imgtoaux;
>--  static int parse_iraf_subsection();
>-   void set_trans_speed(), combine_transform(), clear_coord_area();
>- 
>-   if( parse_iraf_subsection(title, &xoff, &yoff, &block) == 0 ) {
>-@@ -92,6 +94,10 @@ int guess_true_file_coords ( title )
>-  * Purpose:	Parse for subsection and blocking from the image name
>-  * Returns:	1 if subsection or blocking was used, else 0
>-  */
>-+
>-+static char *fn_substr();	/* look for a substr */
>-+static void get_subsection_offsets();
>-+
>- static int parse_iraf_subsection ( s, xoff, yoff, block )
>-      char *s;			/* i: file name */
>-      int *xoff;			/* o: x offset */
>-@@ -99,8 +105,6 @@ static int parse_iraf_subsection ( s, xo
>-      int *block;		/* o: block */
>- {
>-   char *t, *u;			/* temp char pointers */
>--  static char *fn_substr();	/* look for a substr */
>--  static void get_subsection_offsets();
>- 
>-   /* seed the default values */
>-   *xoff = 1;
>-@@ -139,6 +143,9 @@ static int parse_iraf_subsection ( s, xo
>-  * Subroutine:	get_subsection_offsets
>-  * Purpose:	parse subsection syntax for x and y offsets of subsection
>-  */
>-+
>-+static char *fn_substr();
>-+
>- static void get_subsection_offsets ( s, xoff, yoff, is_qp )
>-      char *s;
>-      int *xoff, *yoff;
>-@@ -147,7 +154,6 @@ static void get_subsection_offsets ( s, 
>-   int x1, x2;
>-   int y1, y2;
>-   char *sy, *s2, *st;
>--  static char *fn_substr();
>- 
>-   /* if not qp, grab the initial x offset right after the '[' */
>-   sy = fn_substr(s, ",");
>---- irafimtl.c.orig	1998-02-25 19:52:37 UTC
>-+++ irafimtl.c
>-@@ -46,6 +46,9 @@ static char wcsbuf[SZ_WCSBUF];
>-  * Subroutine:	imtool_response
>-  * Purpose:	Read imtool messages from iraf (return 1 if pipe trouble)
>-  */
>-+
>-+static int get_frame_no();
>-+
>- void imtool_response ( port, imhead, ndatabytes )
>-      struct connectRec *port;	/* i: struct of port for IRAF input */
>-      struct imtoolRec *imhead;	/* i: packet header, already read in */
>-@@ -60,7 +63,6 @@ void imtool_response ( port, imhead, nda
>-   void set_curpos_to_iraf_trigger(), set_cursor_from_iraf(), imtool_output();
>-   void set_imtool_scale(), set_cursor_to_iraf(), disp_subpiece();
>-   void map_panbox(), disp_panbox(), send_curpos_to_iraf(), flush_connection();
>--  static int get_frame_no();
>- 
>-   switch( imhead->subunit & 077 ) {
>-   case FEEDBACK:
>-@@ -189,6 +191,9 @@ void imtool_response ( port, imhead, nda
>-  * Purpose:	Reset buffer sizes, coordinate systems and parameters as
>-  *		needed.
>-  */
>-+
>-+static int get_frame_no();
>-+
>- void imtool_newimage ( is_wcs, imhead )
>-      int is_wcs;
>-      struct imtoolRec *imhead;
>-@@ -199,7 +204,6 @@ void imtool_newimage ( is_wcs, imhead )
>-   void set_disptran(), combine_transform(), set_edges(), set_dispoff();
>-   void adjust_cursor_coords(), set_magnifier(), disp_subpiece(), set_tdisp();
>-   void set_imtool_scale(), imtool_reinit(), new_pancursor();
>--  static int get_frame_no();
>- 
>-   /* set size and frame */
>-   if( is_wcs )
>---- irafio.c.orig	1992-10-12 17:17:50 UTC
>-+++ irafio.c
>-@@ -102,6 +102,9 @@ void rename_imtool_connection ( name, in
>-  * Subroutine:	imtool_output
>-  * Purpose:	Write image data back to iraf device channel
>-  */
>-+
>-+static int compact_short_to_byte();
>-+
>- void imtool_output ( imhead, odev, imagebuf, width, height )
>-      struct imtoolRec *imhead;
>-      struct connectRec *odev;
>-@@ -116,7 +119,6 @@ void imtool_output ( imhead, odev, image
>-   int buferr = 0;
>-   char fifobuf[SZ_FIFOBUF + 4];
>-   int write_connection();
>--  static int compact_short_to_byte();
>- 
>-   ndatabytes = -(int)imhead->thingct;
>-   x = imhead->x & 077777;
>-@@ -153,6 +155,9 @@ void imtool_output ( imhead, odev, image
>-  * Called by:	imtool_response() in RemoteImtool.c
>-  * Returns:	-1 if read no bytes, 1 if trouble, else 0
>-  */
>-+
>-+static void expand_byte_to_short();
>-+
>- int imtool_input ( imhead, idev, readbuf, iwdth, owdth, y1, y2,
>- 		   imagebuf, imbufsz )
>-      struct imtoolRec *imhead;
>-@@ -171,7 +176,6 @@ int imtool_input ( imhead, idev, readbuf
>-   int got, try, gotten;
>-   short *obuf;
>-   int read_connection();
>--  static void expand_byte_to_short();
>- 
>-   /* get data count and packing type */
>-   ndatavals = -(int)imhead->thingct;
>---- irafpipe.c.orig	1998-02-25 19:52:26 UTC
>-+++ irafpipe.c
>-@@ -33,6 +33,9 @@ static char SccsId[] = "%W%  %G%";
>-  * Subroutine:	read_imtool_packet()
>-  * Purpose:	event handler for packet input from iraf
>-  */
>-+
>-+static int check_packet_sum();
>-+
>- void read_imtool_packet( port )
>-      struct connectRec *port;
>- {
>-@@ -48,7 +51,6 @@ void read_imtool_packet( port )
>- #endif
>-   int read_connection();
>-   void imtool_response(), swap_bytes();
>--  static int check_packet_sum();
>- 
>-   /* read the header */
>-   bytes = read_connection(port, (char *)&imhead, sizeof(struct imtoolRec));
>---- maininit.c.orig	2003-12-01 23:21:35 UTC
>-+++ maininit.c
>-@@ -76,11 +76,13 @@ Display *display;		/* display connection
>-  * Xlib calls:	XSetErrorHandler()
>-  * UNIX calls:	setrlimit()
>-  */
>-+
>-+static void init_params(), init_packages();
>-+
>- main(argc, argv)
>-   int argc;
>-   char **argv;
>- {
>--  static void init_params(), init_packages();
>-   void crash_on_error(), control_event_loop();
>-   void say_goodbye();
>-   
>-@@ -141,13 +143,15 @@ void say_goodbye ( code )
>-  * Purpose:	Initialize parameters in the records
>-  * Note:	Resource or default file not yet used
>-  */
>-+
>-+static void init_server();
>-+
>- static void init_params ( argc, argv )
>-      int argc;
>-      char **argv;
>- {
>-   char *name;		/* l: both flag for init and return display name */
>-   int parse_stat;
>--  static void init_server();
>-   int parse_cmdline(), check_image();
>-   void say_goodbye(), init_connections();
>- 
>---- mainkey.c.orig	2003-09-24 22:38:25 UTC
>-+++ mainkey.c
>-@@ -87,6 +87,9 @@ static double oldypix = 0.0;
>- 
>- static double oldxpos, oldypos;
>- 
>-+static void PrintFITSHead();
>-+static int new_image();
>-+
>- void
>- key_response()
>- {
>-@@ -110,7 +113,6 @@ key_response()
>-   void print_center(), print_cursor();
>-   void move_pointer();
>-   void get_cursor_pos();
>--  static void PrintFITSHead();
>-   void toggle_region_visibility(), toggle_region_labeling();
>-   double xbuf, ybuf, xfile, yfile;
>-   double newxpos, newypos, distance;
>---- mgfyctrl.c.orig	1999-05-06 19:47:12 UTC
>-+++ mgfyctrl.c
>-@@ -45,12 +45,14 @@ extern struct magRec magset;
>-  * Purpose:	Magnify location of a dispbox event
>-  * Xlib calls:	XCheckWindowEvent(), XSync()
>-  */
>-+
>-+static void label_file_coords(), label_file_coords_proportional();
>-+
>- void magnify_disp ( event, view, text )
>-      XEvent *event;		/* i: XEvent for location of mouse */
>-      int view, text;
>- {
>-   void draw_magnifier();
>--  static void label_file_coords(), label_file_coords_proportional();
>- 
>-   /* get only the most recent mouse moved event */
>-   XSync(dispbox.display, 0);
>-@@ -132,6 +134,9 @@ void redraw_magnifier ( )
>-  * Purpose:	Show pointer coordinates and image value in display window
>-  * Xlib calls:	XDrawImageString()
>-  */
>-+
>-+static void draw_proportional_coord();
>-+
>- static void label_file_coords ( bufX, bufY )
>-      double bufX, bufY;
>- {
>-@@ -142,7 +147,6 @@ static void label_file_coords ( bufX, bu
>-   float fileX, fileY;
>-   GC gc, set_edit_gc();
>-   void d_transform();
>--  static void draw_proportional_coord();
>-   static int lwcs0 = 0;
>-   static int lpix0 = 0;
>-   int i;
>-@@ -289,6 +293,9 @@ void clear_coord_area ()
>-  *		but has not been refined for the val section.
>-  * Xlib call:	XDrawImageString()
>-  */
>-+
>-+static void draw_proportional_number();
>-+
>- static void label_file_coords_proportional ( bufX, bufY )
>-      double bufX, bufY;
>- {
>-@@ -297,7 +304,6 @@ static void label_file_coords_proportion
>-   float fileX, fileY;
>-   GC gc, set_edit_gc();
>-   void d_transform();
>--  static void draw_proportional_number();
>- 
>-   gc = set_edit_gc(magset.text.font,
>- 		   magset.text.foreground, magset.text.background);
>---- mgfytabl.c.orig	1998-07-09 16:28:28 UTC
>-+++ mgfytabl.c
>-@@ -30,6 +30,10 @@ static char SccsId[] = "%W%  %G%";
>-  *		coordinates
>-  * Note:	Uses event coords in control struct (control.event.xkey)
>-  */
>-+
>-+static int get_key_buf_coords(), set_table_params();
>-+static void output_column_labels(), output_pixval_table();
>-+
>- void print_table ()
>- {
>-   int bufx, bufy;
>-@@ -39,8 +43,6 @@ void print_table ()
>-   int table_size;
>-   int col_width;
>-   int rot;
>--  static int get_key_buf_coords(), set_table_params();
>--  static void output_column_labels(), output_pixval_table();
>- 
>-   /* determine the buffer coordinates of the event */
>-   if( get_key_buf_coords(&control.event.xkey, &bufx, &bufy) == 0 ) {
>---- pancrsr.c.orig	1990-05-02 06:49:17 UTC
>-+++ pancrsr.c
>-@@ -45,13 +45,15 @@ void draw_pancursor ( )
>-  * Subroutine:	new_pancursor
>-  * Purpose:	Create and draw panbox cursor given image coordinates
>-  */
>-+
>-+static void set_pancursor();
>-+
>- void new_pancursor ( track )
>-      int track;
>- {
>-   float panX1, panX2, panY1, panY2;
>-   GC gc, set_gc();
>-   void disp_window(), i_transform();
>--  static void set_pancursor();
>- 
>-   if( pancur_present ) {
>-     /* erase the old box if it was visible */
>---- panimage.c.orig	1990-04-20 16:17:38 UTC
>-+++ panimage.c
>-@@ -45,12 +45,14 @@ void disp_panbox ( )
>-  * Subroutine:	map_panbox
>-  * Purpose:	Fill the panbox display buffer, mapping from its short buffer
>-  */
>--void map_panbox ( )
>--{
>--  static void map_panbuf();
>-+
>-+static void map_panbuf();
>- #ifdef SUMBLOCK
>--  static void map_adj_panbuf();
>-+static void map_adj_panbuf();
>- #endif
>-+
>-+void map_panbox ( )
>-+{
>-   void panimage_halftone();
>- 
>-   if( color.ncolors <= 1 ) {
>---- prntcent.c.orig	1999-08-20 22:18:40 UTC
>-+++ prntcent.c
>-@@ -36,6 +36,11 @@ static char SccsId[] = "%W%  %G%";
>-  *		Returns 1 if successful, else 0
>-  * Note:	Uses event coords in control struct (control.event.xkey)
>-  */
>-+
>-+static int set_center_param();
>-+static int get_key_buf_coord();
>-+static void comp_center ();
>-+
>- void
>- print_center ( xc, yc )
>- 
>-@@ -59,9 +64,6 @@ double *xc, *yc;		/* Returned centroided
>-   int xfile, yfile;
>-   char string[64];
>-   int lstr = 48;
>--  static int set_center_param();
>--  static int get_key_buf_coord();
>--  static void comp_center ();
>-   void d_trans();
>-   int iswcs();
>- 
>---- prntcurs.c.orig	2002-01-16 22:54:18 UTC
>-+++ prntcurs.c
>-@@ -31,12 +31,14 @@ static char SccsId[] = "%W%  %G%";
>-  * Subroutine:	print_cursor
>-  * Purpose:	print location of a dispbox event
>-  */
>-+
>-+static void print_file_value();
>-+
>- void print_cursor ( event )
>-   XEvent *event;		/* XEvent for location of mouse */
>- {
>-   double bufx, bufy, filex, filey;
>-   void get_cursor_pos();
>--  static void print_file_value();
>- 
>-   (void)get_cursor_pos (event, &bufx, &bufy, &filex, &filey );
>-   (void)print_file_value ( bufx, bufy, filex, filey );
>---- readarr.c.orig	1999-02-23 14:05:41 UTC
>-+++ readarr.c
>-@@ -28,6 +28,9 @@ static char SccsId[] = "%W%  %G%";
>-  * Purpose:	Read array data from a file
>-  * Note:	Assumes file was tested benignly, exits here if trouble
>-  */
>-+
>-+static int read_data();
>-+
>- void read_array ( fd, img, imgbuf, filebuf, width, height, X, Y, block,
>- 		  verbose )
>-      int fd;			/* if >=0 handle to open & ready image file */
>-@@ -40,7 +43,6 @@ void read_array ( fd, img, imgbuf, fileb
>-      int verbose;		/* whether to print explanatory messages */
>- {
>-   int vals;
>--  static int read_data();
>-   int image_start;
>-   int open_disk(), lseek_disk();
>-   void close_disk();
>---- readfith.c.orig	1998-09-29 15:40:06 UTC
>-+++ readfith.c
>-@@ -46,6 +46,9 @@ static char SccsId[] = "%W%  %G%";
>-  * Purpose:	Find important FITS parameters in FITS header
>-  * Returns:	1 if success, else 0
>-  */
>-+
>-+static int get_keyint(), get_keyfloat();
>-+
>- int read_fitsheader ( header, length, bitpix, naxis, naxes, scale, bias )
>-      char *header;
>-      int length;
>-@@ -55,7 +58,6 @@ int read_fitsheader ( header, length, bi
>-      float *scale;
>-      float *bias;
>- {
>--  static int get_keyint(), get_keyfloat();
>-   struct WorldCoor *wcsinit();
>-   char *header0;
>-   header0 = header;
>-@@ -144,6 +146,9 @@ static int get_keyint ( header, keyword,
>-  * Purpose:	Return the float value in the data field for a given FITS
>-  *		header keyword.  If key not found, return 0.
>-  */
>-+
>-+static void fix_exponent();
>-+
>- static int get_keyfloat ( header, keyword, length, val, report_error)
>-      char *header;	/* buffer start */
>-      char *keyword;	/* keyword to match */
>-@@ -153,7 +158,6 @@ static int get_keyfloat ( header, keywor
>- {
>-   int key_not_end;
>-   int i;
>--  static void fix_exponent();
>-   void no_fitscomment();
>- 
>-   key_not_end = (strncmp(keyword, "END     ", 8) != 0);
>---- rgnanli.c.orig	1990-04-20 16:25:03 UTC
>-+++ rgnanli.c
>-@@ -89,14 +89,16 @@ void new_annulus_edge ( cursor )
>-  * Note:	"vala valb valc ..." and "val1 val2 n=int" are both
>-  *		permitted syntax forms
>-  */
>-+
>-+static int expand_radii();
>-+static char *got_nequal();
>-+
>- int parse_radii ( line, radius, maxcnt )
>-      char *line;	/* i: string with first radius as next token */
>-      float *radius;	/* o: buffer for float radius vals */
>-      int maxcnt;	/* i: size of radius buffer */
>- {
>-   int i, cnt;
>--  static int expand_radii();
>--  static char *got_nequal();
>-   char *next_token();
>- 
>-   i = 0;
>---- rgndraw.c.orig	1998-11-30 21:46:40 UTC
>-+++ rgndraw.c
>-@@ -115,12 +115,14 @@ void disp_regions ( cursor )
>-  * Subroutine:	disp_region
>-  * Purpose:	Draw one saved cursor region and its labels
>-  */
>-+
>-+static GC set_region_gc();
>-+static void label_annuli(), label_region(), draw_region();
>-+
>- void disp_region ( region )
>-      struct cursorRec *region;
>- {
>-   GC gc;
>--  static GC set_region_gc();
>--  static void label_annuli(), label_region(), draw_region();
>- 
>-   if( rgdraw.visible && (region != NULL) ) {
>-     gc = set_region_gc(region);
>-@@ -215,11 +217,13 @@ static void draw_region_label ( string, 
>-  * Purpose:	Draw one saved cursor region outline or point index
>-  * Note:	gc is already set, hence NULL GCspec in draw calls
>-  */
>-+
>-+static void draw_region_label();
>-+
>- static void draw_region ( region, gc )
>-      struct cursorRec *region;
>-      GC gc;
>- {
>--  static void draw_region_label();
>-   void draw_annuli(), draw_cursor();
>- 
>-   if( region->type != COP_Point ) {
>-@@ -246,12 +250,14 @@ static void draw_region ( region, gc )
>- /*
>-  * Subroutine:	label_annuli
>-  */
>-+
>-+static void label_region();
>-+
>- static void label_annuli ( region, gc )
>-      struct cursorRec *region;
>-      GC gc;
>- {
>-   struct cursorRec *annulus;
>--  static void label_region();
>- 
>-   /* apply label to outer annulus */
>-   annulus = region;
>-@@ -268,6 +274,10 @@ static void label_annuli ( region, gc )
>-  * Purpose:	Draw one region's label line and text for center and edge
>-  * Xlib calls:	XDrawLine()
>-  */
>-+
>-+static int mark_include();
>-+static void draw_region_label();
>-+
>- static void label_region ( region, gc )
>-      struct cursorRec *region;
>-      GC gc;
>-@@ -277,8 +287,6 @@ static void label_region ( region, gc )
>-   char edge_string[132];
>-   int len;
>-   int exclude;
>--  static int mark_include();
>--  static void draw_region_label();
>- 
>-   /* if label not requested or don't know how to label or will another part */
>-   if( (!rgdraw.label) || (region->type == COP_Polygon) )
>---- rgndrop.c.orig	1990-04-20 16:31:38 UTC
>-+++ rgndrop.c
>-@@ -64,14 +64,16 @@ void unsave_region ( cursor, dead_meat )
>-  *		cursors enclose one or two digit label but have 0 area).
>-  *		In case of equal areas (i.e. points), closer center is used.
>-  */
>-+
>-+static int pointer_is_inside_region();
>-+static int closer_to_center();
>-+
>- struct cursorRec *region_indicated_by_pointer ( cursor, x, y, point_only )
>-      struct cursorRec *cursor;
>-      int x, y;
>-      int point_only;
>- {
>-   struct cursorRec *region, *chosen;
>--  static int pointer_is_inside_region();
>--  static int closer_to_center();
>- 
>-   chosen = NULL;
>-   region = cursor->next_region;
>-@@ -115,13 +117,15 @@ static int closer_to_center ( challenger
>-  * Subroutine:	is_inside_region
>-  * Purpose:	Determine if mouse is within a region
>-  */
>-+
>-+static int pointer_is_inside_polygon();
>-+
>- static int pointer_is_inside_region ( x, y, region )
>-      int x, y;
>-      struct cursorRec *region;
>- {
>-   double rayX, rayY, ray;
>-   int inside;
>--  static int pointer_is_inside_polygon();
>- 
>-   if( region->type == COP_Polygon )
>-     return( pointer_is_inside_polygon((double)x, (double)y,
>---- rgnwpros.c.orig	1991-01-09 03:57:30 UTC
>-+++ rgnwpros.c
>-@@ -45,11 +45,13 @@ static char SccsId[] = "%W%  %G%";
>-  * Purpose:	Write ROSAT PROS style region description to file
>-  * Method:	Recurse first to start writing from end of link list
>-  */
>-+
>-+static void cat_annulus(), write_annuli(), cat_shape();
>-+
>- void write_region_pros ( fd, region )
>-      FILE *fd;
>-      struct cursorRec *region;
>- {
>--  static void cat_annulus(), write_annuli(), cat_shape();
>- 
>-   /*  Check for pointer before doing anything  */
>-   if( region == NULL )
>-@@ -84,13 +86,15 @@ void write_region_pros ( fd, region )
>- /*  Subroutine:	cat_shape
>-  *  Purpose:	Put simple PROS description of given cursor in line buffer
>-  */     
>-+
>-+static void cat_polypts(), cat_cen(), cat_params();
>-+
>- static void cat_shape ( region, line )
>-      struct cursorRec *region;
>-      char *line;
>- {
>-   int params;
>-   void write_text_region();
>--  static void cat_polypts(), cat_cen(), cat_params();
>- 
>-   switch( region->type ) {
>-   case COP_Box:
>-@@ -205,12 +209,14 @@ static void cat_cen ( region, line )
>-  * Subroutine:	cat_polypts
>-  * Purpose:	Add list of point coordinates to line buffer (for polygon)
>-  */
>-+
>-+static void cat_pt();
>-+
>- static void cat_polypts ( region, line )
>-      struct cursorRec *region;
>-      char *line;
>- {
>-   int i;
>--  static void cat_pt();
>- 
>-   cat_pt((double)region->poly[0].fileX, (double)region->poly[0].fileY,
>- 	 line, 0);
>-@@ -254,12 +260,14 @@ static void cat_pt ( x, y, line, comma )
>-  * Purpose:	Put a PROS style description of circular annuli on the
>-  *		line buffer
>-  */
>-+
>-+static void cat_cen();
>-+
>- static void cat_annulus ( region, line )
>-      struct cursorRec *region;
>-      char *line;
>- {
>-   char radius[16];
>--  static void cat_cen();
>- 
>-   (void)strcat(line, "ANNULUS(");
>-   cat_cen(region, line);
>-@@ -275,14 +283,16 @@ static void cat_annulus ( region, line )
>-  * Subroutine:	write_annuli
>-  * Purpose:	Write PROS type description to produce annuli of given shapes
>-  */
>-+
>-+static struct cursorRec *cat_annular();
>-+static void cat_shape();
>-+
>- static void write_annuli ( region, line, fd )
>-      struct cursorRec *region;
>-      char *line;
>-      FILE *fd;
>- {
>-   struct cursorRec *annulus;
>--  static struct cursorRec *cat_annular();
>--  static void cat_shape();
>- 
>-   /* annuli start with next_annulus (base region is not one of them) */ 
>-   if( (annulus = region->next_annulus) != NULL ) {
>-@@ -309,11 +319,13 @@ static void write_annuli ( region, line,
>-  * Purpose:	Add outer shape anded with not of inner shape to make
>-  *		an annular ring
>-  */
>-+
>-+static void cat_shape();
>-+
>- static struct cursorRec *cat_annular ( region, line )
>-      struct cursorRec *region;
>-      char *line;
>- {
>--  static void cat_shape();
>- 
>-   if( region->next_annulus != NULL ) {
>-     if( region->exclude_region )
>---- rgnwrite.c.orig	1995-09-08 22:29:19 UTC
>-+++ rgnwrite.c
>-@@ -58,6 +58,9 @@ EditStruct *region_edit;
>-  * Subroutine:	write_regions
>-  * Purpose:	Write region info to a file
>-  */
>-+
>-+static void write_region_imtool();
>-+
>- void write_regions ( cursor, image, output_type )
>-      struct cursorRec *cursor;
>-      struct imageRec *image;
>-@@ -66,7 +69,6 @@ void write_regions ( cursor, image, outp
>-   FILE *fd;
>-   static int last_output_type = 0;
>-   char fname[SZ_FNAME];
>--  static void write_region_imtool();
>-   int open_output_file();
>-   EditStruct *init_edit_popup();
>-   void set_path_iraf(), write_region_pros(), load_edit_struct(), timestamp();
>-@@ -146,13 +148,15 @@ static void write_region_imtool ( fd, re
>-  * Subroutine:	timestamp
>-  * Purpose:	Write date and filename (if known) to region file
>-  */
>-+
>-+static void set_time_string();
>-+
>- void timestamp ( fd, imagename )
>-      FILE *fd;
>-      char *imagename;
>- {
>-   char  line[SZ_LINE];
>-   int len;
>--  static void set_time_string();
>- 
>-   /* timestamp the first entry in the output file. */
>-   set_time_string (line);
>---- sclctrl.c.orig	1996-10-10 15:55:57 UTC
>-+++ sclctrl.c
>-@@ -70,6 +70,9 @@ void select_scalemap ()
>-  * Subroutine:	new_scalemap
>-  * Purpose:	Scalemap calculation for a new image
>-  */
>-+
>-+static void new_histogram();
>-+
>- void new_scalemap ( )
>- {
>-   static double cmdMin = 0.0;
>-@@ -78,7 +81,6 @@ void new_scalemap ( )
>-   static int max_given = 0;
>-   static int imtool_200 = 0;
>-   static int init = 1;		/* identify first time called */
>--  static void new_histogram();
>-   void make_scalemap(), color_logo();
>- #ifdef IMTOOL
>-   void set_imtool_colors();
>---- sclmap.c.orig	1994-10-25 15:25:02 UTC
>-+++ sclmap.c
>-@@ -36,11 +36,13 @@ static char SccsId[] = "%W%  %G%";
>-  * Note:	Map goes from image value to hardware value (through ideal
>-  *		map value using pixels array from XAllocColors)
>-  */
>-+
>-+static void linear_scale(), wrap_scale(), sqrt_scale(), log_scale();
>-+
>- void make_scalemap ( image_min, image_max )
>-      int image_min, image_max;	/* i: range of mapping for image data input */
>- {
>-   void histogram_equalize();
>--  static void linear_scale(), wrap_scale(), sqrt_scale(), log_scale();
>- 
>-   /* note the range of data for which mapping is to be calculated */
>-   if( image_max == image_min )
>-@@ -105,6 +107,9 @@ void make_scalemap ( image_min, image_ma
>-  * Subroutine:	linear_scale
>-  * Purpose:	Distribute color levels in the map evenly
>-  */
>-+
>-+static void get_histogram_range();
>-+
>- static void linear_scale ( image_min, image_max )
>-   int image_min, image_max;		/* i: limits of values in display */
>- {
>-@@ -118,7 +123,6 @@ static void linear_scale ( image_min, im
>-   register int imageval;
>-   register int pixval;
>-   register int imagelim;
>--  static void get_histogram_range();
>- 
>-   range_min = image_min;
>-   range_max = image_max;
>---- wndwconf.c.orig	1995-01-21 00:27:13 UTC
>-+++ wndwconf.c
>-@@ -55,9 +55,11 @@ static unsigned int geo_width, geo_heigh
>-  * Method:	The size can be given or set to norm.  If given but less
>-  *		than min (i.e. 0,0) it becomes the minimum configuration.
>-  */
>-+
>-+static void set_parsed_geometry();
>-+
>- void init_desktop ( )
>- {
>--  static void set_parsed_geometry();
>- 
>-   desktop.hints.min_width =
>-     (2 * desktop.xzero) + (2 * dispbox.bdrwidth) + dispbox.hints.min_width;
>---- wndwinit.c.orig	2001-12-14 23:19:23 UTC
>-+++ wndwinit.c
>-@@ -53,11 +53,13 @@ static char **cmd_argv;		/* i: command l
>-  * Uses:	create_window() in WndwCreate.c
>-  * Xlib calls:	DisplayWidth(), DisplayHeight();
>-  */
>-+
>-+static void set_window_basics();
>-+
>- void init_windows1 ( argc, argv )
>-      int argc;			/* i: command line arg count param */
>-      char **argv;		/* i: command line args */
>- {
>--  static void set_window_basics();
>-   void init_desktop(), create_window();
>- 
>-   /* set display screen parameters for all to see */
>-@@ -81,9 +83,11 @@ void init_windows1 ( argc, argv )
>-  * Uses:	configure_windows() in WndwConfig.c
>-  * Uses:	get_window_dimensions(), create_window() in WndwCreate.c
>-  */
>-+
>-+static void init_window_basics(), set_border_color();
>-+
>- void init_windows2 ( )
>- {
>--  static void init_window_basics(), set_border_color();
>-   void get_window_dimensions(), configure_windowgroup(), create_window();
>- 
>-   /* install runtime environment parameters for all windows */
>-@@ -175,11 +179,13 @@ void raise_windows ( )
>-  * Subroutine:	init_window_basics, set_window_basics
>-  * Purpose:	Set the runtime environment parameters
>-  */
>-+
>-+static void set_window_basics();
>-+
>- static void init_window_basics ( border_pixel )
>-      int border_pixel;
>- {
>-   XImage *ximage;
>--  static void set_window_basics();
>- 
>-   ximage = XCreateImage(desktop.display, color.visual, color.screen_depth,
>- 			dispbox.image.format, 0, malloc(4), 2, 2,
>---- wndwmaus.c.orig	2001-12-19 22:06:46 UTC
>-+++ wndwmaus.c
>-@@ -61,11 +61,13 @@ static Cursor keycursor;
>-  * Subroutine:	init_mousepointers
>-  * Purpose:	Set up the various mouse pointer icons for all windows
>-  */
>-+
>-+static Cursor make_mouse_cursor();
>-+
>- void init_mousepointers ( dispdisplay, auxdisplay )
>-      Display *dispdisplay;	/* i: display for the dispbox */
>-      Display *auxdisplay;	/* i: display for the auxiliary windows */
>- {
>--  static Cursor make_mouse_cursor();
>- 
>-   /* create special btnbox cursor for button menu window */
>-   btnbox.attrs.cursor =
>diff --git astro/saoimage/files/patch-makefile.FreeBSD astro/saoimage/files/patch-makefile.FreeBSD
>index b9c3ad9da248..dc829f4fd4d7 100644
>--- astro/saoimage/files/patch-makefile.FreeBSD
>+++ astro/saoimage/files/patch-makefile.FreeBSD
>@@ -1,4 +1,4 @@
>---- makefile.FreeBSD.orig	2003-04-01 17:34:57 UTC
>+--- makefile.FreeBSD.orig	2020-01-26 19:05:22 UTC
> +++ makefile.FreeBSD
> @@ -36,9 +36,9 @@
>  # FBCONFIG_2, which is set to the value of IMTOOLRC in the definition of
>@@ -22,7 +22,21 @@
>  # Uncomment these two lines to compile with gcc (add any optimizers you wish).
>  #CC = gcc -finline-functions -fdelayed-branch -fstrength-reduce
>  #  Delayed branches could win big on RISC: many inner loops have branches
>-@@ -76,12 +76,12 @@ MFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT
>+@@ -64,24 +64,24 @@ CC = cc
>+ 
>+ IFLAGS = -DFITS -DOIF -DIMTOOL
>+ 
>+-# MFLAGS: machine or library specific code.
>++# MYMFLAGS: machine or library specific code.
>+ #   -DSUN - SunOS temp file name, IEEE floating point debug, and Sun keyboard
>+ #   -DLSB - byte swap for FITS (VAX and DECstations)
>+ #   -DSYSV - substitutes for getdtablesize() and setrlimit() not widely known
>+ #   -DPSCRIPT - hard copy output to a PostScript printer (else no hardcopy)
>+ #   -DMIRIAD - extras
>+ 
>+-MFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT
>++MYMFLAGS = -DLSB -DSUN -DPSCRIPT -DQUIT
>+ 
>  # OFLAGS: compiler optimization/debug options.
>  
>  #OFLAGS = -g -DDEBUG
>@@ -46,6 +60,28 @@
>  #XLIB = -L/usr/X11R6/lib -lX11	# ATTENTION: OpenWindows users...
>  #F77LIB = -lF77 -lI77 -lU77
>  F77LIB = -lf2c
>+@@ -106,7 +106,7 @@ RANLIB = ranlib
>+ RM     = rm -f
>+ SHELL  = /bin/sh
>+ 
>+-CFLAGS = $(OFLAGS) $(ADFLAGS) $(MFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\"
>++CFLAGS = $(OFLAGS) $(ADFLAGS) $(MYMFLAGS) $(IFLAGS) -DFBCONFIG_2=\"$(IMTOOLRC)\"
>+ 
>+ # SAOimage libraries that live in subdirectories with their own makefiles.
>+ # This definition must be kept in correspondence with the DEPLIBS target.
>+@@ -241,10 +241,10 @@ $(PROGRAM):	$(DEPLIBS) $(OBJS)
>+ 
>+ $(DEPLIBS):
>+ 	@echo Building $(DEPLIBS)...
>+-	cd btnlib; $(MAKE) CFLAGS="-c $(OFLAGS) $(ADFLAGS) $(MFLAGS)" CC=$(CC)
>++	cd btnlib; $(MAKE) CFLAGS="-c $(OFLAGS) $(ADFLAGS) $(MYMFLAGS)" CC=$(CC)
>+ 
>+ lint:
>+-	$(LINT) -DDEBUG $(MFLAGS) $(IFLAGS) $(SRCS)
>++	$(LINT) -DDEBUG $(MYMFLAGS) $(IFLAGS) $(SRCS)
>+ 
>+ clean:
>+ 	cd btnlib; $(MAKE) clean
> @@ -307,7 +307,7 @@ tape:
>  	$(MAKE) ARCFILE=$(TAPEDEV) tar
>  
>@@ -55,7 +91,7 @@
>  STRUCT = hfiles/struct.h hfiles/buffer.h hfiles/color.h hfiles/control.h \
>  	 hfiles/coord.h hfiles/cursor.h hfiles/image.h hfiles/window.h
>  WORKS = $(XLIBH) $(STRUCT) hfiles/constant.h hfiles/extern.h $(WCSH)
>-@@ -419,8 +419,8 @@ maininit.o	: $(XLIBH) $(STRUCT) hfiles/c
>+@@ -419,8 +419,8 @@ maininit.o	: $(XLIBH) $(STRUCT) hfiles/constant.h hfil
>  		defs/dispbox.def defs/magnibox.def defs/panbox.def \
>  		defs/btnbox.def defs/colorbox.def defs/graphbox.def \
>  		defs/desktop.def defs/cursor.def
>diff --git astro/saoimage/files/patch-rgnwrite.c astro/saoimage/files/patch-rgnwrite.c
>index 7ec00f613021..e6693353a51a 100644
>--- astro/saoimage/files/patch-rgnwrite.c
>+++ astro/saoimage/files/patch-rgnwrite.c
>@@ -1,6 +1,41 @@
>---- rgnwrite.c.orig	1995-09-08 22:29:19 UTC
>+--- rgnwrite.c.orig	2020-01-26 19:05:22 UTC
> +++ rgnwrite.c
>-@@ -183,7 +183,7 @@ static void set_time_string ( time_strin
>+@@ -58,6 +58,9 @@ EditStruct *region_edit;
>+  * Subroutine:	write_regions
>+  * Purpose:	Write region info to a file
>+  */
>++
>++static void write_region_imtool();
>++
>+ void write_regions ( cursor, image, output_type )
>+      struct cursorRec *cursor;
>+      struct imageRec *image;
>+@@ -66,7 +69,6 @@ void write_regions ( cursor, image, output_type )
>+   FILE *fd;
>+   static int last_output_type = 0;
>+   char fname[SZ_FNAME];
>+-  static void write_region_imtool();
>+   int open_output_file();
>+   EditStruct *init_edit_popup();
>+   void set_path_iraf(), write_region_pros(), load_edit_struct(), timestamp();
>+@@ -146,13 +148,15 @@ static void write_region_imtool ( fd, region, image )
>+  * Subroutine:	timestamp
>+  * Purpose:	Write date and filename (if known) to region file
>+  */
>++
>++static void set_time_string();
>++
>+ void timestamp ( fd, imagename )
>+      FILE *fd;
>+      char *imagename;
>+ {
>+   char  line[SZ_LINE];
>+   int len;
>+-  static void set_time_string();
>+ 
>+   /* timestamp the first entry in the output file. */
>+   set_time_string (line);
>+@@ -183,7 +187,7 @@ static void set_time_string ( time_string )
>  #ifdef LONG64
>    int time();
>  #else
>diff --git astro/xplanet/Makefile astro/xplanet/Makefile
>index 13d147cff955..fb3c4fd88908 100644
>--- astro/xplanet/Makefile
>+++ astro/xplanet/Makefile
>@@ -12,32 +12,31 @@ COMMENT=	Draw pictures of the earth textured by an image
> 
> GNU_CONFIGURE=	yes
> USES=		iconv localbase xorg
>-USE_XORG=	xt xscrnsaver
>+USE_XORG=	xscrnsaver xt
> CONFIGURE_ARGS=	--with-map-extension=jpg
> CPPFLAGS+=	-I${LOCALBASE}/include/netpbm
> LIBS+=		-lm
> 
>-OPTIONS_DEFINE=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
>-OPTIONS_DEFAULT=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
>+OPTIONS_DEFINE=		FREETYPE GIF JPEG PANGO PNG PNM TIFF
>+OPTIONS_DEFAULT=	FREETYPE GIF JPEG PANGO PNG PNM TIFF
> 
> FREETYPE_CONFIGURE_WITH=	--with-freetype
>-FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
>-PANGO_CONFIGURE_WITH=	pango
>-PANGO_USES=		gnome
>-PANGO_USE=	GNOME=pango
>-GIF_CONFIGURE_WITH=	gif
>-GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
>-JPEG_CONFIGURE_WITH=	jpeg
>-JPEG_USES=		jpeg
>-PNG_CONFIGURE_WITH=	png
>-PNG_LIB_DEPENDS+=	libpng.so:graphics/png
>-PNM_CONFIGURE_WITH=	pnm
>-PNM_LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
>-TIFF_CONFIGURE_WITH=	tiff
>-TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
>+FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
>+PANGO_CONFIGURE_WITH=		pango
>+PANGO_USES=			gnome
>+PANGO_USE=			GNOME=pango
>+GIF_CONFIGURE_WITH=		gif
>+GIF_LIB_DEPENDS=		libgif.so:graphics/giflib
>+JPEG_CONFIGURE_WITH=		jpeg
>+JPEG_USES=			jpeg
>+PNG_CONFIGURE_WITH=		png
>+PNG_LIB_DEPENDS+=		libpng.so:graphics/png
>+PNM_CONFIGURE_WITH=		pnm
>+PNM_LIB_DEPENDS=		libnetpbm.so:graphics/netpbm
>+TIFF_CONFIGURE_WITH=		tiff
>+TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
> 
>-post-extract:
>-	@${REINPLACE_CMD} -e "s/default/default.sample/g" ${WRKSRC}/Makefile.in
>+post-patch:
> 	@${MV} ${WRKSRC}/xplanet/config/default ${WRKSRC}/xplanet/config/default.sample
> 
> .include <bsd.port.mk>
>diff --git astro/xplanet/files/patch-libprojections_stdiofix astro/xplanet/files/patch-libprojections_stdiofix
>deleted file mode 100644
>index 94ecaa165930..000000000000
>--- astro/xplanet/files/patch-libprojections_stdiofix
>+++ /dev/null
>@@ -1,31 +0,0 @@
>---- src/libprojection/ProjectionBonne.cpp.orig	2006-03-26 05:03:20 UTC
>-+++ src/libprojection/ProjectionBonne.cpp
>-@@ -7,6 +7,8 @@
>-   http://www.atnf.csiro.au/~mcalabre/WCS
>-  */
>- 
>-+#include <stdio.h>
>-+
>- #include <cmath>
>- #include <cstdio>
>- #include <sstream>
>---- src/libprojection/ProjectionGnomonic.cpp.orig	2006-03-26 05:03:20 UTC
>-+++ src/libprojection/ProjectionGnomonic.cpp
>-@@ -7,6 +7,8 @@
>-   http://www.atnf.csiro.au/~mcalabre/WCS
>- */
>- 
>-+#include <stdio.h>
>-+
>- #include <cmath>
>- #include <cstdio>
>- #include <sstream>
>---- src/libprojection/ProjectionMercator.cpp.orig	2006-03-26 05:03:20 UTC
>-+++ src/libprojection/ProjectionMercator.cpp
>-@@ -1,4 +1,6 @@
>- #include <cmath>
>-+#include <stdio.h>
>-+
>- #include <cstdio>
>- #include <sstream>
>- using namespace std;
>diff --git astro/xplanet/files/patch-null-comparison-fix astro/xplanet/files/patch-null-comparison-fix
>deleted file mode 100644
>index f03de03a6ec7..000000000000
>--- astro/xplanet/files/patch-null-comparison-fix
>+++ /dev/null
>@@ -1,150 +0,0 @@
>-Index: src/libmultiple/RayleighScattering.cpp
>-===================================================================
>---- src/libmultiple/RayleighScattering.cpp	(revision 206)
>-+++ src/libmultiple/RayleighScattering.cpp	(revision 207)
>-@@ -369,7 +369,7 @@
>- 
>-     diskTemplate_.clear();
>-     limbTemplate_.clear();
>--    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
>-+    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
>-     {
>-         int i = 0;
>-         while (isDelimiter(line[i]))
>-@@ -439,7 +439,7 @@
>-     values.clear();
>- 
>-     char line[MAX_LINE_LENGTH];
>--    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
>-+    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
>-     {
>-         int i = 0;
>-         while (isDelimiter(line[i]))
>-@@ -470,7 +470,7 @@
>-                               double &value)
>- {
>-     char line[MAX_LINE_LENGTH];
>--    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
>-+    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
>-     {
>-         int i = 0;
>-         while (isDelimiter(line[i]))
>-Index: src/libmultiple/drawStars.cpp
>-===================================================================
>---- src/libmultiple/drawStars.cpp	(revision 206)
>-+++ src/libmultiple/drawStars.cpp	(revision 207)
>-@@ -41,7 +41,7 @@
>-     ifstream inFile(starMap.c_str());
>- 
>-     char line[MAX_LINE_LENGTH];
>--    while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
>-+    while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
>-     {
>-         if (line[0] == '#') continue;
>- 
>-Index: src/readConfig.cpp
>-===================================================================
>---- src/readConfig.cpp	(revision 206)
>-+++ src/readConfig.cpp	(revision 207)
>-@@ -550,7 +550,7 @@
>- 
>-         ifstream inFile(configFile.c_str());
>-         char *line = new char[256];
>--        while (inFile.getline(line, 256, '\n') != NULL)
>-+        while (inFile.getline(line, 256, '\n'))
>-             readConfig(line, planetProperties);
>-         
>-         // This condition will only be true if [default] is the only
>-Index: src/libannotate/addArcs.cpp
>-===================================================================
>---- src/libannotate/addArcs.cpp	(revision 206)
>-+++ src/libannotate/addArcs.cpp	(revision 207)
>-@@ -258,7 +258,7 @@
>-         {
>-             ifstream inFile(arcFile.c_str());
>-             char *line = new char[MAX_LINE_LENGTH];
>--            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
>-+            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
>-                 readArcFile(line, planet, view, projection,
>-                             planetProperties, annotationMap);
>-             
>-@@ -292,7 +292,7 @@
>-         {
>-             ifstream inFile(arcFile.c_str());
>-             char *line = new char[256];
>--            while (inFile.getline (line, 256, '\n') != NULL)
>-+            while (inFile.getline (line, 256, '\n'))
>-                 readArcFile(line, NULL, view, NULL, NULL, annotationMap);
>- 
>-             inFile.close();
>-Index: src/libannotate/addMarkers.cpp
>-===================================================================
>---- src/libannotate/addMarkers.cpp	(revision 206)
>-+++ src/libannotate/addMarkers.cpp	(revision 207)
>-@@ -429,7 +429,7 @@
>-         {
>-             ifstream inFile(markerFile.c_str());
>-             char *line = new char[MAX_LINE_LENGTH];
>--            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
>-+            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
>-             {
>-                 unsigned char color[3];
>-                 memcpy(color, planetProperties->MarkerColor(), 3);
>-@@ -475,7 +475,7 @@
>-         {
>-             ifstream inFile(markerFile.c_str());
>-             char *line = new char[MAX_LINE_LENGTH];
>--            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
>-+            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
>-             {
>-                 unsigned char color[3];
>-                 memcpy(color, options->Color(), 3);
>-Index: src/libannotate/addSatellites.cpp
>-===================================================================
>---- src/libannotate/addSatellites.cpp	(revision 206)
>-+++ src/libannotate/addSatellites.cpp	(revision 207)
>-@@ -488,10 +488,10 @@
>-         {
>-             ifstream inFile(tleFile.c_str());
>-             char lines[3][80];
>--            while (inFile.getline(lines[0], 80) != NULL)
>-+            while (inFile.getline(lines[0], 80))
>-             {
>--                if ((inFile.getline(lines[1], 80) == NULL) 
>--                    || (inFile.getline(lines[2], 80) == NULL))
>-+                if ((!inFile.getline(lines[1], 80)) 
>-+                    || (!inFile.getline(lines[2], 80)))
>-                 {
>-                     ostringstream errStr;
>-                     errStr << "Malformed TLE file (" << tleFile << ")?\n";
>-@@ -542,7 +542,7 @@
>-         {
>-             ifstream inFile(satFile.c_str());
>-             char *line = new char[MAX_LINE_LENGTH];
>--            while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
>-+            while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
>-                 readSatelliteFile(line, planet, view, projection,
>-                                   planetProperties, annotationMap);
>-             
>-Index: src/libannotate/addSpiceObjects.cpp
>-===================================================================
>---- src/libannotate/addSpiceObjects.cpp	(revision 206)
>-+++ src/libannotate/addSpiceObjects.cpp	(revision 207)
>-@@ -524,7 +524,7 @@
>-         {
>-             ifstream inFile(kernelFile.c_str());
>-             char *line = new char[MAX_LINE_LENGTH];
>--            while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
>-+            while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
>-             {
>-                 int ii = 0;
>-                 while (isDelimiter(line[ii]))
>-@@ -576,7 +576,7 @@
>-         {
>-             ifstream inFile(spiceFile.c_str());
>-             char *line = new char[MAX_LINE_LENGTH];
>--            while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
>-+            while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
>-                 readSpiceFile(line, planetsFromSunMap, view, projection,
>-                               annotationMap);
>-             inFile.close();
>diff --git astro/xplanet/files/patch-src_libimage_gif.c astro/xplanet/files/patch-src_libimage_gif.c
>index d956e89240c9..119d0828e316 100644
>--- astro/xplanet/files/patch-src_libimage_gif.c
>+++ astro/xplanet/files/patch-src_libimage_gif.c
>@@ -1,4 +1,4 @@
>---- src/libimage/gif.c.orig	2006-03-25 22:50:51 UTC
>+--- src/libimage/gif.c.orig	2020-01-26 19:25:24 UTC
> +++ src/libimage/gif.c
> @@ -28,6 +28,314 @@
>    distribution. 
>@@ -315,7 +315,7 @@
>  int
>  read_gif(const char *filename, int *width, int *height, unsigned char **rgb)
>  {
>-@@ -42,11 +350,15 @@ read_gif(const char *filename, int *widt
>+@@ -42,11 +350,15 @@ read_gif(const char *filename, int *width, int *height
>      int color_index;
>      unsigned char *ptr = NULL;
>  
>@@ -332,7 +332,7 @@
>          return(0);
>      }
>  
>-@@ -54,7 +366,11 @@ read_gif(const char *filename, int *widt
>+@@ -54,7 +366,11 @@ read_gif(const char *filename, int *width, int *height
>      {
>          if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) 
>          {
>@@ -345,7 +345,7 @@
>              return(0);
>          }
>  
>-@@ -63,7 +379,11 @@ read_gif(const char *filename, int *widt
>+@@ -63,7 +379,11 @@ read_gif(const char *filename, int *width, int *height
>          case IMAGE_DESC_RECORD_TYPE:
>              if (DGifGetImageDesc(infile) == GIF_ERROR)
>              {
>@@ -358,7 +358,7 @@
>                  return(0);
>              }
>  
>-@@ -107,14 +427,22 @@ read_gif(const char *filename, int *widt
>+@@ -107,14 +427,22 @@ read_gif(const char *filename, int *width, int *height
>              GifByteType *ext;
>              if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) 
>              {
>@@ -383,7 +383,7 @@
>                      return(0);
>                  }
>              }
>-@@ -154,7 +482,11 @@ read_gif(const char *filename, int *widt
>+@@ -154,7 +482,11 @@ read_gif(const char *filename, int *width, int *height
>      
>      free(buffer);
>  
>@@ -395,7 +395,7 @@
>      return(1);
>  }
>  
>-@@ -178,7 +510,11 @@ write_gif(const char *filename, int widt
>+@@ -178,7 +510,11 @@ write_gif(const char *filename, int width, int height,
>          return(0);
>      }
>  
>@@ -407,7 +407,7 @@
>  
>      for (i = 0; i < width * height; i++)
>      {
>-@@ -190,7 +526,7 @@ write_gif(const char *filename, int widt
>+@@ -190,7 +526,7 @@ write_gif(const char *filename, int width, int height,
>      if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,   
>                         buffer, colormap->Colors) == GIF_ERROR)
>      {
>@@ -416,7 +416,7 @@
>          return(0);
>      }
>  
>-@@ -198,24 +534,36 @@ write_gif(const char *filename, int widt
>+@@ -198,24 +534,36 @@ write_gif(const char *filename, int width, int height,
>      free(green);
>      free(blue);
>  
>@@ -458,7 +458,7 @@
>          return(0);
>      }
>  
>-@@ -224,7 +572,11 @@ write_gif(const char *filename, int widt
>+@@ -224,7 +572,11 @@ write_gif(const char *filename, int width, int height,
>      {
>          if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
>          {
>@@ -471,7 +471,7 @@
>              return(0);
>          }
>          ptr += width;
>-@@ -232,8 +584,12 @@ write_gif(const char *filename, int widt
>+@@ -232,8 +584,12 @@ write_gif(const char *filename, int width, int height,
>  
>      EGifSpew(outfile);
>  
>diff --git astro/xplanet/files/patch-src_libprojection_ProjectionIcosagnomonic.cpp astro/xplanet/files/patch-src_libprojection_ProjectionIcosagnomonic.cpp
>index edcfd8d1a004..64ab8c572a31 100644
>--- astro/xplanet/files/patch-src_libprojection_ProjectionIcosagnomonic.cpp
>+++ astro/xplanet/files/patch-src_libprojection_ProjectionIcosagnomonic.cpp
>@@ -1,4 +1,4 @@
>---- src/libprojection/ProjectionIcosagnomonic.cpp.orig	2009-04-16 15:10:08 UTC
>+--- src/libprojection/ProjectionIcosagnomonic.cpp.orig	2020-01-26 19:25:24 UTC
> +++ src/libprojection/ProjectionIcosagnomonic.cpp
> @@ -26,6 +26,19 @@ using namespace std;
>  #define THIGH 3
>diff --git astro/xplanet/files/patch-src_readConfig.cpp astro/xplanet/files/patch-src_readConfig.cpp
>index 8426da519f59..2b34d73035d8 100644
>--- astro/xplanet/files/patch-src_readConfig.cpp
>+++ astro/xplanet/files/patch-src_readConfig.cpp
>@@ -31,7 +31,7 @@ Since it happens in a half-dozen places, introduce a trivial helper function.
>  static void
>  readConfig(const char *line, PlanetProperties *planetProperties[])
>  {
>-@@ -49,7 +52,7 @@ readConfig(const char *line, PlanetPrope
>+@@ -49,7 +52,7 @@ readConfig(const char *line, PlanetProperties *planetP
>              int r, g, b;
>              if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
>              {
>@@ -40,7 +40,7 @@ Since it happens in a half-dozen places, introduce a trivial helper function.
>                  currentProperties->ArcColor(color);
>              }
>              else
>-@@ -179,7 +182,7 @@ readConfig(const char *line, PlanetPrope
>+@@ -179,7 +182,7 @@ readConfig(const char *line, PlanetProperties *planetP
>              int r, g, b;
>              if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
>              {
>@@ -49,7 +49,7 @@ Since it happens in a half-dozen places, introduce a trivial helper function.
>                  currentProperties->Color(color);
>              }
>              else
>-@@ -244,7 +247,7 @@ readConfig(const char *line, PlanetPrope
>+@@ -244,7 +247,7 @@ readConfig(const char *line, PlanetProperties *planetP
>              int r, g, b;
>              if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
>              {
>@@ -58,7 +58,7 @@ Since it happens in a half-dozen places, introduce a trivial helper function.
>                  currentProperties->GridColor(color);
>              }
>              else
>-@@ -296,7 +299,7 @@ readConfig(const char *line, PlanetPrope
>+@@ -296,7 +299,7 @@ readConfig(const char *line, PlanetProperties *planetP
>              int r, g, b;
>              if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
>              {
>@@ -67,7 +67,7 @@ Since it happens in a half-dozen places, introduce a trivial helper function.
>                  currentProperties->MarkerColor(color);
>              }
>              else
>-@@ -403,7 +406,7 @@ readConfig(const char *line, PlanetPrope
>+@@ -403,7 +406,7 @@ readConfig(const char *line, PlanetProperties *planetP
>              int r, g, b;
>              if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
>              {
>@@ -76,7 +76,7 @@ Since it happens in a half-dozen places, introduce a trivial helper function.
>                  currentProperties->OrbitColor(color);
>              }
>              else
>-@@ -473,7 +476,7 @@ readConfig(const char *line, PlanetPrope
>+@@ -473,7 +476,7 @@ readConfig(const char *line, PlanetProperties *planetP
>              int r, g, b;
>              if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3)
>              {
>@@ -85,3 +85,12 @@ Since it happens in a half-dozen places, introduce a trivial helper function.
>                  currentProperties->TextColor(color);
>              }
>              else
>+@@ -550,7 +553,7 @@ readConfigFile(string configFile, PlanetProperties *pl
>+ 
>+         ifstream inFile(configFile.c_str());
>+         char *line = new char[256];
>+-        while (inFile.getline(line, 256, '\n') != NULL)
>++        while (inFile.getline(line, 256, '\n'))
>+             readConfig(line, planetProperties);
>+         
>+         // This condition will only be true if [default] is the only
>diff --git audio/aacplusenc/Makefile audio/aacplusenc/Makefile
>index 17c56bb7e23f..1ff70d18c6f3 100644
>--- audio/aacplusenc/Makefile
>+++ audio/aacplusenc/Makefile
>@@ -33,7 +33,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|-O3 -ftree-vectorize|${CFLAGS}| ; s|-lfftw3f|-L${LOCALBASE}/lib -lfftw3f| ; s|INSTDIR=.*|INSTDIR=${PREFIX}|' ${WRKSRC}/Makefile
>-	@${REINPLACE_CMD} -e 's|<endian.h>|<sys/endian.h>| ; s|__BYTE|_BYTE|' ${WRKSRC}/au_channel.h
> 	@${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/configure
> 
> .include <bsd.port.mk>
>diff --git audio/blop/Makefile audio/blop/Makefile
>index cc7fbda36d8f..e13544d9eedd 100644
>--- audio/blop/Makefile
>+++ audio/blop/Makefile
>@@ -25,9 +25,4 @@ OPTIONS_SUB=	yes
> NLS_USES=	gettext
> NLS_CONFIGURE_ENABLE=	nls
> 
>-post-patch:
>-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|$$(LIBS)$$|$$(LIBS) $$(LDFLAGS)|g ; \
>-		 s|-lc | |g'
>-
> .include <bsd.port.mk>
>diff --git audio/cmt/Makefile audio/cmt/Makefile
>index 876faf64d8ad..496b0ebbcf9b 100644
>--- audio/cmt/Makefile
>+++ audio/cmt/Makefile
>@@ -24,10 +24,6 @@ ALL_TARGET=	targets
> 
> PLIST_FILES=	lib/ladspa/cmt.so
> 
>-post-patch:
>-	@${FIND} ${BUILD_WRKSRC} -name '*.cpp' | ${XARGS} \
>-		${REINPLACE_CMD} -e "s|<malloc.h>|<stdlib.h>|g"
>-
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ladspa
> 	${INSTALL_LIB} ${WRKSRC}/plugins/cmt.so ${STAGEDIR}${PREFIX}/lib/ladspa/
>diff --git audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk
>index 98fdcf371071..4996c58e80bd 100644
>--- audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk
>+++ audio/dpf-plugins-lv2/files/patch-dpf_Makefile.base.mk
>@@ -1,11 +1,48 @@
>---- dpf/Makefile.base.mk.orig	2019-02-28 18:07:46 UTC
>+--- dpf/Makefile.base.mk.orig	2019-07-07 08:30:45 UTC
> +++ dpf/Makefile.base.mk
>-@@ -90,7 +90,7 @@ endif
>- # Set build and link flags
>+@@ -12,6 +12,8 @@ CXX ?= g++
>+ # Auto-detect OS if not defined
>  
>- BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
>--BASE_OPTS  = -O3 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
>-+BASE_OPTS  = -O3 -ffast-math $(SIMD_FLAGS) -fdata-sections -ffunction-sections
>+ ifneq ($(BSD),true)
>++ifneq ($(FREEBSD),true)
>++ifneq ($(FREEBSDPPC),true)
>+ ifneq ($(HAIKU),true)
>+ ifneq ($(HURD),true)
>+ ifneq ($(LINUX),true)
>+@@ -22,6 +24,12 @@ TARGET_MACHINE := $(shell $(CC) -dumpmachine)
>+ ifneq (,$(findstring bsd,$(TARGET_MACHINE)))
>+ BSD=true
>+ endif
>++ifneq (,$(findstring freebsd,$(TARGET_MACHINE)))
>++FREEBSD=true
>++ifneq (,$(findstring powerpc,$(TARGET_MACHINE)))
>++FREEBSDPPC=true
>++endif
>++endif
>+ ifneq (,$(findstring haiku,$(TARGET_MACHINE)))
>+ HAIKU=true
>+ endif
>+@@ -44,6 +52,8 @@ endif
>+ endif
>+ endif
>+ endif
>++endif
>++endif
>+ 
>+ # ---------------------------------------------------------------------------------------------------------------------
>+ # Set PKG_CONFIG (can be overridden by environment variable)
>+@@ -107,7 +117,13 @@ endif
>  
>+ BASE_FLAGS = -Wall -Wextra -pipe -MD -MP
>+ BASE_OPTS  = -O3 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
>+-
>++ifeq ($(FREEBSD),true)
>++ifeq ($(FREEBSDPPC),true)
>++BASE_OPTS  = -O3 -ffast-math -fdata-sections -ffunction-sections
>++else
>++BASE_OPTS  = -O3 -ffast-math -msse -msse2 -fdata-sections -ffunction-sections
>++endif
>++endif
>  ifeq ($(MACOS),true)
>  # MacOS linker flags
>+ LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs
>diff --git audio/funktrackergold/Makefile audio/funktrackergold/Makefile
>index 99cd3fba4781..087819938012 100644
>--- audio/funktrackergold/Makefile
>+++ audio/funktrackergold/Makefile
>@@ -13,8 +13,8 @@ COMMENT=	Curses MOD/FNK music tracker
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN_armv6=		fails to compile: function definition is not allowed here
>-BROKEN_armv7=		fails to compile: function definition is not allowed here
>+BROKEN_armv6=	fails to compile: function definition is not allowed here
>+BROKEN_armv7=	fails to compile: function definition is not allowed here
> 
> USES=		compiler:nestedfct ncurses tar:tgz
> 
>diff --git audio/funktrackergold/files/patch-Makefile audio/funktrackergold/files/patch-Makefile
>index 1ae782c5ae8e..97c8e2c3744a 100644
>--- audio/funktrackergold/files/patch-Makefile
>+++ audio/funktrackergold/files/patch-Makefile
>@@ -1,6 +1,6 @@
>---- Makefile.orig	Mon Jun 22 20:24:17 1998
>-+++ Makefile	Sun Apr  1 20:44:19 2001
>-@@ -5,53 +5,10 @@
>+--- Makefile.orig	2020-01-26 19:53:24 UTC
>++++ Makefile
>+@@ -5,61 +5,18 @@
>  # FunktrackerGOLD now comes under the GNU General Public License. Please
>  # read the COPYING notice in this distribution.
>  ############################################################################
>@@ -20,7 +20,8 @@
> -    OPTIONS += -DLinux
> -  endif
> -endif
>--
>++all: funkgold
>+ 
> -HOST_SAFE = 0
> -
> -ifeq ($(HOSTTYPE),i386)
>@@ -39,7 +40,7 @@
> -  HOST_SAFE = 1
> -endif
> -
>--###############################
>+ ###############################
> -all:
> -	@if [ $(HOST_SAFE) = '1' ]; then \
> -	  make funkgold; \
>@@ -53,11 +54,10 @@
> -	  echo "Refer to INSTALL file."; \
> -	  echo "***********************************************"; \
> -	fi
>-+all: funkgold
>- 
>- ###############################
>+-
>+-###############################
>  OBJ_FT		= dsp_mixxer.o funktracker.o funkload.o funkgold_misc.o \
>-@@ -59,7 +16,7 @@
>+ 		funkgold_dir.o funkgold_sm.o funkgold_se.o funkgold_pe.o \
>  		funkgold_trac.o funkgold.o
>  
>  funkgold: $(OBJ_FT)
>@@ -66,7 +66,7 @@
>  	strip funkgold
>  
>  ###############################
>-@@ -69,7 +26,3 @@
>+@@ -69,7 +26,3 @@ clean:
>  release:
>  	make
>  	rm -f *.o
>diff --git audio/funktrackergold/files/patch-dsp_mixxer.c audio/funktrackergold/files/patch-dsp_mixxer.c
>deleted file mode 100644
>index 34d646bb433f..000000000000
>--- audio/funktrackergold/files/patch-dsp_mixxer.c
>+++ /dev/null
>@@ -1,50 +0,0 @@
>---- dsp_mixxer.c.orig	Mon Jun 22 12:39:39 1998
>-+++ dsp_mixxer.c	Sat Jul 14 21:55:28 2007
>-@@ -15,15 +15,11 @@
>- ***************************************************************************/
>- #include <stdio.h>
>- #include <math.h>
>--#include <malloc.h>
>-+#include <stdlib.h>
>- #include <unistd.h>
>- #include <fcntl.h>
>- #include <sys/ioctl.h>
>--#ifdef Linux
>-- #include <sys/soundcard.h>
>--#elif FreeBSD
>-- #include <machine/soundcard.h>
>--#endif
>-+#include <sys/soundcard.h>
>- #include "funktracker_defs.h"
>- #include "funktracker.h"
>- #include "funkload.h"
>-@@ -301,12 +297,12 @@
>- 
>-   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
>-   {
>--    if(chmix[chan_no].funkctrl & 0x2)
>-+    if(chmix[chan_no].funkctrl & 0x2) {
>- #pragma pack(1)
>-       sam = *((sDB *)chmix[chan_no].sample_addr +
>-             (unsigned long)chmix[chan_no].sample_ptr);
>- #pragma pack()
>--    else
>-+    } else
>-       sam = 0;
>- 
>- #ifdef DIGITAL_ECHOING
>-@@ -363,12 +359,12 @@
>-   shift_t = 8 + shift_table[funk_info.no_active_channels];
>-   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
>-   {
>--    if(chmix[chan_no].funkctrl & 0x2)
>-+    if(chmix[chan_no].funkctrl & 0x2) {
>- #pragma pack(1)
>-       sam = *((sDW *)chmix[chan_no].sample_addr +
>-             (unsigned long)chmix[chan_no].sample_ptr);
>- #pragma pack()
>--    else
>-+    } else
>-       sam = 0;
>- #ifdef DIGITAL_ECHOING
>-     sam_reverb = *(chmix[chan_no].echo_buffer +
>diff --git audio/funktrackergold/files/patch-funkgold__misc.c audio/funktrackergold/files/patch-funkgold__misc.c
>index 3557cd198a77..17bdde95fde2 100644
>--- audio/funktrackergold/files/patch-funkgold__misc.c
>+++ audio/funktrackergold/files/patch-funkgold__misc.c
>@@ -1,6 +1,14 @@
>---- funkgold_misc.c.orig	Thu Apr 14 17:48:48 2005
>-+++ funkgold_misc.c	Thu Apr 14 17:49:42 2005
>-@@ -30,22 +30,7 @@
>+--- funkgold_misc.c.orig	2020-01-26 19:53:24 UTC
>++++ funkgold_misc.c
>+@@ -17,7 +17,6 @@
>+ #include <stdlib.h>
>+ #include <string.h>
>+ #include <sys/time.h>
>+-#include <malloc.h>
>+ #include "funktracker_defs.h"
>+ #include "dsp_mixxer.h"
>+ #include "funktracker.h"
>+@@ -30,22 +29,7 @@
>  
>  void get_environment(void)
>  {
>diff --git audio/funktrackergold/files/patch-headers audio/funktrackergold/files/patch-headers
>deleted file mode 100644
>index cecf6a20165b..000000000000
>--- audio/funktrackergold/files/patch-headers
>+++ /dev/null
>@@ -1,53 +0,0 @@
>---- ../funkgold-orig/funkgold.c	Sun Jun 21 22:10:54 1998
>-+++ funkgold.c	Sun Apr  1 17:53:18 2001
>-@@ -23,7 +23,7 @@
>- ***************************************************************************/
>- #include <curses.h>
>- #include <unistd.h>
>--#include <malloc.h>
>-+#include <stdlib.h>
>- #include <string.h>
>- #include <signal.h>
>- #include <sys/time.h>
>---- ../funkgold-orig/funkgold_dir.c	Wed Dec  2 22:01:23 1998
>-+++ funkgold_dir.c	Sun Apr  1 18:05:59 2001
>-@@ -18,7 +18,6 @@
>- #include <unistd.h>
>- #include <dirent.h>
>- #include <sys/stat.h>
>--#include <malloc.h>
>- #include <string.h>
>- #include <stdlib.h>
>- #include "funktracker_defs.h"
>---- ../funkgold-orig/funkgold_misc.c	Sun Jun 21 15:56:46 1998
>-+++ funkgold_misc.c	Sun Apr  1 17:53:30 2001
>-@@ -17,7 +17,6 @@
>- #include <stdlib.h>
>- #include <string.h>
>- #include <sys/time.h>
>--#include <malloc.h>
>- #include "funktracker_defs.h"
>- #include "dsp_mixxer.h"
>- #include "funktracker.h"
>---- ../funkgold-orig/funkgold_sm.c	Sun Jun 21 15:57:07 1998
>-+++ funkgold_sm.c	Sun Apr  1 17:53:44 2001
>-@@ -16,7 +16,7 @@
>- ***************************************************************************/
>- #include <curses.h>
>- #include <unistd.h>
>--#include <malloc.h>
>-+#include <stdlib.h>
>- #include "funktracker_defs.h"
>- #include "dsp_mixxer.h"
>- #include "funktracker.h"
>---- ../funkgold-orig/funkload.c	Sun Jun 21 15:57:21 1998
>-+++ funkload.c	Sun Apr  1 17:53:51 2001
>-@@ -15,7 +15,7 @@
>- ***************************************************************************/
>- #include <stdio.h>
>- #include <string.h>
>--#include <malloc.h>
>-+#include <stdlib.h>
>- #include "funktracker_defs.h"
>- #include "dsp_mixxer.h"
>- #include "funktracker.h"
>diff --git audio/libcanberra/Makefile audio/libcanberra/Makefile
>index 7f683517892e..3132372d1579 100644
>--- audio/libcanberra/Makefile
>+++ audio/libcanberra/Makefile
>@@ -27,7 +27,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> 
>-.if defined(SLAVEPORT)
>+.if !defined(SLAVEPORT)
> OPTIONS_DEFINE=	PULSEAUDIO GSTREAMER
> .endif
> 
>diff --git audio/osalp/Makefile audio/osalp/Makefile
>index 03f73c838c26..a908d9520b85 100644
>--- audio/osalp/Makefile
>+++ audio/osalp/Makefile
>@@ -27,13 +27,6 @@ PLIST_SUB=	VERSION=${PORTVERSION}
> 
> CONFLICTS=	libaudiofile-[0-9]*
> 
>-post-patch:
>-	@${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -E \
>-	    's|iostream.h|iostream|; \
>-	     s|[[:space:]]cout| std::cout|g; \
>-	     s|[[:space:]]endl| std::endl|g; \
>-	     s|[[:space:]]cerr| std::cerr|g;'
>-
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaflib-${PORTVERSION}.so \
> 	    ${STAGEDIR}${PREFIX}/lib/aflib/lib*-${PORTVERSION}.so
>diff --git audio/osalp/files/patch-aflib_aflibMemCache.cc audio/osalp/files/patch-aflib_aflibMemCache.cc
>index e104d342f91b..0dfb3242431a 100644
>--- audio/osalp/files/patch-aflib_aflibMemCache.cc
>+++ audio/osalp/files/patch-aflib_aflibMemCache.cc
>@@ -8,3 +8,12 @@
>  
>  #include "aflibMemCache.h"
>  #include "aflibMemNode.h"
>+@@ -559,7 +560,7 @@ aflibMemCache::fillDataFromCache(
>+    // IF we need data at the end then get the data
>+    if (num_samples != orig_num_samples)
>+    {
>+-      cerr << "NOT YET IMPLEMENTED!" << endl;
>++      std::cerr << "NOT YET IMPLEMENTED!" << endl;
>+    }
>+ #endif
>+ 
>diff --git audio/play/Makefile audio/play/Makefile
>index 0be482589c24..0aa884569d3d 100644
>--- audio/play/Makefile
>+++ audio/play/Makefile
>@@ -17,9 +17,4 @@ MAKE_ARGS=	CFLAGS="${CFLAGS}" MANDIR="${PREFIX}/man/ja/man" BINDIR="${PREFIX}/bi
> 
> PLIST_FILES=	bin/play man/ja/man1/play.1.gz
> 
>-post-patch:
>-.for file in play_audio.c mixer_ctl.c encode_sun.c encode_riff.c speed.c
>-	@${REINPLACE_CMD} '/soundcard\.h/s,machine,sys,' ${WRKSRC}/${file}
>-.endfor
>-
> .include <bsd.port.mk>
>diff --git audio/pulseaudio/Makefile audio/pulseaudio/Makefile
>index cab375374970..2ec0d83aebf3 100644
>--- audio/pulseaudio/Makefile
>+++ audio/pulseaudio/Makefile
>@@ -23,7 +23,7 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
> 		libltdl.so:devel/libltdl \
> 		libck-connector.so:sysutils/consolekit2
> 
>-USES=		compiler:c11 cpe gettext gmake gnome iconv libtool \
>+USES=		compiler:c11 cpe gettext gmake gnome iconv libtool:build \
> 		pathfix pkgconfig python:run shebangfix ssl tar:xz xorg
> 
> USE_GNOME=	glib20
>diff --git audio/rawrec/Makefile audio/rawrec/Makefile
>index 236d6342128b..5af25298ddb9 100644
>--- audio/rawrec/Makefile
>+++ audio/rawrec/Makefile
>@@ -22,10 +22,6 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CPPFLAGS} ${CFLAGS}" \
> 
> PLIST_FILES=	bin/rawplay bin/rawrec share/man/man1/rawplay.1.gz share/man/man1/rawrec.1.gz
> 
>-post-patch:
>-	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|<linux/soundcard.h>|<sys/soundcard.h>|g'
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/rawrec ${STAGEDIR}${PREFIX}/bin
> 	${LN} -sf rawrec ${STAGEDIR}${PREFIX}/bin/rawplay
>diff --git audio/spiralloops/Makefile audio/spiralloops/Makefile
>index df9d8585da57..aa28a73f1c02 100644
>--- audio/spiralloops/Makefile
>+++ audio/spiralloops/Makefile
>@@ -27,23 +27,6 @@ DESKTOP_ENTRIES="SpiralLoops" "" "" "SpiralLoops" "" false
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.orig
>-	${SED} -E "s:-ldl::g; \
>-		s:^CFLAGS:XCFLAGS:g; \
>-		s:^CXXFLAGS:XCXXFLAGS:g; \
>-		s:-O3::g; \
>-		s:CFLAGS =:CFLAGS +=:g; \
>-		s:CXXFLAGS=:CXXFLAGS+=:g; \
>-		s:-lm:-lpthread -lm:g; \
>-		s:/usr/X11R6:${LOCALBASE}:g; \
>-		s:gcc:${CC}:; s:g\+\+:${CXX}:" \
>-		< ${WRKSRC}/Makefile.in.orig > ${WRKSRC}/Makefile.in
>-
>-	@${FIND} ${WRKSRC} -type f -name "*.C" -o -name "*.cpp" -o -name "*.h" | ${XARGS} \
>-	   ${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; /^#include "FL/s|.h"$$|.H"|; \
>-	   s|fl_file_chooser.H|Fl_File_Chooser.H|g; s|iostream.h|iostream|; s|fstream.h|fstream|'
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/SpiralLoops ${STAGEDIR}${PREFIX}/bin
> 
>diff --git audio/spiralloops/files/patch-Fl_Knob.H audio/spiralloops/files/patch-Fl_Knob.H
>deleted file mode 100644
>index d422fd28f4f7..000000000000
>--- audio/spiralloops/files/patch-Fl_Knob.H
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-patch by Stephen Paskaluk to enable compilation with fltk 1.1.2
>-
>---- GUI/Widgets/Fl_Knob.H.orig	Thu Apr 19 16:48:10 2001
>-+++ GUI/Widgets/Fl_Knob.H	Sat Mar  1 12:36:19 2003
>-@@ -4,6 +4,7 @@
>- #define Fl_Knob_H
>- #include <FL/Fl.H>
>- #include <FL/Fl_Valuator.H>
>-+#include <FL/Fl_Group.H>
>- 
>- class Fl_Knob : public Fl_Valuator {
>- public:
>diff --git audio/spiralloops/files/patch-Fl_LED_Button.H audio/spiralloops/files/patch-Fl_LED_Button.H
>deleted file mode 100644
>index 45884959a35b..000000000000
>--- audio/spiralloops/files/patch-Fl_LED_Button.H
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-patch by Stephen Paskaluk to enable compilation with fltk 1.1.2
>-
>---- GUI/Widgets/Fl_LED_Button.H.orig	Thu Apr 19 16:48:11 2001
>-+++ GUI/Widgets/Fl_LED_Button.H	Sat Mar  1 12:39:19 2003
>-@@ -4,6 +4,7 @@
>- #define Fl_LED_Button_H
>- #include <FL/Fl.H>
>- #include <FL/Fl_Light_Button.H>
>-+#include <FL/Fl_Group.H>
>- 
>- class Fl_LED_Button : public Fl_Light_Button {
>- public:
>diff --git audio/spiralloops/files/patch-Fl_LED_Button.cxx audio/spiralloops/files/patch-Fl_LED_Button.cxx
>deleted file mode 100644
>index 391c9751939a..000000000000
>--- audio/spiralloops/files/patch-Fl_LED_Button.cxx
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- GUI/Widgets/Fl_LED_Button.cxx.orig	Thu Apr 19 22:48:11 2001
>-+++ GUI/Widgets/Fl_LED_Button.cxx	Wed Nov 22 13:16:40 2006
>-@@ -3,7 +3,7 @@
>- #include "Fl_LED_Button.H"
>- #include <FL/fl_draw.H>
>- 
>--Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l=0):Fl_Light_Button(x,y,w,h,l) {
>-+Fl_LED_Button::Fl_LED_Button(int x, int y, int w, int h, const char* l):Fl_Light_Button(x,y,w,h,l) {
>-   box(FL_NO_BOX);
>- 	down_box(FL_ROUND_DOWN_BOX);
>- 	selection_color(FL_RED);
>-@@ -15,7 +15,7 @@
>- void Fl_LED_Button::draw() {
>-   uchar r,g,b;
>- 
>--	if (box()) draw_box(this==Fl::pushed() ? down(box()) : box(), color());
>-+	if (box()) draw_box(this==Fl::pushed() ? down_box() : box(), color());
>- 	Fl_Color col = value() ? selection_color() : color();
>- 	Fl::get_color((Fl_Color)selection_color(),r,g,b);
>- 	int d = h()/6;
>diff --git audio/spiralloops/files/patch-GUI-Widgets-Fl__Trigger.h audio/spiralloops/files/patch-GUI-Widgets-Fl__Trigger.h
>deleted file mode 100644
>index db0452cef7da..000000000000
>--- audio/spiralloops/files/patch-GUI-Widgets-Fl__Trigger.h
>+++ /dev/null
>@@ -1,12 +0,0 @@
>---- GUI/Widgets/Fl_Trigger.h.orig	2001-04-20 00:48:10.000000000 +0400
>-+++ GUI/Widgets/Fl_Trigger.h	2014-02-13 05:50:41.290374838 +0400
>-@@ -24,6 +24,9 @@
>- #ifndef TRIGGERWIDGET
>- #define TRIGGERWIDGET
>- 
>-+using std::istream;
>-+using std::ostream;
>-+
>- class Fl_Trigger : public Fl_Widget
>- {
>- public:
>diff --git audio/spiralloops/files/patch-GUI_OutputGUI.C audio/spiralloops/files/patch-GUI_OutputGUI.C
>index de4b17a4dc4f..60bb9de15771 100644
>--- audio/spiralloops/files/patch-GUI_OutputGUI.C
>+++ audio/spiralloops/files/patch-GUI_OutputGUI.C
>@@ -1,6 +1,15 @@
>---- GUI/OutputGUI.C.orig	Wed Nov 22 13:13:17 2006
>-+++ GUI/OutputGUI.C	Wed Nov 22 13:13:32 2006
>-@@ -26,7 +26,7 @@
>+--- GUI/OutputGUI.C.orig	2001-04-19 20:48:10 UTC
>++++ GUI/OutputGUI.C
>+@@ -18,7 +18,7 @@
>+ 
>+ #include "OutputGUI.h"
>+ 
>+-#include <FL/fl_file_chooser.h>
>++#include <FL/Fl_File_Chooser.H>
>+ 
>+ OutputGUI::OutputGUI(Output *o)
>+ {
>+@@ -26,7 +26,7 @@ OutputGUI::OutputGUI(Output *o)
>  	if (!m_out) cerr<<"WARNING: Output not correctly set up"<<endl;
>  }
>  		
>diff --git audio/spiralloops/files/patch-GUI_ScopeGUI.C audio/spiralloops/files/patch-GUI_ScopeGUI.C
>index 3dbf6a2e47f0..bc430d55fc85 100644
>--- audio/spiralloops/files/patch-GUI_ScopeGUI.C
>+++ audio/spiralloops/files/patch-GUI_ScopeGUI.C
>@@ -1,5 +1,5 @@
>---- GUI/ScopeGUI.C.orig	Wed Nov 22 13:08:41 2006
>-+++ GUI/ScopeGUI.C	Wed Nov 22 13:10:26 2006
>+--- GUI/ScopeGUI.C.orig	2001-04-19 20:48:11 UTC
>++++ GUI/ScopeGUI.C
> @@ -23,7 +23,7 @@
>  
>  #include <FL/fl_draw.H>
>@@ -9,7 +9,7 @@
>  Fl_Widget(x,y,w,h,l),
>  m_Channels(1)
>  {
>-@@ -69,7 +69,7 @@
>+@@ -69,7 +69,7 @@ void ScopeGUI::Display(const short *data)
>  	if (!m_Bypass) m_Scope->redraw();
>  }
>  		
>diff --git audio/spiralloops/files/patch-GUI_Widgets_Fl__Knob.cxx audio/spiralloops/files/patch-GUI_Widgets_Fl__Knob.cxx
>index ff53ece651b1..c8755fe88809 100644
>--- audio/spiralloops/files/patch-GUI_Widgets_Fl__Knob.cxx
>+++ audio/spiralloops/files/patch-GUI_Widgets_Fl__Knob.cxx
>@@ -1,5 +1,5 @@
>---- GUI/Widgets/Fl_Knob.cxx.orig	Wed Nov 22 13:14:11 2006
>-+++ GUI/Widgets/Fl_Knob.cxx	Wed Nov 22 13:14:20 2006
>+--- GUI/Widgets/Fl_Knob.cxx.orig	2001-04-19 20:48:10 UTC
>++++ GUI/Widgets/Fl_Knob.cxx
> @@ -4,7 +4,7 @@
>  #include <FL/fl_draw.H>
>  #include <math.h>
>diff --git audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.C audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.C
>index e76be23ef25d..da226e576f30 100644
>--- audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.C
>+++ audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.C
>@@ -1,6 +1,15 @@
>---- GUI/Widgets/Fl_Loop.C.orig	Wed Nov 22 13:15:09 2006
>-+++ GUI/Widgets/Fl_Loop.C	Wed Nov 22 13:15:18 2006
>-@@ -30,7 +30,7 @@
>+--- GUI/Widgets/Fl_Loop.C.orig	2001-04-19 20:48:10 UTC
>++++ GUI/Widgets/Fl_Loop.C
>+@@ -17,7 +17,7 @@
>+ */ 
>+ 
>+ #include "Fl_Loop.h"
>+-#include <iostream.h>
>++#include <iostream>
>+ #include <FL/fl_draw.H>
>+ #include <FL/x.H>
>+ #include <math.h>
>+@@ -30,7 +30,7 @@ static const float RADCONV = 0.017453292;
>  static const int   INDW = 3; // indicator width
>  static const int   UPDATECYCLES = 4;
>  
>diff --git audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.h audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.h
>index b2409524ab5c..a236f59f30c9 100644
>--- audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.h
>+++ audio/spiralloops/files/patch-GUI_Widgets_Fl__Loop.h
>@@ -1,5 +1,5 @@
>---- GUI/Widgets/Fl_Loop.h.orig	Wed Nov 22 13:00:49 2006
>-+++ GUI/Widgets/Fl_Loop.h	Wed Nov 22 13:01:09 2006
>+--- GUI/Widgets/Fl_Loop.h.orig	2001-04-19 20:48:10 UTC
>++++ GUI/Widgets/Fl_Loop.h
> @@ -18,7 +18,7 @@
>  
>  #include <FL/Fl.H>
>diff --git audio/spiralloops/files/patch-GUI_Widgets_Fl__Trigger.C audio/spiralloops/files/patch-GUI_Widgets_Fl__Trigger.C
>index 962301336075..918b30ef3340 100644
>--- audio/spiralloops/files/patch-GUI_Widgets_Fl__Trigger.C
>+++ audio/spiralloops/files/patch-GUI_Widgets_Fl__Trigger.C
>@@ -1,5 +1,14 @@
>---- GUI/Widgets/Fl_Trigger.C.orig	Wed Nov 22 13:17:29 2006
>-+++ GUI/Widgets/Fl_Trigger.C	Wed Nov 22 13:17:36 2006
>+--- GUI/Widgets/Fl_Trigger.C.orig	2001-05-07 20:43:34 UTC
>++++ GUI/Widgets/Fl_Trigger.C
>+@@ -17,7 +17,7 @@
>+ */ 
>+ 
>+ #include "Fl_Trigger.h"
>+-#include <iostream.h>
>++#include <iostream>
>+ #include <FL/fl_draw.H>
>+ #include <math.h>
>+ #include <stdio.h>
> @@ -27,7 +27,7 @@
>  
>  static const float RADCONV = 0.017453292;
>diff --git audio/spiralloops/files/patch-Output.h audio/spiralloops/files/patch-Output.h
>deleted file mode 100644
>index 7e1e465d3fb6..000000000000
>--- audio/spiralloops/files/patch-Output.h
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- ./SpiralSound/Output.h.orig	Sun Dec  1 15:38:45 2002
>-+++ ./SpiralSound/Output.h	Sun Dec  1 15:40:05 2002
>-@@ -20,16 +20,12 @@
>- #include <stdio.h>
>- #include <fcntl.h>
>- #include <unistd.h>
>--#if defined (__FreeBSD__)
>--	#include <machine/soundcard.h>
>--#else
>- #if defined (__NetBSD__) || defined (__OpenBSD__)
>- 	#include <soundcard.h>            /* OSS emulation */
>- #undef ioctl
>--#else 	                              /* BSDI, Linux, Solaris */
>-+#else 	                              /* FreeBSD, BSDI, Linux, Solaris */
>- 	#include <sys/soundcard.h>
>- #endif                                /* __NetBSD__ or __OpenBSD__ */
>--#endif                                /* __FreeBSD__ */
>- #include <sys/ioctl.h>
>- #include <limits.h>
>- 
>diff --git audio/spiralloops/files/patch-SpiralLoops.C audio/spiralloops/files/patch-SpiralLoops.C
>index b715510f23dc..0c6072d09e6c 100644
>--- audio/spiralloops/files/patch-SpiralLoops.C
>+++ audio/spiralloops/files/patch-SpiralLoops.C
>@@ -1,5 +1,14 @@
> --- SpiralLoops.C.orig	2001-04-19 20:48:11 UTC
> +++ SpiralLoops.C
>+@@ -20,7 +20,7 @@
>+ 
>+ #include <FL/Fl.H>
>+ #include <FL/Enumerations.H>
>+-#include <FL/fl_file_chooser.h>
>++#include <FL/Fl_File_Chooser.H>
>+ #include <fstream>
>+ #include <strstream>
>+ #include <string>
> @@ -308,7 +308,7 @@ int Loops::LinkPlugin()
>          Run     = (Sample *(*)()) dlsym(handle, "Run__Fv");
>          
>@@ -9,7 +18,7 @@
>          {
>          	cerr<<"Error linking to plugin:"<<endl;
>  		    fputs(error, stderr);
>-@@ -467,7 +467,7 @@ inline void Loops::cb_Load_i(Fl_Button* 
>+@@ -467,7 +467,7 @@ inline void Loops::cb_Load_i(Fl_Button* o, void* v)
>  {
>  	char *fn=fl_file_chooser("Load a Workspace", "*.lws", NULL);
>  		
>@@ -18,7 +27,7 @@
>  	{
>  		ifstream inf(fn);
>  		
>-@@ -504,7 +504,7 @@ inline void Loops::cb_Save_i(Fl_Button* 
>+@@ -504,7 +504,7 @@ inline void Loops::cb_Save_i(Fl_Button* o, void* v)
>  {
>  	char *fn=fl_file_chooser("Save a Workspace", "*.lws", NULL);
>  		
>diff --git audio/spiralloops/files/patch-SpiralSound_Output.C audio/spiralloops/files/patch-SpiralSound_Output.C
>index ad16b8079a05..9079fedf785b 100644
>--- audio/spiralloops/files/patch-SpiralSound_Output.C
>+++ audio/spiralloops/files/patch-SpiralSound_Output.C
>@@ -1,6 +1,6 @@
>---- SpiralSound/Output.C.orig	Wed Nov 22 13:07:18 2006
>-+++ SpiralSound/Output.C	Wed Nov 22 13:07:30 2006
>-@@ -29,7 +29,7 @@
>+--- SpiralSound/Output.C.orig	2001-04-19 20:48:12 UTC
>++++ SpiralSound/Output.C
>+@@ -29,7 +29,7 @@ m_Channels(Channels)
>  	m_Buffer.Zero();
>  }
>  
>diff --git audio/spiralloops/files/patch-SpiralSound_RiffWav.C audio/spiralloops/files/patch-SpiralSound_RiffWav.C
>index c7d8675edd95..b0bad4715916 100644
>--- audio/spiralloops/files/patch-SpiralSound_RiffWav.C
>+++ audio/spiralloops/files/patch-SpiralSound_RiffWav.C
>@@ -1,6 +1,15 @@
>---- SpiralSound/RiffWav.C.orig	Wed Nov 22 13:07:57 2006
>-+++ SpiralSound/RiffWav.C	Wed Nov 22 13:08:07 2006
>-@@ -55,7 +55,7 @@
>+--- SpiralSound/RiffWav.C.orig	2001-04-19 20:48:12 UTC
>++++ SpiralSound/RiffWav.C
>+@@ -16,7 +16,7 @@
>+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>+ */ 
>+ 
>+-#include <iostream.h>
>++#include <iostream>
>+ #include <fstream>
>+ #include <stdio.h>
>+ #include <stdlib.h>
>+@@ -55,7 +55,7 @@ WavFile::HeaderInfo::HeaderInfo() : RiffStr1("RIFF"),R
>  #endif
>  }
>  
>diff --git audio/spiralloops/files/patch-SpiralSound_Sample.C audio/spiralloops/files/patch-SpiralSound_Sample.C
>index 442bb7fccaf7..5b301fc3cd6c 100644
>--- audio/spiralloops/files/patch-SpiralSound_Sample.C
>+++ audio/spiralloops/files/patch-SpiralSound_Sample.C
>@@ -1,5 +1,5 @@
>---- SpiralSound/Sample.C.orig	Wed Nov 22 13:02:12 2006
>-+++ SpiralSound/Sample.C	Wed Nov 22 13:03:58 2006
>+--- SpiralSound/Sample.C.orig	2001-04-19 20:48:13 UTC
>++++ SpiralSound/Sample.C
> @@ -18,9 +18,9 @@
>  
>  #include <string.h>
>diff --git audio/spiralloops/files/patch-SpiralSound_Sample.h audio/spiralloops/files/patch-SpiralSound_Sample.h
>index 8e4528f5faf2..cec03a113afe 100644
>--- audio/spiralloops/files/patch-SpiralSound_Sample.h
>+++ audio/spiralloops/files/patch-SpiralSound_Sample.h
>@@ -8,7 +8,7 @@
>  #include "SpiralInfo.h"
>  
>  static const unsigned short UMAX_LEV  = 65535;
>-@@ -63,13 +64,13 @@ public:
>+@@ -63,13 +64,13 @@ class Sample (public)
>  	void Shrink(int Length);
>  	void CropTo(int NewLength);
>  
>@@ -24,7 +24,7 @@
>  	{	
>  		assert(i>=0 && i<m_Length);
>  		// clip
>-@@ -79,7 +80,7 @@ public:
>+@@ -79,7 +80,7 @@ class Sample (public)
>  		m_Data[i]=(short)v;
>  	}	
>  	
>diff --git audio/spiralloops/files/patch-SpiralSound_SpiralInfo.C audio/spiralloops/files/patch-SpiralSound_SpiralInfo.C
>index cc924cd5ba15..a031ed558474 100644
>--- audio/spiralloops/files/patch-SpiralSound_SpiralInfo.C
>+++ audio/spiralloops/files/patch-SpiralSound_SpiralInfo.C
>@@ -1,6 +1,14 @@
>---- SpiralSound/SpiralInfo.C.orig	Wed Nov 22 13:05:47 2006
>-+++ SpiralSound/SpiralInfo.C	Wed Nov 22 13:06:04 2006
>-@@ -22,7 +22,7 @@
>+--- SpiralSound/SpiralInfo.C.orig	2001-04-19 20:48:13 UTC
>++++ SpiralSound/SpiralInfo.C
>+@@ -16,13 +16,13 @@
>+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>+ */
>+ 
>+-#include <iostream.h>
>+-#include <fstream.h>
>++#include <iostream>
>++#include <fstream>
>+ #include <stdlib.h>
>  
>  #include "SpiralInfo.h"
>  
>diff --git audio/spiralloops/files/patch-SpiralSound_SpiralInfo.h audio/spiralloops/files/patch-SpiralSound_SpiralInfo.h
>index 64ea41d0aa6d..01315c62fec0 100644
>--- audio/spiralloops/files/patch-SpiralSound_SpiralInfo.h
>+++ audio/spiralloops/files/patch-SpiralSound_SpiralInfo.h
>@@ -1,5 +1,5 @@
>---- SpiralSound/SpiralInfo.h.orig	Wed Nov 22 12:59:01 2006
>-+++ SpiralSound/SpiralInfo.h	Wed Nov 22 13:00:04 2006
>+--- SpiralSound/SpiralInfo.h.orig	2001-04-19 20:48:12 UTC
>++++ SpiralSound/SpiralInfo.h
> @@ -16,13 +16,15 @@
>   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>  */
>diff --git audio/spiralsynthmodular/Makefile audio/spiralsynthmodular/Makefile
>index 80ffd2293a71..728d591fc102 100644
>--- audio/spiralsynthmodular/Makefile
>+++ audio/spiralsynthmodular/Makefile
>@@ -29,36 +29,6 @@ OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
> 
> OPTIMIZED_CFLAGS_CFLAGS=-O3 -ffast-math
> 
>-post-patch:
>-	@${REINPLACE_CMD} -E -e 's@(-O3|-ffast-math)@@g; \
>-		s|-Wall||; \
>-		s|CFLAGS="-pipe|CFLAGS="\$$\{CFLAGS\}|; \
>-		s|CXXFLAGS="-pipe|CXXFLAGS="\$$\{CXXFLAGS\}|; \
>-		s|^SpiralSound/Plugins/MidiPlugin/Makefile||; \
>-		s|MidiPlugin||' \
>-			${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-	@${REINPLACE_CMD} -e 's|-I/usr/X11R6/include|-I${LOCALBASE}/include|' \
>-		${WRKSRC}/SpiralSound/Plugins/LADSPAPlugin/Makefile.in
>-	@${REINPLACE_CMD} -e 's|O_SYNC|O_FSYNC|' \
>-		${WRKSRC}/SpiralSound/Midi.C
>-	@${REINPLACE_CMD} -e 's|True|true|; s|False|false|' \
>-		${WRKSRC}/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
>-	@${REINPLACE_CMD} -e 's|JackPort::||' \
>-		${WRKSRC}/SpiralSound/Plugins/JackPlugin/JackPlugin.h
>-	@${REINPLACE_CMD} -e 's|CVGUI::||' \
>-		${WRKSRC}/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h
>-	@${REINPLACE_CMD} -e 's|Sample::||' \
>-		${WRKSRC}/SpiralSound/Sample.h
>-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -E -e \
>-		's,-l(dl|rt),,; s|g\+\+|$$(CXX)|; \
>-		/^(CC|CXX)[[:space:]]*=.+$$/d; \
>-		s,@FLTK_(C|CXX)FLAGS@,-I${LOCALBASE}/include,; \
>-		s,(bin|lib)dir),DESTDIR)$$(&,'
>-	@${FIND} ${WRKSRC} -type f -name "*.C" -o -name "*.cpp" -o -name "*.h" \
>-		| ${XARGS} ${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; \
>-		/^#include "FL/s|.h"$$|.H"|; \
>-		s|fl_file_chooser.H|Fl_File_Chooser.H|g'
>-
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/SpiralPlugins/*.so
>diff --git audio/spiralsynthmodular/files/patch-SpiralSound_PluginManager.C audio/spiralsynthmodular/files/patch-SpiralSound_PluginManager.C
>index 00496ebe1139..4c004fe38654 100644
>--- audio/spiralsynthmodular/files/patch-SpiralSound_PluginManager.C
>+++ audio/spiralsynthmodular/files/patch-SpiralSound_PluginManager.C
>@@ -1,6 +1,6 @@
> --- SpiralSound/PluginManager.C.orig	2003-08-08 13:07:30 UTC
> +++ SpiralSound/PluginManager.C
>-@@ -49,7 +49,7 @@ PluginID PluginManager::LoadPlugin(const
>+@@ -49,7 +49,7 @@ PluginID PluginManager::LoadPlugin(const char *PluginN
>      }
>  		
>  	// Link the neccesary functions 
>@@ -9,7 +9,7 @@
>  	
>  	NewPlugin->CreateInstance  = (SpiralPlugin*(*)()) dlsym(NewPlugin->Handle, "SpiralPlugin_CreateInstance"); 	
>  	
>-@@ -98,7 +98,7 @@ void PluginManager::UnLoadPlugin(PluginI
>+@@ -98,7 +98,7 @@ void PluginManager::UnLoadPlugin(PluginID ID)
>  	if (IsValid(ID))
>      {
>  		dlclose(GetPlugin(ID)->Handle);
>diff --git audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_LADSPAPlugin_LADSPAInfo.h audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_LADSPAPlugin_LADSPAInfo.h
>index 13fd3a1b8480..cab3969d2412 100644
>--- audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_LADSPAPlugin_LADSPAInfo.h
>+++ audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_LADSPAPlugin_LADSPAInfo.h
>@@ -1,6 +1,6 @@
> --- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h.orig	2003-06-05 18:26:42 UTC
> +++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h
>-@@ -91,7 +91,7 @@ public:
>+@@ -91,7 +91,7 @@ class LADSPAInfo (public)
>  		unsigned long   UniqueID;
>  		std::string     Name;
>  
>diff --git audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_OutputPlugin_OutputPlugin.C audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_OutputPlugin_OutputPlugin.C
>index 492a817892f6..a0cb302c21c9 100644
>--- audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_OutputPlugin_OutputPlugin.C
>+++ audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_OutputPlugin_OutputPlugin.C
>@@ -17,3 +17,12 @@
>  #else
>  #if defined (__NetBSD__) || defined (__OpenBSD__)
>  	#include <soundcard.h>            /* OSS emulation */
>+@@ -41,7 +42,7 @@
>+ 
>+ #include "OutputPlugin.h"
>+ #include "OutputPluginGUI.h"
>+-#include <FL/fl_file_chooser.H>
>++#include <FL/Fl_File_Chooser.H>
>+ #include "SpiralIcon.xpm"
>+ 
>+ using namespace std;
>diff --git audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C
>index 18f198c917c1..b912ecc1e5ef 100644
>--- audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C
>+++ audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C
>@@ -1,5 +1,17 @@
>---- SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C.orig	2018-08-01 05:59:24 UTC
>+--- SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C.orig	2003-08-08 17:55:51 UTC
> +++ SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C
>+@@ -17,9 +17,9 @@
>+ */
>+ 
>+ #include "PoshSamplerPluginGUI.h"
>+-#include <FL/fl_draw.h>
>+ #include <FL/fl_draw.H>
>+-#include <FL/fl_file_chooser.h>
>++#include <FL/fl_draw.H>
>++#include <FL/Fl_File_Chooser.H>
>+ 
>+ using namespace std;
>+ 
> @@ -502,7 +502,7 @@ inline void PoshSamplerPluginGUI::cb_Load_i(Fl_Button*
>  { 
>  	char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL);
>diff --git audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C
>index 78c1e199fa32..34cfcb715c74 100644
>--- audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C
>+++ audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C
>@@ -1,5 +1,17 @@
>---- SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C.orig	2018-08-01 06:00:29 UTC
>+--- SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C.orig	2003-08-08 17:55:52 UTC
> +++ SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C
>+@@ -17,9 +17,9 @@
>+ */
>+ 
>+ #include "SpiralLoopPluginGUI.h"
>+-#include <FL/fl_draw.h>
>+ #include <FL/fl_draw.H>
>+-#include <FL/fl_file_chooser.h>
>++#include <FL/fl_draw.H>
>++#include <FL/Fl_File_Chooser.H>
>+ 
>+ using namespace std;
>+ 
> @@ -350,7 +350,7 @@ inline void SpiralLoopPluginGUI::cb_Load_i(Fl_Button* 
>  {
>  	char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL);
>diff --git audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C
>index c7d85d41934e..00f4e03faa4b 100644
>--- audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C
>+++ audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C
>@@ -1,5 +1,17 @@
>---- SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C.orig	2018-08-01 06:01:08 UTC
>+--- SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C.orig	2003-08-08 17:55:52 UTC
> +++ SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C
>+@@ -17,9 +17,9 @@
>+ */
>+ 
>+ #include "StreamPluginGUI.h"
>+-#include <FL/fl_draw.h>
>+ #include <FL/fl_draw.H>
>+-#include <FL/fl_file_chooser.h>
>++#include <FL/fl_draw.H>
>++#include <FL/Fl_File_Chooser.H>
>+ 
>+ using namespace std;
>+ 
> @@ -220,7 +220,7 @@ void StreamPluginGUI::cb_Pos (Fl_Slider* o, void* v) {
>  
>  inline void StreamPluginGUI::cb_Load_i (Fl_Button* o, void* v) {
>diff --git audio/spiralsynthmodular/files/patch-SpiralSynthModular.C audio/spiralsynthmodular/files/patch-SpiralSynthModular.C
>index 67c270f896ef..4e28c2ab4f25 100644
>--- audio/spiralsynthmodular/files/patch-SpiralSynthModular.C
>+++ audio/spiralsynthmodular/files/patch-SpiralSynthModular.C
>@@ -1,9 +1,18 @@
>-SpiralSynthModular.C:1016:14: error: comparison between pointer and integer ('char *' and 'int')
>-        if (fn && fn!='\0')
>-                  ~~^ ~~~~
>-
>---- SpiralSynthModular.C.orig	2018-08-01 05:55:58 UTC
>+--- SpiralSynthModular.C.orig	2004-03-20 09:52:38 UTC
> +++ SpiralSynthModular.C
>+@@ -27,9 +27,9 @@
>+ 
>+ #include <FL/Fl.H>
>+ #include <FL/Enumerations.H>
>+-#include <FL/fl_file_chooser.h>
>+-#include <FL/Fl_Box.h>
>+-#include <FL/Fl_Tooltip.h>
>++#include <FL/Fl_File_Chooser.H>
>++#include <FL/Fl_Box.H>
>++#include <FL/Fl_Tooltip.H>
>+ 
>+ #include "SpiralSynthModular.h"
>+ #include "SpiralSound/PluginManager.h"
> @@ -1013,7 +1013,7 @@ inline void SynthModular::cb_Load_i(Fl_Button* o, void
>  
>  	char *fn=fl_file_chooser("Load a patch", "*.ssm", NULL);
>diff --git audio/spiralsynthmodular/files/patch-gcc46 audio/spiralsynthmodular/files/patch-gcc46
>deleted file mode 100644
>index 1b0e84d66f6c..000000000000
>--- audio/spiralsynthmodular/files/patch-gcc46
>+++ /dev/null
>@@ -1,32 +0,0 @@
>---- SpiralSound/ChannelHandler.C.orig	2003-02-21 00:51:15 UTC
>-+++ SpiralSound/ChannelHandler.C
>-@@ -19,6 +19,9 @@
>- #include "ChannelHandler.h"
>- #include <unistd.h>
>- 
>-+#include <cstdlib>
>-+#include <cstring>
>-+
>- using namespace std;
>- 
>- //#define CHANNEL_DEBUG
>---- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C.orig	2003-08-08 17:58:26 UTC
>-+++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C
>-@@ -30,6 +30,7 @@
>- #include <stdio.h>
>- 
>- #include <cstdlib>
>-+#include <cstring>
>- #include <sys/types.h>
>- #include <sys/stat.h>
>- #include <dirent.h>
>---- SpiralSound/Sample.h.orig	2003-07-22 22:08:41 UTC
>-+++ SpiralSound/Sample.h
>-@@ -23,6 +23,7 @@
>- 
>- #include <assert.h>
>- #include <limits.h>
>-+#include <cstring>
>- #include <iostream>
>- 
>- //#define DEBUG
>diff --git audio/squash/files/patch-src_play__flac.c audio/squash/files/patch-src_play__flac.c
>index b9925d280e15..f3c3fb7d02e3 100644
>--- audio/squash/files/patch-src_play__flac.c
>+++ audio/squash/files/patch-src_play__flac.c
>@@ -9,7 +9,7 @@
>      /* errors?  we don't need no stinking errors */
>      return;
>  }
>-@@ -36,47 +36,26 @@ void flac_error_callback(const FLAC__Fil
>+@@ -36,47 +36,26 @@ void flac_error_callback(const FLAC__FileDecoder *deco
>   */
>  void *flac_open( char *filename, sound_format_t *sound_format ) {
>      flac_data_t *flac_data;
>@@ -63,7 +63,7 @@
>              break;
>      }
>  
>-@@ -86,7 +65,7 @@ void *flac_open( char *filename, sound_f
>+@@ -86,7 +65,7 @@ void *flac_open( char *filename, sound_format_t *sound
>      flac_data->sample_rate = -1;
>      flac_data->duration = -1;
>  
>@@ -72,7 +72,7 @@
>  
>      sound_format->rate = flac_data->sample_rate;
>      sound_format->channels = flac_data->channels;
>-@@ -97,12 +76,12 @@ void *flac_open( char *filename, sound_f
>+@@ -97,12 +76,12 @@ void *flac_open( char *filename, sound_format_t *sound
>      return (void *)flac_data;
>  }
>  
>@@ -87,7 +87,7 @@
>      FLAC__StreamMetadata_VorbisComment comment = metadata->data.vorbis_comment;
>      int i;
>      char *start, *end, *key, *value;
>-@@ -128,7 +107,7 @@ void flac_metadata_callback_load_meta( c
>+@@ -128,7 +107,7 @@ void flac_metadata_callback_load_meta( const FLAC__Fil
>      }
>  }
>  
>@@ -96,7 +96,7 @@
>      flac_data_t *flac_data = (flac_data_t *)client_data;
>      int i, j, k;
>  
>-@@ -158,7 +137,7 @@ FLAC__StreamDecoderWriteStatus flac_writ
>+@@ -158,7 +137,7 @@ FLAC__StreamDecoderWriteStatus flac_write_callback_dec
>      return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
>  }
>  
>@@ -105,7 +105,7 @@
>      flac_data_t *flac_data = (flac_data_t *)client_data;
>  
>      if( metadata->type != FLAC__METADATA_TYPE_STREAMINFO ) {
>-@@ -172,47 +151,29 @@ void flac_metadata_callback_decode_frame
>+@@ -172,47 +151,29 @@ void flac_metadata_callback_decode_frame( const FLAC__
>  }
>  
>  void flac_load_meta( void *data, char *filename ) {
>@@ -122,7 +122,8 @@
> -    if( !FLAC__file_decoder_set_filename( decoder, filename ) ) {
> -        squash_error( "Unable to set filename in decoder" );
> -    }
>--
>++    FLAC__stream_decoder_set_metadata_respond_all( decoder );
>+ 
> -    FLAC__file_decoder_set_metadata_callback( decoder, flac_metadata_callback_load_meta );
> -    FLAC__file_decoder_set_metadata_respond_all( decoder );
> -
>@@ -131,8 +132,7 @@
> -    FLAC__file_decoder_set_error_callback( decoder, flac_error_callback );
> -
> -    FLAC__file_decoder_set_client_data( decoder, data );
>-+    FLAC__stream_decoder_set_metadata_respond_all( decoder );
>- 
>+-
> -    state = FLAC__file_decoder_init( decoder );
> +    state = FLAC__stream_decoder_init_file( decoder, filename,  flac_write_callback_load_meta, flac_metadata_callback_load_meta, flac_error_callback, data );
>      switch( state ) {
>@@ -164,7 +164,7 @@
>  
>      return;
>  }
>-@@ -223,29 +184,27 @@ void flac_load_meta( void *data, char *f
>+@@ -223,29 +184,27 @@ void flac_load_meta( void *data, char *filename ) {
>  frame_data_t flac_decode_frame( void *data ) {
>      flac_data_t *flac_data = (flac_data_t *)data;
>      frame_data_t frame_data;
>@@ -214,7 +214,7 @@
>      return;
>  }
>  
>-@@ -277,9 +236,9 @@ void flac_seek( void *data, long seek_ti
>+@@ -277,9 +236,9 @@ void flac_seek( void *data, long seek_time, long durat
>  void flac_close( void *data ) {
>      flac_data_t *flac_data = (flac_data_t *)data;
>  
>diff --git audio/vitunes/Makefile audio/vitunes/Makefile
>index 4ed36542d399..dde1edf9cb28 100644
>--- audio/vitunes/Makefile
>+++ audio/vitunes/Makefile
>@@ -18,10 +18,10 @@ LIB_DEPENDS=	libtag.so:audio/taglib
> 
> USES=		ncurses
> ALL_TARGET=	vitunes
>+MAKE_ARGS=	PREFIX=${PREFIX}
> PLIST_FILES=	bin/vitunes man/man1/${PORTNAME}.1.gz
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile
> 	@${REINPLACE_CMD} -e '27d' ${WRKSRC}/vitunes.h
> 
> .include <bsd.port.mk>
>diff --git biology/avida/Makefile biology/avida/Makefile
>index f7798bb70728..f76a0dd25627 100644
>--- biology/avida/Makefile
>+++ biology/avida/Makefile
>@@ -40,16 +40,6 @@ DATA_FILES=	analyze.cfg avida.cfg default-gx.org \
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${FIND} ${WRKSRC} -name "CMakeLists.txt" | ${XARGS} \
>-		${REINPLACE_CMD} -e \
>-		's|-O[0-9]|| ; \
>-		 s| pthread| -pthread|'
>-	@${REINPLACE_CMD} -e '/long long int/s|std::abs|llabs|' \
>-		${WRKSRC}/avida-core/source/main/cPopulationInterface.cc
>-	@${REINPLACE_CMD} -e '/__PPC__/s|linux|${OPSYS}|' \
>-		${WRKSRC}/libs/tcmalloc-1.4/src/atomicops.h
>-
> pre-build:
> .for exec in ${BIN_FILES}
> 	@(cd ${WRKSRC} && ${ECHO_CMD} \
>diff --git biology/avida/files/patch-avida-core__source__main__cGenomeUtil.cc biology/avida/files/patch-avida-core__source__main__cGenomeUtil.cc
>deleted file mode 100644
>index 0aef270a88ce..000000000000
>--- biology/avida/files/patch-avida-core__source__main__cGenomeUtil.cc
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- avida-core/source/main/cGenomeUtil.cc.orig
>-+++ avida-core/source/main/cGenomeUtil.cc
>-@@ -214,7 +214,14 @@
>-  */
>- void cGenomeUtil::RandomShuffle(cAvidaContext& ctx, Sequence& genome) {
>- 	std::vector<int> idx(static_cast<std::size_t>(genome.GetSize()));
>--	std::iota(idx.begin(), idx.end(), 0);
>-+
>-+	std::vector<int>::iterator idx_it = idx.begin();
>-+	int value = 0;
>-+	while (idx_it != idx.end()) {
>-+		*idx_it++ = value;
>-+		++value;
>-+	}
>-+
>- 	cRandomStdAdaptor rng(ctx.GetRandom());
>- 	std::random_shuffle(idx.begin(), idx.end(), rng);
>- 	Sequence shuffled(genome.GetSize());
>diff --git biology/avida/files/patch-avida-core__source__tools__tArray.h biology/avida/files/patch-avida-core__source__tools__tArray.h
>deleted file mode 100644
>index 7c08bbe7f152..000000000000
>--- biology/avida/files/patch-avida-core__source__tools__tArray.h
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- avida-core/source/tools/tArray.h.orig
>-+++ avida-core/source/tools/tArray.h
>-@@ -23,6 +23,7 @@
>- #ifndef tArray_h
>- #define tArray_h
>- 
>-+#include <cstdlib>
>- #include <cassert>
>- 
>- #ifndef NULL
>diff --git biology/avida/files/patch-libs__tcmalloc-1.4__src__malloc_extension.cc biology/avida/files/patch-libs__tcmalloc-1.4__src__malloc_extension.cc
>deleted file mode 100644
>index 7134dc16aea3..000000000000
>--- biology/avida/files/patch-libs__tcmalloc-1.4__src__malloc_extension.cc
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- libs/tcmalloc-1.4/src/malloc_extension.cc.orig
>-+++ libs/tcmalloc-1.4/src/malloc_extension.cc
>-@@ -57,6 +57,7 @@
>- #include <string.h>
>- #include <stdio.h>
>- #include <stdlib.h>
>-+#include <pthread.h>
>- #if defined HAVE_STDINT_H
>- #include <stdint.h>
>- #elif defined HAVE_INTTYPES_H
>diff --git biology/avida/files/patch-libs_apto_include_apto_core_Atomic.h biology/avida/files/patch-libs_apto_include_apto_core_Atomic.h
>index 0c1ef0eeb909..7dded0dc5e4a 100644
>--- biology/avida/files/patch-libs_apto_include_apto_core_Atomic.h
>+++ biology/avida/files/patch-libs_apto_include_apto_core_Atomic.h
>@@ -1,6 +1,6 @@
> --- libs/apto/include/apto/core/Atomic.h.orig	2012-09-29 03:33:38 UTC
> +++ libs/apto/include/apto/core/Atomic.h
>-@@ -88,6 +88,25 @@ inline void Apto::Atomic::Set(volatile i
>+@@ -88,6 +88,25 @@ inline void Apto::Atomic::Set(volatile int* atomic, in
>    *atomic = value;
>  }
>  
>diff --git biology/lagan/Makefile biology/lagan/Makefile
>index b4d2f7b8df37..7caf31662d07 100644
>--- biology/lagan/Makefile
>+++ biology/lagan/Makefile
>@@ -44,16 +44,6 @@ SCRIPTUTILS=	cmerge2.pl draft.pl mextract.pl mf2bin.pl mpretty.pl \
> READMES=	README.FIRST README.chaos README.lagan README.mlagan \
> 		README.tools README.shuffle
> 
>-post-patch:
>-	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
>-		'/^CC/s|^|#| ; \
>-		 /^CFLAGS/s|^|#| ; \
>-		 s|$$(CC) -o|$$(CC) $$(CFLAGS) -o| ; \
>-		 s|$$(CPP) -o|$$(CXX) $$(CXXFLAGS) -o| ; \
>-		 s|$$(CLINKER) $$(OPTFLAGS)|$$(CXX) $$(LDFLAGS)|'
>-	@${FIND} ${WRKSRC}/src -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|^inline |static inline |'
>-
> do-install:
> 	@${MKDIR} ${STAGEDIR}${LAGAN_DIR}
> .for exe in ${EXECUTABLES}
>diff --git biology/lagan/files/patch-src__glocal__rightinfluence.cpp biology/lagan/files/patch-src__glocal__rightinfluence.cpp
>deleted file mode 100644
>index dd8edd2e0350..000000000000
>--- biology/lagan/files/patch-src__glocal__rightinfluence.cpp
>+++ /dev/null
>@@ -1,33 +0,0 @@
>---- src/glocal/rightinfluence.cpp.orig	2006-09-14 20:40:19 UTC
>-+++ src/glocal/rightinfluence.cpp
>-@@ -1,6 +1,6 @@
>- #include <rightinfluence.h>
>- 
>--Fragment origin, end;
>-+Fragment origin, my_end;
>- 
>- // Sets the first default owner of the whole region
>- void initRI(RI *RightInfluence, long long int scoreIndex) {
>-@@ -18,17 +18,17 @@ void initRI(RI *RightInfluence, long lon
>- 
>- 	// hack to aid winner selection
>- 	origin.score = -1;
>--	end.score = -2;
>--	origin.totalScore = end.totalScore = 0;
>-+	my_end.score = -2;
>-+	origin.totalScore = my_end.totalScore = 0;
>- 
>- 	// will win against anyone
>--	end.seq1End = 0; end.seq2End = 0;
>--	end.seq1Start = 0; end.seq2Start = 0;
>-+	my_end.seq1End = 0; my_end.seq2End = 0;
>-+	my_end.seq1Start = 0; my_end.seq2Start = 0;
>- 
>- 	origin.back = NULL;
>- 
>-     RightInfluence->act[-INF] = &origin;
>--    RightInfluence->act[+INF] = &end;
>-+    RightInfluence->act[+INF] = &my_end;
>- }
>- 
>- 
>diff --git biology/lagan/files/patch-src__glocal__score.cpp biology/lagan/files/patch-src__glocal__score.cpp
>deleted file mode 100644
>index 0360397cacbc..000000000000
>--- biology/lagan/files/patch-src__glocal__score.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/glocal/score.cpp.orig	2006-09-14 20:40:19 UTC
>-+++ src/glocal/score.cpp
>-@@ -2,7 +2,7 @@
>- #include<score.h>
>- #include<leftinfluence.h>
>- #include<rightinfluence.h>
>--#include<fstream.h>
>-+#include<fstream>
>- 
>- extern vector<class Score*> scoreFunctions[1<<(UPSTRANDBITS+DOWNSTRANDBITS+RELPOSBITS)];
>- 
>diff --git biology/lagan/files/patch-src__utils__Glue.cpp biology/lagan/files/patch-src__utils__Glue.cpp
>deleted file mode 100644
>index bce5c336a1aa..000000000000
>--- biology/lagan/files/patch-src__utils__Glue.cpp
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- src/utils/Glue.cpp.orig	2006-09-14 20:40:18 UTC
>-+++ src/utils/Glue.cpp
>-@@ -6,6 +6,7 @@
>- #include <fstream>
>- #include <iostream>
>- #include <algorithm>
>-+#include <cstring>
>- 
>- #define NUCLEOTIDE_MATRIX_FILE "nucmatrix.txt"
>- #define MAX_LINE_LENGTH 1024
>diff --git biology/lagan/files/patch-src_anchors.c biology/lagan/files/patch-src_anchors.c
>index 00b9f66ac060..9c9dbce9e69d 100644
>--- biology/lagan/files/patch-src_anchors.c
>+++ biology/lagan/files/patch-src_anchors.c
>@@ -1,4 +1,4 @@
>---- src/anchors.c.orig	2016-05-11 21:46:55 UTC
>+--- src/anchors.c.orig	2006-09-14 20:40:19 UTC
> +++ src/anchors.c
> @@ -225,7 +225,7 @@ char* rolltonum(char* str) {
>    return &str[i];
>@@ -9,7 +9,7 @@
>    char temp[1024];
>    char* help;
>    int z, h;
>-@@ -248,7 +248,7 @@ hll* parseCHAOS(FILE* infile, int* totnu
>+@@ -248,7 +248,7 @@ hll* parseCHAOS(FILE* infile, int* totnum) {
>    *totnum = 0;
>    while(!feof(infile)) {
>      tt = (hll*) malloc(sizeof(hll));
>diff --git biology/phyml/Makefile biology/phyml/Makefile
>index e2383eaded5f..b7debff72b34 100644
>--- biology/phyml/Makefile
>+++ biology/phyml/Makefile
>@@ -19,7 +19,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	stephaneguindon
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--disable-beagle --disable-native
>+CONFIGURE_ARGS=	--disable-native
> 
> PLIST_FILES=	bin/phyml${BIN_SUFFIX}
> PORTDOCS=	*
>@@ -45,14 +45,6 @@ CONFIGURE_ARGS+=	--disable-mpi
> BIN_SUFFIX=		# none
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|-O2 .* $${ARCH_flag}|$${CFLAGS}|' ${WRKSRC}/configure.ac
>-.if ${ARCH} != amd64 && ${ARCH} != i386
>-	@${REINPLACE_CMD} -e 's|VECTOR_FLAG=-march=native|dnl &|' ${WRKSRC}/configure.ac
>-.endif
>-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/utilities.h
>-
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} *.pdf \
>diff --git biology/wise/Makefile biology/wise/Makefile
>index 651c8a402ec0..b4f0a48d958e 100644
>--- biology/wise/Makefile
>+++ biology/wise/Makefile
>@@ -43,18 +43,6 @@ PLIST_FILES=	${BINFILES:S,^,bin/,} ${DATAFILES:S,^,%%DATADIR%%/,}
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-post-patch:
>-	@${FIND} ${BUILD_WRKSRC} -name "makefile" | ${XARGS} \
>-		${REINPLACE_CMD} -e \
>-		's|^CC =|CC ?=| ; \
>-		 s|^CFLAGS =|CFLAGS +=| ; \
>-		 s|-O[0-9] | | ; \
>-		 s|-g | | ; \
>-		 s|-g[0-9] | | ; \
>-		 s|-lpthread|-pthread| ; \
>-		 s|glib-config|pkg-config glib-2.0| ; \
>-		 /welcome.csh/s|^|#|'
>-
> do-install:
> 	(cd ${BUILD_WRKSRC}/bin && ${INSTALL_PROGRAM} ${BINFILES} \
> 		${STAGEDIR}${PREFIX}/bin)
>diff --git cad/alliance/Makefile cad/alliance/Makefile
>index 67d5001890a9..42214392fc8f 100644
>--- cad/alliance/Makefile
>+++ cad/alliance/Makefile
>@@ -43,16 +43,6 @@ WRKSRC=		${WRKDIR}/alliance/src
> 
> ALLIANCE_TOP=	${PREFIX}/alliance
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e '/include <malloc.h>/d' \
>-		${WRKSRC}/xgra/src/XSB_parse.c
>-	# These Makefiles contain hardcoded references to make(1). Replace them with
>-	# gmake(1) to avoid build failures of the documentation.
>-	@${REINPLACE_CMD} -e 's/; make/; gmake/' \
>-		${WRKSRC}/documentation/Makefile.am \
>-		${WRKSRC}/documentation/alliance-examples/Makefile \
>-		${WRKSRC}/documentation/tutorials/Makefile.am
>-
> pre-configure:
> 	@cd ${WRKSRC} && ./autostuff
> 
>diff --git cad/gnucap/Makefile cad/gnucap/Makefile
>index 193308040202..02a3b7b98e8b 100644
>--- cad/gnucap/Makefile
>+++ cad/gnucap/Makefile
>@@ -22,22 +22,27 @@ USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	prefix=${STAGEDIR}${PREFIX}
> 
>-MAKE_ARGS=	CCFLAGS="${CXXFLAGS}" CCC=c++
>+MAKE_ARGS=	CCC=c++ \
>+		CCFLAGS="${CXXFLAGS}"
> CXXFLAGS+=	-fPIC -I${PREFIX}/include -I${WRKSRC}/include
> ALL_TARGET=	gnucap
> 
>-PLIST_FILES=	bin/gnucap bin/gnucap-modelgen \
>+PLIST_FILES=	bin/gnucap \
>+		bin/gnucap-modelgen \
> 		lib/libgnucap-default-plugins.so \
> 		lib/libgnucap.so
> 
> PORTDOCS=	README
>-EXAMPLES=	runl *c *.ckt *.doc
>+EXAMPLES=	*.ckt *.doc *c runl
> 
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>-	${FIND} -s ${WRKSRC} -name 'configure'|${XARGS} \
>-		${REINPLACE_CMD} -e 's|g++|${CXX}|g'
>+	@${REINPLACE_CMD} 's/%%CXX%%/${CXX}/g' \
>+		${WRKSRC}/main/configure \
>+		${WRKSRC}/apps/configure \
>+		${WRKSRC}/modelgen/configure \
>+		${WRKSRC}/lib/configure
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/main/O/gnucap ${WRKSRC}/modelgen/O/gnucap-modelgen \
>diff --git cad/kicad/Makefile cad/kicad/Makefile
>index 66b6438339e2..9ab4c5251c76 100644
>--- cad/kicad/Makefile
>+++ cad/kicad/Makefile
>@@ -23,9 +23,11 @@ LIB_DEPENDS=	libboost_thread.so:devel/boost-libs	\
> 
> CONFLICTS=	kicad-devel-r201*
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	KiCad
>-GH_PROJECT=	kicad-source-mirror
>+USE_GITLAB=	yes
>+GL_ACCOUNT=	kicad
>+GL_PROJECT=	code/kicad
>+GL_COMMIT=      bd23d003d219cb513b01feb4d9763879c9248f53
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${GL_COMMIT}-${GL_COMMIT}
> 
> USES=		cmake:noninja compiler:c++11-lib desktop-file-utils gl \
> 		gnome pkgconfig python:3.5+ shared-mime-info shebangfix ssl \
>diff --git cad/kicad/distinfo cad/kicad/distinfo
>index 1eb3c00cd9ba..781c327a3452 100644
>--- cad/kicad/distinfo
>+++ cad/kicad/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1589226804
>-SHA256 (KiCad-kicad-source-mirror-5.1.6_GH0.tar.gz) = caf54b256f17171d4be57c1905ab6a0d3bce1de7226e1f9b152c6501507cad52
>-SIZE (KiCad-kicad-source-mirror-5.1.6_GH0.tar.gz) = 23789922
>+TIMESTAMP = 1599528435
>+SHA256 (kicad-code/kicad-bd23d003d219cb513b01feb4d9763879c9248f53_GL0.tar.gz) = 9d444a7002a2e1a52e79dd08143b2f271801930f6972dcddd9263989de6bd7f5
>+SIZE (kicad-code/kicad-bd23d003d219cb513b01feb4d9763879c9248f53_GL0.tar.gz) = 28805890
>diff --git cad/solvespace/Makefile cad/solvespace/Makefile
>index 9ce37807dda4..83b3e6cf53a9 100644
>--- cad/solvespace/Makefile
>+++ cad/solvespace/Makefile
>@@ -6,7 +6,7 @@ DISTVERSIONPREFIX=	v
> PORTREVISION=	5
> CATEGORIES=	cad
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Parametric 2d/3d CAD
> 
> LICENSE=	GPLv3+
>diff --git chinese/lunar/Makefile chinese/lunar/Makefile
>index dfff240c566c..7ad79c5ace37 100644
>--- chinese/lunar/Makefile
>+++ chinese/lunar/Makefile
>@@ -12,6 +12,8 @@ COMMENT=	Convert between Gregorian Solar Calendar (SC) and Lunar Calendar (LC)
> 
> ALL_TARGET=
> 
>+PLIST_FILES=	bin/lunar man/man1/lunar.1.gz share/chinese/lunar.bitmap
>+
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/chinese
> 	${INSTALL_PROGRAM} ${WRKSRC}/lunar ${STAGEDIR}${PREFIX}/bin
>diff --git chinese/lunar/files/patch-Makefile chinese/lunar/files/patch-Makefile
>index 0dc60ddb76fd..8a62bcae8463 100644
>--- chinese/lunar/files/patch-Makefile
>+++ chinese/lunar/files/patch-Makefile
>@@ -1,5 +1,5 @@
>---- Makefile.orig	Mon Aug 10 21:14:48 1992
>-+++ Makefile	Tue Feb  4 01:20:50 1997
>+--- Makefile.orig	2020-01-26 19:55:51 UTC
>++++ Makefile
> @@ -1,6 +1,8 @@
>  # Makefile of LUNAR
>  
>diff --git chinese/lunar/files/patch-lunar.1 chinese/lunar/files/patch-lunar.1
>index ca01fe067074..003127f755ce 100644
>--- chinese/lunar/files/patch-lunar.1
>+++ chinese/lunar/files/patch-lunar.1
>@@ -1,6 +1,6 @@
>---- lunar.1.orig	Tue Aug 11 12:14:48 1992
>-+++ lunar.1	Tue Feb 26 21:00:38 2002
>-@@ -4,13 +4,15 @@
>+--- lunar.1.orig	2020-01-26 19:55:51 UTC
>++++ lunar.1
>+@@ -4,13 +4,15 @@ lunar (version 2.1) \- a calendar conversion utility
>  .SH SYNTAX
>  .B lunar
>  [
>@@ -20,7 +20,7 @@
>  ]
>  .I year month day
>  [
>-@@ -56,14 +58,16 @@
>+@@ -56,14 +58,16 @@ For example, "jia-zi" is 1, "yi-chou" is 2, and so on.
>  The ganzhi of the j-th leap month is the same as that of the j-th month.
>  
>  The possible options are
>diff --git chinese/lunar/files/patch-lunar.c_1 chinese/lunar/files/patch-lunar.c_1
>deleted file mode 100644
>index 8667e0ba005e..000000000000
>--- chinese/lunar/files/patch-lunar.c_1
>+++ /dev/null
>@@ -1,22 +0,0 @@
>---- lunar.c.orig	Mon Aug 10 21:14:48 1992
>-+++ lunar.c	Tue Feb  4 01:04:18 1997
>-@@ -60,6 +60,10 @@
>- #define	GanBM	4
>- #define	ZhiBM	14
>- 
>-+#ifndef BITMAPFILE
>-+#define BITMAPFILE "lunar.bitmap"
>-+#endif
>-+
>- typedef struct {
>- int year, month, day, hour, weekday;
>- int leap;	/* the lunar month is a leap month */
>-@@ -124,7 +128,7 @@
>- 
>- int	showHZ = 0;			/* output in hanzi */
>- int	showBM = 0;			/* output in bitmap */
>--char	BMfile[] = "lunar.bitmap";	/* bit map file */
>-+char	BMfile[] = BITMAPFILE;	/* bit map file */
>- char	GZBM[NBM][BMRow][BMCol];	/* the bitmap array */
>- char	*progname;
>- 
>diff --git chinese/lunar/files/patch-lunar.c_2 chinese/lunar/files/patch-lunar.c_2
>deleted file mode 100644
>index a8e4d08932a2..000000000000
>--- chinese/lunar/files/patch-lunar.c_2
>+++ /dev/null
>@@ -1,120 +0,0 @@
>---- lunar.c.orig	Tue Feb 26 20:54:23 2002
>-+++ lunar.c	Tue Feb 26 21:01:38 2002
>-@@ -118,6 +118,26 @@
>-     "ËÄ", "Îå", "Áù"
>- };
>- 
>-+static	char	*GanBIG5[] = {
>-+    "¥Ò", "¤A", "¤þ", "¤B", "¥³",
>-+    "¤v", "©°", "¨¯", "¤Ð", "¬Ñ"
>-+};
>-+
>-+static	char	*ZhiBIG5[] = {
>-+    "¤l", "¤¡", "±G", "¥f", "¨°", "¤x",
>-+    "¤È", "¥¼", "¥Ó", "¨»", "¦¦", "¥è"
>-+};
>-+
>-+static	char   *ShengXiaoBIG5[] = {
>-+    "¹«", "¤û", "ªê", "¨ß", "Às", "³D",
>-+    "°¨", "¦Ï", "µU", "Âû", "ª¯", "½Þ"
>-+};
>-+
>-+static char *weekdayBIG5[] = {
>-+    "¤é", "¤@", "¤G", "¤T",
>-+    "¥|", "¤", "¤»"
>-+};
>-+
>- 
>- Date solar, lunar, gan, zhi, gan2, zhi2, lunar2;
>- 
>-@@ -127,6 +147,7 @@
>- int jieAlert;		/* if there is uncertainty in JieQi calculation */
>- 
>- int	showHZ = 0;			/* output in hanzi */
>-+int	showB5 = 0;			/* output in big5 */
>- int	showBM = 0;			/* output in bitmap */
>- char	BMfile[] = BITMAPFILE;	/* bit map file */
>- char	GZBM[NBM][BMRow][BMCol];	/* the bitmap array */
>-@@ -139,7 +160,7 @@
>- void	CalGZ();
>- int	JieDate(), JieDate();
>- void    readBM(), display3();
>--void	Report(), ReportE(), ReportBM(), ReportGB();
>-+void	Report(), ReportE(), ReportBM(), ReportGB(), ReportBIG5();
>- void	usage(), Error();
>- 
>- 
>-@@ -162,6 +183,7 @@
>- 	    case 'l': if (inverse) leap=1; else usage(); break;
>- 	    case 'h': showHZ = 1; break;
>- 	    case 'b': showBM = 1; break;
>-+	    case '5': showB5 = 1; break;
>- 	    default:  usage(); break;
>- 	}
>-     }
>-@@ -213,13 +235,14 @@
>- void usage()
>- {
>-     printf("Usage:\n\n");
>--    printf("Solar->Lunar:\t%s [-h] [-b] year month day [hour]\n", progname);
>-+    printf("Solar->Lunar:\t%s [-h] [-5] [-b] year month day [hour]\n", progname);
>-     printf("\t\t(in Solar Calendar, 24 hour clock)\n\n");
>--    printf("Lunar->Solar:\t%s [-h] [-b] -i [-l] year month day [hour]\n",
>-+    printf("Lunar->Solar:\t%s [-h] [-5] [-b] -i [-l] year month day [hour]\n",
>- 	   progname);
>-     printf("\t\t(in Lunar Calendar, 24 hour clock)\n");
>-     printf("\t\t-l means the month is a leap month (\"run4 yue4\")\n\n");
>-     printf("\t\t-h means output in hanzi (GB)\n");
>-+    printf("\t\t-5 means output in traditional chinese(BIG5)\n");
>-     printf("\t\t-b means output in \"bitmap\"\n\n");
>-     printf("Date range: about %d years from the Solar Date %d.%d.%d\n", Nyear,
>- 	   SolarFirstDate.year, SolarFirstDate.month, SolarFirstDate.day);
>-@@ -578,6 +601,8 @@
>- {
>-     if (showHZ)
>- 	ReportGB();
>-+    else if (showB5)
>-+	ReportBIG5();
>-     else if (showBM)
>- 	ReportBM();
>-     else
>-@@ -614,6 +639,39 @@
>- 	if (lunar2.month==1)
>- 	    printf("* %s\n", "ÄêÖùÒà¿ÉÄÜÒªÐÞ¸Ä");
>- 	printf("* %s\n", "Çë²éÓÐ½ÚÆøÊ±¼äÖ®ÍòÄêÀú");
>-+    }
>-+}
>-+
>-+
>-+void ReportBIG5()
>-+{
>-+    printf("%s%d%s%2d%s%2d%s%2d%s%s%s\n", "¶§¾ú¡G¡@",
>-+	   solar.year, "¦~", solar.month, "¤ë", solar.day,
>-+	   "¤é", solar.hour, "®É¡@",
>-+	   "¬P´Á", weekdayBIG5[solar.weekday]); 
>-+    printf("%s%d%s%s%2d%s%2d%s%s%s%s%s\n", "³±¾ú¡G¡@",
>-+	   lunar.year, "¦~", (lunar.leap? "¶|":""),
>-+	   lunar.month, "¤ë", lunar.day, "¤é", 
>-+	   ZhiBIG5[zhi.hour], "®É¡@",
>-+	   "¥Í¨vÄÝ", ShengXiaoBIG5[zhi.year]);
>-+    printf("%s%s%s%s%s%s%s%s%s%s%s%s%s\n", "¤z¤ä¡G¡@",
>-+	   GanBIG5[gan.year], ZhiBIG5[zhi.year], "¦~¡@",
>-+	   GanBIG5[gan.month], ZhiBIG5[zhi.month], "¤ë¡@",
>-+	   GanBIG5[gan.day], ZhiBIG5[zhi.day], "¤é¡@",
>-+	   GanBIG5[gan.hour], ZhiBIG5[zhi.hour], "®É¡@");
>-+    printf("%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
>-+	   "¥Î¥|¬W¯«ºâ±Àºâ¤§®É¨°¤K¦r¡G¡@",
>-+	   GanBIG5[gan2.year], ZhiBIG5[zhi2.year], "¦~¡@",
>-+	   GanBIG5[gan2.month], ZhiBIG5[zhi2.month], "¤ë¡@",
>-+	   GanBIG5[gan2.day], ZhiBIG5[zhi2.day], "¤é¡@",
>-+	   GanBIG5[gan2.hour], ZhiBIG5[zhi2.hour], "®É¡@");
>-+    if (jieAlert)
>-+    {
>-+	printf("* %s, %s\n", "¬O¤é¬°¸`",
>-+	       "¤ë¬W¥i¯àn×§ï");
>-+	if (lunar2.month==1)
>-+	    printf("* %s\n", "¦~¬W¥ç¥i¯àn×§ï");
>-+	printf("* %s\n", "½Ð¬d¦³¸`®ð®É¶¡¤§¸U¦~¾ú");
>-     }
>- }
>- 
>diff --git chinese/lunar/pkg-plist chinese/lunar/pkg-plist
>deleted file mode 100644
>index 470b9ec91b37..000000000000
>--- chinese/lunar/pkg-plist
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-bin/lunar
>-man/man1/lunar.1.gz
>-share/chinese/lunar.bitmap
>diff --git chinese/oto/Makefile chinese/oto/Makefile
>index c03567d2791d..6cf3e8c821f5 100644
>--- chinese/oto/Makefile
>+++ chinese/oto/Makefile
>@@ -15,8 +15,4 @@ GNU_CONFIGURE=	YES
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
> 
>-post-patch:
>-	@${FIND} ${WRKSRC}/src/ -type f -print0 | \
>-	    ${XARGS} -0 ${REINPLACE_CMD} -e 's,stdint.h,inttypes.h,'
>-
> .include <bsd.port.mk>
>diff --git comms/bpl+/Makefile comms/bpl+/Makefile
>index d5a00abff3ba..a10c345359c9 100644
>--- comms/bpl+/Makefile
>+++ comms/bpl+/Makefile
>@@ -11,7 +11,8 @@ DISTNAME=	${PORTNAME}
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	B Plus file transfer protocol
> 
>-PLIST_FILES=	bin/bp bin/bpl
>+PLIST_FILES=	bin/bp \
>+		bin/bpl
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/bpl ${STAGEDIR}${PREFIX}/bin
>diff --git comms/bpl+/files/patch-Makefile comms/bpl+/files/patch-Makefile
>index 2b157ca235c7..cdcc8c2c5ba3 100644
>--- comms/bpl+/files/patch-Makefile
>+++ comms/bpl+/files/patch-Makefile
>@@ -1,5 +1,5 @@
>---- Makefile.orig	Fri Jun 13 14:13:23 2003
>-+++ Makefile	Fri Jun 13 14:13:43 2003
>+--- Makefile.orig	2020-01-26 19:57:34 UTC
>++++ Makefile
> @@ -4,11 +4,9 @@
>  #  USE_MKTIME	use mktime instead of timelocal
>  #
>diff --git comms/bpl+/files/patch-bplexec.c_1 comms/bpl+/files/patch-bplexec.c_1
>deleted file mode 100644
>index 9e788585e998..000000000000
>--- comms/bpl+/files/patch-bplexec.c_1
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- bplexec.c.orig	Fri Feb 10 02:25:34 1995
>-+++ bplexec.c	Tue Feb  3 23:54:32 1998
>-@@ -34,7 +34,7 @@
>- extern void hms(UCHAR *s);
>- extern void ldecout(ULONG l);
>- 
>--#ifdef SUN
>-+#if 0 /*ifdef SUN*/
>- extern int fclose(FILE *stream);
>- extern int fflush(FILE *stream);
>- extern int fseek(FILE *stream, long int offset, int origin);
>diff --git comms/bpl+/files/patch-bplexec.c_2 comms/bpl+/files/patch-bplexec.c_2
>deleted file mode 100644
>index 9830a08aa22a..000000000000
>--- comms/bpl+/files/patch-bplexec.c_2
>+++ /dev/null
>@@ -1,50 +0,0 @@
>---- bplexec.c.orig	Thu Feb  9 17:25:34 1995
>-+++ bplexec.c	Wed Nov 15 20:45:53 2000
>-@@ -17,6 +17,7 @@
>- #include <stdio.h>
>- #include <string.h>
>- #include <stdlib.h>
>-+#include <errno.h>
>- 
>- #include "bpl.h"
>- #include "machine.h"
>-@@ -1096,7 +1097,7 @@
>- 
>- 	fname_w_index = strlen(fname_work);
>- 	if (copy_body(s)) { /* t@C¼Ùí */
>--		strcpy(fname_work, tmpnam(NULL));
>-+		strcpy(fname_work, "/tmp/bpl.XXXXXXXXXX");
>- 	}
>- 
>- 	my_free(real_filename);
>-@@ -1118,16 +1119,19 @@
>- 	FILE *fp;
>- 	UCHAR *my_tmp;
>- 	char *tmp;
>-+	int fd;
>- 
>--	tmp = tmpnam(NULL);
>-+	tmp = "/tmp/bpl.XXXXXXXXXX";
>- 	my_tmp = (UCHAR *) malloc(strlen(tmp) + 1);
>- 	if (my_tmp == NULL)
>- 		return NULL;
>- 	strcpy(my_tmp, tmp);
>- 
>--	fp = fopen(tmp, "wb");
>--	if (fp == NULL) {
>-+	if ((fd = mkstemp(my_tmp)) == -1 ||
>-+            (fp = fdopen(fd, "wb")) == NULL ) {
>-+		fprintf(stderr, "%s: %s\n", my_tmp, strerror(errno));
>- 		free(my_tmp);
>-+		return NULL;
>- 	} else {
>- 		/* fBNgÍ current ðg¤ */
>- 		strwarn(STR_CANT_CREATE_L); /* ut@Cªì¬Å«È¢ÌÅv */
>-@@ -1136,6 +1140,7 @@
>- 		strwarn(STR_CANT_CREATE_R);
>- 		my_free(real_filename);
>- 		real_filename = my_tmp;
>-+		close(fd);
>- 	}
>- 	return fp;
>- }
>diff --git comms/bpl+/files/patch-config.sh comms/bpl+/files/patch-config.sh
>index 5c9a4f328b5a..72049e257423 100644
>--- comms/bpl+/files/patch-config.sh
>+++ comms/bpl+/files/patch-config.sh
>@@ -1,6 +1,6 @@
>---- config.sh.orig	Thu Feb  9 09:25:34 1995
>-+++ config.sh	Sat Jun 14 07:50:30 2003
>-@@ -8,27 +8,6 @@
>+--- config.sh.orig	2020-01-26 19:57:34 UTC
>++++ config.sh
>+@@ -8,27 +8,6 @@ if [ -f $template ]; then
>    exit
>  fi
>  
>@@ -28,7 +28,7 @@
>  if [ -f /usr/include/utime.h ]; then
>      FUTIME="-DHAME_UTIME_H"
>  fi
>-@@ -50,4 +29,4 @@
>+@@ -50,4 +29,4 @@ if [ $? != 0 ]; then
>      MKTIME="mktime.o"
>    fi
>  fi
>diff --git comms/bpl+/files/patch-machine.h comms/bpl+/files/patch-machine.h
>index c8e805c191e5..19f5a00c8160 100644
>--- comms/bpl+/files/patch-machine.h
>+++ comms/bpl+/files/patch-machine.h
>@@ -1,5 +1,5 @@
>---- machine.h.orig	Wed Oct 12 07:19:52 1994
>-+++ machine.h	Tue Feb  3 23:50:25 1998
>+--- machine.h.orig	2020-01-26 19:57:34 UTC
>++++ machine.h
> @@ -11,4 +11,4 @@
>   *	PC88VA		PC-88VA
>   */
>diff --git comms/minicom/Makefile comms/minicom/Makefile
>index 7c27512b3a40..faff1dbfd72e 100644
>--- comms/minicom/Makefile
>+++ comms/minicom/Makefile
>@@ -28,11 +28,6 @@ OPTIONS_SUB=		yes
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
> 
>-post-patch:
>-	${REINPLACE_CMD} -e "s@/usr/local/bin/@${LOCALBASE}/bin/@; \
>-		s@/sz@/lsz@;s@/sb@/lsb@;s@/sx@/lsx@;s@/rz@/lrz@; \
>-		s@/rb@/lrb@;s@/rx@/lrx@" ${WRKSRC}/src/rwconf.c
>-
> post-install:
> 	${MKDIR} ${STAGEDIR}${ETCDIR}
> 
>diff --git comms/minicom/files/patch-minirc.dfl comms/minicom/files/patch-minirc.dfl
>deleted file mode 100644
>index db0d8dae9a0c..000000000000
>--- comms/minicom/files/patch-minirc.dfl
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- doc/minirc.dfl.orig	2009-12-12 15:47:47 UTC
>-+++ doc/minirc.dfl
>-@@ -1,2 +1,7 @@
>- # $Id: minirc.dfl,v 1.1.1.1 2003-03-30 18:55:39 al-guest Exp $
>- # Machine-generated file - use "minicom -s" to change parameters.
>-+pr port             /dev/cuau0
>-+pu baudrate         9600
>-+pu bits             8
>-+pu parity           N
>-+pu minit            
>diff --git comms/minicom/files/patch-src-minicom.h comms/minicom/files/patch-src-minicom.h
>deleted file mode 100644
>index 2f714b1dcaad..000000000000
>--- comms/minicom/files/patch-src-minicom.h
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- src/minicom.h.orig	2013-12-08 10:26:03 UTC
>-+++ src/minicom.h
>-@@ -35,6 +35,7 @@
>- 
>- #include <time.h>
>- #include <stdbool.h>
>-+#include <limits.h>
>- 
>- #if HAVE_LOCKDEV
>- #include <ttylock.h>
>diff --git comms/minicom/files/patch-src-script.c comms/minicom/files/patch-src-script.c
>deleted file mode 100644
>index 2af8b806b973..000000000000
>--- comms/minicom/files/patch-src-script.c
>+++ /dev/null
>@@ -1,19 +0,0 @@
>---- src/script.c.orig	2013-10-29 11:07:42 UTC
>-+++ src/script.c
>-@@ -32,6 +32,7 @@
>- #include <config.h>
>- #endif
>- 
>-+#include <sys/wait.h>
>- #include <stdarg.h>
>- 
>- #include "port.h"
>-@@ -76,7 +77,7 @@ struct env {
>- struct env *curenv;		/* Execution environment */
>- int gtimeout = 120;		/* Global Timeout */
>- int etimeout = 0;		/* Timeout in expect routine */
>--jmp_buf ejmp;			/* To jump to if expect times out */
>-+sigjmp_buf ejmp;		/* To jump to if expect times out */
>- int inexpect = 0;		/* Are we in the expect routine */
>- const char *newline;		/* What to print for '\n'. */
>- const char *s_login = "name";	/* User's login name */
>diff --git comms/minicom/files/patch-src-updown.c comms/minicom/files/patch-src-updown.c
>deleted file mode 100644
>index 48db9ee508d1..000000000000
>--- comms/minicom/files/patch-src-updown.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/updown.c.orig	2013-12-08 10:25:06 UTC
>-+++ src/updown.c
>-@@ -298,7 +298,7 @@ void updown(int what, int nr)
>-     do_log("%s", cmdline);   /* jl 22.06.97 */
>- 
>-   if (P_PFULL(g) == 'N') {
>--    win = mc_wopen(10, 7, 70, 13, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
>-+    win = mc_wopen(5, 5, 74, 11, BSINGLE, stdattr, mfcolor, mbcolor, 1, 0, 1);
>-     snprintf(title, sizeof(title), _("%.30s %s - Press CTRL-C to quit"), P_PNAME(g),
>-              what == 'U' ? _("upload") : _("download"));
>-     mc_wtitle(win, TMID, title);
>diff --git comms/minicom/files/patch-src-window.c comms/minicom/files/patch-src-window.c
>deleted file mode 100644
>index 8eefb31cd206..000000000000
>--- comms/minicom/files/patch-src-window.c
>+++ /dev/null
>@@ -1,45 +0,0 @@
>---- src/window.c.orig	2010-12-12 13:56:25 UTC
>-+++ src/window.c
>-@@ -66,6 +66,7 @@ static const char *CE, *Al, *Dl, *AL, *DL;
>- static const char *CS, *SF, *SR, *VB, *BL;
>- static const char *VE, *VI, *KS, *KE;
>- static const char *CD, *CL, *IC, *DC;
>-+static char *mcBC;
>- static const char *CR, *NL;
>- #ifdef ST_LINE
>- static const char *TS, *FS, *DS;
>-@@ -335,8 +336,8 @@ static void _gotoxy(int x, int y)
>-   else if (NL != NULL && x == 0 && x == curx && y == cury + 1)
>-     outstr(NL);
>- #endif
>--  else if (BC != NULL && y == cury && x == curx - 1)
>--    outstr(BC);
>-+  else if (mcBC != NULL && y == cury && x == curx - 1)
>-+    outstr(mcBC);
>-   else
>-     outstr(tgoto(CM, x, y));
>-   curx = x;
>-@@ -2000,7 +2001,7 @@ int win_init(int fg, int bg, int attr)
>-   CL = tgetstr("cl", &_tptr);
>-   IC = tgetstr("ic", &_tptr);
>-   DC = tgetstr("dc", &_tptr);
>--  BC = tgetstr("bc", &_tptr);
>-+  mcBC = tgetstr("bc", &_tptr);
>-   CR = tgetstr("cr", &_tptr);
>-   NL = tgetstr("nl", &_tptr);
>-   AC = tgetstr("ac", &_tptr);
>-@@ -2059,11 +2060,11 @@ int win_init(int fg, int bg, int attr)
>-   _has_am = tgetflag("am");
>-   _mv_standout = tgetflag("ms");
>-   if (tgetflag("bs")) {
>--    if (BC == NULL)
>--      BC = "\b";
>-+    if (mcBC == NULL)
>-+      mcBC = "\b";
>-   }
>-   else
>--    BC = NULL;
>-+    mcBC = NULL;
>- 
>-   /* Special IBM box-drawing characters */
>-   D_UL  = 201;
>diff --git comms/minicom/files/patch-sysdep1.c comms/minicom/files/patch-sysdep1.c
>deleted file mode 100644
>index ba4569d8d915..000000000000
>--- comms/minicom/files/patch-sysdep1.c
>+++ /dev/null
>@@ -1,55 +0,0 @@
>---- src/sysdep1.c.orig	2009-12-12 15:47:47 UTC
>-+++ src/sysdep1.c
>-@@ -65,13 +65,13 @@ static void m_setrts(int fd)
>-   if (portfd_is_socket)
>-     return;
>- #endif
>--#if defined(TIOCM_RTS) && defined(TIOCMODG)
>-+#if defined(TIOCM_RTS) && defined(TIOCMGET)
>-   {
>-     int mcs=0;
>- 
>--    ioctl(fd, TIOCMODG, &mcs);
>-+    ioctl(fd, TIOCMGET, &mcs);
>-     mcs |= TIOCM_RTS;
>--    ioctl(fd, TIOCMODS, &mcs);
>-+    ioctl(fd, TIOCMSET, &mcs);
>-   }
>- #endif
>- }
>-@@ -180,11 +180,11 @@ int m_getdcd(int fd)
>-     return portfd_is_connected;
>-   }
>- #endif
>--#ifdef TIOCMODG
>-+#ifdef TIOCMODGET
>-   {
>-     int mcs = 0;
>- 
>--    if (ioctl(fd, TIOCMODG, &mcs) < 0)
>-+    if (ioctl(fd, TIOCMODGET, &mcs) < 0)
>-       return -1;
>-     return mcs & TIOCM_CAR ? 1 : 0;
>-   }
>-@@ -227,8 +227,8 @@ void m_savestate(int fd)
>-   ioctl(fd, TIOCLGET, &lsw);
>- #  endif
>- #endif
>--#ifdef TIOCMODG
>--  ioctl(fd, TIOCMODG, &m_word);
>-+#ifdef TIOCMGET
>-+  ioctl(fd, TIOCMGET, &m_word);
>- #endif
>- }
>- 
>-@@ -252,8 +252,8 @@ void m_restorestate(int fd)
>-   ioctl(fd, TIOCLSET, &lsw);
>- #  endif
>- #endif
>--#ifdef TIOCMODS
>--  ioctl(fd, TIOCMODS, &m_word);
>-+#ifdef TIOCMSET
>-+  ioctl(fd, TIOCMSET, &m_word);
>- #endif
>- }
>- 
>diff --git databases/db5/Makefile databases/db5/Makefile
>index 03742489f772..c4b58da879df 100644
>--- databases/db5/Makefile
>+++ databases/db5/Makefile
>@@ -78,10 +78,6 @@ CONFIGURE_ARGS+=	--enable-posixmutexes
> CONFIGURE_ARGS+=	--with-mutex=POSIX/pthreads
> .endif
> 
>-post-patch:
>-	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
>-	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_*
>-
> post-install:
> .for i in ${DBLIBS}
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0
>diff --git databases/db6/Makefile databases/db6/Makefile
>index 9c5de1c77737..fedaf8730e14 100644
>--- databases/db6/Makefile
>+++ databases/db6/Makefile
>@@ -78,10 +78,6 @@ CONFIGURE_ARGS+=	--with-mutex=POSIX/pthreads
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
>-	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' \
>-	    ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_* \
>-	    ${WRKSRC}/../src/dbinc/atomic.h
> 	${REINPLACE_CMD} -e 's/%%BDBVER%%/${BDBVER}/' ${WRKSRC}/../lang/sql/upgrade61.sh
> 
> post-install:
>diff --git databases/db6/files/patch-src_dbinc_mutex__int.h databases/db6/files/patch-src_dbinc_mutex__int.h
>index 7f85db3b67eb..3f962fba389d 100644
>--- databases/db6/files/patch-src_dbinc_mutex__int.h
>+++ databases/db6/files/patch-src_dbinc_mutex__int.h
>@@ -1,4 +1,4 @@
>---- src/dbinc/mutex_int.h.orig	2016-03-28 19:45:54 UTC
>+--- src/dbinc/mutex_int.h.orig	2017-04-13 14:06:20 UTC
> +++ src/dbinc/mutex_int.h
> @@ -9,6 +9,7 @@
>  #ifndef _DB_MUTEX_INT_H_
>@@ -8,7 +8,7 @@
>  #include "dbinc/atomic.h"
>  
>  #if defined(__cplusplus)
>-@@ -506,11 +507,11 @@ typedef unsigned int tsl_t;
>+@@ -487,11 +488,11 @@ typedef unsigned int tsl_t;
>  #define	MUTEX_UNSET(tsl)	(*(volatile tsl_t *)(tsl) = 0)
>  #define	MUTEX_INIT(tsl)         (MUTEX_UNSET(tsl), 0)
>  #define	MUTEX_MEMBAR(x) \
>@@ -23,7 +23,7 @@
>  #endif
>  #endif
>  
>-@@ -652,7 +652,7 @@ MUTEX_SET(int *tsl)  {
>+@@ -633,7 +634,7 @@ MUTEX_SET(int *tsl)  {
>  	 : "=&r" (__r), "+r" (tsl)
>  	 :
>  	 : "cr0", "memory");
>diff --git deskutils/baobab/Makefile deskutils/baobab/Makefile
>index 835f382821a0..f8c9c5b491d7 100644
>--- deskutils/baobab/Makefile
>+++ deskutils/baobab/Makefile
>@@ -25,6 +25,7 @@ USE_GNOME=	cairo gtk30
> BINARY_ALIAS=	python3=${PYTHON_CMD}
> 
> GLIB_SCHEMAS=	org.gnome.baobab.gschema.xml
>+BINARY_ALIAS=	python3=${PYTHON_VERSION}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|MimeType=inode/directory;|MimeType=|g' \
>diff --git deskutils/cairo-dock/Makefile deskutils/cairo-dock/Makefile
>index 332593670de6..1032cec3d03a 100644
>--- deskutils/cairo-dock/Makefile
>+++ deskutils/cairo-dock/Makefile
>@@ -23,45 +23,64 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	Cairo-Dock
> GH_PROJECT=	${PORTNAME}-core
> 
>-GNU_CONFIGURE=	yes
>-USES=		cmake compiler:c++11-lang gettext gl gnome localbase:ldflags \
>-		pkgconfig
>-USE_GL=		glu
>-USE_GNOME=	glib20 gtk30 librsvg2 libxml2
>-USE_LDCONFIG=	yes
>-CMAKE_ARGS=	-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" \
>-		-DROOT_PREFIX:PATH=${STAGEDIR} \
>-		-DCMAKE_INSTALL_MANDIR:PATH=man \
>+GNU_CONFIGURE=		yes
>+USES=			cmake compiler:c++11-lang gettext gl gnome \
>+			localbase:ldflags pkgconfig shebangfix
>+USE_GL=			glu
>+USE_GNOME=		glib20 gtk30 librsvg2 libxml2
>+USE_LDCONFIG=		yes
>+SHEBANG_FILES=		data/desktop-manager/cairo-dock-session \
>+			data/scripts/cairo-dock-package-theme.sh \
>+			data/scripts/help_scripts.sh \
>+			data/scripts/initial-setup.sh \
>+			misc/cairo-dock_theme-creator.sh \
>+			po/misc/add-descriptions.sh po/misc/add-readme.sh
>+CMAKE_ARGS=		-DCMAKE_INSTALL_MANDIR:PATH=man \
>+			-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig" \
>+			-DROOT_PREFIX:PATH=${STAGEDIR}
>+OPTIONS_DEFINE=		WAYLAND X11
>+OPTIONS_DEFAULT=	EGL WAYLAND X11
>+OPTIONS_RADIO=		GL
>+OPTIONS_RADIO_GL=	EGL GLX
> 
>-OPTIONS_DEFINE=	X11 WAYLAND
>-OPTIONS_DEFAULT=EGL WAYLAND X11
>-OPTIONS_RADIO=	GL
>-OPTIONS_RADIO_GL=	GLX EGL
>+EGL_DESC=	${GLX_DESC:S/X11/Native/}
>+EGL_CMAKE_BOOL=	enable-egl-support
>+EGL_USE=	GL=egl
> 
>-EGL_DESC=		${GLX_DESC:S/X11/Native/}
>-EGL_CMAKE_BOOL=		enable-egl-support
>-EGL_USE=		GL=egl
>-
>-GLX_USE=		GL=gl
>-GLX_IMPLIES=		X11
>+GLX_USE=	GL=gl
>+GLX_IMPLIES=	X11
> 
> WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
> WAYLAND_USE=		GL=egl
> WAYLAND_CMAKE_BOOL=	enable-wayland-support
> WAYLAND_IMPLIES=	EGL
> 
>-X11_USES=		xorg
>-X11_USE=		XORG=x11,xcomposite,xinerama,xrandr,xrender,xtst
>-X11_CMAKE_BOOL=		enable-x11-support
>+X11_USES=	xorg
>+X11_USE=	XORG=x11,xcomposite,xinerama,xrandr,xrender,xtst
>+X11_CMAKE_BOOL=	enable-x11-support
> 
> post-patch:
>-	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -e \
>-	    's|/usr/share/pixmaps/|${LOCALBASE}/share/pixmaps/|g; \
>-	     s|/usr/bin/cairo-dock|${LOCALBASE}/bin/cairo-dock|g; \
>-	     s|/bin/bash|${LOCALBASE}/bin/bash|g; \
>-	     s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
>-	     s|/usr/share/icons|${LOCALBASE}/share/icons|g; \
>-	     s|%%LOCALBASE%%|${LOCALBASE}|g;'
>+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g;' \
>+	${WRKSRC}/data/cairo-dock \
>+	${WRKSRC}/data/themes/default-theme-panel/launchers/01firefox.desktop \
>+	${WRKSRC}/data/themes/default-theme-panel/launchers/01gcalctool.desktop \
>+	${WRKSRC}/data/themes/default-theme-panel/launchers/01libreoffice-calc.desktop \
>+	${WRKSRC}/data/themes/default-theme-panel/launchers/01libreoffice-impress.desktop \
>+	${WRKSRC}/data/themes/default-theme-panel/launchers/01libreoffice-writer.desktop \
>+	${WRKSRC}/data/themes/default-theme-panel/launchers/01pidgin.desktop \
>+	${WRKSRC}/data/themes/default-theme-panel/launchers/01thunderbird.desktop \
>+	${WRKSRC}/data/themes/default-theme-panel/launchers/01ubuntu-software-center.desktop \
>+	${WRKSRC}/data/themes/default-theme/launchers/01firefox.desktop \
>+	${WRKSRC}/data/themes/default-theme/launchers/01gcalctool.desktop \
>+	${WRKSRC}/data/themes/default-theme/launchers/01gimp.desktop \
>+	${WRKSRC}/data/themes/default-theme/launchers/01gnome-terminal.desktop \
>+	${WRKSRC}/data/themes/default-theme/launchers/01ooo-writer.desktop \
>+	${WRKSRC}/data/themes/default-theme/launchers/01pidgin.desktop \
>+	${WRKSRC}/data/themes/default-theme/launchers/01thunderbird.desktop \
>+	${WRKSRC}/data/themes/default-theme/launchers/01ubuntu-software-center.desktop \
>+	${WRKSRC}/src/cairo-dock-user-menu.c \
>+	${WRKSRC}/src/gldit/cairo-dock-class-manager.c \
>+	${WRKSRC}/src/gldit/cairo-dock-gui-factory.c \
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgldi.so
>diff --git deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c
>index 01e6666506ea..a553a8733551 100644
>--- deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c
>+++ deskutils/cairo-dock/files/patch-src_gldit_cairo-dock-file-manager.c
>@@ -1,4 +1,4 @@
>---- src/gldit/cairo-dock-file-manager.c.orig	2014-10-15 14:16:34 UTC
>+--- src/gldit/cairo-dock-file-manager.c.orig	2015-02-19 15:03:40 UTC
> +++ src/gldit/cairo-dock-file-manager.c
> @@ -21,7 +21,11 @@
>  #include <string.h>      // memset
>@@ -12,7 +12,7 @@
>  #include <errno.h>  // errno
>  
>  #include "gldi-config.h"
>-@@ -500,7 +504,7 @@ gboolean cairo_dock_copy_file (const gch
>+@@ -503,7 +507,7 @@ gboolean cairo_dock_copy_file (const gchar *cFilePath,
>  	{
>  		// perform in-kernel transfer (zero copy to user space)
>  		int size;
>diff --git deskutils/gcal/Makefile deskutils/gcal/Makefile
>index d24d5767581b..84a6737c75d9 100644
>--- deskutils/gcal/Makefile
>+++ deskutils/gcal/Makefile
>@@ -14,13 +14,13 @@ LICENSE=	GPLv3+
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
>-USES=		charsetfix shebangfix makeinfo tar:xz
>-SHEBANG_FILES=	misc/gcalltx/gcalltxp.in misc/gcalltx/gcalltx.pl
>+USES=		charsetfix makeinfo shebangfix tar:xz
>+SHEBANG_FILES=	misc/gcalltx/gcalltx.pl misc/gcalltx/gcalltxp.in
> 
> INFO=		gcal
> 
>-OPTIONS_DEFINE=	NLS
>-OPTIONS_SUB=	yes
>+OPTIONS_DEFINE=		NLS
>+OPTIONS_SUB=		yes
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
> 
>@@ -28,10 +28,8 @@ GCAL_SCRIPTS=	daily/daily ddiff/ddiff ddiff/ddiffdrv dst/dst gcalltx/gcalltx \
> 		gcalltx/gcalltxp moon/moon mrms/mrms srss/srss wloc/wlocdrv
> 
> post-patch:
>-.for p in ${GCAL_SCRIPTS}
>-	@${REINPLACE_CMD} -e '/^ThisGcal=/s:=.*:=${PREFIX}/bin/gcal:' \
>-		-e '/^packagedatamiscdir=/s:=.*:=${DATADIR}/misc/${p:H}:' \
>-		${WRKSRC}/misc/${p}.in
>+.for p in daily/daily ddiff/ddiff ddiff/ddiffdrv dst/dst gcalltx/gcalltx moon/moon mrms/mrms srss/srss wloc/wlocdrv
>+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/misc/${p}.in
> .endfor
> 
> post-install:
>diff --git deskutils/rubrica/Makefile deskutils/rubrica/Makefile
>index cc310654b19e..41dd9959c2ab 100644
>--- deskutils/rubrica/Makefile
>+++ deskutils/rubrica/Makefile
>@@ -35,18 +35,6 @@ OPTIONS_SUB=	yes
> NLS_CONFIGURE_ENABLE=	nls
> NLS_USES=		gettext
> 
>-post-patch:
>-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|-Wall -g|-Wall|g ; \
>-		 s|-Wmissing-prototypes -g|-Wmissing-prototypes|g'
>-	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e 's|_Modifica|_Edit|' \
>-		-e 's|A_iuto|_Help|' \
>-		${WRKSRC}/interface/MainWindow.glade
>-	@${REINPLACE_CMD} -e \
>-		's|^Categories=.*|Categories=GNOME;Application;Office;System;Utility;|' \
>-		${WRKSRC}/rubrica2.desktop.in
>-
> post-patch-NLS-off:
> 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|po||g' ${WRKSRC}/Makefile.in
> 
>diff --git deskutils/rubrica/files/patch-app_c deskutils/rubrica/files/patch-app_c
>deleted file mode 100644
>index fada05abdbd7..000000000000
>--- deskutils/rubrica/files/patch-app_c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/app.c.orig	2016-01-08 10:28:54 UTC
>-+++ src/app.c
>-@@ -1339,7 +1339,7 @@ rubrica_app_init(RubricaApp* self)
>-   
>-   self->priv->cutted         = NULL;
>-   self->priv->notify         = notify_notification_new("Rubrica Addressbook",
>--						      NULL, "info", NULL);
>-+						      "info", NULL);
>-   self->priv->active_plugin  = g_strdup("autodetect");
>-   self->priv->manager        = r_lib_get_manager();
>-   self->priv->print_settings = NULL;
>diff --git deskutils/rubrica/files/patch-callbacks_c deskutils/rubrica/files/patch-callbacks_c
>deleted file mode 100644
>index 8a6255dc6a6c..000000000000
>--- deskutils/rubrica/files/patch-callbacks_c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/callbacks.c.orig	2016-01-08 10:29:13 UTC
>-+++ src/callbacks.c
>-@@ -638,7 +638,7 @@ on_info_cb (GtkWidget* button, gpointer 
>- 	       "wrap-license",  FALSE,
>- 	       NULL);
>-   
>--  gdk_pixbuf_unref (logo);
>-+  g_object_unref (logo);
>-        
>-   gtk_dialog_run (GTK_DIALOG(about));
>-   gtk_widget_destroy (about);
>diff --git deskutils/rubrica/files/patch-data_view_c deskutils/rubrica/files/patch-data_view_c
>deleted file mode 100644
>index bad9425e5270..000000000000
>--- deskutils/rubrica/files/patch-data_view_c
>+++ /dev/null
>@@ -1,66 +0,0 @@
>---- src/data_view.c.orig	2016-01-08 10:28:41 UTC
>-+++ src/data_view.c
>-@@ -689,7 +689,7 @@ data_view_set_image(RubricaDataView* vie
>-   priv = RUBRICA_DATA_VIEW_GET_PRIVATE(view);
>- 
>-   gtk_image_set_from_pixbuf(GTK_IMAGE(priv->image), pixbuf);
>--  gdk_pixbuf_unref(pixbuf);
>-+  g_object_unref(pixbuf);
>- }
>- 
>- 
>-@@ -952,7 +952,7 @@ write_addresses(RubricaDataView* view, R
>- 
>-       data_view_write(body, "\n");
>-       data_view_write_pixbuf(body, pixbuf, _("Addresses"));      
>--      gdk_pixbuf_unref(pixbuf);
>-+      g_object_unref(pixbuf);
>- 
>-       for (; address; address = r_card_get_next_address(R_CARD(card)))
>- 	{
>-@@ -1057,8 +1057,7 @@ write_work(RubricaDataView* view, RPerso
>- 
>-       data_view_write(body, "\n");
>-       data_view_write_pixbuf(body, pixbuf, _("Work"));
>--      gdk_pixbuf_unref(pixbuf);
>--
>-+      g_object_unref(pixbuf);
>-       data_view_write_line(body, _("Assignment"), assignment, TRUE);
>-       data_view_write_line(body, _("Organization"), organization, TRUE);
>-       data_view_write_line(body, _("Department"), department, TRUE);
>-@@ -1093,7 +1092,7 @@ write_net (RubricaDataView* view, RCard*
>-       
>-       data_view_write(body, "\n");
>-       data_view_write_pixbuf(body, pixbuf, _("Net"));
>--      gdk_pixbuf_unref(pixbuf);
>-+      g_object_unref(pixbuf);
>-       
>-       for (; net; net = r_card_get_next_net_address(R_CARD(card)))
>- 	{	  
>-@@ -1165,7 +1164,7 @@ write_telephones(RubricaDataView* view, 
>- 
>-       data_view_write(body, "\n");
>-       data_view_write_pixbuf(body, pixbuf, _("Telephone"));
>--      gdk_pixbuf_unref(pixbuf);
>-+      g_object_unref(pixbuf);
>- 
>-       for (; tel; tel = r_card_get_next_telephone(R_CARD(card)))
>- 	{
>-@@ -1210,7 +1209,7 @@ write_notes(RubricaDataView* view, RPers
>-       
>-       data_view_write(body, "\n");
>-       data_view_write_pixbuf(body, pixbuf, _("Notes"));
>--      gdk_pixbuf_unref(pixbuf);
>-+      g_object_unref(pixbuf);
>- 
>-       if (has_partner)
>- 	{   
>-@@ -1257,7 +1256,7 @@ write_company_notes(RubricaDataView* vie
>-       data_view_write(body, "\n");
>-       data_view_write_pixbuf(body, pixbuf, _("Notes"));
>-       data_view_write(body, "\n");
>--      gdk_pixbuf_unref(pixbuf);
>-+      g_object_unref(pixbuf);
>- 
>-       data_view_write(body, text);   
>-     }
>diff --git deskutils/rubrica/files/patch-rubrica2.schemas.in deskutils/rubrica/files/patch-rubrica2.schemas.in
>index b1cf27ad3eb9..c5ac6e19abac 100644
>--- deskutils/rubrica/files/patch-rubrica2.schemas.in
>+++ deskutils/rubrica/files/patch-rubrica2.schemas.in
>@@ -1,5 +1,5 @@
>---- rubrica2.schemas.in.orig	2010-06-20 14:23:50.000000000 +0200
>-+++ rubrica2.schemas.in	2013-04-03 20:40:05.000000000 +0200
>+--- rubrica2.schemas.in.orig	2008-02-04 13:57:05 UTC
>++++ rubrica2.schemas.in
> @@ -6,7 +6,7 @@
>  		<applyto>/apps/rubrica2/file_format</applyto>
>  		<owner>rubrica</owner>
>diff --git devel/ElectricFence/Makefile devel/ElectricFence/Makefile
>index c39d3a857543..d2d95d3408fb 100644
>--- devel/ElectricFence/Makefile
>+++ devel/ElectricFence/Makefile
>@@ -15,7 +15,10 @@ USE_LDCONFIG=	yes
> CFLAGS+=	-D__USE_BSD
> 
> MAKE_ARGS=	CC="${CC}"
>-PLIST_FILES=	bin/ef.sh lib/libefence.a lib/libefence.so.0 man/man3/efence.3.gz
>+PLIST_FILES=	bin/ef.sh \
>+		lib/libefence.a \
>+		lib/libefence.so.0 \
>+		man/man3/efence.3.gz
> 
> do-install:
> 	${INSTALL_DATA} ${WRKSRC}/libefence.a ${STAGEDIR}${PREFIX}/lib
>diff --git devel/ElectricFence/files/patch-Makefile devel/ElectricFence/files/patch-Makefile
>index ff22e2c35e41..5e9cb9bce98f 100644
>--- devel/ElectricFence/files/patch-Makefile
>+++ devel/ElectricFence/files/patch-Makefile
>@@ -1,4 +1,4 @@
>---- Makefile.orig	1999-04-13 17:22:49 UTC
>+--- Makefile.orig	2020-01-27 13:08:36 UTC
> +++ Makefile
> @@ -1,8 +1,14 @@
>  PIC= -fPIC
>diff --git devel/ElectricFence/files/patch-ef.sh devel/ElectricFence/files/patch-ef.sh
>index a929683ef188..eb0b8c6426be 100644
>--- devel/ElectricFence/files/patch-ef.sh
>+++ devel/ElectricFence/files/patch-ef.sh
>@@ -1,11 +1,13 @@
>---- ef.sh.orig	Wed May  2 21:17:33 2001
>-+++ ef.sh	Wed May  2 21:17:40 2001
>-@@ -1,3 +1,3 @@
>+--- ef.sh.orig	2020-01-27 13:08:36 UTC
>++++ ef.sh
>+@@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>  
>  #
>-@@ -16,5 +16,5 @@
>+ # Simple script to run electric fence on stuff.  (needs libefence.so).
>+@@ -15,6 +15,6 @@ fi
>+ 
>  # Set the environment to load eletric fence.
>  (\
> -export LD_PRELOAD=libefence.so.0.0;\
>diff --git devel/ElectricFence/files/patch-efence.c devel/ElectricFence/files/patch-efence.c
>index ab8685d6e52c..6df7b7f12888 100644
>--- devel/ElectricFence/files/patch-efence.c
>+++ devel/ElectricFence/files/patch-efence.c
>@@ -1,5 +1,5 @@
>---- efence.c.orig	2019-02-26 17:53:52.941236000 +0100
>-+++ efence.c	2019-02-26 17:56:18.688752000 +0100
>+--- efence.c.orig	2020-01-27 13:08:36 UTC
>++++ efence.c
> @@ -38,6 +38,7 @@
>  # include <pthread.h>
>  # include <semaphore.h>
>@@ -8,7 +8,7 @@
>  
>  #ifdef	malloc
>  #undef	malloc
>-@@ -670,6 +671,27 @@
>+@@ -668,6 +669,27 @@ memalign(size_t alignment, size_t userSize)
>  	release();
>  
>  	return address;
>diff --git devel/ElectricFence/files/patch-longjmp devel/ElectricFence/files/patch-longjmp
>deleted file mode 100644
>index cafc4c5ef1fa..000000000000
>--- devel/ElectricFence/files/patch-longjmp
>+++ /dev/null
>@@ -1,27 +0,0 @@
>---- eftest.c	Tue Jun  2 09:25:10 1998
>-+++ eftest.c	Tue Jun  2 09:24:58 1998
>-@@ -24,7 +24,7 @@
>- extern int	EF_PROTECT_BELOW;
>- extern int	EF_ALIGNMENT;
>- 
>--static jmp_buf	env;
>-+static sigjmp_buf	env;
>- 
>- /*
>-  * There is still too little standardization of the arguments and return
>-@@ -40,13 +40,13 @@
>- )
>-  {
>- 	signal(PAGE_PROTECTION_VIOLATED_SIGNAL, SIG_DFL);
>--	longjmp(env, 1);
>-+	siglongjmp(env, 1);
>- }
>- 
>- static int
>- gotSegmentationFault(int (*test)(void))
>- {
>--	if ( setjmp(env) == 0 ) {
>-+	if ( sigsetjmp(env, 1) == 0 ) {
>- 		int			status;
>- 
>- 		signal(PAGE_PROTECTION_VIOLATED_SIGNAL
>diff --git devel/ElectricFence/files/patch-mmap-size devel/ElectricFence/files/patch-mmap-size
>deleted file mode 100644
>index e94b0b802a98..000000000000
>--- devel/ElectricFence/files/patch-mmap-size
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-Found at:
>-	http://www.redhat.com/archives/fedora-cvs-commits/2007-March/msg00788.html
>-
>-Size is, correctly, size_t and mmap, correctly, takes
>-size_t as the size argument; the cast to int flunks
>-64bit thinking.
>-
>-diff -Naur ElectricFence-2.2.2/page.c ElectricFence-2.2.3/page.c
>---- page.c	2007-03-16 13:20:44.000000000 -0400
>-+++ page.c	2007-03-16 13:23:28.000000000 -0400
>-@@ -70,7 +70,7 @@
>- 	 */
>- 	allocation = (caddr_t) mmap(
>- 	 startAddr
>--	,(int)size
>-+	,size
>- 	,PROT_READ|PROT_WRITE
>- 	,MAP_PRIVATE|MAP_ANONYMOUS
>- 	,-1
>-@@ -122,7 +122,7 @@
>- 	 */
>- 	allocation = (caddr_t) mmap(
>- 	 startAddr
>--	,(int)size
>-+	,size
>- 	,PROT_READ|PROT_WRITE
>- 	,MAP_PRIVATE
>- 	,devZeroFd
>diff --git devel/ElectricFence/files/patch-page.c devel/ElectricFence/files/patch-page.c
>index 25d27763eb86..36ae90089756 100644
>--- devel/ElectricFence/files/patch-page.c
>+++ devel/ElectricFence/files/patch-page.c
>@@ -1,5 +1,5 @@
>---- page.c.orig	Sun Apr 11 14:45:26 1999
>-+++ page.c	Sat Aug 26 18:19:58 2000
>+--- page.c.orig	2020-01-27 13:08:36 UTC
>++++ page.c
> @@ -29,7 +29,7 @@
>  
>  static caddr_t	startAddr = (caddr_t) 0;
>@@ -9,3 +9,21 @@
>  extern int	sys_nerr;
>  extern char *	sys_errlist[];
>  #endif
>+@@ -70,7 +70,7 @@ Page_Create(size_t size)
>+ 	 */
>+ 	allocation = (caddr_t) mmap(
>+ 	 startAddr
>+-	,(int)size
>++	,size
>+ 	,PROT_READ|PROT_WRITE
>+ 	,MAP_PRIVATE|MAP_ANONYMOUS
>+ 	,-1
>+@@ -122,7 +122,7 @@ Page_Create(size_t size)
>+ 	 */
>+ 	allocation = (caddr_t) mmap(
>+ 	 startAddr
>+-	,(int)size
>++	,size
>+ 	,PROT_READ|PROT_WRITE
>+ 	,MAP_PRIVATE
>+ 	,devZeroFd
>diff --git devel/ElectricFence/files/patch-vaarg devel/ElectricFence/files/patch-vaarg
>deleted file mode 100644
>index a1576d9824ae..000000000000
>--- devel/ElectricFence/files/patch-vaarg
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- print.c	Thu Jan 19 23:54:26 1995
>-+++ print.c	Tue May 16 07:43:45 2000
>-@@ -99,7 +99,7 @@ vprint(const char * pattern, va_list arg
>- 				break;
>- 			case 'c':
>- 				{
>--					char	c = va_arg(args, char);
>-+					char	c = va_arg(args, int);
>- 					
>- 					(void) write(2, &c, 1);
>- 				}
>diff --git devel/Makefile devel/Makefile
>index 62cf7cc8736b..fee29ca09a0e 100644
>--- devel/Makefile
>+++ devel/Makefile
>@@ -5150,6 +5150,7 @@
>     SUBDIR += py-versiontools
>     SUBDIR += py-vine
>     SUBDIR += py-virtualenv
>+    SUBDIR += py-virtualenv20
>     SUBDIR += py-virtualenv-clone
>     SUBDIR += py-virtualenvwrapper
>     SUBDIR += py-visitor
>diff --git devel/adacurses/Makefile devel/adacurses/Makefile
>index 8de69bf8c37c..377845fe79af 100644
>--- devel/adacurses/Makefile
>+++ devel/adacurses/Makefile
>@@ -13,7 +13,7 @@ COMMENT=	Ada95 bindings for ncurses
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/README
> 
>-USES=		ada gmake pkgconfig ncurses:port tar:tgz
>+USES=		ada gmake pkgconfig ncurses tar:tgz
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-ada-include=${PREFIX}/include/adacurses \
> 		--with-ada-objects=${PREFIX}/lib/adacurses \
>diff --git devel/alog/Makefile devel/alog/Makefile
>index d1c229c88e2d..5353c5d29d44 100644
>--- devel/alog/Makefile
>+++ devel/alog/Makefile
>@@ -32,11 +32,6 @@ DOCS_ALL_TARGET=	doc
> TEST_BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
> TEST_ALL_TARGET=	tests
> 
>-post-patch:
>-	${REINPLACE_CMD} -e '/^NUM_CPUS/d' ${WRKSRC}/Makefile
>-	${REINPLACE_CMD} -e 's/$not-allowed$/NONEXISTENT\/\1/' \
>-		${WRKSRC}/tests/facility_tests-fd.adb
>-
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
> 		${STAGEDIR}${PREFIX}/lib/alog \
>diff --git devel/autoconf/Makefile devel/autoconf/Makefile
>index 730b5bf5b9f8..a8e2ce34b12c 100644
>--- devel/autoconf/Makefile
>+++ devel/autoconf/Makefile
>@@ -40,7 +40,7 @@ GENERIC_LINKS=	autoconf autoheader autom4te autoreconf autoscan autoupdate \
> 
> post-patch:
> 	@(cd ${WRKSRC}/man && \
>-		for file in *.[1x]; do \
>+		for file in autoconf.1 autoheader.1 autom4te.1 autoreconf.1 autoscan.1 autoupdate.1 common.x config.guess.1 config.guess.x config.sub.1 config.sub.x ifnames.1 ifnames.x ; do \
> 			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2-${BUILD_VERSION},g ; \
> 						s,(config\.guess|config\.sub|ifnames),\1-${BUILD_VERSION},g' $$file ; \
> 		done)
>diff --git devel/bison/Makefile devel/bison/Makefile
>index 6df05a8f9779..60ec4707d82f 100644
>--- devel/bison/Makefile
>+++ devel/bison/Makefile
>@@ -34,8 +34,4 @@ NLS_CONFIGURE_OFF=	ac_cv_libtextstyle=no
> NLS_LIB_DEPENDS=	libtextstyle.so:devel/libtextstyle
> NLS_USES=		gettext
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|$$(docdir)$/examples$|$$(datarootdir)\1/bison|' ${WRKSRC}/Makefile.in
>-	@${GREP} -l '_Noreturn void' ${WRKSRC}/lib/*.[ch] | ${XARGS} -J % ${REINPLACE_CMD} -e 's|$.*$ _Noreturn void|_Noreturn \1 void|' %
>-
> .include <bsd.port.mk>
>diff --git devel/boost-libs/Makefile devel/boost-libs/Makefile
>index 1f80672baafd..bcd2fa498310 100644
>--- devel/boost-libs/Makefile
>+++ devel/boost-libs/Makefile
>@@ -50,10 +50,4 @@ post-install:
> 
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
> 
>-	@${REINPLACE_CMD} \
>-		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
>-		-e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \
>-		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
>-		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
>-
> .include <bsd.port.mk>
>diff --git devel/bzr/Makefile devel/bzr/Makefile
>index 06318a137342..29f9e0abfeba 100644
>--- devel/bzr/Makefile
>+++ devel/bzr/Makefile
>@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=	SFTP CA_BUNDLE
> SFTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR}
> CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
> 
>-USES=		gettext python:2.7 shebangfix tar:xz
>+USES=		gettext python shebangfix tar:xz
> SHEBANG_FILES=	bzr
> USE_PYTHON=	distutils cython autoplist
> PYDISTUTILS_PKGNAME=	bzr
>diff --git devel/cvschk/Makefile devel/cvschk/Makefile
>index fbefce820b94..b0514d84dff8 100644
>--- devel/cvschk/Makefile
>+++ devel/cvschk/Makefile
>@@ -15,16 +15,17 @@ COMMENT=	Quick offline checker for CVS modifications
> 
> LICENSE=	GPLv1
> 
>-USES=		perl5
>+USES=		perl5 shebangfix
> USE_PERL5=	run
> NO_BUILD=	yes
> NO_WRKSUBDIR=	yes
>+SHEBANG_FILES=	${DISTNAME}
> 
>-PLIST_FILES=	bin/cvschk man/man1/cvschk.1.gz
>+PLIST_FILES=	bin/cvschk \
>+		man/man1/cvschk.1.gz
> 
>-do-configure:
>-	${SED} -e "s,^#!/usr/bin/perl -w,#! ${PERL} -w," \
>-	<${DISTDIR}/${DISTNAME} >${WRKSRC}/${DISTNAME}
>+do-extract:
>+	@${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${DISTNAME}
> 
> do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin
>diff --git devel/dee/Makefile devel/dee/Makefile
>index fe7e594b2bee..338637240a88 100644
>--- devel/dee/Makefile
>+++ devel/dee/Makefile
>@@ -16,7 +16,7 @@ LICENSE=	GPLv3
> BUILD_DEPENDS=	vapigen:lang/vala
> LIB_DEPENDS=	libicutu.so:devel/icu
> 
>-USES=		gmake gnome libtool localbase pathfix pkgconfig python:2.7
>+USES=		gmake gnome libtool localbase pathfix pkgconfig python
> GNU_CONFIGURE=	yes
> USE_GNOME=	glib20 introspection:build pygobject3
> USE_LDCONFIG=	yes
>diff --git devel/git/Makefile devel/git/Makefile
>index 721e603297dc..215f4ab16306 100644
>--- devel/git/Makefile
>+++ devel/git/Makefile
>@@ -24,7 +24,7 @@ CONFLICTS_INSTALL?=	git-gui-[0-9]* git-lite-[0-9]*
> USERS=		git_daemon
> GROUPS=		git_daemon
> 
>-SUB_FILES=	pkg-message gitweb.conf
>+SUB_FILES=	gitweb.conf pkg-message
> 
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-isystem${LOCALBASE}/include
>@@ -32,42 +32,41 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> MAKE_ARGS+=	DEVELOPER=
> MAKE_ENV+=	V=1
> USE_RC_SUBR=	git_daemon
>-SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
>-		t/*/*/pre t/*/*/post t/Git-SVN/Utils/*.t \
>-		git-p4.py \
>+SHEBANG_FILES=	*.perl */*.perl */*.pl */*/*.perl */*/*.pl */*/*/*.pl \
>+		contrib/buildsystems/generate contrib/contacts/git-contacts \
>+		contrib/credential/netrc/git-credential-netrc.perl \
>+		contrib/fast-import/import-zips.py \
> 		contrib/hg-to-git/hg-to-git.py \
>-		contrib/hooks/update-paranoid \
>-		contrib/hooks/multimail/post-receive.example \
> 		contrib/hooks/multimail/git_multimail.py \
> 		contrib/hooks/multimail/migrate-mailhook-config \
>-		contrib/fast-import/import-zips.py \
>+		contrib/hooks/multimail/post-receive.example \
>+		contrib/hooks/update-paranoid \
> 		contrib/remote-helpers/git-remote-bzr \
> 		contrib/remote-helpers/git-remote-hg \
>-		contrib/credential/netrc/git-credential-netrc.perl \
>-		contrib/buildsystems/generate contrib/contacts/git-contacts \
>-		contrib/svn-fe/svnrdump_sim.py \
>-		templates/hooks--fsmonitor-watchman.sample
>+		contrib/svn-fe/svnrdump_sim.py git-p4.py t/*/*/post t/*/*/pre \
>+		t/Git-SVN/Utils/*.t templates/hooks--fsmonitor-watchman.sample
> TEST_TARGET=	test
> 
>-CONFIGURE_ARGS=	--enable-pthreads=-pthread ac_cv_header_libcharset_h=no
>+CONFIGURE_ARGS=	--enable-pthreads=-pthread \
>+		ac_cv_header_libcharset_h=no
> 
>-OPTIONS_RADIO=	PCRE_VERSION
>+OPTIONS_RADIO=			PCRE_VERSION
> OPTIONS_RADIO_PCRE_VERSION=	PCRE PCRE2
>-OPTIONS_DEFINE=	GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
>-		SEND_EMAIL NLS SUBTREE
>-OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \
>-			SUBTREE SVN
>-OPTIONS_SUB=	yes
>-
>-CONTRIB_DESC=	Install contributed scripts
>-CURL_DESC=	Install curl support (provides HTTPS transport)
>-CVS_DESC=	Enable CVS support
>-GITWEB_DESC=	Install gitweb
>-HTMLDOCS_DESC=	Install additional documentation
>-P4_DESC=	Enable Perforce support
>-PCRE2_DESC=	Use Perl Compatible Regular Expressions (v2)
>-SEND_EMAIL_DESC=Enable the git-send-email(1) script
>-SUBTREE_DESC=	Install git-subtree
>+OPTIONS_DEFINE=			CONTRIB CURL CVS GITWEB GUI HTMLDOCS ICONV NLS \
>+				P4 PERL SEND_EMAIL SUBTREE SVN
>+OPTIONS_DEFAULT=		CONTRIB CURL CVS GITWEB ICONV P4 PCRE PERL \
>+				SEND_EMAIL SUBTREE SVN
>+OPTIONS_SUB=			yes
>+
>+CONTRIB_DESC=		Install contributed scripts
>+CURL_DESC=		Install curl support (provides HTTPS transport)
>+CVS_DESC=		Enable CVS support
>+GITWEB_DESC=		Install gitweb
>+HTMLDOCS_DESC=		Install additional documentation
>+P4_DESC=		Enable Perforce support
>+PCRE2_DESC=		Use Perl Compatible Regular Expressions (v2)
>+SEND_EMAIL_DESC=	Enable the git-send-email(1) script
>+SUBTREE_DESC=		Install git-subtree
> 
> NLS_USES=		gettext
> NLS_MAKE_ARGS_OFF=	NO_GETTEXT=yes
>@@ -97,12 +96,14 @@ CURL_MAKE_ENV=		CURLDIR=${LOCALBASE}
> CURL_BUILD_DEPENDS=	curl:ftp/curl
> CURL_RUN_DEPENDS=	curl:ftp/curl
> CURL_LIB_DEPENDS=	libexpat.so:textproc/expat2
>-CURL_MAKE_ARGS_OFF=	NO_CURL=1 NO_EXPAT=1
>+CURL_MAKE_ARGS_OFF=	NO_CURL=1 \
>+			NO_EXPAT=1
> 
> HTMLDOCS_DISTFILES=	${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX}
> 
> GUI_USES=		tk
>-GUI_MAKE_ARGS=		TCL_PATH=${TCLSH} TCLTK_PATH=${WISH}
>+GUI_MAKE_ARGS=		TCL_PATH=${TCLSH} \
>+			TCLTK_PATH=${WISH}
> GUI_MAKE_ARGS_OFF=	NO_TCLTK=yes
> 
> SVN_RUN_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
>@@ -112,7 +113,7 @@ SVN_RUN_DEPENDS+=	p5-subversion-lts>=0:devel/p5-subversion
> SVN_RUN_DEPENDS+=	p5-subversion>=0:devel/p5-subversion
> .endif
> 
>-SUBTREE_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor\
>+SUBTREE_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor \
> 			xmlto:textproc/xmlto
> 
> CVS_RUN_DEPENDS=	cvsps:devel/cvsps
>@@ -125,16 +126,14 @@ ALL_TARGET=	all strip
> .endif
> 
> .if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB}
>-USES+=		python
>+USES+=			python
> CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
> .else
> CONFIGURE_ARGS+=	--without-python
> .endif
> 
> .if empty(PORT_OPTIONS:MGUI)
>-RMMAN1+=	git-citool.1 \
>-		git-gui.1 \
>-		gitk.1
>+RMMAN1+=	git-citool.1 git-gui.1 gitk.1
> .endif
> 
> .if empty(PORT_OPTIONS:MSVN)
>@@ -142,9 +141,7 @@ RMMAN1+=	git-svn.1
> .endif
> 
> .if empty(PORT_OPTIONS:MCVS)
>-RMMAN1+=	git-cvsimport.1 \
>-		git-cvsexportcommit.1 \
>-		git-cvsserver.1
>+RMMAN1+=	git-cvsimport.1 git-cvsexportcommit.1 git-cvsserver.1
> RMMAN7+=	gitcvs-migration.7
> .endif
> 
>@@ -207,10 +204,10 @@ post-install:
> 		${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/
> 
> post-install-HTMLDOCS-on:
>-	# Manually remove the index.html symlink before installing, and then
>-	# recreate it after. This is necessary because the distfile is
>-	# extracted with --no-same-owner. If the distfile is extracted as a
>-	# non-root user then the symlink will have the incorrect owner.
>+# Manually remove the index.html symlink before installing, and then
>+# recreate it after. This is necessary because the distfile is
>+# extracted with --no-same-owner. If the distfile is extracted as a
>+# non-root user then the symlink will have the incorrect owner.
> 	${RM} ${WRKDIR}/htmldocs/index.html
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
>@@ -224,14 +221,14 @@ post-install-CONTRIB-on:
> 	@${ECHO_MSG} "===> Installing contributed scripts"
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/git-core/contrib
> 	${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib
>-	# Symlink the completions from the contrib directory to where they
>-	# will be useful
>+# Symlink the completions from the contrib directory to where they
>+# will be useful
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
> 	@${LN} -s ../../share/git-core/contrib/completion/git-completion.bash \
> 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
> 
> post-install-CONTRIB-off:
>-	# Install the contrib completions anyway
>+# Install the contrib completions anyway
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
> 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \
> 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
>diff --git devel/gobject-introspection/Makefile devel/gobject-introspection/Makefile
>index 44595c413a9b..696ed0517459 100644
>--- devel/gobject-introspection/Makefile
>+++ devel/gobject-introspection/Makefile
>@@ -2,14 +2,13 @@
> # $FreeBSD$
> 
> PORTNAME=	gobject-introspection
>-PORTVERSION=	1.56.1
>-PORTREVISION=	1
>+PORTVERSION=	1.64.1
> PORTEPOCH=	1
> CATEGORIES=	devel
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome
> 
>-MAINTAINER=	desktop@FreeBSD.org
>+MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Generate interface introspection data for GObject libraries
> 
> LICENSE=	GPLv2+ LGPL20+
>@@ -23,15 +22,31 @@ LIB_DEPENDS=	libffi.so:devel/libffi
> 
> PORTSCOUT=	limitw:1,even
> 
>-USES=		bison gettext gmake gnome libtool localbase pathfix \
>+USES=		bison gettext gnome localbase meson \
> 		pkgconfig python:3.4+ tar:xz
>-GNU_CONFIGURE=	yes
> USE_GNOME=	glib20
> USE_LDCONFIG=	yes
>-CONFIGURE_ARGS=	--disable-doctool
>-INSTALL_TARGET=	install-strip
>+
>+MESON_ARGS=	-Dpython=${PYTHON_CMD}
> 
> # Force it to put the .cache in ${WRKSRC} instead of ~/.cache. ports/143260
> MAKE_ENV=	HOME=${WRKDIR}
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|@PYTHON_CMD@|/usr/bin/env ${PYTHON_VERSION}|g' \
>+		${WRKSRC}/tools/g-ir-tool-template.in
>+
>+GIRLIBDIR=	${PREFIX}/lib/gobject-introspection/giscanner
>+
>+post-install:
>+# generates .py[co] files for installed modules
>+# if that's not done, ${PYTHON_SITELIBDIR}/gps will be polluted
>+# with these files when module is imported from root user
>+	@${FIND} ${STAGEDIR}${PREFIX} -name \*.pyc -delete
>+	(cd ${STAGEDIR}${PREFIX} && \
>+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
>+		-d ${GIRLIBDIR} -f ${GIRLIBDIR:S;${PREFIX}/;;} && \
>+	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
>+		-d ${GIRLIBDIR} -f ${GIRLIBDIR:S;${PREFIX}/;;})
>+
> .include <bsd.port.mk>
>diff --git devel/gobject-introspection/distinfo devel/gobject-introspection/distinfo
>index 1c74755dca5a..a987e4716b52 100644
>--- devel/gobject-introspection/distinfo
>+++ devel/gobject-introspection/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1525378740
>-SHA256 (gnome/gobject-introspection-1.56.1.tar.xz) = 5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b
>-SIZE (gnome/gobject-introspection-1.56.1.tar.xz) = 1397812
>+TIMESTAMP = 1586148225
>+SHA256 (gnome/gobject-introspection-1.64.1.tar.xz) = 80beae6728c134521926affff9b2e97125749b38d38744dc901f4010ee3e7fa7
>+SIZE (gnome/gobject-introspection-1.64.1.tar.xz) = 1000280
>diff --git devel/gobject-introspection/files/patch-tests_Makefile.in devel/gobject-introspection/files/patch-tests_Makefile.in
>deleted file mode 100644
>index ab3038962a15..000000000000
>--- devel/gobject-introspection/files/patch-tests_Makefile.in
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- tests/Makefile.in.orig	2017-04-17 10:01:31 UTC
>-+++ tests/Makefile.in
>-@@ -1257,7 +1257,7 @@ everything.h: everything-stamp.h
>- 	@true
>- 
>- Everything-1.0.gir: libeverything-1.0.la Makefile
>--	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
>-+	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error \
>- 	--namespace=Everything --nsversion=1.0 \
>- 	--libtool="$(LIBTOOL)" \
>- 	--add-include-path=$(top_builddir) --include=Gio-2.0 \
>-@@ -1266,7 +1266,7 @@ Everything-1.0.gir: libeverything-1.0.la Makefile
>- 	everything.h everything.c
>- 
>- GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile
>--	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \
>-+	$(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error \
>- 	--namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 \
>- 	--libtool="$(LIBTOOL)" \
>- 	--add-include-path=$(top_builddir) --include=Gio-2.0 \
>diff --git devel/gobject-introspection/pkg-plist devel/gobject-introspection/pkg-plist
>index 668eb0905282..07faa15a26c4 100644
>--- devel/gobject-introspection/pkg-plist
>+++ devel/gobject-introspection/pkg-plist
>@@ -22,6 +22,7 @@ include/gobject-introspection-1.0/gitypeinfo.h
> include/gobject-introspection-1.0/gitypelib.h
> include/gobject-introspection-1.0/gitypes.h
> include/gobject-introspection-1.0/giunioninfo.h
>+include/gobject-introspection-1.0/giversion.h
> include/gobject-introspection-1.0/giversionmacros.h
> include/gobject-introspection-1.0/givfuncinfo.h
> lib/girepository-1.0/DBus-1.0.typelib
>@@ -32,6 +33,7 @@ lib/girepository-1.0/GLib-2.0.typelib
> lib/girepository-1.0/GModule-2.0.typelib
> lib/girepository-1.0/GObject-2.0.typelib
> lib/girepository-1.0/Gio-2.0.typelib
>+lib/girepository-1.0/Vulkan-1.0.typelib
> lib/girepository-1.0/cairo-1.0.typelib
> lib/girepository-1.0/fontconfig-2.0.typelib
> lib/girepository-1.0/freetype2-2.0.typelib
>@@ -44,6 +46,8 @@ lib/girepository-1.0/xrandr-1.3.typelib
> lib/gobject-introspection/giscanner/__init__.py
> lib/gobject-introspection/giscanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
> lib/gobject-introspection/giscanner/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
>+lib/gobject-introspection/giscanner/__pycache__/_version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+lib/gobject-introspection/giscanner/__pycache__/_version.cpython-%%PYTHON_SUFFIX%%.pyc
> lib/gobject-introspection/giscanner/__pycache__/annotationmain.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
> lib/gobject-introspection/giscanner/__pycache__/annotationmain.cpython-%%PYTHON_SUFFIX%%.pyc
> lib/gobject-introspection/giscanner/__pycache__/annotationparser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>@@ -74,10 +78,14 @@ lib/gobject-introspection/giscanner/__pycache__/libtoolimporter.cpython-%%PYTHON
> lib/gobject-introspection/giscanner/__pycache__/libtoolimporter.cpython-%%PYTHON_SUFFIX%%.pyc
> lib/gobject-introspection/giscanner/__pycache__/maintransformer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
> lib/gobject-introspection/giscanner/__pycache__/maintransformer.cpython-%%PYTHON_SUFFIX%%.pyc
>+lib/gobject-introspection/giscanner/__pycache__/mdextensions.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+lib/gobject-introspection/giscanner/__pycache__/mdextensions.cpython-%%PYTHON_SUFFIX%%.pyc
> lib/gobject-introspection/giscanner/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
> lib/gobject-introspection/giscanner/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.pyc
> lib/gobject-introspection/giscanner/__pycache__/msvccompiler.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
> lib/gobject-introspection/giscanner/__pycache__/msvccompiler.cpython-%%PYTHON_SUFFIX%%.pyc
>+lib/gobject-introspection/giscanner/__pycache__/pkgconfig.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>+lib/gobject-introspection/giscanner/__pycache__/pkgconfig.cpython-%%PYTHON_SUFFIX%%.pyc
> lib/gobject-introspection/giscanner/__pycache__/scannermain.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
> lib/gobject-introspection/giscanner/__pycache__/scannermain.cpython-%%PYTHON_SUFFIX%%.pyc
> lib/gobject-introspection/giscanner/__pycache__/sectionparser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>@@ -94,69 +102,77 @@ lib/gobject-introspection/giscanner/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.
> lib/gobject-introspection/giscanner/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
> lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
> lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-%%PYTHON_SUFFIX%%.pyc
>-lib/gobject-introspection/giscanner/_giscanner.a
> lib/gobject-introspection/giscanner/_giscanner.so
>+lib/gobject-introspection/giscanner/_version.py
> lib/gobject-introspection/giscanner/annotationmain.py
> lib/gobject-introspection/giscanner/annotationparser.py
> lib/gobject-introspection/giscanner/ast.py
> lib/gobject-introspection/giscanner/cachestore.py
> lib/gobject-introspection/giscanner/ccompiler.py
> lib/gobject-introspection/giscanner/codegen.py
>-lib/gobject-introspection/giscanner/collections/__init__.py
>-lib/gobject-introspection/giscanner/collections/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-lib/gobject-introspection/giscanner/collections/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
>-lib/gobject-introspection/giscanner/collections/__pycache__/counter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-lib/gobject-introspection/giscanner/collections/__pycache__/counter.cpython-%%PYTHON_SUFFIX%%.pyc
>-lib/gobject-introspection/giscanner/collections/__pycache__/ordereddict.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-lib/gobject-introspection/giscanner/collections/__pycache__/ordereddict.cpython-%%PYTHON_SUFFIX%%.pyc
>-lib/gobject-introspection/giscanner/collections/counter.py
>-lib/gobject-introspection/giscanner/collections/ordereddict.py
> lib/gobject-introspection/giscanner/docmain.py
>-lib/gobject-introspection/giscanner/doctemplates/C/callback.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/class.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/constructor.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/default.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/enum.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/field.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/function.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/interface.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/method.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/namespace.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/property.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/record.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/signal.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/C/vfunc.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/callback.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/class.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/constructor.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/default.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/enum.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/field.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/function.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/interface.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/method.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/namespace.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/property.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/record.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/signal.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Gjs/vfunc.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/callback.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/class.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/constructor.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/default.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/enum.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/field.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/function.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/interface.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/method.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/namespace.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/property.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/record.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/signal.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/Python/vfunc.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/base.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/class.tmpl
>-lib/gobject-introspection/giscanner/doctemplates/namespace.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_doc.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_index.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_method.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_methods.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_properties.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_signals.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_staticmethods.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/_vfuncs.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/base.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/callback.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/class.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/default.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/enum.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/function.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/interface.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/method.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/devdocs/Gjs/namespace.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/callback.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/class.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/constructor.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/default.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/enum.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/field.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/function.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/interface.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/method.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/namespace.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/property.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/record.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/signal.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/C/vfunc.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/callback.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/class.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/constructor.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/default.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/enum.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/field.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/function.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/interface.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/method.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/namespace.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/property.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/record.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/signal.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Gjs/vfunc.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/callback.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/class.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/constructor.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/default.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/enum.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/field.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/function.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/interface.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/method.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/namespace.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/property.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/record.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/signal.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/Python/vfunc.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/base.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/class.tmpl
>+lib/gobject-introspection/giscanner/doctemplates/mallard/namespace.tmpl
> lib/gobject-introspection/giscanner/docwriter.py
> lib/gobject-introspection/giscanner/dumper.py
> lib/gobject-introspection/giscanner/gdumpparser.py
>@@ -165,8 +181,10 @@ lib/gobject-introspection/giscanner/girwriter.py
> lib/gobject-introspection/giscanner/introspectablepass.py
> lib/gobject-introspection/giscanner/libtoolimporter.py
> lib/gobject-introspection/giscanner/maintransformer.py
>+lib/gobject-introspection/giscanner/mdextensions.py
> lib/gobject-introspection/giscanner/message.py
> lib/gobject-introspection/giscanner/msvccompiler.py
>+lib/gobject-introspection/giscanner/pkgconfig.py
> lib/gobject-introspection/giscanner/scannermain.py
> lib/gobject-introspection/giscanner/sectionparser.py
> lib/gobject-introspection/giscanner/shlibs.py
>@@ -175,7 +193,6 @@ lib/gobject-introspection/giscanner/testcodegen.py
> lib/gobject-introspection/giscanner/transformer.py
> lib/gobject-introspection/giscanner/utils.py
> lib/gobject-introspection/giscanner/xmlwriter.py
>-lib/libgirepository-1.0.a
> lib/libgirepository-1.0.so
> lib/libgirepository-1.0.so.1
> lib/libgirepository-1.0.so.1.0.0
>@@ -193,6 +210,7 @@ share/gir-1.0/GLib-2.0.gir
> share/gir-1.0/GModule-2.0.gir
> share/gir-1.0/GObject-2.0.gir
> share/gir-1.0/Gio-2.0.gir
>+share/gir-1.0/Vulkan-1.0.gir
> share/gir-1.0/cairo-1.0.gir
> share/gir-1.0/fontconfig-2.0.gir
> share/gir-1.0/freetype2-2.0.gir
>diff --git devel/libublio/Makefile devel/libublio/Makefile
>index 251d086cd48f..626925e1aeb9 100644
>--- devel/libublio/Makefile
>+++ devel/libublio/Makefile
>@@ -12,6 +12,8 @@ COMMENT=	User space caching library
> 
> LICENSE=	BSD2CLAUSE
> 
>+USES=		uidfix
>+
> USE_LDCONFIG=	yes
> 
> .if defined(NO_PROFILE) || defined(NOPROFILE) || defined(WITHOUT_PROFILE) || "${MK_PROFILE}" == "no"
>@@ -20,26 +22,18 @@ PLIST_SUB+=	PROFLIB="@comment "
> PLIST_SUB+=	PROFLIB=""
> .endif
> 
>-USES=		uidfix
>-
> SRCCONF=	/dev/null
> MAKE_ENV+=	SRCCONF=${SRCCONF}
> 
> SUB_FILES=	libublio.pc
>-SUB_LIST=	PREFIX=${PREFIX} PORTVERSION=${PORTVERSION}
>+SUB_LIST=	PORTVERSION=${PORTVERSION} \
>+		PREFIX=${PREFIX}
> 
> OPTIONS_DEFINE=	DOCS
> 
> post-extract:
> 	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}
> 
>-# this pre-install is only for debugging pointyhat failures
>-pre-install:
>-	@${ECHO_CMD} "===> Environment:"
>-	@${SETENV} | ${SORT} -f
>-	@${ECHO_CMD} "===> Makefiles used:"
>-	@${ECHO_CMD} ${.MAKEFILE_LIST}
>-
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
>diff --git devel/lion/Makefile devel/lion/Makefile
>index da21b9ead61c..6109482d3c74 100644
>--- devel/lion/Makefile
>+++ devel/lion/Makefile
>@@ -22,10 +22,6 @@ INCLUDES=	base64.h connections.h io.h lfnmatch.h lgroup.h lion.h \
> 		lion_rcsid.h lion_types.h misc.h pipe.h sockets.h \
> 		timers.h tls.h udp.h zlib.h
> 
>-post-patch:
>-	@${REINPLACE_CMD} -E 's,^(CC|LDFLAGS) *=,\1 ?=,' \
>-		${WRKSRC}/Makefile
>-
> do-install:
> 	${INSTALL_DATA} ${WRKSRC}/liblion.a ${STAGEDIR}${PREFIX}/lib
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/lion
>diff --git devel/newt/Makefile devel/newt/Makefile
>index 022e6e1f6f6e..12b9f17e56d4 100644
>--- devel/newt/Makefile
>+++ devel/newt/Makefile
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	newt
>-PORTVERSION=	0.52.20
>-PORTREVISION=	1
>+PORTVERSION=	0.52.21
> CATEGORIES=	devel
> MASTER_SITES=	https://releases.pagure.org/newt/
> 
>@@ -12,14 +11,13 @@ COMMENT=	Not Eriks Windowing Toolkit: console I/O handling library
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libslang.so:devel/libslang2 \
>-		libpopt.so:devel/popt
>+LIB_DEPENDS=	libpopt.so:devel/popt \
>+		libslang.so:devel/libslang2
> 
> USES=		gmake ncurses pathfix
> GNU_CONFIGURE=	yes
> MAKE_ENV=	PCFLAGS="${CFLAGS}"
> USE_LDCONFIG=	yes
>-MAKE_JOBS_UNSAFE=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib -lncurses
>@@ -37,7 +35,7 @@ OPTIONS_SUB=		yes
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
> PYTHON_USES=		python
>-PYTHON_CONFIGURE_WITH=	python
>+PYTHON_CONFIGURE_WITH=	python=python${PYTHON_VER}
> TCL_USES=		tcl
> TCL_CONFIGURE_ENV=	ac_cv_c_tclconfig=${TCL_LIBDIR:Q}
> TCL_CONFIGURE_WITH=	tcl
>@@ -56,10 +54,6 @@ post-patch:
> 		 /make -C/s|^|#| ; \
> 		 /whiptcl.$$(SOEXT)/s|install|${TRUE}|' ${WRKSRC}/Makefile.in
> 
>-post-patch-PYTHON-on:
>-	@${REINPLACE_CMD} -e \
>-		'/PYTHONVERS/s|=.*|=${PYTHON_VERSION}|' ${WRKSRC}/configure
>-
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnewt.so
>diff --git devel/newt/distinfo devel/newt/distinfo
>index 38ab26fec151..a540155716b8 100644
>--- devel/newt/distinfo
>+++ devel/newt/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1489932281
>-SHA256 (newt-0.52.20.tar.gz) = 8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc
>-SIZE (newt-0.52.20.tar.gz) = 181163
>+TIMESTAMP = 1595562796
>+SHA256 (newt-0.52.21.tar.gz) = 265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31
>+SIZE (newt-0.52.21.tar.gz) = 174895
>diff --git devel/pcre/Makefile devel/pcre/Makefile
>index 4f627869bf07..12c420bd8b97 100644
>--- devel/pcre/Makefile
>+++ devel/pcre/Makefile
>@@ -89,8 +89,44 @@ CONFIGURE_ARGS+=	--enable-jit
> CONFIGURE_ARGS+=	--disable-jit
> .endif
> 
>+RSLIST=		${WRKSRC}/doc/pcre-config.1 ${WRKSRC}/doc/pcre.3 \
>+		${WRKSRC}/doc/pcre16.3 ${WRKSRC}/doc/pcre32.3 \
>+		${WRKSRC}/doc/pcre_assign_jit_stack.3 \
>+		${WRKSRC}/doc/pcre_compile.3 ${WRKSRC}/doc/pcre_compile2.3 \
>+		${WRKSRC}/doc/pcre_config.3 \
>+		${WRKSRC}/doc/pcre_copy_named_substring.3 \
>+		${WRKSRC}/doc/pcre_copy_substring.3 \
>+		${WRKSRC}/doc/pcre_dfa_exec.3 ${WRKSRC}/doc/pcre_exec.3 \
>+		${WRKSRC}/doc/pcre_free_study.3 \
>+		${WRKSRC}/doc/pcre_free_substring.3 \
>+		${WRKSRC}/doc/pcre_free_substring_list.3 \
>+		${WRKSRC}/doc/pcre_fullinfo.3 \
>+		${WRKSRC}/doc/pcre_get_named_substring.3 \
>+		${WRKSRC}/doc/pcre_get_stringnumber.3 \
>+		${WRKSRC}/doc/pcre_get_stringtable_entries.3 \
>+		${WRKSRC}/doc/pcre_get_substring.3 \
>+		${WRKSRC}/doc/pcre_get_substring_list.3 \
>+		${WRKSRC}/doc/pcre_jit_exec.3 \
>+		${WRKSRC}/doc/pcre_jit_stack_alloc.3 \
>+		${WRKSRC}/doc/pcre_jit_stack_free.3 \
>+		${WRKSRC}/doc/pcre_maketables.3 \
>+		${WRKSRC}/doc/pcre_pattern_to_host_byte_order.3 \
>+		${WRKSRC}/doc/pcre_refcount.3 ${WRKSRC}/doc/pcre_study.3 \
>+		${WRKSRC}/doc/pcre_utf16_to_host_byte_order.3 \
>+		${WRKSRC}/doc/pcre_utf32_to_host_byte_order.3 \
>+		${WRKSRC}/doc/pcre_version.3 ${WRKSRC}/doc/pcreapi.3 \
>+		${WRKSRC}/doc/pcrebuild.3 ${WRKSRC}/doc/pcrecallout.3 \
>+		${WRKSRC}/doc/pcrecompat.3 ${WRKSRC}/doc/pcrecpp.3 \
>+		${WRKSRC}/doc/pcregrep.1 ${WRKSRC}/doc/pcrejit.3 \
>+		${WRKSRC}/doc/pcrelimits.3 ${WRKSRC}/doc/pcrematching.3 \
>+		${WRKSRC}/doc/pcrepartial.3 ${WRKSRC}/doc/pcrepattern.3 \
>+		${WRKSRC}/doc/pcreperform.3 ${WRKSRC}/doc/pcreposix.3 \
>+		${WRKSRC}/doc/pcreprecompile.3 ${WRKSRC}/doc/pcresample.3 \
>+		${WRKSRC}/doc/pcrestack.3 ${WRKSRC}/doc/pcresyntax.3 \
>+		${WRKSRC}/doc/pcretest.1 ${WRKSRC}/doc/pcreunicode.3
>+
> post-patch:
>-	@${REINPLACE_CMD} -e "/^\.rs/d" ${WRKSRC}/doc/*.3 ${WRKSRC}/doc/*.1
>+	@${REINPLACE_CMD} -e "/^\.rs/d" ${RSLIST}
> 	@${REINPLACE_CMD} -e "s/Â£//g" ${WRKSRC}/doc/pcre_compile2.3
> 
> .include <bsd.port.post.mk>
>diff --git devel/protobuf-c/Makefile devel/protobuf-c/Makefile
>index c9dbe5234d12..fc5d03fe69c9 100644
>--- devel/protobuf-c/Makefile
>+++ devel/protobuf-c/Makefile
>@@ -25,7 +25,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
> OPTIONS_DEFINE=	DOXYGEN DOCS
>-OPTIONS_DEFAULT=	DOXYGEN
> 
> PORTDOCS=	*
> 
>diff --git devel/py-argcomplete/Makefile devel/py-argcomplete/Makefile
>index cda48f094232..6407bd23caf1 100644
>--- devel/py-argcomplete/Makefile
>+++ devel/py-argcomplete/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	argcomplete
> PORTVERSION=	1.12.0
>+PORTREVISION=	1
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -26,7 +27,7 @@ NO_ARCH=	yes
> .include <bsd.port.pre.mk>
> 
> .if ${PYTHON_REL} < 3800
>-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.23<2:devel/py-importlib-metadata@${PY_FLAVOR}
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.23:devel/py-importlib-metadata@${PY_FLAVOR}
> .endif
> 
> .include <bsd.port.post.mk>
>diff --git devel/py-backports.functools_lru_cache/Makefile devel/py-backports.functools_lru_cache/Makefile
>index 9a87b971023a..3c288ff5216f 100644
>--- devel/py-backports.functools_lru_cache/Makefile
>+++ devel/py-backports.functools_lru_cache/Makefile
>@@ -11,6 +11,9 @@ COMMENT=	Backport of functools.lru_cache from Python 3.3
> 
> LICENSE=	MIT
> 
>+DEPRECATED=	Python 2 is EOL upstream
>+EXPIRATION_DATE=	2020-12-31
>+
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${PY_FLAVOR}
> 
>diff --git devel/py-backports.os/Makefile devel/py-backports.os/Makefile
>index 3f196caa981d..a6b1497f86af 100644
>--- devel/py-backports.os/Makefile
>+++ devel/py-backports.os/Makefile
>@@ -12,6 +12,9 @@ COMMENT=	Backport of new features in Python's os module
> LICENSE=	PSFL
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+DEPRECATED=	Python 2 is EOL upstream
>+EXPIRATION_DATE=	2020-12-31
>+
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR}
>diff --git devel/py-backports_abc/Makefile devel/py-backports_abc/Makefile
>index c72a9c997c95..e414cd75bea9 100644
>--- devel/py-backports_abc/Makefile
>+++ devel/py-backports_abc/Makefile
>@@ -12,6 +12,9 @@ COMMENT=	Backport of recent additions to the 'collections.abc' module
> 
> LICENSE=	PSFL
> 
>+DEPRECATED=	Python 2 is EOL upstream
>+EXPIRATION_DATE=	2020-12-31
>+
> USES=		python:2.7
> USE_PYTHON=	autoplist distutils
> 
>diff --git devel/py-celery/Makefile devel/py-celery/Makefile
>index 7abf3f30507b..3308f50a37b2 100644
>--- devel/py-celery/Makefile
>+++ devel/py-celery/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	celery
>-PORTVERSION=	4.4.2
>+PORTVERSION=	4.4.4
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}kombu>=4.6.8:net/py-kombu@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}kombu>=4.6.10:net/py-kombu@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}vine>=1.3.0:devel/py-vine@${PY_FLAVOR}
> 
> NO_ARCH=	yes
>diff --git devel/py-celery/distinfo devel/py-celery/distinfo
>index 357687e37ff9..1e6b8875d3a7 100644
>--- devel/py-celery/distinfo
>+++ devel/py-celery/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1586284339
>-SHA256 (celery-4.4.2.tar.gz) = 108a0bf9018a871620936c33a3ee9f6336a89f8ef0a0f567a9001f4aa361415f
>-SIZE (celery-4.4.2.tar.gz) = 1448133
>+TIMESTAMP = 1591193469
>+SHA256 (celery-4.4.4.tar.gz) = c2037b6a8463da43b19969a0fc13f9023ceca6352b4dd51be01c66fbbb13647e
>+SIZE (celery-4.4.4.tar.gz) = 1461880
>diff --git devel/py-coverage/Makefile devel/py-coverage/Makefile
>index f4ec691fc439..84b89932f2ad 100644
>--- devel/py-coverage/Makefile
>+++ devel/py-coverage/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	coverage
>-PORTVERSION=	4.5.4
>+PORTVERSION=	5.2
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -11,6 +11,8 @@ COMMENT=	Code coverage measurement for Python
> 
> LICENSE=	BSD2CLAUSE
> 
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
>+
> USES=		python
> USE_PYTHON=	autoplist concurrent distutils
> 
>diff --git devel/py-coverage/distinfo devel/py-coverage/distinfo
>index 026314575a21..a3da4edddb64 100644
>--- devel/py-coverage/distinfo
>+++ devel/py-coverage/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1568761933
>-SHA256 (coverage-4.5.4.tar.gz) = e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c
>-SIZE (coverage-4.5.4.tar.gz) = 385185
>+TIMESTAMP = 1595299825
>+SHA256 (coverage-5.2.tar.gz) = 1874bdc943654ba46d28f179c1846f5710eda3aeb265ff029e0ac2b52daae404
>+SIZE (coverage-5.2.tar.gz) = 693669
>diff --git devel/py-gitpython/Makefile devel/py-gitpython/Makefile
>index 94684b9c22dc..e472ad6c402a 100644
>--- devel/py-gitpython/Makefile
>+++ devel/py-gitpython/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	GitPython
>-DISTVERSION=	2.1.11
>+DISTVERSION=	3.1.2
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -12,9 +12,9 @@ COMMENT=	Python Git Library
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ddt>=1.1.1:devel/py-ddt@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}gitdb2>=2.0.0:devel/py-gitdb2@${PY_FLAVOR}
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gitdb>=4.0.1:devel/py-gitdb@${PY_FLAVOR}
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ddt>=1.1.1:devel/py-ddt@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
> 
> NO_ARCH=	yes
>diff --git devel/py-gitpython/distinfo devel/py-gitpython/distinfo
>index 66101f718d68..6ef820e7d7b5 100644
>--- devel/py-gitpython/distinfo
>+++ devel/py-gitpython/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1545318709
>-SHA256 (GitPython-2.1.11.tar.gz) = 8237dc5bfd6f1366abeee5624111b9d6879393d84745a507de0fda86043b65a8
>-SIZE (GitPython-2.1.11.tar.gz) = 428531
>+TIMESTAMP = 1590775069
>+SHA256 (GitPython-3.1.2.tar.gz) = 864a47472548f3ba716ca202e034c1900f197c0fb3a08f641c20c3cafd15ed94
>+SIZE (GitPython-3.1.2.tar.gz) = 430474
>diff --git devel/py-gobject/Makefile devel/py-gobject/Makefile
>index 4e0bd1a75fa9..a1a35f186ac2 100644
>--- devel/py-gobject/Makefile
>+++ devel/py-gobject/Makefile
>@@ -3,8 +3,7 @@
> #   $MCom: ports/devel/py-gobject/Makefile,v 1.58 2012/12/30 18:15:16 mezz Exp $
> 
> PORTNAME=	gobject
>-PORTVERSION=	2.28.6
>-PORTREVISION=	9
>+PORTVERSION=	3.38.0
> CATEGORIES=	devel python
> MASTER_SITES=	GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -16,21 +15,19 @@ COMMENT=	Python bindings for GObject
> 
> LICENSE=	LGPL21
> 
>-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo@${PY_FLAVOR}
>+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py-cairo@${PY_FLAVOR}
> LIB_DEPENDS+=	libffi.so:devel/libffi
>-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo@${PY_FLAVOR}
>+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py-cairo@${PY_FLAVOR}
> 
> PORTSCOUT=	ignore:1
> 
>-USES=		gmake gnome libtool pathfix pkgconfig python:2.7 shebangfix \
>-		tar:xz
>-USE_GNOME=	glib20 introspection:build,run
>-USE_PYTHON=	flavors
>-GNU_CONFIGURE=	yes
>+USES=		gmake gnome libtool pathfix pkgconfig python:3.5+ tar:xz
>+# meson
>+USE_GNOME=	glib20 introspection:build,run cairo
>+USE_PYTHON=	flavors distutils
> USE_LDCONFIG=	yes
>-CONFIGURE_ARGS=	--disable-docs --disable-introspection --with-ffi
>-INSTALL_TARGET=	install-strip
>-SHEBANG_FILES=	codegen/*.py
>+
>+BINARY_ALIAS=	python3=${PYTHON_CMD}
> 
> CONFLICTS=	py*-gtk-0*
> PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
>diff --git devel/py-gobject/distinfo devel/py-gobject/distinfo
>index f1fb587ffbe8..3c8c73f5c126 100644
>--- devel/py-gobject/distinfo
>+++ devel/py-gobject/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (gnome2/pygobject-2.28.6.tar.xz) = fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8
>-SIZE (gnome2/pygobject-2.28.6.tar.xz) = 747248
>+TIMESTAMP = 1600140878
>+SHA256 (gnome2/pygobject-3.38.0.tar.xz) = 0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5
>+SIZE (gnome2/pygobject-3.38.0.tar.xz) = 553892
>diff --git devel/py-gobject/files/patch-docs_Makefile.in devel/py-gobject/files/patch-docs_Makefile.in
>deleted file mode 100644
>index 39d35befb083..000000000000
>--- devel/py-gobject/files/patch-docs_Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- docs/Makefile.in.orig	Sat May  5 01:25:03 2007
>-+++ docs/Makefile.in	Sat May  5 01:25:39 2007
>-@@ -223,7 +223,7 @@ XSL_FILES = \
>- # fixxref cannot be included in XSL_FILES, because automake is touching it
>- # so the date is newer then the files in HTML_FILES
>- FIXXREF = xsl/fixxref.py
>--TARGET_DIR = $(datadir)/gtk-doc/html/pygobject
>-+TARGET_DIR = $(prefix)/share/doc/pygobject
>- CSSdir = $(TARGET_DIR)
>- CSS_DATA = $(CSS_FILES)
>- XSLdir = $(datadir)/pygobject/xsl
>diff --git devel/py-gobject/files/patch-gi_pygi-info.c devel/py-gobject/files/patch-gi_pygi-info.c
>deleted file mode 100644
>index 75ab80f5a515..000000000000
>--- devel/py-gobject/files/patch-gi_pygi-info.c
>+++ /dev/null
>@@ -1,28 +0,0 @@
>---- gi/pygi-info.c.orig	2011-09-17 10:24:16.000000000 +0200
>-+++ gi/pygi-info.c	2011-09-17 10:24:40.000000000 +0200
>-@@ -162,9 +162,6 @@ _pygi_info_new (GIBaseInfo *info)
>-         case GI_INFO_TYPE_CONSTANT:
>-             type = &PyGIConstantInfo_Type;
>-             break;
>--        case GI_INFO_TYPE_ERROR_DOMAIN:
>--            type = &PyGIErrorDomainInfo_Type;
>--            break;
>-         case GI_INFO_TYPE_UNION:
>-             type = &PyGIUnionInfo_Type;
>-             break;
>-@@ -481,7 +478,6 @@ _pygi_g_type_info_size (GITypeInfo *type
>-                 case GI_INFO_TYPE_INVALID:
>-                 case GI_INFO_TYPE_FUNCTION:
>-                 case GI_INFO_TYPE_CONSTANT:
>--                case GI_INFO_TYPE_ERROR_DOMAIN:
>-                 case GI_INFO_TYPE_VALUE:
>-                 case GI_INFO_TYPE_SIGNAL:
>-                 case GI_INFO_TYPE_PROPERTY:
>-@@ -860,7 +856,6 @@ pygi_g_struct_info_is_simple (GIStructIn
>-                     case GI_INFO_TYPE_INVALID:
>-                     case GI_INFO_TYPE_FUNCTION:
>-                     case GI_INFO_TYPE_CONSTANT:
>--                    case GI_INFO_TYPE_ERROR_DOMAIN:
>-                     case GI_INFO_TYPE_VALUE:
>-                     case GI_INFO_TYPE_SIGNAL:
>-                     case GI_INFO_TYPE_PROPERTY:
>diff --git devel/py-gobject/files/patch-gio-gio-types.defs devel/py-gobject/files/patch-gio-gio-types.defs
>deleted file mode 100644
>index 427fb58ddd60..000000000000
>--- devel/py-gobject/files/patch-gio-gio-types.defs
>+++ /dev/null
>@@ -1,29 +0,0 @@
>---- gio/gio-types.defs.orig	2011-06-13 18:33:49.000000000 +0200
>-+++ gio/gio-types.defs	2013-09-13 01:14:09.000000000 +0200
>-@@ -526,7 +526,7 @@
>-   )
>- )
>- 
>--(define-enum MountMountFlags
>-+(define-flags MountMountFlags
>-   (in-module "gio")
>-   (c-name "GMountMountFlags")
>-   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
>-@@ -545,7 +545,7 @@
>-   )
>- )
>- 
>--(define-enum DriveStartFlags
>-+(define-flags DriveStartFlags
>-   (in-module "gio")
>-   (c-name "GDriveStartFlags")
>-   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
>-@@ -770,7 +770,7 @@
>-   )
>- )
>- 
>--(define-enum SocketMsgFlags
>-+(define-flags SocketMsgFlags
>-   (in-module "gio")
>-   (c-name "GSocketMsgFlags")
>-   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
>diff --git devel/py-gobject/files/patch-pygobject-2.0.pc.in devel/py-gobject/files/patch-pygobject-2.0.pc.in
>deleted file mode 100644
>index 76ee71ccdca0..000000000000
>--- devel/py-gobject/files/patch-pygobject-2.0.pc.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- pygobject-2.0.pc.in.orig	2008-09-03 15:31:23.000000000 +0000
>-+++ pygobject-2.0.pc.in	2008-09-03 15:31:43.000000000 +0000
>-@@ -10,7 +10,7 @@
>- # install additional headers.
>- pygtkincludedir=${includedir}/pygtk-2.0
>- fixxref=${datadir}/pygobject/xsl/fixxref.py
>--pygdocs=${datadir}/gtk-doc/html/pygobject
>-+pygdocs=${datadir}/doc/pygobject
>- defsdir=${datadir}/pygobject/2.0/defs
>- codegendir=${datadir}/pygobject/2.0/codegen
>- 
>diff --git devel/py-gobject/pkg-plist devel/py-gobject/pkg-plist
>index 8074638f4d9f..9e12f0554fd2 100644
>--- devel/py-gobject/pkg-plist
>+++ devel/py-gobject/pkg-plist
>@@ -1,190 +1,91 @@
>-bin/pygobject-codegen-2.0
>-include/pygtk-2.0/pyglib.h
>-include/pygtk-2.0/pygobject.h
>-lib/libpyglib-2.0-%%PYTHON_VERSION%%.so
>-lib/libpyglib-2.0-%%PYTHON_VERSION%%.so.0
>-lib/libpyglib-2.0-%%PYTHON_VERSION%%.so.0.0.0
>-%%PYTHON_SITELIBDIR%%/glib/__init__.py
>-%%PYTHON_SITELIBDIR%%/glib/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/glib/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/glib/_glib.so
>-%%PYTHON_SITELIBDIR%%/glib/option.py
>-%%PYTHON_SITELIBDIR%%/glib/option.pyc
>-%%PYTHON_SITELIBDIR%%/glib/option.pyo
>-%%PYTHON_SITELIBDIR%%/gobject/__init__.py
>-%%PYTHON_SITELIBDIR%%/gobject/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/gobject/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/gobject/_gobject.so
>-%%PYTHON_SITELIBDIR%%/gobject/constants.py
>-%%PYTHON_SITELIBDIR%%/gobject/constants.pyc
>-%%PYTHON_SITELIBDIR%%/gobject/constants.pyo
>-%%PYTHON_SITELIBDIR%%/gobject/propertyhelper.py
>-%%PYTHON_SITELIBDIR%%/gobject/propertyhelper.pyc
>-%%PYTHON_SITELIBDIR%%/gobject/propertyhelper.pyo
>-%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py
>-%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc
>-%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo
>-%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.py
>-%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so
>-%%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so
>-%%PYTHON_SITELIBDIR%%/pygtk.pth
>-%%PYTHON_SITELIBDIR%%/pygtk.py
>-%%PYTHON_SITELIBDIR%%/pygtk.pyc
>-%%PYTHON_SITELIBDIR%%/pygtk.pyo
>-libdata/pkgconfig/pygobject-2.0.pc
>-share/doc/pygobject/class-gioappinfo.html
>-share/doc/pygobject/class-gioapplaunchcontext.html
>-share/doc/pygobject/class-gioasyncresult.html
>-share/doc/pygobject/class-giobufferedinputstream.html
>-share/doc/pygobject/class-giobufferedoutputstream.html
>-share/doc/pygobject/class-giocancellable.html
>-share/doc/pygobject/class-giodatainputstream.html
>-share/doc/pygobject/class-giodataoutputstream.html
>-share/doc/pygobject/class-giodrive.html
>-share/doc/pygobject/class-gioemblem.html
>-share/doc/pygobject/class-gioemblemedicon.html
>-share/doc/pygobject/class-giofile.html
>-share/doc/pygobject/class-giofileattributeinfo.html
>-share/doc/pygobject/class-giofileenumerator.html
>-share/doc/pygobject/class-giofileicon.html
>-share/doc/pygobject/class-giofileinfo.html
>-share/doc/pygobject/class-giofileinputstream.html
>-share/doc/pygobject/class-giofilemonitor.html
>-share/doc/pygobject/class-giofileoutputstream.html
>-share/doc/pygobject/class-giofilterinputstream.html
>-share/doc/pygobject/class-giofilteroutputstream.html
>-share/doc/pygobject/class-gioicon.html
>-share/doc/pygobject/class-gioinputstream.html
>-share/doc/pygobject/class-gioloadableicon.html
>-share/doc/pygobject/class-giomemoryinputstream.html
>-share/doc/pygobject/class-giomemoryoutputstream.html
>-share/doc/pygobject/class-giomount.html
>-share/doc/pygobject/class-giomountoperation.html
>-share/doc/pygobject/class-giooutputstream.html
>-share/doc/pygobject/class-gioseekable.html
>-share/doc/pygobject/class-giosimpleasyncresult.html
>-share/doc/pygobject/class-giothemedicon.html
>-share/doc/pygobject/class-giounixinputstream.html
>-share/doc/pygobject/class-giounixoutputstream.html
>-share/doc/pygobject/class-giovolume.html
>-share/doc/pygobject/class-giovolumemonitor.html
>-share/doc/pygobject/class-glibmaincontext.html
>-share/doc/pygobject/class-glibmainloop.html
>-share/doc/pygobject/class-gobject.html
>-share/doc/pygobject/class-gobjectgboxed.html
>-share/doc/pygobject/class-gobjectginterface.html
>-share/doc/pygobject/class-gobjectgpointer.html
>-share/doc/pygobject/gio-class-reference.html
>-share/doc/pygobject/gio-constants.html
>-share/doc/pygobject/gio-functions.html
>-share/doc/pygobject/giounix-class-reference.html
>-share/doc/pygobject/glib-class-reference.html
>-share/doc/pygobject/glib-constants.html
>-share/doc/pygobject/glib-functions.html
>-share/doc/pygobject/gobject-class-reference.html
>-share/doc/pygobject/gobject-constants.html
>-share/doc/pygobject/gobject-functions.html
>-share/doc/pygobject/index.html
>-share/doc/pygobject/index.sgml
>-share/doc/pygobject/pygobject-introduction.html
>-share/doc/pygobject/pygobject.devhelp
>-share/doc/pygobject/style.css
>-share/pygobject/2.0/codegen/__init__.py
>-share/pygobject/2.0/codegen/__init__.pyc
>-share/pygobject/2.0/codegen/__init__.pyo
>-share/pygobject/2.0/codegen/argtypes.py
>-share/pygobject/2.0/codegen/argtypes.pyc
>-share/pygobject/2.0/codegen/argtypes.pyo
>-share/pygobject/2.0/codegen/code-coverage.py
>-share/pygobject/2.0/codegen/code-coverage.pyc
>-share/pygobject/2.0/codegen/code-coverage.pyo
>-share/pygobject/2.0/codegen/codegen.py
>-share/pygobject/2.0/codegen/codegen.pyc
>-share/pygobject/2.0/codegen/codegen.pyo
>-share/pygobject/2.0/codegen/createdefs.py
>-share/pygobject/2.0/codegen/createdefs.pyc
>-share/pygobject/2.0/codegen/createdefs.pyo
>-share/pygobject/2.0/codegen/definitions.py
>-share/pygobject/2.0/codegen/definitions.pyc
>-share/pygobject/2.0/codegen/definitions.pyo
>-share/pygobject/2.0/codegen/defsconvert.py
>-share/pygobject/2.0/codegen/defsconvert.pyc
>-share/pygobject/2.0/codegen/defsconvert.pyo
>-share/pygobject/2.0/codegen/defsgen.py
>-share/pygobject/2.0/codegen/defsgen.pyc
>-share/pygobject/2.0/codegen/defsgen.pyo
>-share/pygobject/2.0/codegen/defsparser.py
>-share/pygobject/2.0/codegen/defsparser.pyc
>-share/pygobject/2.0/codegen/defsparser.pyo
>-share/pygobject/2.0/codegen/docextract.py
>-share/pygobject/2.0/codegen/docextract.pyc
>-share/pygobject/2.0/codegen/docextract.pyo
>-share/pygobject/2.0/codegen/docextract_to_xml.py
>-share/pygobject/2.0/codegen/docextract_to_xml.pyc
>-share/pygobject/2.0/codegen/docextract_to_xml.pyo
>-share/pygobject/2.0/codegen/docgen.py
>-share/pygobject/2.0/codegen/docgen.pyc
>-share/pygobject/2.0/codegen/docgen.pyo
>-share/pygobject/2.0/codegen/h2def.py
>-share/pygobject/2.0/codegen/h2def.pyc
>-share/pygobject/2.0/codegen/h2def.pyo
>-share/pygobject/2.0/codegen/mergedefs.py
>-share/pygobject/2.0/codegen/mergedefs.pyc
>-share/pygobject/2.0/codegen/mergedefs.pyo
>-share/pygobject/2.0/codegen/missingdefs.py
>-share/pygobject/2.0/codegen/missingdefs.pyc
>-share/pygobject/2.0/codegen/missingdefs.pyo
>-share/pygobject/2.0/codegen/mkskel.py
>-share/pygobject/2.0/codegen/mkskel.pyc
>-share/pygobject/2.0/codegen/mkskel.pyo
>-share/pygobject/2.0/codegen/override.py
>-share/pygobject/2.0/codegen/override.pyc
>-share/pygobject/2.0/codegen/override.pyo
>-share/pygobject/2.0/codegen/reversewrapper.py
>-share/pygobject/2.0/codegen/reversewrapper.pyc
>-share/pygobject/2.0/codegen/reversewrapper.pyo
>-share/pygobject/2.0/codegen/scanvirtuals.py
>-share/pygobject/2.0/codegen/scanvirtuals.pyc
>-share/pygobject/2.0/codegen/scanvirtuals.pyo
>-share/pygobject/2.0/codegen/scmexpr.py
>-share/pygobject/2.0/codegen/scmexpr.pyc
>-share/pygobject/2.0/codegen/scmexpr.pyo
>-share/pygobject/2.0/defs/gappinfo.override
>-share/pygobject/2.0/defs/gapplaunchcontext.override
>-share/pygobject/2.0/defs/gbufferedinputstream.override
>-share/pygobject/2.0/defs/gcancellable.override
>-share/pygobject/2.0/defs/gdatainputstream.override
>-share/pygobject/2.0/defs/gdrive.override
>-share/pygobject/2.0/defs/gfile.override
>-share/pygobject/2.0/defs/gfileattribute.override
>-share/pygobject/2.0/defs/gfileenumerator.override
>-share/pygobject/2.0/defs/gfileinfo.override
>-share/pygobject/2.0/defs/gfileinputstream.override
>-share/pygobject/2.0/defs/gfileiostream.override
>-share/pygobject/2.0/defs/gfileoutputstream.override
>-share/pygobject/2.0/defs/gicon.override
>-share/pygobject/2.0/defs/ginputstream.override
>-share/pygobject/2.0/defs/gio-types.defs
>-share/pygobject/2.0/defs/gio.defs
>-share/pygobject/2.0/defs/gio.override
>-share/pygobject/2.0/defs/giostream.override
>-share/pygobject/2.0/defs/gmemoryinputstream.override
>-share/pygobject/2.0/defs/gmemoryoutputstream.override
>-share/pygobject/2.0/defs/gmount.override
>-share/pygobject/2.0/defs/goutputstream.override
>-share/pygobject/2.0/defs/gresolver.override
>-share/pygobject/2.0/defs/gsocket.override
>-share/pygobject/2.0/defs/gvolume.override
>-share/pygobject/2.0/defs/gvolumemonitor.override
>-share/pygobject/2.0/defs/unix-types.defs
>-share/pygobject/2.0/defs/unix.defs
>-share/pygobject/2.0/defs/unix.override
>-share/pygobject/xsl/common.xsl
>-share/pygobject/xsl/devhelp.xsl
>-share/pygobject/xsl/fixxref.py
>-share/pygobject/xsl/html.xsl
>-share/pygobject/xsl/pdf-style.xsl
>-share/pygobject/xsl/pdf.xsl
>-share/pygobject/xsl/ref-html-style.xsl
>+include/pygobject-3.0/pygobject.h
>+%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
>+%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>+%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>+%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/not-zip-safe
>+%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/requires.txt
>+%%PYTHON_SITELIBDIR%%/PyGObject-3.38.0-py%%PYTHON_VER%%.egg-info/top_level.txt
>+%%PYTHON_SITELIBDIR%%/gi/__init__.py
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_gtktemplate.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_gtktemplate.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/_constants.py
>+%%PYTHON_SITELIBDIR%%/gi/_error.py
>+%%PYTHON_SITELIBDIR%%/gi/_gi.so
>+%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so
>+%%PYTHON_SITELIBDIR%%/gi/_gtktemplate.py
>+%%PYTHON_SITELIBDIR%%/gi/_option.py
>+%%PYTHON_SITELIBDIR%%/gi/_ossighelper.py
>+%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py
>+%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py
>+%%PYTHON_SITELIBDIR%%/gi/docstring.py
>+%%PYTHON_SITELIBDIR%%/gi/importer.py
>+%%PYTHON_SITELIBDIR%%/gi/module.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/GdkPixbuf.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GdkPixbuf.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GdkPixbuf.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py
>+%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py
>+%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py
>+%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/gi/types.py
>+%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
>+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-37.opt-1.pyc
>+%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-37.pyc
>+%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py
>+%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
>+libdata/pkgconfig/pygobject-3.0.pc
>diff --git devel/py-ipywidgets/Makefile devel/py-ipywidgets/Makefile
>index 3e3654e4b021..045846c444b3 100644
>--- devel/py-ipywidgets/Makefile
>+++ devel/py-ipywidgets/Makefile
>@@ -7,7 +7,7 @@ CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	python@FreeBSD.org
> COMMENT=	Interactive HTML widgets for Jupyter notebooks and the IPython kernel
> 
> LICENSE=	BSD3CLAUSE
>diff --git devel/py-jira/Makefile devel/py-jira/Makefile
>index 240d447a7443..2ae3d71b86b4 100644
>--- devel/py-jira/Makefile
>+++ devel/py-jira/Makefile
>@@ -29,7 +29,7 @@ USES=		python:3.5+
> USE_PYTHON=	autoplist distutils
> 
> OPTIONS_DEFINE=		MAGIC PARALLEL SHELL TESTS
>-OPTIONS_DEFAULT=	MAGIC PARALLEL SHELL
>+OPTIONS_DEFAULT=	MAGIC PARALLEL
> 
> MAGIC_DESC=	Enable Content-Type Auto-detection
> PARALLEL_DESC=	Enable asynchronous requests
>diff --git devel/py-jira/pkg-descr devel/py-jira/pkg-descr
>index 98c13afd8a80..de08bf0f3d89 100644
>--- devel/py-jira/pkg-descr
>+++ devel/py-jira/pkg-descr
>@@ -1,4 +1,4 @@
>-a Python library designed to ease the use of the JIRA REST API. Some basic
>+A Python library designed to ease the use of the JIRA REST API. Some basic
> support for the GreenHopper REST API also exists.
> 
> WWW: https://bitbucket.org/bspeakmon/jira-python
>diff --git devel/py-pre-commit/Makefile devel/py-pre-commit/Makefile
>index 0ee0e38663e5..337e966fb367 100644
>--- devel/py-pre-commit/Makefile
>+++ devel/py-pre-commit/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pre-commit
>-PORTVERSION=	1.21.0
>+PORTVERSION=	2.6.0
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -22,8 +22,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aspy.yaml>=0:devel/py-aspy.yaml@${PY_FLAVOR}
> 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}virtualenv20>=20.0.8:devel/py-virtualenv20@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR}
> 
> USES=		python:3.6+ shebangfix
> USE_PYTHON=	autoplist distutils
>diff --git devel/py-pre-commit/distinfo devel/py-pre-commit/distinfo
>index dc343ac1c481..d6a11ed716ce 100644
>--- devel/py-pre-commit/distinfo
>+++ devel/py-pre-commit/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1594693753
>-SHA256 (pre_commit-1.21.0.tar.gz) = 8f48d8637bdae6fa70cc97db9c1dd5aa7c5c8bf71968932a380628c25978b850
>-SIZE (pre_commit-1.21.0.tar.gz) = 145595
>+TIMESTAMP = 1595291430
>+SHA256 (pre_commit-2.6.0.tar.gz) = 1657663fdd63a321a4a739915d7d03baedd555b25054449090f97bb0cb30a915
>+SIZE (pre_commit-2.6.0.tar.gz) = 151465
>diff --git devel/py-pytest-mock/Makefile devel/py-pytest-mock/Makefile
>index 305376cee780..22fbc05f264f 100644
>--- devel/py-pytest-mock/Makefile
>+++ devel/py-pytest-mock/Makefile
>@@ -1,14 +1,11 @@
> # $FreeBSD$
> 
> PORTNAME=	pytest-mock
>-PORTVERSION=	1.10.4
>+PORTVERSION=	3.2.0
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>-PATCH_SITES=	https://github.com/pytest-dev/${PORTNAME}/commit/
>-PATCHFILES=	b3badafebedea3605c90eb22a68adff2885a8bb0.patch:-p1
>-
> MAINTAINER=	olgeni@FreeBSD.org
> COMMENT=	Thin wrapper around the mock package for easier use with py.test
> 
>diff --git devel/py-pytest-mock/distinfo devel/py-pytest-mock/distinfo
>index 1edf1fe991bc..3ac05af3a17a 100644
>--- devel/py-pytest-mock/distinfo
>+++ devel/py-pytest-mock/distinfo
>@@ -1,5 +1,3 @@
>-TIMESTAMP = 1557059422
>-SHA256 (pytest-mock-1.10.4.tar.gz) = 5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568
>-SIZE (pytest-mock-1.10.4.tar.gz) = 18790
>-SHA256 (b3badafebedea3605c90eb22a68adff2885a8bb0.patch) = 8c6d1028175b1a524cbcb1df3aeaa725fed9a1aa3ad0499a242ac65b65e855e0
>-SIZE (b3badafebedea3605c90eb22a68adff2885a8bb0.patch) = 1667
>+TIMESTAMP = 1595302774
>+SHA256 (pytest-mock-3.2.0.tar.gz) = 7122d55505d5ed5a6f3df940ad174b3f606ecae5e9bc379569cdcbd4cd9d2b83
>+SIZE (pytest-mock-3.2.0.tar.gz) = 25569
>diff --git devel/py-pytest/Makefile devel/py-pytest/Makefile
>index 5b390f070a1b..b4daa636c7c3 100644
>--- devel/py-pytest/Makefile
>+++ devel/py-pytest/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pytest
>-PORTVERSION=	4.5.0
>+PORTVERSION=	5.4.3
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git devel/py-pytest/distinfo devel/py-pytest/distinfo
>index 24a260bee58f..79185a2b230d 100644
>--- devel/py-pytest/distinfo
>+++ devel/py-pytest/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1557834909
>-SHA256 (pytest-4.5.0.tar.gz) = 1a8aa4fa958f8f451ac5441f3ac130d9fc86ea38780dd2715e6d5c5882700b24
>-SIZE (pytest-4.5.0.tar.gz) = 943607
>+TIMESTAMP = 1595300910
>+SHA256 (pytest-5.4.3.tar.gz) = 7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8
>+SIZE (pytest-5.4.3.tar.gz) = 1022353
>diff --git devel/regexx/Makefile devel/regexx/Makefile
>index 860de30956fe..0decf314f9ca 100644
>--- devel/regexx/Makefile
>+++ devel/regexx/Makefile
>@@ -14,9 +14,11 @@ LICENSE=	LGPL21
> 
> LIB_DEPENDS=	libpcre.so:devel/pcre
> 
>-USES=		gmake pkgconfig libtool
>+USES=		gmake libtool pkgconfig
> GNU_CONFIGURE=	yes
>-MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
>+MAKE_ARGS=	ACLOCAL="${TRUE}" \
>+		AUTOCONF="${TRUE}" \
>+		AUTOHEADER="${TRUE}" \
> 		AUTOMAKE="${TRUE}"
> USE_LDCONFIG=	yes
> 
>diff --git devel/regexx/files/patch-examples__simple.cc devel/regexx/files/patch-examples__simple.cc
>deleted file mode 100644
>index 504f5d61509a..000000000000
>--- devel/regexx/files/patch-examples__simple.cc
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- examples/simple.cc.orig	Tue Mar 13 23:42:21 2001
>-+++ examples/simple.cc	Sun Dec 22 03:09:56 2002
>-@@ -30,6 +30,7 @@
>- #include <regexx.hh>
>- 
>- using namespace regexx;
>-+using namespace std;
>- 
>- //
>- // This is the function to pass to replace() in
>diff --git devel/regexx/files/patch-src__Makefile.in devel/regexx/files/patch-src__Makefile.in
>deleted file mode 100644
>index 462d6e42fbbf..000000000000
>--- devel/regexx/files/patch-src__Makefile.in
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/Makefile.in.orig	2013-11-15 21:03:55.000000000 +0900
>-+++ src/Makefile.in	2013-11-15 21:04:18.000000000 +0900
>-@@ -74,7 +74,7 @@
>- 
>- lib_LTLIBRARIES = libregexx.la
>- libregexx_la_SOURCES = regexx.cc regexx.hh split.cc split.hh
>--libregexx_la_LDFLAGS = -version-info 2:0:1 ../pcre/maketables.lo ../pcre/get.lo ../pcre/study.lo ../pcre/pcre.lo
>-+libregexx_la_LDFLAGS = -version-info 2:0:1
>- include_HEADERS = regexx.hh split.hh
>- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
>- CONFIG_CLEAN_FILES = 
>diff --git devel/regexx/files/patch-src__regex.hh devel/regexx/files/patch-src__regex.hh
>deleted file mode 100644
>index a34c40bb818f..000000000000
>--- devel/regexx/files/patch-src__regex.hh
>+++ /dev/null
>@@ -1,47 +0,0 @@
>---- src/regexx.hh.orig	Tue Mar 13 23:42:21 2001
>-+++ src/regexx.hh	Sun Dec 22 03:08:47 2002
>-@@ -94,7 +94,7 @@
>- 
>-   };
>- 
>--  inline ostream& operator<<(ostream& _o, RegexxMatchAtom& _rxxma)
>-+  inline std::ostream& operator<<(std::ostream& _o, RegexxMatchAtom& _rxxma)
>-   {
>-     return _o << _rxxma.str();
>-   }
>-@@ -161,7 +161,7 @@
>- 
>-   };
>- 
>--  inline ostream& operator<<(ostream& _o, RegexxMatch& _rxxm)
>-+  inline std::ostream& operator<<(std::ostream& _o, RegexxMatch& _rxxm)
>-   {
>-     return (_o << _rxxm.str());
>-   }
>-@@ -566,7 +566,7 @@
>-   }
>- 
>-   inline const std::string&
>--  Regexx::replacef(std::string (*_func)(const RegexxMatch&), int _flags = 0)
>-+  Regexx::replacef(std::string (*_func)(const RegexxMatch&), int _flags)
>-     throw(CompileException)
>-   {
>-     exec(_flags&~nomatch);
>-@@ -580,7 +580,7 @@
>-   inline const std::string&
>-   Regexx::replacef(const std::string& _expr,
>- 		   std::string (*_func)(const RegexxMatch&),
>--		   int _flags = 0)
>-+		   int _flags)
>-     throw(CompileException)
>-   {
>-     expr(_expr);
>-@@ -590,7 +590,7 @@
>-   inline const std::string&
>-   Regexx::replacef(const std::string& _str, const std::string& _expr,
>- 		   std::string (*_func)(const RegexxMatch&),
>--		   int _flags = 0)
>-+		   int _flags)
>-     throw(CompileException)
>-   {
>-     str(_str);
>diff --git devel/regexx/files/patch-src__regexx.cc devel/regexx/files/patch-src__regexx.cc
>deleted file mode 100644
>index 4d15587279d8..000000000000
>--- devel/regexx/files/patch-src__regexx.cc
>+++ /dev/null
>@@ -1,69 +0,0 @@
>---- src/regexx.cc.orig	Tue Mar 13 22:42:21 2001
>-+++ src/regexx.cc	Sat Dec 29 08:27:24 2001
>-@@ -27,7 +27,7 @@
>- // $Date: 2001/03/13 14:42:21 $
>- 
>- #include "regexx.hh"
>--#include "../pcre/pcre.h"
>-+#include "pcre.h"
>- 
>- const unsigned int&
>- regexx::Regexx::exec(int _flags)
>-@@ -43,13 +43,13 @@
>-     if(m_preg == NULL) {
>-       throw CompileException(errptr);
>-     }
>--    pcre_fullinfo(m_preg, NULL, PCRE_INFO_CAPTURECOUNT, (void*)&m_capturecount);
>-+    pcre_fullinfo((const pcre *)m_preg, NULL, PCRE_INFO_CAPTURECOUNT, (void*)&m_capturecount);
>-     m_compiled = true;
>-   }
>- 
>-   if(!m_study && (_flags&study)) {
>-     const char *errptr;
>--    m_extra = pcre_study(m_preg, 0, &errptr);
>-+    m_extra = pcre_study((const pcre *)m_preg, 0, &errptr);
>-     if(errptr != NULL)
>-       throw CompileException(errptr);
>-     m_study = true;
>-@@ -63,20 +63,20 @@
>-   int ssc;
>-   m_matches = 0;
>- 
>--  ssc = pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),0,eflags,ssv,33);
>-+  ssc = pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),0,eflags,ssv,33);
>-   bool ret = (ssc > 0);
>- 
>-   if(_flags&global) {
>-     if(_flags&nomatch)
>-       while(ret) {
>- 	m_matches++;
>--	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
>-+	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
>-       }
>-     else if(_flags&noatom)
>-       while(ret) {
>- 	m_matches++;
>- 	match.push_back(RegexxMatch(m_str,ssv[0],ssv[1]-ssv[0]));
>--	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
>-+	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
>-       }
>-     else
>-       while(ret) {
>-@@ -89,7 +89,7 @@
>- 	  else
>- 	    match.back().atom.push_back(RegexxMatchAtom(m_str,0,0));
>-         }
>--	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
>-+	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
>-       }
>-   }
>-   else {
>-@@ -114,7 +114,7 @@
>- 	  else
>- 	    match.back().atom.push_back(RegexxMatchAtom(m_str,0,0));
>- 	}
>--	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
>-+	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
>-       }
>-     }
>-   }
>diff --git devel/regexx/files/patch-src__regexx.hh devel/regexx/files/patch-src__regexx.hh
>deleted file mode 100644
>index 9cc9f87a1e96..000000000000
>--- devel/regexx/files/patch-src__regexx.hh
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- src/regexx.hh.orig	2013-11-15 21:02:42.000000000 +0900
>-+++ src/regexx.hh	2013-11-15 21:03:03.000000000 +0900
>-@@ -29,6 +29,7 @@
>- #ifndef REGEXX_HH
>- #define REGEXX_HH
>- 
>-+#include <cstdlib>
>- #include <string>
>- #include <vector>
>- #include <split.hh>
>diff --git devel/zpu-binutils/files/patch-build.sh devel/zpu-binutils/files/patch-build.sh
>index 50efffbe6018..d85c8753aa18 100644
>--- devel/zpu-binutils/files/patch-build.sh
>+++ devel/zpu-binutils/files/patch-build.sh
>@@ -1,7 +1,7 @@
> --- build.sh.orig	2012-10-11 19:40:23.000000000 -0400
> +++ build.sh	2013-12-30 21:20:35.147443323 -0500
> @@ -1,18 +1,20 @@
>-+export CC=cc
>++export CC=%%CC%%
> +export DISTDIR=%%DISTDIR%%
>  set -e
>  rm -rf build
>diff --git dns/checkdns/Makefile dns/checkdns/Makefile
>index a0f4d5c0d629..10497e038413 100644
>--- dns/checkdns/Makefile
>+++ dns/checkdns/Makefile
>@@ -22,11 +22,6 @@ PORTDOCS=	AUTHORS ChangeLog README THANKS TODO
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/main.c \
>-		${WRKSRC}/INSTALL ${WRKSRC}/README ${WRKSRC}/checkdns.conf-dist
>-	@${REINPLACE_CMD} -e 's|CC = gcc|CC = ${CC} -include string.h|' ${WRKSRC}/Makefile
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/checkdns ${STAGEDIR}${PREFIX}/bin/
> 	${INSTALL_DATA} ${WRKSRC}/checkdns.conf-dist ${STAGEDIR}${PREFIX}/etc/
>diff --git dns/checkdns/files/patch-Makefile dns/checkdns/files/patch-Makefile
>index 327d306d2fc0..18bb49a0bb91 100644
>--- dns/checkdns/files/patch-Makefile
>+++ dns/checkdns/files/patch-Makefile
>@@ -1,6 +1,14 @@
>---- Makefile.orig	Fri Nov 10 00:41:08 2006
>-+++ Makefile	Fri Nov 10 00:41:25 2006
>-@@ -9,7 +9,15 @@
>+--- Makefile.orig	2005-01-15 20:40:27 UTC
>++++ Makefile
>+@@ -1,5 +1,5 @@
>+-#CC = gcc -ansi -pedantic -DDEBUG -g
>+-CC = gcc -ansi -pedantic
>++#CC = cc -include string.h -ansi -pedantic -DDEBUG -g
>++CC = cc -include string.h -ansi -pedantic
>+ 
>+ INSTALL = install
>+ 
>+@@ -9,12 +9,20 @@ compile: $(OBJS)
>  	$(CC) -o checkdns $(OBJS)
>  
>  install:
>@@ -12,12 +20,12 @@
> +	mkdir -p ${PREFIX}/share/checkdns/lang
> +	cp -f checkdns.css ${PREFIX}/share/checkdns
> +	cp -f lang/* ${PREFIX}/share/checkdns/lang
>+ 
> +
> +
>- 
>  clean:
>  	rm -f $(OBJS) checkdns
>-@@ -17,4 +25,4 @@
>+ 
>  uninstall: clean
>  	rm /usr/local/bin/checkdns
>  
>diff --git dns/idnkit/files/patch-configure dns/idnkit/files/patch-configure
>index 8f83b45f582c..c95cddee8fb5 100644
>--- dns/idnkit/files/patch-configure
>+++ dns/idnkit/files/patch-configure
>@@ -17,18 +17,18 @@
>      ;;
>  esac
>  
>-@@ -2633,7 +2633,37 @@ fi
>+@@ -2633,13 +2633,43 @@ fi
>    ac_cv_flavor_gethostbyaddr=unknown
>  else
>    cat > conftest.$ac_ext <<EOF
> -#line 2637 "configure"
> +#line 2648 "configure"
>-+#include "confdefs.h"
>-+
>-+    #include <stddef.h>
>-+    #include <sys/types.h>
>-+    #include <sys/socket.h>
>-+    #include <netdb.h>
>+ #include "confdefs.h"
>+ 
>+     #include <stddef.h>
>+     #include <sys/types.h>
>+     #include <sys/socket.h>
>+     #include <netdb.h>
> +    struct hostent *gethostbyaddr(const void *addr, int len, int type) {
> +	return NULL;
> +    }
>@@ -53,17 +53,23 @@
> +else
> +  cat > conftest.$ac_ext <<EOF
> +#line 2678 "configure"
>- #include "confdefs.h"
>- 
>-     #include <stddef.h>
>-@@ -2675,6 +2705,10 @@ echo "$ac_t""$ac_cv_flavor_gethostbyaddr
>++#include "confdefs.h"
>++
>++    #include <stddef.h>
>++    #include <sys/types.h>
>++    #include <sys/socket.h>
>++    #include <netdb.h>
>+     struct hostent *gethostbyaddr(const char *addr, int len, int type) {
>+ 	return NULL;
>+     }
>+@@ -2674,6 +2704,10 @@ echo "$ac_t""$ac_cv_flavor_gethostbyaddr" 1>&6
>+     glibc)
>  	ac_cv_type_ghba_addr_t='const char *'
>  	ac_cv_type_ghba_addrlen_t='size_t'
>- 	;;
>++	;;
> +    freebsd6)
> +	ac_cv_type_ghba_addr_t='const void *'
> +	ac_cv_type_ghba_addrlen_t='int'
>-+	;;
>+ 	;;
>      traditional | none)
>  	ac_cv_type_ghba_addr_t='const char *'
>- 	ac_cv_type_ghba_addrlen_t='int'
>diff --git dns/libbind/Makefile dns/libbind/Makefile
>index 5b19be662ca6..edae1327adc7 100644
>--- dns/libbind/Makefile
>+++ dns/libbind/Makefile
>@@ -29,7 +29,4 @@ THREADS_CONFIGURE_ENABLE=	threads
> verify:	checksum
> 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
> 
>-post-patch:
>-	${REINPLACE_CMD} -e '/#include <utmp.h>/ d' ${WRKSRC}/irs/*.c
>-
> .include <bsd.port.mk>
>diff --git dns/libbind/files/patch-doc-Makefile.in dns/libbind/files/patch-doc-Makefile.in
>deleted file mode 100644
>index f2254479d209..000000000000
>--- dns/libbind/files/patch-doc-Makefile.in
>+++ /dev/null
>@@ -1,27 +0,0 @@
>---- doc/Makefile.in.orig	2009-03-04 01:09:51.000000000 +0100
>-+++ doc/Makefile.in	2012-04-24 00:04:48.884815527 +0200
>-@@ -175,24 +175,12 @@
>- 		${INSTALL_DATA} $${f}.${LIB_NETWORK_MAN_EXT} \
>- 		${MANDIR}/man${LIB_NETWORK_EXT}/$${f}.${LIB_NETWORK_EXT}; \
>- 	done
>--	@set -x; N=${LIB_NETWORK_EXT}; for f in ${LIB_NETWORK_BASE}; do \
>--		${INSTALL_DATA} $${f}.${LIB_NETWORK_CAT_EXT} \
>--		${MANDIR}/cat${LIB_NETWORK_EXT}/$${f}.${LIB_NETWORK_EXT}; \
>--	done
>- 	@set -x; N=${FORMAT_EXT}; for f in ${FORMAT_BASE}; do \
>- 		${INSTALL_DATA} $${f}.${FORMAT_MAN_EXT} \
>- 		${MANDIR}/man${FORMAT_EXT}/$${f}.${FORMAT_EXT}; \
>- 	done
>--	@set -x; N=${FORMAT_EXT}; for f in ${FORMAT_BASE}; do \
>--		${INSTALL_DATA} $${f}.${FORMAT_CAT_EXT} \
>--		${MANDIR}/cat${FORMAT_EXT}/$${f}.${FORMAT_EXT}; \
>--	done
>- 	@set -x; N=${DESC_EXT}; for f in ${DESC_BASE}; do \
>- 		${INSTALL_DATA} $${f}.${DESC_MAN_EXT} \
>- 		${MANDIR}/man${DESC_EXT}/$${f}.${DESC_EXT}; \
>- 	done
>--	@set -x; N=${DESC_EXT}; for f in ${DESC_BASE}; do \
>--		${INSTALL_DATA} $${f}.${DESC_CAT_EXT} \
>--		${MANDIR}/cat${DESC_EXT}/$${f}.${DESC_EXT}; \
>--	done
>- 
>diff --git dns/nsping/Makefile dns/nsping/Makefile
>index 6362148ba8d2..59ff2cc99cb6 100644
>--- dns/nsping/Makefile
>+++ dns/nsping/Makefile
>@@ -13,9 +13,6 @@ COMMENT=	DNS "ping"
> 
> PLIST_FILES=	sbin/nsping man/man8/nsping.8.gz
> 
>-post-patch:
>-	${REINPLACE_CMD} -e "s/dprintf/debug_printf/g" ${WRKSRC}/nsping.*
>-
> do-install:
> 		${INSTALL_PROGRAM} ${WRKSRC}/nsping ${STAGEDIR}${PREFIX}/sbin
> 		${INSTALL_DATA} ${WRKSRC}/nsping.8 ${STAGEDIR}${PREFIX}/man/man8
>diff --git dns/nsping/files/patch-Makefile dns/nsping/files/patch-Makefile
>index 6b3d4f607e20..d69dd73069eb 100644
>--- dns/nsping/files/patch-Makefile
>+++ dns/nsping/files/patch-Makefile
>@@ -1,12 +1,12 @@
>---- Makefile.orig	Mon Nov 24 04:56:28 1997
>-+++ Makefile	Fri Nov 12 15:53:26 1999
>+--- Makefile.orig	1997-11-24 09:56:28 UTC
>++++ Makefile
> @@ -1,4 +1,4 @@
> -CFLAGS=	-g 
> +#CFLAGS=	-g 
>  #Solaris
>  #CFLAGS= -g -Dsys5
>  LDFLAGS=
>-@@ -10,6 +10,8 @@
>+@@ -10,6 +10,8 @@ TARGET= nsping
>  OBJS= nsping.o dns-lib.o dns-rr.o
>  SRCS= nsping.c dns-lib.c dns-rr.c
>  HEADERS= nsping.h dns-lib.h dns-rr.h 
>diff --git dns/nsping/files/patch-dns-rr.c dns/nsping/files/patch-dns-rr.c
>index 2963a6523639..ca318c583e0a 100644
>--- dns/nsping/files/patch-dns-rr.c
>+++ dns/nsping/files/patch-dns-rr.c
>@@ -1,6 +1,6 @@
>---- dns-rr.c.orig	Mon Jul  4 12:02:22 2005
>-+++ dns-rr.c	Mon Jul  4 12:02:39 2005
>-@@ -23,7 +23,7 @@
>+--- dns-rr.c.orig	1997-11-24 09:40:37 UTC
>++++ dns-rr.c
>+@@ -23,7 +23,7 @@ dns_rr_query(char *name, int type, u_char *buf) {
>  
>  	len = dns_string(name, dp, MAXDNAME);
>  	if(len < 0)
>diff --git dns/nsping/files/patch-nsping.c dns/nsping/files/patch-nsping.c
>index af236cb2ce22..2bfcec8b1323 100644
>--- dns/nsping/files/patch-nsping.c
>+++ dns/nsping/files/patch-nsping.c
>@@ -1,6 +1,6 @@
>---- nsping.c.orig	Wed Jul 20 15:23:29 2005
>-+++ nsping.c	Wed Feb 16 10:41:04 2005
>-@@ -14,6 +14,9 @@
>+--- nsping.c.orig	1997-11-26 08:11:39 UTC
>++++ nsping.c
>+@@ -14,6 +14,9 @@ int snprintf(char *, int, char *, ...);
>  #include <stdarg.h>
>  #include <assert.h>
>  
>@@ -10,7 +10,7 @@
>  /* store state on sent queries */
>  
>  struct nsq {
>-@@ -26,8 +29,17 @@
>+@@ -26,8 +29,17 @@ struct nsq {
>   * too much stuff through globals. Sorry.
>   */
>  
>@@ -28,7 +28,7 @@
>  char *Zone 		= NULL;
>  char *Hostname 		= NULL;
>  
>-@@ -55,7 +67,7 @@
>+@@ -55,7 +67,7 @@ int main(int argc, char **argv) {
>  	struct timeval *tvp;
>  	struct itimerval itv;
>  	u_int32_t address = INADDR_ANY;
>@@ -37,7 +37,7 @@
>  	char *timearg = NULL;
>  	char c;
>  	int i;
>-@@ -65,6 +77,10 @@
>+@@ -65,6 +77,10 @@ int main(int argc, char **argv) {
>  		Queries[i].found = 1;
>  	}
>  
>@@ -48,7 +48,7 @@
>  #define OPTS "z:h:t:p:dP:a:c:T:rR"
>  
>  	while((c = getopt(argc, argv, OPTS)) != EOF) {
>-@@ -105,15 +121,17 @@
>+@@ -105,15 +121,17 @@ int main(int argc, char **argv) {
>  			break;			
>  
>  		case 'p':
>@@ -69,7 +69,7 @@
>  			if(address == INADDR_NONE) {
>  				fprintf(stderr, "Unable to resolve local address.\n");
>  				exit(1);
>-@@ -135,7 +153,7 @@
>+@@ -135,7 +153,7 @@ int main(int argc, char **argv) {
>  		exit(1);
>  	}
>  
>@@ -78,7 +78,7 @@
>  		fprintf(stderr, "Unable to resolve target server address.\n");
>  		fprintf(stderr, "Fatal error, exiting.\n");
>  		exit(1);
>-@@ -147,7 +165,7 @@
>+@@ -147,7 +165,7 @@ int main(int argc, char **argv) {
>  	       	exit(1);
>  	}
>  
>@@ -87,7 +87,7 @@
>  		fprintf(stderr, "Fatal error, exiting.\n");
>  		exit(1);
>  	}
>-@@ -167,7 +185,7 @@
>+@@ -167,7 +185,7 @@ int main(int argc, char **argv) {
>  	/* start the fun */
>  
>  	printf("NSPING %s (%s): %s = \"%s\", Type = \"IN %s\"\n",
>@@ -96,7 +96,7 @@
>  			Hostname ? "Hostname" : "Domain",
>  			Hostname ? Hostname : Zone,
>  			type_int2string(Type));
>-@@ -189,10 +207,14 @@
>+@@ -189,10 +207,14 @@ int main(int argc, char **argv) {
>  
>  int guess_zone() {
>  	char lhn[MAXDNAME];
>@@ -111,7 +111,7 @@
>  
>  	cp = strchr(lhn, '.');
>  	if(!cp || !(*(++cp)))
>-@@ -261,15 +283,19 @@
>+@@ -261,15 +283,19 @@ void probe(int sig) {
>  	static int Start = 0;
>  	static int Pos    = 0;      
>  
>@@ -129,12 +129,12 @@
> -		Start = getpid();
> +	if(!Start) {
> +		Start = getpid() % MAX_ID;
>-+	  	dprintf("Start = %d\n", Start);
>++	  	debug_printf("Start = %d\n", Start);
> +	}
>  
>  	/* we're overwriting state from a query we never got a response
>  	 * to, so at least note that we missed it.
>-@@ -278,18 +304,16 @@
>+@@ -278,18 +304,16 @@ void probe(int sig) {
>  	if(!Queries[Pos].found)
>  		Missed++;
>  
>@@ -146,7 +146,7 @@
>  	/* get the DNS request */
>  
> -	l = dns_packet(&qp, Start + Sent);
>-+	dprintf("sending with id = %d\n", (Start + Sent) % MAX_ID);
>++	debug_printf("sending with id = %d\n", (Start + Sent) % MAX_ID);
> +	l = dns_packet(&qp, (Start + Sent) % MAX_ID); 
>  
>  	do {
>@@ -158,7 +158,7 @@
>  			if(errno != EINTR) {		
>  				perror("sendto");
>  				return;
>-@@ -299,7 +323,7 @@
>+@@ -299,7 +323,7 @@ void probe(int sig) {
>  
>  	/* if it was sent successfully, update state */
>  
>@@ -167,7 +167,7 @@
>  	gettimeofday(&Queries[Pos].sent, NULL);
>  	Queries[Pos].found = 0;
>  
>-@@ -361,7 +385,10 @@
>+@@ -361,7 +385,10 @@ int dns_packet(u_char **qp, int id) {
>  
>  void handle_incoming() {
>  	u_char buffer[1024];
>@@ -178,23 +178,33 @@
>  	int sil = sizeof(si);
>  	int l;
>  
>-@@ -378,6 +405,7 @@
>+@@ -378,20 +405,22 @@ void handle_incoming() {
>  
>  		/* descriminate real responses from spurious crud */
>  
> +#if 0
>  		if(si.sin_addr.s_addr != Target_Address) {
>- 			dprintf("Received packet from unexpected address %s.\n",
>+-			dprintf("Received packet from unexpected address %s.\n",
>++			debug_printf("Received packet from unexpected address %s.\n",
>  				inet_ntoa(si.sin_addr));
>-@@ -389,6 +417,7 @@
>+ 			continue;
>+ 		}
>+ 
>+ 		if(si.sin_port != htons(Target_Port)) {
>+-			dprintf("Received packet from unexpected port %d.\n",
>++			debug_printf("Received packet from unexpected port %d.\n",
>  				ntohs(si.sin_port));
>  			continue;
>  		}
> +#endif
>  
>  		if(l < sizeof(HEADER)) {
>- 			dprintf("Short packet.\n");
>-@@ -420,7 +449,7 @@
>+-			dprintf("Short packet.\n");
>++			debug_printf("Short packet.\n");
>+ 			continue;
>+ 		}
>+ 		
>+@@ -420,7 +449,7 @@ void update(u_char *bp, int l) {
>  	double triptime;
>  
>  	if(!Start)
>@@ -203,18 +213,25 @@
>  
>  	gettimeofday(&tv, NULL);
>  
>-@@ -437,8 +466,9 @@
>+@@ -431,14 +460,15 @@ void update(u_char *bp, int l) {
>+ 			break;
>+ 
>+ 	if(i == QUERY_BACKLOG) {
>+-		dprintf("Packet with id %d not ours.\n", ntohs(hp->id));
>++		debug_printf("Packet with id %d not ours.\n", ntohs(hp->id));
>+ 		return;
>+ 	} else 
>  		Queries[i].found = 1;	
>  
>  	/* figure out which query this was, using the DNS query ID */
> -
>-+	dprintf("received with id = %d\n", ntohs(hp->id));
>++	debug_printf("received with id = %d\n", ntohs(hp->id));
>  	delta = ntohs(hp->id) - Start;
>-+	dprintf("delta = %d - %d = %d\n", ntohs(hp->id), Start, delta);
>++	debug_printf("delta = %d - %d = %d\n", ntohs(hp->id), Start, delta);
>  	
>  	/* figure out how long it took */
>  
>-@@ -494,7 +524,7 @@
>+@@ -494,7 +524,7 @@ void update(u_char *bp, int l) {
>  	       hp->rcode == NOERROR ? "+" : "-",
>  	       delta,
>  	       l, 
>@@ -223,7 +240,7 @@
>  	       triptime,
>  	       delta ? Ave : 0.0);
>  
>-@@ -512,6 +542,9 @@
>+@@ -512,6 +542,9 @@ void summarize(int sig) {
>  	       "Ave/Max/Min: %8.3f / %8.3f / %8.3f\n",
>  	       Sent, Count, Missed ? Missed : Sent - Count, Lagged, Ave, Max, Min);
>  
>@@ -233,7 +250,7 @@
>  	exit(0);
>  }
>  
>-@@ -555,18 +588,6 @@
>+@@ -555,18 +588,6 @@ struct timeval *timeval_subtract(struct timeval *out, 
>  
>  /* -------------------------------------------------------------------------- */
>  
>@@ -252,7 +269,16 @@
>  /* map integer type codes to names, v/vrsa. Add new types here if you must. */
>  
>  struct type2str {
>-@@ -625,22 +646,40 @@
>+@@ -610,7 +631,7 @@ int type_string2int(char *string) {
>+ 
>+ /* don't print if we're not in debug mode */
>+ 
>+-void dprintf(char *fmt, ...) {
>++void debug_printf(char *fmt, ...) {
>+ 	va_list ap;
>+ 
>+ 	if(!Debug)
>+@@ -625,22 +646,40 @@ void dprintf(char *fmt, ...) {
>  
>  /* return a bound UDP socket */
>  
>@@ -288,7 +314,8 @@
> +		((struct sockaddr_in *)(&sss))->sin_family = AF_INET;
> +		addrlen = sizeof(struct sockaddr_in);
> +	    	break;
>-+
>+ 
>+-	if(bind(sockfd, (struct sockaddr *)&si, sizeof(si)) < 0) {
> +	    case AF_INET6:
> +		((struct sockaddr_in6 *)(&sss))->sin6_addr = anyaddr;
> +		((struct sockaddr_in6 *)(&sss))->sin6_port = htons(atoi(port)); 
>@@ -296,32 +323,28 @@
> +		addrlen = sizeof(struct sockaddr_in6);
> +	    	break;
> +	}
>- 
>--	if(bind(sockfd, (struct sockaddr *)&si, sizeof(si)) < 0) {
>++
> +	if(bind(sockfd, (struct sockaddr *)&sss, addrlen) < 0) 
> +	{
>  		perror("bind");
>  		return(-1);
>  	}
>-@@ -652,19 +691,45 @@
>+@@ -652,19 +691,45 @@ int bind_udp_socket(u_int32_t address, u_int16_t port)
>  
>  /* wrap hostname resolution */
>  
> -u_int32_t resolve(char *name) {
> -	u_long addr;
>--
>++struct addrinfo* resolve(char *name, char *port) { 
>++	struct addrinfo hints, *res, *res0;
>++    	int error;
>++        const char *cause = NULL;
>+ 
> -	addr = inet_addr(name);
> -	if(addr == INADDR_NONE) {
> -		struct hostent *hp = gethostbyname(name);
> -		if(!hp)
> -			return(INADDR_NONE);
>--
>--		memcpy(&addr, hp->h_addr, 4);
>-+struct addrinfo* resolve(char *name, char *port) { 
>-+	struct addrinfo hints, *res, *res0;
>-+    	int error;
>-+        const char *cause = NULL;
>-+
> +	memset(&hints, 0, sizeof(hints));
> +    	hints.ai_family = PF_UNSPEC;
> +      	hints.ai_socktype = SOCK_DGRAM;
>@@ -330,7 +353,8 @@
> +	  errx(1, "%s", gai_strerror(error));
> +	  return(NULL);
> +	}
>-+
>+ 
>+-		memcpy(&addr, hp->h_addr, 4);
> +	res = res0;
> +	switch (res->ai_family) {
> +	    case AF_INET:
>@@ -360,7 +384,7 @@
>  }
>  
>  
>-@@ -679,9 +744,7 @@
>+@@ -679,9 +744,7 @@ char *xstrdup(char *v) {
>  /* -------------------------------------------------------------------------- */
>  
>   void usage() {
>diff --git dns/nsping/files/patch-nsping.h dns/nsping/files/patch-nsping.h
>index fc73b5804e87..809746455ba1 100644
>--- dns/nsping/files/patch-nsping.h
>+++ dns/nsping/files/patch-nsping.h
>@@ -1,6 +1,6 @@
>---- nsping.h.orig	Wed Jul 20 15:23:39 2005
>-+++ nsping.h	Tue Feb 15 17:29:55 2005
>-@@ -27,7 +27,7 @@
>+--- nsping.h.orig	1997-11-24 09:47:25 UTC
>++++ nsping.h
>+@@ -27,7 +27,7 @@ typedef unsigned short u_int16_t;
>  #endif
>  
>  #define QUERY_BACKLOG	1024
>@@ -9,14 +9,15 @@
>  #define DEFAULT_SECOND_INTERVAL	1
>  #define DEFAULT_USECOND_INTERVAL	0
>  
>-@@ -40,11 +40,10 @@
>+@@ -40,11 +40,10 @@ void update(u_char *bp, int l);
>  void summarize(int);
>  double trip_time(struct timeval *send_time, struct timeval *rcv);
>  struct timeval *timeval_subtract(struct timeval *out, struct timeval *in);
> -char *addr_string(u_int32_t address);
> -int bind_udp_socket(u_int32_t address, u_int16_t port);
>+-void dprintf(char *fmt, ...);
> +int bind_udp_socket(char *port);
>- void dprintf(char *fmt, ...);
>++void debug_printf(char *fmt, ...);
>  void usage(void);
>  char *xstrdup(char *v);
> -u_int32_t resolve(char *name);
>diff --git editors/cooledit/Makefile editors/cooledit/Makefile
>index a9dd6688256f..65812f35931f 100644
>--- editors/cooledit/Makefile
>+++ editors/cooledit/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cooledit
>-DISTVERSION=	3.17.28
>-PORTREVISION=	3
>+DISTVERSION=	4.0.0
> CATEGORIES=	editors
> MASTER_SITES=	SUNSITE/apps/editors/X/cooledit
> 
>@@ -13,22 +12,17 @@ COMMENT=	Suite of utilities, including a GUI editor
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		gettext gmake libtool python xorg # gettext is linked to despite .mo files having been deleted
>+LIB_DEPENDS=	libfreetype.so:print/freetype2
>+
>+USES=		gettext-runtime gmake libtool pkgconfig python xorg
> GNU_CONFIGURE=	yes
> USE_XORG=	x11 xt
> USE_LDCONFIG=	yes
> USE_GCC=	any
> INSTALL_TARGET=	install-strip
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
>+CPPFLAGS+=	-I${PREFIX}/include
>+LDFLAGS+=	-lpthread -L${PREFIX}/lib
> CFLAGS+=	-DHAVE_MBRTOWC
> 
>-OPTIONS_DEFINE=	NEXT_LOOK
>-NEXT_LOOK_DESC=	Enable NeXT look
>-NEXT_LOOK_CONFIGURE_ENABLE=	NeXT-look
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|po pixmap man|po man|g' ${WRKSRC}/Makefile.in
>-
> .include <bsd.port.mk>
>diff --git editors/cooledit/distinfo editors/cooledit/distinfo
>index da007b5b5049..cb255704f826 100644
>--- editors/cooledit/distinfo
>+++ editors/cooledit/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1527085795
>-SHA256 (cooledit-3.17.28.tar.gz) = 4d8b664592737bb1d4b93e509fe185d712318f40fc3c5a36bbc522d87f6b686d
>-SIZE (cooledit-3.17.28.tar.gz) = 1265017
>+TIMESTAMP = 1595154397
>+SHA256 (cooledit-4.0.0.tar.gz) = 88822d8436d4d81b5dabb909881a7e28ef3dd16b1302c0b430938cba8bb96c96
>+SIZE (cooledit-4.0.0.tar.gz) = 67719237
>diff --git editors/cooledit/files/patch-widget__widechar.c editors/cooledit/files/patch-widget__widechar.c
>deleted file mode 100644
>index 2d4aa642e314..000000000000
>--- editors/cooledit/files/patch-widget__widechar.c
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- widget/widechar.c.orig	2017-08-04 19:12:31 UTC
>-+++ widget/widechar.c
>-@@ -227,6 +227,7 @@ static inline struct mb_rule apply_mb_ru
>- static inline struct mb_rule apply_mb_rules_going_right (WEdit * edit, long byte_index, struct mb_rule mb_rule)
>- {
>- #ifdef HAVE_WCHAR_H
>-+#ifdef HAVE_MBRTOWC
>-     wchar_t wc;
>-     unsigned char p[16];
>-     int n;
>-@@ -253,6 +254,7 @@ static inline struct mb_rule apply_mb_ru
>-     mb_rule.end = 0;
>-     mb_rule.ch = -1;
>- #endif
>-+#endif
>-     return mb_rule;
>- }
>- 
>diff --git editors/cooledit/pkg-plist editors/cooledit/pkg-plist
>index 1b53eea7f4d4..86cee8ae4383 100644
>--- editors/cooledit/pkg-plist
>+++ editors/cooledit/pkg-plist
>@@ -11,6 +11,114 @@ man/man1/cooledit.1.gz
> man/man1/coolman.1.gz
> man/man1/smalledit.1.gz
> %%DATADIR%%/c_utils.py
>+%%DATADIR%%/fonts/8x13B-ISO8859-1.pcf.gz
>+%%DATADIR%%/fonts/8x13B.pcf.gz
>+%%DATADIR%%/fonts/Makefile.am
>+%%DATADIR%%/fonts/NotoColorEmoji.ttf
>+%%DATADIR%%/fonts/NotoEmoji-Regular.ttf
>+%%DATADIR%%/fonts/NotoKufiArabic-Regular.ttf
>+%%DATADIR%%/fonts/NotoMono-Regular.ttf
>+%%DATADIR%%/fonts/NotoNaskhArabicUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoNastaliqUrdu-Regular.ttf
>+%%DATADIR%%/fonts/NotoSans-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansAdlam-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansAdlamUnjoined-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansAnatolianHieroglyphs-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansArmenian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansAvestan-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansBalinese-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansBamum-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansBatak-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansBengaliUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansBrahmi-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansBuginese-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansBuhid-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansCanadianAboriginal-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansCarian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansChakma-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansCham-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansCherokee-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansCoptic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansCuneiform-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansCypriot-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansDeseret-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansDevanagariUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansEgyptianHieroglyphs-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansEthiopic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansGeorgian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansGlagolitic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansGothic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansGujaratiUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansGurmukhiUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansHanunoo-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansHebrew-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansImperialAramaic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansInscriptionalPahlavi-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansInscriptionalParthian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansJavanese-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansKaithi-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansKannadaUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansKayahLi-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansKharoshthi-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansKhmerUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansLaoUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansLepcha-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansLimbu-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansLinearB-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansLisu-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansLycian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansLydian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansMalayalamUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansMandaic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansMeeteiMayek-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansMongolian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansMono-Bold.ttf
>+%%DATADIR%%/fonts/NotoSansMonoCJKjp-Regular.otf
>+%%DATADIR%%/fonts/NotoSansMonoCJKkr-Regular.otf
>+%%DATADIR%%/fonts/NotoSansMonoCJKsc-Regular.otf
>+%%DATADIR%%/fonts/NotoSansMonoCJKtc-Regular.otf
>+%%DATADIR%%/fonts/NotoSansMyanmarUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansNKo-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansNewTaiLue-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansOgham-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansOlChiki-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansOldItalic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansOldPersian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansOldSouthArabian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansOldTurkic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansOriyaUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansOsage-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansOsmanya-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansPhagsPa-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansPhoenician-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansRejang-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansRunic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSamaritan-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSaurashtra-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansShavian-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSinhalaUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSundanese-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSylotiNagri-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSymbols-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSymbols2-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSyriacEastern-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSyriacEstrangela-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansSyriacWestern-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansTagalog-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansTagbanwa-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansTaiLe-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansTaiTham-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansTaiViet-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansTamilUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansTeluguUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansThaana-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansThaiUI-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansTibetan-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansTifinagh-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansUgaritic-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansVai-Regular.ttf
>+%%DATADIR%%/fonts/NotoSansYi-Regular.ttf
>+%%DATADIR%%/fonts/sort.py
> %%DATADIR%%/global.py
> %%DATADIR%%/sh_utils.py
> %%DATADIR%%/syntax/ada95.syntax
>diff --git editors/jove/Makefile editors/jove/Makefile
>index 7bcf82f3060a..d1fa7d6f6ca6 100644
>--- editors/jove/Makefile
>+++ editors/jove/Makefile
>@@ -20,18 +20,4 @@ USES=		ncurses
> MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses"
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
>-OPTIONS_DEFINE=	EXTRADOCS
>-EXTRADOCS_DESC=	Build and install cmds.doc
>-EXTRADOCS_USES=	groff
>-OPTIONS_DEFAULT=
>-OPTIONS_SUB=	yes
>-
>-post-patch:
>-# Fix collisions with getline(3)
>-	@${REINPLACE_CMD} 's|[[:<:]]getline[[:>:]]|get_line|g' ${WRKSRC}/*.c ${WRKSRC}/*.h
>-
>-post-patch-EXTRADOCS-off:
>-	@${REINPLACE_CMD} -E 's|^(all:.*) doc/cmds\.doc$$|\1|' ${WRKSRC}/Makefile
>-	@${REINPLACE_CMD} 's|^CMDS.DOC = .*|CMDS.DOC=|' ${WRKSRC}/Makefile
>-
> .include <bsd.port.mk>
>diff --git editors/jove/files/patch-io.c editors/jove/files/patch-io.c
>index 2017a06c133f..477e3d168b08 100644
>--- editors/jove/files/patch-io.c
>+++ editors/jove/files/patch-io.c
>@@ -17,3 +17,15 @@
>  #else /* MSFILESYSTEM */
>  	tmpfd = open(tfname, O_CREAT|O_EXCL|O_BINARY|O_RDWR, S_IWRITE|S_IREAD);
>  #endif /* MSFILESYSTEM */
>+@@ -1240,9 +1246,9 @@ int	Jr_Len;		/* length of Just Read Line */
>+ 
>+ void
>+ #ifdef USE_PROTOTYPES
>+-getline proto((daddr addr, register char *buf))
>++get_line proto((daddr addr, register char *buf))
>+ #else
>+-getline(addr, buf)
>++get_line(addr, buf)
>+ daddr	addr;
>+ register char	*buf;
>+ #endif
>diff --git editors/ne/Makefile editors/ne/Makefile
>index 0a87b17585ba..e0427736563f 100644
>--- editors/ne/Makefile
>+++ editors/ne/Makefile
>@@ -34,15 +34,6 @@ OPTIONS_DEFINE=		DEBUG DOCS
> 
> DEBUG_MAKE_ARGS=	NE_DEBUG=1
> 
>-post-patch:
>-	@${FIND} ${BUILD_WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|"regex\.h"|<gnu/regex.h>|g'
>-	@${REINPLACE_CMD} -e \
>-		's|-O3|| ; \
>-		/[[:space:]]regex.o/d ; \
>-		 s|regex.h$$||g' ${BUILD_WRKSRC}/makefile
>-	@${REINPLACE_CMD} -e '/cp -pR/d' ${WRKSRC}/makefile
>-
> post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ne
> 	${INSTALL_MAN} ${WRKSRC}/doc/ne.1 ${STAGEDIR}${MANPREFIX}/man/man1
>diff --git editors/ne/files/patch-makefile editors/ne/files/patch-makefile
>index 050ba7382925..5f4775095aa2 100644
>--- editors/ne/files/patch-makefile
>+++ editors/ne/files/patch-makefile
>@@ -1,6 +1,6 @@
>---- makefile.orig	2018-10-24 23:53:08 UTC
>+--- makefile.orig	2019-10-02 12:47:26 UTC
> +++ makefile
>-@@ -54,17 +54,17 @@ install:
>+@@ -54,17 +54,16 @@ install:
>  	mkdir -p $(DESTDIR)$(PREFIX)/bin
>  	mkdir -p $(DESTDIR)$(PREFIX)/share/ne/syntax
>  	mkdir -p $(DESTDIR)$(PREFIX)/share/ne/macros
>@@ -14,8 +14,8 @@
>  	cp -p syntax/*.jsf $(DESTDIR)$(PREFIX)/share/ne/syntax
>  	cp -p macros/*     $(DESTDIR)$(PREFIX)/share/ne/macros
> -	cp -p doc/ne.1 $(DESTDIR)$(PREFIX)/share/man/man1
>+-	cp -pR doc/html doc/ne.txt doc/default.* README.md COPYING NEWS CHANGES $(DESTDIR)$(PREFIX)/share/doc/ne
> +#	cp -p doc/ne.1 $(DESTDIR)$(PREFIX)/share/man/man1
>- 	cp -pR doc/html doc/ne.txt doc/default.* README.md COPYING NEWS CHANGES $(DESTDIR)$(PREFIX)/share/doc/ne
>  	if [ -f doc/ne.pdf ]; then cp -p doc/ne.pdf $(DESTDIR)$(PREFIX)/share/doc/ne ; fi
> -	cp -p doc/ne.info.gz $(DESTDIR)$(PREFIX)/share/info
> +#	cp -p doc/ne.info.gz $(DESTDIR)$(PREFIX)/share/info
>diff --git emulators/hercules/Makefile emulators/hercules/Makefile
>index 049799a3a8df..6cae5c663224 100644
>--- emulators/hercules/Makefile
>+++ emulators/hercules/Makefile
>@@ -24,14 +24,4 @@ INSTALL_TARGET=	install-strip
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|SOL_TCP|IPPROTO_TCP|g' ${WRKSRC}/hscutl.c
>-	@${REINPLACE_CMD} \
>-		-e '/herclin_LDADD =/s/$$/ libhercu.la libhercd.la/' \
>-		-e '/hercules_LDADD =/s/$$/ libhercu.la libhercd.la/' \
>-		${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e \
>-		'/^pkgdatadir/s|=.*|= $$(docdir)|' ${WRKSRC}/html/Makefile.in
>-
> .include <bsd.port.mk>
>diff --git finance/xtrader/Makefile finance/xtrader/Makefile
>index d4a23f963472..ee98a78f8aad 100644
>--- finance/xtrader/Makefile
>+++ finance/xtrader/Makefile
>@@ -22,16 +22,6 @@ NO_WRKSUBDIR=	yes
> PLIST_FILES=	bin/xtrader \
> 		%%DATADIR%%/sample.xt
> 
>-post-patch:
>-	${REINPLACE_CMD} -e 's|char|const char|' \
>-	    ${WRKSRC}/xtrader/src/Resource.cpp
>-	${REINPLACE_CMD} -e 's|static char|static const char|' \
>-	    ${WRKSRC}/xtrader/src/Resource.h
>-	${REINPLACE_CMD} -e 's|int(data)|(unsigned long)data|' \
>-	    ${WRKSRC}/xtrader/src/gui/XTrader.h
>-	${FIND} ${WRKSRC} -type f -name "*.cpp" -o -name "*.h" | ${XARGS} \
>-	   ${REINPLACE_CMD} -e '/^#include <FL/s|.h>$$|.H>|; s|fl_file_chooser|Fl_File_Chooser|g'
>-
> do-install:
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
> 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/sample.xt ${STAGEDIR}${DATADIR}
>diff --git finance/xtrader/files/patch-Makefile.linux finance/xtrader/files/patch-Makefile.linux
>deleted file mode 100644
>index 387ee358495e..000000000000
>--- finance/xtrader/files/patch-Makefile.linux
>+++ /dev/null
>@@ -1,21 +0,0 @@
>---- ./xtrader/Makefile.linux.orig	2004-10-22 00:21:08.000000000 +0200
>-+++ ./xtrader/Makefile.linux	2011-11-15 13:46:18.000000000 +0100
>-@@ -1,12 +1,12 @@
>--COMP=			g++
>--IFLAGS=			-I../util -Isrc -I/usr/local/include -I/usr/include/ptypes
>--CFLAGS=			-march=i586 -O3 -Wall -Wno-format-y2k
>--LFLAGS=			-L/usr/local/lib -lz -lfltk -lptypes  -lexpat -L/usr/X11R6/lib -lm -lXpm -lX11 -ldl -lpthread -lXft
>--LFLAGS2=		-L/usr/local/lib -lfltk_ -lptypes -L/usr/X11R6/lib -lXpm -lX11 -ldl -lpthread
>-+COMP=			$(CXX)
>-+IFLAGS=			-I../util -Isrc -I$(LOCALBASE)/include -I$(LOCALBASE)/include/ptypes
>-+CFLAGS:=			$(CFLAGS) -Wno-format-y2k
>-+LFLAGS=			-L$(LOCALBASE)/lib -lz -lfltk -lptypes -lexpat -lm -lXpm -lX11 -pthread -lXft -lcompat
>-+LFLAGS2=		-L$(LOCALBASE)/lib -lfltk -lptypes -lXpm -lX11 -pthread
>- XTRADER=		xtrader
>- XTRADER2=		xtrader.static
>- 
>--all:	$(XTRADER) $(XTRADER2)
>-+all:	$(XTRADER)
>- 
>- XTRADER_OBJ=../util/MH.o ../util/MHCSVFile.o \
>- 		../util/MHDate.o ../util/MHDayChart.o ../util/MHDC.o \
>diff --git finance/xtrader/files/patch-util_fl_Fl_Table.cpp finance/xtrader/files/patch-util_fl_Fl_Table.cpp
>deleted file mode 100644
>index c55ec51c0f62..000000000000
>--- finance/xtrader/files/patch-util_fl_Fl_Table.cpp
>+++ /dev/null
>@@ -1,56 +0,0 @@
>---- ./util/fl/Fl_Table.cpp.orig	2004-11-14 11:21:29.000000000 +0100
>-+++ ./util/fl/Fl_Table.cpp	2011-11-15 13:46:19.000000000 +0100
>-@@ -10,15 +10,15 @@
>- #include "Fl_Select.h"
>- #include "Fl_Find.h"
>- #include "Fl_Defines.h"
>--#include <FL/Fl.h>
>--#include <FL/fl_ask.h>
>--#include <FL/fl_draw.h>
>--#include <FL/Fl_Choice.h>
>--#include <FL/Fl_Check_Button.h>
>--#include <FL/Fl_File_Chooser.h>
>--#include <FL/Fl_Input.h>
>--#include <FL/Fl_Scrollbar.h>
>--#include <FL/fl_show_colormap.h>
>-+#include <FL/Fl.H>
>-+#include <FL/fl_ask.H>
>-+#include <FL/fl_draw.H>
>-+#include <FL/Fl_Choice.H>
>-+#include <FL/Fl_Check_Button.H>
>-+#include <FL/Fl_File_Chooser.H>
>-+#include <FL/Fl_Input.H>
>-+#include <FL/Fl_Scrollbar.H>
>-+#include <FL/fl_show_colormap.H>
>- #include <stdlib.h>
>- #include <stdio.h>
>- #include <string.h>
>-@@ -962,7 +962,14 @@
>-     }
>- }
>- 
>--
>-+/**
>-+ * Callback for file chooser
>-+ */
>-+void tab_fc_callback(Fl_File_Chooser *fc, void *data)
>-+{
>-+	Fl_Table *t = static_cast<Fl_Table *>(data);
>-+	t->aData->value (fc->value(), t->aCurrRow, t->aCurrCol);
>-+}
>- 
>- /**
>- *  Start to edit a cell
>-@@ -983,9 +990,10 @@
>- 
>-     }
>-     else if (aData->editor_type (aCurrRow, aCurrCol, false) == FL_DLG_FILE_EDITOR) {
>--        char* file = fl_file_chooser("Select File", "*", aData->value(aCurrRow, aCurrCol));
>--        aData->value (file, aCurrRow, aCurrCol);
>- 
>-+        Fl_File_Chooser *fc = new Fl_File_Chooser("Select File", "*", Fl_File_Chooser::SINGLE, aData->value(aCurrRow, aCurrCol));
>-+        fc->callback(tab_fc_callback, this);
>-+        delete fc;
>-     }
>-     else {
>-         aEditWidget = aData->editor (aCurrRow, aCurrCol, force_custom);
>diff --git finance/xtrader/files/patch-util_fl_Fl_Table.h finance/xtrader/files/patch-util_fl_Fl_Table.h
>deleted file mode 100644
>index 02db64451ad4..000000000000
>--- finance/xtrader/files/patch-util_fl_Fl_Table.h
>+++ /dev/null
>@@ -1,26 +0,0 @@
>---- ./util/fl/Fl_Table.h.orig	2004-11-14 11:21:34.000000000 +0100
>-+++ ./util/fl/Fl_Table.h	2011-11-15 13:46:19.000000000 +0100
>-@@ -12,12 +12,13 @@
>-     #define snprintf _snprintf
>- #endif
>- 
>--#include <FL/Fl_Group.h>
>-+#include <FL/Fl_Group.H>
>- #include "Fl_Table_Data.h"
>- 
>- class Fl_Input;
>- class Fl_Scrollbar;
>- class Fl_Find;
>-+class Fl_File_Chooser;
>- 
>- enum {
>-     FL_DATA_CHANGE = 1000,
>-@@ -121,6 +122,8 @@
>-     void                    get_cell_pos (int& row, int& col, int& xpos, int& ypos, int& width, int& height);
>-     void                    start_edit_mode (bool force = false);
>-     void                    set_cursor(int row, int col) {move_cursor (row - aCurrRow, col - aCurrCol);}
>-+	 friend                  void tab_fc_callback(Fl_File_Chooser *fc, void *data);
>-+
>- };
>- 
>- #endif
>diff --git finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.cpp finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.cpp
>index 66b6221ea404..e232a5ed084b 100644
>--- finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.cpp
>+++ finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.cpp
>@@ -1,5 +1,5 @@
>---- ./xtrader/src/dlg/DownloadDlg.cpp.orig	2004-11-14 11:21:30.000000000 +0100
>-+++ ./xtrader/src/dlg/DownloadDlg.cpp	2011-11-15 13:46:19.000000000 +0100
>+--- xtrader/src/dlg/DownloadDlg.cpp.orig	2004-11-14 10:21:30 UTC
>++++ xtrader/src/dlg/DownloadDlg.cpp
> @@ -21,8 +21,8 @@
>  #include "Enums.h"
>  #include "Progress.h"
>@@ -11,7 +11,7 @@
>  #include <MHDate.h>
>  #include <MHDebug.h>
>  #include <MHFile.h>
>-@@ -164,13 +164,24 @@
>+@@ -164,13 +164,24 @@ void DownloadDlg::cb2 () {
>  }
>  
>  
>@@ -23,9 +23,9 @@
> +	DownloadDlg *d = static_cast<DownloadDlg *>(data);
> +	const char *file = fc->value();
> +	if (file && *file) d->aFile->value(file);
>-+
>-+}
>  
>++}
>++
>  /**
>  * Browse for result file name
>  */
>diff --git finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.h finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.h
>index 38ec0f85621d..0b4cff63d4c9 100644
>--- finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.h
>+++ finance/xtrader/files/patch-xtrader_src_dlg_DownloadDlg.h
>@@ -1,5 +1,5 @@
>---- ./xtrader/src/dlg/DownloadDlg.h.orig	2004-11-14 11:21:35.000000000 +0100
>-+++ ./xtrader/src/dlg/DownloadDlg.h	2011-11-15 13:46:19.000000000 +0100
>+--- xtrader/src/dlg/DownloadDlg.h.orig	2004-11-14 10:21:35 UTC
>++++ xtrader/src/dlg/DownloadDlg.h
> @@ -18,6 +18,7 @@
>  #include <download/BaseDownload.h>
>  
>@@ -8,7 +8,7 @@
>  
>  
>  
>-@@ -51,6 +52,8 @@
>+@@ -51,6 +52,8 @@ class DownloadDlg : public Fl_Dialog { (private)
>      Fl_Button*              aClose;
>  
>      void                    download (int type, const char* start, const char* stop, int action);
>diff --git finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.cpp finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.cpp
>index d949b682b6bc..cb790cca8add 100644
>--- finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.cpp
>+++ finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.cpp
>@@ -1,5 +1,5 @@
>---- ./xtrader/src/dlg/ExportDlg.cpp.orig	2004-11-14 11:21:29.000000000 +0100
>-+++ ./xtrader/src/dlg/ExportDlg.cpp	2011-11-15 13:46:19.000000000 +0100
>+--- xtrader/src/dlg/ExportDlg.cpp.orig	2004-11-14 10:21:29 UTC
>++++ xtrader/src/dlg/ExportDlg.cpp
> @@ -14,9 +14,9 @@
>  #include <help/Export.h>
>  #include <MHDate.h>
>@@ -13,7 +13,7 @@
>  
>  
>  
>-@@ -134,13 +134,23 @@
>+@@ -134,13 +134,23 @@ void ExportDlg::cb2 () {
>  }
>  
>  
>diff --git finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.h finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.h
>index caebcd376689..9a9278cf8b4b 100644
>--- finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.h
>+++ finance/xtrader/files/patch-xtrader_src_dlg_ExportDlg.h
>@@ -1,5 +1,5 @@
>---- ./xtrader/src/dlg/ExportDlg.h.orig	2004-11-14 11:21:35.000000000 +0100
>-+++ ./xtrader/src/dlg/ExportDlg.h	2011-11-15 13:46:19.000000000 +0100
>+--- xtrader/src/dlg/ExportDlg.h.orig	2004-11-14 10:21:35 UTC
>++++ xtrader/src/dlg/ExportDlg.h
> @@ -16,6 +16,7 @@
>  #include <FL/Fl_Button.H>
>  
>@@ -8,7 +8,7 @@
>  
>  
>  
>-@@ -45,6 +46,8 @@
>+@@ -45,6 +46,8 @@ class ExportDlg : public Fl_Dialog { (private)
>      Fl_Button*              aBrowse;
>      Fl_Button*              aHelp;
>      Fl_Button*              aClose;
>diff --git finance/xtrader/files/patch-xtrader_src_gui_ReportView.cpp finance/xtrader/files/patch-xtrader_src_gui_ReportView.cpp
>index 9edaf9db3340..53ff712417d4 100644
>--- finance/xtrader/files/patch-xtrader_src_gui_ReportView.cpp
>+++ finance/xtrader/files/patch-xtrader_src_gui_ReportView.cpp
>@@ -1,5 +1,5 @@
>---- ./xtrader/src/gui/ReportView.cpp.orig	2004-11-14 11:21:30.000000000 +0100
>-+++ ./xtrader/src/gui/ReportView.cpp	2011-11-15 13:46:19.000000000 +0100
>+--- xtrader/src/gui/ReportView.cpp.orig	2004-11-14 10:21:30 UTC
>++++ xtrader/src/gui/ReportView.cpp
> @@ -21,13 +21,13 @@
>  #include "Resource.h"
>  #include <MHDate.h>
>@@ -20,11 +20,10 @@
>  #include <fl/Fl_Table.h>
>  #include <fl/Fl_Table_Data.h>
>  
>-@@ -139,7 +139,15 @@
>+@@ -139,8 +139,16 @@ void ReportView::cbBrowser1 () {
>  void ReportView::cbBrowser2 () {
>  }
>  
>--
> +/**
> + * Callback for file chooser
> + */
>@@ -35,9 +34,11 @@
> +	if (file && *file) r->Save (file);
> +}
>  
>+-
>  /**
>  *  Callback for buttons
>-@@ -173,8 +181,9 @@
>+ */
>+@@ -173,8 +181,9 @@ void ReportView::cbButton (Fl_Button* button) {
>              Report* r = ((ReportData*)aTable->data())->report();
>  
>              if (r) {
>diff --git finance/xtrader/files/patch-xtrader_src_gui_XTrader.cpp finance/xtrader/files/patch-xtrader_src_gui_XTrader.cpp
>index ec1e442b9e2b..6d12b399bde7 100644
>--- finance/xtrader/files/patch-xtrader_src_gui_XTrader.cpp
>+++ finance/xtrader/files/patch-xtrader_src_gui_XTrader.cpp
>@@ -1,5 +1,5 @@
>---- ./xtrader/src/gui/XTrader.cpp.orig	2004-11-14 11:21:30.000000000 +0100
>-+++ ./xtrader/src/gui/XTrader.cpp	2011-11-15 13:46:19.000000000 +0100
>+--- xtrader/src/gui/XTrader.cpp.orig	2004-11-14 10:21:30 UTC
>++++ xtrader/src/gui/XTrader.cpp
> @@ -34,11 +34,11 @@
>  #include "table/SecurityData.h"
>  #include "table/SetData.h"
>@@ -16,7 +16,7 @@
>  #include <fl/Fl_Table_Data.h>
>  #include <MHDate.h>
>  #include <MHDebug.h>
>-@@ -249,6 +249,34 @@
>+@@ -249,7 +249,35 @@ void XTrader::cbClose () {
>  }
>  
>  
>@@ -27,7 +27,7 @@
> +{
> +	XTrader *xt = static_cast<XTrader *>(data);
> +	const char *file = fc->value();
>-+
>+ 
> +	if (file && *file) {
> +		MHDate date;
> +		Import* import = 0;
>@@ -48,10 +48,11 @@
> +		delete import;
> +	}
> +}
>- 
>++
>  /**
>  *  Callback for all menu items
>-@@ -291,28 +319,11 @@
>+ */
>+@@ -291,28 +319,11 @@ void XTrader::cbMenu (int id) {
>                  break;
>  
>              case Resource::MENU_IMPORT: {
>diff --git games/54321/Makefile games/54321/Makefile
>index d57d8363124c..cc9cb3acaadd 100644
>--- games/54321/Makefile
>+++ games/54321/Makefile
>@@ -22,14 +22,6 @@ post-extract:
> 	@${MKDIR} ${WRKSRC}/archs/${OPSYS}
> 	@${CP} ${FILESDIR}/variables.GNU ${WRKSRC}/archs/${OPSYS}
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|ARCH|OPSYS| ; \
>-		 s|:= -O|+=|' ${WRKSRC}/GNUmakefile
>-	@${REINPLACE_CMD} -e \
>-		's|SDL_main|main| ; \
>-		 s|../../data/|${DATADIR}/data/|' ${WRKSRC}/code/*.cpp
>-
> do-install:
> 	(cd ${WRKSRC}/Release/bin/${OPSYS} && ${INSTALL_PROGRAM} 54321 \
> 		${STAGEDIR}${PREFIX}/bin)
>diff --git games/eboard/Makefile games/eboard/Makefile
>index ea5055f6886a..5a5c8a48907d 100644
>--- games/eboard/Makefile
>+++ games/eboard/Makefile
>@@ -25,22 +25,22 @@ USE_PERL5=	build
> USE_GNOME=	gtk20
> SHEBANG_FILES=	configure
> 
>-CONFIGURE_ARGS=	--prefix=${PREFIX} \
>-		--extra-inc=${LOCALBASE}/include \
>-		--extra-ld=${LOCALBASE}/lib
>+CONFIGURE_ARGS=	--extra-inc=${LOCALBASE}/include \
>+		--extra-ld=${LOCALBASE}/lib \
>+		--prefix=${PREFIX}
> 
> INSTALL_TARGET=	install install-man
> 
>-OPTIONS_DEFINE=	JOYSTICK DOCS
>-JOYSTICK_DESC=	Enable joystick support
>+OPTIONS_DEFINE=		DOCS JOYSTICK
>+JOYSTICK_DESC=		Enable joystick support
> JOYSTICK_BUILD_DEPENDS=	${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto
> 
>-DESKTOP_ENTRIES="eboard" \
>-		"Play chess" \
>-		"${PREFIX}/share/pixmaps/eboard.xpm" \
>-		"eboard" \
>-		"Game;BoardGame;GTK;" \
>-		true
>+DESKTOP_ENTRIES=	"eboard" \
>+			"Play chess" \
>+			"${PREFIX}/share/pixmaps/eboard.xpm" \
>+			"eboard" \
>+			"Game;BoardGame;GTK;" \
>+			true
> 
> .include <bsd.port.options.mk>
> 
>diff --git games/eboard/files/patch-c++11 games/eboard/files/patch-c++11
>deleted file mode 100644
>index 68b47b914a39..000000000000
>--- games/eboard/files/patch-c++11
>+++ /dev/null
>@@ -1,17 +0,0 @@
>-libc++ doesn't like "using namespace std" in C++11
>-
>-network.cc:466:59: error: invalid operands to binary expression ('__bind<int &, sockaddr *, unsigned long>' and 'int')
>-  if (bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
>-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ ~~
>-
>---- network.cc.orig	2008-02-22 15:51:22 UTC
>-+++ network.cc
>-@@ -463,7 +463,7 @@ int IncomingConnection::createSocket() {
>-   sin.sin_addr.s_addr = INADDR_ANY;
>-   sin.sin_port = htons(Port);
>-     
>--  if (bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
>-+  if (::bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
>-     snprintf(errorMessage,128,_("Unable to bind on port %d."),Port);
>-     return(-1);
>-   }
>diff --git games/eboard/files/patch-configure games/eboard/files/patch-configure
>index aa5c56eff85d..e346a75f6844 100644
>--- games/eboard/files/patch-configure
>+++ games/eboard/files/patch-configure
>@@ -1,11 +1,36 @@
>---- configure.orig	2020-01-02 23:06:25 UTC
>+--- configure.orig	2020-01-27 14:05:04 UTC
> +++ configure
>+@@ -1,12 +1,12 @@
>+-#!/usr/bin/perl
>++#!/usr/local/bin/perl
>+ 
>+ use IO::Handle;
>+ 
>+ my $prefix      = "/usr/local";
>+ my $package     = "eboard";
>+ my $version     = "1.1.1";
>+-my $cxx         = "g++";
>+-my @cxxflags    = ("-O6");
>++my $cxx         = "c++";
>++my @cxxflags    = ("-O2 -pipe -fstack-protector-strong -fno-strict-aliasing  ");
>+ my @ldflags     = ("-lpthread");
>+ my @libs        = ();
>+ my $configh     = "config.h";
>+@@ -45,7 +45,7 @@ sub usage {
>+     print "\t--enable-debug       compile with gdb debugging info\n";
>+     print "\t--disable-nls        disable translation support\n";
>+ #    print "\t--disable-dgt        disable DGT board support\n";
>+-    print "\t--compiler=prog      use alternative compiler (default: g++)\n";
>++    print "\t--compiler=prog      use alternative compiler (default: c++)\n";
>+     print "\t--extra-inc=list     additional include file search paths, separated by :\n";
>+     print "\t--extra-ld=list      additional library search paths, separated by :\n";
>+     print "\t--extra-libs=list    additional libraries separated by :\n";
> @@ -104,7 +104,7 @@ sub run_cmd {
>  }
>  
>  sub cplusplus_lang {
> -    my @compilers = ( $cxx, 'g++', 'c++' );
>-+    my @compilers = ( $cxx, 'g++9', 'c++' );
>++    my @compilers = ( $cxx, 'c++9', 'c++' );
>      my $x;
>      my $program = <<EOF;
>  #include <list>
>diff --git games/eboard/files/patch-libpng15 games/eboard/files/patch-libpng15
>deleted file mode 100644
>index 8ab283259f79..000000000000
>--- games/eboard/files/patch-libpng15
>+++ /dev/null
>@@ -1,16 +0,0 @@
>---- cimg.cc
>-+++ cimg.cc
>-@@ -94,11 +95,11 @@
>-       ct == PNG_COLOR_TYPE_GRAY_ALPHA)
>-     png_set_gray_to_rgb(pngp);
>- 
>--  alloc(pngp->width,pngp->height);
>-+  alloc(width,height);
>-   if (!ok) { fclose(f); return; }
>-   ok = 0;
>- 
>--  for(i=0;i<pngp->height;i++) {
>-+  for(i=0;i<height;i++) {
>-     png_read_row(pngp, (png_bytep) (&data[i*rowlen]), NULL);
>-   }
>- 
>diff --git games/eboard/files/patch-main.cc games/eboard/files/patch-main.cc
>index afe72228d1e9..b0ed8027788e 100644
>--- games/eboard/files/patch-main.cc
>+++ games/eboard/files/patch-main.cc
>@@ -1,6 +1,6 @@
>---- main.cc.orig	Mon Jan 22 18:57:40 2007
>-+++ main.cc	Tue Jan 30 21:07:51 2007
>-@@ -139,7 +139,7 @@
>+--- main.cc.orig	2020-01-27 14:05:04 UTC
>++++ main.cc
>+@@ -139,7 +139,7 @@ void openJoystick(MainWindow *mw) {
>    char devname[64];
>  
>    for(i=0;i<10;i++) {
>diff --git games/eboard/files/patch-network.cc games/eboard/files/patch-network.cc
>index 7940e08087f1..fde25f744653 100644
>--- games/eboard/files/patch-network.cc
>+++ games/eboard/files/patch-network.cc
>@@ -1,6 +1,15 @@
>---- network.cc.orig	2008-02-22 16:51:22.000000000 +0100
>-+++ network.cc	2008-12-29 11:24:10.000000000 +0100
>-@@ -566,6 +566,7 @@
>+--- network.cc.orig	2020-01-27 14:05:04 UTC
>++++ network.cc
>+@@ -463,7 +463,7 @@ int IncomingConnection::createSocket() {
>+   sin.sin_addr.s_addr = INADDR_ANY;
>+   sin.sin_port = htons(Port);
>+     
>+-  if (bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
>++  if (::bind(netsocket,(struct sockaddr *) &sin,sizeof(sin))==-1) {
>+     snprintf(errorMessage,128,_("Unable to bind on port %d."),Port);
>+     return(-1);
>+   }
>+@@ -566,6 +566,7 @@ PipeConnection::PipeConnection(int _pin,int _pout) {
>    strcpy(HostName,"local pipe");
>    snprintf(HostAddress,96,"pipe[%d,%d]",pin,pout);
>    Quiet=0;
>@@ -8,7 +17,7 @@
>    MaxWaitTime = 60000.0; // 1 minute
>  }
>  
>-@@ -577,6 +578,7 @@
>+@@ -577,6 +578,7 @@ void PipeConnection::init() {
>    strcpy(HostAddress,"unknown");
>    memset(HelperBin,0,512);
>    Quiet=0;
>@@ -16,7 +25,7 @@
>    handshake.erase();
>    MaxWaitTime = 60000.0; // 1 minute
>  }
>-@@ -612,6 +614,25 @@
>+@@ -612,6 +614,25 @@ PipeConnection::PipeConnection(char *host,int port, 
>    Port=port;
>    g_strlcpy(HostName,host,128);
>  
>@@ -42,7 +51,7 @@
>    // build helper path
>    if (helpersuffix)
>      snprintf(z,256,"%s.%s",helperbin,helpersuffix);
>-@@ -728,7 +749,10 @@
>+@@ -728,7 +749,10 @@ int PipeConnection::open() {
>      dup2(1,2);
>  
>      setpgid(getpid(),0); // to broadcast SIGKILL later
>diff --git games/eboard/files/patch-network.h games/eboard/files/patch-network.h
>index c948b094d892..eadcd891e542 100644
>--- games/eboard/files/patch-network.h
>+++ games/eboard/files/patch-network.h
>@@ -1,6 +1,6 @@
>---- network.h.orig	Mon Jan 15 23:59:58 2007
>-+++ network.h	Wed Jan 17 19:39:10 2007
>-@@ -235,6 +235,7 @@
>+--- network.h.orig	2020-01-27 14:05:04 UTC
>++++ network.h
>+@@ -235,6 +235,7 @@ class PipeConnection : public BufferedConnection,
>    int  pid;
>    int  toid; // timeout
>    string handshake;
>diff --git games/eboard/files/patch-ntext.cc games/eboard/files/patch-ntext.cc
>index b87bfa523882..9c3b1d39bbc7 100644
>--- games/eboard/files/patch-ntext.cc
>+++ games/eboard/files/patch-ntext.cc
>@@ -1,4 +1,4 @@
>---- ntext.cc.orig	2008-02-22 15:51:22 UTC
>+--- ntext.cc.orig	2020-01-27 14:05:04 UTC
> +++ ntext.cc
> @@ -237,7 +237,7 @@ void NText::setBG(int c) {
>  void NText::append(const char *text, int len, int color) {
>@@ -9,7 +9,7 @@
>  
>    if (len < 0) {
>      discardExcess();
>-@@ -246,10 +246,8 @@ void NText::append(const char *text, int
>+@@ -246,10 +246,8 @@ void NText::append(const char *text, int len, int colo
>  
>    p = strchr(text, '\n');
>    if (p!=NULL) {
>diff --git games/gracer/Makefile games/gracer/Makefile
>index 18939d4e45cf..f643639c6289 100644
>--- games/gracer/Makefile
>+++ games/gracer/Makefile
>@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
> LIB_DEPENDS=	libgif.so:graphics/giflib \
> 		libpng.so:graphics/png
> 
>-USES=		gl gmake jpeg localbase perl5 tcl
>+USES=		gl gmake jpeg localbase perl5 tcl xorg
> USE_GL=		glut
> USE_PERL5=	build
> GNU_CONFIGURE=	yes
>diff --git games/gracer/files/patch-ab games/gracer/files/patch-ab
>deleted file mode 100644
>index c3b805f5796d..000000000000
>--- games/gracer/files/patch-ab
>+++ /dev/null
>@@ -1,10 +0,0 @@
>-Index: src/glhash.h
>-@@ -709,6 +709,8 @@
>- 	{"all_attrib_bits",	GL_ALL_ATTRIB_BITS},
>- 	{"client_pixel_store_bit",	GL_CLIENT_PIXEL_STORE_BIT},
>- 	{"client_vertex_array_bit",	GL_CLIENT_VERTEX_ARRAY_BIT},
>-+#ifdef GL_CLIENT_ALL_ATTRIB_BITS
>- 	{"client_all_attrib_bits",	GL_CLIENT_ALL_ATTRIB_BITS},
>-+#endif
>- 	{NULL, GL_NONE},
>- };
>diff --git games/gracer/files/patch-ac2scene.c games/gracer/files/patch-ac2scene.c
>deleted file mode 100644
>index 66e5d009cbbd..000000000000
>--- games/gracer/files/patch-ac2scene.c
>+++ /dev/null
>@@ -1,37 +0,0 @@
>---- ac2scene/ac2scene.c.orig	Fri Apr  1 18:36:19 2005
>-+++ ac2scene/ac2scene.c	Fri Apr  1 18:36:48 2005
>-@@ -160,8 +160,6 @@
>-       return 1;
>-     }
>-     break;
>--
>--  default:
>-   }
>- 
>-   return 0;
>-@@ -232,8 +230,6 @@
>-       return 1;
>-     }
>-     break;
>--
>--  default:
>-   }
>- 
>-   return 0;
>-@@ -315,7 +311,6 @@
>-       return 1;
>-     }
>-     break;
>--  default:
>-   }
>- 
>-   return 0;
>-@@ -397,8 +392,6 @@
>-       hints[i]->state = GR_SCENE_OPT_QUAD_STRIP_START;
>-       hints[i]->surf->elements = gr_new (GrSElement, num_quads * 2 + 2);
>-       break;
>--
>--    default:
>-     }
>-   }
>- 
>diff --git games/gracer/files/patch-glbind.c games/gracer/files/patch-glbind.c
>deleted file mode 100644
>index 800aefec1ee2..000000000000
>--- games/gracer/files/patch-glbind.c
>+++ /dev/null
>@@ -1,29 +0,0 @@
>---- src/glbind.c.orig	Wed May  4 18:45:48 2005
>-+++ src/glbind.c	Wed May  4 18:46:20 2005
>-@@ -2147,8 +2147,6 @@
>-     TCL_CHECK(Tcl_GetIntFromObj(interp, objv[2], &i), ERROR);
>-     GL_CHECK(glLightModeli (pname, i));
>-     return 3;
>--
>--  default:
>-   }
>- 
>- ERROR:
>-@@ -2886,8 +2884,6 @@
>-     }
>-     GL_CHECK(glTexEnvfv (GL_TEXTURE_ENV, pname, param));
>-     return 6;
>--
>--  default:
>-   }
>- 
>- ERROR:
>-@@ -3078,8 +3074,6 @@
>-     param[0] = d;
>-     GL_CHECK(glTexParameterf (target, pname, param[0]));
>-     return 4;
>--
>--  default:
>-   }
>- 
>- ERROR:
>diff --git games/gracer/files/patch-glutwidgets.c games/gracer/files/patch-glutwidgets.c
>deleted file mode 100644
>index b1fc3ec264b4..000000000000
>--- games/gracer/files/patch-glutwidgets.c
>+++ /dev/null
>@@ -1,54 +0,0 @@
>---- src/glutwidgets.c.orig	Wed May  4 18:47:07 2005
>-+++ src/glutwidgets.c	Wed May  4 18:48:56 2005
>-@@ -254,7 +254,6 @@
>- 	widget->x -= (width - screen_width) / 2;
>- 	widget->width += (width - screen_width);
>- 	break;
>--      default:
>-       }
>-       switch (widget->anchor & GR_VERTICAL_MASK) {
>-       case GR_BOTTOM:
>-@@ -267,7 +266,6 @@
>- 	widget->y -= (height - screen_height) / 2;
>- 	widget->height += (width - screen_height);
>- 	break;
>--      default:
>-       }
>-       glut_widget_calc_bbox (widget);
>-     }
>-@@ -325,8 +323,6 @@
>- 	glut_widget_set_focus (glut_next_focus_widget (NULL));
>-       }
>-       break;
>--
>--    default:
>-     }
>-   }
>- 
>-@@ -502,8 +498,6 @@
>- 	glut_widget_set_focus (widget);
>-       }
>-       break;
>--
>--    default:
>-     }
>-   }
>- 
>-@@ -1297,8 +1291,6 @@
>-     }
>-     glut_post_redisplay ();
>-     break;
>--
>--  default:
>-   }
>- }
>- 
>-@@ -1569,8 +1561,6 @@
>-     case GR_RIGHT:
>-       width = glut_label_width (obj) / 2;
>-       break;
>--
>--    default:
>-     }
>- 
>-     glColor4fv (widget->fg_color[GR_STATE_NORMAL]);
>diff --git games/gracer/files/patch-gr_memory.h games/gracer/files/patch-gr_memory.h
>deleted file mode 100644
>index 218a2b368ddc..000000000000
>--- games/gracer/files/patch-gr_memory.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- common/gr_memory.h.orig	Wed May  4 18:49:43 2005
>-+++ common/gr_memory.h	Wed May  4 18:49:45 2005
>-@@ -64,7 +64,7 @@
>- void	gr_dlist_free			(GrDList *list);
>- 
>- #define gr_FOREACH(l,p) \
>--  for (; (l) != NULL && ((void *)(p) = (l)->data, 1); (l) = (l)->next) 
>-+  for (; (l) != NULL && ((p) = (l)->data, 1); (l) = (l)->next) 
>- 
>- void	gr_ref_incr			(GrRef *ref);
>- void	gr_ref_decr			(GrRef *ref);
>diff --git games/gracer/files/patch-gr_texture.c games/gracer/files/patch-gr_texture.c
>deleted file mode 100644
>index 9ea5e054f72e..000000000000
>--- games/gracer/files/patch-gr_texture.c
>+++ /dev/null
>@@ -1,32 +0,0 @@
>---- common/gr_texture.c.orig	2000-03-01 04:27:18 UTC
>-+++ common/gr_texture.c
>-@@ -274,7 +274,11 @@ read_gif_file (GrTexture *texture, char 
>-   int index;
>-   int width, height;
>- 
>-+#if GIFLIB_MAJOR >= 5
>-+  file = DGifOpenFileName (filename, NULL);
>-+#else
>-   file = DGifOpenFileName (filename);
>-+#endif
>-   if (!file)
>-     return -1;
>- 
>-@@ -419,7 +423,7 @@ read_png_file (GrTexture *texture, char 
>-   if (fread (header, 1, PNG_BYTES_TO_CHECK, file) != PNG_BYTES_TO_CHECK) {
>-     goto ERROR;
>-   }
>--  if (!png_check_sig (header, PNG_BYTES_TO_CHECK)) {
>-+  if (png_sig_cmp (header, 0, PNG_BYTES_TO_CHECK)) {
>-     goto ERROR;
>-   }
>- 
>-@@ -431,7 +435,7 @@ read_png_file (GrTexture *texture, char 
>-   if (!info_ptr) {
>-     goto ERROR;
>-   }
>--  if (setjmp (png_ptr->jmpbuf)) {
>-+  if (setjmp (png_jmpbuf(png_ptr))) {
>-     goto ERROR;
>-   }
>-   png_init_io (png_ptr, file);
>diff --git games/gracer/files/patch-gr_world.c games/gracer/files/patch-gr_world.c
>deleted file mode 100644
>index 0c0401bb33b2..000000000000
>--- games/gracer/files/patch-gr_world.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/gr_world.c.orig	Wed May  4 18:49:13 2005
>-+++ src/gr_world.c	Wed May  4 18:49:24 2005
>-@@ -167,8 +167,6 @@
>-     case GR_CLINE_B_TO_A:
>-       vehicle->lap_count --;
>-       break;
>--
>--    default:
>-     }
>- 
>-     tlist = entry->triggers;
>diff --git games/gracer/files/patch-src_glbind.c games/gracer/files/patch-src_glbind.c
>index 3f189f51949b..2d4dd1963d3f 100644
>--- games/gracer/files/patch-src_glbind.c
>+++ games/gracer/files/patch-src_glbind.c
>@@ -1,5 +1,5 @@
>---- src/glbind.c.orig	Mon Mar 10 15:31:50 2003
>-+++ src/glbind.c	Mon Mar 10 15:31:52 2003
>+--- src/glbind.c.orig	2020-01-28 12:54:24 UTC
>++++ src/glbind.c
> @@ -20,6 +20,7 @@
>   */
>  
>@@ -8,3 +8,30 @@
>  #include <GL/gl.h>
>  #include <GL/glut.h>
>  #include <string.h>
>+@@ -2146,8 +2147,6 @@ gl_subcmd_lightmodel (Tcl_Interp *interp, int objc, Tc
>+     TCL_CHECK(Tcl_GetIntFromObj(interp, objv[2], &i), ERROR);
>+     GL_CHECK(glLightModeli (pname, i));
>+     return 3;
>+-
>+-  default:
>+   }
>+ 
>+ ERROR:
>+@@ -2885,8 +2884,6 @@ gl_subcmd_texenv (Tcl_Interp *interp, int objc, Tcl_Ob
>+     }
>+     GL_CHECK(glTexEnvfv (GL_TEXTURE_ENV, pname, param));
>+     return 6;
>+-
>+-  default:
>+   }
>+ 
>+ ERROR:
>+@@ -3077,8 +3074,6 @@ gl_subcmd_texparameter (Tcl_Interp *interp, int objc, 
>+     param[0] = d;
>+     GL_CHECK(glTexParameterf (target, pname, param[0]));
>+     return 4;
>+-
>+-  default:
>+   }
>+ 
>+ ERROR:
>diff --git games/ladder/Makefile games/ladder/Makefile
>index e230a54edbc3..d8ac724fabc3 100644
>--- games/ladder/Makefile
>+++ games/ladder/Makefile
>@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.srv.net/~kth/ \
> DISTNAME=	${PORTNAME}
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	The old "ladder" game
>+COMMENT=	Historical "ladder" game
> 
> RESTRICTED=	possible copyright problems ?
> 
>diff --git games/ladder/files/patch-Makefile games/ladder/files/patch-Makefile
>index 1bf75aeadb5d..a5389453f625 100644
>--- games/ladder/files/patch-Makefile
>+++ games/ladder/files/patch-Makefile
>@@ -1,5 +1,5 @@
>---- Makefile.orig	1997-10-27 07:15:08.000000000 +0800
>-+++ Makefile	2014-06-07 23:36:53.767950530 +0800
>+--- Makefile.orig	2020-01-28 12:55:18 UTC
>++++ Makefile
> @@ -2,12 +2,13 @@ TARGET	= ladder
>  SRCS	= ladder.c lplay.c ltime.c lscore.c lscreens.c
>  OBJS	= ladder.o lplay.o ltime.o lscore.o lscreens.o
>@@ -17,10 +17,11 @@
>  
>  .SUFFIXES:	.o .c .m4
>  
>-@@ -22,6 +23,14 @@ $(TARGET):	$(OBJS)
>+@@ -21,6 +22,14 @@ $(TARGET):	$(OBJS)
>+ 	$(CC) -o $(TARGET) $(LDFLAGS) $(OBJS) $(LIBS)
>  
>  $(OBJS):	ladder.h
>- 
>++
> +clean:
> +	-$(RM)	$(OBJS) $(TARGET) *.core
> +
>@@ -28,7 +29,6 @@
> +
> +install:
> +	$(BSD_INSTALL_PROGRAM) ladder $(DESTDIR)${PREFIX}/bin
>-+
>+ 
>  # ladder.c:	ladder.m4
>  
>- # lscreens.c:	lscreens.m4
>diff --git games/ladder/files/patch-ladder.c_1 games/ladder/files/patch-ladder.c_1
>deleted file mode 100644
>index 2b082bb7b9e6..000000000000
>--- games/ladder/files/patch-ladder.c_1
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- ladder.c.org	Wed Feb 18 19:26:47 1998
>-+++ ladder.c	Wed Feb 18 19:33:09 1998
>-@@ -82,7 +82,7 @@
>-     mvaddstr(r,LM,"Version:    n/a");
>-     mvaddstr(r,RM0,"Up = k|8  Down = j|2  Left = h|4  Right = l|6");
>-     r++;
>--    mvprintw(r,LM,"Terminal:   %s",termname());
>-+    mvprintw(r,LM,"Terminal:   %s",getenv("TERM"));
>-     mvaddstr(r,RM0,"Jump = Space   Stop = Other");
>-     r++;
>-     mvprintw(r,LM,"Play Speed: %d",speed + 1);
>diff --git games/ladder/files/patch-ladder.c_2 games/ladder/files/patch-ladder.c_2
>deleted file mode 100644
>index 3dfe7265028e..000000000000
>--- games/ladder/files/patch-ladder.c_2
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- ladder.c.org	Mon Oct 27 00:07:23 1997
>-+++ ladder.c	Wed Feb 18 22:33:55 1998
>-@@ -14,7 +14,7 @@
>-     char *d = t;
>-     int i;
>-     
>--    for( ; *s; *s++ ) 
>-+    for( ; *s; s++ ) 
>-         if( *s & 0200 )
>-             for( i = 210 - (unsigned char)*s; i; i-- )
>-                 *d++ = ' ';
>diff --git games/ladder/files/patch-ladder.h games/ladder/files/patch-ladder.h
>index ff629e032dfc..62c4e2523f90 100644
>--- games/ladder/files/patch-ladder.h
>+++ games/ladder/files/patch-ladder.h
>@@ -1,5 +1,5 @@
>---- ladder.h.org	Wed Feb 18 19:19:51 1998
>-+++ ladder.h	Wed Feb 18 19:26:29 1998
>+--- ladder.h.orig	2020-01-28 12:55:18 UTC
>++++ ladder.h
> @@ -1,4 +1,4 @@
> -#include <ncurses/curses.h>
> +#include <ncurses.h>
>diff --git games/ladder/files/patch-lplay.c games/ladder/files/patch-lplay.c
>index eef6d35ba017..6a667dd58ac7 100644
>--- games/ladder/files/patch-lplay.c
>+++ games/ladder/files/patch-lplay.c
>@@ -1,6 +1,6 @@
>---- lplay.c.org	Tue Nov 11 20:01:51 1997
>-+++ lplay.c	Wed Feb 18 22:33:56 1998
>-@@ -54,7 +54,7 @@
>+--- lplay.c.orig	2020-01-28 12:55:18 UTC
>++++ lplay.c
>+@@ -54,7 +54,7 @@ static void ldscreen(void)
>          mvaddstr(row,0,t);
>  
>          /* find points of release */
>@@ -9,7 +9,7 @@
>          {
>              rel->row = row;
>              rel->col = s - t;
>-@@ -67,7 +67,7 @@
>+@@ -67,7 +67,7 @@ static void ldscreen(void)
>  
>      /* find lad */
>      for( row = 0; row < DIMROW; row++ ) 
>@@ -18,7 +18,7 @@
>          {
>              /* nasty, check for CLAD's surrounded by CFREEs */
>              if( s[-1] != CFREE || s[1] != CFREE )
>-@@ -433,6 +433,8 @@
>+@@ -433,6 +433,8 @@ static RESULT drv_lad(void)
>                      else
>                          dir = STOP;
>                      break;
>diff --git games/ladder/files/patch-lscore.c games/ladder/files/patch-lscore.c
>index f7545c84d287..7fb401aed303 100644
>--- games/ladder/files/patch-lscore.c
>+++ games/ladder/files/patch-lscore.c
>@@ -1,6 +1,6 @@
>---- lscore.c.org	Mon Oct 27 00:07:24 1997
>-+++ lscore.c	Wed Feb 18 22:33:56 1998
>-@@ -21,7 +21,7 @@
>+--- lscore.c.orig	2020-01-28 12:55:18 UTC
>++++ lscore.c
>+@@ -21,7 +21,7 @@ static void lock_score(void)
>      FILE *lfp;
>  
>      for( i = 3; i; i-- )
>@@ -9,7 +9,7 @@
>          {
>              fclose(lfp);
>              sleep(2);
>-@@ -47,7 +47,7 @@
>+@@ -47,7 +47,7 @@ static void read_scores(void)
>  
>      lock_score();
>      memset(scores,0,sizeof(scores));
>@@ -18,7 +18,7 @@
>      {
>          for( scp = scores; scp < &scores[MAXSCORE]; scp++ )
>              if( fscanf(sfp,"%d%d%d%d",
>-@@ -67,8 +67,8 @@
>+@@ -67,8 +67,8 @@ static void percolate(void)
>      SCORE *scp;
>      for( scp = &scores[MAXSCORE]; scp > scores; scp-- )
>          if( scp[0].score >  scp[-1].score ||
>@@ -29,7 +29,7 @@
>          {
>              SCORE tmp = scp[0];
>              scp[0] = scp[-1];
>-@@ -113,7 +113,7 @@
>+@@ -113,7 +113,7 @@ void prt_score(int r, int c)
>          if( scores[i].score )
>          {
>              printw("%5d00  %2d  ",scores[i].score,scores[i].level + 1);
>diff --git games/ladder/files/patch-ltime.c games/ladder/files/patch-ltime.c
>index c1f515e0ce0e..78e517b1b08b 100644
>--- games/ladder/files/patch-ltime.c
>+++ games/ladder/files/patch-ltime.c
>@@ -1,5 +1,5 @@
>---- ltime.c.org	Mon Oct 27 00:07:24 1997
>-+++ ltime.c	Wed Feb 18 22:33:56 1998
>+--- ltime.c.orig	2020-01-28 12:55:18 UTC
>++++ ltime.c
> @@ -2,6 +2,7 @@
>  #include <sys/types.h>
>  #include <sys/times.h>
>diff --git games/minecraft-server/Makefile games/minecraft-server/Makefile
>index 223061024197..96f00b5eb4dd 100644
>--- games/minecraft-server/Makefile
>+++ games/minecraft-server/Makefile
>@@ -1,9 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	minecraft-server
>-PORTVERSION=	1.16.1
>+PORTVERSION=	1.16.2
> CATEGORIES=	games java
>-MASTER_SITES=	https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/
>+MASTER_SITES=	https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/
> DISTFILES=	server.jar
> DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
> EXTRACT_ONLY=
>diff --git games/minecraft-server/distinfo games/minecraft-server/distinfo
>index f467e35f2701..4609b0d5e199 100644
>--- games/minecraft-server/distinfo
>+++ games/minecraft-server/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1595102862
>-SHA256 (minecraft-server-1.16.1/server.jar) = 2782d547724bc3ffc0ef6e97b2790e75c1df89241f9d4645b58c706f5e6c935b
>-SIZE (minecraft-server-1.16.1/server.jar) = 37968964
>+TIMESTAMP = 1599202877
>+SHA256 (minecraft-server-1.16.2/server.jar) = 2902ed3ff84e4f810a2c0620c6b6df9c3ef8488b272c61274d5eac2433876f39
>+SIZE (minecraft-server-1.16.2/server.jar) = 37942337
>diff --git graphics/aview/Makefile graphics/aview/Makefile
>index 315867357d76..908ad70d9a11 100644
>--- graphics/aview/Makefile
>+++ graphics/aview/Makefile
>@@ -19,9 +19,4 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-x=no
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|/bash|/sh|g' ${WRKSRC}/asciiview
>-	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
>-		's|<malloc.h>|<stdlib.h>|g'
>-
> .include <bsd.port.mk>
>diff --git graphics/gauche-gl/Makefile graphics/gauche-gl/Makefile
>index d9de9550df34..632d82adc085 100644
>--- graphics/gauche-gl/Makefile
>+++ graphics/gauche-gl/Makefile
>@@ -35,11 +35,6 @@ INFO=		gauche-gl-refe gauche-gl-refj
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-post-patch:
>-.for i in configure src/gauche-gl.c src/gauche-gl.h src/glut-lib.stub
>-	@${REINPLACE_CMD} -e '/glut.h/s|GLUT|GL|' ${WRKSRC}/${i}
>-.endfor
>-
> do-install:
> .for i in src lib
> 	@(cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>diff --git graphics/gdchart/Makefile graphics/gdchart/Makefile
>index 5d4389cfbb4b..855b00d7c30e 100644
>--- graphics/gdchart/Makefile
>+++ graphics/gdchart/Makefile
>@@ -31,21 +31,6 @@ PLIST_SUB+=	PROFILE=""
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-post-patch:
>-	@${REINPLACE_CMD} \
>-		-e 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' \
>-		-e 's/^#ifdef HAVE_LIBFREETYPE/#ifndef NO_LIBFREETYPE/' \
>-			${WRKSRC}/*.[ch]
>-# ft_samp.c and gdc_samp?.c miss #include "gdcpie.h"
>-	@${REINPLACE_CMD} \
>-		-e 's/^#include "gdc\.h"/#include "gdcpie.h"/' \
>-			${WRKSRC}/ft_samp.c \
>-			${WRKSRC}/gdc_samp?.c
>-# gdc_pie_samp.c misses #include "gdchart.h"
>-	@${REINPLACE_CMD} \
>-		-e 's/^#include "gdc\.h"/#include "gdchart.h"/' \
>-			${WRKSRC}/gdc_pie_samp.c
>-
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
>diff --git graphics/gimp-refocus-plugin/Makefile graphics/gimp-refocus-plugin/Makefile
>index e20b62d1a03d..82c04e9661d8 100644
>--- graphics/gimp-refocus-plugin/Makefile
>+++ graphics/gimp-refocus-plugin/Makefile
>@@ -41,12 +41,6 @@ ATLAS_CONFIGURE_ON=	--with-lapack-libs="${LAPACKLIB} ${BLASLIB}" \
> 
> OPTIMIZED_CFLAGS_CFLAGS=	-O3
> 
>-post-patch:
>-	@${FIND} ${WRKSRC} -name Makefile.am \
>-		-exec ${REINPLACE_CMD} -e "s|; make|; ${MAKE_CMD}|" {} \;
>-	@${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" \
>-		${WRKSRC}/configure.in
>-
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GIMP_PLUGIN_DIR}/
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
>diff --git graphics/gimp-refocus-plugin/files/patch-configure.in graphics/gimp-refocus-plugin/files/patch-configure.in
>index 138fc38d4ca6..b644c677f7b1 100644
>--- graphics/gimp-refocus-plugin/files/patch-configure.in
>+++ graphics/gimp-refocus-plugin/files/patch-configure.in
>@@ -1,18 +1,19 @@
>---- configure.in.orig	2003-01-30 19:29:29.000000000 -0200
>-+++ configure.in	2014-04-01 22:37:57.000000000 -0300
>-@@ -1,8 +1,8 @@
>+--- configure.in.orig	2003-01-30 21:29:29 UTC
>++++ configure.in
>+@@ -1,9 +1,9 @@
>  dnl Process this file with autoconf to produce a configure script.
>  
> -AC_INIT(README)
>--
>--AM_INIT_AUTOMAKE(refocus, 0.9.0)
> +AC_INIT([refocus],[0.9.0])
> +AC_CONFIG_SRCDIR(README)
> +AM_INIT_AUTOMAKE
>  
>+-AM_INIT_AUTOMAKE(refocus, 0.9.0)
>+-
>  AC_PROG_CC
>  AC_CHECK_PROG(GCC3, gcc3, gcc3)
>-@@ -12,31 +12,32 @@
>+ 
>+@@ -12,31 +12,32 @@ if test "$GCC3" ; then
>     AC_MSG_RESULT([using $CC as compiler])
>  fi
>  
>@@ -65,7 +66,7 @@
>  AM_PATH_GTK_2_0(2.0.0)
>  AM_PATH_GLIB_2_0(2.0.0)
>  
>-@@ -96,15 +97,9 @@
>+@@ -96,15 +97,9 @@ if test x$enable_debug = xyes ; then
>     AC_DEFINE(PREVIEW_DEBUG)
>  fi
>  
>diff --git graphics/gimp-refocus-plugin/files/patch-lib__Makefile.am graphics/gimp-refocus-plugin/files/patch-lib__Makefile.am
>deleted file mode 100644
>index 02b07f4434b5..000000000000
>--- graphics/gimp-refocus-plugin/files/patch-lib__Makefile.am
>+++ /dev/null
>@@ -1,7 +0,0 @@
>---- lib/Makefile.am.orig	2003-01-30 19:29:52.000000000 -0200
>-+++ lib/Makefile.am	2014-04-01 22:13:34.000000000 -0300
>-@@ -1,4 +1,3 @@
>--CFLAGS=-fomit-frame-pointer -O3 -funroll-all-loops
>- 
>- 
>- noinst_LIBRARIES = liblapack.a libatlas.a libcblas.a
>diff --git graphics/gimp-refocus-plugin/files/patch-src__Makefile.am graphics/gimp-refocus-plugin/files/patch-src__Makefile.am
>deleted file mode 100644
>index a69d09eeebe9..000000000000
>--- graphics/gimp-refocus-plugin/files/patch-src__Makefile.am
>+++ /dev/null
>@@ -1,47 +0,0 @@
>---- src/Makefile.am.orig	2003-01-30 19:30:18.000000000 -0200
>-+++ src/Makefile.am	2014-04-01 22:12:45.000000000 -0300
>-@@ -1,22 +1,28 @@
>- ## Process this file with automake to produce Makefile.in
>- 
>--INCLUDES=@GTK_CFLAGS@ @GIMP_CFLAGS@ -I @LAPACK_INCLUDE_DIR@
>-+INCLUDES=@GTK_CFLAGS@ @GIMP_CFLAGS@ @LAPACK_INCLUDES@
>- 
>- bin_PROGRAMS = refocus
>- noinst_PROGRAMS = test-matrix
>- 
>--ldadd_atlas=-L@LAPACK_LIB_DIR@ -llapack -lcblas -latlas
>-+ldadd_atlas=@LAPACK_LIBS@
>- 
>- noinst_HEADERS=bdclosure.h refocus.h matrix.h tilebuf.h conv.h fwlapack.h gimppreview.h prevman.h util.h
>- EXTRA_DIST = dummy-plugin.c
>- 
>- refocus_SOURCES = refocus.c conv.c gimppreview.c prevman.c util.c matrix.c tilebuf.c bdclosure.c fwlapack.c
>--refocus_LDADD = @GTK_LIBS@ -lgimp ${ldadd_atlas}
>--refocus_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a
>-+refocus_LDADD = -lm ${ldadd_atlas} @GIMP_LIBS@
>-+if HAVE_ATLAS
>-+else
>-+refocus_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a
>-+endif
>- 
>- test_matrix_SOURCES = matrix.c test-matrix.c fwlapack.c
>- test_matrix_LDADD = -lm ${ldadd_atlas} @GLIB_LIBS@
>--test_matrix_DEPENDENCIES=@LAPACK_LIB_DIR@/liblapack.a
>-+if HAVE_ATLAS
>-+else
>-+test_matrix_DEPENDENCIES=@BUNDLED_LAPACK_LIB_DIR@/liblapack.a
>-+endif
>- 
>- install-bin: refocus
>- 	@if test "x@GIMPTOOL@" = "x" ; then \
>-@@ -36,8 +42,8 @@
>- 		@GIMPTOOL@ --install-admin-bin refocus ; \
>- 	fi
>- 
>--@LAPACK_LIB_DIR@/liblapack.a:
>--	cd @LAPACK_LIB_DIR@; make
>-+@BUNDLED_LAPACK_LIB_DIR@/liblapack.a:
>-+	cd @BUNDLED_LAPACK_LIB_DIR@; gmake
>- 
>- %.s: %.c
>- 	${CC} ${CFLAGS} -S $< -o $@
>diff --git graphics/gimp-refocus-plugin/files/patch-src__conv.c graphics/gimp-refocus-plugin/files/patch-src__conv.c
>deleted file mode 100644
>index 70742b2adaac..000000000000
>--- graphics/gimp-refocus-plugin/files/patch-src__conv.c
>+++ /dev/null
>@@ -1,34 +0,0 @@
>---- src/conv.c	2014-03-27 20:00:17.000000000 -0300
>-+++ src/conv.c	2014-03-27 20:00:58.000000000 -0300
>-@@ -421,13 +421,19 @@
>-   gint x, buf_start_y, total_tiles, tile_nr = 0;
>-   /* Will be false when progress_update tells us that the data is no longer needed */
>-   gboolean ok = TRUE;
>--
>-+  /*
>-+    tile_height()                 [util.c]
>-+    tile_width()                  [util.c]
>-+   */
>-   initialize_buf (&buf, source, mat_size / 2, sx, sy, width, height,
>-                   boundary_type);
>-   total_tiles = (1 + floor ((buf.x + buf.width - 1) / tile_width ())
>-                  - floor ((buf.x) / tile_width ())) *
>-     (1 + floor ((buf.y_limit - 1) / tile_height ())
>-      - floor ((buf.y) / tile_height ()));
>-+#ifdef RLXTEST
>-+  printf("convolve_image: total_tiles %d\n",total_tiles);
>-+#endif
>- 
>-   buf_start_y = buf.y;
>-   while (ok && shift_buf (&buf, source))
>-@@ -437,6 +443,10 @@
>-         {
>-           const gint ncolors = source->bpp - source->has_alpha;
>-           GimpTile *tile = tile_sink_get_tile (sink, x, buf.y);
>-+#ifdef RLXTEST
>-+          printf("convolve_image: x %d, y %d, tile->eheight %d\n",
>-+                 x, buf.y, tile->eheight);
>-+#endif
>-           convolve_tile (tile, pixpos_in_buf (&buf, x, buf.y), buf.row_stride,
>-                          ncolors, sink->bpp, mat->data, mat_size);
>-           tile_sink_tile_unref (sink, tile);
>diff --git graphics/gimp-refocus-plugin/files/patch-src__gimppreview.c graphics/gimp-refocus-plugin/files/patch-src__gimppreview.c
>deleted file mode 100644
>index 9c076e4a9161..000000000000
>--- graphics/gimp-refocus-plugin/files/patch-src__gimppreview.c
>+++ /dev/null
>@@ -1,384 +0,0 @@
>---- src/gimppreview.c	2014-03-27 20:00:17.000000000 -0300
>-+++ src/gimppreview.c	2014-03-27 20:00:38.000000000 -0300
>-@@ -36,18 +36,18 @@
>- #include "gimppreview.h"
>- 
>- 
>--static void gimp_preview_init (GimpPreview * preview);
>--static void gimp_preview_class_init (GimpPreviewClass * klass);
>-+static void gimp_preview_init (myGimpPreview * preview);
>-+static void gimp_preview_class_init (myGimpPreviewClass * klass);
>- 
>- static void gimp_preview_plus_callback (GtkWidget * widget, gpointer data);
>- static void gimp_preview_minus_callback (GtkWidget * widget, gpointer data);
>- static gint gimp_preview_event (GtkWidget * widget, GdkEvent * event,
>-                                 gpointer data);
>--static void gimp_preview_recompute_sizes (GimpPreview * preview,
>-+static void gimp_preview_recompute_sizes (myGimpPreview * preview,
>-                                           gdouble newscale);
>--static void gimp_preview_update_preview (GimpPreview * preview);
>-+static void gimp_preview_update_preview (myGimpPreview * preview);
>- 
>--static void gimp_preview_image_set_size (GimpPreview * preview, gint width,
>-+static void gimp_preview_image_set_size (myGimpPreview * preview, gint width,
>-                                          gint height);
>- static void gimp_preview_size_request (GtkWidget * widget,
>-                                        GtkRequisition * requisition);
>-@@ -58,7 +58,7 @@
>-                                  GtkCallback callback,
>-                                  gpointer callback_data);
>- gboolean gimp_preview_update_preview_idle_fun (gpointer data);
>--void gimp_preview_schedule_update (GimpPreview * preview);
>-+void gimp_preview_schedule_update (myGimpPreview * preview);
>- 
>- #define PROGRESS_BAR_HEIGHT (10)
>- #define PREVIEW_SIZE (100)
>-@@ -94,11 +94,11 @@
>- 
>- 
>- /*
>-- * Apps which use a GimpPreview widget should not be accessing the private
>-+ * Apps which use a myGimpPreview widget should not be accessing the private
>-  * data!
>-  */
>- #define PREVIEW_DATA(preview) \
>--        ((GimpPreviewData*)(GIMP_PREVIEW (preview)->private_data))
>-+        ((myGimpPreviewData*)(MY_GIMP_PREVIEW (preview)->private_data))
>- 
>- typedef struct
>- {
>-@@ -126,7 +126,7 @@
>-   GtkWidget *image;
>-   GtkWidget *progress_bar;
>- }
>--GimpPreviewData;
>-+myGimpPreviewData;
>- 
>- 
>- /* Convert coordinate in preview space to image coordinates */
>-@@ -155,20 +155,20 @@
>-   if (!preview_type)
>-     {
>-       GTypeInfo preview_info = {
>--        sizeof (GimpPreviewClass),
>-+        sizeof (myGimpPreviewClass),
>-         (GBaseInitFunc) NULL,
>-         (GBaseFinalizeFunc) NULL,
>-         (GClassInitFunc) gimp_preview_class_init,
>-         (GClassFinalizeFunc) NULL,
>-         (gconstpointer) NULL,   /* class_data */
>--        sizeof (GimpPreview),
>-+        sizeof (myGimpPreview),
>-         0,                      /* n_preallocs */
>-         (GInstanceInitFunc) gimp_preview_init,
>-         (GTypeValueTable *) NULL /* value_table */
>-       };
>- 
>-       preview_type =
>--        g_type_register_static (GTK_TYPE_CONTAINER, "GimpPreview",
>-+        g_type_register_static (GTK_TYPE_CONTAINER, "myGimpPreview",
>-                                 &preview_info, 0);
>-     }
>- 
>-@@ -181,7 +181,7 @@
>-  * by GTK's internal mechanisms.
>-  */
>- static void
>--gimp_preview_class_init (GimpPreviewClass * klass)
>-+gimp_preview_class_init (myGimpPreviewClass * klass)
>- {
>-   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
>-   GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
>-@@ -190,7 +190,7 @@
>-     g_signal_new ("update_preview",
>-                   G_TYPE_FROM_CLASS (klass),
>-                   G_SIGNAL_RUN_FIRST,
>--                  G_STRUCT_OFFSET (GimpPreviewClass, update_preview),
>-+                  G_STRUCT_OFFSET (myGimpPreviewClass, update_preview),
>-                   NULL,
>-                   NULL,
>-                   g_cclosure_marshal_VOID__POINTER,
>-@@ -200,7 +200,7 @@
>-     g_signal_new ("preview_changed",
>-                   G_TYPE_FROM_CLASS (klass),
>-                   G_SIGNAL_RUN_FIRST,
>--                  G_STRUCT_OFFSET (GimpPreviewClass, preview_changed),
>-+                  G_STRUCT_OFFSET (myGimpPreviewClass, preview_changed),
>-                   NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
>- 
>-   klass->update_preview = NULL;
>-@@ -212,7 +212,7 @@
>- 
>- 
>- void
>--gimp_preview_set_scale_amount(GimpPreview *preview, gdouble scale_amount)
>-+gimp_preview_set_scale_amount(myGimpPreview *preview, gdouble scale_amount)
>- {
>-   /*
>-    * If the caller wants to set the scale amount, let them do so.
>-@@ -269,7 +269,7 @@
>-  * by GTK's internal mechanisms.
>-  */
>- static void
>--gimp_preview_init (GimpPreview * preview)
>-+gimp_preview_init (myGimpPreview * preview)
>- {
>-   gchar buffer[10];
>- 
>-@@ -277,7 +277,7 @@
>-   GTK_WIDGET_SET_FLAGS (preview, GTK_NO_WINDOW);
>-   GTK_CONTAINER (preview)->resize_mode = GTK_RESIZE_IMMEDIATE;
>- 
>--  preview->private_data = g_malloc0 (sizeof (GimpPreviewData));
>-+  preview->private_data = g_malloc0 (sizeof (myGimpPreviewData));
>- 
>- 
>-   PREVIEW_DATA (preview)->label = gtk_label_new ("");
>-@@ -307,7 +307,7 @@
>- gimp_preview_new_with_args (GimpDrawable * drawable, gint cb_preview_size,
>-                             gdouble cb_scale_amount, gint cb_allow_scale)
>- {
>--  GimpPreview *preview;
>-+  myGimpPreview *preview;
>-   GtkWidget *frame;
>-   GtkWidget *hbox;
>-   GtkWidget *event_box;
>-@@ -337,14 +337,14 @@
>- 
>- 
>-   /* Now allocate the actual preview window. */
>--  preview = GIMP_PREVIEW (g_object_new (gimp_preview_get_type (), NULL));
>-+  preview = MY_GIMP_PREVIEW (g_object_new (gimp_preview_get_type (), NULL));
>- 
>-   /* Set the scale amount. */
>-   gimp_preview_set_scale_amount(preview, cb_scale_amount);
>- 
>-   /* Save the drawable info. */
>-   preview->drawable = drawable;
>--  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->id);
>-+  preview->drawable_has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
>- 
>-   /* Calculate our preview size. */
>-   if (preview_size == PREVIEW_FIXED_SIZE)
>-@@ -352,8 +352,8 @@
>-       preview_width = i2p (drawable->width, preview->scale);
>-       preview_height = i2p (drawable->height, preview->scale);
>- 
>--      GIMP_PREVIEW (preview)->width = preview_width;
>--      GIMP_PREVIEW (preview)->height = preview_height;
>-+      MY_GIMP_PREVIEW (preview)->width = preview_width;
>-+      MY_GIMP_PREVIEW (preview)->height = preview_height;
>-     }
>-   else
>-     {
>-@@ -454,7 +454,7 @@
>- static void
>- gimp_preview_size_request (GtkWidget * widget, GtkRequisition * requisition)
>- {
>--  GimpPreview *preview = GIMP_PREVIEW (widget);
>-+  myGimpPreview *preview = MY_GIMP_PREVIEW (widget);
>-   GtkRequisition resize_box_requisition;
>- 
>- #ifdef PREVIEW_DEBUG
>-@@ -478,7 +478,7 @@
>- static void
>- gimp_preview_size_allocate (GtkWidget * widget, GtkAllocation * allocation)
>- {
>--  GimpPreview *preview = GIMP_PREVIEW (widget);
>-+  myGimpPreview *preview = MY_GIMP_PREVIEW (widget);
>-   GtkAllocation resize_box_allocation, progress_bar_allocation,
>-     event_box_allocation;
>-   GtkRequisition resize_box_requisition;
>-@@ -543,7 +543,7 @@
>-                      gboolean include_internals,
>-                      GtkCallback callback, gpointer callback_data)
>- {
>--  GimpPreview *preview = GIMP_PREVIEW (container);
>-+  myGimpPreview *preview = MY_GIMP_PREVIEW (container);
>- 
>-   if (PREVIEW_DATA (preview)->resize_box)
>-     {
>-@@ -564,7 +564,7 @@
>-  * Plug-ins call this to do an update of the preview area.
>-  */
>- void
>--gimp_preview_update (GimpPreview * preview)
>-+gimp_preview_update (myGimpPreview * preview)
>- {
>-   gimp_preview_recompute_sizes (preview, preview->scale);
>-   gimp_preview_update_preview (preview);
>-@@ -579,11 +579,11 @@
>- static void
>- gimp_preview_plus_callback (GtkWidget * widget, gpointer data)
>- {
>--  GimpPreview *preview;
>-+  myGimpPreview *preview;
>-   gchar buffer[10];
>-   gdouble new_scale;
>- 
>--  preview = GIMP_PREVIEW (data);
>-+  preview = MY_GIMP_PREVIEW (data);
>-   if (PREVIEW_DATA (preview)->scale_n == PREVIEW_SCALE_LAST)
>-     return;
>- 
>-@@ -616,11 +616,11 @@
>- static void
>- gimp_preview_minus_callback (GtkWidget * widget, gpointer data)
>- {
>--  GimpPreview *preview;
>-+  myGimpPreview *preview;
>-   gchar buffer[10];
>-   gdouble new_scale;
>- 
>--  preview = GIMP_PREVIEW (data);
>-+  preview = MY_GIMP_PREVIEW (data);
>-   if (PREVIEW_DATA (preview)->scale_n == 0)
>-     return;
>- 
>-@@ -651,12 +651,12 @@
>- static gint
>- gimp_preview_event (GtkWidget * widget, GdkEvent * event, gpointer data)
>- {
>--  GimpPreview *preview;
>-+  myGimpPreview *preview;
>-   GdkEventButton *button_event;
>-   gint x, y;
>-   gint dx, dy;
>- 
>--  preview = GIMP_PREVIEW (data);
>-+  preview = MY_GIMP_PREVIEW (data);
>-   button_event = (GdkEventButton *) event;
>- 
>-   switch (event->type)
>-@@ -733,7 +733,7 @@
>-  * This function is also used for initializing the preview.
>-  */
>- static void
>--gimp_preview_recompute_sizes (GimpPreview * preview, gdouble new_scale)
>-+gimp_preview_recompute_sizes (myGimpPreview * preview, gdouble new_scale)
>- {
>- 
>-   /* The center of the preview in image coordinates.
>-@@ -765,7 +765,7 @@
>- }
>- 
>- void
>--gimp_preview_generate_update_event (GimpPreview * preview)
>-+gimp_preview_generate_update_event (myGimpPreview * preview)
>-      /* Signal the user that the preview must be updated */
>- {
>-   const gdouble scale = preview->scale;
>-@@ -783,7 +783,7 @@
>-            0,
>-            preview->drawable->height - image_y);
>- 
>--  GimpPreviewEvent preview_event;
>-+  myGimpPreviewEvent preview_event;
>- 
>-   preview_event.event_id = PREVIEW_DATA (preview)->current_event_id;
>-   preview_event.scale = preview->scale;
>-@@ -814,7 +814,7 @@
>-  * to step through source and destination!
>-  */
>- static void
>--gimp_preview_update_preview (GimpPreview * preview)
>-+gimp_preview_update_preview (myGimpPreview * preview)
>- {
>-   GimpPixelRgn region;
>-   guchar *image_data = NULL;
>-@@ -1012,7 +1012,7 @@
>- 
>- 
>- void
>--gimp_preview_force_redraw (GimpPreview * preview)
>-+gimp_preview_force_redraw (myGimpPreview * preview)
>- {
>-   gtk_widget_queue_draw (GTK_WIDGET (PREVIEW_DATA (preview)->image));
>- }
>-@@ -1022,7 +1022,7 @@
>- gboolean
>- gimp_preview_update_preview_idle_fun (gpointer data)
>- {
>--  GimpPreview *preview = GIMP_PREVIEW (data);
>-+  myGimpPreview *preview = MY_GIMP_PREVIEW (data);
>-   gint event_id = PREVIEW_DATA (preview)->current_event_id;
>- 
>- #ifdef PREVIEW_DEBUG
>-@@ -1041,7 +1041,7 @@
>- }
>- 
>- void
>--gimp_preview_schedule_update (GimpPreview * preview)
>-+gimp_preview_schedule_update (myGimpPreview * preview)
>- {
>-   PREVIEW_DATA (preview)->current_event_id++;
>- 
>-@@ -1082,7 +1082,7 @@
>- }
>- 
>- void
>--gimp_preview_image_set_size (GimpPreview * preview, gint width, gint height)
>-+gimp_preview_image_set_size (myGimpPreview * preview, gint width, gint height)
>- {
>-   const gint real_width = MIN (preview->max_width, width);
>-   const gint real_height = MIN (preview->max_height, height);
>-@@ -1120,8 +1120,8 @@
>- 
>- /**
>-  * gimp_preview_draw_row:
>-- * @preview: the #GimpPreview
>-- * @event_id: event_id that was sent with the #GimpPreviewEvent.
>-+ * @preview: the #myGimpPreview
>-+ * @event_id: event_id that was sent with the #myGimpPreviewEvent.
>-  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
>-  * @row:the relative number of the row within the preview.
>-  * The top row of the preview is number 0.
>-@@ -1137,7 +1137,7 @@
>-  * with the same event-id will be ignored by the preview.
>-  **/
>- gboolean
>--gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
>-+gimp_preview_draw_row (myGimpPreview * preview, const gint event_id,
>-                        GimpImageType type, gint row,
>-                        const guchar * const data)
>- {
>-@@ -1247,8 +1247,8 @@
>- 
>- /**
>-  * gimp_preview_draw_unscaled_row:
>-- * @preview: the #GimpPreview
>-- * @event_id: event_id that was sent with the #GimpPreviewEvent.
>-+ * @preview: the #myGimpPreview
>-+ * @event_id: event_id that was sent with the #myGimpPreviewEvent.
>-  * @type: the format of the data (e.g. %GIMP_RGBA_IMAGE).
>-  * @row:row is the relative position of the row w.r.t. preview_event->image_y.
>-  * The top row has number 0.
>-@@ -1267,7 +1267,7 @@
>-  * with the same event-id will be ignored by the preview.
>-  **/
>- gboolean
>--gimp_preview_draw_unscaled_row (GimpPreview * preview, const gint event_id,
>-+gimp_preview_draw_unscaled_row (myGimpPreview * preview, const gint event_id,
>-                                 GimpImageType type, const gint row,
>-                                 const guchar * const data)
>- {
>-@@ -1445,8 +1445,8 @@
>- 
>- /**
>-  * gimp_preview_progress_set_fraction:
>-- * @preview: the #GimpPreview.
>-- * @event_id: event_id that was sent with the #GimpPreviewEvent.
>-+ * @preview: the #myGimpPreview.
>-+ * @event_id: event_id that was sent with the #myGimpPreviewEvent.
>-  * @fraction: the fraction completed.
>-  *
>-  * Set the progress bar of the preview to @fraction completed.
>-@@ -1456,7 +1456,7 @@
>-  * with the same event-id will be ignored by the preview.
>-  **/
>- gboolean
>--gimp_preview_progress_set_fraction (GimpPreview * preview,
>-+gimp_preview_progress_set_fraction (myGimpPreview * preview,
>-                                     const gint event_id, double fraction)
>- {
>-   const gboolean return_status =
>diff --git graphics/gimp-refocus-plugin/files/patch-src__gimppreview.h graphics/gimp-refocus-plugin/files/patch-src__gimppreview.h
>deleted file mode 100644
>index 61623c921bc8..000000000000
>--- graphics/gimp-refocus-plugin/files/patch-src__gimppreview.h
>+++ /dev/null
>@@ -1,82 +0,0 @@
>---- src/gimppreview.h	2014-03-27 20:00:17.000000000 -0300
>-+++ src/gimppreview.h	2014-03-27 20:00:38.000000000 -0300
>-@@ -32,25 +32,25 @@
>- 
>- #define PREVIEW_FIXED_SIZE           0
>- #define PREVIEW_DEFAULT_SIZE         -1
>--#define GIMP_TYPE_PREVIEW            (gimp_preview_get_type ())
>--#define GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, GimpPreview))
>--#define GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, GimpPreviewClass))
>--#define GIMP_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PREVIEW))
>--#define GIMP_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW))
>--typedef struct _GimpPreview GimpPreview;
>--typedef struct _GimpPreviewClass GimpPreviewClass;
>--typedef struct _GimpPreviewEvent GimpPreviewEvent;
>-+//#define GIMP_TYPE_PREVIEW            (gimp_preview_get_type ())
>-+#define MY_GIMP_PREVIEW(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_PREVIEW, myGimpPreview))
>-+#define MY_GIMP_PREVIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_PREVIEW, myGimpPreviewClass))
>-+//#define GIMP_IS_PREVIEW(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_PREVIEW))
>-+//#define GIMP_IS_PREVIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_PREVIEW))
>-+typedef struct _myGimpPreview myGimpPreview;
>-+typedef struct _myGimpPreviewClass myGimpPreviewClass;
>-+typedef struct _myGimpPreviewEvent myGimpPreviewEvent;
>- 
>--struct _GimpPreviewClass
>-+struct _myGimpPreviewClass
>- {
>-   GtkContainerClass parent_class;
>- 
>--  void (*update_preview) (GimpPreview * preview, GimpPreviewEvent * event);
>--  void (*preview_changed) (GimpPreview * preview);
>-+  void (*update_preview) (myGimpPreview * preview, myGimpPreviewEvent * event);
>-+  void (*preview_changed) (myGimpPreview * preview);
>- };
>- 
>- 
>--struct _GimpPreview
>-+struct _myGimpPreview
>- {
>-   GtkContainer parent;
>- 
>-@@ -75,13 +75,13 @@
>- };
>- 
>- /**
>-- * GimpPreviewEvent:
>-+ * myGimpPreviewEvent:
>-  * @event_id: Id of this event. This is needed for gimp_preview_draw_row,
>-  * gimp_preview_draw_unscaled_row and gimp_preview_progress_set_fraction.
>-  * @scale: Current scale of the preview.
>-  *
>-  **/
>--struct _GimpPreviewEvent
>-+struct _myGimpPreviewEvent
>- {
>-   gint event_id;                /* Id of this event */
>-   gdouble scale;                /* Scale of preview */
>-@@ -113,20 +113,20 @@
>-                                        gint preview_size,
>-                                        gdouble scale_amount,
>-                                        gint allow_scale);
>--void gimp_preview_update (GimpPreview * preview);
>-+void gimp_preview_update (myGimpPreview * preview);
>- 
>--gboolean gimp_preview_draw_row (GimpPreview * preview, const gint event_id,
>-+gboolean gimp_preview_draw_row (myGimpPreview * preview, const gint event_id,
>-                                 GimpImageType type, const gint row,
>-                                 const guchar * const data);
>- 
>--gboolean gimp_preview_draw_unscaled_row (GimpPreview * preview,
>-+gboolean gimp_preview_draw_unscaled_row (myGimpPreview * preview,
>-                                          const gint event_id,
>-                                          GimpImageType type, const gint row,
>-                                          const guchar * const data);
>- 
>--void gimp_preview_force_redraw (GimpPreview * preview);
>-+void gimp_preview_force_redraw (myGimpPreview * preview);
>- 
>--gboolean gimp_preview_progress_set_fraction (GimpPreview * preview,
>-+gboolean gimp_preview_progress_set_fraction (myGimpPreview * preview,
>-                                              const gint event_id,
>-                                              double fraction);
>- 
>diff --git graphics/gimp-refocus-plugin/files/patch-src__prevman.c graphics/gimp-refocus-plugin/files/patch-src__prevman.c
>deleted file mode 100644
>index 394dda32c0d8..000000000000
>--- graphics/gimp-refocus-plugin/files/patch-src__prevman.c
>+++ /dev/null
>@@ -1,29 +0,0 @@
>---- src/prevman.c	2014-03-27 20:00:17.000000000 -0300
>-+++ src/prevman.c	2014-03-27 20:00:23.000000000 -0300
>-@@ -52,7 +52,7 @@
>-   tile_source->width = drawable->width;
>-   tile_source->height = drawable->height;
>-   tile_source->bpp = drawable->bpp;
>--  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->id);
>-+  tile_source->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
>-   tile_source->un.drw.drawable = drawable;
>-   gimp_pixel_rgn_init (&tile_source->un.drw.pixel_rgn, drawable, x, y, width,
>-                        height, FALSE, FALSE);
>-@@ -144,7 +144,7 @@
>-   tile_sink->width = drawable->width;
>-   tile_sink->height = drawable->height;
>-   tile_sink->bpp = drawable->bpp;
>--  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
>-+  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
>-   gimp_pixel_rgn_init (&tile_sink->un.drw.pixel_rgn, drawable, x, y, width,
>-                        height, TRUE, TRUE);
>- }
>-@@ -159,7 +159,7 @@
>-   tile_sink->width = width;
>-   tile_sink->height = height;
>-   tile_sink->bpp = drawable->bpp;
>--  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->id);
>-+  tile_sink->has_alpha = gimp_drawable_has_alpha (drawable->drawable_id);
>-   tile_sink->un.prv.data = g_new (guchar,
>-                                   tile_sink->width * tile_sink->height *
>-                                   tile_sink->bpp);
>diff --git graphics/gimp-refocus-plugin/files/patch-src__refocus.c graphics/gimp-refocus-plugin/files/patch-src__refocus.c
>deleted file mode 100644
>index b7810df041ca..000000000000
>--- graphics/gimp-refocus-plugin/files/patch-src__refocus.c
>+++ /dev/null
>@@ -1,124 +0,0 @@
>---- src/refocus.c	2014-03-27 20:00:17.000000000 -0300
>-+++ src/refocus.c	2014-03-27 20:00:38.000000000 -0300
>-@@ -45,9 +45,9 @@
>- 
>- /* Declare local functions. */
>- static void query (void);
>--static void run (char *name,
>-+static void run (const gchar *name,
>-                  gint nparams,
>--                 GimpParam * param,
>-+                 const GimpParam * param,
>-                  gint * nreturn_vals, GimpParam ** return_vals);
>- static gint dialog ();
>- static void doit (void);
>-@@ -111,7 +111,6 @@
>-     {GIMP_PDB_FLOAT, "noise", "Noise to Signal ratio"},
>-   };
>-   static GimpParamDef *return_vals = NULL;
>--  static gint nargs = (gint) (sizeof (args) / sizeof (args[0]));
>-   static gint nreturn_vals = 0;
>- 
>-   gimp_install_procedure ("plug_in_refocus",
>-@@ -123,15 +122,15 @@
>-                           "<Image>/Filters/Enhance/Refocus ...",
>-                           "RGB*, GRAY*",
>-                           GIMP_PLUGIN,
>--                          nargs, nreturn_vals, args, return_vals);
>-+                          G_N_ELEMENTS(args), nreturn_vals, args, return_vals);
>- }
>- 
>- static void
>--run (char *name, gint n_params, GimpParam * param,
>-+run (const gchar *name, gint n_params, const GimpParam * param,
>-      gint * nreturn_vals, GimpParam ** return_vals)
>- {
>-   static GimpParam values[1];
>--  GimpRunModeType run_mode;
>-+  GimpRunMode run_mode;
>-   GimpPDBStatusType status = GIMP_PDB_SUCCESS;
>- 
>-   (void) name;                  /* Shut up warnings about unused parameters. */
>-@@ -186,8 +185,8 @@
>-     {
>- 
>-       /*  Make sure that the drawable is gray or RGB color  */
>--      if (gimp_drawable_is_rgb (drawable->id) ||
>--          gimp_drawable_is_gray (drawable->id))
>-+      if (gimp_drawable_is_rgb (drawable->drawable_id) ||
>-+          gimp_drawable_is_gray (drawable->drawable_id))
>-         {
>-           doit ();
>- 
>-@@ -336,7 +335,7 @@
>-   (void) data;
>-   set_busy_cursor (widget, TRUE);
>-   update_matrix ();
>--  gimp_preview_update (GIMP_PREVIEW (my_widgets.preview));
>-+  gimp_preview_update (MY_GIMP_PREVIEW (my_widgets.preview));
>-   set_busy_cursor (widget, FALSE);
>- }
>- 
>-@@ -369,11 +368,11 @@
>- {
>-   gint event_id = GPOINTER_TO_INT (data);
>-   return (gimp_preview_progress_set_fraction
>--          (GIMP_PREVIEW (my_widgets.preview), event_id, arg));
>-+          (MY_GIMP_PREVIEW (my_widgets.preview), event_id, arg));
>- }
>- 
>- static void
>--preview_callback (GtkWidget * widget, GimpPreviewEvent * event, gpointer data)
>-+preview_callback (GtkWidget * widget, myGimpPreviewEvent * event, gpointer data)
>- {
>-   TileSource source;
>-   TileSink sink;
>-@@ -393,7 +392,7 @@
>-                                       im_width, im_height);
>-       tile_sink_init_for_preview (&sink, drawable, image_x, image_y,
>-                                   im_width, im_height);
>--      gimp_preview_progress_set_fraction (GIMP_PREVIEW (my_widgets.preview),
>-+      gimp_preview_progress_set_fraction (MY_GIMP_PREVIEW (my_widgets.preview),
>-                                           event->event_id, 0);
>-       bd_closure_init (&update_progress_closure,
>-                        preview_progress_update_fun,
>-@@ -409,9 +408,9 @@
>-         {
>-           tile_sink_get_row (&sink, buf, image_x, image_y + row, im_width);
>-           event_is_current =
>--            gimp_preview_draw_unscaled_row (GIMP_PREVIEW (my_widgets.preview),
>-+            gimp_preview_draw_unscaled_row (MY_GIMP_PREVIEW (my_widgets.preview),
>-                                             event->event_id,
>--                                            gimp_drawable_type (drawable->id),
>-+                                            gimp_drawable_type (drawable->drawable_id),
>-                                             row, buf);
>-         };
>-       g_free (buf);
>-@@ -583,7 +582,7 @@
>- 
>-   gtk_widget_show (dlg);
>-   redraw_all ();
>--  gimp_preview_update (GIMP_PREVIEW (preview));
>-+  gimp_preview_update (MY_GIMP_PREVIEW (preview));
>-   gtk_main ();
>-   gdk_flush ();
>-   return run_flag;
>-@@ -608,7 +607,7 @@
>-   gimp_progress_init ("Computing matrix");
>-   update_matrix ();
>-   gimp_progress_init ("Applying convolution");
>--  gimp_drawable_mask_bounds (drawable->id, &sx1, &sy1, &sx2, &sy2);
>-+  gimp_drawable_mask_bounds (drawable->drawable_id, &sx1, &sy1, &sx2, &sy2);
>-   width = sx2 - sx1;
>-   height = sy2 - sy1;
>-   tile_source_init_from_drawable (&source, drawable, sx1, sy1, width, height);
>-@@ -618,7 +617,7 @@
>-                   matrix, 2 * my_config.mat_width + 1,
>-                   &update_progress_closure);
>-   gimp_drawable_flush (drawable);
>--  gimp_drawable_merge_shadow (drawable->id, TRUE);
>--  gimp_drawable_update (drawable->id, sx1, sy1, width, height);
>-+  gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
>-+  gimp_drawable_update (drawable->drawable_id, sx1, sy1, width, height);
>-   g_free (matrix);
>- }
>diff --git graphics/gimp-refocus-plugin/files/patch-src__tilebuf.c graphics/gimp-refocus-plugin/files/patch-src__tilebuf.c
>deleted file mode 100644
>index 1b308c2aec59..000000000000
>--- graphics/gimp-refocus-plugin/files/patch-src__tilebuf.c
>+++ /dev/null
>@@ -1,189 +0,0 @@
>---- src/tilebuf.c	2014-03-27 20:00:17.000000000 -0300
>-+++ src/tilebuf.c	2014-03-27 20:00:58.000000000 -0300
>-@@ -18,6 +18,7 @@
>-  * Version $Id: tilebuf.c,v 1.1.1.1 2003/01/30 21:30:19 ernstl Exp $
>-  */
>- 
>-+#include <stdio.h>
>- #include "tilebuf.h"
>- #include "util.h"
>- #include <string.h>
>-@@ -39,6 +40,11 @@
>- guchar *
>- pixpos_in_buf (TileStripBuffer * buf, const gint x, const gint y)
>- {
>-+  /*
>-+    & data = array(? lines x row_stride columns)
>-+    & pixpos_in_buf = &data[(x - real_x)*bytes_per_pixel, y - real_y]
>-+    & (real_x, real_y) = origin of tile.
>-+   */
>-   return (&buf->data[buf->row_stride * (y - buf->real_y) +
>-                      buf->bpp * (x - buf->real_x)]);
>- }
>-@@ -140,7 +146,10 @@
>- 
>-         for (x = x_lo - 1; x >= buf->real_x; x--)
>-           {
>--            copy_col (buf, 2 * x_lo - x, y_start, y_end - y_start, x);
>-+            gint sx = 2 * x_lo - x;
>-+            copy_col (buf,
>-+                      sx<=buf->real_x+buf->real_width-1?sx:buf->real_x+buf->real_width-1,
>-+                      y_start, y_end - y_start, x);
>-           };
>-       }
>-       break;
>-@@ -171,7 +180,9 @@
>- 
>-         for (x = x_hi; x < buf->real_x + buf->real_width; x++)
>-           {
>--            copy_col (buf, 2 * (x_hi - 1) - x, y_start, y_end - y_start, x);
>-+            gint sx = 2 * (x_hi - 1) - x;
>-+            copy_col (buf, sx>=buf->real_x?sx:buf->real_x,
>-+                      y_start, y_end - y_start, x);
>-           };
>-       }
>-       break;
>-@@ -200,7 +211,10 @@
>- 
>-         for (y = y_lo - 1; y >= buf->real_y; y--)
>-           {
>--            copy_row (buf, buf->real_x, 2 * y_lo - y, buf->real_width, y);
>-+            gint sy = 2 * y_lo - y;
>-+            copy_row (buf, buf->real_x,
>-+                      sy<=buf->real_y+buf->real_height-1?sy:buf->real_y+buf->real_height-1,
>-+                      buf->real_width, y);
>-           };
>-       }
>-       break;
>-@@ -212,7 +226,7 @@
>- static void
>- fix_bottom_boundary (TileStripBuffer * buf, const gint y_hi)
>- {
>--  if (y_hi >= buf->real_y + buf->real_height)
>-+  if (y_hi >= buf->real_y + buf->real_height)       /* (1) */
>-     {
>-       return;
>-     };
>-@@ -226,12 +240,32 @@
>-       break;
>-     case TB_BOUNDARY_MIRROR:
>-       {
>--        register gint y;
>-+        register gint y2;
>- 
>--        for (y = y_hi; y < buf->real_y + buf->real_height; y++)
>-+        /*if (y_hi < buf->y_limit)*/
>-+        for (y2 = y_hi; y2 < buf->real_y + buf->real_height; y2++) /*(2)*/
>-           {
>--            copy_row (buf, buf->real_x, 2 * (y_hi - 1) - y, buf->real_width,
>--                      y);
>-+            /*
>-+              &1 y < y_hi              [domain of y, definition of y_hi, (1)]
>-+              &2 y_hi <= y2 < buf->real_y + buf->real_height  [(1),(2)]
>-+              &3 i = 0, 1, ...
>-+              &4 y=y_hi-i-1 -> y2=y_hi+i               [definition of mirror]
>-+              &5 y = y2 - 2*i - 1                      [4]
>-+              &6 y = 2*y2 - 2*i - y2 - 1               [5,algebra]
>-+              &7 y = 2*y_hi - y2 - 1                   [4,6]
>-+            */
>-+            gint y =  2*y_hi - y2 - 1;
>-+            if (y < buf->real_y) break;
>-+#ifdef RLXTEST
>-+           printf("fix_bottom_boundary: Copying row %d to %d, width %d, buf_loc %d %d, real_y %d\n",
>-+                  2*y_hi - y2 - 1, y2, buf->real_width,
>-+                  buf->row_stride * (2*y_hi - y2 - 1 - buf->real_y) +
>-+                   buf->bpp * (buf->real_x - buf->real_x),
>-+                  buf->row_stride * (y2 - buf->real_y) +
>-+                   buf->bpp * (buf->real_x - buf->real_x),
>-+                   buf->real_y);
>-+#endif
>-+            copy_row (buf, buf->real_x, y, buf->real_width,y2);
>-           };
>-       }
>-       break;
>-@@ -253,7 +287,21 @@
>-   const gint y_lo = MAX (buf->real_y, source->y);
>-   const gint y_hi = MIN (buf->real_y + buf->real_height,
>-                          source->y + source->height);
>--
>-+  /*
>-+    y:  domain of y.
>-+    & 0 <= y.  y is a 0-index.
>-+    & | & y in the source image
>-+        & 0 <=  source->y <= y < source->y + source->height
>-+      | & y in the buffer
>-+        & 0 <= buf->real_y <= y < buf->real_y + buf->real_height
>-+    x:  domain of x = domain of y with mapping y -> x, height -> width.
>-+   */
>-+
>-+#ifdef RLXTEST
>-+  printf("buf->real_y %d, buf->real_height %d, source->y %d, source->heigh %d, y_hi %d\n",
>-+         buf->real_y,  buf->real_height,
>-+       source->y, source->height, y_hi);
>-+#endif
>-   fix_left_boundary (buf, x_lo, first_time ? buf->y : buf->y + tile_height (),
>-                      y_hi);
>-   fix_right_boundary (buf, x_hi,
>-@@ -262,7 +310,15 @@
>-     {
>-       fix_top_boundary (buf, y_lo);
>-     };
>-+#ifdef RLXTEST
>-+  printf("fix_boundaries: Now goto fix_bottom_boundary: y_hi %d, real_y + real_height %d, data[%d]\n",
>-+         y_hi, buf->real_y + buf->real_height,
>-+         buf->real_height * buf->row_stride);
>-+#endif
>-   fix_bottom_boundary (buf, y_hi);
>-+#ifdef RLXTEST
>-+  printf("bottom boundary fixed\n");
>-+#endif
>- }
>- 
>- void
>-@@ -309,6 +365,14 @@
>-   gint x;
>-   gboolean not_finished = TRUE;
>- 
>-+  /*
>-+    & y_limit = height of picture, if full picture.
>-+   */
>-+#ifdef RLXTEST
>-+  printf("buf->y %d + tile_height%d () >= buf->y_limit %d\n",
>-+         buf->y,tile_height(),buf->y_limit);
>-+#endif
>-+
>-   if (buf->first_time)
>-     {
>-       /* Buf must already have been initialized so there is nothing to do */
>-@@ -321,19 +385,31 @@
>-     }
>-   else
>-     {
>-+#ifdef RLXTEST
>-+      printf("shift_buf: tile_height %d\n", tile_height());
>-+#endif
>-       memmove (pixpos_in_buf (buf, buf->real_x,
>-                               buf->real_y),
>-                pixpos_in_buf (buf, buf->real_x,
>-                               buf->real_y + tile_height ()),
>-                buf->row_stride * (tile_height () + buf->border_width));
>-       buf->y += tile_height ();
>-+#ifdef RLXTEST
>-+      printf("shift_buf: y %d, y_limit %d\n", buf->y,  buf->y_limit);
>-+#endif
>-       buf->real_y = buf->y - buf->border_width;
>-       for (x = buf->x - tile_width ();
>-            x <= buf->x + buf->width; x += tile_width ())
>-         {
>-           copy_tile_to_buf (buf, source, x, buf->y + tile_height ());
>-+#ifdef RLXTEST
>-+          printf("shift_buf: x %d\n", x);
>-+#endif
>-         };
>-       fix_boundaries (buf, source, FALSE);
>-     };
>-+#ifdef RLXTEST
>-+  printf("shift_buf: done\n");
>-+#endif
>-   return (not_finished);
>- }
>diff --git graphics/gimp-refocus-plugin/files/patch-src__util.c graphics/gimp-refocus-plugin/files/patch-src__util.c
>deleted file mode 100644
>index c1dd86d9d7c0..000000000000
>--- graphics/gimp-refocus-plugin/files/patch-src__util.c
>+++ /dev/null
>@@ -1,49 +0,0 @@
>---- src/util.c	2014-03-27 20:00:17.000000000 -0300
>-+++ src/util.c	2014-03-27 20:00:58.000000000 -0300
>-@@ -18,6 +18,7 @@
>-  * Version $Id: util.c,v 1.1.1.1 2003/01/30 21:30:19 ernstl Exp $
>-  */
>- 
>-+#include <stdio.h>
>- #include "util.h"
>- #include <string.h>
>- #include <math.h>
>-@@ -30,14 +31,38 @@
>- gint
>- floorm (gint a, gint b)
>-  /* return largest multiple of b that is <= a */
>-+ /*
>-+  & & m = floorm(a,b)
>-+    & a = b*m + r
>-+    &  0 <= r < b
>-+  */
>- {
>-+#ifdef RLXTEST
>-+  printf("floorm: a/b %d, fl %g\n", a/b, floor ((gdouble) a / b));
>-+#endif
>-   return (b * floor ((gdouble) a / b));
>- }
>- 
>- gint
>- ceilm (gint a, gint b)
>-  /* return least multiple of b that is >= a */
>-+ /*
>-+    & m = ceilm(a,b)
>-+    & a = b*m - r;
>-+    & m = a/b
>-+    % r = a%b
>-+    & -a = -b*m + r
>-+
>-+    & ceilm = (r == 0 ? b*m : (b+1)*m)
>-+  */
>- {
>-+#ifdef RLXTEST
>-+  printf("ceil: a %d, b %d, -(-a/b) %d,a/b+(a%b != 0 ? 1:0) %d,  fl %g\n",
>-+         a,b,
>-+         -((-a)/b),
>-+          a/b+(a%b != 0 ? 1:0),
>-+         ceil ((gdouble) a / b) );
>-+#endif
>-   return (b * ceil ((gdouble) a / b));
>- }
>- 
>diff --git graphics/hppsmtools/Makefile graphics/hppsmtools/Makefile
>index efeb6445cc62..5fdba3a2ca82 100644
>--- graphics/hppsmtools/Makefile
>+++ graphics/hppsmtools/Makefile
>@@ -18,12 +18,6 @@ PORTDOCS=	README changes.txt
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|^CC=|#CC=|g ; \
>-		 s|-Wall -pedantic|$$(CFLAGS)|g' ${WRKSRC}/Makefile
>-	@${REINPLACE_CMD} -e '/typedef unsigned char/d' ${WRKSRC}/exif.h
>-	@${REINPLACE_CMD} -e '/<malloc.h>/d' ${WRKSRC}/psm*.c
>-
> do-install:
> .for file in psmdel psmdir psmget psmsho
> 	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin
>diff --git graphics/opencolorio/Makefile graphics/opencolorio/Makefile
>index bc83c3da8e47..dc8faf327413 100644
>--- graphics/opencolorio/Makefile
>+++ graphics/opencolorio/Makefile
>@@ -2,22 +2,25 @@
> # $FreeBSD$
> 
> PORTNAME=	opencolorio
>-DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.1.1
>-PORTREVISION?=	1
>+PORTVERSION=	g20200916
>+PORTEPOCH=	1
> CATEGORIES=	graphics multimedia
> 
> MAINTAINER?=	FreeBSD@Shaneware.biz
> COMMENT?=	Complete color management solution
> 
> LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
> 
> USES=		alias cmake compiler:c++11-lang localbase:ldflags pkgconfig \
>-		shebangfix
>+		shebangfix python:3.5+
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	imageworks
> GH_PROJECT=	OpenColorIO
>+GH_TAGNAME=	268238bd
> 
> CMAKE_ON=	USE_EXTERNAL_TINYXML USE_EXTERNAL_YAML
> CMAKE_OFF=	OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE OCIO_BUILD_STATIC
>@@ -26,9 +29,7 @@ CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
> CXXFLAGS_gcc=	-Wno-unused-function -Wno-error
> CXXFLAGS_clang=	-Wno-deprecated-register
> 
>-SHEBANG_FILES=	share/sphinx/ExtractRstFromSourceCPP.py \
>-		share/sphinx/ExtractRstFromSourceSimple.py \
>-		src/pyglue/createPyDocH.py
>+SHEBANG_FILES=	share/sphinx/ExtractRstFromSourceSimple.py share/sphinx/ExtractRstFromSourceCPP.py
> 
> OPTIONS_DEFINE=		DOCS
> 
>@@ -36,6 +37,8 @@ DOCS_CMAKE_BOOL=	OCIO_BUILD_DOCS
> 
> PLIST_SUB+=		LIBVERS=${PORTVERSION}
> 
>+CMAKE_OFF+=	OCIO_BUILD_TESTS OCIO_BUILD_GPU_TESTS
>+
> .if ${MACHINE_CPU:Msse2}
> CMAKE_ON+=	OCIO_USE_SSE
> .else
>@@ -52,33 +55,44 @@ CMAKE_ON+=	OCIO_BUILD_APPS USE_EXTERNAL_LCMS
> CMAKE_OFF+=	OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
> LDFLAGS+=	-lOpenColorIO
> USES+=		gl xorg
>-USE_GL=		gl glu glut glew
>+USE_GL=		egl gl glu glut glew
> USE_XORG=	xi xmu
> PLIST=		${PKGDIR}/pkg-plist-tools
>-EXTRA_PATCHES=	${PATCHDIR}/tools
> .elif defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
> LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio \
> 		libOpenColorIO.so:graphics/opencolorio
>-USES+=		python
>-USE_PYTHON=	flavors
> LDFLAGS+=	-lOpenColorIO
> CMAKE_ON+=	OCIO_BUILD_PYGLUE OCIO_PYGLUE_LINK
> CMAKE_OFF+=	OCIO_BUILD_APPS OCIO_BUILD_SHARED
>-CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD}
>+CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD} -Dpystring_ROOT=${LOCALBASE}
> PLIST=		${PKGDIR}/pkg-plist-pyglue
>+USE_PYTHON=	flavors
> .else # master port
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
>-LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
>-		libyaml-cpp03.so:devel/yaml-cpp03
>+CMAKE_ON+=	USE_EXTERNAL_LCMS OCIO_BUILD_SHARED
>+CMAKE_OFF+=	OCIO_BUILD_APPS
>+USES+=		gl xorg
>+USE_GL=		gl glu glut glew
>+USE_XORG=	xi xmu
>+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinx-tabs>0:textproc/py-sphinx-tabs@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}recommonmark>=0:textproc/py-recommonmark@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}testresources>=0:devel/py-testresources@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinx_press_theme>=0:textproc/py-sphinx_press_theme@${PY_FLAVOR}
>+
>+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
>+		libHalf.so:graphics/ilmbase \
>+		liblcms2.so:graphics/lcms2 \
>+		libpystring.so:devel/pystring \
>+		libtinyxml.so:textproc/tinyxml \
>+		libyaml-cpp.so:devel/yaml-cpp
>+
> .if ${PORT_OPTIONS:MDOCS}
>-USES+=		python:2.7,build
>-.else
>-USES+=		python:build
>+USES+=		python:3.5+,build
> .endif
> USE_LDCONFIG=	yes
> CMAKE_ON+=	OCIO_BUILD_SHARED OCIO_BUILD_PYGLUE
> CMAKE_OFF+=	OCIO_BUILD_APPS
>-CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD}
>+CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD} -DPYTHON_LIBRARY=${PYTHON_LIBDIR}
> # we enable pyglue in master port. This makes the python module
> # available when generating docs, we leave the python header in place
> # but only install the python module with the py-opencolorio port
>@@ -86,26 +100,18 @@ CMAKE_ARGS+=	-DPYTHON:FILEPATH=${PYTHON_CMD}
> # doc building fails using python3 - but the py-opencolorio port can still
> # be used to build a python 3 module
> PLIST=		${PKGDIR}/pkg-plist
>-EXTRA_PATCHES=	${PATCHDIR}/libs
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
>-		${WRKSRC}/CMakeLists.txt
>-	@${REINPLACE_CMD} -e '/YAML_CPP_INCLUDE_DIR/ s|yaml-cpp|&03|' \
>-		${WRKSRC}/CMakeLists.txt
>-	@${REINPLACE_CMD} -e '/YAML_CPP_LIBRARY/ s|yaml-cpp|&03|' \
>-		${WRKSRC}/CMakeLists.txt
>-	@${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.cpp
>-.if ${SLAVE_PORT} == yes
>-	@${FIND} ${WRKSRC}/src/apps -name main.cpp | ${XARGS} \
>-		${REINPLACE_CMD} '/namespace OIIO/d'
>+.if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == tools
>+do-install:
>+.for BIN in ociobakelut ociocheck ociochecklut ocioconvert ociodisplay ociolutimage ociomakeclf ocioperf ociowrite
>+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/apps/${BIN}/${BIN} ${STAGEDIR}${PREFIX}/bin/${BIN}
>+.endfor
> .endif
>-
> .if defined(OCIO_SLAVE) && ${OCIO_SLAVE} == pymodule
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
>-	${INSTALL_LIB} ${BUILD_WRKSRC}/src/pyglue/PyOpenColorIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
>+	${INSTALL_LIB} ${BUILD_WRKSRC}/src/bindings/python/PyOpenColorIO.so ${STAGEDIR}${PYTHON_SITELIBDIR}
> .elif !defined(OCIO_SLAVE)
> post-install:
> 	@${RM} -R ${STAGEDIR}${PYTHON_LIBDIR}
>diff --git graphics/opencolorio/distinfo graphics/opencolorio/distinfo
>index cb537c0218a8..4c8f58ad423b 100644
>--- graphics/opencolorio/distinfo
>+++ graphics/opencolorio/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1557638944
>-SHA256 (imageworks-OpenColorIO-v1.1.1_GH0.tar.gz) = c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
>-SIZE (imageworks-OpenColorIO-v1.1.1_GH0.tar.gz) = 13828483
>+TIMESTAMP = 1600267246
>+SHA256 (imageworks-OpenColorIO-g20200916-268238bd_GH0.tar.gz) = 0b004452ba1349e332ad711d89778ab16f71c653df563c75d033b56007f01e1e
>+SIZE (imageworks-OpenColorIO-g20200916-268238bd_GH0.tar.gz) = 9577856
>diff --git graphics/opencolorio/files/libs/patch-CMakeLists.txt graphics/opencolorio/files/libs/patch-CMakeLists.txt
>deleted file mode 100644
>index a7dba8317111..000000000000
>--- graphics/opencolorio/files/libs/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,17 +0,0 @@
>---- ./CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
>-+++ ./CMakeLists.txt
>-@@ -596,7 +599,7 @@ if(TARGET OpenColorIO_STATIC)
>-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
>-     endif()
>- endif()
>--install(EXPORT OpenColorIO DESTINATION cmake)
>-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
>- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
>-     "
>-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
>-@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
>-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
>-     "
>- )
>--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
>-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
>diff --git graphics/opencolorio/files/libs/patch-src_core_CMakeLists.txt graphics/opencolorio/files/libs/patch-src_core_CMakeLists.txt
>deleted file mode 100644
>index b598b621f1f4..000000000000
>--- graphics/opencolorio/files/libs/patch-src_core_CMakeLists.txt
>+++ /dev/null
>@@ -1,8 +0,0 @@
>---- src/core/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
>-+++ src/core/CMakeLists.txt
>-@@ -90,4 +90,4 @@ message(STATUS "Create OpenColorIO.pc fr
>- configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
>-     ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
>- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
>--    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
>-+    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/libdata/pkgconfig/)
>diff --git graphics/opencolorio/files/patch-CMakeLists.txt graphics/opencolorio/files/patch-CMakeLists.txt
>deleted file mode 100644
>index 612d07718e4a..000000000000
>--- graphics/opencolorio/files/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,32 +0,0 @@
>---- CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
>-+++ CMakeLists.txt
>-@@ -3,6 +3,10 @@ set(OCIO_VERSION_MAJOR 1)
>- set(OCIO_VERSION_MINOR 1)
>- set(OCIO_VERSION_PATCH 0)
>- 
>-+set(CMAKE_CXX_STANDARD 11)
>-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
>-+set(CMAKE_CXX_EXTENSIONS OFF)
>-+
>- cmake_minimum_required(VERSION 2.8)
>- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/share/cmake)
>- if(NOT DEFINED CMAKE_FIRST_RUN)
>-@@ -218,8 +222,7 @@ else(USE_EXTERNAL_TINYXML)
>-         ## => great news when build staticaly since we do not want another client project have to link also with tinyxml when he want to use this project
>-         ## => could be problematic if the client project use another version of tinyxml... In this case build tinyxml as shared lib with all projects could be a solution
>-         ## => TODO: so maybe provide a simple cmake way to build 3rdParty as shared and auto install with this project ?
>--        set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-DTIXML_USE_STL -fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
>--        add_definitions(-DTIXML_USE_STL) ## needed to build correctly, and also need to be propagated in child projects (client projects)
>-+        set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
>-         list(APPEND EXTERNAL_OBJECTS $<TARGET_OBJECTS:TINYXML_LIB>)
>-     else()
>-         find_package(Git REQUIRED) ## in order to apply patch (for crossplateform compatibility)
>-@@ -384,7 +387,7 @@ else()
>-     set(OCIO_INLINES_HIDDEN OFF)
>- endif()
>- 
>--set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
>-+set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
>- 
>- set(EXTERNAL_LINK_FLAGS "")
>- set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
>diff --git graphics/opencolorio/files/patch-docs_CMakeLists.txt graphics/opencolorio/files/patch-docs_CMakeLists.txt
>index f87ba3dcb976..4bd4ebbad3ff 100644
>--- graphics/opencolorio/files/patch-docs_CMakeLists.txt
>+++ graphics/opencolorio/files/patch-docs_CMakeLists.txt
>@@ -1,17 +1,22 @@
>---- docs/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
>+--- docs/CMakeLists.txt.orig	2020-09-16 03:35:02 UTC
> +++ docs/CMakeLists.txt
>-@@ -110,12 +115,11 @@ add_custom_target(doc ALL
>- add_dependencies(doc Sphinx) 
>+@@ -147,17 +147,14 @@ if(${Python_VERSION_MAJOR} GREATER_EQUAL 3)
>+     ### Installation ###
>  
>- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
>--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
>-+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/opencolorio
>-         PATTERN .* EXCLUDE
>- )
>+     install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
>+-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
>++            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/opencolorio
>+             PATTERN .* EXCLUDE
>+     )
>  
>--find_package(LATEX)
>--if(PDFLATEX_COMPILER)
>-+if(0)
>-     
>-     add_custom_target(latex
>-         COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
>+     ###############################################################################
>+     ### PDF target ###
>+ 
>+-    find_package(LATEX)
>+-    package_root_message(LATEX)
>+-
>+-    if(PDFLATEX_COMPILER)
>++    if(0)
>+ 
>+         add_custom_target(latex
>+             COMMAND
>diff --git graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake
>deleted file mode 100644
>index 5bd99e152c9f..000000000000
>--- graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- share/cmake/OCIOMacros.cmake.orig	2015-08-29 00:58:36 UTC
>-+++ share/cmake/OCIOMacros.cmake
>-@@ -168,7 +168,7 @@ MACRO(OCIOFindPython)
>-         file(TO_CMAKE_PATH "${PYTHON_LIBRARY_DIRS_RAW}" PYTHON_LIBRARY_DIRS)
>- 
>-         FIND_LIBRARY(PYTHON_LIBRARY
>--            NAMES "python${PYTHON_VERSION}"
>-+            NAMES "${PYTHON_VERSION}${PYTHON_ABIVER}"
>-             PATHS ${PYTHON_LIBRARY_DIRS}
>-             NO_DEFAULT_PATH # Don't be "helpful" and randomly grab library from /usr/lib etc
>-         )
>diff --git graphics/opencolorio/files/patch-src_core_Config.cpp graphics/opencolorio/files/patch-src_core_Config.cpp
>deleted file mode 100644
>index bc5f727a585f..000000000000
>--- graphics/opencolorio/files/patch-src_core_Config.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/core/Config.cpp.orig	2018-09-04 18:15:21 UTC
>-+++ src/core/Config.cpp
>-@@ -324,7 +324,7 @@ OCIO_NAMESPACE_ENTER
>-                 sanitytext_ = rhs.sanitytext_;
>-                 
>-                 cacheids_ = rhs.cacheids_;
>--                cacheidnocontext_ = cacheidnocontext_;
>-+                cacheidnocontext_ = rhs.cacheidnocontext_;
>-             }
>-             return *this;
>-         }
>diff --git graphics/opencolorio/files/tools/patch-CMakeLists.txt graphics/opencolorio/files/tools/patch-CMakeLists.txt
>deleted file mode 100644
>index eaeb072797a6..000000000000
>--- graphics/opencolorio/files/tools/patch-CMakeLists.txt
>+++ /dev/null
>@@ -1,35 +0,0 @@
>---- ./CMakeLists.txt.orig	2018-01-05 12:08:27 UTC
>-+++ ./CMakeLists.txt
>-@@ -457,7 +460,7 @@ endif()
>- ###############################################################################
>- ### APPS ###
>- 
>--if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
>-+if(OCIO_BUILD_APPS)
>- 
>-     # Try to find OpenImageIO (OIIO) and OpenGL stuff
>-     OCIOFindOpenImageIO()
>-@@ -531,7 +534,7 @@ endif()
>- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
>-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
>- 
>--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
>-+#INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
>- 
>- ###############################################################################
>- ### CPACK ###
>-@@ -596,7 +595,7 @@ if(TARGET OpenColorIO_STATIC)
>-         set(OCIO_STATIC_COMPILE_DEFINITIONS )
>-     endif()
>- endif()
>--install(EXPORT OpenColorIO DESTINATION cmake)
>-+#install(EXPORT OpenColorIO DESTINATION cmake)
>- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
>-     "
>-     get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
>-@@ -646,4 +649,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
>-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
>-     "
>- )
>--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
>-+#install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules)
>diff --git graphics/opencolorio/files/tools/patch-src_core_CMakeLists.txt graphics/opencolorio/files/tools/patch-src_core_CMakeLists.txt
>deleted file mode 100644
>index 1845054ea11c..000000000000
>--- graphics/opencolorio/files/tools/patch-src_core_CMakeLists.txt
>+++ /dev/null
>@@ -1,18 +0,0 @@
>---- src/core/CMakeLists.txt.orig	2018-02-05 14:07:04 UTC
>-+++ src/core/CMakeLists.txt
>-@@ -105,15 +105,3 @@ macro(target_link_OCIO target)
>-         set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS OpenColorIO_STATIC)
>-     endif()
>- endmacro()
>--
>--
>--# public interface
>--install(FILES ${core_export_headers}
>--    DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/)
>--
>--# pkg-config
>--message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in")
>--configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in
>--    ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY)
>--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc
>--    DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
>diff --git graphics/opencolorio/pkg-plist graphics/opencolorio/pkg-plist
>index 3d9547f2a971..3bac434857e9 100644
>--- graphics/opencolorio/pkg-plist
>+++ graphics/opencolorio/pkg-plist
>@@ -2,18 +2,21 @@ include/OpenColorIO/OpenColorABI.h
> include/OpenColorIO/OpenColorIO.h
> include/OpenColorIO/OpenColorTransforms.h
> include/OpenColorIO/OpenColorTypes.h
>-include/PyOpenColorIO/PyOpenColorIO.h
>+include/OpenColorIO/apphelpers/CategoryNames.h
>+include/OpenColorIO/apphelpers/ColorSpaceHelpers.h
>+include/OpenColorIO/apphelpers/DisplayViewHelpers.h
>+include/OpenColorIO/apphelpers/MixingHelpers.h
>+include/OpenColorIO/apphelpers/ViewingPipeline.h
> lib/libOpenColorIO.so
>-lib/libOpenColorIO.so.1
>-lib/libOpenColorIO.so.%%LIBVERS%%
>+lib/libOpenColorIO.so.2.0
>+lib/libOpenColorIO.so.2.0.0
>+lib/libOpenColorIOapphelpers.a
> libdata/pkgconfig/OpenColorIO.pc
>-share/cmake/Modules/OpenColorIOConfig.cmake
>-share/cmake/Modules/OpenColorIO-release.cmake
>-share/cmake/Modules/OpenColorIO.cmake
>-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.html
>-%%PORTDOCS%%%%DOCSDIR%%/CompatibleSoftware.html
>-%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
>-%%PORTDOCS%%%%DOCSDIR%%/License.html
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.html
>+%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.html
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
>+%%PORTDOCS%%%%DOCSDIR%%/README.html
>+%%PORTDOCS%%%%DOCSDIR%%/V2_DOC_README.html
> %%PORTDOCS%%%%DOCSDIR%%/_images/gn10_to_linear_light.jpeg
> %%PORTDOCS%%%%DOCSDIR%%/_images/gnf_to_linear_light.jpeg
> %%PORTDOCS%%%%DOCSDIR%%/_images/lg10_to_linear_light.jpeg
>@@ -24,101 +27,243 @@ share/cmake/Modules/OpenColorIO.cmake
> %%PORTDOCS%%%%DOCSDIR%%/_images/psicc_proof_setup.png
> %%PORTDOCS%%%%DOCSDIR%%/_images/psicc_reveal_profile.png
> %%PORTDOCS%%%%DOCSDIR%%/_images/psicc_select_profile.png
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/ChangeLog.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/CompatibleSoftware.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/FAQ.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/License.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/aces_1.0.3.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/allocation_vars.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/index.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/nuke_default.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_anim.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_vfx.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorIO.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTransforms.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTypes.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/index.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonAPI.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTransforms.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/bindings/PythonTypes.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/coding_guidelines.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/documentation_guidelines.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/getting_started.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/index.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/internal_architecture.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/issues.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/submitting_changes.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/usage_examples.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/downloads.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/introduction.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/installation.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/baking_luts.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/config_syntax.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/contexts.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/index.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/looks.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_sources/userguide/tool_overview.txt
>-%%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif
>-%%PORTDOCS%%%%DOCSDIR%%/_static/alert_info_32.png
>-%%PORTDOCS%%%%DOCSDIR%%/_static/alert_warning_32.png
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/CHANGELOG.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/CMakeLists.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/INSTALL.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/README.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/V2_DOC_README.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/_index.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/bindings/PythonAPI.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/bindings/PythonTransforms.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/bindings/PythonTypes.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_baker.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_colorspace.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_colorspaceset.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_config.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_context.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_cpuprocessor.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_dynamicproperty.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_filerules.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_formatmetadata.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_gpuprocessor.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_gpushadercreator.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_gpushaderdesc.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_imagedesc.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_look.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_packedimagedesc.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_planarimagedesc.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_processor.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/c_viewingrules.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/change_log.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/transforms.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/api/types.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/_index.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/aswf_docker.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/charter.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/cla_dco.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/aswf/license.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/_index.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/configuration_files.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/glossary.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/internal_architecture.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/introduction.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/overview/overview.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/concepts/publications/publications.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/_index.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/aces_1.0.3.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/nuke_default.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_anim.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/configurations/spi_vfx.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorIO.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTransforms.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/developers/api/OpenColorTypes.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/_index.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/allocation_vars.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/authoring.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/colorspaces.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/config_syntax.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/contexts.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/displays_views.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/looks.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/looks_example.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/overview.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/rules.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/authoring/transforms.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/architectural_notes.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/coding_style_guide.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/contributing.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/documentation_guidelines.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/doxygen_style_guide.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/getting_started.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/issues.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/repository_structure.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/submitting_changes.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/contributing/unit_tests.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/developing/app_helpers.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/developing/developing.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/developing/usage_examples.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/using_ocio/compatible_software.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/using_ocio/faq.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/using_ocio/tool_overview.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/guides/using_ocio/using_ocio.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/index.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/_index.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/downloads.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/for_artists.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/for_config_authors.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/for_contributors.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/for_devs.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/quick_start/installation.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/requirements.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/README.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/README_theme.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/archetypes/default.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/author/john-doe.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/author/mark-dinn.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/installation.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-1.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-2.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-3.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-4.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-5.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-6.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-7.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/site/homepage/content/english/blog/simple-blog-post-8.md.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/toc_redirect.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorials/_index.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorials/baking_luts.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/tutorials/contributing.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/upgrading_v2/_index.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_sources/upgrading_v2/how_to.rst.txt
>+%%PORTDOCS%%%%DOCSDIR%%/_static/OpenColorIO_withText.svg
> %%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
>-%%PORTDOCS%%%%DOCSDIR%%/_static/bg-page.png
>-%%PORTDOCS%%%%DOCSDIR%%/_static/bullet_orange.png
>-%%PORTDOCS%%%%DOCSDIR%%/_static/clo_res19_lm10.0101.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/_static/clo_res19_lnf.0101.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/_static/clo_res19_vd16.0101.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png
>-%%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png
>-%%PORTDOCS%%%%DOCSDIR%%/_static/comment.png
> %%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
>-%%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png
>-%%PORTDOCS%%%%DOCSDIR%%/_static/down.png
>+%%PORTDOCS%%%%DOCSDIR%%/_static/documentation_options.js
> %%PORTDOCS%%%%DOCSDIR%%/_static/file.png
>+%%PORTDOCS%%%%DOCSDIR%%/_static/jquery-3.5.1.js
> %%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
>+%%PORTDOCS%%%%DOCSDIR%%/_static/language_data.js
> %%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
>-%%PORTDOCS%%%%DOCSDIR%%/_static/ocio.css
>+%%PORTDOCS%%%%DOCSDIR%%/_static/ocio_b.svg
> %%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
> %%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
> %%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
>+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_press_theme.css
>+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/semantic-ui-2.4.1/menu.min.css
>+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/semantic-ui-2.4.1/segment.min.css
>+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/semantic-ui-2.4.1/tab.min.css
>+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/semantic-ui-2.4.1/tab.min.js
>+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/tabs.css
>+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_tabs/tabs.js
>+%%PORTDOCS%%%%DOCSDIR%%/_static/theme-vendors.js
>+%%PORTDOCS%%%%DOCSDIR%%/_static/theme.css
>+%%PORTDOCS%%%%DOCSDIR%%/_static/theme.js
>+%%PORTDOCS%%%%DOCSDIR%%/_static/underscore-1.3.1.js
> %%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
>-%%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png
>-%%PORTDOCS%%%%DOCSDIR%%/_static/up.png
>-%%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js
>+%%PORTDOCS%%%%DOCSDIR%%/api/_index.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/bindings/PythonAPI.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/bindings/PythonTransforms.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/bindings/PythonTypes.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_baker.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_colorspace.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_colorspaceset.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_config.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_context.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_cpuprocessor.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_dynamicproperty.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_filerules.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_formatmetadata.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_gpuprocessor.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_gpushadercreator.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_gpushaderdesc.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_imagedesc.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_look.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_packedimagedesc.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_planarimagedesc.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_processor.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/c_viewingrules.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/change_log.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/transforms.html
>+%%PORTDOCS%%%%DOCSDIR%%/api/types.html
>+%%PORTDOCS%%%%DOCSDIR%%/aswf/_index.html
>+%%PORTDOCS%%%%DOCSDIR%%/aswf/aswf_docker.html
>+%%PORTDOCS%%%%DOCSDIR%%/aswf/charter.html
>+%%PORTDOCS%%%%DOCSDIR%%/aswf/cla_dco.html
>+%%PORTDOCS%%%%DOCSDIR%%/aswf/license.html
>+%%PORTDOCS%%%%DOCSDIR%%/concepts/_index.html
>+%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/configuration_files.html
>+%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/glossary.html
>+%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/internal_architecture.html
>+%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/introduction.html
>+%%PORTDOCS%%%%DOCSDIR%%/concepts/overview/overview.html
>+%%PORTDOCS%%%%DOCSDIR%%/concepts/publications/publications.html
>+%%PORTDOCS%%%%DOCSDIR%%/configurations/_index.html
> %%PORTDOCS%%%%DOCSDIR%%/configurations/aces_1.0.3.html
>-%%PORTDOCS%%%%DOCSDIR%%/configurations/allocation_vars.html
>-%%PORTDOCS%%%%DOCSDIR%%/configurations/index.html
> %%PORTDOCS%%%%DOCSDIR%%/configurations/nuke_default.html
> %%PORTDOCS%%%%DOCSDIR%%/configurations/spi_anim.html
> %%PORTDOCS%%%%DOCSDIR%%/configurations/spi_vfx.html
> %%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorIO.html
> %%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTransforms.html
> %%PORTDOCS%%%%DOCSDIR%%/developers/api/OpenColorTypes.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/api/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonAPI.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTransforms.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/bindings/PythonTypes.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/coding_guidelines.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/documentation_guidelines.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/getting_started.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/internal_architecture.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/issues.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/submitting_changes.html
>-%%PORTDOCS%%%%DOCSDIR%%/developers/usage_examples.html
>-%%PORTDOCS%%%%DOCSDIR%%/downloads.html
> %%PORTDOCS%%%%DOCSDIR%%/genindex.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/_index.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/allocation_vars.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/authoring.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/colorspaces.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/config_syntax.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/contexts.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/displays_views.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/looks.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/looks_example.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/overview.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/rules.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/authoring/transforms.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/architectural_notes.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/coding_style_guide.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/contributing.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/documentation_guidelines.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/doxygen_style_guide.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/getting_started.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/issues.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/repository_structure.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/submitting_changes.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/contributing/unit_tests.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/developing/app_helpers.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/developing/developing.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/developing/usage_examples.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/using_ocio/compatible_software.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/using_ocio/faq.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/using_ocio/tool_overview.html
>+%%PORTDOCS%%%%DOCSDIR%%/guides/using_ocio/using_ocio.html
> %%PORTDOCS%%%%DOCSDIR%%/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/installation.html
>-%%PORTDOCS%%%%DOCSDIR%%/introduction.html
> %%PORTDOCS%%%%DOCSDIR%%/objects.inv
>-%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html
>+%%PORTDOCS%%%%DOCSDIR%%/quick_start/_index.html
>+%%PORTDOCS%%%%DOCSDIR%%/quick_start/downloads.html
>+%%PORTDOCS%%%%DOCSDIR%%/quick_start/for_artists.html
>+%%PORTDOCS%%%%DOCSDIR%%/quick_start/for_config_authors.html
>+%%PORTDOCS%%%%DOCSDIR%%/quick_start/for_contributors.html
>+%%PORTDOCS%%%%DOCSDIR%%/quick_start/for_devs.html
>+%%PORTDOCS%%%%DOCSDIR%%/quick_start/installation.html
>+%%PORTDOCS%%%%DOCSDIR%%/requirements.html
> %%PORTDOCS%%%%DOCSDIR%%/search.html
> %%PORTDOCS%%%%DOCSDIR%%/searchindex.js
>-%%PORTDOCS%%%%DOCSDIR%%/userguide/baking_luts.html
>-%%PORTDOCS%%%%DOCSDIR%%/userguide/config_syntax.html
>-%%PORTDOCS%%%%DOCSDIR%%/userguide/contexts.html
>-%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/userguide/looks.html
>-%%PORTDOCS%%%%DOCSDIR%%/userguide/tool_overview.html
>-share/ocio/setup_ocio.sh
>+%%PORTDOCS%%%%DOCSDIR%%/site/README.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/README_theme.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/archetypes/default.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/author/john-doe.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/author/mark-dinn.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/installation.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-1.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-2.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-3.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-4.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-5.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-6.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-7.html
>+%%PORTDOCS%%%%DOCSDIR%%/site/homepage/content/english/blog/simple-blog-post-8.html
>+%%PORTDOCS%%%%DOCSDIR%%/toc_redirect.html
>+%%PORTDOCS%%%%DOCSDIR%%/tutorials/_index.html
>+%%PORTDOCS%%%%DOCSDIR%%/tutorials/baking_luts.html
>+%%PORTDOCS%%%%DOCSDIR%%/tutorials/contributing.html
>+%%PORTDOCS%%%%DOCSDIR%%/upgrading_v2/_index.html
>+%%PORTDOCS%%%%DOCSDIR%%/upgrading_v2/how_to.html
>diff --git graphics/opencolorio/pkg-plist-tools graphics/opencolorio/pkg-plist-tools
>index 3f3b88901ee0..8ed29b4ee681 100644
>--- graphics/opencolorio/pkg-plist-tools
>+++ graphics/opencolorio/pkg-plist-tools
>@@ -1,5 +1,9 @@
> bin/ociobakelut
> bin/ociocheck
>+bin/ociochecklut
> bin/ocioconvert
> bin/ociodisplay
> bin/ociolutimage
>+bin/ociomakeclf
>+bin/ocioperf
>+bin/ociowrite
>diff --git graphics/rawtherapee/Makefile graphics/rawtherapee/Makefile
>index 0d540e83ce6a..53e301d82421 100644
>--- graphics/rawtherapee/Makefile
>+++ graphics/rawtherapee/Makefile
>@@ -152,10 +152,6 @@ _OPT_FLAGS+=	-mstackrealign
> 
> .include <bsd.port.pre.mk>
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \
>-		${WRKSRC}/CMakeLists.txt
>-
> TESTIMAGES=	${FILESDIR}/../testimages
> 
> # paranoia: run rawtherapee to be sure it finds all its
>diff --git graphics/scale2x/Makefile graphics/scale2x/Makefile
>index dd5d9ceed99d..204d3682b5a9 100644
>--- graphics/scale2x/Makefile
>+++ graphics/scale2x/Makefile
>@@ -28,12 +28,6 @@ OPTIONS_DEFINE_i386=	MMX
> 
> MMX_CPPFLAGS=		-DHAVE_MMX
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e \
>-		'/<malloc.h>/d ; \
>-		 s|__i386__|HAVE_MMX| ; \
>-		 s|__x86_64__|__amd64__|' ${WRKSRC}/*.[ch]
>-
> post-install:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	(cd ${WRKSRC}/example && ${INSTALL_DATA} *.png \
>diff --git graphics/separate/Makefile graphics/separate/Makefile
>index 35c09f38d86a..d302e0f57aa2 100644
>--- graphics/separate/Makefile
>+++ graphics/separate/Makefile
>@@ -39,11 +39,6 @@ MAKE_ENV=	TARGETS="${BIN_TARGETS}" \
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-post-patch:
>-	@${REINPLACE_CMD} \
>-		'/^CC/s|=|?=|; s| make| ${MAKE_CMD}|; /^LIBS/s/$$/ -lm/;' \
>-		${WRKSRC}/Makefile ${WRKSRC}/po/Makefile
>-
> do-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gimp/2.2/plug-ins
> .for plugin in ${BIN_TARGETS}
>diff --git graphics/stamp/Makefile graphics/stamp/Makefile
>index f204fbf0da96..4c7a9243bc72 100644
>--- graphics/stamp/Makefile
>+++ graphics/stamp/Makefile
>@@ -15,8 +15,4 @@ GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's#/usr/local/share/stamp#${DATADIR}#' \
>-		${WRKSRC}/configure
>-
> .include <bsd.port.mk>
>diff --git graphics/stamp/files/patch-Makefile.in graphics/stamp/files/patch-Makefile.in
>index ccd944f6b2e5..ad03108a1c92 100644
>--- graphics/stamp/files/patch-Makefile.in
>+++ graphics/stamp/files/patch-Makefile.in
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2011-03-12 21:24:42.000000000 +0100
>-+++ Makefile.in	2011-03-12 21:25:00.000000000 +0100
>-@@ -329,12 +329,12 @@ maintainer-clean-generic clean mostlycle
>+--- Makefile.in.orig	1999-03-10 10:54:42 UTC
>++++ Makefile.in
>+@@ -329,12 +329,12 @@ maintainer-clean-generic clean mostlyclean distclean m
>  .PHONY: files
>  
>  files:
>diff --git graphics/stamp/files/patch-gstamp_gstamp.c graphics/stamp/files/patch-gstamp_gstamp.c
>index 30976d4b5613..2a4455f8d404 100644
>--- graphics/stamp/files/patch-gstamp_gstamp.c
>+++ graphics/stamp/files/patch-gstamp_gstamp.c
>@@ -1,5 +1,5 @@
>---- gstamp/gstamp.c.orig	2011-03-12 21:29:21.000000000 +0100
>-+++ gstamp/gstamp.c	2011-03-12 21:29:42.000000000 +0100
>+--- gstamp/gstamp.c.orig	1999-03-10 06:27:04 UTC
>++++ gstamp/gstamp.c
> @@ -7,6 +7,7 @@
>  
>  #include <gtk/gtk.h>
>diff --git graphics/stamp/files/patch-gstamp_gstamp_misc.c graphics/stamp/files/patch-gstamp_gstamp_misc.c
>deleted file mode 100644
>index 20c8c0a91323..000000000000
>--- graphics/stamp/files/patch-gstamp_gstamp_misc.c
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- gstamp/gstamp_misc.c.orig	2011-03-12 21:33:49.000000000 +0100
>-+++ gstamp/gstamp_misc.c	2011-03-12 21:34:16.000000000 +0100
>-@@ -2,6 +2,7 @@
>-    Eric Werner - 19 FEB 1999 
>-    ebw@city-net.com
>- */
>-+#include <sys/shm.h>
>- #include <stdlib.h>
>- #include <string.h>
>- #include <unistd.h>
>diff --git graphics/stamp/files/patch-gstamp_gstamp_signals.c graphics/stamp/files/patch-gstamp_gstamp_signals.c
>deleted file mode 100644
>index 19926a639db3..000000000000
>--- graphics/stamp/files/patch-gstamp_gstamp_signals.c
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- gstamp/gstamp_signals.c.orig	2011-03-12 21:31:32.000000000 +0100
>-+++ gstamp/gstamp_signals.c	2011-03-12 21:31:44.000000000 +0100
>-@@ -3,6 +3,7 @@
>-    ebw@city-net.com
>- */
>- #include <gtk/gtk.h>
>-+#include <stdlib.h>
>- #include <string.h>
>- #include "gstamp.h"
>- #include "../lib/rcfile.h"
>diff --git graphics/stamp/files/patch-gstamp_gstamp_ui.c graphics/stamp/files/patch-gstamp_gstamp_ui.c
>deleted file mode 100644
>index 7a4380560404..000000000000
>--- graphics/stamp/files/patch-gstamp_gstamp_ui.c
>+++ /dev/null
>@@ -1,7 +0,0 @@
>---- gstamp/gstamp_ui.c.orig	2011-03-12 21:31:56.000000000 +0100
>-+++ gstamp/gstamp_ui.c	2011-03-12 21:32:20.000000000 +0100
>-@@ -1,3 +1,4 @@
>-+#include <string.h>
>- #include <gtk/gtk.h>
>- #include "gstamp.h"
>- 
>diff --git graphics/stamp/files/patch-lib_common.c graphics/stamp/files/patch-lib_common.c
>index 276b677f222c..abf94acab6ed 100644
>--- graphics/stamp/files/patch-lib_common.c
>+++ graphics/stamp/files/patch-lib_common.c
>@@ -1,5 +1,5 @@
>---- lib/common.c.orig	2011-03-12 21:28:20.000000000 +0100
>-+++ lib/common.c	2011-03-12 21:28:30.000000000 +0100
>+--- lib/common.c.orig	1999-03-11 08:29:53 UTC
>++++ lib/common.c
> @@ -1,5 +1,6 @@
>  #include <stdio.h>
>  #include <stdlib.h>
>diff --git graphics/stamp/files/patch-lib_rcfile.c graphics/stamp/files/patch-lib_rcfile.c
>index aec536730309..24615ad302c9 100644
>--- graphics/stamp/files/patch-lib_rcfile.c
>+++ graphics/stamp/files/patch-lib_rcfile.c
>@@ -1,6 +1,6 @@
>---- lib/rcfile.c.orig	Fri Dec 24 15:02:25 1999
>-+++ lib/rcfile.c	Fri Dec 24 15:06:09 1999
>-@@ -101,8 +101,8 @@
>+--- lib/rcfile.c.orig	1999-03-11 08:30:32 UTC
>++++ lib/rcfile.c
>+@@ -101,8 +101,8 @@ if ((!(strcmp(Args->LowerFont,""))) &&
>      exit(ERR_NOLFONT) ;
>    }
>  
>diff --git graphics/stamp/files/patch-lib_transmogrify.c graphics/stamp/files/patch-lib_transmogrify.c
>index 204d77f11ba1..1e2f810e2b8b 100644
>--- graphics/stamp/files/patch-lib_transmogrify.c
>+++ graphics/stamp/files/patch-lib_transmogrify.c
>@@ -1,5 +1,5 @@
>---- lib/transmogrify.c.orig	2011-03-12 21:28:42.000000000 +0100
>-+++ lib/transmogrify.c	2011-03-12 21:28:55.000000000 +0100
>+--- lib/transmogrify.c.orig	1999-03-10 11:40:33 UTC
>++++ lib/transmogrify.c
> @@ -1,5 +1,6 @@
>  #include <stdio.h>
>  #include <stdlib.h>
>diff --git graphics/synaesthesia/Makefile graphics/synaesthesia/Makefile
>index ed50ae939ab4..b0782afbea0d 100644
>--- graphics/synaesthesia/Makefile
>+++ graphics/synaesthesia/Makefile
>@@ -23,10 +23,6 @@ PLIST_FILES=	bin/${PORTNAME}
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's,stdint\.h,inttypes.h,' ${WRKSRC}/*.c?
>-	@${REINPLACE_CMD} -e 's,int16_t,u_int16_t,' ${WRKSRC}/sound.cc
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
> 
>diff --git graphics/tiff/Makefile graphics/tiff/Makefile
>index be509ee3a33a..5742fda5af13 100644
>--- graphics/tiff/Makefile
>+++ graphics/tiff/Makefile
>@@ -101,7 +101,25 @@ __pmlinks3!=	${ECHO_CMD} '${MLNKS:S/    / /}' | ${AWK} \
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} "/\.po 0/d" ${WRKSRC}/man/*
>+	@${REINPLACE_CMD} "/\.po 0/d" \
>+		${WRKSRC}/man/fax2ps.1 \
>+		${WRKSRC}/man/fax2tiff.1 \
>+		${WRKSRC}/man/pal2rgb.1 \
>+		${WRKSRC}/man/ppm2tiff.1 \
>+		${WRKSRC}/man/raw2tiff.1 \
>+		${WRKSRC}/man/tiff2bw.1 \
>+		${WRKSRC}/man/tiff2ps.1 \
>+		${WRKSRC}/man/tiff2rgba.1 \
>+		${WRKSRC}/man/tiffcmp.1 \
>+		${WRKSRC}/man/tiffcp.1 \
>+		${WRKSRC}/man/tiffcrop.1 \
>+		${WRKSRC}/man/tiffdither.1 \
>+		${WRKSRC}/man/tiffdump.1 \
>+		${WRKSRC}/man/tiffgt.1 \
>+		${WRKSRC}/man/tiffinfo.1 \
>+		${WRKSRC}/man/tiffmedian.1 \
>+		${WRKSRC}/man/tiffset.1 \
>+		${WRKSRC}/man/tiffsplit.1
> 
> pre-configure:
> 	${REINPLACE_CMD} \
>diff --git graphics/xviewer/Makefile graphics/xviewer/Makefile
>index 11dbc27408bc..edbbfabb78a1 100644
>--- graphics/xviewer/Makefile
>+++ graphics/xviewer/Makefile
>@@ -26,13 +26,14 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	linuxmint
> USE_GNOME=	atk cairo gdkpixbuf2 gtk30 introspection pango
> USE_XORG=	x11
>-GLIB_SCHEMAS=	org.x.viewer.enums.xml org.x.viewer.gschema.xml
>+GLIB_SCHEMAS=	org.x.viewer.enums.xml \
>+		org.x.viewer.gschema.xml
> INSTALLS_ICONS=	yes
> 
>-OPTIONS_DEFINE=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
>+OPTIONS_DEFINE=		JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
> OPTIONS_DEFAULT=	JPEG LCMS2 LIBEXIF LIBRSVG2 XMP
>-XMP_DESC=	Adobe Extensible Metadata Platform support
>-OPTIONS_SUB=	yes
>+XMP_DESC=		Adobe Extensible Metadata Platform support
>+OPTIONS_SUB=		yes
> 
> JPEG_USES=		jpeg
> JPEG_CONFIGURE_OFF=	--without-libjpeg
>@@ -49,8 +50,4 @@ LIBRSVG2_CONFIGURE_OFF=	--without-librsvg
> XMP_LIB_DEPENDS=	libexempi.so:textproc/exempi
> XMP_CONFIGURE_OFF=	--without-xmp
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e '/CINNAMON_DESKTOP_REQUIRED/s,3\.2\.0,2.4.2,' \
>-		${WRKSRC}/configure.ac
>-
> .include <bsd.port.mk>
>diff --git graphics/zphoto/Makefile graphics/zphoto/Makefile
>index 5cf20c790997..972f39227c2d 100644
>--- graphics/zphoto/Makefile
>+++ graphics/zphoto/Makefile
>@@ -30,7 +30,4 @@ ZIP_CONFIGURE_OFF=	--disable-zip
> NLS_USES=		gettext
> NLS_CONFIGURE_ENABLE=	nls
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|<ming.h>|<ming/ming.h>|g' ${WRKSRC}/*.c ${WRKSRC}/configure
>-
> .include <bsd.port.mk>
>diff --git graphics/zphoto/files/patch-Makefile.in graphics/zphoto/files/patch-Makefile.in
>deleted file mode 100644
>index 2b920bc11c4f..000000000000
>--- graphics/zphoto/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- templates/default/all/Makefile.in.org	2014-06-21 19:51:31.487457236 +0900
>-+++ templates/default/all/Makefile.in	2014-06-21 19:51:46.935435015 +0900
>-@@ -369,9 +369,9 @@
>- 	| sh
>- 
>- install-data-local:
>--	mkdir -p $(templatesdir)
>--	cp -p *.html.* $(templatesdir)
>--	cp -p *.js.* $(templatesdir)
>-+	mkdir -p $(DESTDIR)$(templatesdir)
>-+	cp -p *.html.* $(DESTDIR)$(templatesdir)
>-+	cp -p *.js.* $(DESTDIR)$(templatesdir)
>- 
>- clean:
>- 	rm -f zphoto.css .photo.html *.html.* *.js.* *.txt
>diff --git graphics/zphoto/files/patch-configure graphics/zphoto/files/patch-configure
>index 81857a226640..524cfdecb74e 100644
>--- graphics/zphoto/files/patch-configure
>+++ graphics/zphoto/files/patch-configure
>@@ -1,6 +1,31 @@
>---- configure.orig	Wed May  5 16:27:51 2004
>-+++ configure	Wed May  5 16:44:18 2004
>-@@ -4131,7 +4131,7 @@
>+--- configure.orig	2004-07-20 16:49:27 UTC
>++++ configure
>+@@ -4277,7 +4277,7 @@ cat confdefs.h >>conftest.$ac_ext
>+ cat >>conftest.$ac_ext <<_ACEOF
>+ /* end confdefs.h.  */
>+ $ac_includes_default
>+-#include <ming.h>
>++#include <ming/ming.h>
>+ _ACEOF
>+ rm -f conftest.$ac_objext
>+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+@@ -4321,7 +4321,7 @@ _ACEOF
>+ cat confdefs.h >>conftest.$ac_ext
>+ cat >>conftest.$ac_ext <<_ACEOF
>+ /* end confdefs.h.  */
>+-#include <ming.h>
>++#include <ming/ming.h>
>+ _ACEOF
>+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
>+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
>+@@ -4488,13 +4488,13 @@ fi
>+ echo "$as_me:$LINENO: checking whether ming 0.2a (old API) is used" >&5
>+ echo $ECHO_N "checking whether ming 0.2a (old API) is used... $ECHO_C" >&6
>+ cat > tmp.c <<'EOF'
>+-#include <ming.h>
>++#include <ming/ming.h>
>+ int main () {
>+     SWFMovie movie;
>      SWFMovie_save(movie, "foo"); /* 0.2a API */
>  }
>  EOF
>diff --git graphics/zphoto/files/patch-exif.c graphics/zphoto/files/patch-exif.c
>index 6963c63ed522..db12e2a5eaa8 100644
>--- graphics/zphoto/files/patch-exif.c
>+++ graphics/zphoto/files/patch-exif.c
>@@ -1,6 +1,6 @@
>---- exif.c.orig	2004-06-07 18:58:04.000000000 +0900
>-+++ exif.c	2010-12-03 21:25:38.562390923 +0900
>-@@ -33,11 +33,11 @@
>+--- exif.c.orig	2004-06-07 09:58:04 UTC
>++++ exif.c
>+@@ -33,11 +33,11 @@ enum {
>      HEADER_OFFSET2 = 8
>  };
>  
>@@ -17,7 +17,7 @@
>  
>  #define SWAP_ENDIAN_SHORT(val) ((unsigned short) ( \
>      (((unsigned short) (val) & (unsigned short) 0x00ff) << 8) | \
>-@@ -46,14 +46,14 @@
>+@@ -46,14 +46,14 @@ enum {
>  static int 
>  is_little_endian ()
>  {
>@@ -35,7 +35,7 @@
>  	if (memcmp(p, x, 4) == 0) {
>  	    retval = 1;
>  	} else {
>-@@ -63,8 +63,8 @@
>+@@ -63,8 +63,8 @@ is_little_endian ()
>      return retval;
>  }
>  
>@@ -46,7 +46,7 @@
>  {
>      if (is_little_endian()) {
>  	return x;
>-@@ -83,8 +83,8 @@
>+@@ -83,8 +83,8 @@ ushort_from_be (unsigned short x)
>      }
>  }
>  
>@@ -57,7 +57,7 @@
>  {
>      if (is_little_endian()) {
>  	return SWAP_ENDIAN_LONG(x);
>-@@ -115,7 +115,7 @@
>+@@ -115,7 +115,7 @@ efread (void *ptr, size_t size, size_t nmemb, FILE *st
>  
>  
>  static int
>@@ -66,7 +66,7 @@
>  {
>      int x = fseek(stream, offset, whence);
>      if (x != 0)
>-@@ -142,16 +142,16 @@
>+@@ -142,16 +142,16 @@ zphoto_exif_file_p (const char *file_name)
>  typedef void	(*TraverseFunc)	 (FILE *fp,
>                                    unsigned short tag, 
>                                    unsigned short type, 
>@@ -87,7 +87,7 @@
>                      void *data)
>  {
>      if (tag == 0x8769) {
>-@@ -163,12 +163,12 @@
>+@@ -163,12 +163,12 @@ static void
>  get_time (FILE *fp, 
>            unsigned short tag,
>            unsigned short type,
>@@ -103,7 +103,7 @@
>          char buf[BUFSIZ];
>          struct tm t;
>  
>-@@ -204,16 +204,16 @@
>+@@ -204,16 +204,16 @@ read_ushort (FILE *fp, int le_exif_p)
>          return ushort_from_be(x);
>  }
>  
>@@ -126,7 +126,7 @@
>  }
>  
>  static int
>-@@ -225,12 +225,12 @@
>+@@ -225,12 +225,12 @@ read_directory (FILE *fp, TraverseFunc func, void *dat
>      n = read_ushort(fp, le_exif_p);
>      for (i = 0; i < n; i++) {
>          unsigned short tag, type;
>diff --git graphics/zphoto/files/patch-image.cpp graphics/zphoto/files/patch-image.cpp
>index 68e00e71744d..75a015dffad0 100644
>--- graphics/zphoto/files/patch-image.cpp
>+++ graphics/zphoto/files/patch-image.cpp
>@@ -1,6 +1,6 @@
> --- image.cpp.orig	2004-07-20 16:48:11 UTC
> +++ image.cpp
>-@@ -554,8 +554,8 @@ restore_mtime (const char *file_name, ti
>+@@ -554,8 +554,8 @@ restore_mtime (const char *file_name, time_t mtime)
>  static int
>  convert_needed_p (const char *src, const char *dest)
>  {
>diff --git graphics/zphoto/files/patch-util.c graphics/zphoto/files/patch-util.c
>index 9a3ea02f4a9d..855a1141edab 100644
>--- graphics/zphoto/files/patch-util.c
>+++ graphics/zphoto/files/patch-util.c
>@@ -1,6 +1,6 @@
>---- util.c.orig	2010-12-04 00:36:16.000000000 +0900
>-+++ util.c	2010-12-04 00:36:52.000000000 +0900
>-@@ -389,7 +389,7 @@
>+--- util.c.orig	2004-07-20 16:48:11 UTC
>++++ util.c
>+@@ -389,7 +389,7 @@ char **
>  zphoto_get_image_suffixes (void)
>  {
>      static char *empty[] = { NULL };
>diff --git irc/insub/Makefile irc/insub/Makefile
>index 7b4b1f203c52..a56eb614d2f3 100644
>--- irc/insub/Makefile
>+++ irc/insub/Makefile
>@@ -30,7 +30,7 @@ OPTIONS_SUB=	yes
> COWS_DESC=	Install a collection of cowsay(1) cows
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' \
>+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
> 		${WRKSRC}/${PORTNAME}.py ${WRKSRC}/irssi/${PORTNAME}.pl
> 
> do-install:
>diff --git irc/unreal/Makefile irc/unreal/Makefile
>index 2913308f1a31..c738bcd7db6e 100644
>--- irc/unreal/Makefile
>+++ irc/unreal/Makefile
>@@ -98,21 +98,9 @@ post-extract:
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
>-		-e "s,%%RUNDIR%%,${RUNDIR}," \
>-		-e "s,%%USERS%%,${USERS}," \
>-		-e "s,%%GROUPS%%,${GROUPS}," \
>-		-e "s,%%LOGDIR%%,${LOGDIR}," ${WRKSRC}/include/config.h
>-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
>-		-e "s,%%LOGDIR%%,${LOGDIR}," ${WRKSRC}/doc/example.conf
>-	@${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/ircd.c
>-	@${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/modules.c
>-	@${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/s_conf.c
>-	@${REINPLACE_CMD} -e "s,%%RUNDIR%%,${RUNDIR}," ${WRKSRC}/src/url.c
> .if defined(WITH_SQLMOD)
> 	@${PATCH} -d ${WRKSRC} < ${WRKSRC}/SQLMod/patch
> .endif
>-	@${REINPLACE_CMD} -e "/Your system does not support IPv6/ s|as_fn_error|echo|" ${WRKSRC}/configure
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/ircd ${STAGEDIR}${PREFIX}/libexec/ircd
>diff --git japanese/edict/Makefile japanese/edict/Makefile
>index e09a4ad3b3cf..ecc9b6130404 100644
>--- japanese/edict/Makefile
>+++ japanese/edict/Makefile
>@@ -5,8 +5,7 @@ PORTNAME=	edict
> PORTVERSION=	19990714
> PORTREVISION=	5
> CATEGORIES=	japanese
>-MASTER_SITES=	\
>-		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
>+MASTER_SITES=	http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
> 		http://www.bcit-broadcast.com/monash/ \
> 		ftp://ftp.mirrorservice.org/sites/ftp.cc.monash.edu.au/pub/nihongo/ \
> 		ftp://ftp.edrdg.org/pub/Nihongo/ \
>@@ -14,30 +13,29 @@ MASTER_SITES=	\
> 		ftp://ftp.funet.fi/pub/culture/japan/mirrors/monash/pub/nihongo/ \
> 		ftp://ftp.uni-duisburg.de/Mirrors/ftp.monash.edu.au/pub/nihongo/ \
> 		ftp://ftp.monash.edu.au/pub/nihongo/
>-EXTRACT_SUFX=	# empty
>-DISTFILES=	${DICTFILES} ${SRCFILES} ${DOCFILES}
>+DISTFILES=	${DICTFILES} \
>+		${SRCFILES} \
>+		${DOCFILES}
>+DIST_SUBDIR=	edict
> EXTRACT_ONLY=	${SRCFILES}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Japanese-English dictionaries with access and maintenance utilities
> 
>-DIST_SUBDIR=	edict
>+LICENSE=	GPLv1
>+LICENSE_FILE=	${WRKSRC}/gnu_license
> 
>-DICTFILES=	edict.gz edicth enamdict.gz compdic.gz \
>-		j_places.gz ediclsd3.zip \
>-		kanjidic.gz kanjd212.gz lawgledt.zip \
>-		lingdic.zip geodic.gz pandpdic.zip \
>-		aviation.zip findic.zip mktdic.zip \
>-		4jword3_edict.zip concrete.zip
>+DICTFILES=	4jword3_edict.zip aviation.zip compdic.gz concrete.zip \
>+		ediclsd3.zip edict.gz edicth enamdict.gz findic.zip geodic.gz \
>+		j_places.gz kanjd212.gz kanjidic.gz lawgledt.zip lingdic.zip \
>+		mktdic.zip pandpdic.zip
> 
> SRCFILES=	xjdic23.tgz
> 
>-DOCFILES=	edict_doc.html edicth.doc \
>-		enamdict_doc.txt enamdict_doc.html \
>-		j_places.inf kanjidic.doc kanjd212.doc ediclsd3.rme \
>-		lawgldoc.new lingdic.txt geodic.doc aviation.txt \
>-		findic.doc mktdic.doc 4jword3_inf.txt \
>-		concrete.doc
>+DOCFILES=	4jword3_inf.txt aviation.txt concrete.doc ediclsd3.rme \
>+		edict_doc.html edicth.doc enamdict_doc.html enamdict_doc.txt \
>+		findic.doc geodic.doc j_places.inf kanjd212.doc kanjidic.doc \
>+		lawgldoc.new lingdic.txt mktdic.doc
> 
> BINFILES=	exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen
> 
>@@ -52,10 +50,6 @@ CFLAGS+=	-fcommon
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${GREP} -l '^main' ${WRKSRC}/*.c | ${XARGS} ${REINPLACE_CMD} \
>-		-e '/argv/s/unsigned//'
>-
> do-install:
> 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BINFILES} ${STAGEDIR}${PREFIX}/bin)
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>@@ -77,24 +71,18 @@ do-install:
> 	${LN} -s ${PREFIX}/bin/xjdic_sa ${STAGEDIR}${PREFIX}/bin/xjdic
> 	(cd ${WRKSRC} && ${INSTALL_DATA} radicals.tm radkfile kanjstroke \
> 		romkana.cnv vconj ${STAGEDIR}${DATADIR})
>-	#
>-	# Only 9 dictionaries can be enabled
>-	#
>+#
>+# Only 9 dictionaries can be enabled
>+#
> 	@${ECHO_CMD} dicdir ${DATADIR} > ${STAGEDIR}${DATADIR}/.xjdicrc
> 	@${ECHO_CMD} dicfile edict >> ${STAGEDIR}${DATADIR}/.xjdicrc
> 	@${ECHO_CMD} dicfile enamdict >> ${STAGEDIR}${DATADIR}/.xjdicrc
> 	@${ECHO_CMD} dicfile compdic >> ${STAGEDIR}${DATADIR}/.xjdicrc
> 	@${ECHO_CMD} dicfile ediclsd3 >> ${STAGEDIR}${DATADIR}/.xjdicrc
> 	@${ECHO_CMD} dicfile j_places >> ${STAGEDIR}${DATADIR}/.xjdicrc
>-	# @${ECHO_CMD} dicfile lawgledt >> ${DATADIR}/.xjdicrc
> 	@${ECHO_CMD} dicfile geodic >> ${STAGEDIR}${DATADIR}/.xjdicrc
>-	# @${ECHO_CMD} dicfile pandpdic >> ${DATADIR}/.xjdicrc
> 	@${ECHO_CMD} dicfile aviation >> ${STAGEDIR}${DATADIR}/.xjdicrc
>-	# @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc
>-	# @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc
> 	@${ECHO_CMD} dicfile 4jword3_edict.euc >> ${STAGEDIR}${DATADIR}/.xjdicrc
>-	# @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc
>-	# @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc
> 	@${CHMOD} ${SHAREMODE} ${STAGEDIR}${DATADIR}/.xjdicrc
> 	${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${STAGEDIR}${PREFIX}/man/man1
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>diff --git japanese/edict/files/patch-exjdxgen.c japanese/edict/files/patch-exjdxgen.c
>index ffe35391d920..4341923fd47f 100644
>--- japanese/edict/files/patch-exjdxgen.c
>+++ japanese/edict/files/patch-exjdxgen.c
>@@ -9,6 +9,15 @@
>  #include <ctype.h>
>  #include <string.h>
>  #include "xjdic.h"
>+@@ -68,7 +68,7 @@ int stringcomp(unsigned char *s1, unsigned char *s2)
>+ /*====function to Load Dictionary and load/create index table=======*/
>+ main(argc,argv)
>+ int argc;
>+-unsigned char **argv;
>++ char **argv;
>+ {
>+   FILE *fp,*fopen();
>+   unsigned long schi,diclen,indlen;
> @@ -229,6 +229,7 @@ unsigned char **argv;
>    jindex[0] = diclen+jiver;
>    fwrite(jindex,sizeof(long),indptr+2,fp);
>diff --git japanese/edict/files/patch-xjdfrontend.c japanese/edict/files/patch-xjdfrontend.c
>index 7b1807b06b36..c85190316888 100644
>--- japanese/edict/files/patch-xjdfrontend.c
>+++ japanese/edict/files/patch-xjdfrontend.c
>@@ -1,6 +1,6 @@
>---- xjdfrontend.c	1998-09-16 02:28:03.000000000 +0200
>-+++ xjdfrontend.c	2007-12-28 19:54:07.000000000 +0100
>-@@ -55,6 +55,8 @@
>+--- xjdfrontend.c.orig	1998-09-16 00:28:03 UTC
>++++ xjdfrontend.c
>+@@ -55,6 +55,8 @@ IOCTL_RAW
>  
>  #ifdef __STRICT_BSD__
>  static struct sgttyb    orig,new;
>@@ -9,7 +9,7 @@
>  #else
>  static struct termio    orig,new;
>  #endif
>-@@ -240,6 +242,11 @@
>+@@ -240,6 +242,11 @@ void    ioctlraw()
>      ioctl(0, TIOCGETP, &orig); ioctl(0, TIOCGETP, &new);
>      new.sg_flags |= CBREAK; new.sg_flags &= ~ECHO;
>      ioctl(0, TIOCSETP, &new);
>@@ -21,7 +21,7 @@
>  #else
>      ioctl(0, TCGETA, &orig); ioctl(0, TCGETA, &new);
>      new.c_lflag &= ~ICANON; new.c_lflag &= ~ISIG; new.c_lflag &= ~ECHO;
>-@@ -255,6 +262,8 @@
>+@@ -255,6 +262,8 @@ void    ioctlorig()
>  {
>  #ifdef __STRICT_BSD__
>     ioctl(0, TIOCSETP, &orig);
>@@ -30,3 +30,12 @@
>  #else
>     ioctl(0, TCSETA, &orig);
>  #endif
>+@@ -2519,7 +2528,7 @@ void FiltSet()
>+ 
>+ main(argc,argv)
>+ int argc;
>+-unsigned char **argv;
>++ char **argv;
>+ 
>+ {
>+ 	int i,j,ip,cmdmode,bit8,escf;
>diff --git japanese/edict/files/patch-xjdic.h japanese/edict/files/patch-xjdic.h
>index 2dc40879b18d..52389cc6ab7a 100644
>--- japanese/edict/files/patch-xjdic.h
>+++ japanese/edict/files/patch-xjdic.h
>@@ -1,5 +1,5 @@
>---- xjdic.h.orig	Thu Sep  3 02:05:28 1998
>-+++ xjdic.h	Wed Oct  7 11:55:52 1998
>+--- xjdic.h.orig	1998-09-03 09:05:28 UTC
>++++ xjdic.h
> @@ -3,7 +3,7 @@
>  #define NRKANA 250*2   /*  size of the romaji to kana tables*/
>  #define NOFILT 10      /* maximum number of general filters */
>diff --git japanese/edict/files/patch-xjdxgen.c japanese/edict/files/patch-xjdxgen.c
>index a42cd8f225f7..9af6a3400886 100644
>--- japanese/edict/files/patch-xjdxgen.c
>+++ japanese/edict/files/patch-xjdxgen.c
>@@ -9,6 +9,15 @@
>  #include <ctype.h>
>  #include <string.h>
>  #include "xjdic.h"
>+@@ -76,7 +76,7 @@ int stringcomp(unsigned char *s1, unsigned char *s2)
>+ /*====function to Load Dictionary and load/create index table=======*/
>+ main(argc,argv)
>+ int argc;
>+-unsigned char **argv;
>++ char **argv;
>+ {
>+   FILE *fp,*fopen();
>+   unsigned long possav,schi,diclen,indlen;
> @@ -154,7 +154,7 @@ unsigned char **argv;
>    db[diclen] = 10;
>    db[0] = 10;
>diff --git lang/gcc9/Makefile lang/gcc9/Makefile
>index 86e1dac58aa5..094cc5363667 100644
>--- lang/gcc9/Makefile
>+++ lang/gcc9/Makefile
>@@ -41,8 +41,11 @@ CXXFLAGS:=	${CXXFLAGS:N-mretpoline}
> 
> OPTIONS_DEFINE=		BOOTSTRAP GRAPHITE PLUGINS
> OPTIONS_DEFAULT=	BOOTSTRAP PLUGINS
>+OPTIONS_DEFINE_amd64=	SANITIZER
>+OPTIONS_DEFAULT_amd64=	SANITIZER
> BOOTSTRAP_DESC=		Build using a full bootstrap
> GRAPHITE_DESC=		Support for Graphite loop optimizations
>+SANITIZER_DESC=		Build and install libsanitizer
> 
> .if exists(/usr/lib32/libc.so)
> OPTIONS_DEFINE_amd64+=		MULTILIB
>@@ -59,6 +62,10 @@ PLUGINS_CONFIGURE_ENABLE=	plugin
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${PORT_OPTIONS:MSANITIZER}
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-libsanitizer_configure.tgt
>+.endif
>+
> .if ${ARCH} == amd64
> CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
> 
>diff --git lang/gjs/Makefile lang/gjs/Makefile
>index dad84133a964..238979d85304 100644
>--- lang/gjs/Makefile
>+++ lang/gjs/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gjs
>-PORTVERSION=	1.52.4
>-PORTREVISION=	4
>+PORTVERSION=	1.66.0
> CATEGORIES=	lang gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome3
>@@ -16,17 +15,18 @@ LICENSE_COMB=	multi
> LICENSE_FILE_MPL11=	${WRKSRC}/COPYING
> LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LGPL
> 
>-LIB_DEPENDS=	libmozjs-52.so:lang/spidermonkey52 \
>+LIB_DEPENDS=	libmozjs-78.so:lang/spidermonkey78 \
> 		libffi.so:devel/libffi
> 
>-USES=		compiler:c++11-lib gettext gmake gnome libtool \
>-		localbase pathfix pkgconfig python:build readline tar:xz xorg
>-USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection
>+USES=		compiler:c++17-lang gettext gmake gnome libtool \
>+		localbase pathfix pkgconfig python:build readline tar:xz xorg meson
>+USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection glib20
> USE_XORG=	x11 xext
>-GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
>-CONFIGURE_ARGS+=--disable-profiler
> USE_LDCONFIG=	yes
>-INSTALL_TARGET=	install-strip
>+
>+MESON_ARGS=	-Dinstalled_tests=false
>+
>+CONFIGURE_ENV=	PYTHONDONTWRITEBYTECODE=1
>+MAKE_ENV=	PYTHONDONTWRITEBYTECODE=1
> 
> .include <bsd.port.mk>
>diff --git lang/gjs/distinfo lang/gjs/distinfo
>index 17310c303cf3..285df6d8fd2f 100644
>--- lang/gjs/distinfo
>+++ lang/gjs/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1539116944
>-SHA256 (gnome3/gjs-1.52.4.tar.xz) = 9c160cf9383ca20fcba3b75154c9d19efae9decf63bec6164a81403092d3b4f7
>-SIZE (gnome3/gjs-1.52.4.tar.xz) = 626960
>+TIMESTAMP = 1600144389
>+SHA256 (gnome3/gjs-1.66.0.tar.xz) = f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8
>+SIZE (gnome3/gjs-1.66.0.tar.xz) = 439596
>diff --git lang/gjs/pkg-plist lang/gjs/pkg-plist
>index ef652bf14beb..ce86a1269dd1 100644
>--- lang/gjs/pkg-plist
>+++ lang/gjs/pkg-plist
>@@ -2,10 +2,11 @@ bin/gjs
> bin/gjs-console
> include/gjs-1.0/gjs/context.h
> include/gjs-1.0/gjs/coverage.h
>+include/gjs-1.0/gjs/error-types.h
> include/gjs-1.0/gjs/gjs.h
> include/gjs-1.0/gjs/macros.h
>+include/gjs-1.0/gjs/mem.h
> include/gjs-1.0/gjs/profiler.h
>-include/gjs-1.0/util/error.h
> lib/gjs/girepository-1.0/GjsPrivate-1.0.typelib
> lib/libgjs.so
> lib/libgjs.so.0
>diff --git lang/lua52/Makefile lang/lua52/Makefile
>index 7fc3c2b0d589..e9d9276864e7 100644
>--- lang/lua52/Makefile
>+++ lang/lua52/Makefile
>@@ -57,7 +57,7 @@ post-patch:
> 	@${REINPLACE_CMD} -e "/LUA_ROOT/s|/usr/local|${LUA_PREFIX}| ; \
> 		s,readline/,editline/,g ; \
> 		/history\.h/d" \
>-		${WRKSRC}/src/luaconf.h ${WRKSRC}/src/lua.c
>+		${WRKSRC}/src/lua.c
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblua-${LUA_VER}.so
>diff --git lang/perl5.30/Makefile lang/perl5.30/Makefile
>index cb064ebadc30..4e3544eaae4b 100644
>--- lang/perl5.30/Makefile
>+++ lang/perl5.30/Makefile
>@@ -234,13 +234,18 @@ post-clean:
> .endif
> 
> post-patch:
>+.if ${LOCALBASE} != "/usr/local"
> 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
> 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
>+.endif
> .if !defined(IAMDEFAULTPERL)
> 	${REINPLACE_CMD} -e '/do_installprivlib = 0 if .versiononly/d; \
> 		/^if.*nopods.*versiononly || /s/.*/if (1) {/' \
> 		${WRKSRC}/installperl
> .endif
>+.if ${ARCH} == "riscv64"
>+	${REINPLACE_CMD} -e 's/-DHAS_FPSETMASK //' ${WRKSRC}/hints/freebsd.sh
>+.endif
> 
> post-install:
> 	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
>diff --git lang/python27/Makefile lang/python27/Makefile
>index 0e9eb190c4a6..145520d18390 100644
>--- lang/python27/Makefile
>+++ lang/python27/Makefile
>@@ -16,6 +16,7 @@ LICENSE=	PSFL
> 
> DEPRECATED=	EOLed upstream
> EXPIRATION_DATE=	2020-12-31
>+BROKEN=		Deprecated
> 
> USES=		cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz
> PATHFIX_MAKEFILEIN=	Makefile.pre.in
>@@ -115,9 +116,6 @@ PLIST_SUB+=	NO_NIS=""
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \
> 		${WRKSRC}/Lib/cgi.py
>-	@${REINPLACE_CMD} -e \
>-		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
>-		${PATCH_WRKSRC}/Lib/pydoc.py
> 
> .if !exists(/usr/bin/ypcat) || defined(WITHOUT_NIS)
> 	@${REINPLACE_CMD} -e 's/disabled_module_list =[^]]*/&, "nis"/' \
>diff --git lang/python27/files/patch-Doc__library__fcntl.rst lang/python27/files/patch-Doc__library__fcntl.rst
>index 7aa39700fd5f..f8aae6d773b1 100644
>--- lang/python27/files/patch-Doc__library__fcntl.rst
>+++ lang/python27/files/patch-Doc__library__fcntl.rst
>@@ -1,6 +1,6 @@
>---- ./Doc/library/fcntl.rst.orig	2014-07-03 21:53:41.473098625 +1000
>-+++ ./Doc/library/fcntl.rst	2014-07-03 21:54:04.342833056 +1000
>-@@ -50,7 +50,6 @@ The module defines the following functio
>+--- Doc/library/fcntl.rst.orig	2019-10-19 18:38:44 UTC
>++++ Doc/library/fcntl.rst
>+@@ -52,7 +52,6 @@ The module defines the following functions:
>     operations are typically defined in the library module :mod:`termios` and the
>     argument handling is even more complicated.
>  
>diff --git lang/python27/files/patch-Lib_distutils_command_build__scripts.py lang/python27/files/patch-Lib_distutils_command_build__scripts.py
>index 78b3dd6e2791..0240d7df6d0c 100644
>--- lang/python27/files/patch-Lib_distutils_command_build__scripts.py
>+++ lang/python27/files/patch-Lib_distutils_command_build__scripts.py
>@@ -3,8 +3,8 @@
> # installation.
> # Submitted by: mva
> 
>---- Lib/distutils/command/build_scripts.py.orig	2014-07-26 09:52:20.000000000 UTC
>-+++ Lib/distutils/command/build_scripts.py	2014-07-26 09:52:56.000000000 UTC
>+--- Lib/distutils/command/build_scripts.py.orig	2019-10-19 18:38:44 UTC
>++++ Lib/distutils/command/build_scripts.py
> @@ -126,6 +126,9 @@ class build_scripts (Command):
>                                   file, oldmode, newmode)
>                          os.chmod(file, newmode)
>diff --git lang/python27/files/patch-Lib_distutils_command_install__lib.py lang/python27/files/patch-Lib_distutils_command_install__lib.py
>index f7dfb21c8336..f0e3bd323799 100644
>--- lang/python27/files/patch-Lib_distutils_command_install__lib.py
>+++ lang/python27/files/patch-Lib_distutils_command_install__lib.py
>@@ -6,12 +6,7 @@ Subject: [PATCH] Check bytecode file actually exists and tests
> Should solve issue 20397, where using the --record argument results
> in files that failed to generate bytecode files are added to the
> record file nonetheless.
>----
>- Lib/distutils/command/install_lib.py    | 17 +++++++++++++----
>- Lib/distutils/tests/test_install_lib.py |  8 ++++++--
>- 2 files changed, 19 insertions(+), 6 deletions(-)
>-
>---- Lib/distutils/command/install_lib.py.orig	2015-12-05 19:46:56 UTC
>+--- Lib/distutils/command/install_lib.py.orig	2019-10-19 18:38:44 UTC
> +++ Lib/distutils/command/install_lib.py
> @@ -168,10 +168,14 @@ class install_lib(Command):
>              ext = os.path.splitext(os.path.normcase(py_file))[1]
>diff --git lang/python27/files/patch-Lib_distutils_tests_test__install__lib.py lang/python27/files/patch-Lib_distutils_tests_test__install__lib.py
>index 9313cf2e211e..b16f4e9a0c5e 100644
>--- lang/python27/files/patch-Lib_distutils_tests_test__install__lib.py
>+++ lang/python27/files/patch-Lib_distutils_tests_test__install__lib.py
>@@ -6,14 +6,9 @@ Subject: [PATCH] Check bytecode file actually exists and tests
> Should solve issue 20397, where using the --record argument results
> in files that failed to generate bytecode files are added to the
> record file nonetheless.
>----
>- Lib/distutils/command/install_lib.py    | 17 +++++++++++++----
>- Lib/distutils/tests/test_install_lib.py |  8 ++++++--
>- 2 files changed, 19 insertions(+), 6 deletions(-)
>-
>---- Lib/distutils/tests/test_install_lib.py.orig	2015-12-05 19:46:57 UTC
>+--- Lib/distutils/tests/test_install_lib.py.orig	2019-10-19 18:38:44 UTC
> +++ Lib/distutils/tests/test_install_lib.py
>-@@ -64,8 +64,12 @@ class InstallLibTestCase(support.Tempdir
>+@@ -64,8 +64,12 @@ class InstallLibTestCase(support.TempdirManager,
>          cmd.distribution.packages = [pkg_dir]
>          cmd.distribution.script_name = 'setup.py'
>  
>diff --git lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
>index 43195847ebe8..8ccd9827d4b2 100644
>--- lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
>+++ lang/python27/files/patch-Modules___ctypes__libffi__src__arm__ffi.c
>@@ -3,8 +3,8 @@
> # PR: ports/149167 ports/184517
> # Patch by: cognet@ (to be upstreamed @ LLVM)
> 
>---- ./Modules/_ctypes/libffi/src/arm/ffi.c.orig	2013-11-10 18:36:41.000000000 +1100	
>-+++ ./Modules/_ctypes/libffi/src/arm/ffi.c	2013-12-03 18:05:51.461078888 +1100
>+--- Modules/_ctypes/libffi/src/arm/ffi.c.orig	2019-10-19 18:38:44 UTC
>++++ Modules/_ctypes/libffi/src/arm/ffi.c
> @@ -33,6 +33,11 @@
>  
>  #include <stdlib.h>
>@@ -17,10 +17,11 @@
>  /* Forward declares. */
>  static int vfp_type_p (ffi_type *);
>  static void layout_vfp_args (ffi_cif *);
>-@@ -751,6 +756,16 @@ ffi_closure_free (void *ptr)
>+@@ -750,6 +755,16 @@ ffi_closure_free (void *ptr)
>+ }
>  
>  #else
>- 
>++
> +#if defined(__FreeBSD__) && defined(__arm__)
> +#define __clear_cache(start, end) do { \
> +		struct arm_sync_icache_args ua; 		\
>@@ -30,7 +31,6 @@
> +		sysarch(ARM_SYNC_ICACHE, &ua);			\
> +	} while (0);
> +#endif
>-+
>+ 
>  #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX)				\
>  ({ unsigned char *__tramp = (unsigned char*)(TRAMP);			\
>-    unsigned int  __fun = (unsigned int)(FUN);				\
>diff --git lang/python27/files/patch-Modules__fcntlmodule.c lang/python27/files/patch-Modules__fcntlmodule.c
>index 8bda9f62a224..913f71f433a8 100644
>--- lang/python27/files/patch-Modules__fcntlmodule.c
>+++ lang/python27/files/patch-Modules__fcntlmodule.c
>@@ -1,6 +1,6 @@
>---- ./Modules/fcntlmodule.c.orig	2014-07-03 21:57:10.429953240 +1000
>-+++ ./Modules/fcntlmodule.c	2014-07-03 21:59:36.517210444 +1000
>-@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *ar
>+--- Modules/fcntlmodule.c.orig	2019-10-19 18:38:44 UTC
>++++ Modules/fcntlmodule.c
>+@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *args)
>  {
>  #define IOCTL_BUFSZ 1024
>      int fd;
>@@ -24,7 +24,7 @@
>      int arg;
>      int ret;
>      char *str;
>-@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
>+@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
>      int mutate_arg = 1;
>      char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
>  
>@@ -33,7 +33,7 @@
>                           conv_descriptor, &fd, &code,
>                           &str, &len, &mutate_arg)) {
>          char *arg;
>-@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
>+@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
>      }
>  
>      PyErr_Clear();
>@@ -42,7 +42,7 @@
>                           conv_descriptor, &fd, &code, &str, &len)) {
>          if (len > IOCTL_BUFSZ) {
>              PyErr_SetString(PyExc_ValueError,
>-@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar
>+@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
>      PyErr_Clear();
>      arg = 0;
>      if (!PyArg_ParseTuple(args,
>diff --git lang/python27/files/patch-pr192365 lang/python27/files/patch-pr192365
>index 5f4fbcdc43e9..5636f37db6bc 100644
>--- lang/python27/files/patch-pr192365
>+++ lang/python27/files/patch-pr192365
>@@ -2,9 +2,9 @@
> # in include/python2.7/pyconfig.h
> # Submitted by: antoine
> 
>---- configure.orig	2014-09-06 14:42:50 UTC
>+--- configure.orig	2019-10-19 18:38:44 UTC
> +++ configure
>-@@ -2919,13 +2919,6 @@
>+@@ -3007,13 +3007,6 @@ $as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
>  
>  
>  # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
>@@ -18,7 +18,7 @@
>  # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
>  
>  $as_echo "#define _BSD_TYPES 1" >>confdefs.h
>-@@ -3293,9 +3286,8 @@
>+@@ -3394,9 +3387,8 @@ $as_echo "#define _BSD_SOURCE 1" >>confdefs.h
>    # but used in struct sockaddr.sa_family. Reported by Tim Rice.
>    SCO_SV/3.2)
>      define_xopen_source=no;;
>@@ -30,9 +30,9 @@
>      define_xopen_source=no;;
>    # On MacOS X 10.2, a bug in ncurses.h means that it craps out if
>    # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
>---- configure.ac.orig	2014-09-06 14:42:50 UTC
>+--- configure.ac.orig	2019-10-19 18:38:44 UTC
> +++ configure.ac
>-@@ -88,11 +88,6 @@
>+@@ -91,11 +91,6 @@ AC_DEFINE(_GNU_SOURCE, 1, [Define on Linux to activate
>  AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features])
>  
>  # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
>@@ -44,7 +44,7 @@
>  # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
>  AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int])
>  
>-@@ -426,9 +421,8 @@
>+@@ -444,9 +439,8 @@ case $ac_sys_system/$ac_sys_release in
>    # but used in struct sockaddr.sa_family. Reported by Tim Rice.
>    SCO_SV/3.2)
>      define_xopen_source=no;;
>diff --git lang/python27/files/patch-setup.py lang/python27/files/patch-setup.py
>index e3223582a88d..dfad23d3c2eb 100644
>--- lang/python27/files/patch-setup.py
>+++ lang/python27/files/patch-setup.py
>@@ -5,9 +5,9 @@
> 
> # Description: ossaudiodev detection fix backport
> 
>---- setup.py.orig	2017-04-22 03:42:03 UTC
>+--- setup.py.orig	2019-10-19 18:38:44 UTC
> +++ setup.py
>-@@ -15,6 +15,7 @@ from distutils.core import Extension, se
>+@@ -15,6 +15,7 @@ from distutils.core import Extension, setup
>  from distutils.command.build_ext import build_ext
>  from distutils.command.install import install
>  from distutils.command.install_lib import install_lib
>@@ -24,7 +24,7 @@
>  
>  def add_dir_to_list(dirlist, dir):
>      """Add the directory 'dir' to the list 'dirlist' (at the front) if
>-@@ -1234,7 +1235,7 @@ class PyBuildExt(build_ext):
>+@@ -1280,7 +1281,7 @@ class PyBuildExt(build_ext):
>                  sysroot = macosx_sdk_root()
>                  f = os.path.join(sysroot, f[1:])
>  
>@@ -33,7 +33,7 @@
>              data = open(f).read()
>              m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
>              if m is not None:
>-@@ -1624,9 +1625,10 @@ class PyBuildExt(build_ext):
>+@@ -1665,9 +1666,10 @@ class PyBuildExt(build_ext):
>          else:
>              missing.append('linuxaudiodev')
>  
>@@ -47,7 +47,7 @@
>              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
>          else:
>              missing.append('ossaudiodev')
>-@@ -2200,6 +2202,22 @@ class PyBuildInstallLib(install_lib):
>+@@ -2290,6 +2292,22 @@ class PyBuildInstallLib(install_lib):
>      def is_chmod_supported(self):
>          return hasattr(os, 'chmod')
>  
>@@ -70,7 +70,7 @@
>  SUMMARY = """
>  Python is an interpreted, interactive, object-oriented programming
>  language. It is often compared to Tcl, Perl, Scheme or Java.
>-@@ -2245,7 +2263,9 @@ def main():
>+@@ -2335,7 +2353,9 @@ def main():
>            platforms = ["Many"],
>  
>            # Build info
>@@ -81,7 +81,7 @@
>                        'install_lib':PyBuildInstallLib},
>            # The struct module is defined here, because build_ext won't be
>            # called unless there's at least one extension module defined.
>-@@ -2253,8 +2273,7 @@ def main():
>+@@ -2343,8 +2363,7 @@ def main():
>  
>            # Scripts to install
>            scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
>diff --git lang/spidermonkey52/Makefile lang/spidermonkey52/Makefile
>index 78cba7acdcc9..14149047bb0b 100644
>--- lang/spidermonkey52/Makefile
>+++ lang/spidermonkey52/Makefile
>@@ -17,6 +17,7 @@ LIB_DEPENDS=	libnspr4.so:devel/nspr \
> 		libffi.so:devel/libffi \
> 		libicudata.so:devel/icu
> 
>+BROKEN=		Needs python2
> HAS_CONFIGURE=	yes
> USES=		compiler:c++14-lang gmake localbase pathfix pkgconfig \
> 		python:2.7,build tar:xz
>diff --git lang/spidermonkey60/Makefile lang/spidermonkey60/Makefile
>index e3fd57629b71..c8910eb82eb7 100644
>--- lang/spidermonkey60/Makefile
>+++ lang/spidermonkey60/Makefile
>@@ -14,14 +14,16 @@ COMMENT=	Standalone JavaScript based from Mozilla 60-esr
> LICENSE=	MPL20
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	autoconf-2.13:devel/autoconf213
>+BUILD_DEPENDS=	autoconf-2.13:devel/autoconf213 \
>+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
>+
> LIB_DEPENDS=	libnspr4.so:devel/nspr \
> 		libffi.so:devel/libffi \
> 		libicudata.so:devel/icu
> 
> HAS_CONFIGURE=	yes
> USES=		compiler:c++14-lang gmake localbase pathfix pkgconfig \
>-		python:2.7,build tar:xz
>+		python:build tar:xz
> USE_LDCONFIG=	yes
> SP_VER=		60
> 
>@@ -58,6 +60,9 @@ CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
> USE_GCC=	9+
> .endif
> 
>+post-patch:
>+	${REINPLACE_CMD} 's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' ${WRKSRC}/js/src/configure
>+
> post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
> 	${LN} -fs libmozjs-${SP_VER}.so ${STAGEDIR}${PREFIX}/lib/libmozjs-${SP_VER}.so.1
>diff --git lang/spidermonkey68/Makefile lang/spidermonkey68/Makefile
>index 340a605d7c36..743b74b0ee28 100644
>--- lang/spidermonkey68/Makefile
>+++ lang/spidermonkey68/Makefile
>@@ -24,7 +24,7 @@ LIB_DEPENDS=	libnspr4.so:devel/nspr \
> 		libicudata.so:devel/icu
> 
> USES=		compiler gmake localbase pathfix pkgconfig \
>-		python:2.7,build tar:xz
>+		python:build tar:xz
> USE_LDCONFIG=	yes
> SP_VER=		68
> HAS_CONFIGURE=	yes
>diff --git lang/spidermonkey78/Makefile lang/spidermonkey78/Makefile
>index 7751d1e43615..2334b39583ce 100644
>--- lang/spidermonkey78/Makefile
>+++ lang/spidermonkey78/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	spidermonkey
>-DISTVERSION=	78.2.0
>+DISTVERSION=	78.3.0
> CATEGORIES=	lang
> MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source
> PKGNAMESUFFIX=	${SP_VER}
>diff --git lang/spidermonkey78/distinfo lang/spidermonkey78/distinfo
>index aea8ba218be9..bfe83113b6b9 100644
>--- lang/spidermonkey78/distinfo
>+++ lang/spidermonkey78/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1600105157
>-SHA256 (firefox-78.2.0esr.source.tar.xz) = 965ccfcbb8c0aa97639911997c54be0fcf896fd388b03138952089af675ea918
>-SIZE (firefox-78.2.0esr.source.tar.xz) = 331996944
>+TIMESTAMP = 1600826847
>+SHA256 (firefox-78.3.0esr.source.tar.xz) = 85273e22d6c31ccd000d72af47530cea3dc52f63f06e53701d9c6c82f68f7bf7
>+SIZE (firefox-78.3.0esr.source.tar.xz) = 331073228
>diff --git mail/proxsmtp/Makefile mail/proxsmtp/Makefile
>index 02de6e2d7deb..ad1796866d8c 100644
>--- mail/proxsmtp/Makefile
>+++ mail/proxsmtp/Makefile
>@@ -33,9 +33,6 @@ post-patch:
> 		-e 's|250 smtp.passthru|${PROXSMTP_HELO_RSP}|g' \
> 		-e 's|250-smtp.passthru|${PROXSMTP_SMTP_EHLO_RSP}|g' \
> 		${WRKSRC}/common/smtppass.c
>-	@${REINPLACE_CMD} -e \
>-		'/^acx_pthread_flags/s|=.*|="-lpthread"|' \
>-		${WRKSRC}/configure
> 
> post-install:
> 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} proxsmtpd.conf \
>diff --git math/cantor/Makefile math/cantor/Makefile
>index a12c4459c0d7..6bc6c660f61e 100644
>--- math/cantor/Makefile
>+++ math/cantor/Makefile
>@@ -17,6 +17,8 @@ LIB_DEPENDS=	libAnalitza.so:math/analitza \
> BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
> 		docbook-xml>0:textproc/docbook-xml
> 
>+MAKE_JOBS_UNSAFE=	yes
>+
> USES=		cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
> 		pkgconfig python:3.4+ qt:5 tar:xz
> USE_KDE=	attica auth archive bookmarks codecs completion config \
>diff --git math/octave-forge-audio/Makefile math/octave-forge-audio/Makefile
>index 44f8ebea375c..2163afed5577 100644
>--- math/octave-forge-audio/Makefile
>+++ math/octave-forge-audio/Makefile
>@@ -15,6 +15,9 @@ LIB_DEPENDS+=	librtmidi.so:audio/rtmidi
> 
> USES=		compiler:c++11-lang pkgconfig
> 
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/../COPYING
>+
> # OCTSRC is the name of the directory of the package.
> # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
> OCTSRC=		${DISTNAME}
>diff --git math/py-mpmath/Makefile math/py-mpmath/Makefile
>index 1e9259b0b45e..6b56517c8ad9 100644
>--- math/py-mpmath/Makefile
>+++ math/py-mpmath/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mpmath
> PORTVERSION=	1.1.0
>+PORTREVISION=	1
> CATEGORIES=	math python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,6 +14,7 @@ COMMENT=	Python Library for Arbitrary-precision Floating-point Arithmetic
> LICENSE=	BSD3CLAUSE
> 
> BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy@${PY_FLAVOR}
> 
> USES=		python
> USE_PYTHON=	distutils autoplist
>diff --git math/reed-solomon/Makefile math/reed-solomon/Makefile
>index f048500d26b3..2da47972d669 100644
>--- math/reed-solomon/Makefile
>+++ math/reed-solomon/Makefile
>@@ -14,7 +14,4 @@ USES=		gmake
> USE_LDCONFIG=	yes
> MAKEFILE=	makefile
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/makefile.in
>-
> .include <bsd.port.mk>
>diff --git misc/help2man/Makefile misc/help2man/Makefile
>index 10386cdf756a..1c4ea826a946 100644
>--- misc/help2man/Makefile
>+++ misc/help2man/Makefile
>@@ -31,7 +31,7 @@ NLS_VARS=		CONFIGURE_FAIL_MESSAGE="Rebuild lang/${PERL_PORT} and devel/p5-Locale
> NLS_VARS_OFF=		NO_ARCH=yes
> 
> .for lang in de es fr pl pt_BR sv ta uk zh_CN
>-NLS_INFO+=		help2man-${lang}
>+NLS_INFO+=	help2man-${lang}
> .endfor
> 
> .for lang in da de el eo es fi fr hr hu it ja nb pl pt_BR ru sr sv ta uk vi zh_CN
>diff --git misc/jojodiff/Makefile misc/jojodiff/Makefile
>index 8e226c996916..e128c5c07aba 100644
>--- misc/jojodiff/Makefile
>+++ misc/jojodiff/Makefile
>@@ -12,24 +12,24 @@ COMMENT=	Diff and patch utilities for binary files
> 
> LICENSE=	GPLv3+
> 
>-USES=		gmake tar:tgz
>-MAKE_ARGS=	CC="${CC}" CPP="${CXX}" CFLAGS="${CFLAGS}"
>+USES=		dos2unix gmake tar:tgz
>+DOS2UNIX_FILES=	JDebug.cpp JDebug.h JDefs.h JDiff.cpp JDiff.h JFile.h \
>+		JFileAhead.cpp JFileAhead.h JFileIStream.cpp JFileIStream.h \
>+		JFileIStreamAhead.cpp JFileIStreamAhead.h JHashPos.cpp \
>+		JHashPos.h JMatchTable.cpp JMatchTable.h JOut.h JOutAsc.cpp \
>+		JOutAsc.h JOutBin.cpp JOutBin.h JOutRgn.cpp JOutRgn.h \
>+		jpatch.cpp Makefile
>+MAKE_ARGS=	CC="${CC}" \
>+		CFLAGS="${CFLAGS}" \
>+		CPP="${CXX}"
> WRKSRC_SUBDIR=	src
> 
>-PLIST_FILES=	bin/jdiff bin/jptch
>-PORTDOCS=	readme.txt readme.htm
>+PLIST_FILES=	bin/jdiff \
>+		bin/jptch
>+PORTDOCS=	readme.htm readme.txt
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${REINPLACE_CMD} -E 's,P(RI|8)(zd|hkey), & ,g' \
>-		${WRKSRC}/JFileAhead.cpp ${WRKSRC}/JFileIStreamAhead.cpp \
>-		${WRKSRC}/JHashPos.cpp ${WRKSRC}/JOutAsc.cpp \
>-		${WRKSRC}/JOutRgn.cpp ${WRKSRC}/jpatch.cpp \
>-		${WRKSRC}/main.cpp
>-	@${REINPLACE_CMD} -e 's,is %d bit,is %zu bit,' \
>-		${WRKSRC}/jpatch.cpp ${WRKSRC}/main.cpp
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/j???? ${STAGEDIR}${PREFIX}/bin
> 
>diff --git multimedia/libkate/Makefile multimedia/libkate/Makefile
>index 23734bd2f527..90fc2008ee33 100644
>--- multimedia/libkate/Makefile
>+++ multimedia/libkate/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libkate
> PORTVERSION=	0.4.1
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	multimedia
> MASTER_SITES=	http://downloads.xiph.org/releases/kate/
> 
>@@ -23,10 +23,9 @@ USE_LDCONFIG=	yes
> CFLAGS+=	"-I${LOCALBASE}/include"
> 
> MANPAGE=	katalyzer.1 kateenc.1 katedec.1
>-OPTIONS_DEFINE=	DOXYGEN HTMLDOCS KATEDJ DOCS
>+OPTIONS_DEFINE=	DOXYGEN HTMLDOCS DOCS
> 
> HTMLDOCS_DESC=	Install bundled html documentation
>-KATEDJ_DESC=	Install KateDJ (Huge dependencies list)
> 
> PORTDOCS=	*
> 
>@@ -38,28 +37,11 @@ BUILD_DEPENDS+=	doxygen:devel/doxygen
> CONFIGURE_ARGS+=	--disable-doc
> .endif
> 
>-.if ${PORT_OPTIONS:MKATEDJ}
>-RUN_DEPENDS=	${LOCALBASE}/bin/oggz:audio/liboggz
>-USES+=		python:2.7 shebangfix
>-SHEBANG_FILES=	tools/KateDJ/KateDJ
>-USE_WX=		3.0+
>-WX_COMPS=	wx python:lib
>-MANPAGE+=	KateDJ.1
>-PLIST_SUB+=	KATEDJ=""
>-.else
>-PLIST_SUB+=	KATEDJ="@comment "
>-.endif
>-
> post-patch:
>-.if ${PORT_OPTIONS:MKATEDJ}
>-	@${REINPLACE_CMD} -e 's|PYTHON=python|PYTHON=${PYTHON_CMD}|' \
>-		${WRKSRC}/misc/autotools/py-compile
>-.else
> 	@${REINPLACE_CMD} -e \
> 		"s|  HAVE_PYTHON_TRUE=$$|  HAVE_PYTHON_TRUE='#'|; \
> 			s|  HAVE_PYTHON_FALSE='#'$$|  HAVE_PYTHON_FALSE=|" \
> 		${WRKSRC}/configure
>-.endif
> 
> 	@${REINPLACE_CMD} -E -e \
> 		"s|^(install-data-am: ).*|\1|" \
>diff --git multimedia/libkate/pkg-plist multimedia/libkate/pkg-plist
>index f00243a0a23d..46ac544f2007 100644
>--- multimedia/libkate/pkg-plist
>+++ multimedia/libkate/pkg-plist
>@@ -1,4 +1,3 @@
>-%%KATEDJ%%bin/KateDJ
> bin/katalyzer
> bin/katedec
> bin/kateenc
>@@ -18,37 +17,3 @@ libdata/pkgconfig/oggkate.pc
> man/man1/katalyzer.1.gz
> man/man1/katedec.1.gz
> man/man1/kateenc.1.gz
>-%%KATEDJ%%man/man1/KateDJ.1.gz
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/__init__.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/__init__.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/__init__.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/constants.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/constants.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/constants.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/demuxer.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/demuxer.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/finder.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/finder.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/finder.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/muxer.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/muxer.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/muxer.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/options.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/options.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/options.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tester.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tester.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tester.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tools.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tools.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/tools.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_editor.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_editor.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_main.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_main.pyo
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_options.py
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyc
>-%%KATEDJ%%%%PYTHON_SITELIBDIR%%/kdj/ui_options.pyo
>diff --git net-im/libtelepathy/Makefile net-im/libtelepathy/Makefile
>index 3afdcb6514fc..beb7a2c53648 100644
>--- net-im/libtelepathy/Makefile
>+++ net-im/libtelepathy/Makefile
>@@ -14,7 +14,7 @@ COMMENT=	Flexible Communications Framework
> LIB_DEPENDS=	libtelepathy-glib.so:net-im/telepathy-glib \
> 		libdbus-glib-1.so:devel/dbus-glib
> 
>-USES=		gmake gnome libtool pathfix pkgconfig python:2.7,build
>+USES=		gmake gnome libtool pathfix pkgconfig python:build
> USE_LDCONFIG=	yes
> USE_GNOME=	glib20 libxslt:build
> GNU_CONFIGURE=	yes
>diff --git net-im/purple-slack/Makefile net-im/purple-slack/Makefile
>index f71ba4184b31..61a23da9d8f4 100644
>--- net-im/purple-slack/Makefile
>+++ net-im/purple-slack/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	purple-slack
>-PORTVERSION=	20180508
>+PORTVERSION=	20200506
> CATEGORIES=	net-im
> 
> MAINTAINER=	aou@eecs.berkeley.edu
>@@ -20,7 +20,7 @@ USE_LDCONFIG=	yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	dylex
> GH_PROJECT=	slack-libpurple
>-GH_TAGNAME=	0179b2c
>+GH_TAGNAME=	03ac750
> 
> PLIST_FILES=	lib/purple-2/libslack.so \
> 		share/pixmaps/pidgin/protocols/16/slack.png \
>diff --git net-im/purple-slack/distinfo net-im/purple-slack/distinfo
>index 3209f5cb7d17..707ac2f26b7d 100644
>--- net-im/purple-slack/distinfo
>+++ net-im/purple-slack/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1526319813
>-SHA256 (dylex-slack-libpurple-20180508-0179b2c_GH0.tar.gz) = 7bcd47a8ac817bb8230764ff7a8048768ebd3a00dab48b322f7ec67204f51697
>-SIZE (dylex-slack-libpurple-20180508-0179b2c_GH0.tar.gz) = 49883
>+TIMESTAMP = 1588779488
>+SHA256 (dylex-slack-libpurple-20200506-03ac750_GH0.tar.gz) = 77feab161b051e907c123ee2e3ddbf03f48ce62fd6e5b5c0a5fd95fd8627fb0a
>+SIZE (dylex-slack-libpurple-20200506-03ac750_GH0.tar.gz) = 54044
>diff --git net-im/telepathy-gabble/Makefile net-im/telepathy-gabble/Makefile
>index ffae36cacc2e..09aae6dca73b 100644
>--- net-im/telepathy-gabble/Makefile
>+++ net-im/telepathy-gabble/Makefile
>@@ -28,7 +28,7 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
> 
> PORTSCOUT=	limitw:1,even
> 
>-USES=		alias gmake gnome libtool pathfix pkgconfig python:2.7,build \
>+USES=		alias gmake gnome libtool pathfix pkgconfig python:build \
> 		shebangfix sqlite ssl
> USE_GNOME=	glib20 gtksourceview3 libxslt:build
> GNU_CONFIGURE=	yes
>diff --git net-im/telepathy-gabble/distinfo net-im/telepathy-gabble/distinfo
>index 153637551791..7a4b05e6e0d4 100644
>--- net-im/telepathy-gabble/distinfo
>+++ net-im/telepathy-gabble/distinfo
>@@ -1,2 +1,3 @@
>+TIMESTAMP = 1600948310
> SHA256 (telepathy-gabble-0.18.3.tar.gz) = 8ec714607e9bcb8d5a3f44adf871e7b07d5db8e326e47536e74e09cba59989c2
> SIZE (telepathy-gabble-0.18.3.tar.gz) = 2793195
>diff --git net-im/telepathy-gabble/files/patch-Makefile.in net-im/telepathy-gabble/files/patch-Makefile.in
>index 6e8234229f1c..1aa6b77fe4b4 100644
>--- net-im/telepathy-gabble/files/patch-Makefile.in
>+++ net-im/telepathy-gabble/files/patch-Makefile.in
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2010-09-18 17:29:38.000000000 +0000
>-+++ Makefile.in	2010-09-18 17:29:53.000000000 +0000
>-@@ -267,7 +267,7 @@
>+--- Makefile.in.orig	2020-09-24 11:51:08 UTC
>++++ Makefile.in
>+@@ -349,7 +349,7 @@ top_build_prefix = @top_build_prefix@
>  top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
>  ACLOCAL_AMFLAGS = -I m4
>diff --git net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
>index c055de832675..68cfed921d70 100644
>--- net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
>+++ net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
>@@ -1,6 +1,6 @@
>---- lib/gibber/gibber-unix-transport.c.orig	2010-06-09 16:09:58.000000000 +0000
>-+++ lib/gibber/gibber-unix-transport.c	2010-09-18 21:24:44.000000000 +0000
>-@@ -375,6 +375,167 @@ gibber_unix_transport_recv_credentials (
>+--- lib/gibber/gibber-unix-transport.c.orig	2013-10-04 15:51:47 UTC
>++++ lib/gibber/gibber-unix-transport.c
>+@@ -374,6 +374,167 @@ gibber_unix_transport_recv_credentials (GibberUnixTran
>    return TRUE;
>  }
>  
>@@ -168,7 +168,7 @@
>  #else /* OSs where we have no implementation */
>  
>  gboolean
>-@@ -393,9 +554,7 @@ gibber_unix_transport_recv_credentials (
>+@@ -392,9 +553,7 @@ gibber_unix_transport_recv_credentials (GibberUnixTran
>  }
>  
>  gboolean
>diff --git net-im/telepathy-glib/Makefile net-im/telepathy-glib/Makefile
>index d3b22e2e83dc..ebc4796d2b0c 100644
>--- net-im/telepathy-glib/Makefile
>+++ net-im/telepathy-glib/Makefile
>@@ -20,7 +20,7 @@ RUN_DEPENDS=	vapigen:lang/vala
> 
> PORTSCOUT=	limitw:1,even
> 
>-USES=		gmake gnome libtool pathfix pkgconfig python:2.7,build
>+USES=		gmake gnome libtool pathfix pkgconfig python:build
> USE_GNOME=	glib20 introspection:build libxslt:build
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>diff --git net-im/telepathy-idle/Makefile net-im/telepathy-idle/Makefile
>index d123a04adf4d..fcdacd6d7349 100644
>--- net-im/telepathy-idle/Makefile
>+++ net-im/telepathy-idle/Makefile
>@@ -14,7 +14,7 @@ COMMENT=	IRC Connection Manager for Telepathy Framework
> LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
> 		libtelepathy-glib.so:net-im/telepathy-glib
> 
>-USES=		gmake gnome libtool pathfix pkgconfig python:2.7,build ssl
>+USES=		gmake gnome libtool pathfix pkgconfig python:build ssl
> USE_GNOME=	glib20 libxslt:build
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>diff --git net-im/telepathy-logger/Makefile net-im/telepathy-logger/Makefile
>index 687fa927723f..48fa12f923d4 100644
>--- net-im/telepathy-logger/Makefile
>+++ net-im/telepathy-logger/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
> 		libtelepathy-glib.so:net-im/telepathy-glib
> 
> USES=		gettext-tools gmake gnome libtool pathfix pkgconfig \
>-		python:2.7,build sqlite tar:bzip2
>+		python:build sqlite tar:bzip2
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> USE_GNOME=	glib20 intltool libxml2 \
>diff --git net-im/telepathy-logger/files/patch-configure net-im/telepathy-logger/files/patch-configure
>index ce4c818f908c..c1cec33e57ad 100644
>--- net-im/telepathy-logger/files/patch-configure
>+++ net-im/telepathy-logger/files/patch-configure
>@@ -1,6 +1,6 @@
>---- configure.orig	2010-08-18 14:48:05.000000000 +0200
>-+++ configure	2010-08-18 14:49:13.000000000 +0200
>-@@ -13281,8 +13281,8 @@
>+--- configure.orig	2015-04-30 11:32:10 UTC
>++++ configure
>+@@ -14348,8 +14348,8 @@ install-data-am: install-gsettings-schemas
>  .SECONDARY: $(gsettings_SCHEMAS)
>  
>  gsettings__base_list = \
>diff --git net-im/telepathy-mission-control/Makefile net-im/telepathy-mission-control/Makefile
>index 18342a758e42..56c297508324 100644
>--- net-im/telepathy-mission-control/Makefile
>+++ net-im/telepathy-mission-control/Makefile
>@@ -3,18 +3,18 @@
> #    $MCom: ports/trunk/net-im/telepathy-mission-control/Makefile 19955 2014-10-15 10:15:00Z gusi $
> 
> PORTNAME=	telepathy-mission-control
>-PORTVERSION=	5.16.3
>-PORTREVISION=	1
>+PORTVERSION=	5.16.6
> CATEGORIES=	net-im devel
> MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-mission-control/
> 
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Telepathy component to apps to abstract details of connection managers
> 
>-LIB_DEPENDS=	libtelepathy.so:net-im/libtelepathy \
>-		libdbus-glib-1.so:devel/dbus-glib
>+LIB_DEPENDS=	libtelepathy-glib.so:net-im/telepathy-glib \
>+		libdbus-glib-1.so:devel/dbus-glib \
>+		libdbus-1.so:devel/dbus
> 
>-USES=		gmake gnome libtool pathfix pkgconfig python:2.7,build
>+USES=		gmake gnome libtool pathfix pkgconfig python:build
> USE_GNOME=	glib20 libxslt
> GNU_CONFIGURE=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
>diff --git net-im/telepathy-mission-control/distinfo net-im/telepathy-mission-control/distinfo
>index bc4b5d60bfd0..21dbd91a44bb 100644
>--- net-im/telepathy-mission-control/distinfo
>+++ net-im/telepathy-mission-control/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (telepathy-mission-control-5.16.3.tar.gz) = 71575d2ff8aa7337aca355e3d921eba5cd2ff050fabc01e51577343093e98b7d
>-SIZE (telepathy-mission-control-5.16.3.tar.gz) = 1096019
>+TIMESTAMP = 1600879605
>+SHA256 (telepathy-mission-control-5.16.6.tar.gz) = 2df8ae3995e919a7670e01aa3568215ef0777e34961ace1cac1c6477cb297a45
>+SIZE (telepathy-mission-control-5.16.6.tar.gz) = 1127785
>diff --git net-im/telepathy-mission-control/pkg-plist net-im/telepathy-mission-control/pkg-plist
>index 0ea328987298..b25971d53fab 100644
>--- net-im/telepathy-mission-control/pkg-plist
>+++ net-im/telepathy-mission-control/pkg-plist
>@@ -20,27 +20,29 @@ libexec/mission-control-5
> man/man1/mc-tool.1.gz
> man/man1/mc-wait-for-name.1.gz
> man/man8/mission-control-5.8.gz
>-share/doc/telepathy-mission-control/mission-control-plugins/McpAccountManager.html
>-share/doc/telepathy-mission-control/mission-control-plugins/McpDispatchOperation.html
>-share/doc/telepathy-mission-control/mission-control-plugins/McpRequest.html
>-share/doc/telepathy-mission-control/mission-control-plugins/annotation-glossary.html
>-share/doc/telepathy-mission-control/mission-control-plugins/api-index-full.html
>-share/doc/telepathy-mission-control/mission-control-plugins/ch01.html
>-share/doc/telepathy-mission-control/mission-control-plugins/ch02.html
>-share/doc/telepathy-mission-control/mission-control-plugins/ch03.html
>-share/doc/telepathy-mission-control/mission-control-plugins/ch04.html
>-share/doc/telepathy-mission-control/mission-control-plugins/home.png
>-share/doc/telepathy-mission-control/mission-control-plugins/index.html
>-share/doc/telepathy-mission-control/mission-control-plugins/index.sgml
>-share/doc/telepathy-mission-control/mission-control-plugins/left.png
>-share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-McpAccountStorage.html
>-share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-McpDispatchOperationPolicy.html
>-share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-McpRequestPolicy.html
>-share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html
>-share/doc/telepathy-mission-control/mission-control-plugins/mission-control-plugins.devhelp2
>-share/doc/telepathy-mission-control/mission-control-plugins/object-tree.html
>-share/doc/telepathy-mission-control/mission-control-plugins/right.png
>-share/doc/telepathy-mission-control/mission-control-plugins/style.css
>-share/doc/telepathy-mission-control/mission-control-plugins/up.png
>+%%DOCSDIR%%/mission-control-plugins/McpAccountManager.html
>+%%DOCSDIR%%/mission-control-plugins/McpDispatchOperation.html
>+%%DOCSDIR%%/mission-control-plugins/McpDispatchOperationPolicy.html
>+%%DOCSDIR%%/mission-control-plugins/McpRequest.html
>+%%DOCSDIR%%/mission-control-plugins/McpRequestPolicy.html
>+%%DOCSDIR%%/mission-control-plugins/annotation-glossary.html
>+%%DOCSDIR%%/mission-control-plugins/api-index-full.html
>+%%DOCSDIR%%/mission-control-plugins/ch01.html
>+%%DOCSDIR%%/mission-control-plugins/ch02.html
>+%%DOCSDIR%%/mission-control-plugins/ch03.html
>+%%DOCSDIR%%/mission-control-plugins/ch04.html
>+%%DOCSDIR%%/mission-control-plugins/home.png
>+%%DOCSDIR%%/mission-control-plugins/index.html
>+%%DOCSDIR%%/mission-control-plugins/left-insensitive.png
>+%%DOCSDIR%%/mission-control-plugins/left.png
>+%%DOCSDIR%%/mission-control-plugins/mission-control-plugins-McpAccountStorage.html
>+%%DOCSDIR%%/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html
>+%%DOCSDIR%%/mission-control-plugins/mission-control-plugins.devhelp2
>+%%DOCSDIR%%/mission-control-plugins/object-tree.html
>+%%DOCSDIR%%/mission-control-plugins/right-insensitive.png
>+%%DOCSDIR%%/mission-control-plugins/right.png
>+%%DOCSDIR%%/mission-control-plugins/style.css
>+%%DOCSDIR%%/mission-control-plugins/up-insensitive.png
>+%%DOCSDIR%%/mission-control-plugins/up.png
> share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service
> share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service
>diff --git net-im/telepathy-salut/Makefile net-im/telepathy-salut/Makefile
>index 886cec4e1e59..dedad1ed1847 100644
>--- net-im/telepathy-salut/Makefile
>+++ net-im/telepathy-salut/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libavahi-glib.so:net/avahi-app \
> 		libsoup-2.4.so:devel/libsoup
> 
> GNU_CONFIGURE=	yes
>-USES=		gmake gnome libtool pathfix pkgconfig python:2.7,build sqlite ssl
>+USES=		gmake gnome libtool pathfix pkgconfig python:build sqlite ssl
> USE_GNOME=	glib20 libxslt:build
> CONFIGURE_ARGS=	--disable-Werror --enable-avahi-tests=no
> LDFLAGS+=	-lpthread
>diff --git net-mgmt/netxms/Makefile net-mgmt/netxms/Makefile
>index 978c3ff36fea..f2e5a3b048ac 100644
>--- net-mgmt/netxms/Makefile
>+++ net-mgmt/netxms/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	netxms
> PORTVERSION=	2.2.2
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://www.netxms.org/download/releases/2.2/${PORTVERSION}/
> 
>diff --git net-mgmt/rtrlib/Makefile net-mgmt/rtrlib/Makefile
>index cc569d92b7e5..9c89682b00c4 100644
>--- net-mgmt/rtrlib/Makefile
>+++ net-mgmt/rtrlib/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	rtrlib
> PORTVERSION=	0.6.3
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net-mgmt sysutils
> 
>diff --git net-mgmt/wmi-client/Makefile net-mgmt/wmi-client/Makefile
>index e4e147718bf3..c1e8fd6b8ffa 100644
>--- net-mgmt/wmi-client/Makefile
>+++ net-mgmt/wmi-client/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	wmi
> PORTVERSION=	1.3.16
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://dev.zenoss.org/trac/export/26435/trunk/inst/externallibs/ \
> 		http://www.openvas.org/download/wmi/ \
>@@ -13,9 +13,6 @@ PKGNAMESUFFIX=	-client
> MAINTAINER=	koichiro@rworks.jp
> COMMENT=	DCOM/WMI client implementation
> 
>-OPTIONS_DEFINE=	PYTHON
>-PYTHON_DESC=	Build Python bindings
>-
> USES=		autoreconf:build gmake iconv tar:bzip2
> 
> MAKEFILE=	GNUmakefile
>@@ -27,19 +24,9 @@ PROGS=	bin/wmic bin/winexe
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MPYTHON}
>-USES+=		python:2.7
>-MAKE_ARGS+=	PYTHON="${PYTHON_CMD}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}"
>-PLIST_SUB+=	PYTHON=""
>-.else
>-PLIST_SUB+=	PYTHON="@comment "
>-.endif
>-
>-.if !${PORT_OPTIONS:MPYTHON}
> do-install:
> .for x in ${PROGS}
> 	@${INSTALL_PROGRAM} ${WRKSRC}/Samba/source/${x} ${STAGEDIR}${PREFIX}/${x}
> .endfor
>-.endif
> 
> .include <bsd.port.mk>
>diff --git net-mgmt/wmi-client/pkg-plist net-mgmt/wmi-client/pkg-plist
>index a77322f56b6a..6fe6293f866d 100644
>--- net-mgmt/wmi-client/pkg-plist
>+++ net-mgmt/wmi-client/pkg-plist
>@@ -1,26 +1,2 @@
> bin/winexe
> bin/wmic
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libasync_wmi_lib.so.0.0.2
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/talloc.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/watcher.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/connect.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/test/wmic.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/__init__.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/version.pyc
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/library.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/composite_context.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/version.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/ndr.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/Rpc.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/__init__.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/credentials.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/dcerpc.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/rpc_request.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/rpc/oxidresolver.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/__init__.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/Query.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/wbem/wbem.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/callback.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/__init__.py
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pysamba/twisted/reactor.py
>diff --git net/3proxy/Makefile net/3proxy/Makefile
>index e435b466d054..385cf2ed6749 100644
>--- net/3proxy/Makefile
>+++ net/3proxy/Makefile
>@@ -27,7 +27,6 @@ OPTIONS_DEFINE=	DOCS
> 3PROXY_LOGDIR=	/var/log/${PORTNAME}
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
> 	@${REINPLACE_CMD} -e 's|%%3PROXY_LOGDIR%%|${3PROXY_LOGDIR}|' ${WRKSRC}/cfg/3proxy.cfg.sample
> 
> post-build:
>diff --git net/libfabric/Makefile net/libfabric/Makefile
>index e390e4f0b5d5..e6551ddcb60f 100644
>--- net/libfabric/Makefile
>+++ net/libfabric/Makefile
>@@ -41,23 +41,4 @@ ${p}_DESC=			'${p:tl}' provider
> ${p}_CONFIGURE_ENABLE=		${p:tl}
> .endfor
> 
>-SED_WRAP_CLOSE=	{ \
>-		i\\\n \
>-		\#ifdef SHIM_SYS_SHIM_HELPERS\\\n \
>-		\#undef close\\\n \
>-		\#endif\n \
>-		a\\\n \
>-		\#ifdef SHIM_SYS_SHIM_HELPERS\\\n \
>-		\#define close epoll_shim_close\\\n \
>-		\#endif\n \
>-		}
>-
>-post-patch:
>-	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<asm/types\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<asm/types\.h>|<sys/types.h>|'
>-	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<malloc\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<malloc\.h>|<stdlib.h>|'
>-	@${FIND} ${WRKSRC} -name "*.[ch]" -and -exec ${GREP} -q '<alloca\.h>' {} \; -print | ${XARGS} ${REINPLACE_CMD} 's|<alloca\.h>|<stdlib.h>|'
>-	@${GREP} -Flr --include='*.c' '.close' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} $$'/\\.close/${SED_WRAP_CLOSE}'
>-	@${REINPLACE_CMD} $$'/fi_ops.*close/${SED_WRAP_CLOSE}' ${WRKSRC}/src/fabric.c
>-	@${REINPLACE_CMD} $$'/[*>]close/${SED_WRAP_CLOSE}' ${WRKSRC}/include/rdma/fabric.h
>-
> .include <bsd.port.mk>
>diff --git net/py-amqp/Makefile net/py-amqp/Makefile
>index 25ba52383590..f6cac82391b0 100644
>--- net/py-amqp/Makefile
>+++ net/py-amqp/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	amqp
>-PORTVERSION=	2.5.2
>+PORTVERSION=	2.6.0
> CATEGORIES=	net python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git net/py-amqp/distinfo net/py-amqp/distinfo
>index 83db35fd10ef..c8384abd4d89 100644
>--- net/py-amqp/distinfo
>+++ net/py-amqp/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1576935968
>-SHA256 (amqp-2.5.2.tar.gz) = 77f1aef9410698d20eaeac5b73a87817365f457a507d82edf292e12cbb83b08d
>-SIZE (amqp-2.5.2.tar.gz) = 117788
>+TIMESTAMP = 1591193914
>+SHA256 (amqp-2.6.0.tar.gz) = 24dbaff8ce4f30566bb88976b398e8c4e77637171af3af6f1b9650f48890e60b
>+SIZE (amqp-2.6.0.tar.gz) = 119679
>diff --git net/py-kombu/Makefile net/py-kombu/Makefile
>index e9c66f9a6257..d1647f216ce3 100644
>--- net/py-kombu/Makefile
>+++ net/py-kombu/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	kombu
>-PORTVERSION=	4.6.9
>+PORTVERSION=	4.6.10
> CATEGORIES=	net python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,7 +13,7 @@ COMMENT=	AMQP messaging framework for Python
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=2.5.2<2.6:net/py-amqp@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}amqp>=2.6.0:net/py-amqp@${PY_FLAVOR}
> 
> USES=		python:3.6+
> USE_PYTHON=	autoplist distutils
>diff --git net/py-kombu/distinfo net/py-kombu/distinfo
>index 4693d6b47d3b..3437c9f5f7b8 100644
>--- net/py-kombu/distinfo
>+++ net/py-kombu/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1591096845
>-SHA256 (kombu-4.6.9.tar.gz) = aece08f48706743aaa1b9d607fee300559481eafcc5ee56451aa0ef867a3be07
>-SIZE (kombu-4.6.9.tar.gz) = 405851
>+TIMESTAMP = 1591193664
>+SHA256 (kombu-4.6.10.tar.gz) = 437b9cdea193cc2ed0b8044c85fd0f126bb3615ca2f4d4a35b39de7cacfa3c1a
>+SIZE (kombu-4.6.10.tar.gz) = 406494
>diff --git net/remmina-plugin-nx/Makefile net/remmina-plugin-nx/Makefile
>index a20a1319e3b7..dc46b78d1730 100644
>--- net/remmina-plugin-nx/Makefile
>+++ net/remmina-plugin-nx/Makefile
>@@ -1,6 +1,7 @@
> # Created by: Koichiro IWAO <meta+ports@vmeta.jp>
> # $FreeBSD$
> 
>+PORTREVISION=	1
> PKGNAMESUFFIX=	-nx
> 
> COMMENT=	Remmina plugin for NX
>diff --git net/sshping/Makefile net/sshping/Makefile
>index 116208f76b4e..a6714be16e7d 100644
>--- net/sshping/Makefile
>+++ net/sshping/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	sshping
> PORTVERSION=	0.1.4
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net
> 
>diff --git net/tinyfugue/Makefile net/tinyfugue/Makefile
>index 61739b084b34..661b64cca4f5 100644
>--- net/tinyfugue/Makefile
>+++ net/tinyfugue/Makefile
>@@ -24,10 +24,6 @@ LDFLAGS+=	-L${LOCALBASE}
> 
> PLIST_SUB=	DISTNAME=${DISTNAME}
> 
>-post-patch:
>-	${REINPLACE_CMD} 's:@.*dir@:$${DESTDIR}&:' ${WRKSRC}/unix/vars.mak.in
>-	${REINPLACE_CMD} '/ln -s/s@(TF)@(TF:T)@' ${WRKSRC}/unix/unix.mak
>-
> post-build:
> 	${STRIP_CMD} ${WRKSRC}/src/tf
> 
>diff --git net/x2goclient/Makefile net/x2goclient/Makefile
>index 9e9f75ce85e4..9af74c71962a 100644
>--- net/x2goclient/Makefile
>+++ net/x2goclient/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	x2goclient
> PORTVERSION=	4.1.2.1
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/
> 
>diff --git ports-mgmt/synth/Makefile ports-mgmt/synth/Makefile
>index 1fe85b7b3f7b..0175ffa4de66 100644
>--- ports-mgmt/synth/Makefile
>+++ ports-mgmt/synth/Makefile
>@@ -4,6 +4,7 @@
> PORTNAME=	synth
> DISTVERSIONPREFIX=	v
> DISTVERSION=	2.08
>+PORTREVISION=	1
> CATEGORIES=	ports-mgmt
> 
> MAINTAINER=	ericbsd@FreeBSD.org
>@@ -12,11 +13,10 @@ COMMENT=	Custom package repository builder for FreeBSD and DragonFly
> LICENSE=	ISCL
> LICENSE_FILE=	${WRKSRC}/License.txt
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/libncurses.a:devel/ncurses \
>-		${GPR}/ini_file_manager.gpr:misc/ini_file_manager \
>+BUILD_DEPENDS=	${GPR}/ini_file_manager.gpr:misc/ini_file_manager \
> 		${GPR}/adacurses.gpr:devel/adacurses
> 
>-USES=		ada:6
>+USES=		ada:6 ncurses
> USE_GITHUB=	yes
> GH_ACCOUNT=	jrmarino
> 
>diff --git print/a2ps/Makefile print/a2ps/Makefile
>index ff9405716f5d..8136a35f7451 100644
>--- print/a2ps/Makefile
>+++ print/a2ps/Makefile
>@@ -53,8 +53,8 @@ CONFIGURE_ENV+=	EMACS=no
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|^DESTDIR|#DESTDIR|' \
>-		`${FIND} ${WRKSRC} -name "Makefile.in"`
>+	@${REINPLACE_CMD} -e 's|^DESTDIR|#DESTDIR|' \
>+${WRKSRC}/ppd/Makefile.in ${WRKSRC}/man/Makefile.in ${WRKSRC}/doc/Makefile.in ${WRKSRC}/contrib/sample/Makefile.in ${WRKSRC}/contrib/emacs/Makefile.in ${WRKSRC}/contrib/Makefile.in ${WRKSRC}/Makefile.in ${WRKSRC}/ps/Makefile.in ${WRKSRC}/fonts/Makefile.in ${WRKSRC}/ogonkify/Makefile.in ${WRKSRC}/ogonkify/m4/Makefile.in ${WRKSRC}/ogonkify/doc/Makefile.in ${WRKSRC}/lib/Makefile.in ${WRKSRC}/auxdir/Makefile.in ${WRKSRC}/m4/Makefile.in ${WRKSRC}/sheets/Makefile.in ${WRKSRC}/encoding/Makefile.in ${WRKSRC}/afm/Makefile.in ${WRKSRC}/etc/Makefile.in ${WRKSRC}/tests/Makefile.in ${WRKSRC}/src/Makefile.in
> 
> .if ${PORT_OPTIONS:MI18N}
> #DISTFILES+=	${I18N_PACKAGE}${EXTRACT_SUFX}:i18n
>diff --git print/alignmargins/files/patch-alignmargins print/alignmargins/files/patch-alignmargins
>index 6a3cb052c85a..30041ad8a6f2 100644
>--- print/alignmargins/files/patch-alignmargins
>+++ print/alignmargins/files/patch-alignmargins
>@@ -7,7 +7,7 @@
>  my $programpath = $1;
> -my $printcommand = '/usr/bin/lpr -P ';
> -my $egrep = '/bin/egrep';
>-+my $printcommand = '/usr/local/bin/lpr -P ';
>++my $printcommand = '%%LOCALBASE%%/bin/lpr -P ';
> +my $egrep = '/usr/bin/egrep';
>  my $cat = '/bin/cat';
>  my $cut = '/usr/bin/cut';
>@@ -18,9 +18,9 @@
> -my $adjustmentpagepath = ($programpath ? "${programpath}:" : "") . '.:~:/usr/share/alignmargins:/usr/local/share/alignmargins:/usr/share:/usr/local/share:/usr/share/printer-testpages:/usr/local/share/printer-testpages:/usr/share/ghostscript/*/lib:/usr/local/share/ghostscript/*/lib';
> -my $ppddir = '/etc/cups/ppd';
> -my $printerconffile = '/etc/cups/printers.conf';
>-+my $adjustmentpagepath = ($programpath ? "${programpath}:" : "") . '.:~:/usr/local/share/alignmargins:/usr/share/alignmargins:/usr/local/share/alignmargins:/usr/share:/usr/local/share:/usr/share/printer-testpages:/usr/local/share/printer-testpages:/usr/share/ghostscript/*/lib:/usr/local/share/ghostscript/*/lib';
>-+my $ppddir = '/usr/local/etc/cups/ppd';
>-+my $printerconffile = '/usr/local/etc/cups/printers.conf';
>++my $adjustmentpagepath = ($programpath ? "${programpath}:" : "") . '.:~:%%DATADIR%%:%%LOCALBASE%%/share/alignmargins:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/printer-testpages:%%LOCALBASE%%/share/ghostscript/*/lib';
>++my $ppddir = '%%LOCALBASE%%/etc/cups/ppd';
>++my $printerconffile = '%%LOCALBASE%%/etc/cups/printers.conf';
>  
>  # Find "ælign.ps"
>  
>diff --git print/freetype2/Makefile print/freetype2/Makefile
>index ebe12f18becb..de33641a5b55 100644
>--- print/freetype2/Makefile
>+++ print/freetype2/Makefile
>@@ -79,6 +79,7 @@ V40_VARS=	SUBPIXEL_HINTING_MODE+=2
> 
> .include <bsd.port.pre.mk>
> 
>+DEFAULT_SUBPIXEL_MODE=	2
> SELECTED_MODE=	\
> 	r=0; \
> 	for m in ${SUBPIXEL_HINTING_MODE}; \
>@@ -86,30 +87,35 @@ SELECTED_MODE=	\
> 	done; \
> 	${ECHO_CMD} $$r
> 
>+FINAL_SELECTED_MODE=	${SELECTED_MODE:sh}
> pre-patch:
> 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
> 		${WRKSRC}/builds/unix/install.mk
> 
> post-patch:
> .if defined(SUBPIXEL_HINTING_MODE)
>-	@${REINPLACE_CMD} -i '.hinting.bak' \
>+.if ${FINAL_SELECTED_MODE} != ${DEFAULT_SUBPIXEL_MODE}
>+	@${REINPLACE_CMD} \
> 		-e 's|^$#define TT_CONFIG_OPTION_SUBPIXEL_HINTING$.*|\1 \
> 	${SELECTED_MODE:sh}|' \
> 		${WRKSRC}/include/freetype/config/ftoption.h
>+.endif
> .else
>+.if ${FINAL_SELECTED_MODE} != ${DEFAULT_SUBPIXEL_MODE}
> 	@${REINPLACE_CMD} -i '.hinting.bak' \
> 		-e 's|^$#define TT_CONFIG_OPTION_SUBPIXEL_HINTING.*$|/* \1 */|' \
> 		${WRKSRC}/include/freetype/config/ftoption.h
> .endif
>+.endif
> 
> post-patch-DEBUG-on:
>-	@${REINPLACE_CMD} -i '.debug.bak' \
>+	@${REINPLACE_CMD} \
> 		-e 's|.*$#define FT_DEBUG_LEVEL_TRACE$.*|\1|' \
> 		-e 's|.*$#define FT_DEBUG_MEMORY$.*|\1|' \
> 		${WRKSRC}/include/freetype/config/ftoption.h
> 
> post-patch-LONG_PCF_NAMES-on:
>-	@${REINPLACE_CMD} -i '.names.bak' \
>+	@${REINPLACE_CMD} \
> 		-e 's|.*$#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES$.*|\1|' \
> 		${WRKSRC}/include/freetype/config/ftoption.h
> 
>@@ -118,7 +124,7 @@ post-patch-TABLE_VALIDATION-on:
> 		${WRKSRC}/modules.cfg
> 
> post-patch-TT_SIZE_METRICS-on:
>-	@${REINPLACE_CMD} -i '.metrics.bak' \
>+	@${REINPLACE_CMD} \
> 		-e 's|.*$#define AF_CONFIG_OPTION_TT_SIZE_METRICS$.*|\1|' \
> 		${WRKSRC}/include/freetype/config/ftoption.h
> 
>diff --git print/xreader/Makefile print/xreader/Makefile
>index bf31c142da18..dab6a26bdd13 100644
>--- print/xreader/Makefile
>+++ print/xreader/Makefile
>@@ -50,8 +50,8 @@ KEYRING_MESON_OFF=	-Dkeyring=false
> PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
> PDF_MESON_OFF=		-Dpdf=false
> 
>-PS_LIB_DEPENDS=		libspectre.so:print/libspectre
>-PS_MESON_OFF=		-Dps=false
>+PS_LIB_DEPENDS=	libspectre.so:print/libspectre
>+PS_MESON_OFF=	-Dps=false
> 
> TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
> TIFF_MESON_OFF=		-Dtiff=false
>@@ -59,8 +59,4 @@ TIFF_MESON_OFF=		-Dtiff=false
> XPS_LIB_DEPENDS=	libgxps.so:graphics/libgxps
> XPS_MESON_OFF=		-Dxps=false
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e '/gdk\/gdkwayland\.h/d' \
>-		${WRKSRC}/libdocument/ev-document-misc.h
>-
> .include <bsd.port.mk>
>diff --git science/p5-Chemistry-3DBuilder/Makefile science/p5-Chemistry-3DBuilder/Makefile
>index 46d9d5511c49..99dd4b4f7301 100644
>--- science/p5-Chemistry-3DBuilder/Makefile
>+++ science/p5-Chemistry-3DBuilder/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-3DBuilder
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Generate 3D coordinates from a connection table
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-Bond-Find/Makefile science/p5-Chemistry-Bond-Find/Makefile
>index d336b6262995..be159791a111 100644
>--- science/p5-Chemistry-Bond-Find/Makefile
>+++ science/p5-Chemistry-Bond-Find/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-Bond-Find
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Detect bonds in a molecule and assign formal bond orders
> 
> LICENSE=	ART10 GPLv1+
>diff --git science/p5-Chemistry-Canonicalize/Makefile science/p5-Chemistry-Canonicalize/Makefile
>index 6cfec349e0dc..59b43e748428 100644
>--- science/p5-Chemistry-Canonicalize/Makefile
>+++ science/p5-Chemistry-Canonicalize/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-Canonicalize
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Number the atoms in a molecule in a unique way
> 
> LICENSE=	ART10 GPLv1+
>diff --git science/p5-Chemistry-File-MDLMol/Makefile science/p5-Chemistry-File-MDLMol/Makefile
>index 83fe6e8ec9de..609e511bfda7 100644
>--- science/p5-Chemistry-File-MDLMol/Makefile
>+++ science/p5-Chemistry-File-MDLMol/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-File-MDLMol
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	MDL molfile reader/write
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-File-Mopac/Makefile science/p5-Chemistry-File-Mopac/Makefile
>index f3b589cd1cbf..dd2b77801dd5 100644
>--- science/p5-Chemistry-File-Mopac/Makefile
>+++ science/p5-Chemistry-File-Mopac/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-File-Mopac
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	MOPAC 6 input file reader/writer
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-File-SLN/Makefile science/p5-Chemistry-File-SLN/Makefile
>index 01d704e9724a..fa38cf06e569 100644
>--- science/p5-Chemistry-File-SLN/Makefile
>+++ science/p5-Chemistry-File-SLN/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-File-SLN
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	SLN linear notation parser/writer
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-File-SMARTS/Makefile science/p5-Chemistry-File-SMARTS/Makefile
>index 559d62ca16b1..9ae023054185 100644
>--- science/p5-Chemistry-File-SMARTS/Makefile
>+++ science/p5-Chemistry-File-SMARTS/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-File-SMARTS
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	SMARTS chemical substructure pattern linear notation parser
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-File-SMILES/Makefile science/p5-Chemistry-File-SMILES/Makefile
>index 69333a9ed939..4828ef977b9b 100644
>--- science/p5-Chemistry-File-SMILES/Makefile
>+++ science/p5-Chemistry-File-SMILES/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-File-SMILES
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	SMILES linear notation parser/writer
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-File-VRML/Makefile science/p5-Chemistry-File-VRML/Makefile
>index 4b3ec3c93a20..6ef0d5d78372 100644
>--- science/p5-Chemistry-File-VRML/Makefile
>+++ science/p5-Chemistry-File-VRML/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-File-VRML
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Generate VRML models for molecules
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
>diff --git science/p5-Chemistry-File-XYZ/Makefile science/p5-Chemistry-File-XYZ/Makefile
>index 5f25a80fba4a..6a342dc3111d 100644
>--- science/p5-Chemistry-File-XYZ/Makefile
>+++ science/p5-Chemistry-File-XYZ/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-File-XYZ
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	XYZ molecule format reader/writer
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
>diff --git science/p5-Chemistry-FormulaPattern/Makefile science/p5-Chemistry-FormulaPattern/Makefile
>index 3e967dd8b8e0..bc0718f80739 100644
>--- science/p5-Chemistry-FormulaPattern/Makefile
>+++ science/p5-Chemistry-FormulaPattern/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-FormulaPattern
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Match molecule by formula
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-InternalCoords/Makefile science/p5-Chemistry-InternalCoords/Makefile
>index 00ee4e0cb0e9..416e447ed38b 100644
>--- science/p5-Chemistry-InternalCoords/Makefile
>+++ science/p5-Chemistry-InternalCoords/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-InternalCoords
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Represent the position of an atom using internal coordinates
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-Isotope/Makefile science/p5-Chemistry-Isotope/Makefile
>index d694ce3e1472..ebb828a52938 100644
>--- science/p5-Chemistry-Isotope/Makefile
>+++ science/p5-Chemistry-Isotope/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-Isotope
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Table of the isotopes exact mass data
> 
> USES=		perl5
>diff --git science/p5-Chemistry-MidasPattern/Makefile science/p5-Chemistry-MidasPattern/Makefile
>index e9e3b2de3b41..56d901ff7a97 100644
>--- science/p5-Chemistry-MidasPattern/Makefile
>+++ science/p5-Chemistry-MidasPattern/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-MidasPattern
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Select atoms in macromolecules
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-Mok/Makefile science/p5-Chemistry-Mok/Makefile
>index 00f6962779ec..7d389cda9d97 100644
>--- science/p5-Chemistry-Mok/Makefile
>+++ science/p5-Chemistry-Mok/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-Mok
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Molecular awk interpreter
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git science/p5-Chemistry-Pattern/Makefile science/p5-Chemistry-Pattern/Makefile
>index 623e012ef980..6a638e5cf67b 100644
>--- science/p5-Chemistry-Pattern/Makefile
>+++ science/p5-Chemistry-Pattern/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-Pattern
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Chemical substructure pattern matching
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
>diff --git science/p5-Chemistry-Reaction/Makefile science/p5-Chemistry-Reaction/Makefile
>index 5d51ee71ae34..842c0dc03a66 100644
>--- science/p5-Chemistry-Reaction/Makefile
>+++ science/p5-Chemistry-Reaction/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-Reaction
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Represent a ring as a substructure of a molecule
> 
> LICENSE=	ART10 GPLv1+
>diff --git science/p5-Chemistry-Ring/Makefile science/p5-Chemistry-Ring/Makefile
>index 73b28821afa3..924268423c21 100644
>--- science/p5-Chemistry-Ring/Makefile
>+++ science/p5-Chemistry-Ring/Makefile
>@@ -1,4 +1,3 @@
>-# Created by: Steve Wills <steve@mouf.net>
> # $FreeBSD$
> 
> PORTNAME=	Chemistry-Ring
>@@ -9,7 +8,7 @@ MASTER_SITES=	CPAN
> MASTER_SITE_SUBDIR=	CPAN:ITUB
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Represent a ring as a substructure of a molecule
> 
> BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
>diff --git security/honeytrap/Makefile security/honeytrap/Makefile
>index c6444e432862..c398d86b9038 100644
>--- security/honeytrap/Makefile
>+++ security/honeytrap/Makefile
>@@ -1,19 +1,19 @@
> # $FreeBSD$
> 
> PORTNAME=	honeytrap
>-DISTVERSION=	g20200415
>+DISTVERSION=	g20200625
> CATEGORIES=	security
> 
>-MAINTAINER=	remco.verhoef@dutchsec.com
>-COMMENT=	HoneyTrap Freebsd port
>+MAINTAINER=	ezri.mudde@dutchsec.com
>+COMMENT=	Framework for running, monitoring and managing honeypots
> 
> LICENSE=	ART20
> 
> USES=		go:modules
>+GO_BUILDFLAGS=	-ldflags '-X github.com/honeytrap/honeytrap/cmd.Version=2020-07-22T08:34:55 -X github.com/honeytrap/honeytrap/cmd.ReleaseTag=DEVELOPMENT.2020-07-22T08-34-55Z -X github.com/honeytrap/honeytrap/cmd.CommitID=33bbb2db3a3140b0ce4fbda14747bc954e0bcadd -X github.com/honeytrap/honeytrap/cmd.ShortCommitID=33bbb2db3a31 -extldflags "static"'
> USE_GITHUB=	yes
>-GH_TAGNAME=	d8d94c8f
>-GH_TUPLE=	\
>-		AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
>+GH_TAGNAME=	33bbb2d
>+GH_TUPLE=	AndreasBriese:bbloom:28f7e881ca57:andreasbriese_bbloom/vendor/github.com/AndreasBriese/bbloom \
> 		BurntSushi:toml:v0.3.0:burntsushi_toml/vendor/github.com/BurntSushi/toml \
> 		Logicalis:asn1:c9c836c1a3cd:logicalis_asn1/vendor/github.com/Logicalis/asn1 \
> 		Shopify:sarama:v1.16.0:shopify_sarama/vendor/github.com/Shopify/sarama \
>@@ -70,22 +70,24 @@ GH_TUPLE=	\
> 		yuin:gopher-lua:8bfc7677f583:yuin_gopher_lua/vendor/github.com/yuin/gopher-lua \
> 		google:gvisor:3eb302470365:google_gvisor/vendor/gvisor.dev/gvisor
> 
>-USERS=		honeytrap
>-GROUPS=		honeytrap
>+HONEYTRAP_USER?=	honeytrap
>+HONEYTRAP_GROUP?=	honeytrap
>+HONEYTRAP_DBDIR?=	/var/db/${PORTNAME}
>+
>+USERS=		${HONEYTRAP_USER}
>+GROUPS=		${HONEYTRAP_GROUP}
> USE_RC_SUBR=	honeytrap
>-PLIST_FILES=	bin/honeytrap \
>-		etc/honeytrap.toml \
>-		"@dir(honeytrap,honeytrap,4744) /var/log/honeytrap" \
>-		"@dir(honeytrap,honeytrap,4744) libdata/honeytrap"
>+PLIST_FILES=	"@sample(honeytrap,honeytrap,0600) ${ETCDIR}/honeytrap.toml.sample" \
>+		bin/honeytrap
>+
>+SUB_LIST=	GROUP=${HONEYTRAP_GROUP} \
>+		HONEYTRAP_DBDIR=${HONEYTRAP_DBDIR} \
>+		USER=${HONEYTRAP_USER}
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_PROGRAM} ${WRKDIR}/bin/honeytrap ${STAGEDIR}${PREFIX}/bin/honeytrap
>-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d
>-	${INSTALL_DATA} ${FILESDIR}/etc/honeytrap.toml ${STAGEDIR}${PREFIX}/etc
>-
>-post-install:
>-	${MKDIR} ${STAGEDIR}${PREFIX}/libdata/honeytrap
>-	${MKDIR} ${STAGEDIR}/var/log/honeytrap
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d ${STAGEDIR}${ETCDIR}
>+	${INSTALL_DATA} ${FILESDIR}/honeytrap.toml ${STAGEDIR}${ETCDIR}/honeytrap.toml.sample
> 
> .include <bsd.port.mk>
>diff --git security/honeytrap/distinfo security/honeytrap/distinfo
>index 7fcc17f1acc5..6f082e28ae61 100644
>--- security/honeytrap/distinfo
>+++ security/honeytrap/distinfo
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1587390791
>-SHA256 (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = f565e52e8f4bbebc3765bd2ead68b7ab141da4ef00073749ae55268290f5d13a
>-SIZE (honeytrap-honeytrap-g20200415-d8d94c8f_GH0.tar.gz) = 379014
>+TIMESTAMP = 1595352531
>+SHA256 (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = a6390179c0ba3282d7523f3633d4a15852f39081fd666f4ac3a4c37f95fef4c4
>+SIZE (honeytrap-honeytrap-g20200625-33bbb2d_GH0.tar.gz) = 379053
> SHA256 (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = c87bf25d12aa9ef597c6a465dd2959d6d7e06d8341030d6d75c8a81ccc388ccd
> SIZE (AndreasBriese-bbloom-28f7e881ca57_GH0.tar.gz) = 7141
> SHA256 (BurntSushi-toml-v0.3.0_GH0.tar.gz) = 2c49390424cfb043f803977bce80b1504495bada54f9e845ff8b30a05fab9a36
>diff --git security/honeytrap/files/etc/honeytrap.toml security/honeytrap/files/etc/honeytrap.toml
>deleted file mode 100644
>index 91e71d5fd729..000000000000
>--- security/honeytrap/files/etc/honeytrap.toml
>+++ /dev/null
>@@ -1,20 +0,0 @@
>-[listener]
>-type="socket"
>-
>-[service.ssh-simulator]
>-type="ssh-simulator"
>-credentials=["root:root", "root:password"]
>-
>-[[port]]
>-ports=["tcp/8022"]
>-services=["ssh-simulator"]
>-
>-[channel.console]
>-type="console"
>-
>-[[filter]]
>-channel=["console"]
>-
>-[[logging]]
>-output="/var/log/honeytrap/logging.log"
>-level="debug"
>diff --git security/honeytrap/files/honeytrap.in security/honeytrap/files/honeytrap.in
>index e2d110cc54c0..21b1ad12d678 100644
>--- security/honeytrap/files/honeytrap.in
>+++ security/honeytrap/files/honeytrap.in
>@@ -3,18 +3,34 @@
> # $FreeBSD$
> #
> # PROVIDE: honeytrap
>-# REQUIRE: LOGIN
>+# REQUIRE: NETWORKING SERVERS DAEMON
> # KEYWORD: shutdown
>+
>+# Add honeytrap_enable="YES" to /etc/rc.conf to enable Honeytrap
>+
>+# Additional variables you can define are:
>+
>+# honeytrap_config (path):                Config file path.
>+#                                         Set to %%ETCDIR%%/honeytrap.toml by default.
>+# honeytrap_datadir (dir):                Set dir to store honeytrap data in.
>+#                                         Default is "%%HONEYTRAP_DBDIR%%"
>+# honeytrap_logdir (dir):                 Set dir to store honeytrap logs in.
>+#                                         Default is "/var/log/honeytrap"
>+# honeytrap_user (string):                Set user to run honeytrap.
>+#                                         Default is "%%USER%%".
>+# honeytrap_group (string):               Set group to run honeytrap.
>+#                                         Default is "%%GROUP%%".
>+# honeytrap_pidfile (string):             Set full path to pid file
>+#                                         Default is "/var/run/honeytrap.pid"
>+# honeytrap_syslog_output_enable (bool):  Set to YES to enable syslog output
>+#                                         Default is "NO". See daemon(8).
>+# honeytrap_syslog_output_tag (str):      Set syslog tag if syslog enabled.
>+#                                         Default is "honeytrap". See daemon(8).
>+# honeytrap_syslog_output_priority (str): Set syslog priority if syslog enabled.
>+#                                         Default is "info". See daemon(8).
>+# honeytrap_syslog_output_facility (str): Set syslog facility if syslog enabled.
>+#                                         Default is "daemon". See daemon(8).
> #
>-# Add these lines to /etc/rc.conf.local or /etc/rc.conf
>-# to enable this service:
>-#
>-# honeytrap_enable (bool):	Set to NO by default.
>-#				Set it to YES to enable honeytrap.
>-# honeytrap_datadir (path):	Set to %%PREFIX%%/libdata/honeytrap
>-#				by default.
>-# honeytrap_config (path):	Set to %%PREFIX%%/etc/honeytrap.toml
>-#				by default.
> 
> . /etc/rc.subr
> 
>@@ -24,18 +40,49 @@ rcvar=honeytrap_enable
> load_rc_config $name
> 
> : ${honeytrap_enable:="NO"}
>-: ${honeytrap_datadir="%%PREFIX%%/libdata/honeytrap"}
>-: ${honeytrap_config="%%PREFIX%%/etc/honeytrap.toml"}
>+: ${honeytrap_config="%%ETCDIR%%/honeytrap.toml"}
>+: ${honeytrap_datadir:="%%HONEYTRAP_DBDIR%%"}
>+: ${honeytrap_logdir:="/var/log/honeytrap"}
>+: ${honeytrap_user:="%%USER%%"}
>+: ${honeytrap_group:="%%GROUP%%"}
>+: ${honeytrap_pidfile:="/var/run/${name}.pid"}
>+: ${honeytrap_syslog_output_enable:="NO"}
>+
>+pidfile=${honeytrap_pidfile}
>+procname="%%PREFIX%%/bin/honeytrap"
>+command="/usr/sbin/daemon"
> 
>-start_cmd="${name}_start"
>+start_precmd="honeytrap_start_precmd"
> 
>-honeytrap_program="%%PREFIX%%/bin/honeytrap"
>-honeytrap_flags="--data $honeytrap_datadir --config $honeytrap_config"
>-pidfile=/var/run/${name}.pid
>+if checkyesno honeytrap_syslog_output_enable; then
>+    if [ -n "${honeytrap_syslog_output_tag}" ]; then
>+        honeytrap_syslog_output_flags="-T ${honeytrap_syslog_output_tag}"
>+    else
>+        honeytrap_syslog_output_flags="-T ${name}"
>+    fi
>+    if [ -n "${honeytrap_syslog_output_priority}" ]; then
>+        honeytrap_syslog_output_flags="${honeytrap_syslog_output_flags} -s ${honeytrap_syslog_output_priority}"
>+    fi
> 
>-honeytrap_start()
>+    if [ -n "${honeytrap_syslog_output_facility}" ]; then
>+        honeytrap_syslog_output_flags="${honeytrap_syslog_output_flags} -l ${honeytrap_syslog_output_facility}"
>+    fi
>+fi
>+
>+command_args="-f -t ${name} ${honeytrap_syslog_output_flags} -p ${pidfile} /usr/bin/env ${honeytrap_env} ${procname} --data ${honeytrap_datadir} --config ${honeytrap_config} ${honeytrap_flags}"
>+
>+honeytrap_start_precmd()
> {
>-	daemon -o /var/log/honeytrap/service.log -p $pidfile -u $name $honeytrap_program $honeytrap_flags
>-}
>+    if [ ! -e ${pidfile} ]; then
>+        install -o ${honeytrap_user} -g ${honeytrap_group} /dev/null ${pidfile}
>+    fi
> 
>+    if [ ! -d ${honeytrap_datadir} ]; then
>+        install -d -m 0750 -o ${honeytrap_user} -g ${honeytrap_group} ${honeytrap_datadir}
>+    fi
>+    if [ ! -d ${honeytrap_logdir} ]; then
>+        install -d -m 0750 -o ${honeytrap_user} -g ${honeytrap_group} ${honeytrap_logdir}
>+    fi
>+}
>+ 
> run_rc_command "$@"
>diff --git security/openconnect-gui/distinfo security/openconnect-gui/distinfo
>index 7059c2eb036d..79523b9afd73 100644
>--- security/openconnect-gui/distinfo
>+++ security/openconnect-gui/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1591544711
>-SHA256 (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = a8d156d056a81be1c895738f0a4299b60fc87b608fcb9676b8f2d5215b7101ae
>-SIZE (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = 10025784
>+TIMESTAMP = 1592016430
>+SHA256 (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = b9cdddbc9f064386d5ba739522ff861b9dfa0ef746d30f095f0ded79d1cbab25
>+SIZE (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = 635260
>diff --git security/openvas8-libraries/Makefile security/openvas8-libraries/Makefile
>index 31c4f7c12106..3a13bc048028 100644
>--- security/openvas8-libraries/Makefile
>+++ security/openvas8-libraries/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME?=	openvas8-libraries
> PORTVERSION?=	8.0.9
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES?=	http://wald.intevation.org/frs/download.php/2433/
> DISTNAME?=	${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION}
>diff --git security/py-cryptography/Makefile security/py-cryptography/Makefile
>index ef219bb42bdd..8c85d70f1ef8 100644
>--- security/py-cryptography/Makefile
>+++ security/py-cryptography/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cryptography
>-PORTVERSION=	2.6.1
>+PORTVERSION=	2.9.2
> CATEGORIES=	security python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -16,12 +16,11 @@ LICENSE_FILE_APACHE20=		${WRKSRC}/LICENSE.APACHE
> LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.BSD
> 
> BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR}
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \
> 		${PY_ENUM34} \
> 		${PY_IPADDRESS} \
> 		${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR}
>-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=${PORTVERSION}:security/py-cryptography-vectors@${PY_FLAVOR} \
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=2.9.2:security/py-cryptography-vectors@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \
>@@ -47,6 +46,6 @@ post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so
> 
> do-test:
>-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
>+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} -m pytest
> 
> .include <bsd.port.post.mk>
>diff --git security/py-cryptography/distinfo security/py-cryptography/distinfo
>index bad171cc21b8..8794c2b59fd7 100644
>--- security/py-cryptography/distinfo
>+++ security/py-cryptography/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1551354433
>-SHA256 (cryptography-2.6.1.tar.gz) = 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6
>-SIZE (cryptography-2.6.1.tar.gz) = 491580
>+TIMESTAMP = 1587899355
>+SHA256 (cryptography-2.9.2.tar.gz) = a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229
>+SIZE (cryptography-2.9.2.tar.gz) = 517571
>diff --git security/py-cryptography/files/patch-PR4855 security/py-cryptography/files/patch-PR4855
>deleted file mode 100644
>index 63f02496c393..000000000000
>--- security/py-cryptography/files/patch-PR4855
>+++ /dev/null
>@@ -1,49 +0,0 @@
>-# security/py-cryptography fails to build with libressl-2.9.1
>-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237487
>-# Use generic DTLS functions added in LibreSSL 2.9.1
>-# https://github.com/pyca/cryptography/pull/4855
>-
>-index 4124dcb879..ac32fdffde 100644
>---- src/_cffi_src/openssl/cryptography.py.orig
>-+++ src/_cffi_src/openssl/cryptography.py
>-@@ -38,9 +38,12 @@
>-     (LIBRESSL_VERSION_NUMBER >= 0x2070000f)
>- #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER \
>-     (LIBRESSL_VERSION_NUMBER >= 0x2080000f)
>-+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER \
>-+    (LIBRESSL_VERSION_NUMBER >= 0x2090100f)
>- #else
>- #define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER (0)
>- #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER (0)
>-+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER (0)
>- #endif
>- 
>- #define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \
>-diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
>-index 92fd1e3ec8..da21f3ce90 100644
>---- src/_cffi_src/openssl/ssl.py.orig
>-+++ src/_cffi_src/openssl/ssl.py
>-@@ -719,17 +719,20 @@
>- static const long TLS_ST_OK = 0;
>- #endif
>- 
>--#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
>-+/* LibreSSL 2.9.1 added only the DTLS_*_method functions */
>-+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER
>- static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
>- const SSL_METHOD *(*DTLS_method)(void) = NULL;
>- const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
>- const SSL_METHOD *(*DTLS_client_method)(void) = NULL;
>-+#else
>-+static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
>-+#endif
>-+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
>- static const long SSL_OP_NO_DTLSv1 = 0;
>- static const long SSL_OP_NO_DTLSv1_2 = 0;
>- long (*DTLS_set_link_mtu)(SSL *, long) = NULL;
>- long (*DTLS_get_link_min_mtu)(SSL *) = NULL;
>--#else
>--static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
>- #endif
>- 
>- static const long Cryptography_HAS_DTLS = 1;
>diff --git security/vuxml/Makefile security/vuxml/Makefile
>index d66c3e82fdae..c76b3d2c2c2e 100644
>--- security/vuxml/Makefile
>+++ security/vuxml/Makefile
>@@ -83,8 +83,27 @@ tidy: vuln.xml
> 
> newentry:
> 	@${SH} ${FILESDIR}/newentry.sh "${VUXML_FILE}"
>+#
>+# make split: create files/vuln-*.xml from the vuln.xml file.
>+#
>+split: vuln-all.xml
>+vuln-all.xml: vuln.xml
>+	cd ${FILESDIR} && xsltproc split.xsl ${PKGDIR}/vuln.xml \
>+	    > ${FILESDIR}/${.TARGET}
>+.PATH: ${FILESDIR}
>+#
>+# make concat: create vuln-new.xml file from the files/vuln-*.xml files.
>+#
>+concat: vuln-new.xml
>+vuln-new.xml: vuln-all.xml
>+	cd ${FILESDIR} && xmllint --xinclude ${FILESDIR}/vuln-all.xml \
>+	    > ${PKGDIR}/${.TARGET}
> 
> .include <bsd.port.pre.mk>
>+post-clean: clean-vuln
>+clean-vuln:
>+	${RM} vuln-new.xml
>+	${RM} ${FILESDIR}/vuln-*.xml
> 
> .if defined(VID) && !empty(VID)
> html: work/${VID}.html
>diff --git shells/xonsh/Makefile shells/xonsh/Makefile
>index 7bfe41535a50..a5bc9fe08337 100644
>--- shells/xonsh/Makefile
>+++ shells/xonsh/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	xonsh
>-PORTVERSION=	0.7.9
>+PORTVERSION=	0.9.16
> CATEGORIES=	shells python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git shells/xonsh/distinfo shells/xonsh/distinfo
>index 1b9e90dc7832..3cc33f2b096b 100644
>--- shells/xonsh/distinfo
>+++ shells/xonsh/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1537440457
>-SHA256 (xonsh-0.7.9.tar.gz) = a90785419da7346927c51135ed4871e17862acad8be7adc557bac15e2cda4825
>-SIZE (xonsh-0.7.9.tar.gz) = 833920
>+TIMESTAMP = 1595300286
>+SHA256 (xonsh-0.9.16.tar.gz) = 5531fe79ace9f86312e06a245c95f9ac2d099a32c2958297796695652bb84e26
>+SIZE (xonsh-0.9.16.tar.gz) = 981839
>diff --git sysutils/44bsd-more/Makefile sysutils/44bsd-more/Makefile
>index 4a5c26d8eeff..9fac218dcab3 100644
>--- sysutils/44bsd-more/Makefile
>+++ sysutils/44bsd-more/Makefile
>@@ -30,8 +30,6 @@ post-patch:
> 	    's!/usr/share/misc/more.help!${PREFIX}/share/misc/44bsd-more.help!'\
> 	    ${WRKSRC}/pathnames.h
> 	${CP} ${FILESDIR}/queue.h ${WRKSRC}
>-	${REINPLACE_CMD} -e 's/static char \*getvar/static const char \*getvar/' \
>-	    ${WRKSRC}/ncommand.c
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>diff --git sysutils/and/Makefile sysutils/and/Makefile
>index 08c4a55186f9..239e475f54b0 100644
>--- sysutils/and/Makefile
>+++ sysutils/and/Makefile
>@@ -17,8 +17,4 @@ USES=		gmake
> ALL_TARGET=	default
> NOPRECIOUSMAKEVARS=	yes
> 
>-post-patch:
>-	@${REINPLACE_CMD} "s,P_KTHREAD,P_KPROC,g" \
>-		${WRKSRC}/Makefile ${WRKSRC}/and-OpenBSD.c
>-
> .include <bsd.port.mk>
>diff --git sysutils/and/files/patch-and-OpenBSD.c sysutils/and/files/patch-and-OpenBSD.c
>index e08c56a23b42..889f07e7288f 100644
>--- sysutils/and/files/patch-and-OpenBSD.c
>+++ sysutils/and/files/patch-and-OpenBSD.c
>@@ -7,7 +7,7 @@
> +
> +#if defined(__FreeBSD__) && __FreeBSD_version >= 500014
> +  /* Skip kernel threads */
>-+  while((openbsd_pt[openbsd_next].ki_flag & P_KTHREAD) 
>++  while((openbsd_pt[openbsd_next].ki_flag & P_KPROC)
> +	     && openbsd_next < openbsd_nproc)
> +      openbsd_next++;
> +  if (openbsd_next >= openbsd_nproc) return NULL;
>diff --git sysutils/ansible-iocage/patch-iocage sysutils/ansible-iocage/patch-iocage
>deleted file mode 100644
>index 23a7bfa0d97d..000000000000
>--- sysutils/ansible-iocage/patch-iocage
>+++ /dev/null
>@@ -1,27 +0,0 @@
>-See: https://github.com/fractalcells/ansible-iocage/pull/18
>---- iocage.orig	2019-11-03 14:19:54 UTC
>-+++ iocage
>-@@ -148,10 +148,11 @@ def _get_iocage_facts(module, iocage_path, argument="a
>-                 # non-iocage jails: skip all
>-                 break
>-             elif re.match('(\d+|-)',_jid):
>--                if l.count('\t') == 10:
>--                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template,_basejail) = l.split('\t')
>-+                _fragments = l.split('\t')
>-+                if len(_fragments) == 10:
>-+                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template,_basejail) = _fragments
>-                 else:
>--                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template) = l.split('\t')
>-+                    (_jid,_name,_boot,_state,_type,_release,_ip4,_ip6,_template) = _fragments
>-                 if _name != "":
>-                     _properties = _jail_get_properties(module, iocage_path, _name)
>-                     _jails[_name] = { "jid": _jid, "name": _name, "state": _state, "properties": _properties }
>-@@ -504,7 +505,7 @@ def main():
>-             cmd          = dict(default="", required=False),
>-             clone_from   = dict(default="", required=False),
>-             release      = dict(default="", required=False),
>--            update       = dict(default="", required=False, type='bool'),
>-+            update       = dict(default=False, required=False, type='bool'),
>-             components   = dict(default="", aliases=["files","component"], required=False, type='list')),
>-         supports_check_mode = True
>-     )
>diff --git sysutils/conky/Makefile sysutils/conky/Makefile
>index 887988e60b73..0005332c4ddf 100644
>--- sysutils/conky/Makefile
>+++ sysutils/conky/Makefile
>@@ -12,35 +12,38 @@ COMMENT?=	Advanced, highly configurable system monitor for X11
> LIB_DEPENDS=	libinotify.so:devel/libinotify
> BUILD_DEPENDS=	db2x_xsltproc:textproc/docbook2X \
> 		docbook-xsl>=0:textproc/docbook-xsl \
>-		xsltproc:textproc/libxslt \
>-		gsed:textproc/gsed
>+		gsed:textproc/gsed \
>+		xsltproc:textproc/libxslt
> 
>-USES=		cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \
>+USES=		cmake:noninja compiler:c++11-lib cpe gettext-runtime iconv \
> 		localbase lua:52 pkgconfig tar:bzip2
> 
>-CMAKE_ARGS=	-DBUILD_PORT_MONITORS:BOOL=false \
>-		-DBUILD_IBM:BOOL=false \
>-		-DBUILD_HDDTEMP:BOOL=false \
>-		-DBUILD_IOSTATS:BOOL=false \
>+CMAKE_ARGS=	-DAPP_SED=${LOCALBASE}/bin/gsed \
> 		-DBUILD_AUDACIOUS:BOOL=false \
> 		-DBUILD_DOCS:BOOL=true \
>-		-DAPP_SED=${LOCALBASE}/bin/gsed
>+		-DBUILD_HDDTEMP:BOOL=false \
>+		-DBUILD_IBM:BOOL=false \
>+		-DBUILD_IOSTATS:BOOL=false \
>+		-DBUILD_PORT_MONITORS:BOOL=false
> CONFLICTS?=	conky-awesome-[0-9]*
> 
> SLAVEDIRS=	sysutils/conky-awesome
>-PLIST_FILES=	bin/conky man/man1/conky.1.gz
>+PLIST_FILES=	bin/conky \
>+		man/man1/conky.1.gz
> PORTEXAMPLES=	conky.conf conky_no_x11.conf convert.lua
>-PORTDOCS=	html/config_settings.html html/docs.html html/lua.html html/variables.html
>+PORTDOCS=	html/config_settings.html html/docs.html html/lua.html \
>+		html/variables.html
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	brndnmtthws
> 
>-OPTIONS_DEFINE=	APCUPSD CURL DOCS EXAMPLES IPV6 METAR MOC MPD NCURSES RSS \
>-		X11 XMMS2 XOAP
>+OPTIONS_DEFINE=	APCUPSD CURL DOCS EXAMPLES IPV6 METAR MOC MPD NCURSES RSS X11 \
>+		XMMS2 XOAP
> 
>-OPTIONS_GROUP?=	X11
>-OPTIONS_GROUP_X11=	ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 LUA_RSVG
>-OPTIONS_DEFAULT?=	X11 ARGB DOUBLE_BUFFER XFT LUA_CAIRO
>+OPTIONS_GROUP?=		X11
>+OPTIONS_GROUP_X11=	ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO \
>+			LUA_IMLIB2 LUA_RSVG
>+OPTIONS_DEFAULT?=	ARGB DOUBLE_BUFFER LUA_CAIRO X11 XFT
> 
> APCUPSD_DESC=		Monitor APCUPSD
> APCUPSD_CMAKE_BOOL=	BUILD_APCUPSD
>@@ -52,9 +55,9 @@ ARGB_IMPLIES=		X11
> CURL_CMAKE_BOOL=	BUILD_CURL
> CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
> 
>-DOUBLE_BUFFER_DESC=	X11 double buffering
>-DOUBLE_BUFFER_CMAKE_BOOL=BUILD_XDBE
>-DOUBLE_BUFFER_IMPLIES=	X11
>+DOUBLE_BUFFER_DESC=		X11 double buffering
>+DOUBLE_BUFFER_CMAKE_BOOL=	BUILD_XDBE
>+DOUBLE_BUFFER_IMPLIES=		X11
> 
> IMLIB2_CMAKE_BOOL=	BUILD_IMLIB2
> IMLIB2_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
>@@ -65,7 +68,7 @@ IPV6_CMAKE_BOOL=	BUILD_IPV6
> LUA_CAIRO_DESC=		Lua-Cairo binding
> LUA_CAIRO_CMAKE_BOOL=	BUILD_LUA_CAIRO
> LUA_CAIRO_USES=		gnome
>-LUA_CAIRO_USE=		gnome=cairo
>+LUA_CAIRO_USE=		GNOME=cairo
> LUA_CAIRO_PLIST_FILES=	lib/conky/libcairo.so
> LUA_CAIRO_IMPLIES=	X11
> 
>@@ -77,7 +80,7 @@ LUA_IMLIB2_IMPLIES=	IMLIB2 X11
> LUA_RSVG_DESC=		Lua-rsvg binding
> LUA_RSVG_CMAKE_BOOL=	BUILD_LUA_RSVG
> LUA_RSVG_USES=		gnome
>-LUA_RSVG_USE=		gnome=librsvg2
>+LUA_RSVG_USE=		GNOME=librsvg2
> LUA_RSVG_PLIST_FILES=	lib/conky/librsvg.so
> LUA_RSVG_IMPLIES=	X11
> 
>@@ -85,34 +88,34 @@ METAR_DESC=		Display METAR weather reports
> METAR_CMAKE_BOOL=	BUILD_WEATHER_METAR
> METAR_IMPLIES=		CURL
> 
>-MOC_DESC=		Control MOC (Music On Console)
>-MOC_CMAKE_BOOL=		BUILD_MOC
>+MOC_DESC=	Control MOC (Music On Console)
>+MOC_CMAKE_BOOL=	BUILD_MOC
> 
>-MPD_DESC=		Control MPD (Music Player Daemon)
>-MPD_CMAKE_BOOL=		BUILD_MPD
>+MPD_DESC=	Control MPD (Music Player Daemon)
>+MPD_CMAKE_BOOL=	BUILD_MPD
> 
> NCURSES_DESC=		Use ncurses to draw on terminals
> NCURSES_CMAKE_BOOL=	BUILD_NCURSES
>-NCURSES_USES=		ncurses:port
>+NCURSES_USES=		ncurses
> 
>-RSS_DESC=		Display RSS feeds
>-RSS_CMAKE_BOOL=		BUILD_RSS
>-RSS_USES=		gnome
>-RSS_USE=		gnome=glib20,libxml2
>-RSS_IMPLIES=		CURL
>+RSS_DESC=	Display RSS feeds
>+RSS_CMAKE_BOOL=	BUILD_RSS
>+RSS_USES=	gnome
>+RSS_USE=	GNOME=glib20,libxml2
>+RSS_IMPLIES=	CURL
> 
>-X11_USES=		xorg
>-X11_USE=		xorg=x11,xext,xdamage,xfixes
>-X11_CMAKE_BOOL=		BUILD_X11 OWN_WINDOW
>-X11_VARS=		EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf
>-X11_VARS_OFF=		EXAMPLE_CONF_FILE=${WRKSRC}/data/conky_no_x11.conf
>+X11_USES=	xorg
>+X11_USE=	XORG=x11,xdamage,xext,xfixes
>+X11_CMAKE_BOOL=	BUILD_X11 OWN_WINDOW
>+X11_VARS=	EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf
>+X11_VARS_OFF=	EXAMPLE_CONF_FILE=${WRKSRC}/data/conky_no_x11.conf
> 
>-XFT_CMAKE_BOOL=		BUILD_XFT
>-XFT_USE=		xorg=xft
>-XFT_IMPLIES=		X11
>+XFT_CMAKE_BOOL=	BUILD_XFT
>+XFT_USE=	XORG=xft
>+XFT_IMPLIES=	X11
> 
> XINERAMA_CMAKE_BOOL=	BUILD_XINERAMA
>-XINERAMA_USE=		xorg=xinerama
>+XINERAMA_USE=		XORG=xinerama
> XINERAMA_IMPLIES=	X11
> 
> XMMS2_DESC=		Control XMMS2 media player
>@@ -123,17 +126,17 @@ XOAP_DESC=		Display XOAP weather reports
> XOAP_CMAKE_BOOL=	BUILD_WEATHER_XOAP
> XOAP_IMPLIES=		CURL METAR
> XOAP_USES=		gnome
>-XOAP_USE=		gnome=libxml2
>+XOAP_USE=		GNOME=libxml2
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MLUA_CAIRO} && ${PORT_OPTIONS:MLUA_IMLIB2}
>-PLIST_FILES+=		lib/conky/libcairo_imlib2_helper.so
>+PLIST_FILES+=	lib/conky/libcairo_imlib2_helper.so
> .endif
> 
> # disable apm on non-x86 archs
> .if ${ARCH} != amd64 && ${ARCH} != i386
>-EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src_CMakeLists.txt
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_CMakeLists.txt
> .endif
> 
> post-patch:
>diff --git sysutils/ipfs-go/Makefile sysutils/ipfs-go/Makefile
>index d2b3a1cde1ab..e392d5fc861f 100644
>--- sysutils/ipfs-go/Makefile
>+++ sysutils/ipfs-go/Makefile
>@@ -2,8 +2,7 @@
> 
> PORTNAME=	ipfs
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.4.23
>-PORTREVISION=	1
>+DISTVERSION=	0.6.0
> CATEGORIES=	sysutils
> MASTER_SITES=	https://github.com/ipfs/go-ipfs/releases/download/v${DISTVERSION}/
> PKGNAMESUFFIX=	-go
>diff --git sysutils/py-google-compute-engine/Makefile sysutils/py-google-compute-engine/Makefile
>index e57873c5cd4e..65b3bc7519d3 100644
>--- sysutils/py-google-compute-engine/Makefile
>+++ sysutils/py-google-compute-engine/Makefile
>@@ -5,7 +5,7 @@ DISTVERSION=	2.8.16
> CATEGORIES=	sysutils python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	swills@FreeBSD.org
> COMMENT=	Guest Environment for Google Compute Engine
> 
> LICENSE=	APACHE20
>diff --git sysutils/screen/Makefile sysutils/screen/Makefile
>index 170684df2297..a67c70316961 100644
>--- sysutils/screen/Makefile
>+++ sysutils/screen/Makefile
>@@ -19,28 +19,19 @@ COMMENT=	Multi-screen window manager
> LICENSE=	GPLv3
> 
> OPTIONS_DEFINE=		INFO NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
>-OPTIONS_DEFAULT=	INFO NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC \
>-			NCURSES_DEFAULT
>-OPTIONS_SINGLE=		IPC NCURSES
>+OPTIONS_DEFAULT=	INFO NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC
>+OPTIONS_SINGLE=		IPC
> OPTIONS_SINGLE_IPC=	SOCKETS NAMED_PIPES
>-OPTIONS_SINGLE_NCURSES=	NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT
> NETHACK_DESC=		Enable nethack-style messages
> XTERM_256_DESC=		Enable support for 256 colour xterm
> SHOWENC_DESC=		Show encoding on the status line
> SOCKETS_DESC=		Use new (4.2.1+) sockets for IPC (default)
> NAMED_PIPES_DESC=	Use legacy (4.0.3) named pipes for IPC (override)
> SYSTEM_SCREENRC_DESC=	Install system screenrc with helpful status line
>-NCURSES_DEFAULT_DESC=	Depend on ncurses (ports if installed, otherwise base)
>-NCURSES_BASE_DESC=	Depend on ncurses in base
>-NCURSES_PORT_DESC=	Depend on devel/ncurses in ports
>-
>-NCURSES_DEFAULT_USES=	ncurses
>-NCURSES_BASE_USES=	ncurses:base
>-NCURSES_PORT_USES=	ncurses:port
> 
> OPTIONS_SUB=
> 
>-USES=		gmake cpe
>+USES=		gmake cpe ncurses:base
> MAKE_ARGS+=	WITH_MAN=1
> 
> CPE_VENDOR=	gnu
>diff --git sysutils/slurm-wlm/Makefile sysutils/slurm-wlm/Makefile
>index ed853220a67a..3432bd024f2c 100644
>--- sysutils/slurm-wlm/Makefile
>+++ sysutils/slurm-wlm/Makefile
>@@ -85,42 +85,14 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
> CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lprocstat
> 
>+.include <bsd.port.options.mk>
>+
> # Hack around nonfunctional --disable-gtktest flag
>-pre-configure-GUI-off:
>-	@${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
>-		${WRKSRC}/configure
>+.if ! ${PORT_OPTIONS:MGUI}
>+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-gui-off
>+.endif
> 
>-# SLURM's configure enables interactive jobs if pty.h exists.  Replacing
>-# #include <pty.h> with appropriate headers will therefore not work, so instead
>-# add a pty.h for the build.
> pre-configure:
>-	@${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
>-	@${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \
>-		${WRKSRC}/configure
>-
>-	@${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \
>-		-e 's|(/proc)|(/compat/linux/proc)|g' \
>-		${WRKSRC}/src/slurmd/slurmstepd/req.c \
>-		${WRKSRC}/src/slurmd/slurmstepd/pdebug.c \
>-		${WRKSRC}/src/slurmd/common/xcpuinfo.c \
>-		${WRKSRC}/src/slurmd/common/xcgroup.c \
>-		${WRKSRC}/src/slurmd/common/set_oomadj.c \
>-		${WRKSRC}/src/slurmd/common/proctrack.c \
>-		${WRKSRC}/src/common/callerid.c \
>-		${WRKSRC}/src/plugins/task/affinity/affinity.c \
>-		${WRKSRC}/src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c \
>-		${WRKSRC}/src/plugins/jobacct_gather/cgroup/jobacct_gather_cgroup.c \
>-		${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \
>-		${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \
>-		${WRKSRC}/src/plugins/switch/cray_aries/scaling.c \
>-		${WRKSRC}/src/plugins/proctrack/cray_aries/proctrack_cray_aries.c \
>-		${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \
>-		${WRKSRC}/src/plugins/proctrack/pgid/proctrack_pgid.c \
>-		${WRKSRC}/src/plugins/proctrack/linuxproc/kill_tree.c \
>-		${WRKSRC}/src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \
>-		${WRKSRC}/src/plugins/node_features/knl_generic/node_features_knl_generic.c \
>-		${WRKSRC}/contribs/cray/pam_job.c
>-
> 	@if ${WHICH} sbatch > /dev/null; then \
> 		${ECHO_CMD} "********************************************"; \
> 		${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \
>diff --git sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c
>index 37753084f886..d2ed263af145 100644
>--- sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c
>+++ sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c
>@@ -1,5 +1,14 @@
> --- src/plugins/jobacct_gather/common/common_jag.c.orig	2020-01-18 14:05:02 UTC
> +++ src/plugins/jobacct_gather/common/common_jag.c
>+@@ -233,7 +233,7 @@ static int _get_sys_interface_freq_line(uint32_t cpu, 
>+ 	} else {
>+ 		/* frequency scaling not enabled */
>+ 		if (!cpunfo_frequency) {
>+-			snprintf(freq_file, 14, "/proc/cpuinfo");
>++			snprintf(freq_file, 14, "/compat/linux/proc/cpuinfo");
>+ 			debug2("_get_sys_interface_freq_line: filename = %s ",
>+ 			       freq_file);
>+ 			if ((sys_fp = fopen(freq_file, "r")) != NULL) {
> @@ -250,6 +250,11 @@ static int _get_sys_interface_freq_line(uint32_t cpu, 
>  	return 0;
>  }
>@@ -12,14 +21,78 @@
>  static int _is_a_lwp(uint32_t pid)
>  {
>  	char *filename = NULL;
>-@@ -258,6 +263,10 @@ static int _is_a_lwp(uint32_t pid)
>- 	ssize_t n;
>+@@ -259,8 +264,12 @@ static int _is_a_lwp(uint32_t pid)
>  	char *tgids = NULL;
>  	pid_t tgid = -1;
>-+
>+ 
>+-	xstrfmtcat(filename, "/proc/%u/status", pid);
> +	// Disable check for now, this will only skew process accounting
> +	// slightly by including threads
> +	return 0;
>  
>- 	xstrfmtcat(filename, "/proc/%u/status", pid);
>++	xstrfmtcat(filename, "/compat/linux/proc/%u/status", pid);
>++
>+ 	fd = open(filename, O_RDONLY);
>+ 	if (fd < 0) {
>+ 		error("%s: open() %s failed: %m", __func__, filename);
>+@@ -634,9 +643,9 @@ static List _get_precs(List task_list, bool pgid_plugi
>+ 			goto finished;
>+ 		}
>+ 		for (i = 0; i < npids; i++) {
>+-			snprintf(proc_stat_file, 256, "/proc/%d/stat", pids[i]);
>+-			snprintf(proc_io_file, 256, "/proc/%d/io", pids[i]);
>+-			snprintf(proc_smaps_file, 256, "/proc/%d/smaps", pids[i]);
>++			snprintf(proc_stat_file, 256, "/compat/linux/proc/%d/stat", pids[i]);
>++			snprintf(proc_io_file, 256, "/compat/linux/proc/%d/io", pids[i]);
>++			snprintf(proc_smaps_file, 256, "/compat/linux/proc/%d/smaps", pids[i]);
>+ 			_handle_stats(prec_list, proc_stat_file, proc_io_file,
>+ 				      proc_smaps_file, callbacks,
>+ 				      jobacct ? jobacct->tres_count : 0);
>+@@ -649,16 +658,16 @@ static List _get_precs(List task_list, bool pgid_plugi
>+ 		if (slash_proc_open) {
>+ 			rewinddir(slash_proc);
>+ 		} else {
>+-			slash_proc=opendir("/proc");
>++			slash_proc=opendir("/compat/linux/proc");
>+ 			if (slash_proc == NULL) {
>+ 				perror("opening /proc");
>+ 				goto finished;
>+ 			}
>+ 			slash_proc_open=1;
>+ 		}
>+-		strcpy(proc_stat_file, "/proc/");
>+-		strcpy(proc_io_file, "/proc/");
>+-		strcpy(proc_smaps_file, "/proc/");
>++		strcpy(proc_stat_file, "/compat/linux/proc/");
>++		strcpy(proc_io_file, "/compat/linux/proc/");
>++		strcpy(proc_smaps_file, "/compat/linux/proc/");
>+ 
>+ 		while ((slash_proc_entry = readdir(slash_proc))) {
>+ 
>+@@ -669,7 +678,7 @@ static List _get_precs(List task_list, bool pgid_plugi
>+ 			 * should be a pid). Then do the same for the
>+ 			 * /proc/<pid>/io file name.
>+ 			 */
>+-			optr = proc_stat_file + sizeof("/proc");
>++			optr = proc_stat_file + sizeof("/compat/linux/proc");
>+ 			iptr = slash_proc_entry->d_name;
>+ 			i = 0;
>+ 			do {
>+@@ -689,7 +698,7 @@ static List _get_precs(List task_list, bool pgid_plugi
>+ 			} while (*iptr);
>+ 			*optr = 0;
>+ 
>+-			optr2 = proc_io_file + sizeof("/proc");
>++			optr2 = proc_io_file + sizeof("/compat/linux/proc");
>+ 			iptr = slash_proc_entry->d_name;
>+ 			i = 0;
>+ 			do {
>+@@ -708,7 +717,7 @@ static List _get_precs(List task_list, bool pgid_plugi
>+ 			} while (*iptr);
>+ 			*optr2 = 0;
>  
>+-			optr2 = proc_smaps_file + sizeof("/proc");
>++			optr2 = proc_smaps_file + sizeof("/compat/linux/proc");
>+ 			iptr = slash_proc_entry->d_name;
>+ 			i = 0;
>+ 			do {
>diff --git sysutils/slurm-wlm/files/pty.h sysutils/slurm-wlm/files/pty.h
>deleted file mode 100644
>index 28671a8478d4..000000000000
>--- sysutils/slurm-wlm/files/pty.h
>+++ /dev/null
>@@ -1,4 +0,0 @@
>-#include <sys/types.h>
>-#include <sys/ioctl.h>
>-#include <termios.h>
>-#include <libutil.h>
>diff --git sysutils/uefi-edk2-bhyve/Makefile sysutils/uefi-edk2-bhyve/Makefile
>index 21f8efb0eb65..6e029163d0b4 100644
>--- sysutils/uefi-edk2-bhyve/Makefile
>+++ sysutils/uefi-edk2-bhyve/Makefile
>@@ -9,6 +9,7 @@ CATEGORIES=	sysutils
> 
> MAINTAINER=	araujo@FreeBSD.org
> COMMENT?=	UEFI-EDK2 firmware for bhyve
>+BROKEN=		Needs python2
> 
> LICENSE=	BSD2CLAUSE
> 
>diff --git textproc/fist/Makefile textproc/fist/Makefile
>index 4f7dd5eb4df8..ec0cba1c2234 100644
>--- textproc/fist/Makefile
>+++ textproc/fist/Makefile
>@@ -11,4 +11,7 @@ COMMENT=	Emphatic message generator
> GNU_CONFIGURE=	yes
> PLIST_FILES=	bin/fist man/man1/fist.1.gz
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's/foo/bar/' ${WRKSRC}/fist.c
>+
> .include <bsd.port.mk>
>diff --git textproc/libxml2/Makefile textproc/libxml2/Makefile
>index a1b7e88b3438..a857368d1019 100644
>--- textproc/libxml2/Makefile
>+++ textproc/libxml2/Makefile
>@@ -60,7 +60,7 @@ post-install:
> .include <bsd.port.pre.mk>
> 
> post-patch:
>-.for d in . doc doc/devhelp doc/examples
>+.for d in doc doc/examples
> 	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
> 		${WRKSRC}/${d}/Makefile.in
> .endfor
>diff --git textproc/p5-XML-Parser/Makefile textproc/p5-XML-Parser/Makefile
>index 704bd8c177b7..4cd51a768270 100644
>--- textproc/p5-XML-Parser/Makefile
>+++ textproc/p5-XML-Parser/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	XML-Parser
>-PORTVERSION=	2.44
>+PORTVERSION=	2.46
> CATEGORIES=	textproc perl5
> MASTER_SITES=	CPAN
> PKGNAMEPREFIX=	p5-
>@@ -11,7 +11,10 @@ COMMENT=	Perl extension interface to James Clark's XML parser, expat
> 
> LICENSE=	ART10 GPLv1+
> LICENSE_COMB=	dual
>+LICENSE_FILE=	${WRKSRC}/Parser.pm
> 
>+BUILD_DEPENDS=  ${RUN_DEPENDS}
>+RUN_DEPENDS=    p5-libwww>=6.43:www/p5-libwww
> LIB_DEPENDS=	libexpat.so:textproc/expat2
> 
> USES=		perl5
>diff --git textproc/p5-XML-Parser/distinfo textproc/p5-XML-Parser/distinfo
>index 6c793ada0a60..80f6390e8918 100644
>--- textproc/p5-XML-Parser/distinfo
>+++ textproc/p5-XML-Parser/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (XML-Parser-2.44.tar.gz) = 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216
>-SIZE (XML-Parser-2.44.tar.gz) = 237377
>+TIMESTAMP = 1586303346
>+SHA256 (XML-Parser-2.46.tar.gz) = d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d
>+SIZE (XML-Parser-2.46.tar.gz) = 254763
>diff --git textproc/p5-XML-Parser/files/patch-CheckLib.pm textproc/p5-XML-Parser/files/patch-CheckLib.pm
>deleted file mode 100644
>index 1da73f667b6c..000000000000
>--- textproc/p5-XML-Parser/files/patch-CheckLib.pm
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- inc/Devel/CheckLib.pm.orig	2013-01-11 11:43:02.293444337 +0900
>-+++ inc/Devel/CheckLib.pm	2013-01-11 11:48:47.556449831 +0900
>-@@ -222,7 +222,7 @@
>-     for my $header (@headers) {
>-         push @use_headers, $header;
>-         my($ch, $cfile) = File::Temp::tempfile(
>--            'assertlibXXXXXXXX', SUFFIX => '.c'
>-+            'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
>-         );
>-         print $ch qq{#include <$_>\n} for @use_headers;
>-         print $ch qq{int main(void) { return 0; }\n};
>-@@ -262,7 +262,7 @@
>- 
>-     # now do each library in turn with headers
>-     my($ch, $cfile) = File::Temp::tempfile(
>--        'assertlibXXXXXXXX', SUFFIX => '.c'
>-+        'assertlibXXXXXXXX', SUFFIX => '.c', TMPDIR => 1,
>-     );
>-     print $ch qq{#include <$_>\n} foreach (@headers);
>-     print $ch "int main(void) { ".($args{function} || 'return 0;')." }\n";
>diff --git textproc/py-alabaster/Makefile textproc/py-alabaster/Makefile
>index 418d725536cb..d3f4389ff48e 100644
>--- textproc/py-alabaster/Makefile
>+++ textproc/py-alabaster/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	alabaster
>-PORTVERSION=	0.7.6
>+PORTVERSION=	0.7.12
> CATEGORIES=	textproc python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git textproc/py-alabaster/distinfo textproc/py-alabaster/distinfo
>index 3671b689caa7..ec3385031fe4 100644
>--- textproc/py-alabaster/distinfo
>+++ textproc/py-alabaster/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (alabaster-0.7.6.tar.gz) = 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb
>-SIZE (alabaster-0.7.6.tar.gz) = 16598
>+TIMESTAMP = 1563550321
>+SHA256 (alabaster-0.7.12.tar.gz) = a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02
>+SIZE (alabaster-0.7.12.tar.gz) = 11242
>diff --git textproc/py-pykwalify/Makefile textproc/py-pykwalify/Makefile
>index b4c58c288b05..17f93dc61d55 100644
>--- textproc/py-pykwalify/Makefile
>+++ textproc/py-pykwalify/Makefile
>@@ -3,6 +3,7 @@
> PORTNAME=	pykwalify
> DISTVERSION=	1.7.0-15
> DISTVERSIONSUFFIX=	-g02b7e21
>+PORTREVISION=	1
> CATEGORIES=	textproc python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>diff --git www/chromium/Makefile www/chromium/Makefile
>index 9dda00dd9295..9da1bdfba193 100644
>--- www/chromium/Makefile
>+++ www/chromium/Makefile
>@@ -132,9 +132,9 @@ GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild --skip-generate-buildfiles
> # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
> # Note: these are for FreeBSD use ONLY. For your own distribution,
> # please get your own set of keys.
>-GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \
>-		google_default_client_id="996322985003.apps.googleusercontent.com" \
>-		google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"
>+GN_ARGS+=	google_api_key="AIzaSyCel7Soy49Gi5bLtgvIb1gg7b_clF2O6zM" \
>+		google_default_client_id="1097775399400-4e9dgfp2il6dtj9j44qeul36h519sm5u.apps.googleusercontent.com" \
>+		google_default_client_secret="05C5CkbtavjEHbuvdq9FxZeo"
> 
> .if !defined(GN_ONLY)
> SUB_FILES=	chromium-browser.desktop chrome pkg-message
>diff --git www/minio/Makefile www/minio/Makefile
>index 7a34fa553a8c..22e1d9253010 100644
>--- www/minio/Makefile
>+++ www/minio/Makefile
>@@ -13,8 +13,8 @@ LICENSE=	APACHE20
> USES=		compiler go:modules
> 
> USE_GITHUB=	yes
>-GHTAG=		RELEASE.2020-09-21T22-31-59Z
>-COMMIT_ID=	4c81201f95bb83443fe5b8a188cc44e0fb56dc2b
>+GHTAG=		RELEASE.2020-09-23T19-18-30Z
>+COMMIT_ID=	f7f9517b6ae297210aca2a68416e298396c07076
> 
> GH_TUPLE=	${PORTNAME}:${PORTNAME}:${GHTAG}:DEFAULT \
> 		Azure:azure-pipeline-go:v0.2.2:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
>diff --git www/minio/distinfo www/minio/distinfo
>index bfb5cc9c97f9..bd0173438025 100644
>--- www/minio/distinfo
>+++ www/minio/distinfo
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1600779678
>-SHA256 (minio/minio-minio-2020.09.21.22.31.59-RELEASE.2020-09-21T22-31-59Z_GH0.tar.gz) = 57aff6a977d70d77c9b3faf1d2f7344b3225e601de1c878e211bbd2e7da12ee6
>-SIZE (minio/minio-minio-2020.09.21.22.31.59-RELEASE.2020-09-21T22-31-59Z_GH0.tar.gz) = 10194714
>+TIMESTAMP = 1600955330
>+SHA256 (minio/minio-minio-2020.09.23.19.18.30-RELEASE.2020-09-23T19-18-30Z_GH0.tar.gz) = 79933e7878c7799cb65d041da58dee8f8ad229ec387d8e50d9735a5f5c596c63
>+SIZE (minio/minio-minio-2020.09.23.19.18.30-RELEASE.2020-09-23T19-18-30Z_GH0.tar.gz) = 10200483
> SHA256 (minio/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = dc0d15949088e17e74da35c3ae2730f52240ad73e25cf795f532b7282de68e2f
> SIZE (minio/Azure-azure-pipeline-go-v0.2.2_GH0.tar.gz) = 16443
> SHA256 (minio/Azure-azure-storage-blob-go-v0.10.0_GH0.tar.gz) = e3d4304b9fcb7dc5911d648a236fa69c06cb3b33ffb05ac4be6bf3d69125f71e
>diff --git www/qt5-webengine/Makefile www/qt5-webengine/Makefile
>index 4a4074481446..abde5b190dd9 100644
>--- www/qt5-webengine/Makefile
>+++ www/qt5-webengine/Makefile
>@@ -74,7 +74,7 @@ SNDIO_VARS_OFF=		QMAKE_CONFIGURE_ARGS+=-no-sndio
> # We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks
> # whether webenginewidgets is available, which fails when qmake processes all
> # .pro files at once.
>-USES=		gl gnome gperf jpeg python:2.7,build pkgconfig \
>+USES=		gl gnome gperf jpeg python:3.7,build pkgconfig \
> 		qmake:norecursive,outsource qt-dist:5,webengine shebangfix xorg
> USE_GL=		gl
> USE_GNOME=	glib20 libxml2 libxslt
>diff --git www/qt5-webengine/files/patch-configure.pri www/qt5-webengine/files/patch-configure.pri
>index 82636d8a2f51..b37c9db06838 100644
>--- www/qt5-webengine/files/patch-configure.pri
>+++ www/qt5-webengine/files/patch-configure.pri
>@@ -1,5 +1,14 @@
> --- configure.pri.orig	2020-04-08 09:41:36 UTC
> +++ configure.pri
>+@@ -12,7 +12,7 @@
>+     python_version ~= s/[()]//g
>+     python_version = $$split(python_version, ',')
>+     python_major_version = $$first(python_version)
>+-    greaterThan(python_major_version, 2) {
>++    greaterThan(python_major_version, 3) {
>+         qtLog("Python version 3 is not supported by Chromium.")
>+         return(false)
>+     }
> @@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
>  defineTest(qtConfTest_detectPlatform) {
>      QT_FOR_CONFIG += gui-private
>diff --git x11-drivers/xf86-video-amdgpu/Makefile x11-drivers/xf86-video-amdgpu/Makefile
>index e777c3738b7f..bea8fb95007c 100644
>--- x11-drivers/xf86-video-amdgpu/Makefile
>+++ x11-drivers/xf86-video-amdgpu/Makefile
>@@ -16,6 +16,10 @@ PATCHFILES+=	edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d.diff:-p1
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+# No amdgpu kernel driver on non-x86 and PC98.
>+ONLY_FOR_ARCHS=	amd64 i386
>+ONLY_FOR_ARCHS_REASON=	KMS is required and currently only available on x86
>+
> LIB_DEPENDS=	libdrm_amdgpu.so:graphics/libdrm
> 
> USES=		gl xorg-cat:driver
>@@ -24,7 +28,7 @@ USE_GL=		gbm
> ONLY_FOR_ARCHS=	aarch64 i386 amd64
> ONLY_FOR_ARCHS_REASON=	KMS is required and currently only available on x86/arm64
> 
>-CONFIGURE_ARGS+=--disable-udev
>+CONFIGURE_ARGS+=	--disable-udev
> 
> PLIST_FILES=	lib/xorg/modules/drivers/amdgpu_drv.so \
> 		man/man4/amdgpu.4x.gz \
>diff --git x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__drm__queue.c x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__drm__queue.c
>index bbf1c20c91ac..325b5015b6da 100644
>--- x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__drm__queue.c
>+++ x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__drm__queue.c
>@@ -1,6 +1,6 @@
>---- src/amdgpu_drm_queue.c.orig	2016-09-20 08:19:15 UTC
>+--- src/amdgpu_drm_queue.c.orig	2019-10-11 15:20:30 UTC
> +++ src/amdgpu_drm_queue.c
>-@@ -61,7 +61,7 @@ amdgpu_drm_queue_handler(int fd, unsigne
>+@@ -94,7 +94,7 @@ amdgpu_drm_queue_handler(int fd, unsigned int frame, u
>  			 unsigned int usec, void *user_ptr)
>  {
>  	uintptr_t seq = (uintptr_t)user_ptr;
>@@ -9,7 +9,7 @@
>  
>  	xorg_list_for_each_entry_safe(e, tmp, &amdgpu_drm_queue, list) {
>  		if (e->seq == seq) {
>-@@ -133,7 +133,7 @@ amdgpu_drm_abort_one(struct amdgpu_drm_q
>+@@ -213,7 +213,7 @@ amdgpu_drm_queue_alloc(xf86CrtcPtr crtc, ClientPtr cli
>  void
>  amdgpu_drm_abort_client(ClientPtr client)
>  {
>@@ -18,16 +18,16 @@
>  
>  	xorg_list_for_each_entry(e, &amdgpu_drm_queue, list) {
>  		if (e->client == client)
>-@@ -147,7 +147,7 @@ amdgpu_drm_abort_client(ClientPtr client
>+@@ -227,7 +227,7 @@ amdgpu_drm_abort_client(ClientPtr client)
>  void
>  amdgpu_drm_abort_entry(uintptr_t seq)
>  {
> -	struct amdgpu_drm_queue_entry *e, *tmp;
> +	struct amdgpu_drm_queue_entry *e = NULL, *tmp;
>  
>- 	xorg_list_for_each_entry_safe(e, tmp, &amdgpu_drm_queue, list) {
>- 		if (e->seq == seq) {
>-@@ -163,7 +163,7 @@ amdgpu_drm_abort_entry(uintptr_t seq)
>+ 	if (seq == AMDGPU_DRM_QUEUE_ERROR)
>+ 		return;
>+@@ -260,7 +260,7 @@ amdgpu_drm_abort_entry(uintptr_t seq)
>  void
>  amdgpu_drm_abort_id(uint64_t id)
>  {
>@@ -36,7 +36,7 @@
>  
>  	xorg_list_for_each_entry_safe(e, tmp, &amdgpu_drm_queue, list) {
>  		if (e->id == id) {
>-@@ -191,7 +191,7 @@ amdgpu_drm_queue_init()
>+@@ -356,7 +356,7 @@ amdgpu_drm_queue_init(ScrnInfoPtr scrn)
>  void
>  amdgpu_drm_queue_close(ScrnInfoPtr scrn)
>  {
>diff --git x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__kms.c x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__kms.c
>index 885b2058eef4..d3fda4df0126 100644
>--- x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__kms.c
>+++ x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__kms.c
>@@ -1,8 +1,8 @@
>---- src/amdgpu_kms.c.orig	2016-11-17 06:07:48 UTC
>+--- src/amdgpu_kms.c.orig	2019-10-11 15:20:30 UTC
> +++ src/amdgpu_kms.c
>-@@ -723,7 +723,7 @@ amdgpu_dirty_update(ScrnInfoPtr scrn)
>+@@ -930,7 +930,7 @@ static void
>+ amdgpu_dirty_update(ScrnInfoPtr scrn)
>  {
>- 	AMDGPUInfoPtr info = AMDGPUPTR(scrn);
>  	ScreenPtr screen = scrn->pScreen;
> -	PixmapDirtyUpdatePtr ent;
> +	PixmapDirtyUpdatePtr ent = NULL;
>diff --git x11-drivers/xf86-video-amdgpu/pkg-descr x11-drivers/xf86-video-amdgpu/pkg-descr
>index 27f29dac0dbf..239496c03466 100644
>--- x11-drivers/xf86-video-amdgpu/pkg-descr
>+++ x11-drivers/xf86-video-amdgpu/pkg-descr
>@@ -2,7 +2,7 @@ This package contains the X.Org xf86-video-amdgpu driver.
> 
> The amdgpu driver supports AMD Radeon chipsets: OLAND, HAINAN, TAHITI, PITCAIRN,
> VERDE, BONAIRE, KABINI, MULLINS, KAVERI, HAWAII, TOPAZ, TONGA, CARRIZO, FIJI,
>-STONEY, POLARIS11, POLARIS10 
>+STONEY, POLARIS11, POLARIS10
> 
> On FreeBSD requires amdgpu KMS driver from graphics/drm-kmod.
> 
>diff --git x11-fm/nemo/pkg-descr x11-fm/nemo/pkg-descr
>index b4f3fd678e8f..a36d4c8297a3 100644
>--- x11-fm/nemo/pkg-descr
>+++ x11-fm/nemo/pkg-descr
>@@ -1,5 +1,3 @@
>-Nautilus is a file manager tightly integrated into the GNOME destkop.
>-It is also responsible for desktop and icon management, and provides
>-an intuitive interface for accessing files and webpages.
>+Nemo is the file manager for the Cinnamon desktop environment.
> 
>-WWW: http://www.gnome.org/projects/nautilus/
>+WWW: https://github.com/linuxmint/nemo
>diff --git x11-toolkits/p5-Gtk2/Makefile x11-toolkits/p5-Gtk2/Makefile
>index 09c7add4ded7..888bb06c9be4 100644
>--- x11-toolkits/p5-Gtk2/Makefile
>+++ x11-toolkits/p5-Gtk2/Makefile
>@@ -9,7 +9,7 @@ MASTER_SITES=	CPAN \
> 		SF/${PORTNAME:tl}-perl/${PORTNAME}/${PORTVERSION}
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	swills@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Perl module for Gtk+ 2.x graphical user interface library
> 
> LICENSE=	LGPL21
>diff --git x11-toolkits/py-gtk2/Makefile x11-toolkits/py-gtk2/Makefile
>index df060ef8e6c2..50e5d295fe04 100644
>--- x11-toolkits/py-gtk2/Makefile
>+++ x11-toolkits/py-gtk2/Makefile
>@@ -14,6 +14,7 @@ DIST_SUBDIR=	gnome2
> 
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Set of Python bindings for GTK+
>+BROKEN=		Needs python2
> 
> BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR}
> RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR}
>diff --git x11/libX11/Makefile x11/libX11/Makefile
>index 6070ad4c5237..f9401504c827 100644
>--- x11/libX11/Makefile
>+++ x11/libX11/Makefile
>@@ -25,7 +25,5 @@ INSTALL_TARGET=	install-strip
> post-patch:
> 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
> 		${WRKSRC}/configure
>-	@${REINPLACE_CMD} '/^install-data-am:/,/^$$/ \
>-		s/install-specDATA//' ${WRKSRC}/nls/Makefile.in
> 
> .include <bsd.port.mk>
>diff --git x11/rxvt-unicode/Makefile x11/rxvt-unicode/Makefile
>index 2826191a3cb5..2ff9801adedf 100644
>--- x11/rxvt-unicode/Makefile
>+++ x11/rxvt-unicode/Makefile
>@@ -33,7 +33,7 @@ OPTIONS_DEFINE=	PERL XIM UNICODE3 ISO14755 COMBINING RXVT_SCROLLBAR	\
> 
> SHEBANG_FILES=	${WRKSRC}/src/perl/*
> perl_OLD_CMD=	perl
>-perl_CMD=	${SETENV} perl
>+perl_CMD=	/usr/bin/env perl
> 
> PERL_DESC=		Embedded Perl interpreter
> XIM_DESC=		Support for XIM (X Input Method) protocol

Actions: View | Diff

Attachments on bug 249626: 218255