Index: head/Mk/bsd.wx.mk
===================================================================
--- head/Mk/bsd.wx.mk	(revision 527448)
+++ head/Mk/bsd.wx.mk	(revision 527449)
@@ -1,518 +1,518 @@
 # $FreeBSD$
 #
 # bsd.wx.mk - Support for wxWidgets based ports.
 #
 # Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 #
 # The following variables can be defined in a port that uses the wxWidgets
 # library, contributed libraries, WxPython and/or more wxWidgets related
 # components (with run and/or build dependencies). It can be used after and/or
 # before bsd.port.pre.mk, but Python components will only work if Python
 # variables (e.g. USE_PYTHON) are defined before it (this is a bsd.python.mk
 # limitation), at least it is manually included.
 #
 # USE_WX	- Set to the list of wxWidgets versions that can be used by
 #		  the port. The syntax allows the following elements:
 #		  - Single version (e.g. "3.0").
 #		  - Range of versions (e.g. "2.8-3.0"). Must be ascending.
 #		  - Partial range: single version and upper (e.g. "2.8+").
 #		  - Partial range: single version and lower (e.g. "-2.8").
 #		  Multiple elements can be specified separated by spaces.
 # USE_WX_NOT	- Set to the list of wxWidgets versions that can't be used by
 #		  the port. In other words, it removes some versions from
 #		  USE_WX. If the latter is not defined, it will have the value
 #		  of all the possible versions. The syntax is like USE_WX.
 # WX_COMPS	- Set to the list of wxWidgets components the port uses.
 #		  Several components can be specified separated by spaces. By
 #		  default it will have the value of "wx". Suffixes in the form
 #		  ":xxx" may be added to the components to determine the
 #		  dependency type.
 #		  The available components are:
 #		  wx		- The wxWidgets library.
 #		  contrib	- The wxWidgets contributed libraries.
 #		  python	- The wxWidgets API for Python.
 #		  The available dependency types are:
 #		  build		- Requires component for building.
 #		  lib		- Requires component for building and running.
 #		  run		- Requires component for running.
 #		  If no suffix is present then "run" will be used for "python"
 #		  and "lib" for others.
 # WX_CONF_ARGS	- Set to "absolute" or "relative" if the port needs configure
 #		  arguments in addition to the WX_CONFIG environment variable.
 #		  It determines the type of parameters that have to be passed
 #		  to the configure script. In the first case it adds
 #		  "--with-wx-config=${WX_CONFIG}" (absolute path of
 #		  WX_CONFIG), and in second one "--with-wx=${LOCALBASE}" plus
 #		  "--with-wx-config=${WX_CONFIG:T} (prefix and name).
 # WX_PREMK	- Define to determine version and define WX_CONFIG/WX_VERSION
 #		  after <bsd.port.pre.mk> (in case the port needs to manually
 #		  run the script).
 # WANT_WX	- Set to "yes" or a valid single version (no ranges, etc).
 #		  In both cases it will detect the installed wxWidgets
 #		  components and add them to the variable HAVE_WX. If a
 #		  version is selected, HAVE_WX will contain a list of
 #		  components in the other case it will contain a list of
 #		  "component-version" pairs (e.g. wx-2.8, contrib-2.8, etc).
 #		  It has to be used before bsd.port.pre.mk.
 # WANT_WX_VER	- Set to the preferred wxWidgets version for the port. It must
 #		  be present in USE_WX or missing in USE_WX_NOT. This is
 #		  overridden by the user variable WITH_WX_VER if set. It can
 #		  contain multiple versions in order of preference (last ones
 #		  are tried first).
 #
 # The following variables are intended for the user and can be defined in
 # make.conf.
 # WITH_WX_VER	- Define to the list of preferred versions in reverse order.
 #
 # The following variables are defined by this file, to be read from the port.
 # WX_CONFIG	- The path to the wx-config program (with different name).
 # WXRC_CMD	- The path to the wxrc program (with different name).
 # WX_VERSION	- The wxWidgets version that is going to be used.
 # HAVE_WX	- The list of wxWidgets components installed, if WANT_WX was
 #		  defined. The components will have version suffix if it was
 #		  set to "yes".
 #
 # Examples:
 # - A port that needs wxWidgets 2.8 and contributed libraries
 #	USE_WX=		2.8
 #	WX_COMPS=	wx contrib
 # - A port that needs WxPython 2.8 for running.
 #	USE_PYTHON=	yes
 #	USE_WX=		2.8
 #	WX_COMPS=	python:run
 # - A port that needs WxPython 2.8 or 3.0 for building.
 #	USE_PYTHON=	yes
 #	USE_WX=		2.8 3.0
 #	WX_COMPS=	python:build
 # - A port that needs wxWidgets version 2.8 or higher and contributed
 #	libraries.
 #	USE_WX=		2.8+
 #	WX_COMPS=	wx contrib
 # - A port that needs wxWidgets of any version other than 2.8.
 #	USE_WX_NOT=	2.8
 #
 
 WX_Include_MAINTAINER=	ports@FreeBSD.org
 
 #
 # Global definitions.
 #
 
 .if !defined(_WX_Definitions_Done)
 _WX_Definitions_Done=	yes
 
 #
 # Common variables:
 # _WX_COMPS_ALL		- List of valid components.
 # _WX_DEP_TYPES_ALL	- List of valid dependency types.
 # _WX_VERS_ALL		- List of supported versions.
 # _WX_VERS_UC_ALL	- List of Unicode capable versions.
 # _WX_VERS_LISTS	- Reverse lists preference order.
 #
 
 _WX_COMPS_ALL=		wx contrib python
 _WX_DEP_TYPES_ALL=	build lib run
 _WX_VERS_ALL=		2.8 3.0 3.1
 _WX_VERS_UC_ALL=	2.8 3.0 3.1
 _WX_VERS_SKIP=		3.0 3.1
 _WX_VERS_LISTS=		WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED
 
 #
 # Variables used to determine what is needed:
 # _WX_PORT_comp_ver	- Port directory.
 # _WX_LIB_comp_ver	- Name of the shared library (optional).
 # _WX_SHVER_comp_ver	- Shared library version (optional).
 # _WX_FILE_comp_ver	- File installed by that component.
 # _WX_DEPTYPE_comp_ver	- Default dependency type (optional).
 #
 
 # wxgtk 2.8
 _WX_PORT_wx_2.8=	x11-toolkits/wxgtk28
 _WX_LIB_wx_2.8=		wx_base${_WX_UC}-2.8
 
 _WX_PORT_contrib_2.8=	x11-toolkits/wxgtk28-contrib
 _WX_LIB_contrib_2.8=	wx_gtk2${_WX_UC}_fl-2.8
 
 _WX_PORT_python_2.8=	x11-toolkits/py-wxPython28
 _WX_FILE_python_2.8=	${PYTHON_SITELIBDIR}/wx-2.8-gtk2${_WX_PYSUFX}/wx/__init__.py
 
 # wxgtk 3.0
 _WX_PORT_wx_3.0=	x11-toolkits/wxgtk30
 _WX_LIB_wx_3.0=		wx_baseu-3.0
 
