Update gtk+ to 1.2.4

Overview of Changes in GTK+ 1.2.4:

 * DnD improvements (drags can be canceled with Esc now).
 * suppressed configure event reordering in Gdk.
 * rewrite of Gtk's configure event handling.
 * major improvements for the object argument system (Elena Devdariani).
 * major bugfixes for threading, GtkNotebook, GtkItemFactory, GtkCList and
   GtkCTree.
 * tutorial/FAQ updates, new file generation.txt on autogenerated sources.
 * configure's --with-glib= is "officially" unsupported.
 * upgrade to libtool 1.3.3.
 * various buglets fixed.

Overview of Changes in GTK+ 1.2.3:

 * Upgrade to libtool 1.3
 * Check for dgettext (for systems with old versions of GNU Gettext)
 * Many bug fixes (see ChangeLog for details)

7 files changed, 55 insertions, 43 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index c65cb0ccfd4..46d10fd64e9 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 1999/05/23 23:49:14 tv Exp $
+# $NetBSD: Makefile,v 1.33 1999/08/28 09:36:31 rh Exp $
 
-DISTNAME=	gtk+-1.2.2
+DISTNAME=	gtk+-1.2.4
 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/
 
 DEPENDS+=	gettext-0.10.35:../../devel/gettext
-DEPENDS+=	glib-1.2.2:../../devel/glib
+DEPENDS+=	glib-1.2.4:../../devel/glib
 BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
 
 USE_LIBTOOL=	yes
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index 59ddc82d8aa..7050bc2660d 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.12 1999/05/02 14:24:59 tron Exp $
+$NetBSD: md5,v 1.13 1999/08/28 09:36:32 rh Exp $
 
-MD5 (gtk+-1.2.2.tar.gz) = 2776dca7d9f907b7b851ac9a4d4fb304
+MD5 (gtk+-1.2.4.tar.gz) = 5bbdb0c73b426885c09098f0de20b711
diff --git a/x11/gtk/files/patch-sum b/x11/gtk/files/patch-sum
index 86007a1b32f..729a3b3800d 100644
--- a/x11/gtk/files/patch-sum
+++ b/x11/gtk/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:27 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/28 09:36:33 rh Exp $
 
-MD5 (patch-aa) = 7b84d3d6dca1f1b064bc01111e17b041
-MD5 (patch-ab) = def72db131862042922367a822e6c312
-MD5 (patch-ac) = 9d82505a9d22d0669b7388cdca2c2da0
+MD5 (patch-aa) = 6db2fdb34b98d0ab48d68def3385602c
+MD5 (patch-ab) = 884c71416aaaaee6dd2d410cb5a9cade
+MD5 (patch-ac) = 76bcc7c03a39f3562d365a8c57270189
 MD5 (patch-ad) = dec2132522595c59687fa3af05b75462
 MD5 (patch-ae) = 64ca7aa504acc04b1f15f1caf62a88ee
 MD5 (patch-af) = c3ac2a236275341e06d6a6566b876759
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 3cc56fb5437..0800a6cea97 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,18 +1,17 @@
-$NetBSD: patch-aa,v 1.11 1999/05/02 14:24:59 tron Exp $
+$NetBSD: patch-aa,v 1.12 1999/08/28 09:36:33 rh Exp $
 
---- configure.orig	Thu Mar 25 06:24:30 1999
-+++ configure	Fri Apr 16 21:30:53 1999
+--- configure.orig	Mon Aug 23 23:31:31 1999
++++ configure	Fri Aug 27 20:54:25 1999
 @@ -22,7 +22,7 @@
  #
  GTK_MAJOR_VERSION=1
  GTK_MINOR_VERSION=2
--GTK_MICRO_VERSION=2
--GTK_INTERFACE_AGE=0
-+GTK_MICRO_VERSION=14
-+GTK_INTERFACE_AGE=2
- GTK_BINARY_AGE=2
+-GTK_MICRO_VERSION=4
++GTK_MICRO_VERSION=15
+ GTK_INTERFACE_AGE=2
+ GTK_BINARY_AGE=4
  GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
-@@ -1599,6 +1599,7 @@
+@@ -1389,6 +1389,7 @@
  
  
  # Check for any special flags to pass to ltconfig.
@@ -20,7 +19,7 @@ $NetBSD: patch-aa,v 1.11 1999/05/02 14:24:59 tron Exp $
  libtool_flags="--cache-file=$cache_file"
  test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
  test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-@@ -1894,6 +1895,7 @@
+@@ -1541,6 +1542,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -28,7 +27,7 @@ $NetBSD: patch-aa,v 1.11 1999/05/02 14:24:59 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -4506,7 +4508,7 @@
+@@ -4076,7 +4078,7 @@
  
  # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
