wxGTK3.0: switch to gtk3 and webkit2

Discussed with: portmgr
2019-02-25 12:47:20 +00:00
parent 18072cdaa3
commit 89bc7fbdd1
66 changed files with 123 additions and 101 deletions
--- a/Mk/bsd.wx.mk
+++ b/Mk/bsd.wx.mk
@@ -405,8 +405,14 @@ _WX_VER=		${ver}
 # Set variables.
 #

-WX_CONFIG?=		${LOCALBASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config
-WXRC_CMD?=		${LOCALBASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER}
+.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
--- a/astro/opencpn/Makefile
+++ b/astro/opencpn/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	opencpn
 PORTVERSION=	4.4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro geography

 MAINTAINER=	ml@netfence.it
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	audacity
 PORTVERSION=	2.3.0
 DISTVERSIONPREFIX=	Audacity-
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio

 MAINTAINER=	xxjack12xx@gmail.com
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	mbox
 PORTVERSION=	0.7.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mbox.wz.cz/src/

--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	karaoke
 PORTVERSION=	0.7.5
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	audio python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	spek
 PORTVERSION=	0.8.2
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/alexkay/${PORTNAME}/releases/download/v${PORTVERSION}/

--- a/audio/wxguitar/Makefile
+++ b/audio/wxguitar/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	wxguitar
 PORTVERSION=	1.01
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/

--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv3

 OPTIONS_DEFINE=	DOCS EXAMPLES

-USE_WX=		2.8 3.0
+USE_WX=		3.0
 USES=		compiler:c++11-lib gmake pkgconfig

 CXXFLAGS+=	-std=c++11
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	kicad
 PORTVERSION=	5.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	cad

--- a/comms/cwstudio/Makefile
+++ b/comms/cwstudio/Makefile
@@ -2,6 +2,7 @@

 PORTNAME=	cwstudio
 DISTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SOURCEFORGE/cwstudio

--- a/comms/freedv/Makefile
+++ b/comms/freedv/Makefile
@@ -2,7 +2,7 @@

 PORTNAME=	freedv
 DISTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	https://hobbes1069.fedorapeople.org/freetel/freedv/

--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -2,7 +2,7 @@

 PORTNAME=	gnuradio
 PORTVERSION=	3.7.13.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		LOCAL/db
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	quisk
 PORTVERSION=	4.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://james.ahlstrom.name/quisk/ \
 		LOCAL/db
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	grass
 PORTVERSION=	7.6.0
+PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	pgadmin3
 PORTVERSION=	1.22.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	PGSQL/pgadmin/pgadmin3/v${PORTVERSION}/src
 DIST_SUBDIR=	postgresql
--- a/deskutils/cycle/Makefile
+++ b/deskutils/cycle/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	cycle
 PORTVERSION=	0.3.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	deskutils biology python
 MASTER_SITES=	SF

--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -2,6 +2,7 @@

 PORTNAME=	taskcoach
 DISTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Release-${PORTVERSION}
 DISTNAME=	TaskCoach-${PORTVERSION}
--- a/deskutils/treesheets/Makefile
+++ b/deskutils/treesheets/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	treesheets
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils

--- a/deskutils/wammu/Makefile
+++ b/deskutils/wammu/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	wammu
 PORTVERSION=	0.44
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://dl.cihar.com/wammu/v0/ \
 		http://dl.cihar.com.nyud.net/wammu/v0/
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	drpython
 PORTVERSION=	3.11.4
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/DrPython%20%283.x%29/${PORTVERSION}
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
--- a/devel/wxGlade/Makefile
+++ b/devel/wxGlade/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	wxglade
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits python
 MASTER_SITES=	SF
 DISTNAME=	wxGlade-${PORTVERSION}
--- a/devel/wxformbuilder/Makefile
+++ b/devel/wxformbuilder/Makefile
@@ -2,7 +2,7 @@

 PORTNAME=	wxformbuilder
 DISTVERSION=	3.5.0-beta
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-nightly/${DISTVERSION}
 DISTNAME=	wxFormBuilder_v${DISTVERSION}-source
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	codelite
 PORTVERSION=	12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors devel

 MAINTAINER=	mmokhi@FreeBSD.org
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	Padre
 PORTVERSION=	1.00
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors perl5
 MASTER_SITES=	CPAN/${PORTNAME}/ CPAN/Wx/:wxsc
 PKGNAMEPREFIX=	p5-
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -4,7 +4,7 @@

 PORTNAME=	poedit
 PORTVERSION=	1.8.4
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/

--- a/editors/wxhexeditor/Makefile
+++ b/editors/wxhexeditor/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	wxhexeditor
 PORTVERSION=	0.24
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/wxHexEditor/v${PORTVERSION}%20Beta/
 DISTNAME=	wxHexEditor-v${PORTVERSION}-src
--- a/emulators/playonbsd/Makefile
+++ b/emulators/playonbsd/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	playonbsd
 PORTVERSION=	4.2.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators games

 MAINTAINER=	se@FreeBSD.org
--- a/emulators/wxmupen64plus/Makefile
+++ b/emulators/wxmupen64plus/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	wxmupen64plus
 PORTVERSION=	0.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	emulators
 MASTER_SITES=	https://bitbucket.org/auria/wxmupen64plus/get/
 DISTNAME=	${PORTVERSION}
--- a/finance/moneymanagerex/Makefile
+++ b/finance/moneymanagerex/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mmex
 PORTVERSION=	1.2.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	finance
 MASTER_SITES=	https://github.com/vslavik/bakefile/releases/download/v0.2.9/:bakefile
 DISTFILES=	bakefile-0.2.9${EXTRACT_SUFX}:bakefile
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -2,6 +2,7 @@

 PORTNAME=	filezilla
 PORTVERSION=	3.40.0
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	https://download.filezilla-project.org/client/
 DISTNAME=	FileZilla_${PORTVERSION}_src
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -2,6 +2,7 @@

 PORTNAME=	0ad
 PORTVERSION=	0.0.23b
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://releases.wildfiregames.com/ \
 		SF/zero-ad/releases
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	asc
 PORTVERSION=	2.6.1.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
 		http://www.asc-hq.org/music/:music
--- a/games/golly/Makefile
+++ b/games/golly/Makefile
@@ -2,7 +2,7 @@

 PORTNAME=	golly
 PORTVERSION=	3.2
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
--- a/graphics/delaboratory/Makefile
+++ b/graphics/delaboratory/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	delaboratory
 PORTVERSION=	0.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://BSDforge.com/projects/source/graphics/delaboratory/

--- a/graphics/electricsheep/Makefile
+++ b/graphics/electricsheep/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Infinite evolving crowdsourced artwork
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

+BROKEN=		Requires wxGTK 3.1 which is not added to the framework
+
 BUILD_DEPENDS=	flam3-animate:graphics/flam3
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
--- a/graphics/gtimelapse/Makefile
+++ b/graphics/gtimelapse/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	gtimelapse
 DISTVERSION=	0.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Relase	# yes, this is not a typo (here)

--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	hugin
 PORTVERSION=	2018.0.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}

