update to gtk2+-2.0.2

This is a bug fix release.

Overview of Changes in GTK+ 2.0.2
=================================

* GtkTreeView cursor movement fixes [Kristian Rietveld]
* GtkTreeModelSort iterator stamp fixes [Kristian Rietveld]

16 files changed, 106 insertions, 88 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 8f454b7a6ed..3ae75982333 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/03/30 20:01:38 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 #
 
-DISTNAME=		gtk+-2.0.1
+DISTNAME=		gtk+-2.0.2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index bdd192057c7..22fa09ac6aa 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/03/30 20:01:38 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
 bin/gdk-pixbuf-csource
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
@@ -253,22 +253,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.0
-lib/libgdk-x11-2.0.so.0.1
+lib/libgdk-x11-2.0.so.0.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.0
-lib/libgdk_pixbuf-2.0.so.0.1
+lib/libgdk_pixbuf-2.0.so.0.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.0
-lib/libgdk_pixbuf_xlib-2.0.so.0.1
+lib/libgdk_pixbuf_xlib-2.0.so.0.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.0
-lib/libgtk-x11-2.0.so.0.1
+lib/libgtk-x11-2.0.so.0.2
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 5c2c133c5c0..fc5124b396f 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.3 2002/03/30 20:01:38 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
 
-SHA1 (gtk+-2.0.1.tar.gz) = f67678606bd853b5e8722714121c33872d1bd1af
-Size (gtk+-2.0.1.tar.gz) = 7785452 bytes
-SHA1 (patch-aa) = f24060b9e42c010d6612aa24da0e03cced86a9ad
-SHA1 (patch-ab) = ba90eae16f99b6d735ee391163022adcd0ac8676
-SHA1 (patch-ac) = d198d3758f75a36348eb87ec1be2f7e1bdf28538
-SHA1 (patch-ad) = b24b7a73ee31bb579b6d1e4dfa5eb329f636cb42
-SHA1 (patch-ae) = 85521dc0d8a9d8aca8a6d70983c8b8c82a210f26
-SHA1 (patch-af) = dd4cafbe57e148d88d1fe2e599b22e34a24b5358
-SHA1 (patch-ag) = b7b842e930de9ae08ddf2c1a3962869b46446075
-SHA1 (patch-ah) = 4ccfe1913d17dcb382ae44817dc2579084979f8d
-SHA1 (patch-ai) = 28fcba63774756de4f9091e43cedb1963dc4ced5
-SHA1 (patch-aj) = 73d4d43d431c0bd44b6065f7c8764cbd5ccb27cd
-SHA1 (patch-ak) = ac41460706e34b7a268ebaf6402a1dc2aee93f64
-SHA1 (patch-al) = b5bbafd3524e225f930fc7a486db36c2508f363c
+SHA1 (gtk+-2.0.2.tar.gz) = 96bc1c54f67f4a1b22b549f2ea3ce1e8418641eb
+Size (gtk+-2.0.2.tar.gz) = 7846932 bytes
+SHA1 (patch-aa) = 8b89d80140098692f26f45288510e9237a77813a
+SHA1 (patch-ab) = 88ccc48726501c1726ff202095087addd99ba4be
+SHA1 (patch-ac) = b196b6aaee8caed51d42ef8d701f423c2989998f
+SHA1 (patch-ad) = fd82d510c7d3a761e5218fda9abe61e73ca7299b
+SHA1 (patch-ae) = 6e5d2307e97e0578d7991f95ed132cf108bdf127
+SHA1 (patch-af) = cc2cf357905c4d23e58176866a9093cd04024570
+SHA1 (patch-ag) = 55165f8a8d8f0aa1324dcc1c2fbce567e8380c07
+SHA1 (patch-ah) = 144e4931bdb6c28f38191b201227249f125512fb
+SHA1 (patch-ai) = 49d6bf894b88cfd976ba58403ae2291a853f7779
+SHA1 (patch-aj) = d0f60a37037b8b4c50ebfaddc7a02f42f955db8c
+SHA1 (patch-ak) = 382c23406a869acda4e220081a56f99b9014bafa
+SHA1 (patch-al) = 5fc7ac07cb3066b0df9cf5b2fcc2dc2dc867c0ee
+SHA1 (patch-am) = 80bcc1a0eff0b4be3e3f9375a5541954cea48266
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 615be2a0a7c..c7c788ef1ac 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 
---- configure.orig	Fri Mar 29 18:16:20 2002
+--- configure.orig	Tue Apr  2 06:45:37 2002
 +++ configure
-@@ -10004,7 +10004,7 @@
+@@ -8016,7 +8016,7 @@
  
  # AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
 -gtklocaledir='${prefix}/${DATADIRNAME}/locale'
 +gtklocaledir='${prefix}/${PKGLOCALEDIR}/locale'
  
- echo "$as_me:10009: checking for extra flags to get ANSI library prototypes" >&5
- echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6
+ 
+ echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
index 2954ff2a99e..e1c2e2dfc09 100644
--- a/x11/gtk2/patches/patch-ab
+++ b/x11/gtk2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
 
