Update wxGTK and wxGTK-contrib to 2.6.2. Many bug fixes and

improvements.  In particular, incompatibility with pango>=1.10 was
fixed.  See CHANGES.txt for the complete list.

6 files changed, 38 insertions, 24 deletions

diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index a48797b18d5..ff8f9b06c4e 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2005/08/11 00:47:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.45 2005/10/04 01:47:32 minskim Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	1
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 
 post-install:
diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common
index 2e7f367b04e..af3d4f8f0eb 100644
--- a/x11/wxGTK/Makefile.common
+++ b/x11/wxGTK/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2005/08/11 00:47:23 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/10/04 01:47:32 minskim Exp $
 #
 
-DISTNAME=		wxGTK-2.6.1
+DISTNAME=		wxGTK-2.6.2
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxwindows/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/wxGTK/PLIST b/x11/wxGTK/PLIST
index 4111194c252..393d29836b7 100644
--- a/x11/wxGTK/PLIST
+++ b/x11/wxGTK/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/08/14 08:03:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/10/04 01:47:32 minskim Exp $
 bin/wx-config
 bin/wxrc
 bin/wxrc-2.6
@@ -313,6 +313,7 @@ include/wx-2.6/wx/quantize.h
 include/wx-2.6/wx/radiobox.h
 include/wx-2.6/wx/radiobut.h
 include/wx-2.6/wx/rawbmp.h
+include/wx-2.6/wx/recguard.h
 include/wx-2.6/wx/regex.h
 include/wx-2.6/wx/region.h
 include/wx-2.6/wx/renderer.h
@@ -471,6 +472,9 @@ lib/libwx_gtk2_xrc-2.6.so
 lib/wx/config/gtk2-ansi-release-2.6
 lib/wx/include/gtk2-ansi-release-2.6/wx/setup.h
 share/aclocal/wxwin.m4
+share/bakefile/presets/wx.bkl
+share/bakefile/presets/wx_unix.bkl
+share/bakefile/presets/wx_win32.bkl
 share/doc/wxGTK/LICENSE
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/wxstd.mo
@@ -482,6 +486,7 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/wxstd.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/wxmsw.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/wxstd.mo
@@ -494,6 +499,8 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/wxstd.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/wxstd.mo
 @dirrm share/doc/wxGTK
+@dirrm share/bakefile/presets
+@dirrm share/bakefile
 @dirrm lib/wx/include/gtk2-ansi-release-2.6/wx
 @dirrm lib/wx/include/gtk2-ansi-release-2.6
 @unexec ${RMDIR} %D/lib/wx/include 2>/dev/null || ${TRUE}
diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo
index 93b402085c5..114a1ef1222 100644
--- a/x11/wxGTK/distinfo
+++ b/x11/wxGTK/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2005/08/11 00:47:23 dmcmahill Exp $
+$NetBSD: distinfo,v 1.22 2005/10/04 01:47:32 minskim Exp $
 
-SHA1 (wxGTK-2.6.1.tar.bz2) = 49142a4b827a4c8187eb60c76c85355f50058e8e
-RMD160 (wxGTK-2.6.1.tar.bz2) = 66f4a499b69dcffec7579472d238b637b986e7cd
-Size (wxGTK-2.6.1.tar.bz2) = 7205374 bytes
-SHA1 (patch-aa) = 884ab5b352119a37b2611e0538bf10914530a5d5
-SHA1 (patch-ab) = d39eaa09e91ac3da1b8b1b59f0fae6a42b31f2e4
+SHA1 (wxGTK-2.6.2.tar.bz2) = ba953ecf9ee1c5be05d00f1f58523e2a5114e1a5
+RMD160 (wxGTK-2.6.2.tar.bz2) = 53f3b61606037dc502e1185ab517b5ddc64a205c
+Size (wxGTK-2.6.2.tar.bz2) = 7328807 bytes
+SHA1 (patch-aa) = 50ca53f98d0ae37566a8e6d46c889665e240a2f5
+SHA1 (patch-ab) = 8f57d3169b363ef90c44fafb864589840b0eeafa
 SHA1 (patch-ah) = c384584623b63004f59b4755ef32156f3d5687a0
diff --git a/x11/wxGTK/patches/patch-aa b/x11/wxGTK/patches/patch-aa
index 902a6725f6a..6ced39a8e39 100644
--- a/x11/wxGTK/patches/patch-aa
+++ b/x11/wxGTK/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.6 2005/08/07 11:26:17 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2005/10/04 01:47:32 minskim Exp $
 
---- configure.orig	2005-06-02 18:03:05.000000000 +0200
+--- configure.orig	2005-09-20 08:03:25.000000000 -0700
 +++ configure
-@@ -22242,7 +22242,8 @@ SEARCH_INCLUDE="\
-     /usr/local/x11r5/include  \
-     /usr/lpp/Xamples/include  \
+@@ -22529,7 +22529,8 @@ SEARCH_INCLUDE="\
+     /usr/XFree86/include/X11  \
+     /usr/pkg/include          \
                                \
 -    /usr/openwin/share/include"
 +    /usr/openwin/share/include\
 +    ${BUILDLINK_DIR}/include"
  
- SEARCH_LIB="/usr/lib /usr/lib32 /usr/lib64 /usr/X11R6/lib64 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g`"
- 
+ echo "$as_me:$LINENO: checking for libraries directory" >&5
+ echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
diff --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab
index 0c22f665907..225f7b75e71 100644
--- a/x11/wxGTK/patches/patch-ab
+++ b/x11/wxGTK/patches/patch-ab
@@ -1,6 +1,9 @@
---- Makefile.in.orig	2005-06-02 12:03:05.000000000 -0400
-+++ Makefile.in	2005-08-10 15:28:16.561533000 -0400
-@@ -24,5 +24,7 @@
+$NetBSD: patch-ab,v 1.14 2005/10/04 01:47:32 minskim Exp $
+
+--- Makefile.in.orig	2005-09-20 08:03:25.000000000 -0700
++++ Makefile.in
+@@ -23,7 +23,9 @@ PIC_FLAG = @PIC_FLAG@
+ SONAME_FLAG = @SONAME_FLAG@
  STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -8,14 +11,18 @@
 +INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
  INSTALL_DIR = @INSTALL_DIR@
  srcdir = @srcdir@
-@@ -1181,5 +1183,5 @@
+ top_srcdir = @top_srcdir@
+@@ -1181,7 +1183,7 @@ LOCALE_MSW_LINGUAS =  it
+ @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 -@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
 +@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL) $(LIBOSSAUDIO)
+ @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
+ @COND_PLATFORM_MACOSX_1@	-compatibility_version 2.0 -current_version 2.0
  @COND_USE_GUI_0@PORTNAME = base
- @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@@ -9674,14 +9676,14 @@
+@@ -9693,16 +9695,16 @@ samples: 
+ install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
 -	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
@@ -35,3 +42,4 @@
 +	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(prefix)/${PKGLOCALEDIR}/locale/$$l/LC_MESSAGES/wxstd.mo ; \
  	fi ; \
  	done
+