Update to 2.2.2:

* GdkPixbuf [Matthias Clasen]
 - Fix animation of slow-loading progressive GIFS
 - Fix long-standing animated GIF display bug with transparency
 - Misc bug and portability fixes [Rick Jones, Tim Mooney, Marijn Ross]
* GDK [Owen Taylor]
 - Draw continuous underlines between Pango layout runs when
   possible [Kang Jeong-Hee]
 - Fix gdk_pixbuf_from_drawable() for big endian [Christian Petig]
   Major rewrite of 16-bit handling for pixbuf_from_drawable()
* X11 backend [Owen]
 - Fix build on X11R5 [Albert Chin]
 - Fix switching keyboard layouts while running [Egmont Koblinger]
 - Work around RENDER extension bugs on certain Sun X servers [Morten Welinder]
 - Zero unused fields in client messages we send Lubos Lunak]
 - Fix occasional segfault when drawing pixbufs [Hans Petter Jansson]
 - Fix wrong initializaiton that was keeping XShm from being used.
* Win32 backend [Tor Lillqvist]
 - Tweak line drawing
 - Mouse/cursor fixes [Allin Cottrell]
 - Better handling of floppy drives in GtkFileSelection
 - Misc fixes [Arnaud Charlet, Cedric Gustin, Martyn Russell]
* Input methods [Hidetoshi Tajima]
 - Add rules for Greek accents to GtkIMContextSimple [Vasilis Vasaitis]
 - Fix sorting of rules in GtkIMContextSimple [Vasilis]
 - Miscellaneous GtkIMContextXIM fixes
 - Fix translation of input context names
* Fix keyboard accelerators/bindings on Numeric Keypad [Owen, Olivier Ripoll]
* Add Delete to GtkEntry context menu, Delete/Select All
  to GtkTextView context menu [Matthias]