--- a/graphics/panoglview/Makefile
+++ b/graphics/panoglview/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	panoglview
 PORTVERSION=	0.2.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}

@@ -20,7 +20,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include -ftemplate-depth-64
 LIBS+=		-L${LOCALBASE}/lib -lGLU -lGL

-USE_WX=		2.8 3.0
+USE_WX=		3.0
 WX_COMPS=	wx
 WX_CONF_ARGS=	relative

--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	fityk
 PORTVERSION=	1.3.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math

 MAINTAINER=	ports@FreeBSD.org
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	gambit
 DISTVERSION=	16.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PORTVERSION:R:R}/${PORTVERSION}

--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	saga
 PORTVERSION=	7.1.1
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}

--- a/math/wxmaxima/Makefile
+++ b/math/wxmaxima/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	wxmaxima
 PORTVERSION=	19.02.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	Version-
 CATEGORIES=	math

--- a/misc/metalink-editor/Makefile
+++ b/misc/metalink-editor/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	metalink
 PORTVERSION=	1.2.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	misc
 MASTER_SITES=	SF/${PORTNAME}s/Metalink%20Editor/${PORTVERSION}
 PKGNAMESUFFIX?=	-editor
--- a/misc/pyobd/Makefile
+++ b/misc/pyobd/Makefile
@@ -2,6 +2,7 @@

 PORTNAME=	pyobd
 DISTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.obdtester.com/download/
 DISTNAME=	pyobd_${PORTVERSION}
