Update to 2.91.7.

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

7 files changed, 117 insertions, 62 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 332f151aa..c65e176ff 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.12 2010/12/04 18:13:59 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.13 2010/12/16 18:08:30 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.91.6
+PORTVERSION=	2.91.7
 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 b31ae8d71..7477f4e79 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-2.91.6.tar.bz2) = 57b0d8dc6e3d43967f19edb9f3706608260b6122a7d3eef66a28025400fa0af7
-SIZE (gnome3/gtk+-2.91.6.tar.bz2) = 16795155
+SHA256 (gnome3/gtk+-2.91.7.tar.bz2) = 24fbfd9d7f45a57df80cbc7ac8185672f0cdc9f259dc3680b0d35401fc906860
+SIZE (gnome3/gtk+-2.91.7.tar.bz2) = 16923801
diff --git a/x11-toolkits/gtk30/files/patch-Makefile.in b/x11-toolkits/gtk30/files/patch-Makefile.in
index c5e567012..484e0dd9c 100644
--- a/x11-toolkits/gtk30/files/patch-Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2010-12-01 00:07:00.000000000 +0100
-+++ Makefile.in	2010-12-01 00:07:21.000000000 +0100
-@@ -416,7 +416,7 @@
+--- 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
  
@@ -9,3 +9,12 @@
  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 06a6f7b9f..84549a3ef 100644
--- a/x11-toolkits/gtk30/files/patch-configure
+++ b/x11-toolkits/gtk30/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2009-12-26 21:41:27.000000000 +0100
-+++ configure	2009-12-26 21:51:04.000000000 +0100
-@@ -33884,9 +33884,9 @@
+--- configure.orig	2010-12-25 21:43:58.000000000 +0100
++++ configure	2010-12-25 21:51:36.000000000 +0100
+@@ -23978,9 +23978,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,3 +12,28 @@
         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
+ 
+ 
+-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 @@
+ 
+ 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
diff --git a/x11-toolkits/gtk30/files/patch-docs_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_Makefile.in
index b6a6a7172..cc9e4c46a 100644
--- a/x11-toolkits/gtk30/files/patch-docs_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-docs_Makefile.in
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	2009-12-25 20:26:59.000000000 +0100
-+++ docs/Makefile.in	2009-12-25 20:27:35.000000000 +0100
-@@ -241,7 +241,7 @@
+--- docs/Makefile.in.orig	2010-12-24 00:14:51.000000000 +0100
++++ docs/Makefile.in	2010-12-24 00:15:52.000000000 +0100
+@@ -220,7 +220,7 @@
  LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
  LT_VERSION_INFO = @LT_VERSION_INFO@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
+ MANIFEST_TOOL = @MANIFEST_TOOL@
  MATH_LIB = @MATH_LIB@
  MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/x11-toolkits/gtk30/files/patch-gdk_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk_Makefile.in
index f91f26441..cc9daac87 100644
--- a/x11-toolkits/gtk30/files/patch-gdk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gdk_Makefile.in
@@ -1,11 +1,11 @@
---- gdk/Makefile.in.orig	2010-12-01 00:07:46.000000000 +0100
-+++ gdk/Makefile.in	2010-12-01 00:08:24.000000000 +0100
-@@ -698,7 +698,7 @@
+--- gdk/Makefile.in.orig	2010-12-24 00:25:23.000000000 +0100
++++ gdk/Makefile.in	2010-12-24 00:27:00.000000000 +0100
+@@ -562,7 +562,7 @@
  #
- # Rule to install gdkconfig.h header file
+ # setup GDK sources and their dependencies
  #
--configexecincludedir = $(libdir)/gtk-3.0/include
-+configexecincludedir = $(prefix)/include/gtk-3.0
- 
- #note: not gdkconfig.h
- BUILT_SOURCES = \
+-gdkincludedir = $(includedir)/gtk-3.0/gdk
++gdkincludedir = $(prefix)/include/gtk-3.0
+ gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
+ common_sources = \
+ 	$(gdk_private_headers)	\
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 1350e3635..caa001b1a 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -7,39 +7,59 @@ include/gail-3.0/gail/gailwidget.h
 include/gail-3.0/libgail-util/gail-util.h
 include/gail-3.0/libgail-util/gailmisc.h
 include/gail-3.0/libgail-util/gailtextutil.h
-include/gtk-3.0/gdk/gdk.h
-include/gtk-3.0/gdk/gdkapplaunchcontext.h
-include/gtk-3.0/gdk/gdkcairo.h
-include/gtk-3.0/gdk/gdkcolor.h
-include/gtk-3.0/gdk/gdkcursor.h
-include/gtk-3.0/gdk/gdkdevice.h
-include/gtk-3.0/gdk/gdkdevicemanager.h
-include/gtk-3.0/gdk/gdkdisplay.h
-include/gtk-3.0/gdk/gdkdisplaymanager.h
-include/gtk-3.0/gdk/gdkdnd.h
-include/gtk-3.0/gdk/gdkenumtypes.h
-include/gtk-3.0/gdk/gdkevents.h
-include/gtk-3.0/gdk/gdkinput.h
-include/gtk-3.0/gdk/gdkkeys.h
-include/gtk-3.0/gdk/gdkkeysyms-compat.h
-include/gtk-3.0/gdk/gdkkeysyms.h
-include/gtk-3.0/gdk/gdkmain.h
-include/gtk-3.0/gdk/gdkpango.h
-include/gtk-3.0/gdk/gdkpixbuf.h
-include/gtk-3.0/gdk/gdkprivate.h
-include/gtk-3.0/gdk/gdkproperty.h
-include/gtk-3.0/gdk/gdkrectangle.h
-include/gtk-3.0/gdk/gdkrgba.h
-include/gtk-3.0/gdk/gdkscreen.h
-include/gtk-3.0/gdk/gdkselection.h
-include/gtk-3.0/gdk/gdkspawn.h
-include/gtk-3.0/gdk/gdktestutils.h
-include/gtk-3.0/gdk/gdkthreads.h
-include/gtk-3.0/gdk/gdktypes.h
-include/gtk-3.0/gdk/gdkvisual.h
-include/gtk-3.0/gdk/gdkwindow.h
+include/gtk-3.0/gdk.h
 include/gtk-3.0/gdk/gdkx.h
+include/gtk-3.0/gdk/x11/gdkx11applaunchcontext.h
+include/gtk-3.0/gdk/x11/gdkx11cursor.h
+include/gtk-3.0/gdk/x11/gdkx11device-core.h
+include/gtk-3.0/gdk/x11/gdkx11device-xi.h
+include/gtk-3.0/gdk/x11/gdkx11device-xi2.h
+include/gtk-3.0/gdk/x11/gdkx11devicemanager-core.h
+include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi.h
+include/gtk-3.0/gdk/x11/gdkx11devicemanager-xi2.h
+include/gtk-3.0/gdk/x11/gdkx11display.h
+include/gtk-3.0/gdk/x11/gdkx11displaymanager.h
+include/gtk-3.0/gdk/x11/gdkx11dnd.h
+include/gtk-3.0/gdk/x11/gdkx11keys.h
+include/gtk-3.0/gdk/x11/gdkx11property.h
+include/gtk-3.0/gdk/x11/gdkx11screen.h
+include/gtk-3.0/gdk/x11/gdkx11selection.h
+include/gtk-3.0/gdk/x11/gdkx11utils.h
+include/gtk-3.0/gdk/x11/gdkx11visual.h
+include/gtk-3.0/gdk/x11/gdkx11window.h
+include/gtk-3.0/gdkapplaunchcontext.h
+include/gtk-3.0/gdkcairo.h
+include/gtk-3.0/gdkcolor.h
 include/gtk-3.0/gdkconfig.h
+include/gtk-3.0/gdkcursor.h
+include/gtk-3.0/gdkdevice.h
+include/gtk-3.0/gdkdevicemanager.h
+include/gtk-3.0/gdkdisplay.h
+include/gtk-3.0/gdkdisplaymanager.h
+include/gtk-3.0/gdkdnd.h
+include/gtk-3.0/gdkenumtypes.h
+include/gtk-3.0/gdkevents.h
+include/gtk-3.0/gdkkeys.h
+include/gtk-3.0/gdkkeysyms-compat.h
+include/gtk-3.0/gdkkeysyms.h
+include/gtk-3.0/gdkmain.h
+include/gtk-3.0/gdkpango.h
+include/gtk-3.0/gdkpixbuf.h
+include/gtk-3.0/gdkprivate.h
+include/gtk-3.0/gdkproperty.h
+include/gtk-3.0/gdkrectangle.h
+include/gtk-3.0/gdkrgba.h
+include/gtk-3.0/gdkscreen.h
+include/gtk-3.0/gdkselection.h
+include/gtk-3.0/gdktestutils.h
+include/gtk-3.0/gdkthreads.h
+include/gtk-3.0/gdktypes.h
+include/gtk-3.0/gdkvisual.h
+include/gtk-3.0/gdkwindow.h
+include/gtk-3.0/gtk/gtkcellarea.h
+include/gtk-3.0/gtk/gtkcellareabox.h
+include/gtk-3.0/gtk/gtkcellareaboxcontext.h
+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
@@ -309,14 +329,14 @@ lib/libgailutil-3.0.a
 lib/libgailutil-3.0.la
 lib/libgailutil-3.0.so
 lib/libgailutil-3.0.so.0
-lib/libgdk-x11-3.0.a
-lib/libgdk-x11-3.0.la
-lib/libgdk-x11-3.0.so
-lib/libgdk-x11-3.0.so.0
-lib/libgtk-x11-3.0.a
-lib/libgtk-x11-3.0.la
-lib/libgtk-x11-3.0.so
-lib/libgtk-x11-3.0.so.0
+lib/libgdk-3.0.a
+lib/libgdk-3.0.la
+lib/libgdk-3.0.so
+lib/libgdk-3.0.so.0
+lib/libgtk-3.0.a
+lib/libgtk-3.0.la
+lib/libgtk-3.0.so
+lib/libgtk-3.0.so.0
 libdata/pkgconfig/gail-3.0.pc
 libdata/pkgconfig/gdk-3.0.pc
 libdata/pkgconfig/gdk-x11-3.0.pc
@@ -609,6 +629,7 @@ share/themes/Raleigh/gtk-3.0/gtkrc
 @dirrm include/gtk-3.0/unix-print/gtk
 @dirrm include/gtk-3.0/unix-print
 @dirrm include/gtk-3.0/gtk
+@dirrm include/gtk-3.0/gdk/x11
 @dirrm include/gtk-3.0/gdk
 @dirrm include/gtk-3.0
 @dirrm include/gail-3.0/libgail-util