Update to 3.0.4.

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

3 files changed, 7 insertions, 79 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index c1944a77c..15a521067 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.26 2011/03/07 20:16:03 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.27 2011/03/14 20:09:10 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 64c5f56da..030ee4871 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-3.0.3.tar.bz2) = 3e07acf4fc145268e4249eba2e26181040a08885eeda9e832418e6844deef090
-SIZE (gnome3/gtk+-3.0.3.tar.bz2) = 16804576
+SHA256 (gnome3/gtk+-3.0.4.tar.bz2) = 0e95436f31c9d2a8992d53106ace97961e13c4b52ee70bab52a884c6af6dbb17
+SIZE (gnome3/gtk+-3.0.4.tar.bz2) = 16834235
diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure
index 2c8b7725a..2e625d30e 100644
--- a/x11-toolkits/gtk30/files/patch-configure
+++ b/x11-toolkits/gtk30/files/patch-configure
@@ -1,69 +1,6 @@
---- configure.orig	2011-01-06 19:45:42.000000000 +0000
-+++ configure	2011-01-06 19:48:43.000000000 +0000
-@@ -18656,7 +18656,7 @@
- GIO_PACKAGE=gio-2.0
- PANGO_PACKAGES="pango pangocairo"
- 
--if test "x$enable_x11_backend" == xyes; then
-+if test "x$enable_x11_backend" = xyes; then
-   # GDK calls the xlib backend "x11," cairo calls it "xlib." Other
-   # backend names are identical.
-   cairo_backends="$cairo_backends cairo-xlib"
-@@ -18669,7 +18669,7 @@
- #define GDK_WINDOWING_X11"
- fi
- 
--if test "x$enable_win32_backend" == xyes; then
-+if test "x$enable_win32_backend" = xyes; then
-   cairo_backends="$cairo_backends cairo-win32"
-   GDK_BACKENDS="$GDK_BACKENDS win32"
-   backend_immodules="$backend_immodules,ime"
-@@ -18697,7 +18697,7 @@
- 
- fi
- 
--if test "x$enable_quartz_backend" == xyes; then
-+if test "x$enable_quartz_backend" = xyes; then
-   cairo_backends="$cairo_backends cairo-quartz"
-   GDK_BACKENDS="$GDK_BACKENDS quartz"
-   GDK_WINDOWING="$GDK_WINDOWING
-@@ -18723,7 +18723,7 @@
- fi
- 
- # strip leading space
--GDK_BACKENDS=${GDK_BACKENDS/# }
-+GDK_BACKENDS=${GDK_BACKENDS# }
- 
- 
- 
-@@ -21834,7 +21834,7 @@
- GTK_DEP_LIBS_FOR_X=
- X_EXTENSIONS=
- 
--if test "x$enable_x11_backend" == xyes; then
-+if test "x$enable_x11_backend" = xyes; then
-   X_PACKAGES=fontconfig
- 
-   #
-@@ -22992,7 +22992,7 @@
- 
- 
-   # strip leading space
--  X_EXTENSIONS=${X_EXTENSIONS/# }
-+  X_EXTENSIONS=${X_EXTENSIONS# }
- 
- else
-   XPACKAGES=
-@@ -23164,7 +23164,7 @@
- fi
- 
- GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
--if test "x$enable_x11_backend" == xyes; then
-+if test "x$enable_x11_backend" = xyes; then
-   GTK_PACKAGES="$GTK_PACKAGES pangoft2"
- fi
- GTK_EXTRA_LIBS=
-@@ -24043,9 +24043,9 @@
+--- configure.orig	2011-03-21 20:08:47.000000000 +0100
++++ configure	2011-03-21 20:10:50.000000000 +0100
+@@ -23728,9 +23728,9 @@
         INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
         INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
         INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
@@ -75,12 +12,3 @@
         INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
         INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
         INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-@@ -27580,7 +27580,7 @@
- 
- 
- # beautify the immodule list a bit
--included_immodules=${included_immodules//,/ }
-+included_immodules=`printf '%s' "$included_immodules" | sed -e 's/,/ /g'`
- included_immodules=${included_immodules:-none}
- 
- echo "configuration:"