The never ending gnome story:

Update "gtk+" package to version 1.1.12.

5 files changed, 45 insertions, 31 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index dff3da0c08b..395d94ce2b1 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 1998/12/28 20:49:55 tron Exp $
+# $NetBSD: Makefile,v 1.25 1999/01/16 01:43:29 tron Exp $
 
-DISTNAME=	gtk+-1.1.9
+DISTNAME=	gtk+-1.1.12
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -11,7 +11,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gtk.org/
 
 DEPENDS+=	gettext-0.10.35:../../devel/gettext
-DEPENDS+=	glib-1.1.9:../../devel/glib
+DEPENDS+=	glib-1.1.12:../../devel/glib
 BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
 
 CONFLICTS=	gtk+-*
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index 9f7a0486c90..aa60943f46c 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 1998/12/18 23:53:16 tron Exp $
+$NetBSD: md5,v 1.9 1999/01/16 01:43:30 tron Exp $
 
-MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805
+MD5 (gtk+-1.1.12.tar.gz) = e8430577fe750e463db2238d6190281e
diff --git a/x11/gtk/patches/patch-ac b/x11/gtk/patches/patch-ac
index 1491c49e562..4045034b571 100644
--- a/x11/gtk/patches/patch-ac
+++ b/x11/gtk/patches/patch-ac
@@ -1,13 +1,12 @@
-$NetBSD: patch-ac,v 1.6 1998/12/18 23:53:16 tron Exp $
+$NetBSD: patch-ac,v 1.7 1999/01/16 01:43:30 tron Exp $
 
---- gtk/Makefile.in.orig	Thu Dec 17 07:33:52 1998
-+++ gtk/Makefile.in	Fri Dec 18 23:52:34 1998
-@@ -369,7 +369,7 @@
- 	../gdk/gdkrgb.h
+--- gtk/Makefile.in.orig	Mon Jan  4 10:55:25 1999
++++ gtk/Makefile.in	Sat Jan 16 01:37:56 1999
+@@ -371,7 +371,6 @@
  
  libgtk_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
-+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- 	@GLIB_LIBS@ 			\
- 	@x_ldflags@			\
- 	@x_libs@ 			\
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
+-	-release $(LT_RELEASE) 					\
+ 	@GLIB_LIBS@ 						\
+ 	@x_ldflags@						\
+ 	@x_libs@ 						\
diff --git a/x11/gtk/patches/patch-ad b/x11/gtk/patches/patch-ad
deleted file mode 100644
index 8f80191f877..00000000000
--- a/x11/gtk/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1998/12/18 23:53:16 tron Exp $
-
---- Makefile.in.orig	Sat Dec 19 00:07:51 1998
-+++ Makefile.in	Sat Dec 19 00:07:22 1998
-@@ -118,7 +118,7 @@
- xinput_progs = @xinput_progs@
- 
- SRC_SUBDIRS = gdk gtk
--SUBDIRS = po $(SRC_SUBDIRS) docs
-+SUBDIRS = $(SRC_SUBDIRS) docs
- 
- bin_SCRIPTS = gtk-config
- 
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 0d8cd055fbd..5fc3e5adf6f 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 1998/12/18 23:53:16 tron Exp $
+@comment $NetBSD: PLIST,v 1.16 1999/01/16 01:43:30 tron Exp $
 bin/gtk-config
 include/gdk/gdk.h
 include/gdk/gdkrgb.h
@@ -121,9 +121,9 @@ include/gtk/gtkplug.h
 include/gtk/gtksocket.h
 include/gtk/gtkthemes.h
 include/gtk/gtkintl.h
-lib/libgdk.so.9.0
+lib/libgdk.so.11.1
 lib/libgdk.a
-lib/libgtk.so.9.0
+lib/libgtk.so.11.1
 lib/libgtk.a
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
@@ -138,11 +138,39 @@ info/gtk.info-3
 info/gtk.info-4
 info/gtk.info-5
 info/gtk.info-6
+lib/locale/ko/LC_MESSAGES/gtk+.mo
+lib/locale/fr/LC_MESSAGES/gtk+.mo
+lib/locale/de/LC_MESSAGES/gtk+.mo
+lib/locale/no/LC_MESSAGES/gtk+.mo
+lib/locale/sv/LC_MESSAGES/gtk+.mo
+lib/locale/pt/LC_MESSAGES/gtk+.mo
+lib/locale/ja/LC_MESSAGES/gtk+.mo
+lib/locale/pl/LC_MESSAGES/gtk+.mo
+lib/locale/nl/LC_MESSAGES/gtk+.mo
 share/aclocal/gtk.m4
 share/themes/Default/gtk/gtkrc
 @unexec rmdir %D/share/aclocal 2>/dev/null || true
 @dirrm include/gtk
 @dirrm include/gdk
+@dirrm lib/locale/de/LC_MESSAGES
+@dirrm lib/locale/de
+@dirrm lib/locale/fr/LC_MESSAGES
+@dirrm lib/locale/fr
+@dirrm lib/locale/nl/LC_MESSAGES
+@dirrm lib/locale/nl
+@dirrm lib/locale/pt/LC_MESSAGES
+@dirrm lib/locale/pt
+@dirrm lib/locale/ja/LC_MESSAGES
+@dirrm lib/locale/ja
+@dirrm lib/locale/sv/LC_MESSAGES
+@dirrm lib/locale/sv
+@dirrm lib/locale/pl/LC_MESSAGES
+@dirrm lib/locale/pl
+@dirrm lib/locale/no/LC_MESSAGES
+@dirrm lib/locale/no
+@dirrm lib/locale/ko/LC_MESSAGES
+@dirrm lib/locale/ko
+@dirrm lib/locale
 @dirrm share/themes/Default/gtk
 @dirrm share/themes/Default
 @dirrm share/themes