Update to 2.4.22.

USE_GNOME=gnomehack ->USES=pathfix.
Stageify, use new LIB_DEPEND syntax, switch to libtool less ltverhack.
Merge new gtk-query-immodules handling from gtk30 ports in our dev repo [1]

Obtained from:	FreeBSD gnome dev repo [1]

7 files changed, 32 insertions, 73 deletions

diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index 46fafdd8c102..abe8d458db0b 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/trunk/graphics/gtk-update-icon-cache/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gtk-update-icon-cache
-PORTVERSION=	2.24.19
+PORTVERSION=	2.24.22
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,17 +16,16 @@ COMMENT=	Gtk-update-icon-cache utility from the Gtk+ toolkit
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_XZ=		yes
-USES=		gettext gmake perl5 pkgconfig
+USES=		gettext gmake pathfix perl5 pkgconfig
 USE_PERL5=	build
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack atk pango gdkpixbuf2 ltverhack
+GNU_CONFIGURE=	yes
+USE_GNOME=	atk pango gdkpixbuf2 introspection:build ltverhack
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 PATCHDIR=	${.CURDIR}/../../x11-toolkits/gtk20/files
@@ -35,11 +34,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 BUILD_WRKSRC=	${WRKSRC}/gtk
 ALL_TARGET=	${PORTNAME}
-PLIST_FILES=	bin/gtk-update-icon-cache
+PLIST_FILES=	bin/gtk-update-icon-cache \
+		man/man1/gtk-update-icon-cache.1.gz
 
