Update to wxGTK-2.8.10:

- bugfixes

For pkgsrc:
- fix installation of wxrc
- build both Unicode and non-Unicode version, they are not API and ABI
  compatible and different programs either

11 files changed, 158 insertions, 102 deletions

diff --git a/x11/wxGTK28-contrib/Makefile b/x11/wxGTK28-contrib/Makefile
index 618d35c3f38..f4299b26bac 100644
--- a/x11/wxGTK28-contrib/Makefile
+++ b/x11/wxGTK28-contrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 11:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2009/03/23 00:38:56 joerg Exp $
 #
 
 .include "../../x11/wxGTK28/Makefile.common"
@@ -9,7 +9,8 @@ COMMENT=		GTK-based implementation of the wxWidgets GUI library (contrib librari
 
 USE_TOOLS+=		gmake
 
-BUILD_DIRS=		contrib/src
+BUILD_DIRS=		${WRKSRC}/build-non-unicode/contrib/src \
+			${WRKSRC}/build-unicode/contrib/src
 
 INSTALL_TARGET=		install
 
diff --git a/x11/wxGTK28-contrib/PLIST b/x11/wxGTK28-contrib/PLIST
index c5062e698f6..c5fde4a5bda 100644
--- a/x11/wxGTK28-contrib/PLIST
+++ b/x11/wxGTK28-contrib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/12 11:15:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/03/23 00:38:56 joerg Exp $
 include/wx-2.8/wx/fl/antiflickpl.h
 include/wx-2.8/wx/fl/bardragpl.h
 include/wx-2.8/wx/fl/barhintspl.h
@@ -51,20 +51,23 @@ include/wx-2.8/wx/plot/plot_zot.bmp
 include/wx-2.8/wx/plot/wxplot.rc
 include/wx-2.8/wx/stc/stc.h
 include/wx-2.8/wx/svg/dcsvg.h
-lib/libwx_gtk2_fl-2.8.la
-lib/libwx_gtk2_gizmos-2.8.la
-lib/libwx_gtk2_gizmos_xrc-2.8.la
-lib/libwx_gtk2_ogl-2.8.la
-lib/libwx_gtk2_plot-2.8.la
-lib/libwx_gtk2_stc-2.8.la
-lib/libwx_gtk2_svg-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_fl-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_gizmos-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_gizmos_xrc-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_ogl-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_plot-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_stc-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_svg-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_fl-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_gizmos-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_gizmos_xrc-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_ogl-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_plot-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_stc-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_svg-2.8.la
 @dirrm include/wx-2.8/wx/svg
 @dirrm include/wx-2.8/wx/stc
 @dirrm include/wx-2.8/wx/plot
 @dirrm include/wx-2.8/wx/ogl
-@exec ${MKDIR} %D/include/wx-2.8/wx/mmedia
-@dirrm include/wx-2.8/wx/mmedia
 @dirrm include/wx-2.8/wx/gizmos
 @dirrm include/wx-2.8/wx/fl
-@dirrm include/wx-2.8/wx
-@dirrm include/wx-2.8
diff --git a/x11/wxGTK28-contrib/buildlink3.mk b/x11/wxGTK28-contrib/buildlink3.mk
index eb1f3cc4b28..ce71ea9a3c9 100644
--- a/x11/wxGTK28-contrib/buildlink3.mk
+++ b/x11/wxGTK28-contrib/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/23 00:38:56 joerg Exp $
 
 BUILDLINK_TREE+=	wxGTK28-contrib
 
 .if !defined(WXGTK28_CONTRIB_BUILDLINK3_MK)
 WXGTK28_CONTRIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.wxGTK28-contrib+=	wxGTK28-contrib>=2.8.8
+BUILDLINK_API_DEPENDS.wxGTK28-contrib+=	wxGTK28-contrib>=2.8.10
 BUILDLINK_PKGSRCDIR.wxGTK28-contrib?=	../../x11/wxGTK28-contrib
 
 .include "../../x11/wxGTK28/buildlink3.mk"
diff --git a/x11/wxGTK28/Makefile b/x11/wxGTK28/Makefile
index 39816c7974b..170d6bdfd68 100644
--- a/x11/wxGTK28/Makefile
+++ b/x11/wxGTK28/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/01/08 21:58:17 shattered Exp $
+# $NetBSD: Makefile,v 1.3 2009/03/23 00:38:55 joerg Exp $
 #
 
 .include "../../x11/wxGTK28/Makefile.common"
 
-PKGREVISION=		1
 PKGNAME=		${DISTNAME:S/wxGTK/wxGTK28/}
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 
diff --git a/x11/wxGTK28/Makefile.common b/x11/wxGTK28/Makefile.common
index 5af606596d0..16deee8cf54 100644
--- a/x11/wxGTK28/Makefile.common
+++ b/x11/wxGTK28/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
+# $NetBSD: Makefile.common,v 1.2 2009/03/23 00:38:55 joerg Exp $
 #
 
-DISTNAME=		wxGTK-2.8.8
+DISTNAME=		wxGTK-2.8.10
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxwindows/}
 EXTRACT_SUFX=		.tar.bz2
