update to gtk2-2.0.1

Overview of Changes in GTK+ 2.0.1
=================================

* GtkTreeView fixes and performance improvements
  [Kristian Rietveld, Jonathan Blandford, Mike Piepe, Dave Camp]
* GtkTextView fixes [Havoc Pennington]
* Fix problems with accelerators on Solaris [Padraig O'Briain]
* Some fixes for key bindings on keypad keys [Owen Taylor]
* Fix problem with RENDER use on big endian machines
  [Owen Taylor, with help from Tuomas Kuosmanen]
* Win32 fixes, especially dashed line drawing
  [Tor Lillqvist, Hans Breuer]
* Compile with -D_REENTRANT when appropriate [Sven Numann]
* Compiler warning cleanups [Erwann Chenede]
* Fix handling of font-name XSETTING [Richard Hestilow]
* Make linux-fb backend compile again [Carlo E. Prelz, Alex Larsson]
* Fix problems with inappropriate menu scroll arrows [Owen]
* Stock icon improvements [Jakub Steiner, Tuomas]
* Much work on pixbuf loader robustness [Matthias Clasen]
* Documentation improvements [Matthias, Vitaly Tiskkov]
* Fix some crashes in GtkWindow accelerator handling code
  [Dave Camp, Matt Wilson]
* Misc bug fixes

Other contributors: Jacob Berkman, Dennis Björklund, Seth Burgess,
  Murray Cumming, Johan Dahlin, John Ellis, Kang Jeong-He,
  James Henstridge, Richard Hult, Thomas Leonard, LEE Sau Dan,
  Alexey A. Malyshev, Mark McLoughlin, Michael Meeks, Sven Neumann,
  Andras Salamon, Soeren Sandmann, Dan Winship, Yao Zhang

18 files changed, 138 insertions, 138 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 54e0c9bf60b..8f454b7a6ed 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/30 20:01:38 dmcmahill Exp $
 #
 
-DISTNAME=		gtk+-2.0.0
+DISTNAME=		gtk+-2.0.1
 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 b071197824a..bdd192057c7 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/25 02:05:04 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/03/30 20:01:38 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.0
+lib/libgdk-x11-2.0.so.0.1
 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.0
+lib/libgdk_pixbuf-2.0.so.0.1
 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.0
+lib/libgdk_pixbuf_xlib-2.0.so.0.1
 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.0
+lib/libgtk-x11-2.0.so.0.1
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
@@ -436,7 +436,7 @@ share/gtk-doc/html/gdk/watch.png
 share/gtk-doc/html/gdk/xterm.png
 share/gtk-doc/html/gtk/abstractobjects.html
 share/gtk-doc/html/gtk/buttonwidgets.html
-share/gtk-doc/html/gtk/c17337.html
+share/gtk-doc/html/gtk/c17325.html
 share/gtk-doc/html/gtk/deprecatedobjects.html
 share/gtk-doc/html/gtk/displaywidgets.html
 share/gtk-doc/html/gtk/gtk-accelerator-maps.html
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 5dff2d8e808..5c2c133c5c0 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.2 2002/03/25 02:04:48 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2002/03/30 20:01:38 dmcmahill Exp $
 
-SHA1 (gtk+-2.0.0.tar.gz) = 3aa6c6ffbca5656daee97dbb655bedfc3dc0e4b7
-Size (gtk+-2.0.0.tar.gz) = 8023422 bytes
-SHA1 (patch-aa) = 674a5cb1aa288f4c8745129a91a4caa416f16743
-SHA1 (patch-ae) = b5bbafd3524e225f930fc7a486db36c2508f363c
+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) = 87fb4c9719d29ba557ed0cfa0154b21cc64687d5
-SHA1 (patch-ah) = d3cda25e66530107585fe1a2644b1e30cf39abbe
-SHA1 (patch-ai) = 540f38a2e667b40c1451653c06286af4d0abcae1
-SHA1 (patch-aj) = 6171936cf292cef24a1ee2ed7e85fba0db98b495
-SHA1 (patch-ak) = 1e387470b0f1ddbfbca69e5a4c9fa7a842293ea1
-SHA1 (patch-al) = 23008493c5652b5dc6b5b4f2b4848e3d0f9ea9e7
-SHA1 (patch-am) = 1b6e6e54b597a27f2020a664e6db4808ce690641
-SHA1 (patch-an) = 658372f2d5e0d458bee638ac2f1cf132447084d6
-SHA1 (patch-ao) = b192161c7f0bcb4fccb33d786692a00d10515b47
+SHA1 (patch-ag) = b7b842e930de9ae08ddf2c1a3962869b46446075
+SHA1 (patch-ah) = 4ccfe1913d17dcb382ae44817dc2579084979f8d
+SHA1 (patch-ai) = 28fcba63774756de4f9091e43cedb1963dc4ced5
+SHA1 (patch-aj) = 73d4d43d431c0bd44b6065f7c8764cbd5ccb27cd
+SHA1 (patch-ak) = ac41460706e34b7a268ebaf6402a1dc2aee93f64
+SHA1 (patch-al) = b5bbafd3524e225f930fc7a486db36c2508f363c
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index ba1abbeb4cc..615be2a0a7c 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
 
