aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED3
-rw-r--r--Mk/bsd.wx.mk76
-rw-r--r--astro/libroadnav/Makefile2
-rw-r--r--astro/roadnav/Makefile2
-rw-r--r--audio/audacity/Makefile2
-rw-r--r--audio/smasher/Makefile2
-rw-r--r--biology/lamarc/Makefile1
-rw-r--r--biology/treeviewx/Makefile2
-rw-r--r--cad/basicdsp/Makefile2
-rw-r--r--cad/gspiceui/Makefile2
-rw-r--r--comms/congruity/Makefile2
-rw-r--r--comms/ebook2cwgui/Makefile2
-rw-r--r--comms/trustedqsl/Makefile2
-rw-r--r--databases/flamerobin/Makefile2
-rw-r--r--databases/grass/Makefile2
-rw-r--r--databases/pgadmin3/Makefile1
-rw-r--r--databases/pgagent/Makefile2
-rw-r--r--databases/spatialite_gui/Makefile2
-rw-r--r--deskutils/xchm/Makefile2
-rw-r--r--devel/codeblocks/Makefile2
-rw-r--r--devel/rapidsvn/Makefile2
-rw-r--r--editors/madedit/Makefile2
-rw-r--r--editors/xmlcopyeditor/Makefile1
-rw-r--r--emulators/catapult/Makefile1
-rw-r--r--emulators/lisaem/Makefile2
-rw-r--r--finance/moneymanagerex/Makefile2
-rw-r--r--ftp/ftpcube/Makefile2
-rw-r--r--ftp/multiget/Makefile2
-rw-r--r--ftp/wxdfast/Makefile2
-rw-r--r--games/0ad/Makefile1
-rw-r--r--games/blokish/Makefile2
-rw-r--r--games/glest/Makefile2
-rw-r--r--games/openyahtzee/Makefile1
-rw-r--r--games/pyfa/Makefile1
-rw-r--r--games/scorched3d/Makefile2
-rw-r--r--games/scummvm-tools/Makefile2
-rw-r--r--games/springlobby/Makefile2
-rw-r--r--games/traindirector/Makefile2
-rw-r--r--games/vavoom/Makefile2
-rw-r--r--graphics/comical/Makefile2
-rw-r--r--graphics/hugin-devel/Makefile2
-rw-r--r--graphics/hugin/Makefile2
-rw-r--r--graphics/libreatlas/Makefile2
-rw-r--r--graphics/panoglview/Makefile2
-rw-r--r--lang/erlang-runtime15/Makefile2
-rw-r--r--lang/erlang-runtime16/Makefile2
-rw-r--r--lang/erlang-runtime17/Makefile1
-rw-r--r--lang/erlang-runtime18/Makefile1
-rw-r--r--lang/erlang-wx/Makefile1
-rw-r--r--lang/erlang/Makefile1
-rw-r--r--math/gnuplot/Makefile2
-rw-r--r--math/graphthing/Makefile2
-rw-r--r--math/wxMaxima/Makefile2
-rw-r--r--misc/diary-hercules/Makefile2
-rw-r--r--multimedia/libkate/Makefile2
-rw-r--r--net-p2p/amule-devel/Makefile2
-rw-r--r--net-p2p/amule/Makefile12
-rw-r--r--net-p2p/tribler/Makefile1
-rw-r--r--net/opennx/Makefile2
-rw-r--r--science/gnudatalanguage/Makefile2
-rw-r--r--science/psychopy/Makefile1
-rw-r--r--security/webshag/Makefile1
-rw-r--r--sysutils/abgx360gui/Makefile2
-rw-r--r--x11-toolkits/Makefile3
-rw-r--r--x11-toolkits/py-wax/Makefile2
-rw-r--r--x11-toolkits/py-wxPython28-unicode/Makefile8
-rw-r--r--x11-toolkits/py-wxPython28/Makefile10
-rw-r--r--x11-toolkits/wxgtk28-contrib/pkg-plist42
-rw-r--r--x11-toolkits/wxgtk28-unicode-contrib/Makefile10
-rw-r--r--x11-toolkits/wxgtk28-unicode-contrib/pkg-plist21
-rw-r--r--x11-toolkits/wxgtk28-unicode/Makefile10
-rw-r--r--x11-toolkits/wxgtk28-unicode/pkg-plist39
-rw-r--r--x11-toolkits/wxgtk28/Makefile7
-rw-r--r--x11-toolkits/wxgtk28/pkg-plist78
-rw-r--r--x11/simdock/Makefile2
75 files changed, 135 insertions, 294 deletions
diff --git a/MOVED b/MOVED
index 99d623faa7f8..92eb681ac21d 100644
--- a/MOVED
+++ b/MOVED
@@ -7870,3 +7870,6 @@ www/asp-php||2015-09-13|Unmaintained upstream, generate unsupported php
textproc/py-xmltools||2015-09-15|Remove port marked broken for six months: fetch failed
security/krb5-111|security/krb5-112|2015-09-15|krb5-1.11 EOLed by MIT in December 2014
textproc/py-xml||2015-09-16|Remove: this package is available in standard python library since 2.2
+x11-toolkits/wxgtk28-unicode|x11-toolkits/wxgtk28|2015-09-16|Make wxGTK now only unicode
+x11-toolkits/py-wxPython28-unicode|x11-toolkits/py-wxPython28-unicode|2015-09-16|Make wxGTK now only unicode
+x11-toolkits/py-wxPython28-unicode-contrib|x11-toolkits/py-wxPython28-unicode-contrib|2015-09-16|Make wxGTK now only unicode
diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk
index 9843514c5f92..35d647323a3b 100644
--- a/Mk/bsd.wx.mk
+++ b/Mk/bsd.wx.mk
@@ -46,11 +46,6 @@
# 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).
-# WX_UNICODE - Define if the port needs the Unicode version of the
-# wxWidgets library and/or contributed libraries.
-# NOTE: this should NOT be used for ports that can be compiled
-# with Unicode or not, but for the ones that require it.
-# WANT_UNICODE - Define if the port prefers Unicode, but doesn't require it.
# 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
@@ -66,29 +61,20 @@
#
# The following variables are intended for the user and can be defined in
# make.conf.
-# WITH_UNICODE - Define if you prefer the Unicode version when available.
-# WITHOUT_UNICODE
-# - Define if you prefer the non Unicode version (this
-# variable disables WITH_UNICODE and WANT_UNICODE).
# WITH_WX_VER - Define to the list of prefered 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.
-# WX_UNICODE - If this variable is not defined by the port (which means it
-# requires the Unicode version of wxWidgets), it will be
-# defined in the case the Unicode version is used (enabled by
-# WITH_UNICODE or WANT_UNICODE).
# 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 with Unicode.
+# - A port that needs wxWidgets 2.8 and contributed libraries
# USE_WX= 2.8
# WX_COMPS= wx contrib
-# WX_UNICODE= yes
# - A port that needs WxPython 2.8 for running.
# USE_PYTHON= yes
# USE_WX= 2.8
@@ -140,13 +126,13 @@ _WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED
#
# wxgtk 2.8
-_WX_PORT_wx_2.8= x11-toolkits/wxgtk28${_WX_UCL}
+_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${_WX_UCL}-contrib
+_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_UCL}
+_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
@@ -176,17 +162,6 @@ _WX_DEPTYPE_${comp}_${ver}= lib
.endif # !_WX_Defined_Done
#
-# Check if the user/port wants Unicode.
-#
-
-.if (!defined(WITHOUT_UNICODE) && \
- (defined(WITH_UNICODE) || defined(WANT_UNICODE)))
-_WX_UC_AVAILABLE= yes
-.else
-. undef _WX_UC_AVAILABLE
-.endif
-
-#
# Check if we are going to determine the version.
#
@@ -214,28 +189,11 @@ _WANT_WX= yes
.if defined(_WANT_WX)
-# Check if Unicode will be used.
-
-. for __WANT_WX in ${_WANT_WX}
-. if defined(_WX_UC_AVAILABLE) && \
- (${_WX_VERS_UC_ALL:M${__WANT_WX}} != "" || ${_WANT_WX:tl} == "yes")
-_WX_WANT_UNICODE= yes
-. endif
-. endfor
-
# These variables are reprocessed later so they won't affect other parts.
-. if defined(WX_UNICODE) || defined(_WX_WANT_UNICODE)
_WX_VER_FINAL= ${_WX_VERS_UC_ALL}
_WX_UC= u
-_WX_UCL= -unicode
_WX_PYSUFX= -unicode
-. else
-_WX_VER_FINAL= ${_WX_VERS_ALL}
-_WX_UC= #
-_WX_UCL= #
-_WX_PYSUFX= -ansi
-. endif
# Fill _HAVE_WX with the installed components.
@@ -407,37 +365,11 @@ _WX_VER_UC+= ${ver}
. endif
.endfor
-# Requested by the user or port (optional).
-
-.if defined(_WX_UC_AVAILABLE)
-. for ver in ${_WX_VER_UC}
-. if ${_WX_VERS_UC_ALL:M${ver}} != ""
-WX_UNICODE= yes
-. endif
-. endfor
-.endif
-
-# Requested by the port (mandatory).
-
-.if defined(WX_UNICODE)
-. if empty(_WX_VER_UC)
-IGNORE?= selected a wxWidgets version which does not support Unicode: ${_WX_VER_MERGED}
-. endif
-.endif
-
# Set Unicode variables.
-.if defined(WX_UNICODE)
_WX_VER_FINAL= ${_WX_VER_UC}
_WX_UC= u
-_WX_UCL= -unicode
_WX_PYSUFX= -unicode
-.else
-_WX_VER_FINAL= ${_WX_VER_MERGED}
-_WX_UC= #
-_WX_UCL= #
-_WX_PYSUFX= -ansi
-.endif
# Remove unusable installed versions.
diff --git a/astro/libroadnav/Makefile b/astro/libroadnav/Makefile
index fbf60b61be1a..b2771687ed81 100644
--- a/astro/libroadnav/Makefile
+++ b/astro/libroadnav/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libroadnav
PORTVERSION= 0.19
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= astro geography
MASTER_SITES= SF/roadnav/LibRoadnav/${PORTVERSION}
diff --git a/astro/roadnav/Makefile b/astro/roadnav/Makefile
index 18af9a0255c8..ad8db5b1a7de 100644
--- a/astro/roadnav/Makefile
+++ b/astro/roadnav/Makefile
@@ -3,7 +3,7 @@
PORTNAME= roadnav
PORTVERSION= 0.19
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= astro geography
MASTER_SITES= SF/${PORTNAME}/Roadnav/${PORTVERSION}
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 9439f6d6f657..86e715236e40 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -3,7 +3,7 @@
PORTNAME= audacity
PORTVERSION= 2.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-minsrc-${PORTVERSION}
diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile
index 54a5db367cdc..9574bb5e7d8d 100644
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smasher
PORTVERSION= 1.1.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SF
diff --git a/biology/lamarc/Makefile b/biology/lamarc/Makefile
index 0c51835bdfbf..75d9ddc65620 100644
--- a/biology/lamarc/Makefile
+++ b/biology/lamarc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= lamarc
PORTVERSION= 2.1.8
+PORTREVISION= 1
DISTVERSIONSUFFIX= -src
PORTEPOCH= 1
CATEGORIES= biology
diff --git a/biology/treeviewx/Makefile b/biology/treeviewx/Makefile
index 49c530949db0..b8aa64362ad7 100644
--- a/biology/treeviewx/Makefile
+++ b/biology/treeviewx/Makefile
@@ -4,7 +4,7 @@
PORTNAME= treeviewx
PORTVERSION= ${DISTVERSION}.1s20100823
DISTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= biology
MASTER_SITES= GOOGLE_CODE
DISTNAME= tv-${DISTVERSION}
diff --git a/cad/basicdsp/Makefile b/cad/basicdsp/Makefile
index 8a9973062d8d..4a5d09fe6244 100644
--- a/cad/basicdsp/Makefile
+++ b/cad/basicdsp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= basicdsp
PORTVERSION= 1.01
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= cad hamradio
MASTER_SITES= http://wwwhome.cs.utwente.nl/~ptdeboer/ham/basicdsp/ \
LOCAL/db
diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index c6cd94cad238..74058e2a8a03 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gspiceui
PORTVERSION= 1.0.00
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${PORTVERSION}
DISTNAME= ${PORTNAME}-v${PORTVERSION}
diff --git a/comms/congruity/Makefile b/comms/congruity/Makefile
index c11f07640e9f..70b56e96f19c 100644
--- a/comms/congruity/Makefile
+++ b/comms/congruity/Makefile
@@ -3,7 +3,7 @@
PORTNAME= congruity
PORTVERSION= 18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= SF
diff --git a/comms/ebook2cwgui/Makefile b/comms/ebook2cwgui/Makefile
index c3d7c0af3a64..3224d0ed1a3e 100644
--- a/comms/ebook2cwgui/Makefile
+++ b/comms/ebook2cwgui/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ebook2cwgui
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms hamradio
MASTER_SITES= http://fkurz.net/ham/ebook2cw/ \
http://distfiles.bsdjunk.com/ \
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index b47314180e8a..8b0dacda1134 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= trustedqsl
PORTVERSION= 2.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/TrustedQSL/v${PORTVERSION}/
DISTNAME= tqsl-${PORTVERSION}
diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
index 60b9e497d69e..bdd7d9c4cf7f 100644
--- a/databases/flamerobin/Makefile
+++ b/databases/flamerobin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= flamerobin
PORTVERSION= 0.9.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index dff3232bd13e..52cfd74c4c9e 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -3,7 +3,7 @@
PORTNAME= grass
PORTVERSION= 6.4.5
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= databases geography
MASTER_SITES= http://grass.osgeo.org/%SUBDIR%/ \
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 5d4f6ab95a6f..eead0812d3cb 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pgadmin3
PORTVERSION= 1.20.0
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= PGSQL/pgadmin3/release/v${PORTVERSION}/src
DIST_SUBDIR= postgresql
diff --git a/databases/pgagent/Makefile b/databases/pgagent/Makefile
index e679e82fb1e9..05f87c943026 100644
--- a/databases/pgagent/Makefile
+++ b/databases/pgagent/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pgagent
PORTVERSION= 3.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= PGSQL/pgadmin3/release/pgagent
DISTNAME= pgAgent-${PORTVERSION}-Source
diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile
index 988f079afea6..f85b345abb3b 100644
--- a/databases/spatialite_gui/Makefile
+++ b/databases/spatialite_gui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= spatialite_gui
PORTVERSION= 1.7.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= databases geography
MASTER_SITES= http://www.gaia-gis.it/gaia-sins/
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index a3f86465d3ad..4ef9a27dff46 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xchm
PORTVERSION= 1.23
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/xCHM/${PORTNAME}-${PORTVERSION}
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 190768826a29..622eaf8d775d 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -3,7 +3,7 @@
PORTNAME= codeblocks
PORTVERSION= 13.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}-1
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index ae6cfb658252..d9e1174baf72 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rapidsvn
PORTVERSION= 0.12.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://www.rapidsvn.org/download/release/${PORTVERSION}/
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index 5ebbb3f74e21..5e4690095335 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -3,7 +3,7 @@
PORTNAME= madedit
PORTVERSION= 0.2.9
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= editors
MASTER_SITES= SF/${PORTNAME}/MadEdit/MadEdit-${PORTVERSION}
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 2ad93f936e4f..3a24fc9d0bca 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xmlcopyeditor
PORTVERSION= 1.2.1.3
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}
diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 08b650648025..f9988a1c4f81 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -3,6 +3,7 @@
PORTNAME= catapult
PORTVERSION= 0.11.0
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF/openmsx/openmsx/${PORTVERSION}
DISTNAME= openmsx-${PORTNAME}-${PORTVERSION}
diff --git a/emulators/lisaem/Makefile b/emulators/lisaem/Makefile
index 90abbdff6385..af5cbebfa90b 100644
--- a/emulators/lisaem/Makefile
+++ b/emulators/lisaem/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lisaem
DISTVERSION= 1.2.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= emulators
MASTER_SITES= http://lisaem.sunder.net/downloads/
diff --git a/finance/moneymanagerex/Makefile b/finance/moneymanagerex/Makefile
index a366be28b5b0..826204a67c95 100644
--- a/finance/moneymanagerex/Makefile
+++ b/finance/moneymanagerex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mmex
PORTVERSION= 0.9.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance
MASTER_SITES= http://www.codelathe.com/${PORTNAME}/installer/linux/ \
SF/moneymanagerex/moneymanagerex/Version%20${PORTVERSION}
diff --git a/ftp/ftpcube/Makefile b/ftp/ftpcube/Makefile
index 82a3bb79895d..e5fa8a0c863c 100644
--- a/ftp/ftpcube/Makefile
+++ b/ftp/ftpcube/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ftpcube
PORTVERSION= 0.5.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= ftp python
MASTER_SITES= SF
diff --git a/ftp/multiget/Makefile b/ftp/multiget/Makefile
index bb092243feca..421f3913c37a 100644
--- a/ftp/multiget/Makefile
+++ b/ftp/multiget/Makefile
@@ -3,7 +3,7 @@
PORTNAME= multiget
PORTVERSION= 1.1.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= ftp www
MASTER_SITES= SF/${PORTNAME}/OldFiles
diff --git a/ftp/wxdfast/Makefile b/ftp/wxdfast/Makefile
index 8507e11c2be5..98c0d3725d10 100644
--- a/ftp/wxdfast/Makefile
+++ b/ftp/wxdfast/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wxdfast
PORTVERSION= 0.6.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= ftp www
MASTER_SITES= SF/dfast/wxDownload%20Fast/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index 1b3bc3590457..02cad7c8ccf0 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -2,6 +2,7 @@
PORTNAME= 0ad
PORTVERSION= 0.0.18
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/zero-ad/releases
DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
diff --git a/games/blokish/Makefile b/games/blokish/Makefile
index 09595cdeefc3..6e4431706416 100644
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@@ -3,7 +3,7 @@
PORTNAME= blokish
PORTVERSION= 0.9.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
DISTNAME= ${PORTNAME}_v${PORTVERSION}
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 69aefdf6939a..6044b2b415fe 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -3,7 +3,7 @@
PORTNAME= glest
PORTVERSION= 3.2.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION}
DISTNAME= ${PORTNAME}_source_${PORTVERSION}
diff --git a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile
index d5dc1d5cf9cd..ed3e57b798e9 100644
--- a/games/openyahtzee/Makefile
+++ b/games/openyahtzee/Makefile
@@ -3,6 +3,7 @@
PORTNAME= openyahtzee
PORTVERSION= 1.9.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Open%20Yahtzee/Open%20Yahtzee%20${PORTVERSION}
diff --git a/games/pyfa/Makefile b/games/pyfa/Makefile
index 1e51d29d18ee..e0e896a8a9f2 100644
--- a/games/pyfa/Makefile
+++ b/games/pyfa/Makefile
@@ -4,6 +4,7 @@
PORTNAME= pyfa
PORTVERSION= 1.13.1
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= games python
MAINTAINER= andrey@bsdnir.info
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 2f61895f18f4..cb5041ae01f3 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scorched3d
PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION}
DISTNAME= Scorched3D-${SCORCH_VERSION}-src
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 8d94877d1ac4..a4725418715f 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scummvm-tools
DISTVERSION= 1.7.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games emulators
MASTER_SITES= SF/scummvm/${PORTNAME}/${DISTVERSION}
diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile
index 2ee740d394de..e9e37115e5bf 100644
--- a/games/springlobby/Makefile
+++ b/games/springlobby/Makefile
@@ -3,7 +3,7 @@
PORTNAME= springlobby
PORTVERSION= 0.180
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games net
MASTER_SITES= http://www.springlobby.info/tarballs/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile
index d8f2edd621d7..926f5f64cb9c 100644
--- a/games/traindirector/Makefile
+++ b/games/traindirector/Makefile
@@ -2,7 +2,7 @@
PORTNAME= traindirector
PORTVERSION= 3.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= http://www.backerstreet.com/traindir/
DISTNAME= tdir36src
diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index 5e26adcebcf7..8018594464c3 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vavoom
PORTVERSION= 1.33
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Vavoom-source/${PORTVERSION}
diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index 7ea4ee37dffc..a4b3c421881a 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -3,7 +3,7 @@
PORTNAME= comical
PORTVERSION= 0.8
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= SF
diff --git a/graphics/hugin-devel/Makefile b/graphics/hugin-devel/Makefile
index 7d32a6c45c17..18534f505da1 100644
--- a/graphics/hugin-devel/Makefile
+++ b/graphics/hugin-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hugin
PORTVERSION= 2013.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-2013.0
PKGNAMESUFFIX= -devel
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index bb5733c5357e..cf5104b4b5d6 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hugin
PORTVERSION= 2013.0.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile
index 6ba2ac8fe10a..8caba0e98965 100644
--- a/graphics/libreatlas/Makefile
+++ b/graphics/libreatlas/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libreatlas
PORTVERSION= 1.0.0a
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= graphics geography
MASTER_SITES= http://www.gaia-gis.it/gaia-sins/
diff --git a/graphics/panoglview/Makefile b/graphics/panoglview/Makefile
index edf05c36752c..a41c9825b2fa 100644
--- a/graphics/panoglview/Makefile
+++ b/graphics/panoglview/Makefile
@@ -3,7 +3,7 @@
PORTNAME= panoglview
PORTVERSION= 0.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/hugin/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index 7d48ae199f50..79f0368d3e35 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erlang
PORTVERSION= 15.b.03.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile
index 6c8025ca72d2..33682d16c151 100644
--- a/lang/erlang-runtime16/Makefile
+++ b/lang/erlang-runtime16/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erlang
PORTVERSION= 16.b.03.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile
index fdac0ca258b7..06d851c01778 100644
--- a/lang/erlang-runtime17/Makefile
+++ b/lang/erlang-runtime17/Makefile
@@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 17.5.6.3
+PORTREVISION= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile
index 9a0641f69a97..6d5eae0da10c 100644
--- a/lang/erlang-runtime18/Makefile
+++ b/lang/erlang-runtime18/Makefile
@@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 18.0.3
+PORTREVISION= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile
index 1b9d57d5390c..fc90cb1636d0 100644
--- a/lang/erlang-wx/Makefile
+++ b/lang/erlang-wx/Makefile
@@ -2,6 +2,7 @@
PORTNAME= erlang
PORTVERSION= 18.0.3
+PORTREVISION= 1
CATEGORIES= lang parallel
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 249d455dfce4..842e797c937f 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -3,6 +3,7 @@
PORTNAME= erlang
PORTVERSION= 18.0.3
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 5231a442bce0..7ed583b7dfe1 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnuplot
PORTVERSION= 4.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math graphics
MASTER_SITES= SF
diff --git a/math/graphthing/Makefile b/math/graphthing/Makefile
index f46ae8107b2f..389c344426f5 100644
--- a/math/graphthing/Makefile
+++ b/math/graphthing/Makefile
@@ -3,7 +3,7 @@
PORTNAME= graphthing
PORTVERSION= 1.3.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= math
MASTER_SITES= http://graph.seul.org/
diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile
index 76420b0390ea..9c155dce8c2c 100644
--- a/math/wxMaxima/Makefile
+++ b/math/wxMaxima/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wxMaxima
PORTVERSION= 14.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
DISTFILES= ${PORTNAME:tl}-${PORTVERSION}.tar.gz
diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index f0681f074a3a..e786b191b42f 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hercules
PORTVERSION= 0.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= misc
MASTER_SITES= SF/${PORTNAME}/development%20branch/${PORTVERSION}
PKGNAMEPREFIX= diary-
diff --git a/multimedia/libkate/Makefile b/multimedia/libkate/Makefile
index 69a855d7438e..a18f7d1a39b9 100644
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libkate
PORTVERSION= 0.4.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia
MASTER_SITES= GOOGLE_CODE
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 5acbf0fdf4cd..945bb55a35fb 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amule
PORTVERSION= 10834
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-p2p
MASTER_SITES= http://amule.sourceforge.net/tarballs/
PKGNAMESUFFIX= -devel
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index ab74d1e956f9..63fdfe546f00 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -3,7 +3,7 @@
PORTNAME= amule
PORTVERSION= 2.3.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION}
DISTNAME= aMule-${PORTVERSION}
@@ -22,6 +22,7 @@ USES= bison gmake pkgconfig perl5 shebangfix tar:bzip2 \
desktop-file-utils
USE_PERL5= build
USE_WX= 2.8
+WX_UNICODE= yes
WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-denoise-level=0
@@ -34,7 +35,7 @@ LDFLAGS+= -lpthread -L${LOCALBASE}/lib
OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \
FILEVIEW GEOIP MMAP MONOLITHIC NLS PLASMAMULE UPNP \
- WEBSERVER WXCAS WXUNICODE XAS
+ WEBSERVER WXCAS XAS
ALC_DESC= Compile aMule Link Creator for GUI
ALCC_DESC= Compile aMule Link Creator for console
AMULECMD_DESC= Compile aMule command line client
@@ -47,10 +48,9 @@ MMAP_DESC= Use mapped memory
MONOLITHIC_DESC= Compile monolithic aMule
PLASMAMULE_DESC= Compile aMule plasma applet and engine
WXCAS_DESC= Compile aMule Statistics for GUI
-WXUNICODE_DESC= Unicode support
XAS_DESC= Install XChat2 plugin
OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \
- FILEVIEW MONOLITHIC WEBSERVER WXCAS WXUNICODE XAS
+ FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS
OPTIONS_SUB= yes
@@ -115,10 +115,6 @@ CPPFLAGS+= -DCRYPTOPP_DISABLE_ASM
CONFLICTS+= ed2k-hash*
.endif
-.if ${PORT_OPTIONS:MWXUNICODE}
-WX_UNICODE= yes
-.endif
-
post-patch: .SILENT
${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
-e '/if.*test/s/==/=/' \
diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 8e45c527477d..ff5f2002b950 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tribler
PORTVERSION= 6.4.3
+PORTREVISION= 1
CATEGORIES= net-p2p
MASTER_SITES= https://github.com/Tribler/tribler/releases/download/${PORTVERSION:S/^/v/}/
DISTFILES= ${PORTNAME}_${PORTVERSION}_all.deb
diff --git a/net/opennx/Makefile b/net/opennx/Makefile
index 1dbb1b3af83c..b45795f2104c 100644
--- a/net/opennx/Makefile
+++ b/net/opennx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opennx
PORTVERSION= 0.16.0.729
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CI-source
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 761749445934..679270fc11fa 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnudatalanguage
DISTVERSION= 0.9.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= science lang
MASTER_SITES= SF/${PORTNAME}/gdl/${DISTVERSION}
.if defined(BUILD_PYTHON_MODULE)
diff --git a/science/psychopy/Makefile b/science/psychopy/Makefile
index d68cd50cfa86..db87a4084897 100644
--- a/science/psychopy/Makefile
+++ b/science/psychopy/Makefile
@@ -3,6 +3,7 @@
PORTNAME= psychopy
PORTVERSION= 1.82.02
+PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= SF/psychpy/PsychoPy
DISTNAME= PsychoPy-${PORTVERSION}
diff --git a/security/webshag/Makefile b/security/webshag/Makefile
index 5dbe877b0736..d964bb30725b 100644
--- a/security/webshag/Makefile
+++ b/security/webshag/Makefile
@@ -2,6 +2,7 @@
PORTNAME= webshag
PORTVERSION= 1.10
+PORTREVISION= 1
CATEGORIES= security www
MASTER_SITES= http://www.scrt.ch/outils/webshag/
DISTNAME= ws110
diff --git a/sysutils/abgx360gui/Makefile b/sysutils/abgx360gui/Makefile
index 385946806244..9f11b8e33751 100644
--- a/sysutils/abgx360gui/Makefile
+++ b/sysutils/abgx360gui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= abgx360gui
PORTVERSION= 1.0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
http://update.cooltrainer.org/abgx360/ \
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 3e8632d4e796..c158f1fdc413 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -201,7 +201,6 @@
SUBDIR += py-wxPython-common
SUBDIR += py-wxPython28
SUBDIR += py-wxPython28-common
- SUBDIR += py-wxPython28-unicode
SUBDIR += py-wxPython30
SUBDIR += py-xlib
SUBDIR += pypy-tkinter
@@ -261,8 +260,6 @@
SUBDIR += wxgtk28-common
SUBDIR += wxgtk28-contrib
SUBDIR += wxgtk28-contrib-common
- SUBDIR += wxgtk28-unicode
- SUBDIR += wxgtk28-unicode-contrib
SUBDIR += wxgtk30
SUBDIR += xbae
SUBDIR += xforms
diff --git a/x11-toolkits/py-wax/Makefile b/x11-toolkits/py-wax/Makefile
index ecf116831d92..937655335741 100644
--- a/x11-toolkits/py-wax/Makefile
+++ b/x11-toolkits/py-wax/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wax
PORTVERSION= 0.3.33
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-toolkits devel python
MASTER_SITES= SF/${PORTNAME}gui/${PORTNAME}gui/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-toolkits/py-wxPython28-unicode/Makefile b/x11-toolkits/py-wxPython28-unicode/Makefile
deleted file mode 100644
index 138651b6bc49..000000000000
--- a/x11-toolkits/py-wxPython28-unicode/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-# $FreeBSD$
-
-WITH_WXPYTHON_UNICODE= yes
-
-MASTERDIR= ${.CURDIR}/../py-wxPython28
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 13ce7fd010c0..51eb358a88fa 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wxPython
PORTVERSION= 2.8.12.1
-PORTREVISION?= 5
+PORTREVISION?= 7
CATEGORIES= x11-toolkits python
MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -83,19 +83,11 @@ PYDISTUTILS_BUILDARGS+= \
NO_SCRIPTS=1 \
INSTALL_MULTIVERSION=1
-. if defined(WITH_WXPYTHON_UNICODE)
WX_UNICODE= yes
-PKGNAMESUFFIX= 28-unicode
-
PYDISTUTILS_BUILDARGS+= \
UNICODE=1
WX_PYTHON_DIR= wx-${WX_VERSION}-${WXPORT}-unicode
-. else
-PYDISTUTILS_BUILDARGS+= \
- UNICODE=0
-WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi
-. endif # defined(WITH_WXPYTHON_UNICODE)
# plist substitutions
PLIST_SUB+= WX_PYTHON_DIR=${WX_PYTHON_DIR}
diff --git a/x11-toolkits/wxgtk28-contrib/pkg-plist b/x11-toolkits/wxgtk28-contrib/pkg-plist
index ebf865c43d67..6281ec78ed9a 100644
--- a/x11-toolkits/wxgtk28-contrib/pkg-plist
+++ b/x11-toolkits/wxgtk28-contrib/pkg-plist
@@ -1,21 +1,21 @@
-lib/libwx_gtk2_fl-2.8.so
-lib/libwx_gtk2_fl-2.8.so.0
-lib/libwx_gtk2_fl-2.8.so.0.8.0
-lib/libwx_gtk2_gizmos-2.8.so
-lib/libwx_gtk2_gizmos-2.8.so.0
-lib/libwx_gtk2_gizmos-2.8.so.0.8.0
-lib/libwx_gtk2_gizmos_xrc-2.8.so
-lib/libwx_gtk2_gizmos_xrc-2.8.so.0
-lib/libwx_gtk2_gizmos_xrc-2.8.so.0.8.0
-lib/libwx_gtk2_ogl-2.8.so
-lib/libwx_gtk2_ogl-2.8.so.0
-lib/libwx_gtk2_ogl-2.8.so.0.8.0
-lib/libwx_gtk2_plot-2.8.so
-lib/libwx_gtk2_plot-2.8.so.0
-lib/libwx_gtk2_plot-2.8.so.0.8.0
-lib/libwx_gtk2_stc-2.8.so
-lib/libwx_gtk2_stc-2.8.so.0
-lib/libwx_gtk2_stc-2.8.so.0.8.0
-lib/libwx_gtk2_svg-2.8.so
-lib/libwx_gtk2_svg-2.8.so.0
-lib/libwx_gtk2_svg-2.8.so.0.8.0
+lib/libwx_gtk2u_fl-2.8.so
+lib/libwx_gtk2u_fl-2.8.so.0
+lib/libwx_gtk2u_fl-2.8.so.0.8.0
+lib/libwx_gtk2u_gizmos-2.8.so
+lib/libwx_gtk2u_gizmos-2.8.so.0
+lib/libwx_gtk2u_gizmos-2.8.so.0.8.0
+lib/libwx_gtk2u_gizmos_xrc-2.8.so
+lib/libwx_gtk2u_gizmos_xrc-2.8.so.0
+lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.8.0
+lib/libwx_gtk2u_ogl-2.8.so
+lib/libwx_gtk2u_ogl-2.8.so.0
+lib/libwx_gtk2u_ogl-2.8.so.0.8.0
+lib/libwx_gtk2u_plot-2.8.so
+lib/libwx_gtk2u_plot-2.8.so.0
+lib/libwx_gtk2u_plot-2.8.so.0.8.0
+lib/libwx_gtk2u_stc-2.8.so
+lib/libwx_gtk2u_stc-2.8.so.0
+lib/libwx_gtk2u_stc-2.8.so.0.8.0
+lib/libwx_gtk2u_svg-2.8.so
+lib/libwx_gtk2u_svg-2.8.so.0
+lib/libwx_gtk2u_svg-2.8.so.0.8.0
diff --git a/x11-toolkits/wxgtk28-unicode-contrib/Makefile b/x11-toolkits/wxgtk28-unicode-contrib/Makefile
deleted file mode 100644
index 05a055767a91..000000000000
--- a/x11-toolkits/wxgtk28-unicode-contrib/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: fjoe@FreeBSD.org
-# $FreeBSD$
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode)
-
-WXGTK_FLAVOR= gtk2-unicode-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk28
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist b/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
deleted file mode 100644
index 6281ec78ed9a..000000000000
--- a/x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-lib/libwx_gtk2u_fl-2.8.so
-lib/libwx_gtk2u_fl-2.8.so.0
-lib/libwx_gtk2u_fl-2.8.so.0.8.0
-lib/libwx_gtk2u_gizmos-2.8.so
-lib/libwx_gtk2u_gizmos-2.8.so.0
-lib/libwx_gtk2u_gizmos-2.8.so.0.8.0
-lib/libwx_gtk2u_gizmos_xrc-2.8.so
-lib/libwx_gtk2u_gizmos_xrc-2.8.so.0
-lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.8.0
-lib/libwx_gtk2u_ogl-2.8.so
-lib/libwx_gtk2u_ogl-2.8.so.0
-lib/libwx_gtk2u_ogl-2.8.so.0.8.0
-lib/libwx_gtk2u_plot-2.8.so
-lib/libwx_gtk2u_plot-2.8.so.0
-lib/libwx_gtk2u_plot-2.8.so.0.8.0
-lib/libwx_gtk2u_stc-2.8.so
-lib/libwx_gtk2u_stc-2.8.so.0
-lib/libwx_gtk2u_stc-2.8.so.0.8.0
-lib/libwx_gtk2u_svg-2.8.so
-lib/libwx_gtk2u_svg-2.8.so.0
-lib/libwx_gtk2u_svg-2.8.so.0.8.0
diff --git a/x11-toolkits/wxgtk28-unicode/Makefile b/x11-toolkits/wxgtk28-unicode/Makefile
deleted file mode 100644
index 404f05548b91..000000000000
--- a/x11-toolkits/wxgtk28-unicode/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: fjoe@FreeBSD.org
-# $FreeBSD$
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit (Unicode)
-
-WXGTK_FLAVOR= gtk2-unicode
-MASTERDIR= ${.CURDIR}/../wxgtk28
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk28-unicode/pkg-plist b/x11-toolkits/wxgtk28-unicode/pkg-plist
deleted file mode 100644
index 5d4b8e9394ed..000000000000
--- a/x11-toolkits/wxgtk28-unicode/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-bin/wxgtk2u-2.8-config
-bin/wxrc-gtk2u-2.8
-lib/libwx_baseu-2.8.so
-lib/libwx_baseu-2.8.so.0
-lib/libwx_baseu-2.8.so.0.8.0
-lib/libwx_baseu_net-2.8.so
-lib/libwx_baseu_net-2.8.so.0
-lib/libwx_baseu_net-2.8.so.0.8.0
-lib/libwx_baseu_xml-2.8.so
-lib/libwx_baseu_xml-2.8.so.0
-lib/libwx_baseu_xml-2.8.so.0.8.0
-lib/libwx_gtk2u_adv-2.8.so
-lib/libwx_gtk2u_adv-2.8.so.0
-lib/libwx_gtk2u_adv-2.8.so.0.8.0
-lib/libwx_gtk2u_aui-2.8.so
-lib/libwx_gtk2u_aui-2.8.so.0
-lib/libwx_gtk2u_aui-2.8.so.0.8.0
-lib/libwx_gtk2u_core-2.8.so
-lib/libwx_gtk2u_core-2.8.so.0
-lib/libwx_gtk2u_core-2.8.so.0.8.0
-lib/libwx_gtk2u_gl-2.8.so
-lib/libwx_gtk2u_gl-2.8.so.0
-lib/libwx_gtk2u_gl-2.8.so.0.8.0
-lib/libwx_gtk2u_html-2.8.so
-lib/libwx_gtk2u_html-2.8.so.0
-lib/libwx_gtk2u_html-2.8.so.0.8.0
-%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so
-%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0
-%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0.8.0
-lib/libwx_gtk2u_qa-2.8.so
-lib/libwx_gtk2u_qa-2.8.so.0
-lib/libwx_gtk2u_qa-2.8.so.0.8.0
-lib/libwx_gtk2u_richtext-2.8.so
-lib/libwx_gtk2u_richtext-2.8.so.0
-lib/libwx_gtk2u_richtext-2.8.so.0.8.0
-lib/libwx_gtk2u_xrc-2.8.so
-lib/libwx_gtk2u_xrc-2.8.so.0
-lib/libwx_gtk2u_xrc-2.8.so.0.8.0
-lib/wx/include/gtk2-unicode-release-2.8/wx/setup.h
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 43df6ab2d77d..b0b8cd4ff96f 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wx
PORTVERSION= 2.8.12
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= x11-toolkits
MASTER_SITES= SF/wxwindows/${PORTVERSION}
PKGNAMESUFFIX= 28-${WXGTK_FLAVOR}
@@ -81,10 +81,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
USE_WX= 2.8
RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
-
-.if ${WXGTK_FLAVOR:M*-unicode*} != ""
WX_UNICODE= yes
-.endif
pre-configure:
@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
@@ -95,9 +92,7 @@ pre-configure:
.endif # !gtk2-contrib-common
.endif # *-contrib*
-.if ${WXGTK_FLAVOR:M*-unicode*} != ""
CONFIGURE_ARGS+=--enable-unicode
-.endif
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/wxgtk28/pkg-plist b/x11-toolkits/wxgtk28/pkg-plist
index 4bc1a9a85de5..5d4b8e9394ed 100644
--- a/x11-toolkits/wxgtk28/pkg-plist
+++ b/x11-toolkits/wxgtk28/pkg-plist
@@ -1,39 +1,39 @@
-bin/wxgtk2-2.8-config
-bin/wxrc-gtk2-2.8
-lib/libwx_base-2.8.so
-lib/libwx_base-2.8.so.0
-lib/libwx_base-2.8.so.0.8.0
-lib/libwx_base_net-2.8.so
-lib/libwx_base_net-2.8.so.0
-lib/libwx_base_net-2.8.so.0.8.0
-lib/libwx_base_xml-2.8.so
-lib/libwx_base_xml-2.8.so.0
-lib/libwx_base_xml-2.8.so.0.8.0
-lib/libwx_gtk2_adv-2.8.so
-lib/libwx_gtk2_adv-2.8.so.0
-lib/libwx_gtk2_adv-2.8.so.0.8.0
-lib/libwx_gtk2_aui-2.8.so
-lib/libwx_gtk2_aui-2.8.so.0
-lib/libwx_gtk2_aui-2.8.so.0.8.0
-lib/libwx_gtk2_core-2.8.so
-lib/libwx_gtk2_core-2.8.so.0
-lib/libwx_gtk2_core-2.8.so.0.8.0
-lib/libwx_gtk2_gl-2.8.so
-lib/libwx_gtk2_gl-2.8.so.0
-lib/libwx_gtk2_gl-2.8.so.0.8.0
-lib/libwx_gtk2_html-2.8.so
-lib/libwx_gtk2_html-2.8.so.0
-lib/libwx_gtk2_html-2.8.so.0.8.0
-%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so
-%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so.0
-%%GSTREAMER%%lib/libwx_gtk2_media-2.8.so.0.8.0
-lib/libwx_gtk2_qa-2.8.so
-lib/libwx_gtk2_qa-2.8.so.0
-lib/libwx_gtk2_qa-2.8.so.0.8.0
-lib/libwx_gtk2_richtext-2.8.so
-lib/libwx_gtk2_richtext-2.8.so.0
-lib/libwx_gtk2_richtext-2.8.so.0.8.0
-lib/libwx_gtk2_xrc-2.8.so
-lib/libwx_gtk2_xrc-2.8.so.0
-lib/libwx_gtk2_xrc-2.8.so.0.8.0
-lib/wx/include/gtk2-ansi-release-2.8/wx/setup.h
+bin/wxgtk2u-2.8-config
+bin/wxrc-gtk2u-2.8
+lib/libwx_baseu-2.8.so
+lib/libwx_baseu-2.8.so.0
+lib/libwx_baseu-2.8.so.0.8.0
+lib/libwx_baseu_net-2.8.so
+lib/libwx_baseu_net-2.8.so.0
+lib/libwx_baseu_net-2.8.so.0.8.0
+lib/libwx_baseu_xml-2.8.so
+lib/libwx_baseu_xml-2.8.so.0
+lib/libwx_baseu_xml-2.8.so.0.8.0
+lib/libwx_gtk2u_adv-2.8.so
+lib/libwx_gtk2u_adv-2.8.so.0
+lib/libwx_gtk2u_adv-2.8.so.0.8.0
+lib/libwx_gtk2u_aui-2.8.so
+lib/libwx_gtk2u_aui-2.8.so.0
+lib/libwx_gtk2u_aui-2.8.so.0.8.0
+lib/libwx_gtk2u_core-2.8.so
+lib/libwx_gtk2u_core-2.8.so.0
+lib/libwx_gtk2u_core-2.8.so.0.8.0
+lib/libwx_gtk2u_gl-2.8.so
+lib/libwx_gtk2u_gl-2.8.so.0
+lib/libwx_gtk2u_gl-2.8.so.0.8.0
+lib/libwx_gtk2u_html-2.8.so
+lib/libwx_gtk2u_html-2.8.so.0
+lib/libwx_gtk2u_html-2.8.so.0.8.0
+%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so
+%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0
+%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0.8.0
+lib/libwx_gtk2u_qa-2.8.so
+lib/libwx_gtk2u_qa-2.8.so.0
+lib/libwx_gtk2u_qa-2.8.so.0.8.0
+lib/libwx_gtk2u_richtext-2.8.so
+lib/libwx_gtk2u_richtext-2.8.so.0
+lib/libwx_gtk2u_richtext-2.8.so.0.8.0
+lib/libwx_gtk2u_xrc-2.8.so
+lib/libwx_gtk2u_xrc-2.8.so.0
+lib/libwx_gtk2u_xrc-2.8.so.0.8.0
+lib/wx/include/gtk2-unicode-release-2.8/wx/setup.h
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index e29188cfd36b..0447c505fc81 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -3,7 +3,7 @@
PORTNAME= simdock
PORTVERSION= 1.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}