@@ -14,6 +14,7 @@ DISTINFO_FILE=		${.CURDIR}/../../x11/wxGTK28/distinfo
 
 PATCHFILES=		${DISTNAME}-libtool.diff.bz2
 PATCH_SITES=		${MASTER_SITE_LOCAL}
+PATCH_DIST_STRIP.${DISTNAME}-libtool.diff.bz2= -p1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -33,6 +34,22 @@ CONFIGURE_ARGS+=	--with-regex=builtin
 
 DOCDIR=			${PREFIX}/share/doc/wxGTK
 
+CONFIGURE_DIRS=	${WRKSRC}/build-non-unicode ${WRKSRC}/build-unicode
+
+INSTALL_MAKE_FLAGS+=	LN_S="ln -fs"
+
+#CONFIGURE_ARGS+=	--enable-debug
+#PLIST_SUBST+=	DEBUG_LIB=d DEBUG_CONFIG=-config
+
+PLIST_SUBST+=	DEBUG_LIB= DEBUG_CONFIG=-release
+
+pre-configure:
+	mkdir ${WRKSRC}/build-non-unicode ${WRKSRC}/build-unicode
+	printf '#!%s\n../configure --enable-unicode "$$@"' ${SH:Q} \
+	    > ${WRKSRC}/build-unicode/configure
+	printf '#!%s\n../configure --disable-unicode "$$@"' ${SH:Q} \
+	    > ${WRKSRC}/build-non-unicode/configure
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/wxGTK28/PLIST b/x11/wxGTK28/PLIST
index aceac13a2c2..54fe7e7923a 100644
--- a/x11/wxGTK28/PLIST
+++ b/x11/wxGTK28/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/03/23 00:38:55 joerg Exp $
 bin/wx-config
 bin/wxrc
 bin/wxrc-2.8
@@ -16,6 +16,7 @@ include/wx-2.8/wx/arrimpl.cpp
 include/wx-2.8/wx/arrstr.h
 include/wx-2.8/wx/artprov.h
 include/wx-2.8/wx/aui/aui.h
+include/wx-2.8/wx/aui/auibar.h
 include/wx-2.8/wx/aui/auibook.h
 include/wx-2.8/wx/aui/dockart.h
 include/wx-2.8/wx/aui/floatpane.h
@@ -540,20 +541,34 @@ include/wx-2.8/wx/xtistrm.h
 include/wx-2.8/wx/xtixml.h
 include/wx-2.8/wx/zipstrm.h
 include/wx-2.8/wx/zstream.h
-lib/libwx_base-2.8.la
-lib/libwx_base_net-2.8.la
-lib/libwx_base_xml-2.8.la
-lib/libwx_gtk2_adv-2.8.la
-lib/libwx_gtk2_aui-2.8.la
-lib/libwx_gtk2_core-2.8.la
-lib/libwx_gtk2_gl-2.8.la
-lib/libwx_gtk2_html-2.8.la
-lib/libwx_gtk2_qa-2.8.la
-lib/libwx_gtk2_richtext-2.8.la
-lib/libwx_gtk2_xrc-2.8.la
-lib/libwxregex-2.8.la
-lib/wx/config/gtk2-ansi-release-2.8
-lib/wx/include/gtk2-ansi-release-2.8/wx/setup.h
+lib/libwx_base${DEBUG_LIB}-2.8.la
+lib/libwx_base${DEBUG_LIB}_net-2.8.la
+lib/libwx_base${DEBUG_LIB}_xml-2.8.la
+lib/libwx_baseu${DEBUG_LIB}-2.8.la
+lib/libwx_baseu${DEBUG_LIB}_net-2.8.la
+lib/libwx_baseu${DEBUG_LIB}_xml-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_adv-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_aui-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_core-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_gl-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_html-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_qa-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_richtext-2.8.la
+lib/libwx_gtk2${DEBUG_LIB}_xrc-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_adv-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_aui-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_core-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_gl-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_html-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_qa-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_richtext-2.8.la
+lib/libwx_gtk2u${DEBUG_LIB}_xrc-2.8.la
+lib/libwxregex${DEBUG_LIB}-2.8.la
+lib/libwxregexu${DEBUG_LIB}-2.8.la
+lib/wx/config/gtk2-ansi${DEBUG_CONFIG}-2.8
+lib/wx/config/gtk2-unicode${DEBUG_CONFIG}-2.8
+lib/wx/include/gtk2-ansi${DEBUG_CONFIG}-2.8/wx/setup.h
+lib/wx/include/gtk2-unicode${DEBUG_CONFIG}-2.8/wx/setup.h
 share/aclocal/wxwin.m4
 share/bakefile/presets/wx.bkl
 share/bakefile/presets/wx_unix.bkl
