Update to 2.18.6.

8 files changed, 38 insertions, 32 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 6ffb67c9bd4a..aecd9d71ae2e 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.18.5
+PORTVERSION=	2.18.6
 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/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 89e3c1c38fec..a262f0562c67 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.18.5.tar.bz2) = 3047875309f7f6030e03b0a95cf99c8c
-SHA256 (gnome2/gtk+-2.18.5.tar.bz2) = 4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4
-SIZE (gnome2/gtk+-2.18.5.tar.bz2) = 18126480
+MD5 (gnome2/gtk+-2.18.6.tar.bz2) = 3b32073cf1fad755f7c2b2db71aebe90
+SHA256 (gnome2/gtk+-2.18.6.tar.bz2) = 5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d
+SIZE (gnome2/gtk+-2.18.6.tar.bz2) = 18137401
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index 416fbb3f007e..4d2c63f0d2e2 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	2009-09-05 11:12:17.000000000 +0200
-+++ docs/Makefile.in	2009-09-05 11:16:52.000000000 +0200
-@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@
+--- docs/Makefile.in.orig	2010-01-18 01:13:15.000000000 -0500
++++ docs/Makefile.in	2010-01-18 01:14:29.000000000 -0500
+@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@
  LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
  LT_VERSION_INFO = @LT_VERSION_INFO@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
+ MATH_LIB = @MATH_LIB@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 8037cf952ad2..348bb57b8fdb 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,14 +1,17 @@
---- gtk/Makefile.in.orig	2009-09-05 11:21:40.000000000 +0200
-+++ gtk/Makefile.in	2009-09-05 11:22:57.000000000 +0200
-@@ -1310,9 +1310,9 @@ LDADDS = \
- 
- bin_SCRIPTS = gtk-builder-convert
+--- gtk/Makefile.in.orig	2010-01-18 01:17:13.000000000 -0500
++++ gtk/Makefile.in	2010-01-18 01:18:40.000000000 -0500
+@@ -1324,11 +1324,12 @@ 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_2_0_DEPENDENCIES = $(DEPS)
 -gtk_query_immodules_2_0_LDADD = $(LDADDS)
 +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
  gtk_query_immodules_2_0_SOURCES = queryimmodules.c
--gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+ gtk_update_icon_cache_LDADD = \
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+-	$(GDK_PIXBUF_DEP_LIBS)
++	$(GDK_PIXBUF_DEP_LIBS) \
++	$(GLIB_LIBS)
+ 
  gtk_update_icon_cache_SOURCES = \
  	updateiconcache.c 
- 
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 6ffb67c9bd4a..aecd9d71ae2e 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.18.5
+PORTVERSION=	2.18.6
 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 89e3c1c38fec..a262f0562c67 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.18.5.tar.bz2) = 3047875309f7f6030e03b0a95cf99c8c
-SHA256 (gnome2/gtk+-2.18.5.tar.bz2) = 4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4
-SIZE (gnome2/gtk+-2.18.5.tar.bz2) = 18126480
+MD5 (gnome2/gtk+-2.18.6.tar.bz2) = 3b32073cf1fad755f7c2b2db71aebe90
+SHA256 (gnome2/gtk+-2.18.6.tar.bz2) = 5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d
+SIZE (gnome2/gtk+-2.18.6.tar.bz2) = 18137401
diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah
index 416fbb3f007e..4d2c63f0d2e2 100644
--- a/x11-toolkits/gtk30/files/patch-ah
+++ b/x11-toolkits/gtk30/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	2009-09-05 11:12:17.000000000 +0200
-+++ docs/Makefile.in	2009-09-05 11:16:52.000000000 +0200
-@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@
+--- docs/Makefile.in.orig	2010-01-18 01:13:15.000000000 -0500
++++ docs/Makefile.in	2010-01-18 01:14:29.000000000 -0500
+@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@
  LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
  LT_VERSION_INFO = @LT_VERSION_INFO@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
+ MATH_LIB = @MATH_LIB@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 8037cf952ad2..348bb57b8fdb 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,14 +1,17 @@
---- gtk/Makefile.in.orig	2009-09-05 11:21:40.000000000 +0200
-+++ gtk/Makefile.in	2009-09-05 11:22:57.000000000 +0200
-@@ -1310,9 +1310,9 @@ LDADDS = \
- 
- bin_SCRIPTS = gtk-builder-convert
+--- gtk/Makefile.in.orig	2010-01-18 01:17:13.000000000 -0500
++++ gtk/Makefile.in	2010-01-18 01:18:40.000000000 -0500
+@@ -1324,11 +1324,12 @@ 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_2_0_DEPENDENCIES = $(DEPS)
 -gtk_query_immodules_2_0_LDADD = $(LDADDS)
 +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
  gtk_query_immodules_2_0_SOURCES = queryimmodules.c
--gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+ gtk_update_icon_cache_LDADD = \
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+-	$(GDK_PIXBUF_DEP_LIBS)
++	$(GDK_PIXBUF_DEP_LIBS) \
++	$(GLIB_LIBS)
+ 
  gtk_update_icon_cache_SOURCES = \
  	updateiconcache.c 
-