-depends xorg-libs '--with-x --with-libxpm' &&
-
+depends libx11 '--with-x' &&
+depends libxpm '--with-libxpm' &&
# all of the "depends" below strictly speaking are not required, e.g. we can
# use included library by specifying --with-*=builtin, but we want to use the
# system libraries, so we're saying --with-*[=sys] here.
diff --git a/x11-toolkits/wxgtk/DETAILS b/x11-toolkits/wxgtk/DETAILS
index ddd6cf8..0c319f8 100755
--- a/x11-toolkits/wxgtk/DETAILS
+++ b/x11-toolkits/wxgtk/DETAILS
@@ -1,9 +1,8 @@
SPELL=wxgtk
SPELLX=wxGTK
if [[ "$WX_DEV" == "y" ]];then
- VERSION=2.8.10
-
SOURCE_HASH=sha512:3a007846beff1ccc736d267d66793967350d1eaccc1d4707d7a9133cd5215d53158247a5f1882479a30e156ebcd86affe74633da392b295ad890f3819ca6bea5
- SECURITY_PATCH=1
+ VERSION=2.8.11
+
SOURCE_HASH=sha512:25439876fd3641cd469055681f9ec36ca8fe5bf93b15d98513ff82797945aa8b1ac557345475ceee80ec7d053f926c23592d2cc729af2bf4ff99e3bacc5519e8
else
VERSION=2.6.4
SOURCE_HASH=sha512:53b3a1a111288910b18e3743d8e389398bf7e60cddbf0ad609cd72fa4fbd5da2bb9b3b94427ba7ec9d695fb1cbca5fa79a1836a15c652aebf2ae605b1f93f4c5
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 6d46db4..1044668 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,9 @@
+2010-05-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.8.11
+ * PRE_BUILD: don't patch this version
+ * wxgtk-2.8.10-gsocket.patch: deleted
+ * DEPENDS: xorg-libs =< libx11, libxpm
+
2009-09-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, wxgtk-2.8.10-gsocket.patch: added patch to make
the spell compile with our version of glib
diff --git a/x11-toolkits/wxgtk/PRE_BUILD b/x11-toolkits/wxgtk/PRE_BUILD
index 91b0154..3b1d034 100755
--- a/x11-toolkits/wxgtk/PRE_BUILD
+++ b/x11-toolkits/wxgtk/PRE_BUILD
@@ -3,7 +3,4 @@ cd $SOURCE_DIRECTORY &&