Update glib to 1.2.4

Changes are mostly bug and portability fixes.

5 files changed, 19 insertions, 19 deletions

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 460cc782f71..c3ee322fe96 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 1999/05/02 16:04:37 tron Exp $
+# $NetBSD: Makefile,v 1.18 1999/08/28 09:34:45 rh Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
-DISTNAME=	glib-1.2.2
+DISTNAME=	glib-1.2.4
 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 ba18090e1bf..42c60704e94 100644
--- a/devel/glib/files/md5
+++ b/devel/glib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 1999/05/02 14:05:55 tron Exp $
+$NetBSD: md5,v 1.9 1999/08/28 09:34:46 rh Exp $
 
-MD5 (glib-1.2.2.tar.gz) = 1ecec788b21ae0b6b6debbe5ff9d5c65
+MD5 (glib-1.2.4.tar.gz) = ff1061e3dc620ff0bff61adae7524ccc
diff --git a/devel/glib/files/patch-sum b/devel/glib/files/patch-sum
index 4913adeca1a..5994e565a55 100644
--- a/devel/glib/files/patch-sum
+++ b/devel/glib/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:35 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/28 09:34:47 rh Exp $
 
 MD5 (patch-aa) = f0f79c4b4966ceb121bd12f240e5aef6
 MD5 (patch-ab) = e26aa155f4ac1fc9c8f78de44e1dc7f1
 MD5 (patch-ac) = c072894b86c50791eefeef2f8920d497
-MD5 (patch-ad) = abfb297f72881bc265eec4f1a2bb409b
+MD5 (patch-ad) = 9de048c181b9baf4f5661be720818c0b
 MD5 (patch-ae) = c48c7445b6ad23423b7afcf4831414ec
diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad
index 4c0dd349eb7..23863c25579 100644
--- a/devel/glib/patches/patch-ad
+++ b/devel/glib/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.5 1999/05/02 14:05:56 tron Exp $
+$NetBSD: patch-ad,v 1.6 1999/08/28 09:34:47 rh Exp $
 
---- configure.orig	Thu Mar 25 05:09:55 1999
-+++ configure	Fri Apr 16 21:00:31 1999
+--- configure.orig	Mon Aug 23 21:44:19 1999
++++ configure	Fri Aug 27 21:09:58 1999
 @@ -26,7 +26,7 @@
  #
  GLIB_MAJOR_VERSION=1
  GLIB_MINOR_VERSION=2
--GLIB_MICRO_VERSION=2
-+GLIB_MICRO_VERSION=15
- GLIB_INTERFACE_AGE=2
- GLIB_BINARY_AGE=1
+-GLIB_MICRO_VERSION=4
++GLIB_MICRO_VERSION=16
+ GLIB_INTERFACE_AGE=4
+ GLIB_BINARY_AGE=4
  GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
-@@ -1888,9 +1888,12 @@
+@@ -1537,9 +1537,12 @@
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ad,v 1.5 1999/05/02 14:05:56 tron Exp $
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
  exec 5>>./config.log
-@@ -6148,10 +6151,12 @@
+@@ -5795,10 +5798,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/devel/glib/pkg/PLIST b/devel/glib/pkg/PLIST
index 0429454685f..0f3a7f1ec22 100644
--- a/devel/glib/pkg/PLIST
+++ b/devel/glib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 1999/05/02 14:05:56 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 1999/08/28 09:34:47 rh 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.2
+lib/libglib.so.12.4
 lib/libgmodule.a
 lib/libgmodule.la
-lib/libgmodule.so.13.2
+lib/libgmodule.so.12.4
 lib/libgthread.a
 lib/libgthread.la
-lib/libgthread.so.13.2
+lib/libgthread.so.12.4
 man/man1/glib-config.1
 share/aclocal/glib.m4
 @dirrm include/glib