Update gtk+ to 1.2.8. Overview of changes:

 * GNU Make 3.79 bug workaround
 * FAQ and tutorial updates and improvements
 * Miscellaneous bug fixes: CList, Calendar, rc-files, FontSelection

5 files changed, 26 insertions, 19 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index ffbb33bb5ce..60270c503a9 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2000/03/28 18:38:41 tron Exp $
+# $NetBSD: Makefile,v 1.42 2000/05/26 05:38:19 rh Exp $
 
-DISTNAME=	gtk+-1.2.7
+DISTNAME=	gtk+-1.2.8
 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.*:../../devel/gettext
-DEPENDS+=	glib>=1.2.7:../../devel/glib
+DEPENDS+=	glib>=1.2.8:../../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 0da133f10d0..03f9861d388 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.15 2000/03/12 22:30:06 tron Exp $
+$NetBSD: md5,v 1.16 2000/05/26 05:38:20 rh Exp $
 
-MD5 (gtk+-1.2.7.tar.gz) = cc20b2fc612c30be11cebc430ee39e91
+MD5 (gtk+-1.2.8.tar.gz) = d947ecc5780b4367d4c50fbb019d0216
diff --git a/x11/gtk/files/patch-sum b/x11/gtk/files/patch-sum
index 0b7bb95b7e4..5962e50605e 100644
--- a/x11/gtk/files/patch-sum
+++ b/x11/gtk/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.7 2000/05/02 18:48:44 danw Exp $
+$NetBSD: patch-sum,v 1.8 2000/05/26 05:38:21 rh Exp $
 
-MD5 (patch-aa) = 1349b1c8498056c8aea8d7d2615ed4e9
+MD5 (patch-aa) = fe100bb1f02b87744711d67d975a4764
 MD5 (patch-ab) = 884c71416aaaaee6dd2d410cb5a9cade
 MD5 (patch-ac) = 76bcc7c03a39f3562d365a8c57270189
 MD5 (patch-ad) = dec2132522595c59687fa3af05b75462
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index c2621dc2b33..f1f6ed000f9 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.17 2000/05/02 18:48:44 danw Exp $
+$NetBSD: patch-aa,v 1.18 2000/05/26 05:38:21 rh Exp $
 
---- configure.orig	Wed Feb 16 12:28:06 2000
-+++ configure	Sun Mar 12 22:45:47 2000
+--- configure.orig	Thu May 25 02:31:48 2000
++++ configure	Thu May 25 18:53:46 2000
 @@ -22,8 +22,8 @@
  #
  GTK_MAJOR_VERSION=1
  GTK_MINOR_VERSION=2
--GTK_MICRO_VERSION=7
--GTK_INTERFACE_AGE=2
-+GTK_MICRO_VERSION=19
-+GTK_INTERFACE_AGE=7
- GTK_BINARY_AGE=7
+-GTK_MICRO_VERSION=8
+-GTK_INTERFACE_AGE=3
++GTK_MICRO_VERSION=20
++GTK_INTERFACE_AGE=8
+ GTK_BINARY_AGE=8
  GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
  ac_help="$ac_help
 @@ -1393,6 +1393,7 @@
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.17 2000/05/02 18:48:44 danw Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -4094,7 +4096,7 @@
+@@ -4099,7 +4101,7 @@
  
  # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 83a9148b0ce..03969112a0c 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2000/03/12 22:30:07 tron Exp $
+@comment $NetBSD: PLIST,v 1.26 2000/05/26 05:38:21 rh Exp $
 bin/gtk-config
 etc/gtk/gtkrc.cs
 etc/gtk/gtkrc.hr
@@ -42,6 +42,12 @@ 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
+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
@@ -162,9 +168,9 @@ include/gtk/gtklayout.h
 include/gtk/gtkplug.h
 include/gtk/gtksocket.h
 include/gtk/gtkthemes.h
-lib/libgdk.so.12.7
+lib/libgdk.so.12.8
 lib/libgdk.a
-lib/libgtk.so.12.7
+lib/libgtk.so.12.8
 lib/libgtk.a
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
@@ -180,6 +186,7 @@ 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
+share/locale/nn/LC_MESSAGES/gtk+.mo
 share/locale/gl/LC_MESSAGES/gtk+.mo
 share/locale/lt/LC_MESSAGES/gtk+.mo
 share/locale/nl/LC_MESSAGES/gtk+.mo