---- demos/Makefile.am.orig	Tue Mar  5 16:03:50 2002
+--- demos/Makefile.am.orig	Fri Mar  8 01:36:21 2002
 +++ demos/Makefile.am
 @@ -19,6 +19,7 @@
  	$(top_builddir)/gtk/@gtktargetlib@
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
index 1e3f5100abf..bbd1bbf95ac 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,12 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
 
---- demos/Makefile.in.orig	Fri Mar 29 18:51:32 2002
+--- demos/Makefile.in.orig	Tue Apr  2 06:50:48 2002
 +++ demos/Makefile.in
-@@ -193,6 +193,7 @@
+@@ -180,7 +180,9 @@
+ DEPS =  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@ 					$(top_builddir)/gtk/@gtktargetlib@
  
  
- LDADDS = @STRIP_BEGIN@ 							\
-+	@LDFLAGS@							\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
- 	$(top_builddir)/gtk/@gtktargetlib@ 				\
+-LDADDS = @STRIP_BEGIN@ 								$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@        				$(top_builddir)/gtk/@gtktargetlib@ 				@STRIP_END@
++LDADDS = @STRIP_BEGIN@ \
++	@LDFLAGS@ \
++	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@        				$(top_builddir)/gtk/@gtktargetlib@ 				@STRIP_END@
+ 
+ 
+ noinst_PROGRAMS =  	testpixbuf 			testpixbuf-drawable 		testanimation 			testpixbuf-save			testpixbuf-scale 		pixbuf-demo
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
index 6434e21f267..40bef60588a 100644
--- a/x11/gtk2/patches/patch-ad
+++ b/x11/gtk2/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2002/04/06 15:48:55 dmcmahill Exp $
 
---- demos/gtk-demo/Makefile.am.orig	Tue Mar  5 16:03:51 2002
+--- demos/gtk-demo/Makefile.am.orig	Fri Mar  8 01:36:21 2002
 +++ demos/gtk-demo/Makefile.am
 @@ -41,6 +41,7 @@
  	$(top_builddir)/gtk/@gtktargetlib@
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index 88ebaa632d2..d32f32a0ff2 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,12 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 
---- demos/gtk-demo/Makefile.in.orig	Fri Mar 29 18:51:33 2002
+--- demos/gtk-demo/Makefile.in.orig	Tue Apr  2 06:50:50 2002
 +++ demos/gtk-demo/Makefile.in
-@@ -214,6 +214,7 @@
+@@ -183,7 +183,7 @@
+ DEPS =  	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@ 					$(top_builddir)/gtk/@gtktargetlib@
  
  
- LDADDS = @STRIP_BEGIN@ 							\
-+	@LDFLAGS@							\
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
- 	$(top_builddir)/gtk/@gtktargetlib@ 				\
+-LDADDS = @STRIP_BEGIN@ 								$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@        				$(top_builddir)/gtk/@gtktargetlib@ 				@STRIP_END@
++LDADDS = @STRIP_BEGIN@ @LDFLAGS@								$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(top_builddir)/gdk/@gdktargetlib@        				$(top_builddir)/gtk/@gtktargetlib@ 				@STRIP_END@
+ 
+ 
+ bin_PROGRAMS = gtk-demo
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index 7be6c5b2605..c40b202a33c 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-af,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 
---- demos/gtk-demo/main.c.orig	Sat Mar  2 23:16:18 2002
+--- demos/gtk-demo/main.c.orig	Sun Mar  3 00:25:09 2002
 +++ demos/gtk-demo/main.c
 @@ -87,7 +87,7 @@
    int n_read = 0;
diff --git a/x11/gtk2/patches/patch-ag b/x11/gtk2/patches/patch-ag
index cfd235dfd8d..99bb92ecd64 100644
--- a/x11/gtk2/patches/patch-ag
+++ b/x11/gtk2/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 
---- gdk-pixbuf/Makefile.am.orig	Tue Mar  5 16:04:01 2002
+--- gdk-pixbuf/Makefile.am.orig	Fri Mar  8 01:36:26 2002
 +++ gdk-pixbuf/Makefile.am
 @@ -227,7 +227,7 @@
  @STRIP_END@
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
index 358b51c7076..c1aa38a8921 100644
--- a/x11/gtk2/patches/patch-ah
+++ b/x11/gtk2/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 
---- gdk-pixbuf/Makefile.in.orig	Fri Mar 29 18:51:13 2002
+--- gdk-pixbuf/Makefile.in.orig	Tue Apr  2 06:50:29 2002
 +++ gdk-pixbuf/Makefile.in
-@@ -360,7 +360,7 @@
+@@ -324,7 +324,7 @@
  
  
  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
diff --git a/x11/gtk2/patches/patch-ai b/x11/gtk2/patches/patch-ai
index efd49ae8867..b69e60ac670 100644
--- a/x11/gtk2/patches/patch-ai
+++ b/x11/gtk2/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 
---- gdk/Makefile.am.orig	Thu Mar  7 18:27:00 2002
+--- gdk/Makefile.am.orig	Fri Mar  8 01:36:23 2002
 +++ gdk/Makefile.am
 @@ -68,6 +68,7 @@
  # since automake doesn't support conditionalized libsomething_la_LDFLAGS
