Update to 2.99.0

Fix some configure bashisms. Big thanks goes to jilles@ for coming up with
fixes.

Don't install gtk-builder-convert gtk-update-icon-cache. These where versioned
before with -3.0 but other ports and script just called the unversioned
versions.

Add depend gtk20 to get access to these programs. If someone has a beter idea
how we can make these two program available to both gtk's without the need
that gtk30 depends on gtk20.

Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=635207
Upstream commit: http://git.gnome.org/browse/gtk+/commit/?id=a975d62071d71814eb9e6b3c379228f4cd66f0d3


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

7 files changed, 124 insertions, 69 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index bad79b7c4..a72ebba92 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.14 2010/12/25 21:39:38 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.15 2010/12/26 09:24:16 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.91.7
-PORTREVISION?=	1
+PORTVERSION=	2.99.0
+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/%SUBDIR%/ \
@@ -40,19 +40,18 @@ USE_PERL5_BUILD=yes
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack atk pango gdkpixbuf2 ltverhack
+USE_GNOME=	gnomehack atk pango gdkpixbuf2 ltverhack gtk20
 USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
-CONFIGURE_ARGS=	--enable-static --with-xinput=yes
+CONFIGURE_ARGS=	--enable-static --enable-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GLIB_SCHEMAS=	org.gtk.Settings.FileChooser.gschema.xml
 
-MAN1=		gtk-builder-convert-3.0.1 gtk-query-immodules-3.0.1 \
-		gtk-update-icon-cache-3.0.1
+MAN1=		gtk-query-immodules-3.0.1
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug=yes
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 7477f4e79..bdea93c57 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-2.91.7.tar.bz2) = 24fbfd9d7f45a57df80cbc7ac8185672f0cdc9f259dc3680b0d35401fc906860
-SIZE (gnome3/gtk+-2.91.7.tar.bz2) = 16923801
+SHA256 (gnome3/gtk+-2.99.0.tar.bz2) = 304a9f4553b6e5de224053245d21b897ede9ef44a232de7f769e5116f40bd41a
+SIZE (gnome3/gtk+-2.99.0.tar.bz2) = 17208765
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
deleted file mode 100644
index 484e0dd9c..000000000
--- a/x11-toolkits/gtk30/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	2010-12-25 22:08:00.000000000 +0100
-+++ Makefile.in	2010-12-25 22:24:02.000000000 +0100
-@@ -415,7 +415,7 @@
- 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- 	&& DISPLAY=:$$XID && export DISPLAY
- 
--SRC_SUBDIRS = gdk gtk modules demos tests perf examples
-+SRC_SUBDIRS = gdk gtk modules demos perf examples
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- MAINTAINERCLEANFILES = \
-@@ -441,7 +441,7 @@
- 
- pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc $(patsubst \
--	%,gtk+-%-3.0.pc,@gdktarget@) $(am__append_1)
-+	%,gtk+-%-3.0.pc,@gdktarget@) $(patsubst %,gdk-%-3.0.pc,@gdktarget@) $(am__append_1)
- DISTCLEANFILES = \
- 	gtk+-unix-print-3.0.pc		\
- 	gtk+-3.0.pc			\
diff --git a/x11-toolkits/gtk30/files/patch-configure b/x11-toolkits/gtk30/files/patch-configure
index 84549a3ef..2c8b7725a 100644
--- a/x11-toolkits/gtk30/files/patch-configure
+++ b/x11-toolkits/gtk30/files/patch-configure
@@ -1,6 +1,69 @@
---- configure.orig	2010-12-25 21:43:58.000000000 +0100
-+++ configure	2010-12-25 21:51:36.000000000 +0100
-@@ -23978,9 +23978,9 @@
+--- 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 @@
         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`
@@ -12,28 +75,12 @@
         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
-@@ -24530,7 +24530,7 @@
- fi
- 
+@@ -27580,7 +27580,7 @@
  
--if test "x${enable_Bsymbolic}" == "xyes"; then
-+if test "x${enable_Bsymbolic}" = "xyes"; then
-   GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions
- fi
  
-@@ -25859,11 +25859,13 @@
+ # 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}
  
- gdk_windowing=''
- if expr "$gdktarget" : ".*x11.*" > /dev/null ; then
--  gdk_windowing+='
-+  gdk_windowing='
-+$gdk_windowing
- #define GDK_WINDOWING_X11'
- fi
- if expr "$gdktarget" : ".*win32.*" > /dev/null ; then
--  gdk_windowing+='
-+  gdk_windowing='
-+$gdk_windowing
- #define GDK_NATIVE_WINDOW_POINTER
- #define GDK_WINDOWING_WIN32'
- fi
+ echo "configuration:"
diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
new file mode 100644
index 000000000..16f9e6bd9
--- /dev/null
+++ b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
@@ -0,0 +1,13 @@
+--- docs/reference/gtk//Makefile.in.orig	2011-01-06 20:58:59.000000000 +0000
++++ docs/reference/gtk/Makefile.in	2011-01-06 20:59:14.000000000 +0000
+@@ -730,9 +730,7 @@
+ 
+ ########################################################################
+ man_MANS = \
+-	gtk-query-immodules-3.0.1	\
+-	gtk-update-icon-cache.1		\
+-	gtk-builder-convert.1
++	gtk-query-immodules-3.0.1
+ 
+ MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
+ all: all-am
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index c00f3a951..7439f0be4 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,18 +1,37 @@
---- gtk/Makefile.in.orig	2010-12-01 00:09:55.000000000 +0100
-+++ gtk/Makefile.in	2010-12-01 00:11:12.000000000 +0100
-@@ -1519,9 +1519,9 @@
- # gtk-update-icon-cache-3.0.exe doesn't require any special privileges.
- @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache-3.0.exe.manifest
+--- gtk/Makefile.in.orig	2011-01-06 19:51:02.000000000 +0000
++++ gtk/Makefile.in	2011-01-06 20:27:55.000000000 +0000
+@@ -79,8 +79,7 @@ DIST_COMMON = $(am__gtkunixprintinclude_
+ @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_14 = --add-include-path=$(top_builddir)/gdk/x11
+ @HAVE_INTROSPECTION_TRUE@am__append_15 = Gtk-3.0.gir
+ @HAVE_INTROSPECTION_TRUE@am__append_16 = $(gir_DATA) $(typelibs_DATA)
+-bin_PROGRAMS = gtk-query-immodules-3.0$(EXEEXT) \
+-	gtk-update-icon-cache$(EXEEXT)
++bin_PROGRAMS = gtk-query-immodules-3.0$(EXEEXT)
+ @OS_WIN32_TRUE@am__append_17 = \
+ @OS_WIN32_TRUE@	$(GTK_UPDATE_ICON_CACHE_MANIFEST)
+ 
+@@ -1422,7 +1421,7 @@ LDADDS = \
+ @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
+ @HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
+ @HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+-bin_SCRIPTS = gtk-builder-convert $(am__append_17)
++bin_SCRIPTS = $(am__append_17)
+ 
+ # Workaround for UAC silliness: programs with "update" in their name
+ # are believed to be installers and require elevated privileges to be
+@@ -1430,9 +1429,9 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+ # gtk-update-icon-cache.exe doesn't require any special privileges.
+ @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
  gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
 -gtk_query_immodules_3_0_LDADD = $(LDADDS)
 +gtk_query_immodules_3_0_LDADD = $(LDADDS) $(GLIB_LIBS)
  gtk_query_immodules_3_0_SOURCES = queryimmodules.c
--gtk_update_icon_cache_3_0_LDADD = $(GDK_PIXBUF_LIBS)
-+gtk_update_icon_cache_3_0_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
- gtk_update_icon_cache_3_0_SOURCES = updateiconcache.c
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
++gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
  STOCK_ICONS = \
  	stock-icons/16/document-open-recent.png		\
-@@ -1762,7 +1762,171 @@
+@@ -1673,7 +1672,171 @@ GENERATED_ICONS = \
  	stock-icons/24/folder-remote.png 		\
  	stock-icons/24/user-home.png 			\
  	stock-icons/24/user-desktop.png 		\
@@ -184,8 +203,8 @@
 +	stock-icons/24/gtk-zoom-out.png
  
  @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
- @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache-3.0
-@@ -2981,6 +3145,88 @@
+ @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
+@@ -2911,6 +3074,88 @@ stamp-icons: $(STOCK_ICONS)
  	   && $(LN_S) folder.png user-desktop.png 			\
  	   && $(RM) text-x-generic.png 					\
  	   && $(LN_S) document-x-generic.png text-x-generic.png 	\
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 0f11ef27c..bedd773ac 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,6 +1,4 @@
-bin/gtk-builder-convert-3.0
 bin/gtk-query-immodules-3.0
-bin/gtk-update-icon-cache-3.0
 bin/gtk3-demo
 etc/gtk-3.0/im-multipress.conf
 include/gail-3.0/gail/gailwidget.h
@@ -63,7 +61,6 @@ include/gtk-3.0/gtk/gtkcellareacontext.h
 include/gtk-3.0/gtk/gtk.h
 include/gtk-3.0/gtk/gtkaboutdialog.h
 include/gtk-3.0/gtk/gtkaccelgroup.h
-include/gtk-3.0/gtk/gtkaccelgroupprivate.h
 include/gtk-3.0/gtk/gtkaccellabel.h
 include/gtk-3.0/gtk/gtkaccelmap.h
 include/gtk-3.0/gtk/gtkaccessible.h
@@ -167,6 +164,7 @@ include/gtk-3.0/gtk/gtkmisc.h
 include/gtk-3.0/gtk/gtkmodules.h
 include/gtk-3.0/gtk/gtkmountoperation.h
 include/gtk-3.0/gtk/gtknotebook.h
+include/gtk-3.0/gtk/gtknumerableicon.h
 include/gtk-3.0/gtk/gtkoffscreenwindow.h
 include/gtk-3.0/gtk/gtkorientable.h
 include/gtk-3.0/gtk/gtkpagesetup.h
@@ -250,7 +248,6 @@ include/gtk-3.0/gtk/gtktreestore.h
 include/gtk-3.0/gtk/gtktreeview.h
 include/gtk-3.0/gtk/gtktreeviewcolumn.h
 include/gtk-3.0/gtk/gtktypebuiltins.h
-include/gtk-3.0/gtk/gtktypeutils.h
 include/gtk-3.0/gtk/gtkuimanager.h
 include/gtk-3.0/gtk/gtkvbbox.h
 include/gtk-3.0/gtk/gtkvbox.h