summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/wxGTK-contrib/Makefile3
-rw-r--r--x11/wxGTK-contrib/PLIST18
-rw-r--r--x11/wxGTK/Makefile14
-rw-r--r--x11/wxGTK/Makefile.common21
-rw-r--r--x11/wxGTK/PLIST31
-rw-r--r--x11/wxGTK/distinfo15
-rw-r--r--x11/wxGTK/patches/manual-bakefile.diff196
-rw-r--r--x11/wxGTK/patches/manual-regen.diff50
-rw-r--r--x11/wxGTK/patches/patch-aa16
-rw-r--r--x11/wxGTK/patches/patch-ab45
-rw-r--r--x11/wxGTK/patches/patch-ah9
11 files changed, 316 insertions, 102 deletions
diff --git a/x11/wxGTK-contrib/Makefile b/x11/wxGTK-contrib/Makefile
index b323e2b23aa..d01882e911b 100644
--- a/x11/wxGTK-contrib/Makefile
+++ b/x11/wxGTK-contrib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/30 15:28:12 joerg Exp $
#
.include "../../x11/wxGTK/Makefile.common"
PKGNAME= ${DISTNAME:S/wxGTK/wxGTK-contrib/}
-PKGREVISION= 2
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= GTK-based implementation of the wxWidgets GUI library (contrib libraries)
diff --git a/x11/wxGTK-contrib/PLIST b/x11/wxGTK-contrib/PLIST
index 882252b1a22..40f2339de1e 100644
--- a/x11/wxGTK-contrib/PLIST
+++ b/x11/wxGTK-contrib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/08/07 11:26:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/30 15:28:12 joerg Exp $
include/wx-2.6/wx/deprecated/expr.h
include/wx-2.6/wx/deprecated/prop.h
include/wx-2.6/wx/deprecated/propform.h
@@ -60,14 +60,14 @@ include/wx-2.6/wx/plot/plot_zot.bmp
include/wx-2.6/wx/plot/wxplot.rc
include/wx-2.6/wx/stc/stc.h
include/wx-2.6/wx/svg/dcsvg.h
-lib/libwx_gtk2_deprecated-2.6.so
-lib/libwx_gtk2_fl-2.6.so
-lib/libwx_gtk2_gizmos-2.6.so
-lib/libwx_gtk2_gizmos_xrc-2.6.so
-lib/libwx_gtk2_ogl-2.6.so
-lib/libwx_gtk2_plot-2.6.so
-lib/libwx_gtk2_stc-2.6.so
-lib/libwx_gtk2_svg-2.6.so
+lib/libwx_gtk2_deprecated-2.6.la
+lib/libwx_gtk2_fl-2.6.la
+lib/libwx_gtk2_gizmos-2.6.la
+lib/libwx_gtk2_gizmos_xrc-2.6.la
+lib/libwx_gtk2_ogl-2.6.la
+lib/libwx_gtk2_plot-2.6.la
+lib/libwx_gtk2_stc-2.6.la
+lib/libwx_gtk2_svg-2.6.la
@dirrm include/wx-2.6/wx/svg
@dirrm include/wx-2.6/wx/stc
@dirrm include/wx-2.6/wx/plot
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index c7a82c47107..e52a3542c00 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,10 +1,20 @@
-# $NetBSD: Makefile,v 1.48 2006/03/09 21:04:46 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2006/03/30 15:28:12 joerg Exp $
#
.include "Makefile.common"
COMMENT= GTK-based implementation of the wxWidgets GUI library
-PKGREVISION= 2
+
+post-build:
+ set -e; cd ${WRKSRC}/locale; \
+ for lang in ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk \
+ zh_CN zh_TW; do \
+ ${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \
+ done
+ set -e; cd ${WRKSRC}/locale/msw; \
+ for lang in it; do \
+ ${TOOLS_PATH.msgfmt} -c -o $${lang}.mo $${lang}.po; \
+ done
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common
index cb1d5f9bad1..8f2529b0fc6 100644
--- a/x11/wxGTK/Makefile.common
+++ b/x11/wxGTK/Makefile.common
@@ -1,35 +1,46 @@
-# $NetBSD: Makefile.common,v 1.7 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2006/03/30 15:28:12 joerg Exp $
#
-DISTNAME= wxGTK-2.6.2
+DISTNAME= wxGTK-2.6.3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= pkgsrc-users@NetBSD.org
+MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.wxwidgets.org/
PATCHDIR= ${.CURDIR}/../../x11/wxGTK/patches
DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK/distinfo
-USE_TOOLS+= pkg-config
+PATCHFILES= ${DISTNAME}-libtool.diff.bz2
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+
+USE_TOOLS+= pkg-config msgfmt
+USE_LIBTOOL= yes
USE_PKGLOCALEDIR= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_GNU_CONFIGURE_HOST= NO
+USE_GNU_CONFIGURE_HOST= no
CONFIGURE_ARGS+= --with-gtk=2
CONFIGURE_ARGS+= --with-libjpeg=sys
CONFIGURE_ARGS+= --with-libpng=sys
CONFIGURE_ARGS+= --with-libtiff=sys
CONFIGURE_ARGS+= --with-opengl
CONFIGURE_ARGS+= --with-zlib=sys
+CONFIGURE_ARGS+= --with-regex=builtin
CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+#CONFIGURE_ARGS+= --enable-unicode
+#PIST_SUBST+= UNICODE=u
+PLIST_SUBST+= UNICODE=
+PLIST_SUBST+= BUILDTYPE=ansi
+
CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this
DOCDIR= ${PREFIX}/share/doc/wxGTK
+.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/wxGTK/PLIST b/x11/wxGTK/PLIST
index 393d29836b7..f7be8750a4d 100644
--- a/x11/wxGTK/PLIST
+++ b/x11/wxGTK/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/10/04 01:47:32 minskim Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/03/30 15:28:12 joerg Exp $
bin/wx-config
bin/wxrc
bin/wxrc-2.6
@@ -459,18 +459,19 @@ include/wx-2.6/wx/xtistrm.h
include/wx-2.6/wx/xtixml.h
include/wx-2.6/wx/zipstrm.h
include/wx-2.6/wx/zstream.h
-lib/libwx_base-2.6.so
-lib/libwx_base_net-2.6.so
-lib/libwx_base_xml-2.6.so
-lib/libwx_gtk2_adv-2.6.so
-lib/libwx_gtk2_core-2.6.so
-lib/libwx_gtk2_gl-2.6.so
-lib/libwx_gtk2_html-2.6.so
-lib/libwx_gtk2_media-2.6.so
-lib/libwx_gtk2_qa-2.6.so
-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
+lib/libwx_base${UNICODE}-2.6.la
+lib/libwx_base${UNICODE}_net-2.6.la
+lib/libwx_base${UNICODE}_xml-2.6.la
+lib/libwx_gtk2${UNICODE}_adv-2.6.la
+lib/libwx_gtk2${UNICODE}_core-2.6.la
+lib/libwx_gtk2${UNICODE}_gl-2.6.la
+lib/libwx_gtk2${UNICODE}_html-2.6.la
+lib/libwx_gtk2${UNICODE}_media-2.6.la
+lib/libwx_gtk2${UNICODE}_qa-2.6.la
+lib/libwx_gtk2${UNICODE}_xrc-2.6.la
+lib/libwxregex${UNICODE}-2.6.la
+lib/wx/config/gtk2-${BUILDTYPE}-release-2.6
+lib/wx/include/gtk2-${BUILDTYPE}-release-2.6/wx/setup.h
share/aclocal/wxwin.m4
share/bakefile/presets/wx.bkl
share/bakefile/presets/wx_unix.bkl
@@ -501,8 +502,8 @@ ${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
+@dirrm lib/wx/include/gtk2-${BUILDTYPE}-release-2.6/wx
+@dirrm lib/wx/include/gtk2-${BUILDTYPE}-release-2.6
@unexec ${RMDIR} %D/lib/wx/include 2>/dev/null || ${TRUE}
@dirrm lib/wx/config
@unexec ${RMDIR} %D/lib/wx 2>/dev/null || ${TRUE}
diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo
index 49006af34e4..4f308dff245 100644
--- a/x11/wxGTK/distinfo
+++ b/x11/wxGTK/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.23 2005/11/07 18:13:54 joerg Exp $
+$NetBSD: distinfo,v 1.24 2006/03/30 15:28:12 joerg Exp $
-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) = 3e6761aef80f7dcdd0a9d9ff42ae78bce9e4a14f
-SHA1 (patch-ab) = 8f57d3169b363ef90c44fafb864589840b0eeafa
-SHA1 (patch-ah) = c384584623b63004f59b4755ef32156f3d5687a0
+SHA1 (wxGTK-2.6.3.tar.bz2) = 7c2dfe27a56aa99b4ea557a436bf84a13a579a9d
+RMD160 (wxGTK-2.6.3.tar.bz2) = d7465860d7c07b42d299d4b4c5d015b25f96a9dd
+Size (wxGTK-2.6.3.tar.bz2) = 7213119 bytes
+SHA1 (wxGTK-2.6.3-libtool.diff.bz2) = 5e1e93f34f031aeb970c5821a19cd57ed7b2013c
+RMD160 (wxGTK-2.6.3-libtool.diff.bz2) = 9031bc030bb1c23b1c46bdc43e2282741fcd078a
+Size (wxGTK-2.6.3-libtool.diff.bz2) = 136324 bytes
+SHA1 (patch-aa) = 159a42a05fe9287931e46bfdd1adfa7cfa9d36a3
diff --git a/x11/wxGTK/patches/manual-bakefile.diff b/x11/wxGTK/patches/manual-bakefile.diff
new file mode 100644
index 00000000000..acfd038517a
--- /dev/null
+++ b/x11/wxGTK/patches/manual-bakefile.diff
@@ -0,0 +1,196 @@
+Binary files ../bakefile-0.2.0.orig/output/msvc6prj.pyc and ./output/msvc6prj.pyc differ
+diff -uNr ../bakefile-0.2.0.orig/rules/autoconf.bkl ./rules/autoconf.bkl
+--- ../bakefile-0.2.0.orig/rules/autoconf.bkl 2006-01-22 23:31:00.000000000 +0000
++++ ./rules/autoconf.bkl 2006-02-28 18:00:14.000000000 +0000
+@@ -160,61 +160,18 @@
+
+ <set var="__linkname1">$(__linkname)</set>
+
+- <set var="__targetsuf2">
+- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0'">
+- $(DLLEXT).$(__soversion1)
+- </if>
+- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
+- .$(__soversion1)$(DLLEXT)
+- </if>
+- <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
+- </set>
++ <set var="__targetsuf2">$(DLLEXT)</set>
+ <set var="__linkname2" eval="0">
+ $(DLLPREFIX)$(__dllname)$(__targetsuf2)
+ </set>
+
+- <set var="__targetsuf3">
+- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='0' and USE_SOVERCYGWIN=='0'">
+- $(DLLEXT).$(__soversion1).$(__soversion2).$(__soversion3)
+- </if>
+- <if cond="USE_SOVERSION=='1' and PLATFORM_MACOSX=='1'">
+- .$(__soversion1).$(__soversion2).$(__soversion3)$(DLLEXT)
+- </if>
+- <if cond="USE_SOVERSION=='1' and USE_SOVERCYGWIN=='1'">
+- -$(__soversion1)$(DLLEXT)
+- </if>
+- <if cond="USE_SOVERSION=='0'">$(DLLEXT)</if>
+- </set>
++ <set var="__targetsuf3">$(DLLEXT)</set>
+ <set var="__targetname" eval="0">
+ $(DLLPREFIX)$(__dllname)$(__targetsuf3)
+ </set>
+
+- <set var="__soname_flags">
+- <if cond="USE_SOVERLINUX=='1'"> <!-- Linux -->
+- $(SONAME_FLAG)$(__linkname2)
+- </if>
+- <if cond="USE_SOVERSOLARIS=='1'"> <!-- Solaris -->
+- $(SONAME_FLAG)$(__targetname)
+- </if>
+- </set>
++ <set var="__soname_flags">-version-number $(__soversion1):$(__soversion2):$(__soversion3)</set>
+ <ldflags>$(__soname_flags)</ldflags>
+-
+- <set var="__so_symlinks_cmd">
+- <if cond="USE_SOSYMLINKS=='1'">
+- (cd $(pathPrefixToPath(__targetdir));
+- $(RM) $(__linkname1) $(__linkname2);
+- $(LN_S) $(__targetname) $(__linkname2);
+- $(LN_S) $(__linkname2) $(__linkname1))
+- </if>
+- </set>
+- <set var="__so_symlinks_inst_cmd">
+- <if cond="USE_SOSYMLINKS=='1'">
+- $(RM) $(__linkname1) $(__linkname2);
+- $(LN_S) $(__targetname) $(__linkname2);
+- $(LN_S) $(__linkname2) $(__linkname1)
+- </if>
+- </set>
+- <__command>$(LF)$(__so_symlinks_cmd)</__command>
+
+ <set var="__mac_instname">$(__linkname2)</set>
+
+diff -uNr ../bakefile-0.2.0.orig/rules/makefile.bkl ./rules/makefile.bkl
+--- ../bakefile-0.2.0.orig/rules/makefile.bkl 2005-12-08 10:19:46.000000000 +0000
++++ ./rules/makefile.bkl 2006-03-20 22:04:43.000000000 +0000
+@@ -604,7 +604,7 @@
+ <define-tag name="install-to" rules="exe">
+ <modify-target target="install_$(id)">
+ <command>
+- $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
++ ${LIBTOOL} --mode=install $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+ </command>
+ </modify-target>
+ </define-tag>
+@@ -612,8 +612,7 @@
+ <define-tag name="install-to" rules="dll">
+ <modify-target target="install_$(id)">
+ <command>
+- $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__linkname',id)) $(DESTDIR)$(value)
+- $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
++ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+ </command>
+ </modify-target>
+ </define-tag>
+@@ -621,7 +620,7 @@
+ <define-tag name="install-to" rules="module">
+ <modify-target target="install_$(id)">
+ <command>
+- $(INSTALL_PROGRAM) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
++ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+ </command>
+ </modify-target>
+ </define-tag>
+@@ -629,7 +628,7 @@
+ <define-tag name="install-to" rules="lib">
+ <modify-target target="install_$(id)">
+ <command>
+- $(INSTALL_DATA) $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
++ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(ref('__targetdir',id))$(ref('__targetname',id)) $(DESTDIR)$(value)
+ </command>
+ </modify-target>
+ </define-tag>
+diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl ./rules/makefile_defs_gnu.bkl
+--- ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl 2005-06-16 17:48:03.000000000 +0000
++++ ./rules/makefile_defs_gnu.bkl 2006-02-28 22:43:14.000000000 +0000
+@@ -37,12 +37,12 @@
+
+ <template id="__commands_templ_C">
+ <set var="__COMPILE_C_CMD" eval="0">
+- $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $&lt;
++ ${LIBTOOL} --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(CPPDEPS) $&lt;
+ </set>
+ </template>
+ <template id="__commands_templ_CXX">
+ <set var="__COMPILE_CXX_CMD" eval="0">
+- $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $&lt;
++ ${LIBTOOL} --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(CPPDEPS) $&lt;
+ </set>
+ </template>
+
+diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl ./rules/makefile_defs_unix.bkl
+--- ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl 2005-03-13 22:50:03.000000000 +0000
++++ ./rules/makefile_defs_unix.bkl 2006-03-20 21:30:47.000000000 +0000
+@@ -15,20 +15,21 @@
+
+ <set var="DIRSEP">/</set>
+
+- <set var="OBJEXT">.o</set>
++ <set var="LIBTOOL">${LIBTOOL}</set>
++ <set var="OBJEXT">.lo</set>
+ <set var="LIBEXT" overwrite="0">.a</set>
+ <set var="LIBPREFIX" overwrite="0">lib</set>
+ <set var="EXEEXT" overwrite="0"></set>
+- <set var="DLLEXT" overwrite="0">.so</set>
++ <set var="DLLEXT" overwrite="1">.la</set>
+ <set var="DLLEXT_MODULE" overwrite="0">$(DLLEXT)</set>
+ <set var="DLLIMPEXT" overwrite="0">$(DLLEXT)</set>
+ <set var="DLLPREFIX" overwrite="0">$(LIBPREFIX)</set>
+ <set var="DLLPREFIX_MODULE" overwrite="0">$(DLLPREFIX)</set>
+- <set var="PIC_CFLAGS" overwrite="0">-fPIC -DPIC</set>
++ <set var="PIC_CFLAGS" overwrite="0"></set>
+
+- <set var="INSTALL_PROGRAM" overwrite="0">install -c</set>
+- <set var="INSTALL_DATA" overwrite="0">$(INSTALL) -m 644</set>
+- <set var="INSTALL_DIR" overwrite="0">$(INSTALL) -d</set>
++ <set var="INSTALL_PROGRAM" overwrite="1">${BSD_INSTALL_PROGRAM}</set>
++ <set var="INSTALL_DATA" overwrite="1">${BSD_INSTALL_DATA}</set>
++ <set var="INSTALL_DIR" overwrite="1">${BSD_INSTALL_DATA_DIR}</set>
+
+ <set var="AROPTIONS">rcu</set>
+ <set var="RM">rm -f</set>
+@@ -92,12 +93,12 @@
+ <if cond="FORMAT!='gnu'">
+ <template id="__commands_templ_C">
+ <set var="__COMPILE_C_CMD" eval="0">
+- $(CCC) -c -o $@ $(__cflags) $(src)
++ $(LIBTOOL) --mode=compile --tag=CC $(CCC) -c -o $@ $(__cflags) $(src)
+ </set>
+ </template>
+ <template id="__commands_templ_CXX">
+ <set var="__COMPILE_CXX_CMD" eval="0">
+- $(CXXC) -c -o $@ $(__cxxflags) $(src)
++ $(LIBTOOL) --mode=compile --tag=CXX $(CXXC) -c -o $@ $(__cxxflags) $(src)
+ </set>
+ </template>
+ </if>
+@@ -105,18 +106,16 @@
+
+ <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)
+ </set>
+ <set var="__LINK_LIB_CMD" eval="0">
+- $(RM) $@
+- $(AR) $(AROPTIONS) $@ $(__objects_var)
+- $(RANLIB) $@
++ $(LIBTOOL) --mode=link --tag=CC $(CCC) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
+ </set>
+ <set var="__LINK_DLL_CMD" eval="0">
+- $(__dll_linker) $@ $(__objects_var) $(__ldflags) $(__ldlibs)
++ $(LIBTOOL) --mode=link --tag=CC $(CCC) -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 $(CCC) -rpath $(libdir) -o $@ $(__objects_var) $(__ldflags) $(__ldlibs)
+ </set>
+ </template>
+
diff --git a/x11/wxGTK/patches/manual-regen.diff b/x11/wxGTK/patches/manual-regen.diff
new file mode 100644
index 00000000000..83b129dfc02
--- /dev/null
+++ b/x11/wxGTK/patches/manual-regen.diff
@@ -0,0 +1,50 @@
+To regenerate the patch, get the full wxWidgets tarball, copy build/bakefiles
+and the various *.bkl files into the wxGTK tree and run
+ ./bakefile_gen -f autoconf
+in build/bakefiles. manual-bakefile.diff contains the necessary patch for
+the bakefile ruleset to use libtool.
+
+--- build/bakefiles/regex.bkl.orig 2006-03-20 20:14:11.000000000 +0000
++++ build/bakefiles/regex.bkl
+@@ -27,16 +27,13 @@
+ <if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>
+ </set>
+
+- <lib id="wxregex" template="msvc_setup_h,3rdparty_lib"
++ <dll id="wxregex" template="msvc_setup_h,anylib"
+ cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
+- <libname cond="FORMAT=='autoconf'">
+- $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+- </libname>
+- <libname cond="FORMAT!='autoconf'">
+- $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+- </libname>
+- <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
+- <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
++ <dllname>
++ $(id)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)
++ </dllname>
++ <version>$(WX_VERSION)</version>
++ <so_version>$(WXSOVERSION)</so_version>
+ <define>__WX$(TOOLKIT)__</define>
+ <define>$(UNICODE_DEFINE)</define>
+ <dirname>$(LIBDIRNAME)</dirname>
+@@ -48,6 +45,6 @@
+ src/regex/regerror.c
+ src/regex/regfree.c
+ </sources>
+- </lib>
++ </dll>
+
+ </makefile>
+--- build/bakefiles/wx.bkl.orig 2006-02-28 22:50:55.000000000 +0000
++++ build/bakefiles/wx.bkl
+@@ -96,7 +96,7 @@
+ <command>
+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
+- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
++ ${BSD_INSTALL_SCRIPT} lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
+ (cd $(DESTDIR)$(BINDIR) &amp;&amp; rm -f wx-config &amp;&amp; $(LN_S) $(DESTDIR)$(LIBDIR)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ </command>
+ </action>
diff --git a/x11/wxGTK/patches/patch-aa b/x11/wxGTK/patches/patch-aa
index 48505e8f588..85ed8f3f08f 100644
--- a/x11/wxGTK/patches/patch-aa
+++ b/x11/wxGTK/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2005/11/07 18:13:54 joerg Exp $
+$NetBSD: patch-aa,v 1.9 2006/03/30 15:28:12 joerg Exp $
---- configure.orig 2005-09-20 17:03:25.000000000 +0200
+--- configure.orig 2006-03-21 23:42:05.000000000 +0000
+++ configure
-@@ -1815,7 +1815,7 @@ _ACEOF
+@@ -1820,7 +1820,7 @@ _ACEOF
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2005/11/07 18:13:54 joerg Exp $
USE_BSD=1
USE_FREEBSD=1
cat >>confdefs.h <<\_ACEOF
-@@ -22529,7 +22529,8 @@ SEARCH_INCLUDE="\
+@@ -23445,7 +23445,8 @@ SEARCH_INCLUDE="\
/usr/XFree86/include/X11 \
/usr/pkg/include \
\
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.8 2005/11/07 18:13:54 joerg Exp $
echo "$as_me:$LINENO: checking for libraries directory" >&5
echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
-@@ -35616,6 +35617,9 @@ echo "$as_me: WARNING: BeOS threads are
+@@ -36663,6 +36664,9 @@ echo "$as_me: WARNING: BeOS threads are
THREAD_OPTS="-mt $THREAD_OPTS"
fi
;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.8 2005/11/07 18:13:54 joerg Exp $
*-*-freebsd*)
THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
;;
-@@ -35749,7 +35753,7 @@ echo $ECHO_N "checking if more special f
+@@ -36797,7 +36801,7 @@ echo $ECHO_N "checking if more special f
LDFLAGS="-L/usr/lib/threads $LDFLAGS"
flag="-D_THREAD_SAFE"
;;
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.8 2005/11/07 18:13:54 joerg Exp $
flag="-D_THREAD_SAFE"
;;
*-hp-hpux* )
-@@ -44116,7 +44120,7 @@ EOF
+@@ -45354,7 +45358,7 @@ EOF
;;
powerpc-apple-macos* | \
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.8 2005/11/07 18:13:54 joerg Exp $
*-*-sunos4* | \
*-*-osf* | \
*-*-dgux5* | \
-@@ -44158,7 +44162,7 @@ echo "$as_me: error: unknown system type
+@@ -45396,7 +45400,7 @@ echo "$as_me: error: unknown system type
SONAME_FLAG=
case "${BAKEFILE_HOST}" in
diff --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab
deleted file mode 100644
index 225f7b75e71..00000000000
--- a/x11/wxGTK/patches/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
-$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@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
- INSTALL_DIR = @INSTALL_DIR@
- srcdir = @srcdir@
- 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
-@@ -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
-+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-
- locale_install:
-- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/${PKGLOCALEDIR}/locale
- for l in $(LOCALE_LINGUAS) ; do \
-- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
-- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
-+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/${PKGLOCALEDIR}/locale/$$l ; \
-+ $(INSTALL_DIR) $(DESTDIR)$(prefix)/${PKGLOCALEDIR}/locale/$$l/LC_MESSAGES ; \
- if test -f $(srcdir)/locale/$$l.mo ; then \
-- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(prefix)/${PKGLOCALEDIR}/locale/$$l/LC_MESSAGES/wxstd.mo ; \
- fi ; \
- done
-
diff --git a/x11/wxGTK/patches/patch-ah b/x11/wxGTK/patches/patch-ah
deleted file mode 100644
index 0cc8eb4542d..00000000000
--- a/x11/wxGTK/patches/patch-ah
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/08/07 11:26:17 wiz Exp $
-
---- contrib/src/Makefile.in.orig 2005-06-02 18:03:59.000000000 +0200
-+++ contrib/src/Makefile.in 2005-07-28 17:32:22.000000000 +0200
-@@ -2,3 +2,3 @@
-
--CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet
-+CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated #applet
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-27 08:46:02 +0000