diff --git a/x11/gtk2/patches/patch-aj b/x11/gtk2/patches/patch-aj
index 08a59fb8ec0..8bcc9c7cff0 100644
--- a/x11/gtk2/patches/patch-aj
+++ b/x11/gtk2/patches/patch-aj
@@ -1,12 +1,13 @@
-$NetBSD: patch-aj,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 
---- gdk/Makefile.in.orig	Fri Mar 29 18:51:15 2002
+--- gdk/Makefile.in.orig	Tue Apr  2 06:50:31 2002
 +++ gdk/Makefile.in
-@@ -212,6 +212,7 @@
+@@ -197,7 +197,7 @@
+ # libtool stuff: set version and export symbols for resolving
  # since automake doesn't support conditionalized libsomething_la_LDFLAGS
  # we use the general approach here
- LDFLAGS = @STRIP_BEGIN@ 						\
-+	@LDFLAGS@							\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 		\
- 	-export-dynamic 						\
- 	-rpath $(libdir) 						\
+-LDFLAGS = @STRIP_BEGIN@ 							-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 			-export-dynamic 							-rpath $(libdir) 							$(no_undefined)								@LIBTOOL_EXPORT_OPTIONS@						$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(gdk_win32_symbols)							@GDK_DEP_LIBS@							@STRIP_END@
++LDFLAGS = @STRIP_BEGIN@ @LDFLAGS@  							-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 			-export-dynamic 							-rpath $(libdir) 							$(no_undefined)								@LIBTOOL_EXPORT_OPTIONS@						$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la		$(gdk_win32_symbols)							@GDK_DEP_LIBS@							@STRIP_END@
+ 
+ 
+ #
diff --git a/x11/gtk2/patches/patch-ak b/x11/gtk2/patches/patch-ak
index 0c1f3f561e8..1c854641b22 100644
--- a/x11/gtk2/patches/patch-ak
+++ b/x11/gtk2/patches/patch-ak
@@ -1,13 +1,12 @@
-$NetBSD: patch-ak,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-ak,v 1.3 2002/04/06 15:48:55 dmcmahill Exp $
 
---- gtk/Makefile.in.orig	Fri Mar 29 18:51:26 2002
-+++ gtk/Makefile.in
-@@ -667,7 +667,7 @@
- bin_PROGRAMS = gtk-query-immodules-2.0
- 
- gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
--gtk_query_immodules_2_0_LDADD = $(LDADDS)
-+gtk_query_immodules_2_0_LDADD = @LDFLAGS@ $(LDADDS)
- 
- gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+--- gtk/Makefile.am.orig	Fri Mar  8 01:36:45 2002
++++ gtk/Makefile.am
+@@ -65,6 +65,7 @@
+ # we use the general approach here
+ libgtkincludedir = $(includedir)/gtk-2.0/gtk
+ LDFLAGS = @STRIP_BEGIN@ \
++	@LDFLAGS@								\
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)			\
+ 	-export-dynamic								\
+ 	-rpath $(libdir)							\
diff --git a/x11/gtk2/patches/patch-al b/x11/gtk2/patches/patch-al
index 91984f49a07..118281603c4 100644
--- a/x11/gtk2/patches/patch-al
+++ b/x11/gtk2/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
+$NetBSD: patch-al,v 1.3 2002/04/06 15:48:56 dmcmahill Exp $
 
---- po/Makefile.in.in.orig	Wed Sep 26 16:32:41 2001
-+++ po/Makefile.in.in
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/${PKGLOCALEDIR}/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
+--- gtk/Makefile.in.orig	Tue Apr  2 06:50:40 2002
++++ gtk/Makefile.in
+@@ -194,7 +194,7 @@
+ # since automake doesn't support conditionalized libsomething_la_LDFLAGS
+ # we use the general approach here
+ libgtkincludedir = $(includedir)/gtk-2.0/gtk
+-LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				-export-dynamic									-rpath $(libdir)								$(no_undefined)									@LIBTOOL_EXPORT_OPTIONS@							$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la			$(top_builddir)/gdk/@gdktargetlib@						$(libgtk_target_ldflags)							@GTK_DEP_LIBS@								@STRIP_END@
++LDFLAGS = @STRIP_BEGIN@ @LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				-export-dynamic									-rpath $(libdir)								$(no_undefined)									@LIBTOOL_EXPORT_OPTIONS@							$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la			$(top_builddir)/gdk/@gdktargetlib@						$(libgtk_target_ldflags)							@GTK_DEP_LIBS@								@STRIP_END@
+ 
+ 
+ #
diff --git a/x11/gtk2/patches/patch-am b/x11/gtk2/patches/patch-am
new file mode 100644
index 00000000000..0aaa95e9dc4
--- /dev/null
+++ b/x11/gtk2/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.3 2002/04/06 15:48:56 dmcmahill Exp $
+
+--- po/Makefile.in.in.orig	Thu Sep 27 06:07:57 2001
++++ po/Makefile.in.in
+@@ -23,7 +23,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/${PKGLOCALEDIR}/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po