summaryrefslogtreecommitdiff
path: root/x11-toolkits/wxgtk-devel
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2003-01-15 18:25:48 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2003-01-15 18:25:48 +0000
commit2679664f6a0fd40b3d6d5bc1f9d05f9fa6bf91fe (patch)
treeb2745bb52ad98061cf316533a1b5e1ce2a9361c3 /x11-toolkits/wxgtk-devel
parentUpdate to 7.4.6 (diff)
Update to 2.4.0.
Notes
Notes: svn path=/head/; revision=73182
Diffstat (limited to 'x11-toolkits/wxgtk-devel')
-rw-r--r--x11-toolkits/wxgtk-devel/Makefile4
-rw-r--r--x11-toolkits/wxgtk-devel/distinfo2
-rw-r--r--x11-toolkits/wxgtk-devel/files/patch-aa42
-rw-r--r--x11-toolkits/wxgtk-devel/files/patch-ac32
-rw-r--r--x11-toolkits/wxgtk-devel/files/patch-configure68
-rw-r--r--x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h17
-rw-r--r--x11-toolkits/wxgtk-devel/files/patch-parser.y10
-rw-r--r--x11-toolkits/wxgtk-devel/files/patch-wx-config.in16
-rw-r--r--x11-toolkits/wxgtk-devel/pkg-plist26
9 files changed, 113 insertions, 104 deletions
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 8c54b61b1ce7..3abc3544798f 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= wxgtk
-PORTVERSION= 2.3.2
-PORTREVISION= 1
+PORTVERSION= 2.4.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
@@ -22,6 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
NO_LATEST_LINK= "Unstable, development version."
+USE_BZIP2= yes
USE_X_PREFIX= yes
USE_MESA= yes
USE_GMAKE= yes
diff --git a/x11-toolkits/wxgtk-devel/distinfo b/x11-toolkits/wxgtk-devel/distinfo
index 630d423090e3..9485d3c239b0 100644
--- a/x11-toolkits/wxgtk-devel/distinfo
+++ b/x11-toolkits/wxgtk-devel/distinfo
@@ -1 +1 @@
-MD5 (wxGTK-2.3.2.tar.gz) = b85e06fcd149dd74fae0762a5130d8ec
+MD5 (wxGTK-2.4.0.tar.bz2) = b51cbef5b29ede3f56121e3d142dbc76
diff --git a/x11-toolkits/wxgtk-devel/files/patch-aa b/x11-toolkits/wxgtk-devel/files/patch-aa
index 7907a232b39a..374d4acd99d5 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-aa
+++ b/x11-toolkits/wxgtk-devel/files/patch-aa
@@ -1,21 +1,21 @@
$FreeBSD$
---- configure.in.orig Mon Dec 10 20:07:00 2001
-+++ configure.in Sat Jan 19 14:34:28 2002
-@@ -2393,8 +2393,8 @@
- lib_debug_suffix=d
- fi
+--- configure.in.orig Sun Jan 5 13:55:00 2003
++++ configure.in Tue Jan 14 18:25:25 2003
+@@ -2723,8 +2723,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]]"`
--TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
--TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
+-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+-TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl"
if test "$cross_compiling" = "yes"; then
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
-@@ -2406,14 +2406,12 @@
- WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
+@@ -2737,14 +2737,12 @@
+ WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
dnl the name of the shared library
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
@@ -31,15 +31,21 @@ $FreeBSD$
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}"
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
- dnl the name of the resources file for wxMac
- WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
-@@ -3522,24 +3520,6 @@
- fi
+ case "${host}" in
+ *-*-cygwin* | *-*-mingw32* )
+@@ -3459,7 +3457,7 @@
+ *-*-freebsd*)
+ dnl look, in order, for the kernel threads, then Linux threads
+ dnl and finally the userland threads
+- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
++ THREAD_OPTS="$THREAD_OPTS pthread c_r"
+ ;;
+ *-*-darwin* | *-*-cygwin* )
+ dnl Darwin / Mac OS X just uses -lpthread tested below
+@@ -3817,21 +3815,6 @@
+ esac
fi
--
--CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
--CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$wxUSE_OPTIMISE" = "no" ; then
- OPTIMISE=
-else
@@ -58,7 +64,7 @@ $FreeBSD$
if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
AC_DEFINE(WXWIN_COMPATIBILITY_2)
-@@ -4792,7 +4772,6 @@
+@@ -5288,7 +5271,6 @@
AC_SUBST(WX_LIBRARY_IMPORTLIB)
AC_SUBST(WX_TARGET_LIBRARY)
AC_SUBST(WX_LIBRARY_LINK1)
@@ -66,7 +72,7 @@ $FreeBSD$
AC_SUBST(PROGRAM_EXT)
dnl global gl options
-@@ -4800,7 +4779,6 @@
+@@ -5296,7 +5278,6 @@
AC_SUBST(WX_LIBRARY_NAME_SHARED_GL)
AC_SUBST(WX_TARGET_LIBRARY_GL)
AC_SUBST(WX_LIBRARY_LINK1_GL)
diff --git a/x11-toolkits/wxgtk-devel/files/patch-ac b/x11-toolkits/wxgtk-devel/files/patch-ac
index b1d381546c6b..f4522eaf15bd 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-ac
+++ b/x11-toolkits/wxgtk-devel/files/patch-ac
@@ -1,9 +1,9 @@
$FreeBSD$
---- Makefile.in.orig Mon Dec 10 20:07:01 2001
-+++ Makefile.in Sat Jan 19 16:58:06 2002
-@@ -340,17 +340,13 @@
+--- Makefile.in.orig Sun Jan 5 13:54:59 2003
++++ Makefile.in Tue Jan 14 18:29:58 2003
+@@ -332,17 +332,13 @@
$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
@$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@
@@ -21,9 +21,9 @@ $FreeBSD$
- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@
+ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
- $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
+ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
-@@ -380,26 +376,21 @@
+@@ -371,26 +367,21 @@
CREATE_INSTALLED_LINKS: preinstall
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
@@ -50,29 +50,37 @@ $FreeBSD$
- $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm
- $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm
+ $(INSTALL) -d $(datadir)/wx/afm
-+ $(INSTALL) -d $(datadir)/wx/gs_afm
++ $(INSTALL) -d $(datadir)/wx//gs_afm
+ $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+ $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
-
+
m4datainstall: preinstall
$(INSTALL) -d $(datadir)/aclocal
-@@ -422,12 +413,10 @@
- @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
+@@ -425,20 +416,16 @@
+ @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
- $(INSTALL) -d $(libdir)/wx
- $(INSTALL) -d $(libdir)/wx/include
+- $(INSTALL) -d $(libdir)/wx/include/univ
- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@
- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx
+ $(INSTALL) -d $(prefix)/include/wx
+ $(INSTALL) -d $(prefix)/include/wx/@TOOLCHAIN_NAME@
$(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \
- $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h
-+ $(prefix)/include/wx/setup.h
++ $(prefix)/include/wx/setup.h
$(INSTALL) -d $(includedir)/wx
@# FIXME: This will erroneously install a wx/base dir for wxBase..
-@@ -485,13 +474,11 @@
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi
+ @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi
+- @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi
+ @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi
+
+ @# always install msw headers for wxBase, it's much simpler
+@@ -494,13 +481,11 @@
@echo " Removing library..."
@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
@@ -86,4 +94,4 @@ $FreeBSD$
+ @$(RM) $(prefix)/include/wx/@TOOLCHAIN_NAME@/setup.h
@$(RM) $(bindir)/wx-config
@$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config
- @$(RM) $(datadir)/wx/afm/*
+ @$(RM) $(datadir)/wx/$(VER_MAJMIN)/afm/*
diff --git a/x11-toolkits/wxgtk-devel/files/patch-configure b/x11-toolkits/wxgtk-devel/files/patch-configure
index 4d42ccaba3ea..ee3970e05565 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-configure
+++ b/x11-toolkits/wxgtk-devel/files/patch-configure
@@ -1,31 +1,16 @@
$FreeBSD$
---- configure.orig Thu Jan 31 12:17:48 2002
-+++ configure Thu Jan 31 13:45:16 2002
-@@ -10036,10 +10036,10 @@
- else
- echo "$ac_t""no" 1>&6
- if test "$GTK_CONFIG_2_0" = "no" ; then
-- echo "*** The gtk-config-2.0 script installed by GTK could not be found"
-- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-- echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
-- echo "*** full path to gtk-config-2.0."
-+# echo "*** The gtk-config-2.0 script installed by GTK could not be found"
-+# echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-+# echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
-+# echo "*** full path to gtk-config-2.0."
- else
- if test -f conf.gtktest ; then
- :
-@@ -10397,16 +10397,16 @@
+--- configure.orig Tue Jan 14 18:31:00 2003
++++ configure Tue Jan 14 18:31:55 2003
+@@ -13284,14 +13284,14 @@
TOOLKIT=GTK
GUIDIST=GTK_DIST
- echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
--echo "configure:10402: checking for gdk_im_open in -lgdk" >&5
+-echo "configure:13289: checking for gdk_im_open in -lgdk" >&5
+ echo $ac_n "checking for gdk_im_open in -lgdk12""... $ac_c" 1>&6
-+echo "configure:10413: checking for gdk_im_open in -lgdk12" >&5
++echo "configure:13289: 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
@@ -34,25 +19,22 @@ $FreeBSD$
-LIBS="-lgdk $LIBS"
+LIBS="-lgdk12 $LIBS"
cat > conftest.$ac_ext <<EOF
--#line 10410 "configure"
-+#line 10421 "configure"
+ #line 13297 "configure"
#include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -11862,8 +11862,8 @@
- lib_debug_suffix=d
- fi
+@@ -15864,8 +15864,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]"`
--TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
--TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
+-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+-TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl"
if test "$cross_compiling" = "yes"; then
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
-@@ -11873,13 +11873,11 @@
- WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
+@@ -15876,13 +15876,11 @@
WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
+ WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
@@ -66,9 +48,18 @@ $FreeBSD$
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}"
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
- WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
- WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
-@@ -16167,6 +16165,7 @@
+ case "${host}" in
+ *-*-cygwin* | *-*-mingw32* )
+@@ -18379,7 +18377,7 @@
+ fi
+ ;;
+ *-*-freebsd*)
+- THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
++ THREAD_OPTS="$THREAD_OPTS pthread c_r"
+ ;;
+ *-*-darwin* | *-*-cygwin* )
+ THREAD_OPTS=""
+@@ -19136,6 +19134,7 @@
fi
fi
@@ -76,13 +67,10 @@ $FreeBSD$
if test "$WXGTK20" = 1 ; then
cat >> confdefs.h <<EOF
#define __WXGTK20__ $WXGTK20
-@@ -16256,24 +16255,6 @@
- fi
+@@ -19236,21 +19235,6 @@
+ esac
fi
--
--CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
--CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$wxUSE_OPTIMISE" = "no" ; then
- OPTIMISE=
-else
@@ -101,7 +89,7 @@ $FreeBSD$
if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
cat >> confdefs.h <<\EOF
#define WXWIN_COMPATIBILITY_2 1
-@@ -18935,13 +18916,11 @@
+@@ -22467,13 +22451,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/files/patch-include::wx::wxchar.h b/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
index 8baf181b9029..f0fd474d8047 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
+++ b/x11-toolkits/wxgtk-devel/files/patch-include::wx::wxchar.h
@@ -1,19 +1,18 @@
$FreeBSD$
---- include/wx/wxchar.h.orig Mon Dec 10 20:07:02 2001
-+++ include/wx/wxchar.h Sat Jan 19 12:14:57 2002
-@@ -532,11 +532,11 @@
- #endif //!Unicode
+--- include/wx/wxchar.h.orig Sun Sep 15 21:19:48 2002
++++ include/wx/wxchar.h Sat Oct 26 18:06:12 2002
+@@ -554,10 +554,10 @@
+ #endif // wxUSE_WCHAR_T
// checks whether the passed in pointer is NULL and if the string is empty
-inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
+WXDLLEXPORT inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
- #ifndef wxNEED_WX_STRING_H
// safe version of strlen() (returns 0 if passed NULL pointer)
--inline size_t wxStrlen(const wxChar *psz)
-+WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz)
- { return psz ? wxStrlen_(psz) : 0; }
- #endif
+-inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; }
++WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; }
+
+ WXDLLEXPORT bool wxOKlibc(); // for internal use
diff --git a/x11-toolkits/wxgtk-devel/files/patch-parser.y b/x11-toolkits/wxgtk-devel/files/patch-parser.y
deleted file mode 100644
index af242167d1ab..000000000000
--- a/x11-toolkits/wxgtk-devel/files/patch-parser.y
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/common/parser.y.orig Wed Dec 18 21:06:41 2002
-+++ src/common/parser.y Wed Dec 18 21:06:48 2002
-@@ -97,6 +97,7 @@
- free($1); }
- | arg1
- {$$ = $1; }
-+ ;
-
- arg1 : WORD
- {$$ = wxmake_word($1); free($1);}
diff --git a/x11-toolkits/wxgtk-devel/files/patch-wx-config.in b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in
index fa2ce1da9e63..ff8564822f23 100644
--- a/x11-toolkits/wxgtk-devel/files/patch-wx-config.in
+++ b/x11-toolkits/wxgtk-devel/files/patch-wx-config.in
@@ -1,14 +1,14 @@
$FreeBSD$
---- wx-config.in.orig Mon Dec 10 20:07:01 2001
-+++ wx-config.in Sat Jan 19 12:19:14 2002
-@@ -37,7 +37,7 @@
- includes=-I@includedir@
+--- wx-config.in.orig Sun Jan 5 13:54:59 2003
++++ wx-config.in Tue Jan 14 18:36:21 2003
+@@ -66,7 +66,7 @@
+ if test $inplace_flag = yes ; then
+ includes="-I$inplace_builddir/lib/wx/include/@TOOLCHAIN_NAME@ -I$inplace_include"
+ else
+- includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@$includes"
++ includes="-I@prefix@/include $includes"
fi
-- includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
-+ includes="-I@prefix@/include $includes"
-
if test $static_flag = yes ; then
- echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
diff --git a/x11-toolkits/wxgtk-devel/pkg-plist b/x11-toolkits/wxgtk-devel/pkg-plist
index dbf6f0321a6e..d2197fde2ecf 100644
--- a/x11-toolkits/wxgtk-devel/pkg-plist
+++ b/x11-toolkits/wxgtk-devel/pkg-plist
@@ -3,10 +3,12 @@ bin/wxgtk-config
include/wx/accel.h
include/wx/app.h
include/wx/arrimpl.cpp
+include/wx/artprov.h
include/wx/bitmap.h
include/wx/bmpbuttn.h
include/wx/brush.h
include/wx/buffer.h
+include/wx/build.h
include/wx/busyinfo.h
include/wx/button.h
include/wx/calctrl.h
@@ -41,6 +43,7 @@ include/wx/dbgrid.h
include/wx/dbkeyg.h
include/wx/dbtable.h
include/wx/dc.h
+include/wx/dcbuffer.h
include/wx/dcclient.h
include/wx/dcmemory.h
include/wx/dcprint.h
@@ -52,6 +55,7 @@ include/wx/defs.h
include/wx/dialog.h
include/wx/dialup.h
include/wx/dir.h
+include/wx/dirctrl.h
include/wx/dirdlg.h
include/wx/dnd.h
include/wx/docmdi.h
@@ -59,10 +63,13 @@ include/wx/docview.h
include/wx/dragimag.h
include/wx/dynarray.h
include/wx/dynlib.h
+include/wx/dynload.h
+include/wx/effects.h
include/wx/encconv.h
include/wx/event.h
include/wx/expr.h
include/wx/fdrepdlg.h
+include/wx/features.h
include/wx/ffile.h
include/wx/file.h
include/wx/fileconf.h
@@ -100,7 +107,6 @@ include/wx/generic/gridctrl.h
include/wx/generic/gridg.h
include/wx/generic/helpext.h
include/wx/generic/helphtml.h
-include/wx/generic/helpwxht.h
include/wx/generic/imaglist.h
include/wx/generic/laywin.h
include/wx/generic/listctrl.h
@@ -119,6 +125,7 @@ include/wx/generic/splitter.h
include/wx/generic/statusbr.h
include/wx/generic/tabg.h
include/wx/generic/textdlgg.h
+include/wx/generic/timer.h
include/wx/generic/treectlg.h
include/wx/generic/wizard.h
include/wx/geometry.h
@@ -171,7 +178,6 @@ include/wx/gtk/radiobut.h
include/wx/gtk/region.h
include/wx/gtk/scrolbar.h
include/wx/gtk/scrolwin.h
-include/wx/gtk/settings.h
include/wx/gtk/slider.h
include/wx/gtk/spinbutt.h
include/wx/gtk/spinctrl.h
@@ -190,6 +196,7 @@ include/wx/gtk/wave.h
include/wx/gtk/win_gtk.h
include/wx/gtk/window.h
include/wx/hash.h
+include/wx/hashmap.h
include/wx/help.h
include/wx/helpbase.h
include/wx/helphtml.h
@@ -208,9 +215,11 @@ include/wx/html/htmprint.h
include/wx/html/m_templ.h
include/wx/html/winpars.h
include/wx/icon.h
+include/wx/iconbndl.h
include/wx/imagbmp.h
include/wx/image.h
include/wx/imaggif.h
+include/wx/imagiff.h
include/wx/imagjpeg.h
include/wx/imaglist.h
include/wx/imagpcx.h
@@ -220,6 +229,7 @@ include/wx/imagtiff.h
include/wx/imagxpm.h
include/wx/intl.h
include/wx/ioswrap.h
+include/wx/ipc.h
include/wx/ipcbase.h
include/wx/isql.h
include/wx/isqlext.h
@@ -227,6 +237,7 @@ include/wx/joystick.h
include/wx/layout.h
include/wx/laywin.h
include/wx/list.h
+include/wx/listbase.h
include/wx/listbox.h
include/wx/listctrl.h
include/wx/listimpl.cpp
@@ -244,10 +255,10 @@ include/wx/mimetype.h
include/wx/minifram.h
include/wx/module.h
include/wx/msgdlg.h
+include/wx/msgout.h
include/wx/mstream.h
include/wx/notebook.h
include/wx/object.h
-include/wx/objstrm.h
include/wx/odbc.h
include/wx/ownerdrw.h
include/wx/palette.h
@@ -279,7 +290,6 @@ include/wx/sckipc.h
include/wx/sckstrm.h
include/wx/scrolbar.h
include/wx/scrolwin.h
-include/wx/serbase.h
include/wx/settings.h
include/wx/setup.h
include/wx/sizer.h
@@ -311,6 +321,7 @@ include/wx/textdlg.h
include/wx/textfile.h
include/wx/tglbtn.h
include/wx/thread.h
+include/wx/thrimpl.cpp
include/wx/time.h
include/wx/timer.h
include/wx/tipdlg.h
@@ -327,6 +338,7 @@ include/wx/unix/execute.h
include/wx/unix/fontutil.h
include/wx/unix/gsockunx.h
include/wx/unix/mimetype.h
+include/wx/unix/utilsx11.h
include/wx/url.h
include/wx/utils.h
include/wx/valgen.h
@@ -335,6 +347,7 @@ include/wx/valtext.h
include/wx/variant.h
include/wx/vector.h
include/wx/version.h
+include/wx/volume.h
include/wx/wave.h
include/wx/wfstream.h
include/wx/window.h
@@ -361,10 +374,15 @@ share/locale/de/LC_MESSAGES/wxstd.mo
share/locale/es/LC_MESSAGES/wxstd.mo
share/locale/fi/LC_MESSAGES/wxstd.mo
share/locale/fr/LC_MESSAGES/wxstd.mo
+share/locale/hu/LC_MESSAGES/wxstd.mo
+share/locale/id/LC_MESSAGES/wxstd.mo
share/locale/it/LC_MESSAGES/wxstd.mo
share/locale/nl/LC_MESSAGES/wxstd.mo
+share/locale/pl/LC_MESSAGES/wxstd.mo
share/locale/ru/LC_MESSAGES/wxstd.mo
+share/locale/sl/LC_MESSAGES/wxstd.mo
share/locale/sv/LC_MESSAGES/wxstd.mo
+share/locale/tr/LC_MESSAGES/wxstd.mo
share/locale/zh/LC_MESSAGES/wxstd.mo
share/wx/afm/Cour.afm
share/wx/afm/CourBo.afm