-_WX_PORT_python_3.0=	x11-toolkits/py-wxPython30
-_WX_FILE_python_3.0=	${PYTHON_SITELIBDIR}/wx-3.0-gtk3/wx/__init__.py
+_WX_PORT_python_3.0=	x11-toolkits/py-wxPython40@${PY_FLAVOR}
+_WX_FILE_python_3.0=	${PYTHON_SITELIBDIR}/wx/__init__.py
 
 # wxgtk 3.1
 _WX_PORT_wx_3.1=	x11-toolkits/wxgtk31
 _WX_LIB_wx_3.1=		wx_baseu-3.1
 
 # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropriately.
 # Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib".
 
 .	for comp in ${_WX_COMPS_ALL}
 _WX_COMP=		${comp}
 .		for ver in ${_WX_VERS_ALL}
 .			if defined(_WX_LIB_${comp}_${ver})
 _WX_SHVER_${comp}_${ver}=	0
 _WX_FILE_${comp}_${ver}=	${LOCALBASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}}
 .			endif
 .			if ${_WX_COMP} == "python"
 _WX_DEPTYPE_${comp}_${ver}=	run
 .			else
 _WX_DEPTYPE_${comp}_${ver}=	lib
 .			endif
 .		endfor
 .	endfor
 .endif		# !_WX_Defined_Done
 
 #
 # Check if we are going to determine the version.
 #
 
 .if !defined(_WX_Version_Done) && (defined(_POSTMKINCLUDED) || \
     (defined(WX_PREMK) && defined(BEFOREPORTMK) && \
     (defined(USE_WX) || defined(USE_WX_NOT))))
 _WX_Need_Version=	yes
 .endif
 
 #
 # Check for present components.
 #
 
 # Requested by the user.
 
 .if defined(WANT_WX) && defined(BEFOREPORTMK)
 _WANT_WX=		${WANT_WX}
 .endif
 
 # Used for autodetection of installed versions.
 
 .if defined(_WX_Need_Version)
 _WANT_WX=		yes
 .endif
 
 .if defined(_WANT_WX)
 
 # These variables are reprocessed later so they won't affect other parts.
 
 _WX_VER_FINAL=		${_WX_VERS_UC_ALL}
 _WX_UC=			u
 _WX_PYSUFX=		-unicode
 
 # Fill _HAVE_WX with the installed components.
 
 .	undef _HAVE_WX
 .	for __WANT_WX in ${_WANT_WX}
 # Check if _WANT_WX contains more than one word.
 .		if defined(_HAVE_WX)
 IGNORE?=		selected multiple values for WANT_WX: ${_WANT_WX}
 .		endif
 _HAVE_WX=		#
 # Check for all versions.
 .		if ${_WANT_WX:tl} == "yes"
 .			for comp in ${_WX_COMPS_ALL}
 .				for ver in ${_WX_VER_FINAL}
 _WX_COMP=		_WX_FILE_${comp}_${ver}
 .					if defined(${_WX_COMP}) && exists(${${_WX_COMP}})
 _HAVE_WX+=		${comp}-${ver}
 .					endif
 .				endfor
 .			endfor
 # Check for a specific version.
 .		elif ${_WX_VERS_ALL:M${__WANT_WX}}
 .			for comp in ${_WX_COMPS_ALL}
 .				if exists(${_WX_FILE_${comp}_${__WANT_WX}})
 _HAVE_WX+=		${comp}
 .				endif
 .			endfor
 .		else
 IGNORE?=		selected an invalid value for WANT_WX: ${__WANT_WX}
 .		endif
 .	endfor
 .endif		# _WANT_WX
 
 # Requested by the user.
 
 .if defined(WANT_WX) && defined(BEFOREPORTMK)
 HAVE_WX:=		${_HAVE_WX}
 .endif
 
 # Used for autodetection of installed versions.
 
 .if defined(_WX_Need_Version)
 _WX_VER_INSTALLED:=	${_HAVE_WX:Mwx-*:S/wx-//}
 .endif
 
 #
 # Select wxWidgets version.
 #
 
 .if defined(_WX_Need_Version)
 _WX_Version_Done=	yes
 
 #
 # Basic component parsing (ignores dependency types).
 #
 # The variables used are:
 # _WX_COMP		- Component part.
 # _WX_COMPS_FINAL	- Final list of components.
 #
 
 # Detect duplicated components.
 
 _WX_COMPS_FINAL=	#
 .for comp in ${WX_COMPS}
 _WX_COMP=		${comp:C/:([[:alpha:]]+)$//}
 .	for __WX_COMP in ${_WX_COMP}
 .		if ${_WX_COMPS_ALL:M${__WX_COMP}} == ""
 IGNORE?=		selected an invalid wxWidgets component: ${__WX_COMP}
 .		endif
 .	endfor
 .	for newcomp in ${_WX_COMP}
 .		if ${_WX_COMPS_FINAL:M${newcomp}} == "" && !defined(IGNORE)
 _WX_COMPS_FINAL+=	${newcomp}
 .		endif
 .	endfor
 .endfor
 
 # Set defaults (if one isn't present).
 
 USE_WX?=		${_WX_VERS_ALL}
 USE_WX_NOT?=		#
 
 #
 # Make lists of valid and invalid versions.
 #
 # The following variables are used:
 # _WX_VER_CHECK		- If the version is a single one, express in a range.
 # _WX_VER_MIN		- Lower version of the range.
 # _WX_VER_MAX		- Higher version of the range.
 # _WX_VER_LIST		- List of requested versions.
 # _WX_VER_NOT_LIST	- List of disallowed versions.
 # _WX_VER_MERGED	- List of requested version without disallowed ones.
 #
 
 .for list in VER VER_NOT
 _WX_${list}_LIST=	#
 .	for ver in ${USE_WX${list:C/VER//}}
 _WX_VER_CHECK:=		${ver:C/^([[:digit:]]+(\.[[:digit:]]+)*)$/\1-\1/}
 _WX_VER_MIN:=		${_WX_VER_CHECK:C/([[:digit:]]+(\.[[:digit:]]+)*)[-+].*/\1/}
 _WX_VER_MAX:=		${_WX_VER_CHECK:C/.*-([[:digit:]]+(\.[[:digit:]]+)*)/\1/}
 # Minimum version not specified.
 .		if ${_WX_VER_MIN} == ${_WX_VER_CHECK}
 .			undef _WX_VER_MIN
 .			for v in ${_WX_VERS_ALL}
 .				if ${_WX_VER_CHECK:C/[-+]//} == ${v} || ${_WX_VERS_SKIP:M${v}} == ""
 _WX_VER_MIN?=		${v}
 .				endif
 .			endfor
 .		endif
 # Maximum version not specified.
 .		if ${_WX_VER_MAX} == ${_WX_VER_CHECK}
 .			for v in ${_WX_VERS_ALL}
 .				if ${_WX_VER_CHECK:C/[-+]//} == ${v} || ${_WX_VERS_SKIP:M${v}} == ""
 _WX_VER_MAX=		${v}
 .				endif
 .			endfor
 .		endif
 # Expand versions and add valid ones to each list.
 .		for v in ${_WX_VERS_ALL}
 .			if ${_WX_VER_MIN} <= ${v} && ${_WX_VER_MAX} >= ${v} && \
 			   ${_WX_${list}_LIST:M${v}} == ""
 _WX_${list}_LIST+=	${v}
 .			endif
 .		endfor
 .	endfor
 .endfor
 
 # Merge the lists into a single list of valid versions.
 
 _WX_VER_MERGED=		#
 .for ver in ${_WX_VER_LIST}
 .	if ${_WX_VER_NOT_LIST:M${ver}} == ""
 _WX_VER_MERGED+=	${ver}
 .	endif
 .endfor
 
 # Check for a null version.
 
 .if empty(_WX_VER_MERGED)
 IGNORE?=		selected a null or invalid wxWidgets version
 .endif
 
 # Avoid versions which have unavailable components.
 
 .for ver in ${_WX_VER_MERGED}
 .	for comp in ${_WX_COMPS_FINAL}
 .		if !defined(_WX_PORT_${comp}_${ver})
 _WX_WRONG_COMPS+=	${comp}
 _WX_WRONG_VERS+=	${ver}
 _WX_VER_MERGED:=	${_WX_VER_MERGED:N${ver}}
 .		endif
 .	endfor
 .endfor
 
 .if empty(_WX_VER_MERGED)
 IGNORE?=		selected wxWidgets versions (${_WX_WRONG_VERS}) which do not have the selected components (${_WX_WRONG_COMPS})
 .endif
 
 #
 # Unicode support.
 #
 
 # Create a list of capable versions.
 
 _WX_VER_UC=		#
 .for ver in ${_WX_VER_MERGED}
 .	if ${_WX_VERS_UC_ALL:M${ver}} != ""
 _WX_VER_UC+=		${ver}
 .	endif
 .endfor
 
 # Set Unicode variables.
 
 _WX_VER_FINAL=		${_WX_VER_UC}
 _WX_UC=			u
 _WX_PYSUFX=		-unicode
 
 # Remove unusable installed versions.
 
 .for ver in ${_WX_VER_INSTALLED}
 .	if ${_WX_VER_FINAL:M${ver}} == ""
 _WX_VER_INSTALLED:=	${_WX_VER_INSTALLED:N${ver}}
 .	endif
 .endfor
 
 #
 # Choose final version.
 #
 
 #
 # Check for the following (in order):
 # 1) WITH_WX_VER	- User preference.
 # 2) WANT_WX_VER	- Port preference.
 # 3) _WX_VER_INSTALLED	- Installed versions.
 # 4) _WX_VER_FINAL	- Available versions.
 
 
 .for list in _WX_VER_FINAL ${_WX_VERS_LISTS}
 .	if defined(${list})
 .		for ver in ${${list}}
 .			if ${_WX_VER_FINAL:M${ver}} != ""
 _WX_VER=		${ver}
 .			endif
 .		endfor
 .	endif
 .endfor
 
 #
 # Set variables.
 #
 
 .if ${_WX_VER:R} == 3
 _GTKVER=	3
 .else
 _GTKVER=	2
 .endif
 
 WX_CONFIG?=		${LOCALBASE}/bin/wxgtk${_GTKVER}${_WX_UC}-${_WX_VER}-config
 WXRC_CMD?=		${LOCALBASE}/bin/wxrc-gtk${_GTKVER}${_WX_UC}-${_WX_VER}
 WX_VERSION?=		${_WX_VER}
 
 .endif		# _WX_Need_Version
 
 #
 # Process components list and add dependencies, variables, etc.
 #
 
 .if defined(_POSTMKINCLUDED)
 
 #
 # Component parsing.
 #
 # The variables used are:
 # _WX_COMP		- Component part.
 # _WX_DEP_TYPE		- Dependency type part.
 # _WX_COMP_NEW		- Component + dependency type.
 # _WX_COMPS_FINAL	- Final list of components with dependency types.
 #
 
 # Default components.
 
 WX_COMPS?=		wx
 
 # Detect invalid and duplicated components.
 
 _WX_COMPS_FINAL=	#
 .for comp in ${WX_COMPS}
 _WX_COMP=		${comp:C/:([[:alpha:]]+)$//}
 .	if ${_WX_COMP} == ${comp}
 _WX_DEP_TYPE=		${_WX_DEPTYPE_${comp}_${_WX_VER}}
 .	else
 _WX_DEP_TYPE=		${comp:C/.+:([[:alpha:]]+)$/\1/}
 .	endif
 _WX_COMP_NEW=		${_WX_COMP}_${_WX_DEP_TYPE}
 .	for __WX_COMP in ${_WX_COMP}
 .		if ${_WX_COMPS_ALL:M${__WX_COMP}} == ""
 IGNORE?=		selected an invalid wxWidgets component: ${__WX_COMP}
 .		endif
 .	endfor
 .	for __WX_DEP_TYPE in ${_WX_DEP_TYPE}
 .		if ${_WX_DEP_TYPES_ALL:M${__WX_DEP_TYPE}} == ""
 IGNORE?=		selected an invalid wxWidgets dependency type: ${__WX_DEP_TYPE}
 .		endif
 .	endfor
 .	if !defined(_WX_PORT_${_WX_COMP}_${_WX_VER})
 IGNORE?=		selected a wxWidgets component (${_WX_COMP}) which is not available for the selected version (${_WX_VER})
 .	endif
 .	for newcomp in ${_WX_COMP_NEW}
 .		if ${_WX_COMPS_FINAL:M${newcomp}} == "" && !defined(IGNORE)
 _WX_COMPS_FINAL+=	${newcomp}
 .		endif
 .	endfor
 .endfor
 
 # Add dependencies.
 #
 # The variable used are:
 # _WX_COMP		- Component part.
 # _WX_DEP_TYPE		- Dependency type part.
 
 .for comp in ${_WX_COMPS_FINAL}
 _WX_COMP=		${comp:C/_([[:alpha:]]+)$//}
 _WX_DEP_TYPE=		${comp:C/.+_([[:alpha:]]+)$/\1/}
 # XXX Need a .for loop here so the variable is expanded before the assignment.
 .	for comp_part in ${_WX_COMP}
 .		if ${_WX_DEP_TYPE} == "lib"
 .			if defined(_WX_LIB_${_WX_COMP}_${_WX_VER})
 LIB_DEPENDS+=		lib${_WX_LIB_${comp_part}_${_WX_VER}}.so:${_WX_PORT_${comp_part}_${_WX_VER}}
 .			else
 BUILD_DEPENDS+=		${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${comp_part}_${_WX_VER}}
 RUN_DEPENDS+=		${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${comp_part}_${_WX_VER}}
 .			endif
 .		else
 ${_WX_DEP_TYPE:tu}_DEPENDS+=	${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${comp_part}_${_WX_VER}}
 .		endif
 .	endfor
 .endfor
 
 #
 # Set build related variables.
 #
 
 MAKE_ENV+=		WX_CONFIG=${WX_CONFIG}
 CONFIGURE_ENV+=		WX_CONFIG=${WX_CONFIG}
 
 .if defined(WX_CONF_ARGS)
 .	if ${WX_CONF_ARGS:tl} == "absolute"
 CONFIGURE_ARGS+=	--with-wx-config=${WX_CONFIG}
 .	elif ${WX_CONF_ARGS:tl} == "relative"
 CONFIGURE_ARGS+=	--with-wx=${LOCALBASE} \
 			--with-wx-config=${WX_CONFIG:T}
 .	else
 IGNORE?=		selected an invalid wxWidgets configure argument type: ${WX_CONF_ARGS}
 .	endif
 .endif
 
 .endif		# _POSTMKINCLUDED
Index: head/audio/py-karaoke/Makefile
===================================================================
--- head/audio/py-karaoke/Makefile	(revision 527448)
+++ head/audio/py-karaoke/Makefile	(revision 527449)
@@ -1,99 +1,99 @@
 # Created by: Elias Mandouvalos <ocean@mail.gr>
 # $FreeBSD$
 
 PORTNAME=	karaoke
 PORTVERSION=	0.7.5
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	audio python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python karaoke application (Plays CD+G, MP3+G, OGG+G files)
 
 LICENSE=	LGPL21+
 
 BUILD_DEPENDS=	${PYGAME} \
 		${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 LIB_DEPENDS=	libaa.so:graphics/aalib
 RUN_DEPENDS=	dejavu>0:x11-fonts/dejavu \
 		${PYGAME} \
 		${PYNUMPY}
 
 USES=		compiler:c++11-lib desktop-file-utils iconv python:2.7 sdl \
 		shebangfix xorg zip
 SHEBANG_FILES=	install/pykaraoke_mini install/pykar install/pykaraoke \
 		install/pycdg install/pympg
 USE_SDL=	sdl
 USE_XORG=	x11 xau xcb xdmcp
-USE_WX=		3.0+
+USE_WX=		2.8+
 WX_COMPS=	python:lib
 
 USE_PYTHON=	distutils autoplist
 
 DATADIR=	${PREFIX}/share/py${PORTNAME}
 
 PLIST_FILES=	${BIN_SCRIPTS:S,^,bin/,} \
 		${DATA_FONTS:S,^,%%DATADIR%%/fonts/,}
 
 OPTIONS_DEFINE=		MUTAGEN
 
 MUTAGEN_DESC=		Mutagen support
 MUTAGEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR}
 
 BIN_SCRIPTS=	cdg2mpg pycdg pykar pykaraoke pykaraoke_mini pympg
 DATA_FONTS=	DejaVuSans.ttf DejaVuSansCondensed.ttf \
 		DejaVuSansCondensed-Bold.ttf
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc
 MAKE_ENV+=	LD_LIBRARY_PATH="${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.cfg
 	@${REINPLACE_CMD} -e \
 		'/if /s|==|=|' ${WRKSRC}/install/cdg2mpg
 .for i in pykaraoke.desktop pykaraoke_mini.desktop
 	@${REINPLACE_CMD} -e \
 		'/^Encodings=/d ; \
 		 /^Icon=/s|/usr/share/pykaraoke|${DATADIR}| ; \
 		 /^MimeType=/s|audio/midi$$|audio/midi;| ; \
 		 /^Categories=/s|Application;||' ${WRKSRC}/install/${i}
 .endfor
 
 post-build:
 	@${MKDIR} ${WRKDIR}/wrappers
 .for i in ${BIN_SCRIPTS}
 	@${ECHO_CMD} -n \
 		>> ${WRKDIR}/wrappers/${i}
 	@${ECHO_CMD} '#!/bin/sh' \
 		>> ${WRKDIR}/wrappers/${i}
 .if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc
 	@${ECHO_CMD} 'LD_LIBRARY_PATH="${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH"' \
 		>> ${WRKDIR}/wrappers/${i}
 	@${ECHO_CMD} 'export LD_LIBRARY_PATH' \
 		>> ${WRKDIR}/wrappers/${i}
 	@${ECHO_CMD} \
 		>> ${WRKDIR}/wrappers/${i}
 .endif
 	@${ECHO_CMD} 'exec ${PREFIX}/libexec/${i} "$$@"' \
 		>> ${WRKDIR}/wrappers/${i}
 .endfor
 
 post-install:
 .for i in ${BIN_SCRIPTS}
 	(cd ${WRKDIR}/wrappers && ${INSTALL_SCRIPT} ${i} \
 		${STAGEDIR}${PREFIX}/bin)
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}/fonts
 .for i in ${DATA_FONTS}
 	@${LN} -sf ${LOCALBASE}/share/fonts/dejavu/${i} \
 		${STAGEDIR}${DATADIR}/fonts
 .endfor
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pycdgAux.so
 
 .include <bsd.port.post.mk>
Index: head/cad/kicad/Makefile
===================================================================
--- head/cad/kicad/Makefile	(revision 527448)
+++ head/cad/kicad/Makefile	(revision 527449)
@@ -1,83 +1,83 @@
 # Created by: Thierry Thomas <thierry@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kicad
 PORTVERSION=	5.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	cad
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Schematic and PCB editing software
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm	\
 		swig3.0:devel/swig30
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs	\
 		libngspice.so:cad/ngspice_rework@shlib	\
 		libTKernel.so:cad/opencascade		\
 		libpixman-1.so:x11/pixman		\
 		libpng.so:graphics/png			\
 		libcurl.so:ftp/curl
 
 CONFLICTS=	kicad-devel-r201*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KiCad
 GH_PROJECT=	kicad-source-mirror
 
 USES=		cmake:noninja compiler:c++11-lib desktop-file-utils gl \
 		gnome pkgconfig python:2.7 shared-mime-info shebangfix ssl \
 		tar:xz xorg
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 
 USE_XORG=	ice x11 xext
 USE_GL=		gl glew glu glut
 USE_WX=		3.0
 WX_COMPS=	python:lib wx
 USE_GNOME=	atk cairo
 CXXFLAGS+=	--std=c++11 -I${WRKSRC}/include -I${LOCALBASE}/include
 CMAKE_ARGS=	-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}	\
 		-DwxWidgets_USE_UNICODE=ON			\
 		-DKICAD_SCRIPTING_WXPYTHON=ON			\
 		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD}		\
 		-DKICAD_SCRIPTING=ON 				\
 		-DKICAD_SCRIPTING_MODULES=ON			\
-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF		\
+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON		\
 		-DKICAD_USE_OCE=OFF				\
 		-DKICAD_USE_OCC=ON				\
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
 OPTIONS_DEFINE=	DOCS DOXYGEN NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 DOXYGEN_VARS=	LICENSE+=GFDL LICENSE_COMB=multi
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_ALL_TARGET=	all doxygen-docs
 DOXYGEN_PORTDOCS=	doxygen
 
 # The CheckCXXSymbolExists module has been shipped with CMake since 3.0 times.
 # The ancient implementation that this bundled module uses, no longer works
 # because it uses CMake internals that have gone away in 3.11.
 post-extract:
 	${RM} ${WRKSRC}/CMakeModules/CheckCXXSymbolExists.cmake
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/share/kicad|${DATADIR}|'		\
 		-e 's|/usr/local|${PREFIX}|'				\
 		${WRKSRC}/common/gestfich.cpp
 	${REINPLACE_CMD} -e 's|/usr/bin/xdg-open|${LOCALBASE}/bin/xdg-open|' \
 		${WRKSRC}/common/pgm_base.cpp
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/Documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/cad/kicad-devel/Makefile
===================================================================
--- head/cad/kicad-devel/Makefile	(revision 527448)
+++ head/cad/kicad-devel/Makefile	(revision 527449)
@@ -1,161 +1,161 @@
 # Created by: Michael Reifenberger <mr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
 
 MAINTAINER=		mr@FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/bin/swig3.0:devel/swig30
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libngspice.so:cad/ngspice_rework@shlib \
 		libTKernel.so:cad/opencascade \
 		libpixman-1.so:x11/pixman \
 		libpng.so:graphics/png \
 		libcurl.so:ftp/curl
 
 CONFLICTS=	kicad-4.*
 
 USE_GITHUB=     yes
 GH_ACCOUNT=     KiCad
 GH_PROJECT=     kicad-source-mirror
 GH_TAGNAME=	${GIT_SRC_HASH}
 
 CXXFLAGS+=	--std=c++11 -I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include -msse
 USE_GL=		gl glew glu glut
 USE_WX=		3.0
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_GNOME=	atk cairo	# Required by libwx_gtk2_aui-2.8.so
 USE_XORG+=	ice pixman x11 xext
 
 BROKEN_aarch64=		Fails to compile: use of undeclared identifier builtin_ia32_emms
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_SUB=	OPSYS=${OPSYS}	\
 		DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
 BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
 USES=		desktop-file-utils shared-mime-info compiler:c++11-lib tar:bzip2 cmake:insource,noninja \
 		gettext python:2.7 shebangfix ssl gl xorg gnome
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
 
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Debug" \
 		-DKICAD_TESTING_VERSION=ON \
 		-DKICAD_BUILD_VERSION=${DISTVERSION} \
 		-DCMAKE_INCLUDE_PATH="${WRKSRC}/include ${LOCALBASE}/include" \
 		-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
 		-DwxWidgets_USE_DEBUG=ON \
 		-DwxWidgets_USE_USE_UNICODE=ON \
 		-DwxWidgets_wxrc_EXECUTABLE=${WXRC_CMD} \
 		-DKICAD_SCRIPTING=ON \
 		-DKICAD_SCRIPTING_MODULES=ON \
 		-DKICAD_SCRIPTING_WXPYTHON=ON \
-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=OFF \
+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
 		-DKICAD_SKIP_BOOST=YES \
 		-DKICAD_SPICE=ON \
 		-DKICAD_USE_OCE=OFF \
 		-DKICAD_USE_OCC=ON \
 		-DOCC_INCLUDE_DIR=${LOCALBASE}/include/OpenCASCADE
 
 .include "Makefile.git_rev"
 
 showversions:
 	@${ECHO} "GIT_SRC_HASH: ${GIT_SRC_HASH}"
 	@${ECHO} "GIT_SRC_DATE: ${GIT_SRC_DATE}"
 	@${ECHO} "DISTDIR: ${DISTDIR}"
 	@${ECHO} "DIST_SUBDIR: ${DIST_SUBDIR}"
 	@${ECHO} "DISTNAME: ${DISTNAME}"
 	@${ECHO} "DISTVERSION: ${DISTVERSION}"
 
 # Updating to new rev:
 # sh files/newVersion.sh
 # make makesum && make clean
 # make install #breaks probably due to plist differences
 # make makeplist > pkg-plist #One has to edit/review the generated plist
 # make generate-plist && make check-plist
 # < Check PLIST_FILE_LIST below >
 
 tmp:
 	echo "${DATADIR} ${DATADIR:H}"
 
 # The CheckCXXSymbolExists module has been shipped with CMake since 3.0 times.
 # The ancient implementation that this bundled module uses, no longer works
 # because it uses CMake internals that have gone away in 3.11.
 post-extract:
 	${RM} ${WRKSRC}/CMakeModules/CheckCXXSymbolExists.cmake
 
 post-configure:
 	${REINPLACE_CMD} -e 's|#define HAVE_ISO646_H|//#define HAVE_ISO646_H|'     \
 		${WRKSRC}/config.h
 	for f in `${FIND} ${WRKSRC} -name \*.make -o -name link.txt` ; do				\
 		${REINPLACE_CMD}						\
 		-e 's|CC = gcc|#CC = gcc|'					\
 		-e 's|LD = gcc|LD = ${CC}|'					\
 		-e 's|LD = g++|LD = ${CXX}|'					\
 		-e 's|wx-config|${WX_CONFIG}|'					\
 		-e 's|CXX_FLAGS =|CXX_FLAGS = ${WRKSRC}/include -I${LOCALBASE}/include|'		\
 		-e 's|C_FLAGS =|C_FLAGS = ${WRKSRC}/include -I${LOCALBASE}/include|'		\
 		-e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|'			\
 		-e 's|gcc -D|${CC} -D|'						\
 		-e 's/-pthread;-D_THREAD_SAFE/-pthread -D_THREAD_SAFE/g'	\
 		$$f ;								\
 	done
 
 pre-install:
 	@echo "${DATADIR}, ${DOCSDIR}"
 
 #post-install:
 #.for subdir in library modules template
 #	${CP} -Rp ${WRKDIR}/kicad-library-master/${subdir} ${STAGEDIR}${DATADIR}
 #.endfor
 #.for subdir in internat
 #	${CP} -Rp ${WRKDIR}/kicad-doc/${subdir} ${STAGEDIR}${DOCSDIR}
 #.endfor
 
 PLIST_FILE_LIST=	bin/freeroute.jnlp \
 			bin/cvpcb \
 			bin/eeschema \
 			bin/gerbview \
 			bin/kicad \
 			bin/pcbnew \
 			bin/pl_editor \
 			bin/bitmap2component \
 			bin/pcb_calculator \
 			share/mimelnk/application/x-kicad-schematic.desktop \
 			share/mimelnk/application/x-kicad-project.desktop \
 			share/icons/hicolor/24x24/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/48x48/apps/kicad.png \
 			share/icons/hicolor/48x48/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/scalable/apps/kicad.svg \
 			share/icons/hicolor/scalable/mimetypes/application-x-kicad-project.svg \
 			share/icons/hicolor/16x16/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/32x32/mimetypes/application-x-kicad-project.png \
 			share/icons/hicolor/22x22/mimetypes/application-x-kicad-project.png \
 			share/mime/packages/kicad.xml \
 			share/applications/kicad.desktop \
 			share/applications/eeschema.desktop
 
 PLIST_DIR_LIST=		lib/kicad
 
 PLIST_SHAREDDIR_LIST=	share/mimelnk/application \
 			share/mimelnk
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${CHOSEN_COMPILER_TYPE} == gcc
 IGNORE=		builds only with clang
 .endif
 
 .include <bsd.port.post.mk>
Index: head/comms/congruity/Makefile
===================================================================
--- head/comms/congruity/Makefile	(revision 527448)
+++ head/comms/congruity/Makefile	(revision 527449)
@@ -1,25 +1,25 @@
 # Created by: Stephen Hurd <shurd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	congruity
 PORTVERSION=	18
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms
 MASTER_SITES=	SF
 
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	GUI Logitech Harmony configuration tool
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libconcord>=0:comms/py-libconcord@${PY_FLAVOR}
 
 USES=		desktop-file-utils gmake tar:bzip2 python:2.7 shebangfix
 MAKE_ARGS=	MANDIR=${PREFIX}/man
-USE_WX=		2.8+
+USE_WX=		3.0+
 WX_COMPS=	python
 SHEBANG_FILES=	congruity mhgui
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
Index: head/comms/gnuradio/Makefile
===================================================================
--- head/comms/gnuradio/Makefile	(revision 527448)
+++ head/comms/gnuradio/Makefile	(revision 527449)
@@ -1,138 +1,138 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
 PORTVERSION=	3.8.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 
 LICENSE=	GPLv3
 
 BROKEN_aarch64=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 BROKEN_armv6=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 BROKEN_armv7=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
 		cheetah:devel/py-cheetah@${PY_FLAVOR} \
 		cppzmq>0:net/cppzmq \
 		guile:lang/guile \
 		minixmlto:textproc/minixmlto \
 		sdl-config:devel/sdl12 \
 		swig3.0:devel/swig30 \
 		xdg-open:devel/xdg-utils \
 		${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libgmpxx.so:math/gmp \
 		libqwt6.so:x11-toolkits/qwt6 \
 		${PY_BOOST} \
 		liblog4cpp.so:devel/log4cpp \
 		libportaudio.so:audio/portaudio \
 		libjack.so:audio/jack \
 		libasound.so:audio/alsa-lib \
 		libgsl.so:math/gsl \
 		libgsm.so:audio/gsm \
 		libboost_date_time.so:devel/boost-libs \
 		liborc-0.4.so:devel/orc \
 		libzmq.so:net/libzmq4
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cmake desktop-file-utils fortran gnome iconv \
 		perl5 pkgconfig pyqt:5 python:2.7 qt:5 shared-mime-info shebangfix
 
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DENABLE_GR_CTRLPORT="YES" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
 		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\
 		-DXMLTO_EXECUTABLE:STRING=minixmlto
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 USE_CXXSTD=	c++11
 USE_GNOME=	pygtk2
 USE_PYQT=	core gui opengl
 USE_WX=		3.0
 USE_QT=		buildtools core gui xml qmake widgets
 CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
 CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
 CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_LDCONFIG=	yes
 LIBSTRIP_FILES=	analog audio blocks channels digital dtv fec fft\
 		filter pmt qtgui runtime trellis video-sdl\
 		vocoder wavelet
 
 OPTIONS_DEFINE=		DOCS UHD TESTING DOXYGEN
 # Unfortunately building docs on i386 fails
 ##OPTIONS_EXCLUDE_${i386}=	DOXYGEN
 # Yay. building docs is broken on 10 and HEAD too so turn them all off
 OPTIONS_EXCLUDE=	DOXYGEN
 OPTIONS_SUB=		yes
 UHD_DESC=	Include UHD support from Ettus
 TESTING_DESC=	Include testing support
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-apidoc:textproc/py-sphinx@${PY_FLAVOR} \
 			dot:graphics/graphviz \
 			xmlto:textproc/xmlto \
 			freefont-ttf>0:x11-fonts/freefont-ttf
 DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON" \
 		-DENABLE_DOCS:STRING="ON"
 DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
 		-DENABLE_DOCS:STRING="OFF"
 
 UHD_CMAKE_ON=	-DENABLE_GR_UHD:STRING="ON"
 UHD_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
 
 TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
 TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MUHD}
 LIBSTRIP_FILES+=	uhd
 LIB_DEPENDS+=	libuhd.so:comms/uhd
 PLIST_SUB+=	UHD=""
 .else
 PLIST_SUB+=	UHD="@comment "
 .endif
 
 PATCH_FILES=	docs/doxygen/Doxyfile.in \
 		gr-fec/lib/CMakeLists.txt
 
 post-patch:
 	@${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \
 	    ${XARGS} ${REINPLACE_CMD} -e \
 		 "s|{GR_LIBRARY_DIR}/pkgconfig|{GR_PKGCONFIG_DIR}/pkgconfig|g"
 
 .for p in ${PATCH_FILES}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/${p}
 .endfor
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} include/volk/asm/neon include/volk/asm/orc include/volk/asm
 
 .include <bsd.port.post.mk>
Index: head/comms/quisk/Makefile
===================================================================
--- head/comms/quisk/Makefile	(revision 527448)
+++ head/comms/quisk/Makefile	(revision 527449)
@@ -1,39 +1,39 @@
 # Created by: Stephen Hurd <shurd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	quisk
 DISTVERSION=	4.1.40
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Software Defined Radio (SDR)
 
 LICENSE=	GPLv2
 
 BROKEN_i386=	strip: elf_update() failed: Invalid data buffer descriptor (bug#238131)
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libportaudio.so:audio/portaudio \
 		libasound.so:audio/alsa-lib \
 		libpulse.so:audio/pulseaudio
 
 USES=		python:2.7
 USE_PYTHON=	distutils noflavors autoplist
 USE_WX=		3.0+
 
 WX_COMPS=	python
 
 post-extract:
 	@${RM} ${WRKSRC}/_quisk.so ${WRKSRC}/sdriqpkg/sdriq.so \
 		${WRKSRC}/freedvpkg/libcodec2_32.so \
 		${WRKSRC}/freedvpkg/libcodec2_64.so
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
 
 post-stage:
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
Index: head/databases/grass7/Makefile
===================================================================
--- head/databases/grass7/Makefile	(revision 527448)
+++ head/databases/grass7/Makefile	(revision 527449)
@@ -1,196 +1,196 @@
 # Created by: Mikael URANKAR and Loïc BARTOLETTI
 # $FreeBSD$
 
 PORTNAME=	grass
 PORTVERSION=	7.6.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
 		http://grass.fbk.eu/%SUBDIR%/ \
 		http://grass.gis-lab.info/%SUBDIR%/ \
 		http://grass.meteo.uni.wroc.pl/%SUBDIR%/ \
 		http://grass.polytechnic.edu.na/%SUBDIR%/ \
 		http://grass.unibuc.ro/%SUBDIR%/ \
 		http://mirrors.ibiblio.org/grass/%SUBDIR%/ \
 		http://pinus.gntech.ac.kr/grass/%SUBDIR%/ \
 		http://wgbis.ces.iisc.ernet.in/grass/%SUBDIR%/ \
 		http://wgrass.media.osaka-cu.ac.jp/grassh/%SUBDIR%/
 MASTER_SITE_SUBDIR=	grass${VER}/source
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Open source Geographical Information System (GIS)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL.TXT
 
 BROKEN_sparc64=	Does not configure on sparc64
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.2:math/py-numpy@${PY_FLAVOR}
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libtiff.so:graphics/tiff \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgeos.so:graphics/geos
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		blaslapack fortran gmake gl gnome \
 		iconv jpeg perl5 pkgconfig python:2.7 \
 		readline shebangfix tk xorg
 SHEBANG_LANG=	nviz
 nviz_OLD_CMD=	nviz
 nviz_CMD=	${PREFIX}/${GRASS_INST_DIR}/bin/nviz
 USE_XORG=	sm ice x11 xext xi xmu xrender xt
 USE_GL=		gl glu
 USE_GNOME=	cairo
 USE_WX=		3.0
 WX_COMPS=	wx:build python:run
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-libs=${LOCALBASE}/lib \
 		--with-opengl-includes=${LOCALBASE}/include/ \
 		--with-opengl-libs=${LOCALBASE}/lib/ \
 		--with-freetype \
 		--with-freetype-includes=${LOCALBASE}/include/freetype2 \
 		--with-blas \
 		--with-lapack \
 		--with-cairo \
 		--with-readline \
 		--enable-largefile \
 		--with-wxwidgets=${WX_CONFIG} \
 		--with-proj-share=${LOCALBASE}/share/proj \
 		--with-geos=${LOCALBASE}/bin/geos-config \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
 		--with-pthread=yes
 		#--with-openmp
 
 ALL_TARGET=	default
 USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
 MAKE_ENV+=	TARGET="${CONFIGURE_TARGET}"
 VER=		${PORTVERSION:R:C/\.//}
 
 PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
 		VERSION="${PORTVERSION}" VERS="${PORTVERSION:C/([0-9]+).([0-9]+)(.*)/\1.\2/}" \
 		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
 
 OPTIONS_DEFINE=		LAS NETCDF NLS PDAL ZSTD
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL SQLITE
 #OPTIONS_SINGLE=		BLAS
 #OPTIONS_SINGLE_BLAS=	ATLAS NETLIB GOTOBLAS OPENBLAS
 OPTIONS_DEFAULT=	LAS NETCDF NLS PDAL PGSQL SQLITE ZSTD
 OPTIONS_SUB=		yes
 
 # BLAS/LAPACK: Only netlib compile the maxmimum number of modules
 #BLAS_DESC=		BLAS/LAPACK support
 #GOTOBLAS_DESC=		GotoBLAS implementationS
 #ATLAS_USES=		blaslapack:atlas
 #NETLIB_USES=		blaslapack
 #GOTOBLAS_USES=		blaslapack:gotoblas
 #OPENBLAS_USES=		blaslapack:openblas
 LAS_DESC=		Enable LiDAR modules
 PDAL_DESC=		Enable points cloud data modules
 DB_DESC=		Database support
 NLS_CONFIGURE_WITH=	nls
 NLS_USES=		gettext
 LAS_CONFIGURE_ON=	--with-liblas=yes
 LAS_LIB_DEPENDS=	liblas.so:devel/liblas \
 			libboost_program_options.so:devel/boost-libs \
 			libboost_thread.so:devel/boost-libs \
 			libgeotiff.so:graphics/libgeotiff
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libs=${LOCALBASE}/lib/mysql
 NETCDF_CONFIGURE_ON=	--with-netcdf=${LOCALBASE}/bin/nc-config
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_ON=	--with-odbc
 PDAL_CONFIGURE_ON=	--with-pdal=${LOCALBASE}/bin/pdal-config
 PDAL_LIB_DEPENDS=	libpdal_base.so:math/pdal
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgres
 SQLITE_USES=		sqlite
 SQLITE_CONFIGURE_ON=	--with-sqlite
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 .include <bsd.port.options.mk>
 
 .if !defined (GRASS_INST_DIR)
 GRASS_INST_DIR=	${PORTNAME}${VER}
 .endif
 
 MANDIRS=	${PREFIX}/grass${VER}/docs/man/man1
 
 post-patch:
 	${REINPLACE_CMD} -e \
 		's|-lblas|${BLASLIB}|g ; \
 		 s|-llapack|${LAPACKLIB}|g ; \
 		 s|g2c|f2c|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e \
 		's|make -C|$$(MAKE) -C| ; \
 		 /^BINDIR/s|=.*|=	$${DESTDIR}$${UNIX_BIN}| ; \
 		 /test /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /tar /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /chmod /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /tar /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /rm /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /$$(MAKE) /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
 		 /^$$(INST_DIR)\//s|$$(INST_DIR)|$${DESTDIR}$${INST_DIR}|g ; \
 		 s|> $$(INST_DIR)|> $${DESTDIR}$${INST_DIR}|' ${WRKSRC}/include/Make/Install.make
 	${REINPLACE_CMD} \
 		's|= python|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
 	${REINPLACE_CMD} \
 		"s|'make'|'gmake'|g" ${WRKSRC}/scripts/g.extension/g.extension.py
 	${REINPLACE_CMD} \
 		's|$$(ARCH)|$$(TARGET)|g' ${WRKSRC}/include/Make/Grass.make
 # Replace hardcoded python interpreter to PYTHON_CMD
 	${REINPLACE_CMD} "s|'GRASS_PYTHON', 'python'|'GRASS_PYTHON', \'${PYTHON_CMD}\'|g" \
 		${WRKSRC}/scripts/wxpyimgview/wxpyimgview.py
 	${REINPLACE_CMD} 's|GRASS_PYTHON=python|GRASS_PYTHON=${PYTHON_CMD}|g' \
 		${WRKSRC}/lib/init/grass.sh
 	${REINPLACE_CMD} \
 		"s|environ\['GRASS_PYTHON'\] = "'"python"'"|environ['GRASS_PYTHON'] = "'"${PYTHON_CMD}"'"|g" \
 		${WRKSRC}/lib/python/script/setup.py
 	cd ${WRKSRC}; \
 	for i in `${FIND} . -type f -print`; do \
 		${REINPLACE_CMD} \
 		's|#!/usr/bin/env python|#!/usr/bin/env ${PYTHON_CMD}|' $$i; \
 	done
 
 post-install:
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/
 	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/docs/html/colortables/*bak.png
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html/
 .for file in i_atcorr_B02_atcorr.png \
 		i_ortho_photo_step1.png \
 		i_ortho_photo_step5.png \
 		i_ortho_photo_step6.png \
 		i_ortho_photo_step7.png \
 		i_ortho_photo_step8.png \
 		r.viewshed.png \
 		rterraflow_accumulation.png \
 		rterraflow_dir2.png \
 		rterraflow_dir3.png \
 		sweep1.png \
 		sweep2.png
 	${TOUCH} ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html/${file}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/*
 .for i in clean_temp current_time_s_ms echo i.find lock run r.watershed/seg r.watershed/ram
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i}
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/lister/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo
 	${LN} -sf ${PORTNAME}${VER} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 .include <bsd.port.mk>
Index: head/devel/py-robotframework-ride/Makefile
===================================================================
--- head/devel/py-robotframework-ride/Makefile	(revision 527448)
+++ head/devel/py-robotframework-ride/Makefile	(revision 527449)
@@ -1,31 +1,32 @@
 # Created by: Vladimir Chukharev
 # $FreeBSD$
 
 PORTNAME=	robotframework-ride
 PORTVERSION=	1.7.3.1
+PORTREVISION=	1
 CATEGORIES=	devel www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	Vladimir.Chukharev@gmail.com
 COMMENT=	Test data editor for Robot Framework
 
 LICENSE=	APACHE20
 
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}robotframework-seleniumlibrary>=1.1.0:devel/py-robotframework-seleniumlibrary@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 
 USES=		dos2unix python:2.7 zip
 # py36 needs WX 4.0.4 wich is not ported yet
 USE_PYTHON=	autoplist distutils
 USE_WX=		3.0+
 
 DOS2UNIX_GLOB=	*.py PKG-INFO settings.cfg MANIFEST.in
 NO_ARCH=	yes
 WX_COMPS=	wx python
 
 .include <bsd.port.mk>
Index: head/emulators/playonbsd/Makefile
===================================================================
--- head/emulators/playonbsd/Makefile	(revision 527448)
+++ head/emulators/playonbsd/Makefile	(revision 527449)
@@ -1,68 +1,71 @@
 # Created by: Stefan Esser <se@StefanEsser.FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	playonbsd
 PORTVERSION=	4.2.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators games
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Easily install and run Windows software for use with Wine
 
 LICENSE=	GPLv3
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 RUN_DEPENDS=	7z:archivers/p7zip \
 		bash:shells/bash \
 		glxinfo:graphics/mesa-demos \
 		gpg:security/gnupg \
 		gsed:textproc/gsed \
 		sudo:security/sudo \
 		xdg-open:devel/xdg-utils \
 		xterm:x11/xterm \
 		cabextract:archivers/cabextract \
 		wget:ftp/wget \
 		icotool:graphics/icoutils
 
-OPTIONS_DEFINE=	GECKO MONO
-OPTIONS_DEFAULT=	GECKO MONO
-GECKO_DESC=	Wine-gecko HTML rendering support
-MONO_RUN_DEPENDS=	wine-mono>=4.5.6:emulators/wine-mono
-GECKO_RUN_DEPENDS=	wine-gecko>=2.21:emulators/wine-gecko
-
-ONLY_FOR_ARCHS=	amd64 i386
-
-USES=		python:2.7,run perl5
+USES=		python:2.7,run perl5 shebangfix
 USE_WX=		3.0
 WX_COMPS=	python:run
+SHEBANG_GLOB=	*.py
+SHEBANG_FILES=	bash/expert/* lib/*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PlayOnLinux
 GH_PROJECT=	POL-POM-4
+
+OPTIONS_DEFINE=	GECKO MONO NLS
+OPTIONS_DEFAULT=	GECKO MONO
+GECKO_DESC=	Wine-gecko HTML rendering support
+MONO_RUN_DEPENDS=	wine-mono>=4.5.6:emulators/wine-mono
+GECKO_RUN_DEPENDS=	wine-gecko>=2.21:emulators/wine-gecko
+NLS_USES=	gettext
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 RUN_DEPENDS+=	wine:emulators/i386-wine
 .else
 RUN_DEPENDS+=	wine:emulators/wine
 .endif
 
 NO_BUILD=	true
 SUB_FILES=	playonbsd.sh
 
 post-patch:
 		@${REINPLACE_CMD} -e 's:/usr/local/:${LOCALBASE}/:' ${WRKSRC}/lib/wine.lib
 
 do-install:
 .for d in bash python
 		cd ${WRKSRC} && ${COPYTREE_BIN} ${d} ${STAGEDIR}${PREFIX}/lib/playonbsd/ "! -name *\.orig ! -name *\.bak"
 .endfor
 .for d in etc lang lib plugins resources
 		cd ${WRKSRC} && ${COPYTREE_BIN} ${d} ${STAGEDIR}${PREFIX}/lib/playonbsd/ "! -name *\.orig ! -name *\.bak"
 .endfor
 		@${REINPLACE_CMD} -e 's:linux:bsd:g;s:linux:BSD:ig' ${WRKSRC}/doc/playonlinux.1
 		${INSTALL_MAN} ${WRKSRC}/doc/playonlinux.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/playonbsd.1
 		${INSTALL_SCRIPT} ${WRKDIR}/playonbsd.sh ${STAGEDIR}${PREFIX}/bin/playonbsd
 		${INSTALL_SCRIPT} ${WRKSRC}/playonfreebsd ${STAGEDIR}${PREFIX}/lib/playonbsd/playonfreebsd
 
 .include <bsd.port.post.mk>
Index: head/games/pyfa/Makefile
===================================================================
--- head/games/pyfa/Makefile	(revision 527448)
+++ head/games/pyfa/Makefile	(revision 527449)
@@ -1,57 +1,57 @@
 # Created by: Andrey Fesenko <andrey@bsdnir.info>
 # $FreeBSD$
 
 PORTNAME=	pyfa
 PORTVERSION=	1.19.1
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games python
 
 MAINTAINER=	andrey@bsdnir.info
 COMMENT=	Fitting tool for EVE Online
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pyfa-org
 GH_PROJECT=	Pyfa
 
 USES=		python:2.7 dos2unix
 DOS2UNIX_GLOB=	*.py
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/pyfa
 PORTDATA=	*
 
 USE_WX=		2.8 3.0
 WX_COMPS=	wx:run python:run
 
 OPTIONS_DEFINE=		DPSGRAPHING
 DPSGRAPHING_DESC=	DPS graphing (requires NumPy and matplotlib)
 
 DPSGRAPHING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}more-itertools5>0:devel/py-more-itertools5@${PY_FLAVOR}
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 post-build:
 	@${PRINTF} "#!/bin/sh\nexec ${PYTHON_CMD} ${DATADIR}/pyfa.py\n" \
 		> ${WRKDIR}/pyfa.sh
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/pyfa.sh ${STAGEDIR}${PREFIX}/bin/pyfa
 
 .include <bsd.port.mk>
Index: head/graphics/djvusmooth/Makefile
===================================================================
--- head/graphics/djvusmooth/Makefile	(revision 527448)
+++ head/graphics/djvusmooth/Makefile	(revision 527449)
@@ -1,29 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	djvusmooth
 DISTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	graphics python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Graphical editor for DjVu
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
 BUILD_DEPENDS=	xsltproc:textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
 		docbook-xml>0:textproc/docbook-xml
 RUN_DEPENDS=	djvulibre>0:graphics/djvulibre \
-		${PYTHON_PKGNAMEPREFIX}python-djvulibre>0:graphics/py-djvulibre@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}wxPython30>0:x11-toolkits/py-wxPython30@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}python-djvulibre>0:graphics/py-djvulibre@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext-tools python:2.7
+USE_WX=		3.0
+WX_COMPS=	python:run
 USE_GITHUB=	yes
 GH_ACCOUNT=	jwilk
 USE_PYTHON=	distutils autoplist noflavors
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
Index: head/graphics/py-mayavi/Makefile
===================================================================
--- head/graphics/py-mayavi/Makefile	(revision 527448)
+++ head/graphics/py-mayavi/Makefile	(revision 527449)
@@ -1,54 +1,54 @@
 # Created by: Vladimir Chukharev
 # $FreeBSD$
 
 PORTNAME=	mayavi
 PORTVERSION=	4.5.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	Vladimir.Chukharev@gmail.com
 COMMENT=	Application and library for 3D visualization and plotting in Python
 
 LICENSE=	BSD3CLAUSE LGPL21 LGPL20 EPL LGPL3 BSD2CLAUSE APACHE11
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.txt
 LICENSE_FILE_LGPL21=	${WRKSRC}/image_LICENSE_Nuvola.txt
 LICENSE_FILE_LGPL20=	${WRKSRC}/image_LICENSE_CP.txt
 LICENSE_FILE_EPL=	${WRKSRC}/image_LICENSE_Eclipse.txt
 LICENSE_FILE_LGPL3=	${WRKSRC}/image_LICENSE_OOo.txt
 LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/LICENSE_YORICK.txt
 LICENSE_FILE_APACHE11=	${WRKSRC}/LICENSE_COLORBREWER.txt
 # See ${WRKSRC}/image_LICENSE.txt for per file license information
 
 BUILD_DEPENDS=	vtk6>=6.1.0_8:math/vtk6 \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1_2:textproc/py-sphinx@${PY_FLAVOR}
 RUN_DEPENDS=	vtk6>=6.1.0_8:math/vtk6 \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui@${PY_FLAVOR}
 
 USES=		python:2.7 shebangfix tar:bzip2
 USE_PYTHON=	autoplist distutils
-USE_WX=		2.8+
+USE_WX=		3.0+
 WX_COMPS=	python:run
 SHEBANG_FILES=	mayavi/tests/csv_files/csv_2_py
 
 DEP1=		vtk6
 
 pre-configure:
 	if [ ! -e ${PREFIX}/lib/python2.7/site-packages/vtk/__init__.py ]; then \
 		${ECHO_MSG} "Port math/vtk6 is installed without PYTHON option."; \
 		${ECHO_MSG} "Please reinstall with PYTHON selected."; \
 		${FALSE}; \
 	else \
 		${ECHO_MSG} "Good, math/vtk6 is installed with PYTHON option!"; \
 	fi
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tvtk/array_ext.so
 
 .include <bsd.port.mk>
Index: head/graphics/sk1/Makefile
===================================================================
--- head/graphics/sk1/Makefile	(revision 527448)
+++ head/graphics/sk1/Makefile	(revision 527449)
@@ -1,60 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	sk1
 DISTVERSION=	2.0
 DISTVERSIONSUFFIX=	rc3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	https://downloads.sk1project.net/sk1/${DISTVERSIONFULL}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Professional quality illustration program
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/GPLv3.txt
 
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libMagickCore-6.so:graphics/ImageMagick6
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext gnome python:2.7 shebangfix
 SHEBANG_FILES=	${PYSETUP}
 USE_PYTHON=	distutils distutils
 PYSETUP=	setup-sk1.py
 PYDISTUTILS_INSTALLARGS=	--root=${STAGEDIR}
 USE_GNOME=	cairo glib20 pango
 USE_WX=		3.0+
 WX_COMPS=	python:lib
 INSTALLS_ICONS=	yes
 
 MAKE_ENV=	FREEBSD_PYTHON_VER=${PYTHON_VER}
 _VER=		${DISTVERSIONFULL}
 PLIST_SUB=	VER="${_VER}"
 
 post-patch:
 	@${REINPLACE_CMD} -E " \
 		s,/usr/(bin|include|lib|share),${LOCALBASE}/\1,g ; \
 		s|%s-wx-%s' % \(NAME, VERSION\)|%s-wx-%s-%s' % (NAME, VERSION, os.environ['FREEBSD_PYTHON_VER'])| ; \
 		s/sk1\.(desktop|png|xpm|svg)/sk1-${PYTHON_VER}.\1/g ; \
 		s|\(install_path, \['GPLv3.txt', 'LICENSE', \]\),|| " \
 		${WRKSRC}/setup-sk1.py
 	@${REINPLACE_CMD} -e 's|/usr/|${LOCALBASE}/|' ${WRKSRC}/setup.cfg_*
 	@${REINPLACE_CMD} -e ' \
 		s|sk1|sk1-${PYTHON_VER}| ; \
 		s|^Name.*|& (python${PYTHON_VER})|' \
 		${WRKSRC}/src/sk1.desktop
 .for ext in desktop png xpm svg
 	@${MV} ${WRKSRC}/src/sk1.${ext} ${WRKSRC}/src/sk1-${PYTHON_VER}.${ext}
 .endfor
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/sk1-wx-${_VER}-${PYTHON_VER}/uc2/*/_*.so
 
 .include <bsd.port.mk>
Index: head/misc/pyobd/Makefile
===================================================================
--- head/misc/pyobd/Makefile	(revision 527448)
+++ head/misc/pyobd/Makefile	(revision 527449)
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	pyobd
 DISTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.obdtester.com/download/
 DISTNAME=	pyobd_${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	OBD-II compliant car diagnostic tool
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 DEPRECATED=	Uses deprecated version of python
 EXPIRATION_DATE=	2020-08-15
 
 BUILD_DEPENDS=	convert:graphics/ImageMagick6
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR}
 
 USES=		dos2unix gnome python:2.7 shebangfix
 DOS2UNIX_FILES=	${PORTNAME}.desktop
 SHEBANG_FILES=	${PORTNAME}
 USE_WX=		3.0
 WX_COMPS=	python
 
 INSTALLS_ICONS=	yes
 
 NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 do-build:
 	@convert ${WRKSRC}/${PORTNAME}.gif ${WRKSRC}/${PORTNAME}.png
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${WRKSRC}/*.py ${WRKSRC}/*.pyc \
 		${STAGEDIR}${DATADIR}
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/${PORTNAME}
 	@${LN} -sf ../share/${PORTNAME}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/multimedia/photofilmstrip/Makefile
===================================================================
--- head/multimedia/photofilmstrip/Makefile	(revision 527448)
+++ head/multimedia/photofilmstrip/Makefile	(revision 527449)
@@ -1,29 +1,29 @@
 # Created by: Charlie Kester <corky1951@comcast.net>
 # $FreeBSD$
 
 PORTNAME=	photofilmstrip
 PORTVERSION=	3.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF/photostoryx/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Creates movies out of your pictures
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 RUN_DEPENDS=	mencoder:multimedia/mencoder \
 		mplayer:multimedia/mplayer
 
 USES=		python:2.7 gettext
 USE_GSTREAMER1=	jpeg
 USE_PYTHON=	distutils autoplist
 USE_WX=		3.0+
 WX_COMPS=	python:lib
 ALL_TARGET=	compile
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/Makefile
===================================================================
--- head/x11-toolkits/Makefile	(revision 527448)
+++ head/x11-toolkits/Makefile	(revision 527449)
@@ -1,264 +1,265 @@
 # $FreeBSD$
 #
 
     COMMENT = X11 toolkits
 
     SUBDIR += SoXt
     SUBDIR += Xaw3d
     SUBDIR += Xmt
     SUBDIR += blt
     SUBDIR += bwidget
     SUBDIR += c++-gtk-utils
     SUBDIR += ctk
     SUBDIR += flowcanvas
     SUBDIR += fltk
     SUBDIR += fox14
     SUBDIR += fox16
     SUBDIR += fox17
     SUBDIR += fpc-gtk2
     SUBDIR += fpc-xforms
     SUBDIR += fxscintilla
     SUBDIR += gdl
     SUBDIR += girara
     SUBDIR += gnocl
     SUBDIR += gnome-pty-helper
     SUBDIR += gnome-sharp20
     SUBDIR += gnomemm
     SUBDIR += gnustep-back
     SUBDIR += gnustep-gui
     SUBDIR += granite
     SUBDIR += gstreamer-plugins-pango
     SUBDIR += gstreamer1-plugins-gtk
     SUBDIR += gstreamer1-plugins-pango
     SUBDIR += gtk-layer-shell
     SUBDIR += gtk-sharp-beans
     SUBDIR += gtk-sharp20
     SUBDIR += gtk-sharp30
     SUBDIR += gtk20
     SUBDIR += gtk20-reference
     SUBDIR += gtk30
     SUBDIR += gtkada
     SUBDIR += gtkada3
     SUBDIR += gtkdatabox
     SUBDIR += gtkextra
     SUBDIR += gtkglarea2
     SUBDIR += gtkglext
     SUBDIR += gtkglextmm
     SUBDIR += gtkimageview
     SUBDIR += gtkmathview
     SUBDIR += gtkmm20
     SUBDIR += gtkmm20-reference
     SUBDIR += gtkmm24
     SUBDIR += gtkmm24-reference
     SUBDIR += gtkmm30
     SUBDIR += gtkmm30-reference
     SUBDIR += gtksourceview2
     SUBDIR += gtksourceview2-reference
     SUBDIR += gtksourceview3
     SUBDIR += gtksourceview3-reference
     SUBDIR += gtksourceview4
     SUBDIR += gtksourceviewmm3
     SUBDIR += hippo-canvas
     SUBDIR += irrlicht
     SUBDIR += itk
     SUBDIR += iwidgets
     SUBDIR += kf5-attica
     SUBDIR += kf5-kcompletion
     SUBDIR += kf5-kconfigwidgets
     SUBDIR += kf5-kdesignerplugin
     SUBDIR += kf5-kguiaddons
     SUBDIR += kf5-kirigami2
     SUBDIR += kf5-kitemviews
     SUBDIR += kf5-kjobwidgets
     SUBDIR += kf5-ktextwidgets
     SUBDIR += kf5-kwidgetsaddons
     SUBDIR += kf5-kxmlgui
     SUBDIR += kproperty
     SUBDIR += lesstif
     SUBDIR += libXaw
     SUBDIR += libXmu
     SUBDIR += libXt
     SUBDIR += libbonoboui
     SUBDIR += libbonoboui-reference
     SUBDIR += libdazzle
     SUBDIR += libgdiplus
     SUBDIR += libgnomeui
     SUBDIR += libgnomeui-reference
     SUBDIR += libgnomeuimm26
     SUBDIR += libhandy
     SUBDIR += libsexy
     SUBDIR += libsexymm
     SUBDIR += libunique3
     SUBDIR += libwnck
     SUBDIR += libwnck-reference
     SUBDIR += libwnck3
     SUBDIR += libxaw3dxft
     SUBDIR += libxfce4gui
     SUBDIR += linux-c7-gtk2
     SUBDIR += linux-c7-gtk3
     SUBDIR += linux-c7-openmotif
     SUBDIR += linux-c7-pango
     SUBDIR += linux-c7-qt-x11
     SUBDIR += linux-c7-tk85
     SUBDIR += movingmotif
     SUBDIR += mowitz
     SUBDIR += mygui
     SUBDIR += mygui-dummy
     SUBDIR += mygui-ogre
     SUBDIR += mygui-opengl
     SUBDIR += nanogui
     SUBDIR += neXtaw
     SUBDIR += ntk
     SUBDIR += ocaml-lablgtk2
     SUBDIR += ocaml-labltk
     SUBDIR += open-motif
     SUBDIR += osm-gps-map
     SUBDIR += otk
     SUBDIR += p5-Alien-wxWidgets
     SUBDIR += p5-Glade2
     SUBDIR += p5-Gnome2
     SUBDIR += p5-Gnome2-Canvas
     SUBDIR += p5-Gnome2-VFS
     SUBDIR += p5-Gnome2-Wnck
     SUBDIR += p5-Gtk2
     SUBDIR += p5-Gtk2-Chmod
     SUBDIR += p5-Gtk2-Ex-Dialogs
     SUBDIR += p5-Gtk2-Ex-FormFactory
     SUBDIR += p5-Gtk2-Ex-PodViewer
     SUBDIR += p5-Gtk2-Ex-Simple-List
     SUBDIR += p5-Gtk2-Ex-Utils
     SUBDIR += p5-Gtk2-GladeXML
     SUBDIR += p5-Gtk2-Html2
     SUBDIR += p5-Gtk2-ImageView
     SUBDIR += p5-Gtk2-PathButtonBar
     SUBDIR += p5-Gtk2-TrayIcon
     SUBDIR += p5-Gtk2-Unique
     SUBDIR += p5-Gtk3
     SUBDIR += p5-Gtk3-SimpleList
     SUBDIR += p5-Pango
     SUBDIR += p5-Prima
     SUBDIR += p5-Tk
     SUBDIR += p5-Tk-Action
     SUBDIR += p5-Tk-Autoscroll
     SUBDIR += p5-Tk-ColourChooser
     SUBDIR += p5-Tk-Contrib
     SUBDIR += p5-Tk-CursorControl
     SUBDIR += p5-Tk-DKW
     SUBDIR += p5-Tk-Date
     SUBDIR += p5-Tk-DynaTabFrame
     SUBDIR += p5-Tk-Enscript
     SUBDIR += p5-Tk-FileDialog
     SUBDIR += p5-Tk-FontDialog
     SUBDIR += p5-Tk-GBARR
     SUBDIR += p5-Tk-Getopt
     SUBDIR += p5-Tk-HistEntry
     SUBDIR += p5-Tk-JComboBox
     SUBDIR += p5-Tk-ResizeButton
     SUBDIR += p5-Tk-Role-Dialog
     SUBDIR += p5-Tk-Role-HasWidgets
     SUBDIR += p5-Tk-Splashscreen
     SUBDIR += p5-Tk-Sugar
     SUBDIR += p5-Tk-TableMatrix
     SUBDIR += p5-Tk-ToolBar
     SUBDIR += p5-Tk-WaitBox
     SUBDIR += pango
     SUBDIR += pangomm
     SUBDIR += pangox-compat
     SUBDIR += pangoxsl
     SUBDIR += plasma5-kdeplasma-addons
     SUBDIR += plib
     SUBDIR += py-AnyQt
     SUBDIR += py-Pmw
     SUBDIR += py-SquareMap
     SUBDIR += py-easygui
     SUBDIR += py-fltk
     SUBDIR += py-gtk2
     SUBDIR += py-gtkglext
     SUBDIR += py-gtksourceview
     SUBDIR += py-kivy
     SUBDIR += py-kiwi-gtk
     SUBDIR += py-qt5-gui
     SUBDIR += py-qt5-quick
     SUBDIR += py-qt5-quickwidgets
     SUBDIR += py-qt5-widgets
     SUBDIR += py-tkinter
     SUBDIR += py-tktreectrl
     SUBDIR += py-vte
     SUBDIR += py-wax
     SUBDIR += py-wxPython-common
     SUBDIR += py-wxPython28
     SUBDIR += py-wxPython28-common
     SUBDIR += py-wxPython30
+    SUBDIR += py-wxPython40
     SUBDIR += py-xlib
     SUBDIR += pypy-tkinter
     SUBDIR += qml-box2d
     SUBDIR += qt5-charts
     SUBDIR += qt5-datavis3d
     SUBDIR += qt5-declarative
     SUBDIR += qt5-gamepad
     SUBDIR += qt5-gtkplatform
     SUBDIR += qt5-gui
     SUBDIR += qt5-quickcontrols
     SUBDIR += qt5-quickcontrols2
     SUBDIR += qt5-uiplugin
     SUBDIR += qt5-virtualkeyboard
     SUBDIR += qt5-widgets
     SUBDIR += qt5pas
     SUBDIR += qtermwidget
     SUBDIR += qwt5-qt5
     SUBDIR += qwt6
     SUBDIR += redkite
     SUBDIR += rep-gtk2
     SUBDIR += rubygem-gdk3
     SUBDIR += rubygem-gtk2
     SUBDIR += rubygem-gtk3
     SUBDIR += rubygem-gtksourceview2
     SUBDIR += rubygem-gtksourceview3
     SUBDIR += rubygem-pango
     SUBDIR += rubygem-poppler
     SUBDIR += rubygem-tk
     SUBDIR += rubygem-uh
     SUBDIR += rubygem-vte
     SUBDIR += rubygem-vte3
     SUBDIR += scintilla
     SUBDIR += sdl_pango
     SUBDIR += shared-desktop-ontologies
     SUBDIR += skinlf
     SUBDIR += slingshot
     SUBDIR += soqt
     SUBDIR += swt
     SUBDIR += tepl
     SUBDIR += termit
     SUBDIR += tile
     SUBDIR += tix
     SUBDIR += tk-wrapper
     SUBDIR += tk85
     SUBDIR += tk86
     SUBDIR += tk87
     SUBDIR += tkdnd
     SUBDIR += tkshape
     SUBDIR += tktable
     SUBDIR += tktray
     SUBDIR += tktreectrl
     SUBDIR += unique
     SUBDIR += v
     SUBDIR += vdk
     SUBDIR += viewklass
     SUBDIR += vte
     SUBDIR += vte-reference
     SUBDIR += vte3
     SUBDIR += wlroots
     SUBDIR += wmapp
     SUBDIR += wxgtk28
     SUBDIR += wxgtk28-common
     SUBDIR += wxgtk28-contrib
     SUBDIR += wxgtk28-contrib-common
     SUBDIR += wxgtk30
     SUBDIR += wxgtk31
     SUBDIR += xbae
     SUBDIR += xforms
     SUBDIR += xmhtml
     SUBDIR += xview
     SUBDIR += xview-clients
 
 .include <bsd.port.subdir.mk>
Index: head/x11-toolkits/py-SquareMap/Makefile
===================================================================
--- head/x11-toolkits/py-SquareMap/Makefile	(revision 527448)
+++ head/x11-toolkits/py-SquareMap/Makefile	(revision 527449)
@@ -1,21 +1,21 @@
 # Created by: Sofian Brabez <sbz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	SquareMap
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Hierarchic visualization control for wxPython
 
 LICENSE=	BSD2CLAUSE
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 USE_WX=		3.0+
 WX_COMPS=	python
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/py-wxPython40/Makefile
===================================================================
--- head/x11-toolkits/py-wxPython40/Makefile	(nonexistent)
+++ head/x11-toolkits/py-wxPython40/Makefile	(revision 527449)
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+PORTNAME=	wxPython
+PORTVERSION=	4.0.7
+CATEGORIES=	x11-toolkits python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	40
+DIST_SUBDIR=	python
+
+MAINTAINER=	python@FreeBSD.org
+COMMENT=	GUI toolkit for the Python programming language
+
+LICENSE=	WXWINDOWS LGPL21+ GPLv2+
+LICENSE_COMB=	multi
+LICENSE_NAME_WXWINDOWS=	wxWindows Library Licence, Version 3.1
+LICENSE_FILE_WXWINDOWS=	${WRKSRC}/license/licence.txt
+LICENSE_PERMS_WXWINDOWS=	dist-mirror pkg-mirror auto-accept
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}
+
+USES=		compiler:c++11-lib gl localbase pkgconfig python
+USE_GL=		glu
+USE_WX=		3.0
+USE_PYTHON=	distutils autoplist
+
+OPTIONS_DEFINE=		NLS
+
+NLS_USES=	gettext
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|WX_CONFIG = 'wx-config'|WX_CONFIG = '${WX_CONFIG}'|" ${WRKSRC}/build.py
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/wx -name *.so -exec ${STRIP_CMD} {} +
+
+.include <bsd.port.mk>

Property changes on: head/x11-toolkits/py-wxPython40/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/py-wxPython40/distinfo
===================================================================
--- head/x11-toolkits/py-wxPython40/distinfo	(nonexistent)
+++ head/x11-toolkits/py-wxPython40/distinfo	(revision 527449)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1575036483
+SHA256 (python/wxPython-4.0.7.tar.gz) = 3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
+SIZE (python/wxPython-4.0.7.tar.gz) = 68868838

Property changes on: head/x11-toolkits/py-wxPython40/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/py-wxPython40/files/patch-build.py
===================================================================
--- head/x11-toolkits/py-wxPython40/files/patch-build.py	(nonexistent)
+++ head/x11-toolkits/py-wxPython40/files/patch-build.py	(revision 527449)
@@ -0,0 +1,11 @@
+--- build.py.orig	2019-05-21 23:12:12 UTC
++++ build.py
+@@ -401,7 +401,7 @@ def makeOptionParser():
+         ("mac_framework",  (False, "Build wxWidgets as a Mac framework.")),
+         ("mac_arch",       ("",    "Comma separated list of architectures to build on Mac")),
+ 
+-        ("use_syswx",      (False, "Try to use an installed wx rather than building the "
++        ("use_syswx",      (True, "Try to use an installed wx rather than building the "
+                                    "one in this source tree.  The wx-config in {prefix}/bin "
+                                    "or the first found on the PATH determines which wx is "
+                                    "used.  Implies --no_magic.")),

Property changes on: head/x11-toolkits/py-wxPython40/files/patch-build.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
===================================================================
--- head/x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py	(nonexistent)
+++ head/x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py	(revision 527449)
@@ -0,0 +1,17 @@
+LLVM/CLANG cannot compile with reinterpret_cast.
+
+https://svnweb.freebsd.org/ports/head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp?revision=383979&view=markup
+https://github.com/wxWidgets/Phoenix/issues/1416#issuecomment-557263381
+https://github.com/wxWidgets/Phoenix/pull/1445
+
+--- etg/propgridiface.py.orig	2019-05-21 23:12:12 UTC
++++ etg/propgridiface.py
+@@ -89,7 +89,7 @@ def run():
+             return sipGetState(sipTransferObj);
+         }
+         else if (sipPy == Py_None) {
+-            *sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL));
++            *sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty * >(NULL));
+             return sipGetState(sipTransferObj);
+         }
+         else {

Property changes on: head/x11-toolkits/py-wxPython40/files/patch-etg_propgridiface.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
===================================================================
--- head/x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp	(nonexistent)
+++ head/x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp	(revision 527449)
@@ -0,0 +1,17 @@
+LLVM/CLANG cannot compile with reinterpret_cast.
+
+https://svnweb.freebsd.org/ports/head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp?revision=383979&view=markup
+https://github.com/wxWidgets/Phoenix/issues/1416#issuecomment-557263381
+https://github.com/wxWidgets/Phoenix/pull/1445
+
+--- sip/cpp/sip_propgridwxPGPropArgCls.cpp.orig	2019-05-22 02:14:14 UTC
++++ sip/cpp/sip_propgridwxPGPropArgCls.cpp
+@@ -317,7 +317,7 @@ static int convertTo_wxPGPropArgCls(PyObject *sipPy,vo
+             return sipGetState(sipTransferObj);
+         }
+         else if (sipPy == Py_None) {
+-            *sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL));
++            *sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty * >(NULL));
+             return sipGetState(sipTransferObj);
+         }
+         else {

Property changes on: head/x11-toolkits/py-wxPython40/files/patch-sip_cpp_sip__propgridwxPGPropArgCls.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
===================================================================
--- head/x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip	(nonexistent)
+++ head/x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip	(revision 527449)
@@ -0,0 +1,17 @@
+LLVM/CLANG cannot compile with reinterpret_cast.
+
+https://svnweb.freebsd.org/ports/head/x11-toolkits/py-wxPython30/files/patch-src_gtk_propgrid__wrap.cpp?revision=383979&view=markup
+https://github.com/wxWidgets/Phoenix/issues/1416#issuecomment-557263381
+https://github.com/wxWidgets/Phoenix/pull/1445
+
+--- sip/gen/propgridiface.sip.orig	2019-05-22 02:13:01 UTC
++++ sip/gen/propgridiface.sip
+@@ -108,7 +108,7 @@ class wxPGPropArgCls (public)
+             return sipGetState(sipTransferObj);
+         }
+         else if (sipPy == Py_None) {
+-            *sipCppPtr = new wxPGPropArgCls(reinterpret_cast< wxPGProperty * >(NULL));
++            *sipCppPtr = new wxPGPropArgCls(static_cast< wxPGProperty * >(NULL));
+             return sipGetState(sipTransferObj);
+         }
+         else {

Property changes on: head/x11-toolkits/py-wxPython40/files/patch-sip_gen_propgridiface.sip
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/py-wxPython40/pkg-descr
===================================================================
--- head/x11-toolkits/py-wxPython40/pkg-descr	(nonexistent)
+++ head/x11-toolkits/py-wxPython40/pkg-descr	(revision 527449)
@@ -0,0 +1,7 @@
+wxPython is a GUI toolkit for the Python programming language. It allows Python
+programmers to create programs with a robust, highly functional graphical user
+interface, simply and easily. It is implemented as a Python extension module
+(native code) that wraps the popular wxWidgets cross platform GUI library, which
+is written in C++.
+
+WWW: http://www.wxpython.org

Property changes on: head/x11-toolkits/py-wxPython40/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/x11-toolkits/wxgtk30/Makefile
===================================================================
--- head/x11-toolkits/wxgtk30/Makefile	(revision 527448)
+++ head/x11-toolkits/wxgtk30/Makefile	(revision 527449)
@@ -1,88 +1,89 @@
 # $FreeBSD$
 
 PORTNAME=	wx
 PORTVERSION=	3.0.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	30-gtk3
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/gpl.txt
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wxWidgets
 GH_PROJECT=	wxWidgets
 
 USES=		compiler:c++11-lib gl gmake gnome iconv jpeg localbase \
 		pkgconfig xorg
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		gl glu
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-libjpeg=sys \
 		--with-libtiff=sys \
 		--with-zlib=sys \
 		--with-expat=sys \
 		--with-opengl \
 		--with-gtk=3 \
 		--without-gnomevfs \
 		--disable-epollloop \
 		--disable-joystick \
 		--enable-backtrace \
 		--enable-ipv6 \
 		--enable-optimise \
-		--enable-utf8 \
+		--enable-unicode \
+		--enable-std_string \
 		--enable-graphics_ctx \
 		--enable-compat26 \
 		--enable-compat28
 CONFIGURE_ENV=	X11BASE="${LOCALBASE}" \
 		ac_cv_header_sys_inotify_h=no
 
 OPTIONS_DEFINE=	GSTREAMER NOTIFY MSPACK NLS WEBKIT
 OPTIONS_DEFAULT=GSTREAMER MSPACK WEBKIT
 MSPACK_DESC=	Microsoft archives support
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 GSTREAMER_CONFIGURE_ENABLE=	mediactrl
 GSTREAMER_USE=	GNOME=gconf2 GSTREAMER1=yes
 
 NOTIFY_CONFIGURE_WITH=	libnotify
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 MSPACK_CONFIGURE_WITH=	libmspack
 MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack
 
 WEBKIT_CONFIGURE_ENABLE=	webview
 WEBKIT_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 .include <bsd.port.pre.mk>
 
 # TLS is broken on armv6/7, PR 229396
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ARGS+=--disable-tls
 .endif
 
 # PR 196703, 197031
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CONFIGURE_ARGS+=--disable-precomp-headers
 .endif
 
 post-build-NLS-on:
 	@${DO_MAKE_BUILD} allmo -C ${BUILD_WRKSRC}/locale
 
 .include <bsd.port.post.mk>