Update "glib" package to version 1.2.1.

4 files changed, 19 insertions, 23 deletions

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index dee1eb141b3..48dff545c8c 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 1999/03/04 08:50:43 tron Exp $
+# $NetBSD: Makefile,v 1.14 1999/04/16 19:18:54 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
-DISTNAME=	glib-1.2.0
+DISTNAME=	glib-1.2.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/devel/glib/files/md5 b/devel/glib/files/md5
index 44150b81e67..ece937d8e2c 100644
--- a/devel/glib/files/md5
+++ b/devel/glib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1999/03/04 08:50:43 tron Exp $
+$NetBSD: md5,v 1.7 1999/04/16 19:18:55 tron Exp $
 
-MD5 (glib-1.2.0.tar.gz) = b19f308dbbd393b6199e743cb1c648a1
+MD5 (glib-1.2.1.tar.gz) = 0112ac41fcda09f009982559a382f04d
diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad
index fa206783fb3..f44898de903 100644
--- a/devel/glib/patches/patch-ad
+++ b/devel/glib/patches/patch-ad
@@ -1,34 +1,30 @@
-$NetBSD: patch-ad,v 1.3 1999/03/09 22:04:39 tron Exp $
+$NetBSD: patch-ad,v 1.4 1999/04/16 19:18:55 tron Exp $
 
---- configure.orig	Wed Feb 24 07:44:18 1999
-+++ configure	Tue Mar  9 22:59:39 1999
+--- configure.orig	Thu Mar 25 05:09:55 1999
++++ configure	Fri Apr 16 21:00:31 1999
 @@ -26,7 +26,7 @@
  #
  GLIB_MAJOR_VERSION=1
  GLIB_MINOR_VERSION=2
--GLIB_MICRO_VERSION=0
-+GLIB_MICRO_VERSION=13
- GLIB_INTERFACE_AGE=0
- GLIB_BINARY_AGE=0
+-GLIB_MICRO_VERSION=1
++GLIB_MICRO_VERSION=14
+ GLIB_INTERFACE_AGE=1
+ GLIB_BINARY_AGE=1
  GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
-@@ -1593,6 +1593,7 @@
-   ac_tool_prefix=
- fi
+@@ -1888,9 +1888,12 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
  
 +if false; then
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
-@@ -1826,6 +1827,8 @@
- $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.
  exec 5>>./config.log
-@@ -5965,10 +5968,12 @@
+@@ -6148,10 +6151,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/devel/glib/pkg/PLIST b/devel/glib/pkg/PLIST
index 21748c0e394..189913e9515 100644
--- a/devel/glib/pkg/PLIST
+++ b/devel/glib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 1999/03/05 09:44:20 tron Exp $
+@comment $NetBSD: PLIST,v 1.10 1999/04/16 19:18:55 tron Exp $
 bin/glib-config
 include/glib/glib.h
 include/glib/glibconfig.h
@@ -8,13 +8,13 @@ info/glib.info
 @exec install-info %D/info/glib.info %D/info/dir
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so.13.0
+lib/libglib.so.13.1
 lib/libgmodule.a
 lib/libgmodule.la
-lib/libgmodule.so.13.0
+lib/libgmodule.so.13.1
 lib/libgthread.a
 lib/libgthread.la
-lib/libgthread.so.13.0
+lib/libgthread.so.13.1
 man/man1/glib-config.1
 share/aclocal/glib.m4
 @dirrm include/glib