Update "gtk" package to version 1.2.1 on request by Tim Rightnour.

4 files changed, 26 insertions, 25 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 4460a11996c..0329119e25a 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 1999/03/04 08:54:37 tron Exp $
+# $NetBSD: Makefile,v 1.29 1999/04/16 20:09:08 tron Exp $
 
-DISTNAME=	gtk+-1.2.0
+DISTNAME=	gtk+-1.2.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -11,7 +11,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gtk.org/
 
 DEPENDS+=	gettext-0.10.35:../../devel/gettext
-DEPENDS+=	glib-1.2.0:../../devel/glib
+DEPENDS+=	glib-1.2.1:../../devel/glib
 BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
 
 USE_LIBTOOL=	yes
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index 3cc6e36773d..76555bc658d 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.10 1999/03/04 08:54:37 tron Exp $
+$NetBSD: md5,v 1.11 1999/04/16 20:09:08 tron Exp $
 
-MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9
+MD5 (gtk+-1.2.1.tar.gz) = 14803407da09e463fd7fd686dec25bbf
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 93a6c8d7744..8d2cef4bc5c 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,33 +1,34 @@
-$NetBSD: patch-aa,v 1.9 1999/03/09 22:44:58 tron Exp $
+$NetBSD: patch-aa,v 1.10 1999/04/16 20:09:08 tron Exp $
 
---- configure.orig	Thu Feb 25 12:02:28 1999
-+++ configure	Tue Mar  9 23:23:53 1999
+--- configure.orig	Thu Mar 25 06:24:30 1999
++++ configure	Fri Apr 16 21:30:53 1999
 @@ -22,7 +22,7 @@
  #
  GTK_MAJOR_VERSION=1
  GTK_MINOR_VERSION=2
--GTK_MICRO_VERSION=0
-+GTK_MICRO_VERSION=12
- GTK_INTERFACE_AGE=0
- GTK_BINARY_AGE=0
+-GTK_MICRO_VERSION=1
+-GTK_INTERFACE_AGE=0
++GTK_MICRO_VERSION=13
++GTK_INTERFACE_AGE=1
+ GTK_BINARY_AGE=1
  GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
-@@ -1600,6 +1600,7 @@
-   ac_tool_prefix=
- fi
+@@ -1599,6 +1599,7 @@
  
+ 
+ # Check for any special flags to pass to ltconfig.
 +if false; then
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+@@ -1894,6 +1895,7 @@
+ 
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1832,6 +1833,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 +fi
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -4444,7 +4446,7 @@
+@@ -4506,7 +4508,7 @@
  
  # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
@@ -36,7 +37,7 @@ $NetBSD: patch-aa,v 1.9 1999/03/09 22:44:58 tron Exp $
  
  
  echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
-@@ -7356,10 +7358,12 @@
+@@ -7421,10 +7423,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index f7044b6a7c2..de204f74fb8 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 1999/03/05 11:32:23 tron Exp $
+@comment $NetBSD: PLIST,v 1.19 1999/04/16 20:09:08 tron Exp $
 bin/gtk-config
 etc/gtk/gtkrc.ja
 etc/gtk/gtkrc.ko
@@ -123,9 +123,9 @@ include/gtk/gtklayout.h
 include/gtk/gtkplug.h
 include/gtk/gtksocket.h
 include/gtk/gtkthemes.h
-lib/libgdk.so.12.0
+lib/libgdk.so.12.1
 lib/libgdk.a
-lib/libgtk.so.12.0
+lib/libgtk.so.12.1
 lib/libgtk.a
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir