5 files changed, 32 insertions, 26 deletions

diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index fb68d1335be8..e4d692045300 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
@@ -43,8 +43,4 @@ pre-patch:
 			 s|-l\$$THREADS_LINK|${PTHREAD_LIBS}|g' \
 				${WRKSRC}/configure
 
-post-install:
-	@${RM} -rf ${PREFIX}/include/wx/motif
-	@${RM} -rf ${PREFIX}/include/wx/msw
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk-devel/distinfo b/x11-toolkits/wxgtk-devel/distinfo
index 6e08b37f8059..1faaa0c02d77 100644
--- a/x11-toolkits/wxgtk-devel/distinfo
+++ b/x11-toolkits/wxgtk-devel/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.3.0.tar.gz) = 9dfbe08a7f574ed3b187bc361012981d
+MD5 (wxGTK-2.3.1.tar.gz) = 4f442ef443e6c4914148de6a01dcafe4
diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure
index 05998ba6dfaa..eb1343aead3e 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-configure
+++ b/x11-toolkits/wxgtk-devel/files/patch-configure
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Mon May 28 20:11:23 2001
-+++ configure	Mon May 28 20:14:20 2001
-@@ -7606,10 +7606,10 @@
+--- configure.orig	Tue Nov 27 13:14:10 2001
++++ configure	Tue Nov 27 13:18:58 2001
+@@ -7657,10 +7657,10 @@
    else
       echo "$ac_t""no" 1>&6
       if test "$GTK_CONFIG_2_0" = "no" ; then
@@ -18,14 +18,14 @@ $FreeBSD$
       else
         if test -f conf.gtktest ; then
          :
-@@ -7941,14 +7941,14 @@
+@@ -7992,14 +7992,14 @@
      TOOLKIT=GTK
      GUIDIST=GTK_DIST
  
 -        echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
--echo "configure:7946: checking for gdk_im_open in -lgdk" >&5
+-echo "configure:7997: checking for gdk_im_open in -lgdk" >&5
 +        echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
-+echo "configure:7946: checking for gdk_im_open in -lgdk12" >&5
++echo "configure:7997: checking for gdk_im_open in -lgdk12" >&5
  ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -34,9 +34,9 @@ $FreeBSD$
 -LIBS="-lgdk  $LIBS"
 +LIBS="-lgdk12  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 7954 "configure"
+ #line 8005 "configure"
  #include "confdefs.h"
-@@ -9207,16 +9207,12 @@
+@@ -9258,16 +9258,12 @@
  WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
  WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
  
@@ -58,7 +58,7 @@ $FreeBSD$
  SHARED_LD=
  PIC_FLAG=
  WX_ALL=
-@@ -12945,6 +12941,7 @@
+@@ -13135,6 +13131,7 @@
    fi
  fi
  
@@ -66,7 +66,7 @@ $FreeBSD$
  if test "$WXGTK20" = 1 ; then
    cat >> confdefs.h <<EOF
  #define __WXGTK20__ $WXGTK20
-@@ -13115,24 +13112,6 @@
+@@ -13305,24 +13302,6 @@
  fi
  
  
@@ -91,7 +91,15 @@ $FreeBSD$
  ZLIB_INCLUDE=
  if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
    cat >> confdefs.h <<\EOF
-@@ -15947,8 +15926,6 @@
+@@ -13526,6 +13505,7 @@
+   cat > conftest.$ac_ext <<EOF
+ #line 13528 "configure"
+ #include "confdefs.h"
++#undef HAVE_STDLIB_H
+ #include <jpeglib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+@@ -16156,8 +16136,6 @@
  s%@WX_LIBRARY@%$WX_LIBRARY%g
  s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
  s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
@@ -100,7 +108,7 @@ $FreeBSD$
  s%@PROGRAM_EXT@%$PROGRAM_EXT%g
  s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g
  s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g
-@@ -15956,8 +15933,6 @@
+@@ -16165,8 +16143,6 @@
  s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
  s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g
  s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g
diff --git a/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
index 498d218439b2..b9a5d54bfff3 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
+++ b/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
@@ -1,22 +1,22 @@
 
 $FreeBSD$
 
---- include/wx/wxchar.h.orig	Fri May 25 05:55:35 2001
-+++ include/wx/wxchar.h	Mon May 28 22:12:39 2001
-@@ -276,12 +276,7 @@
+--- include/wx/wxchar.h.orig	Thu Jul  5 06:24:14 2001
++++ include/wx/wxchar.h	Tue Nov 27 13:13:28 2001
+@@ -288,12 +288,7 @@
  #    ifdef HAVE_WCSTR_H
  #      include <wcstr.h>
  #    else
--#      ifndef __FreeBSD__
- #        include <wchar.h>
--#      else
+-#      if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))
 -#        include <stdlib.h>
 -#        define wxNEED_WCSLEN
+-#      else
+ #        include <wchar.h>
 -#      endif
  #    endif
  #  endif
  
-@@ -511,11 +506,11 @@
+@@ -523,11 +518,11 @@
  #endif
  
  // checks whether the passed in pointer is NULL and if the string is empty
diff --git a/x11-toolkits/wxgtk-devel/pkg-plist b/x11-toolkits/wxgtk-devel/pkg-plist
index 0627aeab4d0a..7845c1aa5913 100644
--- a/x11-toolkits/wxgtk-devel/pkg-plist
+++ b/x11-toolkits/wxgtk-devel/pkg-plist
@@ -87,6 +87,7 @@ include/wx/generic/dragimgg.h
 include/wx/generic/filedlgg.h
 include/wx/generic/fontdlgg.h
 include/wx/generic/grid.h
+include/wx/generic/gridctrl.h
 include/wx/generic/gridg.h
 include/wx/generic/helpext.h
 include/wx/generic/helphtml.h
@@ -161,10 +162,10 @@ include/wx/gtk/region.h
 include/wx/gtk/scrolbar.h
 include/wx/gtk/scrolwin.h
 include/wx/gtk/settings.h
+include/wx/gtk/setup.h
 include/wx/gtk/slider.h
 include/wx/gtk/spinbutt.h
 include/wx/gtk/spinctrl.h
-include/wx/gtk/setup.h
 include/wx/gtk/statbmp.h
 include/wx/gtk/statbox.h
 include/wx/gtk/statline.h
@@ -270,6 +271,7 @@ include/wx/settings.h
 include/wx/setup.h
 include/wx/sizer.h
 include/wx/slider.h
+include/wx/snglinst.h
 include/wx/socket.h
 include/wx/spinbutt.h
 include/wx/spinctrl.h