Update "gtk+" package to version 1.1.3 using patches by

Frank van der Linden.

5 files changed, 41 insertions, 73 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 22780c6a37e..a8abd262230 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 1998/10/04 23:27:39 tron Exp $
+# $NetBSD: Makefile,v 1.20 1998/11/21 22:15:15 tron Exp $
 
-DISTNAME=	gtk+-1.1.2
+DISTNAME=	gtk+-1.1.3
 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,12 +9,13 @@ MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.1/ \
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gtk.org/
 
-DEPENDS+=	glib-1.1.3:../../devel/glib
+DEPENDS+=	glib-1.1.4:../../devel/glib
 
-CONFLICTS=	gtk+-1.0.0 gtk+-1.0.4 gtk+-1.1.1
+CONFLICTS=	gtk+-1.0.0 gtk+-1.0.4 gtk+-1.1.1 gtk+-1.1.2
 
 USE_LIBTOOL=	yes
 USE_X11=	yes
+USE_GMAKE=	yes
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index 97a90eab79c..a29aaf56e1c 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1998/10/04 18:27:47 tron Exp $
+$NetBSD: md5,v 1.7 1998/11/21 22:15:15 tron Exp $
 
-MD5 (gtk+-1.1.2.tar.gz) = d1abc3deded1a4647b0941c1319130ce
+MD5 (gtk+-1.1.3.tar.gz) = a021cabaf8dec713d35bbd5d4e62681f
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
index b1affb6b325..5c9992afc06 100644
--- a/x11/gtk/patches/patch-ab
+++ b/x11/gtk/patches/patch-ab
@@ -1,49 +1,13 @@
-$NetBSD: patch-ab,v 1.6 1998/11/12 14:51:16 agc Exp $
+$NetBSD: patch-ab,v 1.7 1998/11/21 22:15:15 tron Exp $
 
---- docs/Makefile.in.orig	Wed Aug  5 07:06:20 1998
-+++ docs/Makefile.in	Thu Aug 20 23:57:52 1998
-@@ -90,7 +90,7 @@
- x_libs = @x_libs@
- xinput_progs = @xinput_progs@
+--- 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
  
--info_TEXINFOS = gdk.texi gtk.texi glib.texi
-+info_TEXINFOS = gdk.texi gtk.texi
- 
- man_MANS = gtk-config.1
- 
-@@ -119,9 +119,9 @@
- CONFIG_CLEAN_FILES = 
- TEXI2DVI = texi2dvi
- TEXINFO_TEX = $(srcdir)/texinfo.tex
--INFO_DEPS = gdk.info gtk.info glib.info
--DVIS = gdk.dvi gtk.dvi glib.dvi
--TEXINFOS = gdk.texi gtk.texi glib.texi
-+INFO_DEPS = gdk.info gtk.info
-+DVIS = gdk.dvi gtk.dvi
-+TEXINFOS = gdk.texi gtk.texi
- man1dir = $(mandir)/man1
- MANS = $(man_MANS)
- 
-@@ -153,10 +153,6 @@
- gtk.dvi: gtk.texi
- 
- 
--glib.info: glib.texi
--glib.dvi: glib.texi
--
--
- DVIPS = dvips
- 
- .texi.info:
-@@ -252,10 +248,7 @@
- 	  gdk.ps gdk.log gdk.pg gdk.toc gdk.tp gdk.tps gdk.vr gdk.vrs \
- 	  gdk.op gdk.tr gdk.cv gdk.cn gtk.aux gtk.cp gtk.cps gtk.dvi \
- 	  gtk.fn gtk.fns gtk.ky gtk.kys gtk.ps gtk.log gtk.pg gtk.toc \
--	  gtk.tp gtk.tps gtk.vr gtk.vrs gtk.op gtk.tr gtk.cv gtk.cn \
--	  glib.aux glib.cp glib.cps glib.dvi glib.fn glib.fns glib.ky \
--	  glib.kys glib.ps glib.log glib.pg glib.toc glib.tp glib.tps \
--	  glib.vr glib.vrs glib.op glib.tr glib.cv glib.cn
-+	  gtk.tp gtk.tps gtk.vr gtk.vrs gtk.op gtk.tr gtk.cv gtk.cn
- 
- clean-aminfo:
+ 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-ac b/x11/gtk/patches/patch-ac
index c59b8dfcd6d..fe232eba10e 100644
--- a/x11/gtk/patches/patch-ac
+++ b/x11/gtk/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.4 1998/10/04 18:27:47 tron Exp $
+$NetBSD: patch-ac,v 1.5 1998/11/21 22:15:15 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
+--- 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
  
- 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@
+ libgtk_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
- INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ 
+ EXTRA_DIST = \
+ 	line-arrow.xbm 		\
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index ee9a306d41e..1149526ad55 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 1998/10/04 18:27:47 tron Exp $
+@comment $NetBSD: PLIST,v 1.14 1998/11/21 22:15:15 tron Exp $
 bin/gtk-config
 include/gdk/gdk.h
 include/gdk/gdkrgb.h
@@ -11,32 +11,29 @@ include/gdk/gdkx.h
 include/gtk/gtk.h
 include/gtk/gtkaccelgroup.h
 include/gtk/gtkaccellabel.h
-include/gtk/gtkarg.h
-include/gtk/gtkbindings.h
-include/gtk/gtkctree.h
-include/gtk/gtkfontsel.h
-include/gtk/gtkitemfactory.h
-include/gtk/gtkmarshal.h
-include/gtk/gtkpacker.h
-include/gtk/gtkprogress.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
@@ -45,6 +42,7 @@ 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
@@ -58,11 +56,14 @@ 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
@@ -72,10 +73,12 @@ 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
@@ -112,9 +115,9 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-lib/libgdk.so.2.0
+lib/libgdk.so.3.0
 lib/libgdk.a
-lib/libgtk.so.2.0
+lib/libgtk.so.3.0
 lib/libgtk.a
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir