x11-toolkits/wxgtk31: Update 3.1.1 -> 3.1.2

Reported by:	portscout

4 files changed, 53 insertions, 54 deletions

diff --git a/x11-toolkits/wxgtk31/Makefile b/x11-toolkits/wxgtk31/Makefile
index 172cdb6c4a9d..2a858330de8b 100644
--- a/x11-toolkits/wxgtk31/Makefile
+++ b/x11-toolkits/wxgtk31/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	wx
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.1
-PORTREVISION=	4
+DISTVERSION=	3.1.2
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	31-gtk3
 
@@ -23,7 +22,7 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libsoup-2.4.so:devel/libsoup \
 		libtiff.so:graphics/tiff \
 
-USES=		compiler:c++11-lib gmake iconv jpeg localbase pkgconfig
+USES=		compiler:c++11-lib gl gmake gnome iconv jpeg localbase pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	wxWidgets
 GH_PROJECT=	wxWidgets
diff --git a/x11-toolkits/wxgtk31/distinfo b/x11-toolkits/wxgtk31/distinfo
index 93bdcfa6b9f5..7ff757fa2562 100644
--- a/x11-toolkits/wxgtk31/distinfo
+++ b/x11-toolkits/wxgtk31/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528616600
-SHA256 (wxWidgets-wxWidgets-v3.1.1_GH0.tar.gz) = 6f3862f0f53c0d07a12ee4a30bbb501a2b4ae4d1f9c1cc5c15c0419113391d4a
-SIZE (wxWidgets-wxWidgets-v3.1.1_GH0.tar.gz) = 20039325
+TIMESTAMP = 1544551863
+SHA256 (wxWidgets-wxWidgets-v3.1.2_GH0.tar.gz) = 7aa0e9e95d969e47c989288016a04bb5c117f09da6f2e55bbb19c0a33e33f96e
+SIZE (wxWidgets-wxWidgets-v3.1.2_GH0.tar.gz) = 20109169
diff --git a/x11-toolkits/wxgtk31/files/patch-configure b/x11-toolkits/wxgtk31/files/patch-configure
index 31664c2f3e1b..551deb917f48 100644
--- a/x11-toolkits/wxgtk31/files/patch-configure
+++ b/x11-toolkits/wxgtk31/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	2014-10-06 21:33:44 UTC
+--- configure.orig	2018-12-11 18:11:57 UTC
 +++ configure
-@@ -3947,7 +3947,7 @@ case "${host}" in
+@@ -3897,7 +3897,7 @@ case "${host}" in
  
-     DEFAULT_DEFAULT_wxUSE_MOTIF=1
+     DEFAULT_DEFAULT_wxUSE_GTK=1
    ;;
 -  *-*-freebsd*)
 +  *-*-dragonfly*|*-*-freebsd*)
      USE_BSD=1
      USE_FREEBSD=1
      $as_echo "#define __FREEBSD__ 1" >>confdefs.h
-@@ -21894,6 +21894,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -22306,6 +22306,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  SEARCH_INCLUDE="\
@@ -17,7 +17,7 @@
      /usr/local/include        \
      /usr/local/X11/include    \
      /usr/local/include/X11    \
-@@ -31852,9 +31853,6 @@ $as_echo "$as_me: WARNING: BeOS threads 
+@@ -32469,9 +32470,6 @@ $as_echo "$as_me: WARNING: BeOS threads 
                                          THREAD_OPTS="-pthreads $THREAD_OPTS"
                  fi
                  ;;
@@ -27,27 +27,27 @@
            *-*-darwin* | *-*-cygwin* )
                                                  THREAD_OPTS=""
                  ;;
-@@ -33127,7 +33125,7 @@ else
-         fi
-     fi
+@@ -33247,7 +33245,7 @@ if test "x$ac_cv_func_gmtime_r" = xyes; 
+    $as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h
+ 
  fi
 -
 +OPTIMISE_CFLAGS=
  
- if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
-     $as_echo "#define WXWIN_COMPATIBILITY_2_6 1" >>confdefs.h
-@@ -39390,6 +39388,7 @@ EOF
+ 
+ 
+@@ -40172,6 +40170,7 @@ fi
        ;;
  
        powerpc-apple-macos* | \
 +      *-*-dragonfly* | \
-       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
+       *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
        *-*-mirbsd* | \
        *-*-sunos4* | \
-@@ -39432,6 +39431,7 @@ EOF
+@@ -40213,6 +40212,7 @@ fi
  
      case "${BAKEFILE_HOST}" in
-       *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+       *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | \
 +      *-*-dragonfly* | \
        *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
          if test "x$SUNCXX" = "xyes"; then
diff --git a/x11-toolkits/wxgtk31/pkg-plist b/x11-toolkits/wxgtk31/pkg-plist
index 3a79d9bd061f..17418141257e 100644
--- a/x11-toolkits/wxgtk31/pkg-plist
+++ b/x11-toolkits/wxgtk31/pkg-plist
@@ -107,7 +107,6 @@ include/wx-3.1/wx/dir.h
 include/wx-3.1/wx/dirctrl.h
 include/wx-3.1/wx/dirdlg.h
 include/wx-3.1/wx/display.h
-include/wx-3.1/wx/display_impl.h
 include/wx-3.1/wx/dlimpexp.h
 include/wx-3.1/wx/dlist.h
 include/wx-3.1/wx/dnd.h
@@ -373,6 +372,7 @@ include/wx-3.1/wx/listctrl.h
 include/wx-3.1/wx/listimpl.cpp
 include/wx-3.1/wx/log.h
 include/wx-3.1/wx/longlong.h