--- a/misc/survex/Makefile
+++ b/misc/survex/Makefile
@@ -2,6 +2,7 @@

 PORTNAME=	survex
 DISTVERSION=	1.2.37
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	https://survex.com/software/${DISTVERSION}/

--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	aegisub
 PORTVERSION=	3.2.2
-PORTREVISION=	35
+PORTREVISION=	36
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.aegisub.org/pub/archives/releases/source/ \
 		ftp://ftp.aegisub.org/pub/archives/releases/source/ \
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	libkate
 PORTVERSION=	0.4.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xiph.org/releases/kate/

--- a/multimedia/photofilmstrip/Makefile
+++ b/multimedia/photofilmstrip/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	photofilmstrip
 PORTVERSION=	3.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF/photostoryx/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	gnudatalanguage
 PORTVERSION=	0.9.9
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science lang
 .if defined(BUILD_PYTHON_MODULE)
--- a/science/wxmacmolplt/Makefile
+++ b/science/wxmacmolplt/Makefile
@@ -9,6 +9,8 @@ CATEGORIES=	science
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Graphical user interface principally for the GAMESS program

+BROKEN=		depends on wxgtk 3.1 which as not been hooked to the framework
+
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE

--- a/security/veracrypt/Makefile
+++ b/security/veracrypt/Makefile
@@ -2,7 +2,7 @@

 PORTNAME=	veracrypt
 PORTVERSION=	1.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME:S/v/V/:S/c/C/}%20${PORTVERSION}/
 DISTNAME=	${PORTNAME:S/v/V/:S/c/C/}_${PORTVERSION}_Source
--- a/sysutils/freefilesync/Makefile
+++ b/sysutils/freefilesync/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	freefilesync
 DISTVERSION=	9.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.freefilesync.org/download/ \
 		https://www.freefilesync.org/archive/
--- a/sysutils/hachoir-wx/Makefile
+++ b/sysutils/hachoir-wx/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	hachoir-wx
 PORTVERSION=	0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP

--- a/sysutils/passwordsafe/Makefile
+++ b/sysutils/passwordsafe/Makefile
@@ -2,6 +2,7 @@

 PORTNAME=	passwordsafe
 DISTVERSION=	1.03BETA
+PORTREVISION=	1
 CATEGORIES=	sysutils

 MAINTAINER=	brnrd@FreeBSD.org
--- a/textproc/gutenmark/Makefile
+++ b/textproc/gutenmark/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	gutenmark
 PORTVERSION=	20090510
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.sandroid.org/GutenMark/wasftp.GutenMark/SoftwareSnapshots/
 DISTNAME=	GutenMark_source_dev-${PORTVERSION}
--- a/textproc/plover/Makefile
+++ b/textproc/plover/Makefile
@@ -2,7 +2,7 @@

 PORTNAME=	plover
 PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://launchpadlibrarian.net/88624187/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/x11-toolkits/p5-Alien-wxWidgets/Makefile
+++ b/x11-toolkits/p5-Alien-wxWidgets/Makefile
@@ -3,6 +3,7 @@

 PORTNAME=	Alien-wxWidgets
 PORTVERSION=	0.69
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/x11-toolkits/p5-Wx-GLCanvas/Makefile
+++ b/x11-toolkits/p5-Wx-GLCanvas/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	Wx-GLCanvas
 PORTVERSION=	0.09
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MBARBON
--- a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
+++ b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	Wx-Perl-ProcessStream
 PORTVERSION=	0.32
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/x11-toolkits/p5-Wx/Makefile
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	Wx
 PORTVERSION=	0.9932
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/x11-toolkits/py-SquareMap/Makefile
+++ b/x11-toolkits/py-SquareMap/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	SquareMap
 PORTVERSION=	1.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/x11-toolkits/py-wxPython30/Makefile
+++ b/x11-toolkits/py-wxPython30/Makefile
@@ -2,7 +2,7 @@

 PORTNAME=	wxPython
 PORTVERSION=	3.0.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	SF/wxpython/wxPython/${PORTVERSION}
@@ -36,7 +36,7 @@ do-install:

 .else

-WXPORT=		gtk2
+WXPORT=		gtk3
 WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}

 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wxPython-common>0:x11-toolkits/py-wxPython-common@${PY_FLAVOR}
--- a/x11-toolkits/wxgtk30/Makefile
+++ b/x11-toolkits/wxgtk30/Makefile
@@ -3,9 +3,9 @@
 PORTNAME=	wx
 PORTVERSION=	3.0.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
-PKGNAMESUFFIX=	30-gtk2
+PKGNAMESUFFIX=	30-gtk3

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
@@ -26,7 +26,7 @@ GH_PROJECT=	wxWidgets
 USES=		compiler:c++11-lib gl gmake gnome iconv jpeg localbase pkgconfig
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		gl glu
-USE_GNOME=	cairo gdkpixbuf2 gtk20
+USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++11
 GNU_CONFIGURE=	yes
@@ -36,7 +36,7 @@ CONFIGURE_ARGS=	--with-libpng=sys \
 		--with-zlib=sys \
 		--with-expat=sys \
 		--with-opengl \
-		--with-gtk \
+		--with-gtk=3 \
 		--without-gnomevfs \
 		--disable-epollloop \
 		--disable-joystick \
@@ -67,7 +67,7 @@ MSPACK_CONFIGURE_WITH=	libmspack
 MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack

 WEBKIT_CONFIGURE_ENABLE=	webview
-WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
+WEBKIT_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3

 .include <bsd.port.pre.mk>

--- a/x11-toolkits/wxgtk30/pkg-plist
+++ b/x11-toolkits/wxgtk30/pkg-plist
@@ -1,5 +1,5 @@
-bin/wxgtk2u-3.0-config
-bin/wxrc-gtk2u-3.0
+bin/wxgtk3u-3.0-config
+bin/wxrc-gtk3u-3.0
 include/wx-3.0/wx/aboutdlg.h
 include/wx-3.0/wx/accel.h
 include/wx-3.0/wx/access.h
@@ -26,7 +26,6 @@ include/wx-3.0/wx/aui/dockart.h
 include/wx-3.0/wx/aui/floatpane.h
 include/wx-3.0/wx/aui/framemanager.h
 include/wx-3.0/wx/aui/tabart.h
-include/wx-3.0/wx/aui/tabartgtk.h
 include/wx-3.0/wx/aui/tabmdi.h
 include/wx-3.0/wx/bannerwindow.h
 include/wx-3.0/wx/base64.h
@@ -178,7 +177,6 @@ include/wx-3.0/wx/generic/dvrenderers.h
 include/wx-3.0/wx/generic/fdrepdlg.h
 include/wx-3.0/wx/generic/filectrlg.h
 include/wx-3.0/wx/generic/filepickerg.h
-include/wx-3.0/wx/generic/fontdlgg.h
 include/wx-3.0/wx/generic/fswatcher.h
 include/wx-3.0/wx/generic/grid.h
 include/wx-3.0/wx/generic/gridctrl.h
@@ -267,7 +265,6 @@ include/wx-3.0/wx/gtk/frame.h
 include/wx-3.0/wx/gtk/gauge.h
 include/wx-3.0/wx/gtk/glcanvas.h
 include/wx-3.0/wx/gtk/gnome/gvfs.h
-include/wx-3.0/wx/gtk/hildon/notifmsg.h
 include/wx-3.0/wx/gtk/hyperlink.h
 include/wx-3.0/wx/gtk/infobar.h
 include/wx-3.0/wx/gtk/listbox.h
@@ -719,46 +716,47 @@ lib/libwx_baseu_net-3.0.so.0.4.0
 lib/libwx_baseu_xml-3.0.so
 lib/libwx_baseu_xml-3.0.so.0
 lib/libwx_baseu_xml-3.0.so.0.4.0
