ports/56056: update port: x11-toolkits/wxgtk-devel

[Stefan Ehmann]

>Number:         56056
>Category:       ports
>Synopsis:       update port: x11-toolkits/wxgtk-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 27 17:40:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Ehmann
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD shoeserv.freebsd 5.1-CURRENT FreeBSD 5.1-CURRENT #8: Wed
Aug 27 10:57:39 CEST 2003
root at shoeserv.freebsd:/usr/obj/usr/src/sys/SHOE i386

>Description:
	update x11-toolkits/wxgtk-devel to version 4.2.1
	
>How-To-Repeat:
>Fix:

diff -ruN wxgtk-devel.bak/Makefile wxgtk-devel/Makefile
--- wxgtk-devel.bak/Makefile	Wed Aug 27 22:50:39 2003
+++ wxgtk-devel/Makefile	Thu Jul 31 16:01:08 2003
@@ -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 -ruN wxgtk-devel.bak/distinfo wxgtk-devel/distinfo
--- wxgtk-devel.bak/distinfo	Wed Aug 27 22:50:39 2003
+++ wxgtk-devel/distinfo	Wed Aug 27 19:28:09 2003
@@ -1 +1 @@
-MD5 (wxGTK-2.4.0.tar.bz2) = b51cbef5b29ede3f56121e3d142dbc76
+MD5 (wxGTK-2.4.1.tar.bz2) = 937c299de177990908770989206b7d8c
diff -ruN wxgtk-devel.bak/files/patch-configure
wxgtk-devel/files/patch-configure
--- wxgtk-devel.bak/files/patch-configure	Wed Aug 27 22:50:39 2003
+++ wxgtk-devel/files/patch-configure	Thu Jul 31 17:34:58 2003
@@ -1,16 +1,13 @@
-
-$FreeBSD: ports/x11-toolkits/wxgtk-devel/files/patch-configure,v 1.7
2003/01/15 18:25:48 sobomax Exp $
-
---- configure.orig	Tue Jan 14 18:31:00 2003
-+++ configure	Tue Jan 14 18:31:55 2003
-@@ -13284,14 +13284,14 @@
+--- configure.orig	Thu Jul 31 17:34:25 2003
++++ configure	Thu Jul 31 17:33:51 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 +16,9 @@
 -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 +29,7 @@
  
  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 +47,7 @@
  
  case "${host}" in
      *-*-cygwin* | *-*-mingw32* )
-@@ -18379,7 +18377,7 @@
+@@ -18512,7 +18510,7 @@
                  fi
                  ;;
            *-*-freebsd*)
@@ -59,7 +56,7 @@
                  ;;
            *-*-darwin* | *-*-cygwin* )
                                                  THREAD_OPTS=""
-@@ -19136,6 +19134,7 @@
+@@ -19269,6 +19267,7 @@
    fi
  fi
  
@@ -67,7 +64,7 @@
  if test "$WXGTK20" = 1 ; then
    cat >> confdefs.h <<EOF
  #define __WXGTK20__ $WXGTK20
-@@ -19236,21 +19235,6 @@
+@@ -19369,21 +19368,6 @@
      esac
  fi
  
@@ -89,7 +86,7 @@
  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 -ruN wxgtk-devel.bak/files/patch-include::wx::menuitem.h
wxgtk-devel/files/patch-include::wx::menuitem.h
--- wxgtk-devel.bak/files/patch-include::wx::menuitem.h	Thu Jan  1
01:00:00 1970
+++ wxgtk-devel/files/patch-include::wx::menuitem.h	Wed Aug 27 21:12:19
2003
@@ -0,0 +1,19 @@
+--- include/wx/menuitem.h.orig	Wed Aug 27 21:11:09 2003
++++ include/wx/menuitem.h	Wed Aug 27 21:11:35 2003
+@@ -4,7 +4,7 @@
+ // Author:      Vadim Zeitlin
+ // Modified by:
+ // Created:     25.10.99
+-// RCS-ID:      $Id: menuitem.h,v 1.22 2002/04/12 13:15:43 JS Exp $
++// RCS-ID:      $Id: menuitem.h,v 1.22.2.1 2003/06/10 23:48:45 RD Exp
$
+ // Copyright:   (c) 1999 Vadim Zeitlin
<zeitlin at dptmaths.ens-cachan.fr>
+ // Licence:     wxWindows license
+
///////////////////////////////////////////////////////////////////////////////
+@@ -49,6 +49,7 @@
+ 
+     // the menu we're in
+     wxMenu *GetMenu() const { return m_parentMenu; }
++    void SetMenu(wxMenu* menu) { m_parentMenu = menu; }
+ 
+     // get/set id
+     void SetId(int id) { m_id = id; }
diff -ruN wxgtk-devel.bak/pkg-plist wxgtk-devel/pkg-plist
--- wxgtk-devel.bak/pkg-plist	Wed Aug 27 22:50:39 2003
+++ wxgtk-devel/pkg-plist	Thu Jul 31 19:39:05 2003
@@ -279,6 +279,7 @@
 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


>Release-Note:
>Audit-Trail:
>Unformatted: