Update gtk2 to 2.24.28

Rename gtk-update-icon-cache to gtk2-update-icon-cache to avoid
conflict with gtk3.

Overview of Changes from GTK+ 2.24.27 to 2.24.28
================================================

* Bug fixes:
 693738 gtk print dialog shows "Getting printer information failed"...
 746064 "sticky" window state reported wrongly on X11
 746269 Segfault in gtk_tree_view_move_cursor_page_up_down
 748014 W32: Tilting mousewheel left/right does not scroll horizontally

4 files changed, 15 insertions, 73 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 68adb9b4661..6781997e724 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.269 2015/06/12 10:52:17 wiz Exp $
+# $NetBSD: Makefile,v 1.270 2015/06/14 21:46:34 prlw1 Exp $
 
-DISTNAME=	gtk+-2.24.27
+DISTNAME=	gtk+-2.24.28
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
 EXTRACT_SUFX=	.tar.xz
-PKGREVISION=	3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gtk.org/
@@ -76,6 +75,12 @@ CPPFLAGS+=		-DPREFIX="\"${PREFIX}\""
 #SUBST_SED.pthread=	-e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
 #SUBST_FILES.pthread=	gdk-pixbuf/Makefile.in
 
+SUBST_CLASSES+=			iconcache
+SUBST_STAGE.iconcache=		pre-configure
+SUBST_MESSAGE.iconcache=	Renaming gtk-icon-cache-update.
+SUBST_SED.iconcache=		-e 's,gtk-update-icon-cache,gtk2-update-icon-cache,g'
+SUBST_FILES.iconcache=		gtk/Makefile.in
+
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 2.24.22
 REPLACE_PYTHON=	gtk/gtk-builder-convert
 
@@ -86,7 +91,7 @@ post-install:
 	${RM} -f ${DESTDIR}${GTK_IMMODULES_DB}
 
 EVAL_PREFIX+=		PREFIX.hicolor=hicolor-icon-theme
-FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk-update-icon-cache"
+FILES_SUBST+=		GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk2-update-icon-cache"
 FILES_SUBST+=		ICON_THEME_DIR="${PREFIX.hicolor}/share/icons/hicolor"
 INSTALL_TEMPLATES+=	../../x11/gtk2/files/icon-cache.tmpl
 PRINT_PLIST_AWK+=	/^share\/icons\/hicolor\/icon-theme.cache$$/ { next; }
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index c7be9d0e714..9105bf3d02c 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.86 2015/03/14 00:39:14 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.87 2015/06/14 21:46:34 prlw1 Exp $
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
-bin/gtk-update-icon-cache
+bin/gtk2-update-icon-cache
 include/gail-1.0/gail/gailwidget.h
 include/gail-1.0/libgail-util/gail-util.h
 include/gail-1.0/libgail-util/gailmisc.h
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 050c7eaa035..96512204a34 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.155 2015/06/11 15:35:01 ryoon Exp $
+$NetBSD: distinfo,v 1.156 2015/06/14 21:46:34 prlw1 Exp $
 
-SHA1 (gtk+-2.24.27.tar.xz) = dae8cbb37f318c9e7a299d4a8dfccaf13edd8e27
-RMD160 (gtk+-2.24.27.tar.xz) = 01f8917cd0dbc429c9295809209c64fe8ce38c48
-Size (gtk+-2.24.27.tar.xz) = 13349252 bytes
+SHA1 (gtk+-2.24.28.tar.xz) = f3c2f1a3728ed51d08054f6b4c7384fbf99477c0
+RMD160 (gtk+-2.24.28.tar.xz) = 6157ba437c3ea873cc28d38c8184be94fc253838
+Size (gtk+-2.24.28.tar.xz) = 13354884 bytes
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
-SHA1 (patch-demos_gtk-demo_geninclude.pl.in) = a15f5d7432d29c78462e6c27ea3f56db63b7ade3
 SHA1 (patch-gdk_x11_gdkwindow-x11.c) = 08c05b31da38e16727a2941cdec4c855f2fc7d77
 SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780
diff --git a/x11/gtk2/patches/patch-demos_gtk-demo_geninclude.pl.in b/x11/gtk2/patches/patch-demos_gtk-demo_geninclude.pl.in
deleted file mode 100644
index fba993c0158..00000000000
--- a/x11/gtk2/patches/patch-demos_gtk-demo_geninclude.pl.in
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-demos_gtk-demo_geninclude.pl.in,v 1.1 2015/06/11 15:35:01 ryoon Exp $
-
-Avoid
-Can't use 'defined(@array)' (Maybe you should just omit the defined()?)
-errors.
-
---- demos/gtk-demo/geninclude.pl.in.orig	2014-09-29 20:02:16.000000000 +0000
-+++ demos/gtk-demo/geninclude.pl.in
-@@ -40,7 +40,7 @@ foreach $href (@demos) {
- 	my $do_next = 0;
- 
- 	# parent detected
--	if (defined @parents) {
-+	if (@parents) {
- 	    foreach $foo (@parents) {
- 		if ($foo eq $parent_name) {
- 		    $do_next = 1;
-@@ -54,7 +54,7 @@ foreach $href (@demos) {
- 
- 	push @parents, $parent_name;
- 
--	$tmp = (defined @child_arrays)?($#child_arrays + 1):0;
-+	$tmp = (@child_arrays)?($#child_arrays + 1):0;
- 	push @child_arrays, "child$tmp";
- 
- 	push @demos, {"title" => $parent_name, "file" => "NULL",
-@@ -62,7 +62,7 @@ foreach $href (@demos) {
-     }
- }
- 
--if (defined @parents) {
-+if (@parents) {
-     $i = 0;
-     for ($i = 0; $i <= $#parents; $i++) {
- 	$first = 1;
-@@ -73,7 +73,7 @@ if (defined @parents) {
- 	for ($j = 0; $j <= $#demos; $j++) {
- 	    $href = $demos[$j];
- 	    
--	    if (!defined $demos[$j]) {
-+	    if (!$demos[$j]) {
- 		next;
- 	    }
- 	    
-@@ -105,7 +105,7 @@ if (defined @parents) {
- } @demos_old;
- 
- # sort the child arrays
--if (defined @child_arrays) {
-+if (@child_arrays) {
-     for ($i = 0; $i <= $#child_arrays; $i++) {
- 	@foo_old = @{$child_arrays[$i]};
- 
-@@ -133,7 +133,7 @@ foreach $href (@demos) {
- 	print ", \n";
-     }
- 
--    if (defined @parents) {
-+    if (@parents) {
- 	for ($i = 0; $i <= $#parents; $i++) {
- 	    if ($parents[$i] eq $href->{title}) {
-