[71299] trunk/dports/x11/wxgtk

[ryandesign at macports.org]

Revision: 71299
          http://trac.macports.org/changeset/71299
Author:   ryandesign at macports.org
Date:     2010-09-07 17:18:31 -0700 (Tue, 07 Sep 2010)
Log Message:
-----------
wxgtk: update to 2.8.11; see #26361

Modified Paths:
--------------
    trunk/dports/x11/wxgtk/Portfile
    trunk/dports/x11/wxgtk/files/patch-Makefile.in

Removed Paths:
-------------
    trunk/dports/x11/wxgtk/files/patch-gsocket.diff

Modified: trunk/dports/x11/wxgtk/Portfile
===================================================================
--- trunk/dports/x11/wxgtk/Portfile	2010-09-08 00:09:38 UTC (rev 71298)
+++ trunk/dports/x11/wxgtk/Portfile	2010-09-08 00:18:31 UTC (rev 71299)
@@ -4,8 +4,7 @@
 
 name            wxgtk
 conflicts       wxWidgets wxWidgets-python
-version         2.8.4
-revision        3
+version         2.8.11
 categories      x11
 platforms       darwin
 maintainers     nomaintainer
@@ -18,7 +17,9 @@
 master_sites    sourceforge:wxwindows
 distname        wxGTK-${version}
 
-checksums       md5 22e42c1601d9759530c875ffa2c3c554
+checksums       md5     6040933d200037f90f6aa1c5169e7ec6 \
+                sha1    e979d9d2b1ee5bd10e90fd00b02f3306327c661a \
+                rmd160  8028caed3be9ff5793dc7eab015d88d6c945f66d
 
 use_bzip2       yes
 
@@ -29,8 +30,7 @@
                 port:freetype \
                 port:zlib
 
-patchfiles      patch-Makefile.in \
-                patch-gsocket.diff
+patchfiles      patch-Makefile.in
 
 # g++-4.2: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
 universal_variant no

Modified: trunk/dports/x11/wxgtk/files/patch-Makefile.in
===================================================================
--- trunk/dports/x11/wxgtk/files/patch-Makefile.in	2010-09-08 00:09:38 UTC (rev 71298)
+++ trunk/dports/x11/wxgtk/files/patch-Makefile.in	2010-09-08 00:18:31 UTC (rev 71299)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2006-11-13 11:58:04.000000000 +0100
-+++ Makefile.in		2006-11-14 21:45:39.000000000 +0100
-@@ -4901,8 +4901,8 @@
+--- Makefile.in.orig	2010-09-05 00:01:24.000000000 +0200
++++ Makefile.in	2010-09-05 00:05:11.000000000 +0200
+@@ -5033,8 +5033,8 @@
  @COND_PLATFORM_MACOSX_1 at __HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
  @COND_PLATFORM_UNIX_1 at __HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
  @COND_TOOLKIT_MSW at __HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
@@ -11,7 +11,7 @@
  COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
  	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_1_SHARED_0 at __monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
-@@ -6667,8 +6667,8 @@
+@@ -6830,8 +6830,8 @@
  @COND_PLATFORM_MACOSX_1 at __HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
  @COND_PLATFORM_UNIX_1 at __HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
  @COND_TOOLKIT_MSW at __HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
@@ -22,7 +22,7 @@
  COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
  	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1 at __basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
-@@ -10130,8 +10130,8 @@
+@@ -10405,8 +10405,8 @@
  @COND_TOOLKIT_MSW@	= advdll_datectrl.o
  @COND_TOOLKIT_WINCE at __ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
  @COND_TOOLKIT_WINCE@	= advdll_datectrl.o
@@ -33,7 +33,7 @@
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
  	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 at __advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
-@@ -10195,8 +10195,8 @@
+@@ -10470,8 +10470,8 @@
  @COND_TOOLKIT_MSW@	= advlib_datectrl.o
  @COND_TOOLKIT_WINCE at __ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
  @COND_TOOLKIT_WINCE@	= advlib_datectrl.o

Deleted: trunk/dports/x11/wxgtk/files/patch-gsocket.diff
===================================================================
--- trunk/dports/x11/wxgtk/files/patch-gsocket.diff	2010-09-08 00:09:38 UTC (rev 71298)
+++ trunk/dports/x11/wxgtk/files/patch-gsocket.diff	2010-09-08 00:18:31 UTC (rev 71299)
@@ -1,16 +0,0 @@
---- src/gtk/gsockgtk.cpp.orig	2007-05-14 05:15:32.000000000 -0400
-+++ src/gtk/gsockgtk.cpp	2010-02-17 13:25:36.000000000 -0500
-@@ -15,9 +15,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- 
-+#define GSocket GlibGSocket
-+
- #include <gdk/gdk.h>
- #include <glib.h>
- 
-+#undef GSocket
-+
- #include "wx/gsocket.h"
- #include "wx/unix/gsockunx.h"
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100907/4f502fd4/attachment.html>