---- configure.orig	Fri Mar  8 12:22:14 2002
+--- configure.orig	Fri Mar 29 18:16:20 2002
 +++ configure
-@@ -9999,7 +9999,7 @@
+@@ -10004,7 +10004,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'
++gtklocaledir='${prefix}/${PKGLOCALEDIR}/locale'
  
- echo "$as_me:10004: checking for extra flags to get ANSI library prototypes" >&5
+ 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
diff --git a/x11/gtk2/patches/patch-ab b/x11/gtk2/patches/patch-ab
new file mode 100644
index 00000000000..2954ff2a99e
--- /dev/null
+++ b/x11/gtk2/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2002/03/30 20:01:39 dmcmahill Exp $
+
+--- demos/Makefile.am.orig	Tue Mar  5 16:03:50 2002
++++ demos/Makefile.am
+@@ -19,6 +19,7 @@
+ 	$(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@ 				\
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
new file mode 100644
index 00000000000..1e3f5100abf
--- /dev/null
+++ b/x11/gtk2/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.3 2002/03/30 20:01:39 dmcmahill Exp $
+
+--- demos/Makefile.in.orig	Fri Mar 29 18:51:32 2002
++++ demos/Makefile.in
+@@ -193,6 +193,7 @@
+ 
+ 
+ LDADDS = @STRIP_BEGIN@ 							\
++	@LDFLAGS@							\
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+ 	$(top_builddir)/gdk/@gdktargetlib@        			\
+ 	$(top_builddir)/gtk/@gtktargetlib@ 				\
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
new file mode 100644
index 00000000000..6434e21f267
--- /dev/null
+++ b/x11/gtk2/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.3 2002/03/30 20:01:39 dmcmahill Exp $
+
+--- demos/gtk-demo/Makefile.am.orig	Tue Mar  5 16:03:51 2002
++++ demos/gtk-demo/Makefile.am
+@@ -41,6 +41,7 @@
+ 	$(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@ 				\
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index f4aebb5f065..88ebaa632d2 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,13 +1,12 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.2 2002/03/30 20:01:39 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
+--- demos/gtk-demo/Makefile.in.orig	Fri Mar 29 18:51:33 2002
++++ demos/gtk-demo/Makefile.in
+@@ -214,6 +214,7 @@
+ 
+ 
+ LDADDS = @STRIP_BEGIN@ 							\
++	@LDFLAGS@							\
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+ 	$(top_builddir)/gdk/@gdktargetlib@        			\
+ 	$(top_builddir)/gtk/@gtktargetlib@ 				\
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index b996c8f964d..7be6c5b2605 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
 
 --- demos/gtk-demo/main.c.orig	Sat Mar  2 23:16:18 2002
 +++ demos/gtk-demo/main.c
diff --git a/x11/gtk2/patches/patch-ag b/x11/gtk2/patches/patch-ag
index 36ad5db227f..cfd235dfd8d 100644
--- a/x11/gtk2/patches/patch-ag
+++ b/x11/gtk2/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
 
---- gtk/Makefile.in.orig	Sun Mar 17 15:03:23 2002
-+++ gtk/Makefile.in
-@@ -665,7 +665,7 @@
- bin_PROGRAMS = gtk-query-immodules-2.0
+--- gdk-pixbuf/Makefile.am.orig	Tue Mar  5 16:04:01 2002
++++ gdk-pixbuf/Makefile.am
+@@ -227,7 +227,7 @@
+ @STRIP_END@
  
- gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
--gtk_query_immodules_2_0_LDADD = $(LDADDS)
-+gtk_query_immodules_2_0_LDADD = $(LDADDS) @LDFLAGS@
+ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
++LDADDS = @LDFLAGS@ libgdk_pixbuf-$(GTK_API_VERSION).la
  
- gtk_query_immodules_2_0_SOURCES = queryimmodules.c
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ noinst_PROGRAMS = test-gdk-pixbuf test-loaders
+ test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
index e1d961b9833..358b51c7076 100644
--- a/x11/gtk2/patches/patch-ah
+++ b/x11/gtk2/patches/patch-ah
@@ -1,12 +1,13 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
 
---- demos/Makefile.am.orig	Tue Mar  5 16:03:50 2002
-+++ demos/Makefile.am
-@@ -22,6 +22,7 @@
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
- 	$(top_builddir)/gtk/@gtktargetlib@ 				\
-+	@LDFLAGS@							\
- @STRIP_END@
+--- gdk-pixbuf/Makefile.in.orig	Fri Mar 29 18:51:13 2002
++++ gdk-pixbuf/Makefile.in
+@@ -360,7 +360,7 @@
  
- noinst_PROGRAMS = 		\
+ 
+ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
++LDADDS = @LDFLAGS@ libgdk_pixbuf-$(GTK_API_VERSION).la
+ 
+ noinst_PROGRAMS = test-gdk-pixbuf test-loaders
+ test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11/gtk2/patches/patch-ai b/x11/gtk2/patches/patch-ai
index f838334bb50..efd49ae8867 100644
--- a/x11/gtk2/patches/patch-ai
+++ b/x11/gtk2/patches/patch-ai
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
 
---- demos/Makefile.in.orig	Sun Mar 17 15:03:23 2002
-+++ demos/Makefile.in
-@@ -194,6 +194,7 @@
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
- 	$(top_builddir)/gtk/@gtktargetlib@ 				\
+--- gdk/Makefile.am.orig	Thu Mar  7 18:27:00 2002
++++ gdk/Makefile.am
+@@ -68,6 +68,7 @@
+ # since automake doesn't support conditionalized libsomething_la_LDFLAGS
+ # we use the general approach here
+ LDFLAGS = @STRIP_BEGIN@ 						\
 +	@LDFLAGS@							\
- @STRIP_END@
- 
- 
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 		\
+ 	-export-dynamic 						\
+ 	-rpath $(libdir) 						\
diff --git a/x11/gtk2/patches/patch-aj b/x11/gtk2/patches/patch-aj
index 88e6c1dd3c9..08a59fb8ec0 100644
--- a/x11/gtk2/patches/patch-aj
+++ b/x11/gtk2/patches/patch-aj
@@ -1,12 +1,12 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
 
---- demos/gtk-demo/Makefile.am.orig	Tue Mar  5 16:03:51 2002
-+++ demos/gtk-demo/Makefile.am
-@@ -44,6 +44,7 @@
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
- 	$(top_builddir)/gtk/@gtktargetlib@ 				\
+--- gdk/Makefile.in.orig	Fri Mar 29 18:51:15 2002
++++ gdk/Makefile.in
+@@ -212,6 +212,7 @@
+ # since automake doesn't support conditionalized libsomething_la_LDFLAGS
+ # we use the general approach here
+ LDFLAGS = @STRIP_BEGIN@ 						\
 +	@LDFLAGS@							\
- @STRIP_END@
- 
- bin_PROGRAMS = gtk-demo
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 		\
+ 	-export-dynamic 						\
+ 	-rpath $(libdir) 						\
diff --git a/x11/gtk2/patches/patch-ak b/x11/gtk2/patches/patch-ak
index 4c68fa2e2d6..0c1f3f561e8 100644
--- a/x11/gtk2/patches/patch-ak
+++ b/x11/gtk2/patches/patch-ak
@@ -1,12 +1,13 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+$NetBSD: patch-ak,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
 
---- demos/gtk-demo/Makefile.in.orig	Sun Mar 17 15:03:23 2002
-+++ demos/gtk-demo/Makefile.in
-@@ -215,6 +215,7 @@
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(top_builddir)/gdk/@gdktargetlib@        			\
- 	$(top_builddir)/gtk/@gtktargetlib@ 				\
-+	@LDFLAGS@							\
- @STRIP_END@
+--- 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
diff --git a/x11/gtk2/patches/patch-al b/x11/gtk2/patches/patch-al
index 07c20e8bbcd..91984f49a07 100644
--- a/x11/gtk2/patches/patch-al
+++ b/x11/gtk2/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
+$NetBSD: patch-al,v 1.2 2002/03/30 20:01:39 dmcmahill Exp $
 
---- gdk-pixbuf/Makefile.am.orig	Tue Mar  5 16:04:01 2002
-+++ gdk-pixbuf/Makefile.am
-@@ -227,7 +227,7 @@
- @STRIP_END@
- 
- AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
--LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
-+LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la @LDFLAGS@
- 
- noinst_PROGRAMS = test-gdk-pixbuf test-loaders
- test_gdk_pixbuf_LDADD = $(LDADDS)
+--- 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
diff --git a/x11/gtk2/patches/patch-am b/x11/gtk2/patches/patch-am
deleted file mode 100644
index 68ffaf6d342..00000000000
--- a/x11/gtk2/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
-
---- gdk-pixbuf/Makefile.in.orig	Mon Mar 18 08:32:17 2002
-+++ gdk-pixbuf/Makefile.in
-@@ -358,7 +358,7 @@
- 
- 
- AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
--LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
-+LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la @LDFLAGS@
- 
- noinst_PROGRAMS = test-gdk-pixbuf test-loaders
- test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11/gtk2/patches/patch-an b/x11/gtk2/patches/patch-an
deleted file mode 100644
index a5265a909d7..00000000000
--- a/x11/gtk2/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
-
---- gdk/Makefile.am.orig	Thu Mar  7 18:27:00 2002
-+++ gdk/Makefile.am
-@@ -76,6 +76,7 @@
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(gdk_win32_symbols)						\
- 	@GDK_DEP_LIBS@							\
-+	@LDFLAGS@							\
- @STRIP_END@
- 
- #
diff --git a/x11/gtk2/patches/patch-ao b/x11/gtk2/patches/patch-ao
deleted file mode 100644
index cbf9d21deaf..00000000000
--- a/x11/gtk2/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2002/03/24 20:34:37 dmcmahill Exp $
-
---- gdk/Makefile.in.orig	Mon Mar 18 18:54:44 2002
-+++ gdk/Makefile.in
-@@ -218,6 +218,7 @@
- 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
- 	$(gdk_win32_symbols)						\
- 	@GDK_DEP_LIBS@							\
-+	@LDFLAGS@							\
- @STRIP_END@
- 
-