* Keynav tweaks in GtkFileSelection, GtkColorSel [Matthias]
* Add C-A-PgUp/Down as alternative notebook page switching keys [Matthias]
* GtkTextView
 - Fix redrawing on color-only changes [Owen, Gustavo Giráldez]
 - Don't scroll to cursor on focus in [Paolo Maggi]
 - Fix spot location reported to input method [Owen, TOKUNAGA Hiroyuki,
   Yao Zhang]
 - Miscellaneous bug fixes [Torbjörn Andersson, Matthias, Manual Clos,
   Padraig O'Briain, Owen]
* GtkTreeView [Kristian Rietveld]
 - Fix prelighting [Sven Neumann]
 - Set drag cursor earlier to allow apps to override [Daniel Elstner]
 - Speed up insertions into GtkTreeModelSort [Owen, Jonathan Blandford]
 - Get background/cell area handling right in GtkTreeViewColumn [Vasco
   Alexandre da Silva Costa]
 - Bug fixes [Benjamin Bayart, Jonathan Blandford, Peter Bloomfield,
   Dave Cook, Felipe Heidrich, Richard Hult, Markus Lausser, Michael Natterer,
   Mariano Suarez-Alvarez, Owen]
* Fix handling of border width for GtkToolbar [Rodney Dawes]
* Rewrite adjustment handling of GtkViewport, fixing many bugs
  [Owen, Thomas Leonard, Michael]
* Misc bug fixes [Dennis Björklund, Jonathan, Dave Bordoley, Rich Burridge,
  Anders Carlsson, Arnaud, Matthias, Vasco Alexandre da Silva Costa,
  Tim Evans, Larry Ewing, John Finlay, Jeff Franks, Jody Goldberg,
  Jason D. Hildebrand, Charles Kerr, Alex Larsson, Noah Levitt, Xan Lopez,
  Loban Rahman, Richard Reich, Soeren Sandmann, Charles Schmidt,
  Rajkumar Siva, Owen, Sergey V. Udaltsov, Morten Welinder, Michael Zucchi]
* Code cleanups [Matthias, Glynn Foster, Britton Kerin, Sven Neumann,
  Doug Quale, Manish Singh, Morten Welinder]
* Switch to using libtool-1.5
* Build fixes [Matthias, J. Ali Harlowe, Rich Kinder, Jon Nall, Sven,
  Christian Rose]
* Documentation improvements [Matthias, Noah Levitt, Sven Neumann]
* New and updated translations (am,az,be,ca,cs,cy,da,de,el,es,fa,fi,fr,id,
  it,ko,li,ml,mn,ms,nl,no,pl,pt,sr,sr@Latn,sv,ta,uk,yi,zh_TW)

3 files changed, 16 insertions, 14 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 772fabab667..550c2688858 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2003/06/02 01:15:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.28 2003/06/10 10:47:04 jmmv Exp $
 #
 
-DISTNAME=		gtk+-2.2.1
+DISTNAME=		gtk+-2.2.2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 910f51f4dcd..13224fa9b55 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2003/02/15 11:02:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2003/06/10 10:47:04 jmmv Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
@@ -261,22 +261,22 @@ lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
 lib/libgdk-x11-2.0.so.200
-lib/libgdk-x11-2.0.so.200.1
+lib/libgdk-x11-2.0.so.200.2
 lib/libgdk_pixbuf-2.0.a
 lib/libgdk_pixbuf-2.0.la
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.200
-lib/libgdk_pixbuf-2.0.so.200.1
+lib/libgdk_pixbuf-2.0.so.200.2
 lib/libgdk_pixbuf_xlib-2.0.a
 lib/libgdk_pixbuf_xlib-2.0.la
 lib/libgdk_pixbuf_xlib-2.0.so
 lib/libgdk_pixbuf_xlib-2.0.so.200
-lib/libgdk_pixbuf_xlib-2.0.so.200.1
+lib/libgdk_pixbuf_xlib-2.0.so.200.2
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.200
-lib/libgtk-x11-2.0.so.200.1
+lib/libgtk-x11-2.0.so.200.2
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -616,6 +616,7 @@ share/doc/html/gtk/stock_cancel_20.png
 share/doc/html/gtk/stock_cdrom_24.png
 share/doc/html/gtk/stock_clear_24.png
 share/doc/html/gtk/stock_close_24.png
+share/doc/html/gtk/stock_color_picker_25.png
 share/doc/html/gtk/stock_colorselector_24.png
 share/doc/html/gtk/stock_convert_24.png
 share/doc/html/gtk/stock_copy_24.png
@@ -715,7 +716,6 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtk20.mo
-${PKGLOCALEDIR}/locale/en@IPA/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtk20.mo
@@ -730,12 +730,14 @@ ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/ia/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtk20.mo
@@ -748,14 +750,15 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtk20.mo
-${PKGLOCALEDIR}/locale/sp/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gtk20.mo
+${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gtk20.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gtk20.mo
 share/themes/Default/gtk-2.0-key/gtkrc
@@ -773,7 +776,7 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @dirrm share/doc/html/gtk
 @dirrm share/doc/html/gdk-pixbuf
 @dirrm share/doc/html/gdk
-@exec ${MKDIR} %D/lib/gtk-2.0/modules 2>/dev/null || ${TRUE}
+@exec ${MKDIR} %D/lib/gtk-2.0/modules 2>/dev/null || %{TRUE}
 @dirrm lib/gtk-2.0/modules
 @dirrm lib/gtk-2.0/include
 @dirrm lib/gtk-2.0/2.2.0/loaders
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index a1527ce635f..db367791875 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2003/02/15 11:02:29 wiz Exp $
+$NetBSD: distinfo,v 1.16 2003/06/10 10:47:04 jmmv Exp $
 
-SHA1 (gtk+-2.2.1.tar.bz2) = 11a01dab052989c5f9c98c6e9ba98402f267f128
-Size (gtk+-2.2.1.tar.bz2) = 6515939 bytes
+SHA1 (gtk+-2.2.2.tar.bz2) = 5d4ab9373e8938017f9bcdd3b0b6d95457d08812
+Size (gtk+-2.2.2.tar.bz2) = 6975953 bytes
 SHA1 (patch-aa) = 1552e92d97d93a403b908bfe8436e131be9f562e
 SHA1 (patch-ab) = 1734c8ff78460891a2c0bda4ddf0d798c99a31d3
 SHA1 (patch-ac) = 68b0d7da55de5209bed53f3daea1881a634a216f