-update to 2.22.1

 changes:
 -Make GdkPixbuf implement the GIcon interface
 -Translation updates
-copy module registry handling from x11/gtk2 to here
-prepare for building jasper support as pkg
-add bl3 file

8 files changed, 119 insertions, 24 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index eec9b4b3b70..3534685ce3a 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/11/02 15:17:29 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/14 20:11:41 drochner Exp $
 #
 
-DISTNAME=	gdk-pixbuf-2.22.0
-PKGNAME=	gdk-pixbuf2-2.22.0
+DISTNAME=	gdk-pixbuf-2.22.1
+PKGNAME=	gdk-pixbuf2-2.22.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.22/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,6 +23,15 @@ USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gdk-pixbuf-2.0.pc.in
 
+_BUILDING_GTK2= yes
+.include "loaders.mk"
+
+# We remove the loader database during post-install since we create it
+# anew in the +INSTALL script as part of the POST-INSTALL action.
+#
+post-install:
+	${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}
+
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/gdk-pixbuf2/PLIST b/graphics/gdk-pixbuf2/PLIST
index f95f399d1a7..c8910614575 100644
--- a/graphics/gdk-pixbuf2/PLIST
+++ b/graphics/gdk-pixbuf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/02 15:17:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/11/14 20:11:41 drochner Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -160,6 +160,7 @@ share/locale/th/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/tk/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/tr/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/tt/LC_MESSAGES/gdk-pixbuf.mo
+share/locale/ug/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/uk/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/uz/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/uz@cyrillic/LC_MESSAGES/gdk-pixbuf.mo
diff --git a/graphics/gdk-pixbuf2/buildlink3.mk b/graphics/gdk-pixbuf2/buildlink3.mk
new file mode 100644
index 00000000000..4c4477e2f9a
--- /dev/null
+++ b/graphics/gdk-pixbuf2/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2010/11/14 20:11:41 drochner Exp $
+
+BUILDLINK_TREE+=	gdk-pixbuf2
+
+.if !defined(GDK_PIXBUF2_BUILDLINK3_MK)
+GDK_PIXBUF2_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.22.0
+BUILDLINK_PKGSRCDIR.gdk-pixbuf2?=	../../graphics/gdk-pixbuf2
+
+.include "../../devel/glib2/buildlink3.mk"
+.endif	# GDK_PIXBUF2_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gdk-pixbuf2
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index 706162319ff..0fc1675c8e3 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/11/02 15:17:29 drochner Exp $
+$NetBSD: distinfo,v 1.2 2010/11/14 20:11:41 drochner Exp $
 
-SHA1 (gdk-pixbuf-2.22.0.tar.bz2) = 80c25eaa08b22ebab24b98e88883ff615240d7cf
-RMD160 (gdk-pixbuf-2.22.0.tar.bz2) = 6089a4f48588d8252ff8ea06db7f395d1d3a43f0
-Size (gdk-pixbuf-2.22.0.tar.bz2) = 1538400 bytes
-SHA1 (patch-aa) = 59bdebbe095666af4b568325b7a6f4d88c1c9f61
+SHA1 (gdk-pixbuf-2.22.1.tar.bz2) = b452208963ddd84f7280865695b50255fcafaa2e
+RMD160 (gdk-pixbuf-2.22.1.tar.bz2) = d05d6642e147281b7dc1dd21657595333f13f6f1
+Size (gdk-pixbuf-2.22.1.tar.bz2) = 1543273 bytes
+SHA1 (patch-aa) = d5106a1436ad6899c30188c46246a066b13548df
+SHA1 (patch-ab) = d18a235ce973ef132e9dc777b1cf029b064c02ef
diff --git a/graphics/gdk-pixbuf2/files/loaders.tmpl b/graphics/gdk-pixbuf2/files/loaders.tmpl
new file mode 100644
index 00000000000..c64930c0fef
--- /dev/null
+++ b/graphics/gdk-pixbuf2/files/loaders.tmpl
@@ -0,0 +1,22 @@
+# $NetBSD: loaders.tmpl,v 1.1 2010/11/14 20:11:41 drochner Exp $
+#
+# Rebuild the GTK2 gdk-pixbuf database.
+#
+
+GDK_PIXBUF_LOADERS_DB="@GDK_PIXBUF_LOADERS_DB@"
+GDK_PIXBUF_QUERY_LOADERS="@GDK_PIXBUF_QUERY_LOADERS@"
+
+case ${STAGE} in
+POST-INSTALL)
+	${GDK_PIXBUF_QUERY_LOADERS} > ${GDK_PIXBUF_LOADERS_DB}
+	;;
+DEINSTALL)
+	[ "${PKGBASE}" = "gdk-pixbuf2" ] && ${RM} -f ${GDK_PIXBUF_LOADERS_DB}
+	;;
+POST-DEINSTALL)
+	[ "${PKGBASE}" != "gdk-pixbuf2" ] && \
+		${GDK_PIXBUF_QUERY_LOADERS} > ${GDK_PIXBUF_LOADERS_DB}
+	;;
+*)
+	;;
+esac
diff --git a/graphics/gdk-pixbuf2/loaders.mk b/graphics/gdk-pixbuf2/loaders.mk
new file mode 100644
index 00000000000..60406d2abd5
--- /dev/null
+++ b/graphics/gdk-pixbuf2/loaders.mk
@@ -0,0 +1,37 @@
+# $NetBSD: loaders.mk,v 1.1 2010/11/14 20:11:41 drochner Exp $
+#
+# This Makefile fragment is intended to be included by packages that install
+# GTK2 modules.  It takes care of rebuilding the corresponding databases at
+# (de)installation time.
+#
+# The following variables can be defined:
+#    GTK2_LOADERS   - Set to YES if the package installs pixbuf loaders.
+#
+
+.if !defined(GTK2_LOADERS_MK)
+GTK2_LOADERS_MK=	# defined
+
+.if defined(_BUILDING_GTK2)
+BUILDLINK_PREFIX.gdk-pixbuf2=	${PREFIX}
+GTK2_LOADERS=		YES
+.endif
+
+GDK_PIXBUF_QUERY_LOADERS= \
+ ${BUILDLINK_PREFIX.gdk-pixbuf2}/bin/gdk-pixbuf-query-loaders
+
+.if defined(GTK2_LOADERS) && !empty(GTK2_LOADERS:M[Yy][Ee][Ss])
+GDK_PIXBUF_LOADERS_DB= \
+ ${BUILDLINK_PREFIX.gdk-pixbuf2}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+FILES_SUBST+= GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q}
+FILES_SUBST+= GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q}
+INSTALL_TEMPLATES+=	../../graphics/gdk-pixbuf2/files/loaders.tmpl
+DEINSTALL_TEMPLATES+=	../../graphics/gdk-pixbuf2/files/loaders.tmpl
+.endif
+
+#PRINT_PLIST_AWK+=	/^lib\/gdk-pixbuf-2.0/2.10.0/loaders.cache { next; }
+
+.if !defined(_BUILDING_GTK2)
+.  include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.endif
+
+.endif			# GTK2_LOADERS_MK
diff --git a/graphics/gdk-pixbuf2/patches/patch-aa b/graphics/gdk-pixbuf2/patches/patch-aa
index d4a1d1562fb..d867819c99a 100644
--- a/graphics/gdk-pixbuf2/patches/patch-aa
+++ b/graphics/gdk-pixbuf2/patches/patch-aa
@@ -1,20 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/11/02 15:17:29 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2010/11/14 20:11:42 drochner Exp $
 
---- configure.orig	2010-09-21 18:28:58.000000000 +0000
+--- configure.orig	2010-11-05 23:56:08.000000000 +0000
 +++ configure
-@@ -18183,9 +18183,9 @@ $as_echo "$found_introspection" >&6; }
-        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`
--       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
-+#       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
-        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
--       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
-+#       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
-        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
-@@ -18592,7 +18592,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -18594,7 +18594,7 @@ rm -f core conftest.err conftest.$ac_obj
  fi
  
  
diff --git a/graphics/gdk-pixbuf2/patches/patch-ab b/graphics/gdk-pixbuf2/patches/patch-ab
new file mode 100644
index 00000000000..faf89ad92b6
--- /dev/null
+++ b/graphics/gdk-pixbuf2/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 2010/11/14 20:11:42 drochner Exp $
+
+--- gdk-pixbuf/Makefile.in.orig	2010-11-05 23:56:06.000000000 +0000
++++ gdk-pixbuf/Makefile.in
+@@ -269,8 +269,7 @@ libpixbufloader_ico_la_LINK = $(LIBTOOL)
+ 	$(LDFLAGS) -o $@
+ @BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@am_libpixbufloader_ico_la_rpath = -rpath \
+ @BUILD_DYNAMIC_MODULES_TRUE@@BUILD_GDIPLUS_LOADERS_FALSE@@INCLUDE_ICO_FALSE@	$(loaderdir)
+-libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_2)
++libpixbufloader_jasper_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libpixbufloader_jasper_la_OBJECTS = io-jasper.lo
+ libpixbufloader_jasper_la_OBJECTS =  \
+ 	$(am_libpixbufloader_jasper_la_OBJECTS)
+@@ -1077,7 +1076,7 @@ libpixbufloader_pcx_la_LIBADD = $(module
+ libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c
+ libpixbufloader_jasper_la_SOURCES = io-jasper.c
+ libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
+-libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs)
++libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(PREFIX)/lib/libgdk_pixbuf-2.0.la
+ 
+ #
+ # The QTIF loader