-lib/libwx_gtk2u_adv-3.0.so
-lib/libwx_gtk2u_adv-3.0.so.0
-lib/libwx_gtk2u_adv-3.0.so.0.4.0
-lib/libwx_gtk2u_aui-3.0.so
-lib/libwx_gtk2u_aui-3.0.so.0
-lib/libwx_gtk2u_aui-3.0.so.0.4.0
-lib/libwx_gtk2u_core-3.0.so
-lib/libwx_gtk2u_core-3.0.so.0
-lib/libwx_gtk2u_core-3.0.so.0.4.0
-lib/libwx_gtk2u_gl-3.0.so
-lib/libwx_gtk2u_gl-3.0.so.0
-lib/libwx_gtk2u_gl-3.0.so.0.4.0
-lib/libwx_gtk2u_html-3.0.so
-lib/libwx_gtk2u_html-3.0.so.0
-lib/libwx_gtk2u_html-3.0.so.0.4.0
-%%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so
-%%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so.0
-%%GSTREAMER%%lib/libwx_gtk2u_media-3.0.so.0.4.0
-lib/libwx_gtk2u_propgrid-3.0.so
-lib/libwx_gtk2u_propgrid-3.0.so.0
-lib/libwx_gtk2u_propgrid-3.0.so.0.4.0
-lib/libwx_gtk2u_qa-3.0.so
-lib/libwx_gtk2u_qa-3.0.so.0
-lib/libwx_gtk2u_qa-3.0.so.0.4.0
-lib/libwx_gtk2u_ribbon-3.0.so
-lib/libwx_gtk2u_ribbon-3.0.so.0
-lib/libwx_gtk2u_ribbon-3.0.so.0.4.0
-lib/libwx_gtk2u_richtext-3.0.so
-lib/libwx_gtk2u_richtext-3.0.so.0
-lib/libwx_gtk2u_richtext-3.0.so.0.4.0
-lib/libwx_gtk2u_stc-3.0.so
-lib/libwx_gtk2u_stc-3.0.so.0
-lib/libwx_gtk2u_stc-3.0.so.0.4.0
-%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so
-%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so.0
-%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so.0.4.0
-lib/libwx_gtk2u_xrc-3.0.so
-lib/libwx_gtk2u_xrc-3.0.so.0
-lib/libwx_gtk2u_xrc-3.0.so.0.4.0
-lib/wx/include/gtk2-unicode-3.0/wx/setup.h
+lib/libwx_gtk3u_adv-3.0.so
+lib/libwx_gtk3u_adv-3.0.so.0
+lib/libwx_gtk3u_adv-3.0.so.0.4.0
+lib/libwx_gtk3u_aui-3.0.so
+lib/libwx_gtk3u_aui-3.0.so.0
+lib/libwx_gtk3u_aui-3.0.so.0.4.0
+lib/libwx_gtk3u_core-3.0.so
+lib/libwx_gtk3u_core-3.0.so.0
+lib/libwx_gtk3u_core-3.0.so.0.4.0
+lib/libwx_gtk3u_gl-3.0.so
+lib/libwx_gtk3u_gl-3.0.so.0
+lib/libwx_gtk3u_gl-3.0.so.0.4.0
+lib/libwx_gtk3u_html-3.0.so
+lib/libwx_gtk3u_html-3.0.so.0
+lib/libwx_gtk3u_html-3.0.so.0.4.0
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.0.so
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.0.so.0
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.0.so.0.4.0
+lib/libwx_gtk3u_propgrid-3.0.so
+lib/libwx_gtk3u_propgrid-3.0.so.0
+lib/libwx_gtk3u_propgrid-3.0.so.0.4.0
+lib/libwx_gtk3u_qa-3.0.so
+lib/libwx_gtk3u_qa-3.0.so.0
+lib/libwx_gtk3u_qa-3.0.so.0.4.0
+lib/libwx_gtk3u_ribbon-3.0.so
+lib/libwx_gtk3u_ribbon-3.0.so.0
+lib/libwx_gtk3u_ribbon-3.0.so.0.4.0
+lib/libwx_gtk3u_richtext-3.0.so
+lib/libwx_gtk3u_richtext-3.0.so.0
+lib/libwx_gtk3u_richtext-3.0.so.0.4.0
+lib/libwx_gtk3u_stc-3.0.so
+lib/libwx_gtk3u_stc-3.0.so.0
+lib/libwx_gtk3u_stc-3.0.so.0.4.0
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.0.so
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.0.so.0
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.0.so.0.4.0
+lib/libwx_gtk3u_xrc-3.0.so
+lib/libwx_gtk3u_xrc-3.0.so.0
+lib/libwx_gtk3u_xrc-3.0.so.0.4.0
+lib/wx/3.0/web-extensions/webkit2_extu-3.0.so
+lib/wx/include/gtk3-unicode-3.0/wx/setup.h
 share/aclocal/wxwin30.m4
 share/bakefile/presets/wx30.bkl
 share/bakefile/presets/wx30_presets.py
--- a/x11-wm/obapps/Makefile
+++ b/x11-wm/obapps/Makefile
@@ -3,7 +3,7 @@

 PORTNAME=	obapps
 PORTVERSION=	0.1.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/${PORTNAME}/ \
 		SF/nemysisfreebsdp/:icons