update to 1.2.9.

Overview of Changes in GLib 1.2.9:

* Move include files into a glib-1-2/ subdir to support parallel
  installation with GLib-2.0. If you are installing from source
  on top of a previous version, you should to remove $(includedir)/glib.h
  $(includedir)/module.h manually before installing the new version.
* Fix warnings about varargs macros with recent GCC versions
* Miscellaneous important bug fixes
  (g_strncasecmp, some g_printf_string_upper_bound fixes)
* Addition of .pc files

5 files changed, 27 insertions, 23 deletions

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 37c4cddd76d..272bf1eec58 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2001/02/16 14:38:26 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2001/03/10 10:48:08 drochner Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
-DISTNAME=		glib-1.2.8
+DISTNAME=		glib-1.2.9
 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 927e8e5ae30..7e6e8b45a74 100644
--- a/devel/glib/files/md5
+++ b/devel/glib/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.12 2000/05/26 05:37:01 rh Exp $
+$NetBSD: md5,v 1.13 2001/03/10 10:48:08 drochner Exp $
 
-MD5 (glib-1.2.8.tar.gz) = 5965aeb7894f3ab3b9b7c5833418bfe9
+SHA1 (glib-1.2.9.tar.gz) = e6ba39ec60ae5a913c075df2735bff5265e8f3a1
diff --git a/devel/glib/files/patch-sum b/devel/glib/files/patch-sum
index 412c11766e2..2b060bf6888 100644
--- a/devel/glib/files/patch-sum
+++ b/devel/glib/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.8 2000/06/05 00:54:48 wiz Exp $
+$NetBSD: patch-sum,v 1.9 2001/03/10 10:48:08 drochner Exp $
 
-MD5 (patch-aa) = f0f79c4b4966ceb121bd12f240e5aef6
-MD5 (patch-ab) = 9037429c991ff06f71a81e91c1e963f7
-MD5 (patch-ac) = cd3b59c2ee386ad8bd293b09adca1ba6
-MD5 (patch-ad) = a6b07a69e9a5599e1bf3f365173ec538
-MD5 (patch-ae) = f4182beff6eedc691d74330a54dbb63b
+SHA1 (patch-aa) = e9c6046c3766d74919bb03f12cd8e9e32cd4f2f9
+SHA1 (patch-ab) = 56e5035d8c144733752e38e0c1e790dfe44f87b7
+SHA1 (patch-ac) = ab176e926d9fee6d463096ad3853e06718129acc
+SHA1 (patch-ad) = e6f798caeebfa2e532d9835d2a24f52865eeb372
+SHA1 (patch-ae) = 222a1f4c470fd1123deb3b4dd918b036b3607e59
diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad
index b4ec2e97c99..d351bd92d09 100644
--- a/devel/glib/patches/patch-ad
+++ b/devel/glib/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.12 2000/06/05 00:54:49 wiz Exp $
+$NetBSD: patch-ad,v 1.13 2001/03/10 10:48:09 drochner Exp $
 
---- configure.orig	Thu May 25 02:30:06 2000
-+++ configure	Thu May 25 18:24:08 2000
+--- configure.orig	Wed Feb 28 22:57:36 2001
++++ configure	Wed Mar  7 21:33:56 2001
 @@ -26,7 +26,7 @@
  #
  GLIB_MAJOR_VERSION=1
  GLIB_MINOR_VERSION=2
--GLIB_MICRO_VERSION=8
-+GLIB_MICRO_VERSION=21
- GLIB_INTERFACE_AGE=8
- GLIB_BINARY_AGE=8
+-GLIB_MICRO_VERSION=9
++GLIB_MICRO_VERSION=22
+ GLIB_INTERFACE_AGE=9
+ GLIB_BINARY_AGE=9
  GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
diff --git a/devel/glib/pkg/PLIST b/devel/glib/pkg/PLIST
index 75990e2173f..3742c99646f 100644
--- a/devel/glib/pkg/PLIST
+++ b/devel/glib/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.17 2001/01/04 15:10:27 agc Exp $
+@comment $NetBSD: PLIST,v 1.18 2001/03/10 10:48:09 drochner Exp $
 bin/glib-config
-include/glib/glib.h
-include/glib/gmodule.h
+include/glib/glib-1.2/glib.h
+include/glib/glib-1.2/gmodule.h
 @unexec install-info --delete %D/info/glib.info %D/info/dir
 info/glib.info
 @exec install-info %D/info/glib.info %D/info/dir
@@ -10,19 +10,23 @@ lib/libglib.a
 lib/libglib.la
 lib/libglib.so
 lib/libglib.so.13
-lib/libglib.so.13.8
+lib/libglib.so.13.9
 lib/libgmodule.a
 lib/libgmodule.la
 lib/libgmodule.so
 lib/libgmodule.so.13
-lib/libgmodule.so.13.8
+lib/libgmodule.so.13.9
 lib/libgthread.a
 lib/libgthread.la
 lib/libgthread.so
 lib/libgthread.so.13
-lib/libgthread.so.13.8
+lib/libgthread.so.13.9
+lib/pkgconfig/glib.pc
+lib/pkgconfig/gmodule.pc
+lib/pkgconfig/gthread.pc
 man/man1/glib-config.1
 share/aclocal/glib.m4
 @dirrm lib/glib/include
 @dirrm lib/glib
+@dirrm include/glib/glib-1.2
 @dirrm include/glib