update to 1.2.9.

Overview of Changes in GTK+ 1.2.9:

* Move include files into a gtk-1-2/ subdir to support parallel
  installation with GTK+-2.0. If you are installing from source
  on top of a previous version, you should to remove $(includedir)/gdk/
  and $(includedir)/gtk/ manually before installing the new version.
* Improved submenu navigation.
* Other small useability improvements for menus, scrollbars, etc.
* Patch enabling themes with better appearance by making some
  geometry parameters settable.
* Changes so that using fonts (as well as fontsets) for
  non-iso-8859-1 locales will work.
* New --with-native-locale configure option for faster string
  handling on systems with non-broken locale support.
* Refuse to initialize GTK+ when setuid (http://www.gtk.org/setuid.html)
* Change to make GdkRGB use less SHM segments.
* Addition of .pc files
* Many bug fixes

7 files changed, 169 insertions, 159 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 2784be9f476..1dc7f2ebdf3 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2001/02/26 21:42:57 tron Exp $
+# $NetBSD: Makefile,v 1.52 2001/03/10 10:50:37 drochner Exp $
 
-DISTNAME=		gtk+-1.2.8
+DISTNAME=		gtk+-1.2.9
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -11,7 +11,7 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gtk.org/
 COMMENT=		Gimp toolkit. Libraries for building X11 user interfaces
 
-DEPENDS+=		glib>=1.2.8:../../devel/glib
+DEPENDS+=		glib>=1.2.9:../../devel/glib
 BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
 BUILD_DEPENDS+=		msgfmt:../../devel/gettext
 
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index 03f9861d388..52f3b5d5208 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.16 2000/05/26 05:38:20 rh Exp $
+$NetBSD: md5,v 1.17 2001/03/10 10:50:37 drochner Exp $
 
-MD5 (gtk+-1.2.8.tar.gz) = d947ecc5780b4367d4c50fbb019d0216
+SHA1 (gtk+-1.2.9.tar.gz) = 06fc38a84bc4435fa0737675ca87f3aeab2e2e11
diff --git a/x11/gtk/files/patch-sum b/x11/gtk/files/patch-sum
index c655ec0fd83..a7cc8fb6279 100644
--- a/x11/gtk/files/patch-sum
+++ b/x11/gtk/files/patch-sum
@@ -1,8 +1,7 @@
-$NetBSD: patch-sum,v 1.10 2001/02/26 21:42:57 tron Exp $
+$NetBSD: patch-sum,v 1.11 2001/03/10 10:50:38 drochner Exp $
 
-MD5 (patch-aa) = bdb83b1289edcc89b1310822a0ab7cb3
-MD5 (patch-ab) = 884c71416aaaaee6dd2d410cb5a9cade
-MD5 (patch-ac) = 76bcc7c03a39f3562d365a8c57270189
-MD5 (patch-ad) = 0a23ff30c6e52b0a3ba5edc698d8fe03
-MD5 (patch-ae) = 6ea976db6fcdc0143dd048024f044894
-MD5 (patch-af) = c3ac2a236275341e06d6a6566b876759
+SHA1 (patch-aa) = e5b2575b856d8ac27970a9023f0fe4bc593362ad
+SHA1 (patch-ab) = 17db6fd368e0bc63437f3f0a3d47ca9042cffea9
+SHA1 (patch-ac) = 4f7ffd7dbca81740e8b0304f96f7b3ce592404db
+SHA1 (patch-ad) = 7ea957fa92282e95b223821dc98d9d41ff45200e
+SHA1 (patch-af) = d969891b6d8fa493294971894b5a355023c75460
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 7b2ed45535c..600f8b8192c 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.20 2001/02/26 21:42:57 tron Exp $
+$NetBSD: patch-aa,v 1.21 2001/03/10 10:50:38 drochner Exp $
 
---- configure.orig	Thu May 25 02:31:48 2000
-+++ configure	Thu May 25 18:53:46 2000
+--- configure.orig	Fri Mar  2 20:34:37 2001
++++ configure	Wed Mar  7 22:16:35 2001
 @@ -22,8 +22,8 @@
  #
  GTK_MAJOR_VERSION=1
  GTK_MINOR_VERSION=2
--GTK_MICRO_VERSION=8
--GTK_INTERFACE_AGE=3
-+GTK_MICRO_VERSION=20
-+GTK_INTERFACE_AGE=8
- GTK_BINARY_AGE=8
+-GTK_MICRO_VERSION=9
+-GTK_INTERFACE_AGE=0
++GTK_MICRO_VERSION=21
++GTK_INTERFACE_AGE=9
+ GTK_BINARY_AGE=9
  GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
  ac_help="$ac_help
-@@ -4099,7 +4101,7 @@
+@@ -4106,7 +4106,7 @@
  
  # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
index 04078301a13..de96d58fedc 100644
--- a/x11/gtk/patches/patch-ab
+++ b/x11/gtk/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.11 1999/08/28 09:36:33 rh Exp $
+$NetBSD: patch-ab,v 1.12 2001/03/10 10:50:38 drochner Exp $
 
---- gdk/Makefile.in.orig	Tue Aug 24 00:08:02 1999
-+++ gdk/Makefile.in	Fri Aug 27 20:51:55 1999
-@@ -136,7 +136,7 @@
+--- gdk/Makefile.in.orig	Fri Mar  2 20:49:25 2001
++++ gdk/Makefile.in	Wed Mar  7 21:54:58 2001
+@@ -135,7 +135,7 @@
  
  # libtool stuff: set version and export symbols for resolving
- libgdkincludedir = $(includedir)/gdk
+ libgdkincludedir = $(includedir)/gtk-1.2/gdk
 -libgdk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	@GLIB_DEPLIBS@		@x_ldflags@		@x_libs@		-lm		@STRIP_END@
-+libgdk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-export-dynamic 	@GLIB_DEPLIBS@		@x_ldflags@		@x_libs@		-lm		@STRIP_END@
++libgdk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	-export-dynamic 	@GLIB_DEPLIBS@		@x_ldflags@		@x_libs@		-lm		@STRIP_END@
  
  
  #
diff --git a/x11/gtk/patches/patch-ac b/x11/gtk/patches/patch-ac
index 1fbe03e66db..d5821ac3ee0 100644
--- a/x11/gtk/patches/patch-ac
+++ b/x11/gtk/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.10 1999/08/28 09:36:33 rh Exp $
+$NetBSD: patch-ac,v 1.11 2001/03/10 10:50:38 drochner Exp $
 
---- gtk/Makefile.in.orig	Tue Aug 24 00:08:04 1999
-+++ gtk/Makefile.in	Fri Aug 27 20:53:31 1999
-@@ -136,7 +136,7 @@
+--- gtk/Makefile.in.orig	Fri Mar  2 20:49:26 2001
++++ gtk/Makefile.in	Wed Mar  7 21:58:19 2001
+@@ -135,7 +135,7 @@
  
  # libtool stuff: set version and export symbols for resolving
- libgtkincludedir = $(includedir)/gtk
+ libgtkincludedir = $(includedir)/gtk-1.2/gtk
 -libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
 +libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
  
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 80850cac00e..0d0c4c003f6 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST,v 1.29 2001/02/26 21:42:57 tron Exp $
+@comment $NetBSD: PLIST,v 1.30 2001/03/10 10:50:38 drochner Exp $
 bin/gtk-config
+etc/gtk/gtkrc.az
+etc/gtk/gtkrc.be
+etc/gtk/gtkrc.cp1251
 etc/gtk/gtkrc.cs
 etc/gtk/gtkrc.hr
 etc/gtk/gtkrc.hu
+etc/gtk/gtkrc.mi
 etc/gtk/gtkrc.pl
 etc/gtk/gtkrc.sk
 etc/gtk/gtkrc.sl
@@ -23,7 +27,7 @@ etc/gtk/gtkrc.iso-8859-13
 etc/gtk/gtkrc.iso-8859-14
 etc/gtk/gtkrc.iso-8859-15
 etc/gtk/gtkrc.zh_CN
-etc/gtk/gtkrc.zh_TW.Big5
+etc/gtk/gtkrc.zh_TW.big5
 etc/gtk/gtkrc.ka_GE.georgianacademy
 etc/gtk/gtkrc.ka_GE.georgianps
 etc/gtk/gtkrc.vi_VN.tcvn
@@ -40,7 +44,6 @@ etc/gtk/gtkrc.ga
 etc/gtk/gtkrc.et
 etc/gtk/gtkrc.ka
 etc/gtk/gtkrc.vi_VN.viscii111
-etc/gtk/gtkrc.vi_VN.tcvn5712
 etc/gtk/gtkrc.vi
 etc/gtk/gtkrc.cp1255
 etc/gtk/gtkrc.sp
@@ -48,136 +51,138 @@ etc/gtk/gtkrc.he_IL.cp1255
 etc/gtk/gtkrc.he_IL.microsoftcp1255
 etc/gtk/gtkrc.yi
 etc/gtk/gtkrc.lv
-include/gdk/gdk.h
-include/gdk/gdkrgb.h
-include/gdk/gdkcursors.h
-include/gdk/gdki18n.h
-include/gdk/gdkkeysyms.h
-include/gdk/gdkprivate.h
-include/gdk/gdktypes.h
-include/gdk/gdkx.h
-include/gtk/gtk.h
-include/gtk/gtkaccelgroup.h
-include/gtk/gtkaccellabel.h
-include/gtk/gtkadjustment.h
-include/gtk/gtkalignment.h
-include/gtk/gtkarg.h
-include/gtk/gtkarrow.h
-include/gtk/gtkaspectframe.h
-include/gtk/gtkbbox.h
-include/gtk/gtkbin.h
-include/gtk/gtkbindings.h
-include/gtk/gtkbox.h
-include/gtk/gtkbutton.h
-include/gtk/gtkcalendar.h
-include/gtk/gtkcheckbutton.h
-include/gtk/gtkcheckmenuitem.h
-include/gtk/gtkclist.h
-include/gtk/gtkcolorsel.h
-include/gtk/gtkcombo.h
-include/gtk/gtkcontainer.h
-include/gtk/gtkctree.h
-include/gtk/gtkcurve.h
-include/gtk/gtkdata.h
-include/gtk/gtkdebug.h
-include/gtk/gtkdialog.h
-include/gtk/gtkdnd.h
-include/gtk/gtkdrawingarea.h
-include/gtk/gtkeditable.h
-include/gtk/gtkentry.h
-include/gtk/gtkenums.h
-include/gtk/gtkeventbox.h
-include/gtk/gtkfeatures.h
-include/gtk/gtkfilesel.h
-include/gtk/gtkfixed.h
-include/gtk/gtkfontsel.h
-include/gtk/gtkframe.h
-include/gtk/gtkgamma.h
-include/gtk/gtkgc.h
-include/gtk/gtkhandlebox.h
-include/gtk/gtkhbbox.h
-include/gtk/gtkhbox.h
-include/gtk/gtkhpaned.h
-include/gtk/gtkhruler.h
-include/gtk/gtkhscale.h
-include/gtk/gtkhscrollbar.h
-include/gtk/gtkhseparator.h
-include/gtk/gtkimage.h
-include/gtk/gtkinputdialog.h
-include/gtk/gtkinvisible.h
-include/gtk/gtkitem.h
-include/gtk/gtkitemfactory.h
-include/gtk/gtklabel.h
-include/gtk/gtklist.h
-include/gtk/gtklistitem.h
-include/gtk/gtkmain.h
-include/gtk/gtkmarshal.h
-include/gtk/gtkmenu.h
-include/gtk/gtkmenubar.h
-include/gtk/gtkmenufactory.h
-include/gtk/gtkmenuitem.h
-include/gtk/gtkmenushell.h
-include/gtk/gtkmisc.h
-include/gtk/gtknotebook.h
-include/gtk/gtkobject.h
-include/gtk/gtkoptionmenu.h
-include/gtk/gtkpacker.h
-include/gtk/gtkpaned.h
-include/gtk/gtkpixmap.h
-include/gtk/gtkpreview.h
-include/gtk/gtkprivate.h
-include/gtk/gtkprogress.h
-include/gtk/gtkprogressbar.h
-include/gtk/gtkradiobutton.h
-include/gtk/gtkradiomenuitem.h
-include/gtk/gtkrange.h
-include/gtk/gtkrc.h
-include/gtk/gtkruler.h
-include/gtk/gtkscale.h
-include/gtk/gtkscrollbar.h
-include/gtk/gtkscrolledwindow.h
-include/gtk/gtkselection.h
-include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
-include/gtk/gtkspinbutton.h
-include/gtk/gtkstatusbar.h
-include/gtk/gtkstyle.h
-include/gtk/gtktable.h
-include/gtk/gtktearoffmenuitem.h
-include/gtk/gtktext.h
-include/gtk/gtktipsquery.h
-include/gtk/gtktogglebutton.h
-include/gtk/gtktoolbar.h
-include/gtk/gtktooltips.h
-include/gtk/gtktree.h
-include/gtk/gtktreeitem.h
-include/gtk/gtktypebuiltins.h
-include/gtk/gtktypeutils.h
-include/gtk/gtkvbbox.h
-include/gtk/gtkvbox.h
-include/gtk/gtkviewport.h
-include/gtk/gtkvpaned.h
-include/gtk/gtkvruler.h
-include/gtk/gtkvscale.h
-include/gtk/gtkvscrollbar.h
-include/gtk/gtkvseparator.h
-include/gtk/gtkwidget.h
-include/gtk/gtkwindow.h
-include/gtk/gtkcompat.h
-include/gtk/gtklayout.h
-include/gtk/gtkplug.h
-include/gtk/gtksocket.h
-include/gtk/gtkthemes.h
+include/gtk-1.2/gdk/gdk.h
+include/gtk-1.2/gdk/gdkrgb.h
+include/gtk-1.2/gdk/gdkcursors.h
+include/gtk-1.2/gdk/gdki18n.h
+include/gtk-1.2/gdk/gdkkeysyms.h
+include/gtk-1.2/gdk/gdkprivate.h
+include/gtk-1.2/gdk/gdktypes.h
+include/gtk-1.2/gdk/gdkx.h
+include/gtk-1.2/gtk/gtk.h
+include/gtk-1.2/gtk/gtkaccelgroup.h
+include/gtk-1.2/gtk/gtkaccellabel.h
+include/gtk-1.2/gtk/gtkadjustment.h
+include/gtk-1.2/gtk/gtkalignment.h
+include/gtk-1.2/gtk/gtkarg.h
+include/gtk-1.2/gtk/gtkarrow.h
+include/gtk-1.2/gtk/gtkaspectframe.h
+include/gtk-1.2/gtk/gtkbbox.h
+include/gtk-1.2/gtk/gtkbin.h
+include/gtk-1.2/gtk/gtkbindings.h
+include/gtk-1.2/gtk/gtkbox.h
+include/gtk-1.2/gtk/gtkbutton.h
+include/gtk-1.2/gtk/gtkcalendar.h
+include/gtk-1.2/gtk/gtkcheckbutton.h
+include/gtk-1.2/gtk/gtkcheckmenuitem.h
+include/gtk-1.2/gtk/gtkclist.h
+include/gtk-1.2/gtk/gtkcolorsel.h
+include/gtk-1.2/gtk/gtkcombo.h
+include/gtk-1.2/gtk/gtkcontainer.h
+include/gtk-1.2/gtk/gtkctree.h
+include/gtk-1.2/gtk/gtkcurve.h
+include/gtk-1.2/gtk/gtkdata.h
+include/gtk-1.2/gtk/gtkdebug.h
+include/gtk-1.2/gtk/gtkdialog.h
+include/gtk-1.2/gtk/gtkdnd.h
+include/gtk-1.2/gtk/gtkdrawingarea.h
+include/gtk-1.2/gtk/gtkeditable.h
+include/gtk-1.2/gtk/gtkentry.h
+include/gtk-1.2/gtk/gtkenums.h
+include/gtk-1.2/gtk/gtkeventbox.h
+include/gtk-1.2/gtk/gtkfeatures.h
+include/gtk-1.2/gtk/gtkfilesel.h
+include/gtk-1.2/gtk/gtkfixed.h
+include/gtk-1.2/gtk/gtkfontsel.h
+include/gtk-1.2/gtk/gtkframe.h
+include/gtk-1.2/gtk/gtkgamma.h
+include/gtk-1.2/gtk/gtkgc.h
+include/gtk-1.2/gtk/gtkhandlebox.h
+include/gtk-1.2/gtk/gtkhbbox.h
+include/gtk-1.2/gtk/gtkhbox.h
+include/gtk-1.2/gtk/gtkhpaned.h
+include/gtk-1.2/gtk/gtkhruler.h
+include/gtk-1.2/gtk/gtkhscale.h
+include/gtk-1.2/gtk/gtkhscrollbar.h
+include/gtk-1.2/gtk/gtkhseparator.h
+include/gtk-1.2/gtk/gtkimage.h
+include/gtk-1.2/gtk/gtkinputdialog.h
+include/gtk-1.2/gtk/gtkinvisible.h
+include/gtk-1.2/gtk/gtkitem.h
+include/gtk-1.2/gtk/gtkitemfactory.h
+include/gtk-1.2/gtk/gtklabel.h
+include/gtk-1.2/gtk/gtklist.h
+include/gtk-1.2/gtk/gtklistitem.h
+include/gtk-1.2/gtk/gtkmain.h
+include/gtk-1.2/gtk/gtkmarshal.h
+include/gtk-1.2/gtk/gtkmenu.h
+include/gtk-1.2/gtk/gtkmenubar.h
+include/gtk-1.2/gtk/gtkmenufactory.h
+include/gtk-1.2/gtk/gtkmenuitem.h
+include/gtk-1.2/gtk/gtkmenushell.h
+include/gtk-1.2/gtk/gtkmisc.h
+include/gtk-1.2/gtk/gtknotebook.h
+include/gtk-1.2/gtk/gtkobject.h
+include/gtk-1.2/gtk/gtkoptionmenu.h
+include/gtk-1.2/gtk/gtkpacker.h
+include/gtk-1.2/gtk/gtkpaned.h
+include/gtk-1.2/gtk/gtkpixmap.h
+include/gtk-1.2/gtk/gtkpreview.h
+include/gtk-1.2/gtk/gtkprivate.h
+include/gtk-1.2/gtk/gtkprogress.h
+include/gtk-1.2/gtk/gtkprogressbar.h
+include/gtk-1.2/gtk/gtkradiobutton.h
+include/gtk-1.2/gtk/gtkradiomenuitem.h
+include/gtk-1.2/gtk/gtkrange.h
+include/gtk-1.2/gtk/gtkrc.h
+include/gtk-1.2/gtk/gtkruler.h
+include/gtk-1.2/gtk/gtkscale.h
+include/gtk-1.2/gtk/gtkscrollbar.h
+include/gtk-1.2/gtk/gtkscrolledwindow.h
+include/gtk-1.2/gtk/gtkselection.h
+include/gtk-1.2/gtk/gtkseparator.h
+include/gtk-1.2/gtk/gtksignal.h
+include/gtk-1.2/gtk/gtkspinbutton.h
+include/gtk-1.2/gtk/gtkstatusbar.h
+include/gtk-1.2/gtk/gtkstyle.h
+include/gtk-1.2/gtk/gtktable.h
+include/gtk-1.2/gtk/gtktearoffmenuitem.h
+include/gtk-1.2/gtk/gtktext.h
+include/gtk-1.2/gtk/gtktipsquery.h
+include/gtk-1.2/gtk/gtktogglebutton.h
+include/gtk-1.2/gtk/gtktoolbar.h
+include/gtk-1.2/gtk/gtktooltips.h
+include/gtk-1.2/gtk/gtktree.h
+include/gtk-1.2/gtk/gtktreeitem.h
+include/gtk-1.2/gtk/gtktypebuiltins.h
+include/gtk-1.2/gtk/gtktypeutils.h
+include/gtk-1.2/gtk/gtkvbbox.h
+include/gtk-1.2/gtk/gtkvbox.h
+include/gtk-1.2/gtk/gtkviewport.h
+include/gtk-1.2/gtk/gtkvpaned.h
+include/gtk-1.2/gtk/gtkvruler.h
+include/gtk-1.2/gtk/gtkvscale.h
+include/gtk-1.2/gtk/gtkvscrollbar.h
+include/gtk-1.2/gtk/gtkvseparator.h
+include/gtk-1.2/gtk/gtkwidget.h
+include/gtk-1.2/gtk/gtkwindow.h
+include/gtk-1.2/gtk/gtkcompat.h
+include/gtk-1.2/gtk/gtklayout.h
+include/gtk-1.2/gtk/gtkplug.h
+include/gtk-1.2/gtk/gtksocket.h
+include/gtk-1.2/gtk/gtkthemes.h
 lib/libgdk.so
 lib/libgdk.so.12
-lib/libgdk.so.12.8
+lib/libgdk.so.12.9
 lib/libgdk.a
 lib/libgdk.la
 lib/libgtk.so
 lib/libgtk.so.12
-lib/libgtk.so.12.8
+lib/libgtk.so.12.9
 lib/libgtk.a
 lib/libgtk.la
+lib/pkgconfig/gdk.pc
+lib/pkgconfig/gtk+.pc
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
 @unexec install-info --delete %D/info/gtk.info %D/info/dir
@@ -192,7 +197,12 @@ info/gtk.info-6
 @exec install-info %D/info/gdk.info %D/info/dir
 @exec install-info %D/info/gtk.info %D/info/dir
 share/aclocal/gtk.m4
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/sp/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtk+.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtk+.mo
@@ -231,6 +241,7 @@ share/themes/Default/gtk/gtkrc
 @dirrm share/themes/Default/gtk
 @dirrm share/themes/Default
 @dirrm share/themes
-@dirrm include/gtk
-@dirrm include/gdk
+@dirrm include/gtk-1.2/gtk
+@dirrm include/gtk-1.2/gdk
+@dirrm include/gtk-1.2
 @dirrm etc/gtk