Update "gtk+" package to version 1.1.1.

5 files changed, 72 insertions, 54 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 601a7625e36..abe5d886f64 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.16 1998/08/20 15:17:34 tsarna Exp $
+# $NetBSD: Makefile,v 1.17 1998/08/20 22:16:38 tron Exp $
 
-DISTNAME=	gtk+-1.0.4
+DISTNAME=	gtk+-1.1.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.0/ \
-		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.0/ \
-		ftp://ftp.flirble.org/pub/X/gimp/pub/gtk/v1.0/
+MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.1/ \
+		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.1/ \
+		ftp://ftp.flirble.org/pub/X/gimp/pub/gtk/v1.1/
 
 MAINTAINER=	bsieker@techfak.uni-bielefeld.de
 HOMEPAGE=	http://www.gtk.org/
 
-CONFLICTS=	gtk+-1.0.0
+DEPENDS+=	glib-1.1.2:../../devel/glib
+
+CONFLICTS=	gtk+-1.0.0 gtk+-1.0.4
 
 USE_LIBTOOL=	yes
 USE_X11=	yes
@@ -19,6 +21,6 @@ CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 
 CFLAGS=		-pipe -O2
-INFO_FILES=	gdk.info glib.info gtk.info
+INFO_FILES=	gdk.info gtk.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index f3e22ef6e1e..11054d19473 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/08/07 13:29:04 agc Exp $
+$NetBSD: md5,v 1.5 1998/08/20 22:16:38 tron Exp $
 
-MD5 (gtk+-1.0.4.tar.gz) = 48852e0288f2e611aa6b248ff872678f
+MD5 (gtk+-1.1.1.tar.gz) = 9725821ec86dbe570f45fc81b8457202
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
index 744543c64df..5d080628499 100644
--- a/x11/gtk/patches/patch-ab
+++ b/x11/gtk/patches/patch-ab
@@ -1,21 +1,47 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 11:18:05 agc Exp $
-
---- glib/configure.orig	Tue Jun  2 01:31:43 1998
-+++ glib/configure	Sat Jul 18 10:48:59 1998
-@@ -1208,6 +1208,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1253,7 +1254,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+--- 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@
+ 
+-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
+-
 -
-+fi
+ 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:
  
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
- echo "configure:1260: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff --git a/x11/gtk/patches/patch-ac b/x11/gtk/patches/patch-ac
deleted file mode 100644
index 1bf48bc46af..00000000000
--- a/x11/gtk/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:18:05 agc Exp $
-
---- glib/Makefile.in.orig	Tue Jun  2 07:39:16 1998
-+++ glib/Makefile.in	Wed Jul 15 23:08:25 1998
-@@ -74,7 +74,7 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
- 
--configincludedir = $(pkglibdir)/include
-+configincludedir = @includedir@
- 
- lib_LTLIBRARIES = libglib.la
- 
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 08265cc0b97..24c9a4005e9 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,16 +1,24 @@
-@comment $NetBSD: PLIST,v 1.11 1998/07/18 23:14:28 tv Exp $
+@comment $NetBSD: PLIST,v 1.12 1998/08/20 22:16:39 tron Exp $
 bin/gtk-config
 include/gdk/gdk.h
+include/gdk/gdkrgb.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
 include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
-include/glib.h
-include/glibconfig.h
 include/gtk/gtk.h
-include/gtk/gtkaccelerator.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/gtkarrow.h
@@ -103,21 +111,16 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-lib/libgdk.a
-lib/libgdk.so.1.4
-lib/libglib.a
-lib/libglib.so.1.4
-lib/libgtk.a
-lib/libgtk.so.1.4
+lib/libgdk-1.1.so.1.0
+lib/libgdk-1.1.a
+lib/libgtk-1.1.so.1.0
+lib/libgtk-1.1.a
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/glib.info %D/info/dir
 @unexec install-info --delete %D/info/gtk.info %D/info/dir
 info/gdk.info
-info/glib.info
 info/gtk.info
 @exec install-info %D/info/gdk.info %D/info/dir
-@exec install-info %D/info/glib.info %D/info/dir
 @exec install-info %D/info/gtk.info %D/info/dir
 info/gtk.info-1
 info/gtk.info-2