@@ -584,8 +599,10 @@ share/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.8/wx
-@dirrm lib/wx/include/gtk2-ansi-release-2.8
+@dirrm lib/wx/include/gtk2-unicode${DEBUG_CONFIG}-2.8/wx
+@dirrm lib/wx/include/gtk2-unicode${DEBUG_CONFIG}-2.8
+@dirrm lib/wx/include/gtk2-ansi${DEBUG_CONFIG}-2.8/wx
+@dirrm lib/wx/include/gtk2-ansi${DEBUG_CONFIG}-2.8
 @dirrm lib/wx/include
 @dirrm lib/wx/config
 @dirrm lib/wx
diff --git a/x11/wxGTK28/buildlink3.mk b/x11/wxGTK28/buildlink3.mk
index 1e02782d367..555607dd6b0 100644
--- a/x11/wxGTK28/buildlink3.mk
+++ b/x11/wxGTK28/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2009/03/23 00:38:55 joerg Exp $
 
 BUILDLINK_TREE+=	wxGTK28
 
 .if !defined(WXGTK28_BUILDLINK3_MK)
 WXGTK28_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.wxGTK28+=	wxGTK28>=2.8.8
+BUILDLINK_API_DEPENDS.wxGTK28+=	wxGTK28>=2.8.10
 BUILDLINK_PKGSRCDIR.wxGTK28?=	../../x11/wxGTK28
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo
index 0651f20fdbf..8ce679b3dc7 100644
--- a/x11/wxGTK28/distinfo
+++ b/x11/wxGTK28/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2009/01/08 21:58:17 shattered Exp $
+$NetBSD: distinfo,v 1.3 2009/03/23 00:38:55 joerg Exp $
 
-SHA1 (wxGTK-2.8.8-libtool.diff.bz2) = f09ae6cefe70dab7383e11b4ca0abd10b44baeac
-RMD160 (wxGTK-2.8.8-libtool.diff.bz2) = 34b3c3949adc47f2ce9293f91e0cb72543c7d7bb
-Size (wxGTK-2.8.8-libtool.diff.bz2) = 154447 bytes
-SHA1 (wxGTK-2.8.8.tar.bz2) = ba33ca7efad2847c538d3df524d31b8b4011ad8a
-RMD160 (wxGTK-2.8.8.tar.bz2) = 1dc3fab9e6f4d446bbc1c104aa69cf395c56b577
-Size (wxGTK-2.8.8.tar.bz2) = 9482521 bytes
+SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
+RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
+Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes
+SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4
+RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432
+Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes
 SHA1 (patch-aa) = 9cf0af5d5d9f6eaee43ed74c45e45c0a88907ad1
-SHA1 (patch-ab) = d071e5e9f8dfd9c61a527464c55bfc671a27bbd0
+SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
diff --git a/x11/wxGTK28/patches/manual-bakefile.diff b/x11/wxGTK28/patches/manual-bakefile.diff
index 5413a5db853..ac55ded169c 100644
--- a/x11/wxGTK28/patches/manual-bakefile.diff
+++ b/x11/wxGTK28/patches/manual-bakefile.diff
@@ -1,7 +1,8 @@
-diff -ur ../bakefile-0.2.3.orig/rules/autoconf.bkl ./rules/autoconf.bkl
---- ../bakefile-0.2.3.orig/rules/autoconf.bkl	2008-01-06 15:43:17.000000000 +0100
-+++ ./rules/autoconf.bkl	2008-09-08 19:43:18.000000000 +0200
-@@ -195,67 +195,19 @@
+$NetBSD: manual-bakefile.diff,v 1.2 2009/03/23 00:38:55 joerg Exp $
+
+--- rules/autoconf.bkl.orig	2008-09-20 19:58:53.000000000 +0000
++++ rules/autoconf.bkl
+@@ -199,67 +199,19 @@
  
          <set var="__linkname1">$(__linkname)</set>
          
@@ -72,7 +73,7 @@ diff -ur ../bakefile-0.2.3.orig/rules/autoconf.bkl ./rules/autoconf.bkl
          <set var="__mac_instname">$(__linkname2)</set>
     
          <clean-files>
-@@ -278,12 +230,6 @@
+@@ -282,12 +234,6 @@
          <set var="__macinstname" eval="0">
              $(ifthenelse(__mac_instname=='',ref('__targetname',id),ref('__mac_instname',id)))
          </set>
@@ -85,10 +86,11 @@ diff -ur ../bakefile-0.2.3.orig/rules/autoconf.bkl ./rules/autoconf.bkl
  
          <modify-target target="install_$(id)">
              <command>(cd $(DESTDIR)$(value) ; $(ref('__so_symlinks_inst_cmd',id)))</command>
-diff -ur ../bakefile-0.2.3.orig/rules/makefile.bkl ./rules/makefile.bkl
---- ../bakefile-0.2.3.orig/rules/makefile.bkl	2008-01-06 15:43:17.000000000 +0100
-+++ ./rules/makefile.bkl	2008-09-08 19:46:12.000000000 +0200
-@@ -663,7 +663,7 @@
+$NetBSD: manual-bakefile.diff,v 1.2 2009/03/23 00:38:55 joerg Exp $
+
+--- rules/makefile.bkl.orig	2008-09-20 19:58:53.000000000 +0000
++++ rules/makefile.bkl
+@@ -749,7 +749,7 @@
          <define-tag name="install-to" rules="exe">
              <modify-target target="install_$(id)">
                  <command>
@@ -97,7 +99,7 @@ diff -ur ../bakefile-0.2.3.orig/rules/makefile.bkl ./rules/makefile.bkl
                  </command>
              </modify-target>
              <modify-target target="uninstall_$(id)">
-@@ -676,8 +676,7 @@
+@@ -762,8 +762,7 @@
          <define-tag name="install-to" rules="dll">
              <modify-target target="install_$(id)">
                  <command>
@@ -107,7 +109,7 @@ diff -ur ../bakefile-0.2.3.orig/rules/makefile.bkl ./rules/makefile.bkl
                  </command>
              </modify-target>
              <modify-target target="uninstall_$(id)">
-@@ -691,7 +690,7 @@
+@@ -777,7 +776,7 @@
          <define-tag name="install-to" rules="module">
              <modify-target target="install_$(id)">
                  <command>
@@ -116,9 +118,10 @@ diff -ur ../bakefile-0.2.3.orig/rules/makefile.bkl ./rules/makefile.bkl
                  </command>
              </modify-target>
              <modify-target target="uninstall_$(id)">
-diff -ur ../bakefile-0.2.3.orig/rules/makefile_defs_gnu.bkl ./rules/makefile_defs_gnu.bkl
---- ../bakefile-0.2.3.orig/rules/makefile_defs_gnu.bkl	2008-01-06 15:43:17.000000000 +0100
-+++ ./rules/makefile_defs_gnu.bkl	2008-09-08 19:43:18.000000000 +0200
+$NetBSD: manual-bakefile.diff,v 1.2 2009/03/23 00:38:55 joerg Exp $
+
+--- rules/makefile_defs_gnu.bkl.orig	2008-09-20 19:58:53.000000000 +0000
++++ rules/makefile_defs_gnu.bkl
 @@ -62,12 +62,12 @@
  
              <template id="__commands_templ_C">
@@ -134,9 +137,10 @@ diff -ur ../bakefile-0.2.3.orig/rules/makefile_defs_gnu.bkl ./rules/makefile_def
                  </set>
              </template>
  
-diff -ur ../bakefile-0.2.3.orig/rules/makefile_defs_unix.bkl ./rules/makefile_defs_unix.bkl
---- ../bakefile-0.2.3.orig/rules/makefile_defs_unix.bkl	2008-01-06 15:43:17.000000000 +0100
-+++ ./rules/makefile_defs_unix.bkl	2008-09-08 19:43:18.000000000 +0200
+$NetBSD: manual-bakefile.diff,v 1.2 2009/03/23 00:38:55 joerg Exp $
+
+--- rules/makefile_defs_unix.bkl.orig	2008-09-20 19:58:53.000000000 +0000
++++ rules/makefile_defs_unix.bkl
 @@ -39,22 +39,23 @@
  
      <set var="DIRSEP">/</set>
@@ -167,7 +171,7 @@ diff -ur ../bakefile-0.2.3.orig/rules/makefile_defs_unix.bkl ./rules/makefile_de
  
      <set var="UNINSTALL_PROGRAM" overwrite="0">$(RM)</set>
      <set var="UNINSTALL_DATA" overwrite="0">$(RM)</set>
-@@ -120,12 +121,12 @@
+@@ -122,12 +123,12 @@
      <if cond="FORMAT!='gnu'">
          <template id="__commands_templ_C">
              <set var="__COMPILE_C_CMD" eval="0">
@@ -181,37 +185,37 @@ diff -ur ../bakefile-0.2.3.orig/rules/makefile_defs_unix.bkl ./rules/makefile_de
 +                $(LIBTOOL) --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(src)
              </set>
          </template>
-     </if>
-@@ -133,18 +134,16 @@
+         <!-- FIXME: We should allow for a different Objective-C compiler -->
+@@ -154,18 +155,16 @@
+         </set>
  
-     <template id="__commands_templ">
          <set var="__LINK_EXE_CMD" eval="0">
--            $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-+            $(LIBTOOL) --mode=link $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
+-            $(__linker) -o $@ $(__objects_var) $(__ldargs)
++            $(LIBTOOL) --mode=link --tag=CC $(__linker) -o $@ $(__objects_var) $(__ldargs)
          </set>        
          <set var="__LINK_LIB_CMD" eval="0">
 -            $(RM) $@
 -            $(AR) $(AROPTIONS) $@ $(__objects_var)
 -            $(RANLIB) $@
-+            $(LIBTOOL) --mode=link --tag=CC $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
++	    $(LIBTOOL) --mode=link --tag=CC $(__linker) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
          </set>
          <set var="__LINK_DLL_CMD" eval="0">
--            $(__dll_linker) $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-+            $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
+-            $(__dll_linker) $@ $(__objects_var) $(__ldargs)
++	    $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
          </set>
          <set var="__LINK_MODULE_CMD" eval="0">
--            $(__module_linker) $@ $(__objects_var) $(__ldflags) $(__ldlibs)
-+            $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
+-            $(__module_linker) $@ $(__objects_var) $(__ldargs)
++	    $(LIBTOOL) --mode=link --tag=CC $(__linker) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
          </set>
      </template>
      
-$NetBSD: manual-bakefile.diff,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
+$NetBSD: manual-bakefile.diff,v 1.2 2009/03/23 00:38:55 joerg Exp $
 
---- src/bottlenecks_wrap.c.orig	2008-09-08 20:08:03.000000000 +0200
-+++ src/bottlenecks_wrap.c
-@@ -270,6 +270,16 @@
- #define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
- #define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
+--- src/bkl_c_wrap.c.orig	2008-10-20 17:41:13.000000000 +0000
++++ src/bkl_c_wrap.c
+@@ -2600,6 +2600,14 @@ SWIG_FromCharPtr(const char *cptr)
+   return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
+ }
  
 +const char *doEvalExpr(const char *expr,
 +                       PyObject *varCallb,
@@ -221,8 +225,14 @@ $NetBSD: manual-bakefile.diff,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
 +                       PyObject *target,
 +                       PyObject *add_dict);
 +
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -2649,6 +2657,7 @@ fail:
+   return NULL;
+ }
+ 
 +PyObject *proxydict_create(void);
-+
  
- /* Cast-Rank Mode */
- #if defined(SWIG_CASTRANK_MODE)
+ SWIGINTERN PyObject *_wrap_proxydict_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
diff --git a/x11/wxGTK28/patches/manual-regen.diff b/x11/wxGTK28/patches/manual-regen.diff
index 4f94a495ee3..e4c7e61692a 100644
--- a/x11/wxGTK28/patches/manual-regen.diff
+++ b/x11/wxGTK28/patches/manual-regen.diff
@@ -4,8 +4,9 @@ and the various *.bkl files into the wxGTK tree and run
 in build/bakefiles. manual-bakefile.diff contains the necessary patch for
 the bakefile ruleset to use libtool.
 
---- build/bakefiles/regex.bkl.orig	2008-06-20 11:07:14.000000000 +0200
-+++ build/bakefiles/regex.bkl	2008-09-08 19:55:08.000000000 +0200
+diff -uNr wxWidgets-2.8.10.orig/build/bakefiles/regex.bkl wxWidgets-2.8.10/build/bakefiles/regex.bkl
+--- wxWidgets-2.8.10.orig/build/bakefiles/regex.bkl	2009-03-06 13:10:54.000000000 +0100
++++ wxWidgets-2.8.10/build/bakefiles/regex.bkl	2009-03-22 20:09:05.000000000 +0100
 @@ -27,16 +27,13 @@
          <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
      </set>
@@ -37,8 +38,9 @@ the bakefile ruleset to use libtool.
 +    </dll>
  
  </makefile>
---- build/bakefiles/wx.bkl.orig	2008-06-20 11:07:14.000000000 +0200
-+++ build/bakefiles/wx.bkl	2008-09-08 19:55:08.000000000 +0200
+diff -uNr wxWidgets-2.8.10.orig/build/bakefiles/wx.bkl wxWidgets-2.8.10/build/bakefiles/wx.bkl
+--- wxWidgets-2.8.10.orig/build/bakefiles/wx.bkl	2009-03-06 13:10:54.000000000 +0100
++++ wxWidgets-2.8.10/build/bakefiles/wx.bkl	2009-03-22 20:09:05.000000000 +0100
 @@ -96,7 +96,7 @@
              <command>
                  $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
@@ -48,3 +50,15 @@ the bakefile ruleset to use libtool.
                  (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
              </command>
          </action>
+diff -uNr wxWidgets-2.8.10.orig/utils/wxrc/wxrc.bkl wxWidgets-2.8.10/utils/wxrc/wxrc.bkl
+--- wxWidgets-2.8.10.orig/utils/wxrc/wxrc.bkl	2009-03-06 13:11:15.000000000 +0100
++++ wxWidgets-2.8.10/utils/wxrc/wxrc.bkl	2009-03-22 20:10:17.000000000 +0100
+@@ -21,7 +21,7 @@
+         <modify-target target="install_wxrc">
+             <command>
+ 	        rm -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
+-		$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)
++		${LIBTOOL} --mode=install $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)
+                 mv -f $(DESTDIR)$(BINDIR)/wxrc$(EXEEXT) $(DESTDIR)$(BINDIR)/$(versioned_name)
+                 (cd $(DESTDIR)$(BINDIR) &amp;&amp; $(LN_S) $(versioned_name) wxrc$(EXEEXT))
+             </command>
diff --git a/x11/wxGTK28/patches/patch-ab b/x11/wxGTK28/patches/patch-ab
index 074ae1f5ad2..245f2525df5 100644
--- a/x11/wxGTK28/patches/patch-ab
+++ b/x11/wxGTK28/patches/patch-ab
@@ -1,18 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/09/12 11:09:49 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2009/03/23 00:38:55 joerg Exp $
 
---- utils/wxrc/Makefile.in.orig	2008-09-08 23:43:35.000000000 +0200
+--- utils/wxrc/Makefile.in.orig	2009-03-22 23:39:17.000000000 +0000
 +++ utils/wxrc/Makefile.in
-@@ -114,11 +114,8 @@ distclean: clean
+@@ -108,7 +108,7 @@ distclean: clean
+ 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
- @COND_USE_XRC_1@install_wxrc: 
- @COND_USE_XRC_1@	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(bindir)
--@COND_USE_XRC_1@	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} wxrc$(EXEEXT) $(DESTDIR)$(bindir)
--@COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	${BSD_INSTALL_PROGRAM} wxrc$(EXEEXT) $(DESTDIR)$(bindir)
--@COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
-+@COND_USE_XRC_1@	${BSD_INSTALL_SCRIPT} wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
-+@COND_USE_XRC_1@	cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)
+ @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
+-@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
++@COND_USE_XRC_1@	${LIBTOOL} --mode=link $(CXX) -o $@ $(WXRC_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+ @COND_USE_XRC_1@	
+ @COND_USE_XRC_1@	$(__wxrc___mac_setfilecmd)
  
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)