Update to 3.8.8.

Stagify, sort USES, use new lib_depend syntax.
Use USE_GNOME introspection now that it doesn't break the build.
Switch to to libtool less ltverhack.
Use new gtk-query-immodules --update-cache functionality.

Obtained from:	GNOME devel repo (based on)

3 files changed, 33 insertions, 43 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index ab40146b70c5..c6ea24bc0b6b 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,8 +3,8 @@
 #   $MCom: ports/trunk/x11-toolkits/gtk30/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	gtk
-PORTVERSION=	3.8.2
-PORTREVISION?=	1
+PORTVERSION=	3.8.8
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,42 +19,41 @@ LICENSE=	LGPL20
 
 USE_XZ=		yes
 
-.if !defined(REFERENCE_PORT)
+.if defined(REFERENCE_PORT)
+PORTSCOUT=	ignore:1
+.else
+PORTSCOUT=	limit:1,even
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
-BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
 
-MAKE_JOBS_UNSAFE=	yes
-USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-#		introspection:build
-USES=		gettext gmake pathfix pkgconfig perl5
 USE_PERL5=	build
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache \
+		introspection:build
+USES=		gettext gmake pathfix perl5 pkgconfig
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-gtk2-dependency --disable-packagekit
 CPPFLAGS+=	-I${LOCALBASE}/include -fno-omit-frame-pointer
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	INTROSPECTION_GIRDIR=`pkg-config --variable=girdir gobject-introspection-1.0`
+ltverhack_PATCH_FILES=build-aux/ltmain.sh
 
 GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 		org.gtk.Settings.ColorChooser.gschema.xml \
 		org.gtk.Settings.FileChooser.gschema.xml
 
-MAN1=		gtk-query-immodules-3.0.1
-
 OPTIONS_DEFINE=	CUPS COLORD DEBUG
 OPTIONS_DEFAULT=CUPS COLORD
 COLORD_DESC=	Color profile support
 
-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
@@ -67,7 +66,7 @@ CONFIGURE_ARGS+=	--enable-debug=yes
 .endif
 
 .if ${PORT_OPTIONS:MCOLORD}
-LIB_DEPENDS+=	colord:${PORTSDIR}/graphics/colord
+LIB_DEPENDS+=	libcolord.so:${PORTSDIR}/graphics/colord
 CONFIGURE_ARGS+=--enable-colord
 .else
 CONFIGURE_ARGS+=--disable-colord
@@ -92,13 +91,16 @@ 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-3.0/modules
-	@${MKDIR} ${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/engines
-	@${MKDIR} ${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders
-	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \
-		${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/engines
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders
+	${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-3.0.1 \
+		${STAGEDIR}${PREFIX}/man/man1
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdk-3.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgtk-3.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgailutil-3.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/3.0.0/immodules/im*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-*.so
 
 .include <bsd.port.mk>
 
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 6a26d1e5f036..8062edd58442 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-3.8.2.tar.xz) = 1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297
-SIZE (gnome3/gtk+-3.8.2.tar.xz) = 13701516
+SHA256 (gnome3/gtk+-3.8.8.tar.xz) = d9299ab06e1e3feb19d16fc217de441ded0280eda433b718d9705024f7de19a6
+SIZE (gnome3/gtk+-3.8.8.tar.xz) = 13851660
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index a886b2828628..db0704c3bc48 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -337,58 +337,40 @@ include/gtk-3.0/unix-print/gtk/gtkunixprint.h
 lib/girepository-1.0/Gdk-3.0.typelib
 lib/girepository-1.0/GdkX11-3.0.typelib
 lib/girepository-1.0/Gtk-3.0.typelib
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-am-et.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cedilla.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-cyrillic-translit.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-inuktitut.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ipa.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-multipress.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-thai.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-er.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-ti-et.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-viqr.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.a
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.la
 lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-xim.so
-lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
-%%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.a
 %%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.la
 %%CUPS%%lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-cups.so
-lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.a
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.la
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-file.so
-lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.a
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.la
 lib/gtk-3.0/%%GTK3_VERSION%%/printbackends/libprintbackend-lpr.so
-lib/libgailutil-3.a
 lib/libgailutil-3.la
 lib/libgailutil-3.so
 lib/libgailutil-3.so.0
-lib/libgdk-3.a
 lib/libgdk-3.la
 lib/libgdk-3.so
 lib/libgdk-3.so.0
-lib/libgtk-3.a
 lib/libgtk-3.la
 lib/libgtk-3.so
 lib/libgtk-3.so.0
@@ -398,6 +380,7 @@ libdata/pkgconfig/gdk-x11-3.0.pc
 libdata/pkgconfig/gtk+-3.0.pc
 libdata/pkgconfig/gtk+-unix-print-3.0.pc
 libdata/pkgconfig/gtk+-x11-3.0.pc
+man/man1/gtk-query-immodules-3.0.1.gz
 share/aclocal/gtk-3.0.m4
 share/gir-1.0/Gdk-3.0.gir
 share/gir-1.0/GdkX11-3.0.gir
@@ -477,6 +460,8 @@ share/locale/fr/LC_MESSAGES/gtk30-properties.mo
 share/locale/fr/LC_MESSAGES/gtk30.mo
 share/locale/ga/LC_MESSAGES/gtk30-properties.mo
 share/locale/ga/LC_MESSAGES/gtk30.mo
+share/locale/gd/LC_MESSAGES/gtk30-properties.mo
+share/locale/gd/LC_MESSAGES/gtk30.mo
 share/locale/gl/LC_MESSAGES/gtk30-properties.mo
 share/locale/gl/LC_MESSAGES/gtk30.mo
 share/locale/gu/LC_MESSAGES/gtk30-properties.mo
@@ -694,6 +679,8 @@ share/themes/Emacs/gtk-3.0/gtk-keys.css
 @dirrmtry share/locale/ia
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/gd/LC_MESSAGES
+@dirrmtry share/locale/gd
 @dirrmtry share/locale/en@shaw/LC_MESSAGES
 @dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
@@ -727,7 +714,8 @@ share/themes/Emacs/gtk-3.0/gtk-keys.css
 @dirrm lib/gtk-3.0/%%GTK3_VERSION%%/engines
 @dirrm lib/gtk-3.0/%%GTK3_VERSION%%
 @dirrm lib/gtk-3.0
-@exec %D/bin/gtk-query-immodules-3.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache 2>/dev/null || /usr/bin/true
+@exec %D/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true
+@unexec /bin/rm -f %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
 @dirrm include/gtk-3.0/unix-print/gtk
 @dirrm include/gtk-3.0/unix-print
 @dirrm include/gtk-3.0/gtk/deprecated