5 files changed, 47 insertions, 39 deletions

diff --git a/x11-toolkits/wxmozilla/Makefile b/x11-toolkits/wxmozilla/Makefile
index 9e7bc3de0bb6..9b240b5c746c 100644
--- a/x11-toolkits/wxmozilla/Makefile
+++ b/x11-toolkits/wxmozilla/Makefile
@@ -7,11 +7,9 @@
 #
 
 PORTNAME=	wxmozilla
-PORTVERSION=	0.5.3
-PORTREVISION=	10
+PORTVERSION=	0.5.6
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embedding Mozilla in wxWidgets
@@ -21,7 +19,7 @@ USE_GNOME=	gnomehack gnometarget
 USE_GECKO=	mozilla
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-python
-USE_WX=		2.4
+USE_WX=		2.6+
 WX_COMPS=	wx python
 WX_CONF_ARGS=	absolute
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/wxmozilla/distinfo b/x11-toolkits/wxmozilla/distinfo
index be08c038844d..d511840e6ef9 100644
--- a/x11-toolkits/wxmozilla/distinfo
+++ b/x11-toolkits/wxmozilla/distinfo
@@ -1,3 +1,3 @@
-MD5 (wxmozilla-0.5.3.tar.gz) = c353300bfd1f45e1fa3e413cdbdd48d2
-SHA256 (wxmozilla-0.5.3.tar.gz) = 9792abd420240ea01196af4eb88429526205f3ddc22e37e928c577c110696f37
-SIZE (wxmozilla-0.5.3.tar.gz) = 327374
+MD5 (wxmozilla-0.5.6.tar.gz) = f67edaaa17ed33a360c7c636b98b78fd
+SHA256 (wxmozilla-0.5.6.tar.gz) = 35d877fb53fe06be89412479c47c8fe3108019149a23f4c7e8478b42d7dac863
+SIZE (wxmozilla-0.5.6.tar.gz) = 539622
diff --git a/x11-toolkits/wxmozilla/files/patch-configure b/x11-toolkits/wxmozilla/files/patch-configure
deleted file mode 100644
index c4262ed8b201..000000000000
--- a/x11-toolkits/wxmozilla/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Mon Feb  2 14:55:50 2004
-+++ configure	Mon Feb  2 14:56:59 2004
-@@ -10135,7 +10135,7 @@
- fi
- 
- 
--if test "$build_python" == "yes" ; then
-+if test "$build_python" = "yes" ; then
- 
- 
- 
-@@ -10315,7 +10315,7 @@
- fi
- 
- 
--if test $build_python == yes; then
-+if test $build_python = yes; then
-   BUILD_PYTHON_TRUE=
-   BUILD_PYTHON_FALSE='#'
- else
diff --git a/x11-toolkits/wxmozilla/files/patch-wxPython-contrib-mozilla25-gtk_mozilla_wrap.cpp b/x11-toolkits/wxmozilla/files/patch-wxPython-contrib-mozilla25-gtk_mozilla_wrap.cpp
new file mode 100644
index 000000000000..2a1a8fa9122b
--- /dev/null
+++ b/x11-toolkits/wxmozilla/files/patch-wxPython-contrib-mozilla25-gtk_mozilla_wrap.cpp
@@ -0,0 +1,25 @@
+--- wxPython/contrib/mozilla25/gtk/mozilla_wrap.cpp.orig	2008-03-18 16:21:58.000000000 +0100
++++ wxPython/contrib/mozilla25/gtk/mozilla_wrap.cpp	2008-03-18 16:24:58.000000000 +0100
+@@ -1228,7 +1228,7 @@
+     obj = pyobj;
+     if (PyCFunction_Check(obj)) {
+       /* here we get the method pointer for callbacks */
+-      char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
++      const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+       c = doc ? strstr(doc, "swig_ptr: ") : 0;
+       if (c) {
+ 	c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0;
+@@ -8120,11 +8120,11 @@
+     swig_type_info **types_initial) {
+         size_t i;
+         for (i = 0; methods[i].ml_name; ++i) {
+-            char *c = methods[i].ml_doc;
++            const char *c = methods[i].ml_doc;
+             if (c && (c = strstr(c, "swig_ptr: "))) {
+                 int j;
+                 swig_const_info *ci = 0;
+-                char *name = c + 10;
++                const char *name = c + 10;
+                 for (j = 0; const_table[j].type; ++j) {
+                     if (strncmp(const_table[j].name, name, 
+                     strlen(const_table[j].name)) == 0) {
diff --git a/x11-toolkits/wxmozilla/pkg-plist b/x11-toolkits/wxmozilla/pkg-plist
index 9a86d6123d3c..dc29f374d72d 100644
--- a/x11-toolkits/wxmozilla/pkg-plist
+++ b/x11-toolkits/wxmozilla/pkg-plist
@@ -1,18 +1,23 @@
-lib/libwxmozilla_gtk2-2.4.a
-lib/libwxmozilla_gtk2-2.4.la
-lib/libwxmozilla_gtk2-2.4.so
-lib/libwxmozilla_gtk2-2.4.so.0
+lib/libwxmozilla_gtk2-2.6.a
+lib/libwxmozilla_gtk2-2.6.la
+lib/libwxmozilla_gtk2-2.6.so
+lib/libwxmozilla_gtk2-2.6.so.0
 include/wxmozilla/wxMozilla.h
 include/wxmozilla/wxMozillaBrowser.h
 include/wxmozilla/wxMozillaBrowserChrome.h
+include/wxmozilla/wxMozillaComponents.h
 include/wxmozilla/wxMozillaEvents.h
+include/wxmozilla/wxMozillaProtocolHandler.h
 include/wxmozilla/wxMozillaSettings.h
 include/wxmozilla/wxMozillaWindow.h
-@dirrm include/wxmozilla
 libdata/pkgconfig/wxmozilla.pc
-%%PYTHON_SITELIBDIR%%/wxPython/mozilla.py
-%%PYTHON_SITELIBDIR%%/wxPython/mozilla.pyc
-%%PYTHON_SITELIBDIR%%/wxPython/mozilla.pyo
-%%PYTHON_SITELIBDIR%%/wxPython/mozillac.a
-%%PYTHON_SITELIBDIR%%/wxPython/mozillac.la
-%%PYTHON_SITELIBDIR%%/wxPython/mozillac.so
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/mozilla.py
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/mozilla.pyc
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/mozilla.pyo
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wxPython/mozilla.py
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wxPython/mozilla.pyc
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wxPython/mozilla.pyo
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/_mozilla.so
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/_mozilla.la
+%%PYTHON_SITELIBDIR%%/wx-2.6-gtk2-ansi/wx/_mozilla.a
+@dirrm include/wxmozilla