Upgrade to 2.4.1.

4 files changed, 15 insertions, 14 deletions

diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index c44bc4d6e745..bc44cba11721 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxgtk
-PORTVERSION=	2.4.0
+PORTVERSION=	2.4.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
diff --git a/x11-toolkits/wxgtk-devel/distinfo b/x11-toolkits/wxgtk-devel/distinfo
index 9485d3c239b0..136c095f04ca 100644
--- a/x11-toolkits/wxgtk-devel/distinfo
+++ b/x11-toolkits/wxgtk-devel/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.4.0.tar.bz2) = b51cbef5b29ede3f56121e3d142dbc76
+MD5 (wxGTK-2.4.1.tar.bz2) = 937c299de177990908770989206b7d8c
diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure
index ee3970e05565..1a84a2638190 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-configure
+++ b/x11-toolkits/wxgtk-devel/files/patch-configure
@@ -1,16 +1,16 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Jan 14 18:31:00 2003
-+++ configure	Tue Jan 14 18:31:55 2003
-@@ -13284,14 +13284,14 @@
+--- configure.orig	Wed Aug 27 18:55:50 2003
++++ configure	Wed Aug 27 18:57:06 2003
+@@ -13300,14 +13300,14 @@
          TOOLKIT=GTK
          GUIDIST=GTK_DIST
  
 -                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
--echo "configure:13289: checking for gdk_im_open in -lgdk" >&5
+-echo "configure:13305: checking for gdk_im_open in -lgdk" >&5
 +                echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
-+echo "configure:13289: checking for gdk_im_open in -lgdk12" >&5
++echo "configure:13305: 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
@@ -19,9 +19,9 @@ $FreeBSD$
 -LIBS="-lgdk  $LIBS"
 +LIBS="-lgdk12  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 13297 "configure"
+ #line 13313 "configure"
  #include "confdefs.h"
-@@ -15864,8 +15864,8 @@
+@@ -15897,8 +15897,8 @@
  
  WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
  
@@ -32,7 +32,7 @@ $FreeBSD$
  
  if test "$cross_compiling" = "yes"; then
      TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
-@@ -15876,13 +15876,11 @@
+@@ -15909,13 +15909,11 @@
  WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
  WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
  
@@ -50,7 +50,7 @@ $FreeBSD$
  
  case "${host}" in
      *-*-cygwin* | *-*-mingw32* )
-@@ -18379,7 +18377,7 @@
+@@ -18512,7 +18510,7 @@
                  fi
                  ;;
            *-*-freebsd*)
@@ -59,7 +59,7 @@ $FreeBSD$
                  ;;
            *-*-darwin* | *-*-cygwin* )
                                                  THREAD_OPTS=""
-@@ -19136,6 +19134,7 @@
+@@ -19269,6 +19267,7 @@
    fi
  fi
  
@@ -67,7 +67,7 @@ $FreeBSD$
  if test "$WXGTK20" = 1 ; then
    cat >> confdefs.h <<EOF
  #define __WXGTK20__ $WXGTK20
-@@ -19236,21 +19235,6 @@
+@@ -19369,21 +19368,6 @@
      esac
  fi
  
@@ -89,7 +89,7 @@ $FreeBSD$
  if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
      cat >> confdefs.h <<\EOF
  #define WXWIN_COMPATIBILITY_2 1
-@@ -22467,13 +22451,11 @@
+@@ -22600,13 +22584,11 @@
  s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
  s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
  s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
diff --git a/x11-toolkits/wxgtk-devel/pkg-plist b/x11-toolkits/wxgtk-devel/pkg-plist
index d2197fde2ecf..2e76e193cd9c 100644
--- a/x11-toolkits/wxgtk-devel/pkg-plist
+++ b/x11-toolkits/wxgtk-devel/pkg-plist
@@ -279,6 +279,7 @@ include/wx/protocol/file.h
 include/wx/protocol/ftp.h
 include/wx/protocol/http.h
 include/wx/protocol/protocol.h
+include/wx/quantize.h
 include/wx/radiobox.h
 include/wx/radiobut.h
 include/wx/regex.h