Update gtk+ to version 1.0.4 using changes supplied by Bernk Sieker.

5 files changed, 33 insertions, 30 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 920290df36e..9cfa118aacc 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 1998/04/17 09:37:25 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/06/20 21:54:59 tron Exp $
 
-DISTNAME=	gtk+-1.0.0
+DISTNAME=	gtk+-1.0.4
 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/ \
@@ -8,6 +8,8 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.0/ \
 
 MAINTAINER=	bsieker@techfak.uni-bielefeld.de
 
+CONFLICTS=	gtk+-1.0.0
+
 GNU_CONFIGURE=  yes
 USE_X11=	yes
 USE_GTEXINFO=	yes
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index 47427fe36b9..897c051ddc0 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1 +1 @@
-MD5 (gtk+-1.0.0.tar.gz) = 9459cc56e82b9e21583715907febe235
+MD5 (gtk+-1.0.4.tar.gz) = 48852e0288f2e611aa6b248ff872678f
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 44d805920d1..ee02c02f98b 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,11 +1,10 @@
---- configure.orig	Sat Apr 11 14:26:55 1998
-+++ configure	Sat Apr 11 14:29:01 1998
-@@ -645,7 +645,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
- 
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
- echo "configure:652: checking whether build environment is sane" >&5
+--- glib/configure.orig	Sat Jun  6 07:40:29 1998
++++ glib/configure	Sat Jun  6 07:39:57 1998
+@@ -574,6 +574,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:577: checking for a BSD compatible install" >&5
++INSTALL=""
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
index 8f27a009567..32e08c37636 100644
--- a/x11/gtk/patches/patch-ab
+++ b/x11/gtk/patches/patch-ab
@@ -1,10 +1,11 @@
---- glib/configure.orig	Sat Apr 11 14:29:32 1998
-+++ glib/configure	Sat Apr 11 14:30:28 1998
-@@ -570,6 +570,7 @@
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:573: checking for a BSD compatible install" >&5
-+INSTALL=""
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+--- configure.orig	Sat Jun  6 20:45:12 1998
++++ configure	Sat Jun  6 20:45:37 1998
+@@ -638,7 +638,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+ 
+ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+ echo "configure:645: checking whether build environment is sane" >&5
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index d57f2908494..54460a3a8b8 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/04/14 23:16:00 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/06/20 21:55:02 tron Exp $
 bin/gtk-config
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
@@ -33,6 +33,7 @@ include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
+include/gtk/gtkfeatures.h
 include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
@@ -104,13 +105,14 @@ include/gtk/gtkwindow.h
 lib/glib/include/glibconfig.h
 lib/libgdk.a
 lib/libgdk.la
-lib/libgdk.so.1.0
+lib/libgdk.so.1.4
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so.1.0
+lib/libglib.so.1.4
 lib/libgtk.a
 lib/libgtk.la
-lib/libgtk.so.1.0
+lib/libgtk.so.1.4
+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
@@ -122,11 +124,10 @@ info/gtk.info-2
 info/gtk.info-3
 info/gtk.info-4
 info/gtk.info-5
-share/aclocal/gtk.m4
-@exec ([ ! -f %D/info/dir ] && /usr/bin/sed -ne '1,/Menu:/p' ${LOCALBASE}/info/dir > %D/info/dir) || /usr/bin/true
 @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
+share/aclocal/gtk.m4
 @exec /sbin/ldconfig || /usr/bin/true
 @unexec /sbin/ldconfig || /usr/bin/true
 @dirrm share/aclocal