+include/wx-3.1/wx/lzmastream.h
 include/wx-3.1/wx/math.h
 include/wx-3.1/wx/matrix.h
 include/wx-3.1/wx/mdi.h
@@ -718,54 +718,54 @@ include/wx-3.1/wx/xtixml.h
 include/wx-3.1/wx/zipstrm.h
 include/wx-3.1/wx/zstream.h
 lib/libwx_baseu-3.1.so
-lib/libwx_baseu-3.1.so.1
-lib/libwx_baseu-3.1.so.1.0.0
+lib/libwx_baseu-3.1.so.2
+lib/libwx_baseu-3.1.so.2.0.0
 lib/libwx_baseu_net-3.1.so
-lib/libwx_baseu_net-3.1.so.1
-lib/libwx_baseu_net-3.1.so.1.0.0
+lib/libwx_baseu_net-3.1.so.2
+lib/libwx_baseu_net-3.1.so.2.0.0
 lib/libwx_baseu_xml-3.1.so
-lib/libwx_baseu_xml-3.1.so.1
-lib/libwx_baseu_xml-3.1.so.1.0.0
+lib/libwx_baseu_xml-3.1.so.2
+lib/libwx_baseu_xml-3.1.so.2.0.0
 lib/libwx_gtk3u_adv-3.1.so
-lib/libwx_gtk3u_adv-3.1.so.1
-lib/libwx_gtk3u_adv-3.1.so.1.0.0
+lib/libwx_gtk3u_adv-3.1.so.2
+lib/libwx_gtk3u_adv-3.1.so.2.0.0
 lib/libwx_gtk3u_aui-3.1.so
-lib/libwx_gtk3u_aui-3.1.so.1
-lib/libwx_gtk3u_aui-3.1.so.1.0.0
+lib/libwx_gtk3u_aui-3.1.so.2
+lib/libwx_gtk3u_aui-3.1.so.2.0.0
 lib/libwx_gtk3u_core-3.1.so
-lib/libwx_gtk3u_core-3.1.so.1
-lib/libwx_gtk3u_core-3.1.so.1.0.0
+lib/libwx_gtk3u_core-3.1.so.2
+lib/libwx_gtk3u_core-3.1.so.2.0.0
 lib/libwx_gtk3u_gl-3.1.so
-lib/libwx_gtk3u_gl-3.1.so.1
-lib/libwx_gtk3u_gl-3.1.so.1.0.0
+lib/libwx_gtk3u_gl-3.1.so.2
+lib/libwx_gtk3u_gl-3.1.so.2.0.0
 lib/libwx_gtk3u_html-3.1.so
-lib/libwx_gtk3u_html-3.1.so.1
-lib/libwx_gtk3u_html-3.1.so.1.0.0
+lib/libwx_gtk3u_html-3.1.so.2
+lib/libwx_gtk3u_html-3.1.so.2.0.0
 %%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so
-%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.1
-%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.1.0.0
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.2
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.2.0.0
 lib/libwx_gtk3u_propgrid-3.1.so
-lib/libwx_gtk3u_propgrid-3.1.so.1
-lib/libwx_gtk3u_propgrid-3.1.so.1.0.0
+lib/libwx_gtk3u_propgrid-3.1.so.2
+lib/libwx_gtk3u_propgrid-3.1.so.2.0.0
 lib/libwx_gtk3u_qa-3.1.so
-lib/libwx_gtk3u_qa-3.1.so.1
-lib/libwx_gtk3u_qa-3.1.so.1.0.0
+lib/libwx_gtk3u_qa-3.1.so.2
+lib/libwx_gtk3u_qa-3.1.so.2.0.0
 lib/libwx_gtk3u_ribbon-3.1.so
-lib/libwx_gtk3u_ribbon-3.1.so.1
-lib/libwx_gtk3u_ribbon-3.1.so.1.0.0
+lib/libwx_gtk3u_ribbon-3.1.so.2
+lib/libwx_gtk3u_ribbon-3.1.so.2.0.0
 lib/libwx_gtk3u_richtext-3.1.so
-lib/libwx_gtk3u_richtext-3.1.so.1
-lib/libwx_gtk3u_richtext-3.1.so.1.0.0
+lib/libwx_gtk3u_richtext-3.1.so.2
+lib/libwx_gtk3u_richtext-3.1.so.2.0.0
 lib/libwx_gtk3u_stc-3.1.so
-lib/libwx_gtk3u_stc-3.1.so.1
-lib/libwx_gtk3u_stc-3.1.so.1.0.0
+lib/libwx_gtk3u_stc-3.1.so.2
+lib/libwx_gtk3u_stc-3.1.so.2.0.0
 %%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so
-%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.1
-%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.1.0.0
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.2
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.2.0.0
 lib/libwx_gtk3u_xrc-3.1.so
-lib/libwx_gtk3u_xrc-3.1.so.1
-lib/libwx_gtk3u_xrc-3.1.so.1.0.0
-lib/wx/3.1.1/web-extensions/webkit2_extu-3.1.1.so
+lib/libwx_gtk3u_xrc-3.1.so.2
+lib/libwx_gtk3u_xrc-3.1.so.2.0.0
+lib/wx/3.1.2/web-extensions/webkit2_extu-3.1.2.so
 lib/wx/include/gtk3-unicode-3.1/wx/setup.h
 share/aclocal/wxwin31.m4
 share/bakefile/presets/wx31.bkl