Update to 2.11.4

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9059 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 6 insertions, 85 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 5797d15ea..a636670c6 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.111 2007/06/17 20:24:56 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.112 2007/06/18 15:29:40 marcus Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.11.3
-PORTREVISION?=	2
+PORTVERSION=	2.11.4
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index bf8e9f175..350755c25 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.11.3.tar.bz2) = 49c53959df501a48c2cba834d1993508
-SHA256 (gnome2/gtk+-2.11.3.tar.bz2) = 52602be6fdf771cfd770e34cd7830595ac4c1229ba1206f9afe632e6816277d2
-SIZE (gnome2/gtk+-2.11.3.tar.bz2) = 14578238
+MD5 (gnome2/gtk+-2.11.4.tar.bz2) = a3baab72d34b6fa9c01578f1f2dd84f0
+SHA256 (gnome2/gtk+-2.11.4.tar.bz2) = 621a2efacac53d0abfcb4f24c1e281191305abe97dd6a06424fa09539c79bd4f
+SIZE (gnome2/gtk+-2.11.4.tar.bz2) = 15379000
diff --git a/x11-toolkits/gtk20/files/patch-svn b/x11-toolkits/gtk20/files/patch-svn
deleted file mode 100644
index 769b238e6..000000000
--- a/x11-toolkits/gtk20/files/patch-svn
+++ /dev/null
@@ -1,79 +0,0 @@
---- gtk/gtkbuilder.c.orig	Sun Jun 17 16:01:32 2007
-+++ gtk/gtkbuilder.c	Sun Jun 17 16:01:38 2007
-@@ -47,7 +47,7 @@ static void gtk_builder_get_property   (
-                                         GValue          *value,
-                                         GParamSpec      *pspec);
- static GType gtk_builder_real_get_type_from_name   (GtkBuilder      *builder,
--                                                    const char      *typename);
-+                                                    const char      *type_name);
- static gint _gtk_builder_enum_from_string (GType type, const char *string);
- 
- 
-@@ -214,15 +214,15 @@ _gtk_builder_resolve_type_lazily (const 
-  */
- 
- static GType
--gtk_builder_real_get_type_from_name (GtkBuilder *builder, const char *typename)
-+gtk_builder_real_get_type_from_name (GtkBuilder *builder, const char *type_name)
- {
-   GType gtype;
- 
--  gtype = g_type_from_name (typename);
-+  gtype = g_type_from_name (type_name);
-   if (gtype != G_TYPE_INVALID)
-     return gtype;
- 
--  return _gtk_builder_resolve_type_lazily (typename);
-+  return _gtk_builder_resolve_type_lazily (type_name);
- }
- 
- typedef struct
-@@ -1238,23 +1238,23 @@ _gtk_builder_flags_from_string (GType ty
- /**
-  * gtk_builder_get_type_from_name:
-  * @builder: a #GtkBuilder
-- * @typename: Type name to lookup
-+ * @type_name: Type name to lookup
-  *
-  * This method is used to lookup a type. It can be implemented in a 
-  * subclass to override the #GType of an object created by the builder.
-  *
-- * Returns: the #GType found for @typename or #G_TYPE_INVALID if no
-+ * Returns: the #GType found for @type_name or #G_TYPE_INVALID if no
-  *   type was found
-  *
-  * Since 2.12
-  */
- GType
--gtk_builder_get_type_from_name (GtkBuilder *builder, const gchar *typename)
-+gtk_builder_get_type_from_name (GtkBuilder *builder, const gchar *type_name)
- {
-   g_return_val_if_fail (GTK_IS_BUILDER (builder), G_TYPE_INVALID);
--  g_return_val_if_fail (typename != NULL, G_TYPE_INVALID);
-+  g_return_val_if_fail (type_name != NULL, G_TYPE_INVALID);
- 
--  return GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, typename);
-+  return GTK_BUILDER_GET_CLASS (builder)->get_type_from_name (builder, type_name);
- }
- 
- /**
---- gtk/gtkbuilder.h.orig	Sun Jun 17 16:02:12 2007
-+++ gtk/gtkbuilder.h	Sun Jun 17 16:02:23 2007
-@@ -60,7 +60,7 @@ struct _GtkBuilderClass
-   GObjectClass parent_class;
-   
-   GType (* get_type_from_name) (GtkBuilder *builder,
--                                const char *typename);
-+                                const char *type_name);
- 
-   /* Padding for future expansion */
-   void (*_gtk_reserved1) (void);
-@@ -103,7 +103,7 @@ void         gtk_builder_set_translation
-                                                   const gchar  	*domain);
- const gchar* gtk_builder_get_translation_domain  (GtkBuilder   	*builder);
- GType        gtk_builder_get_type_from_name      (GtkBuilder   	*builder,
--                                                  const char   	*typename);
-+                                                  const char   	*type_name);
- 
- gboolean     gtk_builder_value_from_string       (GParamSpec   	*pspec,
-                                                   const gchar  	*string,