-MAN1=		gtk-update-icon-cache.1
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 pre-configure:
@@ -50,8 +47,8 @@ pre-configure:
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/gtk/gtk-update-icon-cache \
-		${PREFIX}/bin/
+		${STAGEDIR}${PREFIX}/bin/
 	@${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-update-icon-cache.1 \
-		${PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/man/man1/
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gtk-update-icon-cache/distinfo b/graphics/gtk-update-icon-cache/distinfo
index 23f6e7574191..ea20cc67e411 100644
--- a/graphics/gtk-update-icon-cache/distinfo
+++ b/graphics/gtk-update-icon-cache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtk+-2.24.19.tar.xz) = 15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8
-SIZE (gnome2/gtk+-2.24.19.tar.xz) = 13374160
+SHA256 (gnome2/gtk+-2.24.22.tar.xz) = b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f
+SIZE (gnome2/gtk+-2.24.22.tar.xz) = 13376344
diff --git a/x11-toolkits/gtk20-reference/Makefile b/x11-toolkits/gtk20-reference/Makefile
index 9f0e925101c9..078942927dd4 100644
--- a/x11-toolkits/gtk20-reference/Makefile
+++ b/x11-toolkits/gtk20-reference/Makefile
@@ -1,7 +1,7 @@
 # Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 
 BOOKS=		gdk gtk
 
@@ -14,7 +14,7 @@ do-install:
 	fi
 .endfor
 
-# overwrite this from bsd.port.mk, because we not don't honow DOCSDIR
+# overwrite this from bsd.port.mk, because we not don't honor DOCSDIR
 add-plist-docs:
 	@${DO_NADA}
 
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 7bcf9e5a97a8..5188f448e6f4 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,8 +3,8 @@
 #   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.237 2013/03/04 17:44:38 kwm Exp $
 
 PORTNAME=	gtk
-PORTVERSION=	2.24.19
-PORTREVISION?=	2
+PORTVERSION=	2.24.22
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,33 +23,29 @@ PORTSCOUT=	limitw:0,even
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		python:${PORTSDIR}/lang/python
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-USES=		gettext gmake pkgconfig perl5
+GNU_CONFIGURE=	yes
+USE_GNOME=	atk pango gdkpixbuf2 introspection:build ltverhack \
+		gtk-update-icon-cache
+USES=		gettext gmake pathfix pkgconfig perl5
 USE_PERL5=	build
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
-CONFIGURE_ARGS=	--enable-static --with-xinput=yes
-CPPFLAGS+=	-I${LOCALBASE}/include/freetype2 \
-		-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--with-xinput=yes
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		gtk-query-immodules-2.0.1
-
 OPTIONS_DEFINE=	CUPS DEBUG
 OPTIONS_DEFAULT=CUPS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=--enable-cups=auto
 PLIST_SUB+=	CUPS:=""
 .else
@@ -80,14 +76,12 @@ pre-build:
 	@${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 post-install:
-	-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
-		${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
-	@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
-	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
-	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders
-	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/modules
-	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \
-		${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/modules
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/modules
+	${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-2.0.1 \
+		${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
 
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 23f6e7574191..ea20cc67e411 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtk+-2.24.19.tar.xz) = 15b8bf463eba99abfa58270662914e8e9b83568ab4945b5f0ef1aa29e90becb8
-SIZE (gnome2/gtk+-2.24.19.tar.xz) = 13374160
+SHA256 (gnome2/gtk+-2.24.22.tar.xz) = b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f
+SIZE (gnome2/gtk+-2.24.22.tar.xz) = 13376344
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
deleted file mode 100644
index c687dec4009b..000000000000
--- a/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
-+++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
-@@ -29,7 +29,9 @@
- #ifndef __GTK_SIGNAL_H__
- #define __GTK_SIGNAL_H__
- 
--#include <gtk/gtk.h>
-+#include <gtk/gtkenums.h>
-+#include <gtk/gtktypeutils.h>
-+#include <gtk/gtkobject.h>
- #include <gtk/gtkmarshal.h>
- 
- G_BEGIN_DECLS
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 61b5c73f8dce..7d9a2d0a4923 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,7 +1,6 @@
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
-etc/gtk-2.0/gtk.immodules
 etc/gtk-2.0/im-multipress.conf
 include/gail-1.0/gail/gailwidget.h
 include/gail-1.0/libgail-util/gail-util.h
@@ -265,66 +264,46 @@ include/gtk-unix-print-2.0/gtk/gtkunixprint.h
 lib/girepository-1.0/Gdk-2.0.typelib
 lib/girepository-1.0/GdkX11-2.0.typelib
 lib/girepository-1.0/Gtk-2.0.typelib
-lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.a
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libpixmap.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-am-et.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cedilla.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ipa.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-multipress.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-thai.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-er.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-ti-et.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-viqr.so
-lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.a
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.la
 lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-xim.so
-%%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.a
 %%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.la
 %%CUPS:%%lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.a
 lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.la
 lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-file.so
-lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.a
 lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.la
 lib/gtk-2.0/%%GTK2_VERSION%%/printbackends/libprintbackend-lpr.so
-lib/gtk-2.0/modules/libferret.a
 lib/gtk-2.0/modules/libferret.la
 lib/gtk-2.0/modules/libferret.so
-lib/gtk-2.0/modules/libgail.a
 lib/gtk-2.0/modules/libgail.la
 lib/gtk-2.0/modules/libgail.so
-lib/libgailutil.a
 lib/libgailutil.la
 lib/libgailutil.so
 lib/libgailutil.so.18
-lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
 lib/libgdk-x11-2.0.so.0
-lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.0
@@ -334,6 +313,7 @@ libdata/pkgconfig/gdk-x11-2.0.pc
 libdata/pkgconfig/gtk+-2.0.pc
 libdata/pkgconfig/gtk+-unix-print-2.0.pc
 libdata/pkgconfig/gtk+-x11-2.0.pc
+man/man1/gtk-query-immodules-2.0.1.gz
 share/aclocal/gtk-2.0.m4
 share/gir-1.0/Gdk-2.0.gir
 share/gir-1.0/GdkX11-2.0.gir
@@ -636,7 +616,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines
 @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%
 @dirrmtry lib/gtk-2.0
-@exec %D/bin/gtk-query-immodules-2.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -f %D/lib/gtk-2.0/%%GTK2_VERSION%%/immodules.cache
+@exec %D/bin/gtk-query-immodules-2.0 --update-cache > /dev/null 2>&1 || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yi/LC_MESSAGES