@@ -37,7 +36,7 @@ $NetBSD: patch-aa,v 1.11 1999/05/02 14:24:59 tron Exp $
  
  
  echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
-@@ -7421,10 +7423,12 @@
+@@ -6990,10 +6992,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
index 7e1134e572c..04078301a13 100644
--- a/x11/gtk/patches/patch-ab
+++ b/x11/gtk/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.10 1999/03/05 11:32:22 tron Exp $
+$NetBSD: patch-ab,v 1.11 1999/08/28 09:36:33 rh Exp $
 
---- gdk/Makefile.in.orig	Thu Feb 25 21:15:33 1999
-+++ gdk/Makefile.in	Wed Mar  3 23:33:09 1999
-@@ -139,7 +139,7 @@
- LDADDS =  	@x_ldflags@		@x_libs@		@GLIB_LIBS@		-lm
+--- 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 @@
  
+ # libtool stuff: set version and export symbols for resolving
+ libgdkincludedir = $(includedir)/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 =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)          @GLIB_DEPLIBS@	         @x_ldflags@	         @x_libs@	         -lm
-+libgdk_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)          @GLIB_DEPLIBS@	         @x_ldflags@	         @x_libs@	         -lm
  
- 
- EXTRA_PROGRAMS = gxid
+ #
diff --git a/x11/gtk/patches/patch-ac b/x11/gtk/patches/patch-ac
index 1aa96eea47e..1fbe03e66db 100644
--- a/x11/gtk/patches/patch-ac
+++ b/x11/gtk/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.9 1999/03/05 11:32:22 tron Exp $
+$NetBSD: patch-ac,v 1.10 1999/08/28 09:36:33 rh Exp $
 
---- gtk/Makefile.in.orig	Thu Feb 25 21:15:36 1999
-+++ gtk/Makefile.in	Wed Mar  3 23:37:29 1999
-@@ -152,7 +152,7 @@
- gdk_headers =  	../gdk/gdktypes.h 	../gdk/gdkrgb.h
- 
- 
--libgtk_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm
-+libgtk_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 						@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm
+--- 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 @@
+ 
+ # libtool stuff: set version and export symbols for resolving
+ libgtkincludedir = $(includedir)/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@
  
  #	$(top_builddir)/gdk/libgdk.la
  
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 39214a90b82..7d6d5de384f 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,8 +1,15 @@
-@comment $NetBSD: PLIST,v 1.20 1999/05/02 14:24:59 tron Exp $
+@comment $NetBSD: PLIST,v 1.21 1999/08/28 09:36:34 rh Exp $
 bin/gtk-config
+etc/gtk/gtkrc.cs
+etc/gtk/gtkrc.hr
+etc/gtk/gtkrc.hu
+etc/gtk/gtkrc.pl
+etc/gtk/gtkrc.sk
+etc/gtk/gtkrc.sl
 etc/gtk/gtkrc.ja
 etc/gtk/gtkrc.ko
 etc/gtk/gtkrc.ru
+etc/gtk/gtkrc.iso-8859-2
 include/gdk/gdk.h
 include/gdk/gdkrgb.h
 include/gdk/gdkcursors.h
@@ -123,9 +130,9 @@ include/gtk/gtklayout.h
 include/gtk/gtkplug.h
 include/gtk/gtksocket.h
 include/gtk/gtkthemes.h
-lib/libgdk.so.12.2
+lib/libgdk.so.13.2
 lib/libgdk.a
-lib/libgtk.so.12.2
+lib/libgtk.so.13.2
 lib/libgtk.a
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
@@ -149,12 +156,18 @@ share/locale/sv/LC_MESSAGES/gtk+.mo
 share/locale/pt/LC_MESSAGES/gtk+.mo
 share/locale/ja/LC_MESSAGES/gtk+.mo
 share/locale/pl/LC_MESSAGES/gtk+.mo
-share/locale/nl/LC_MESSAGES/gtk+.mo
 share/locale/cs/LC_MESSAGES/gtk+.mo
 share/locale/es/LC_MESSAGES/gtk+.mo
 share/locale/ru/LC_MESSAGES/gtk+.mo
 share/locale/hu/LC_MESSAGES/gtk+.mo
 share/locale/it/LC_MESSAGES/gtk+.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
+share/locale/ca/LC_MESSAGES/gtk+.mo
+share/locale/fi/LC_MESSAGES/gtk+.mo
+share/locale/sk/LC_MESSAGES/gtk+.mo
+share/locale/wa/LC_MESSAGES/gtk+.mo
+share/locale/hr/LC_MESSAGES/gtk+.mo
+share/locale/sl/LC_MESSAGES/gtk+.mo
 share/themes/Default/gtk/gtkrc
 @unexec rmdir %D/share/aclocal 2>/dev/null || true
 @dirrm share/themes/Default/gtk