Update "gtk+" package to version 1.1.2.

5 files changed, 39 insertions, 11 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index abe5d886f64..649ef313999 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 1998/08/20 22:16:38 tron Exp $
+# $NetBSD: Makefile,v 1.18 1998/10/04 18:27:47 tron Exp $
 
-DISTNAME=	gtk+-1.1.1
+DISTNAME=	gtk+-1.1.2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.1/ \
 		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.1/ \
@@ -9,9 +9,9 @@ MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.1/ \
 MAINTAINER=	bsieker@techfak.uni-bielefeld.de
 HOMEPAGE=	http://www.gtk.org/
 
-DEPENDS+=	glib-1.1.2:../../devel/glib
+DEPENDS+=	glib-1.1.3:../../devel/glib
 
-CONFLICTS=	gtk+-1.0.0 gtk+-1.0.4
+CONFLICTS=	gtk+-1.0.0 gtk+-1.0.4 gtk+-1.1.1
 
 USE_LIBTOOL=	yes
 USE_X11=	yes
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index 11054d19473..97a90eab79c 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1998/08/20 22:16:38 tron Exp $
+$NetBSD: md5,v 1.6 1998/10/04 18:27:47 tron Exp $
 
-MD5 (gtk+-1.1.1.tar.gz) = 9725821ec86dbe570f45fc81b8457202
+MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
diff --git a/x11/gtk/patches/patch-ac b/x11/gtk/patches/patch-ac
new file mode 100644
index 00000000000..c59b8dfcd6d
--- /dev/null
+++ b/x11/gtk/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.4 1998/10/04 18:27:47 tron Exp $
+
+--- gdk/Makefile.in.orig	Tue Sep 22 05:47:10 1998
++++ gdk/Makefile.in	Sun Oct  4 20:09:56 1998
+@@ -141,7 +141,7 @@
+ 	gdkx.h
+ 
+ libgdk_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+          @x_ldflags@ @x_libs@
+ 
+ INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ 
diff --git a/x11/gtk/patches/patch-ad b/x11/gtk/patches/patch-ad
new file mode 100644
index 00000000000..c674c9c7413
--- /dev/null
+++ b/x11/gtk/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 1998/10/04 18:27:47 tron Exp $
+
+--- gtk/Makefile.in.orig	Tue Sep 22 05:47:15 1998
++++ gtk/Makefile.in	Sun Oct  4 20:10:29 1998
+@@ -330,7 +330,7 @@
+ # makeenums.h: @REBUILD@ gtk.h gtkprivate.h
+ 
+ libgtk_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ EXTRA_DIST = \
+ 	line-arrow.xbm 		\
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 24c9a4005e9..ee9a306d41e 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 1998/08/20 22:16:39 tron Exp $
+@comment $NetBSD: PLIST,v 1.13 1998/10/04 18:27:47 tron Exp $
 bin/gtk-config
 include/gdk/gdk.h
 include/gdk/gdkrgb.h
@@ -92,6 +92,7 @@ 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
@@ -111,10 +112,10 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-lib/libgdk-1.1.so.1.0
-lib/libgdk-1.1.a
-lib/libgtk-1.1.so.1.0
-lib/libgtk-1.1.a
+lib/libgdk.so.2.0
+lib/libgdk.a
+lib/libgtk.so.2.0
+lib/libgtk.a
 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
@@ -127,6 +128,7 @@ info/gtk.info-2
 info/gtk.info-3
 info/gtk.info-4
 info/gtk.info-5
+info/gtk.info-6
 share/aclocal/gtk.m4
 @unexec rmdir %D/share/aclocal 2>/dev/null || true
 @dirrm include/gtk