Update to 2.4.4:

* Win32 bug fixes (John Ehresman)
* Other bug fixes (Manish Singh, Matthias Clasen, Federico
  Mena Quintero, Philippe Blain, Sven Neumann, Julio M. Merino
  Vidal, Kaz Sasayama, Morten Welinder, Mariano Suarez-Alvarez)
* Documentation updates (Crispin Flowerday, Ed Griffiths,
  Federico)
* New and updated translations (az,ne,sq)

4 files changed, 14 insertions, 31 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 6447df5eda7..3790cf41c78 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2004/06/04 17:52:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.53 2004/07/09 15:30:16 jmmv Exp $
 
-DISTNAME=		glib-2.4.2
+DISTNAME=		glib-2.4.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.4/ \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 35c61c37665..24e5a6cc558 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/06/04 17:52:35 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.16 2004/07/09 15:30:16 jmmv Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -75,22 +75,22 @@ lib/libglib-2.0.a
 lib/libglib-2.0.la
 lib/libglib-2.0.so
 lib/libglib-2.0.so.400
-lib/libglib-2.0.so.400.2
+lib/libglib-2.0.so.400.4
 lib/libgmodule-2.0.a
 lib/libgmodule-2.0.la
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.400
-lib/libgmodule-2.0.so.400.2
+lib/libgmodule-2.0.so.400.4
 lib/libgobject-2.0.a
 lib/libgobject-2.0.la
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.400
-lib/libgobject-2.0.so.400.2
+lib/libgobject-2.0.so.400.4
 lib/libgthread-2.0.a
 lib/libgthread-2.0.la
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.400
-lib/libgthread-2.0.so.400.2
+lib/libgthread-2.0.so.400.4
 lib/pkgconfig/glib-2.0.pc
 lib/pkgconfig/gmodule-2.0.pc
 lib/pkgconfig/gobject-2.0.pc
@@ -101,6 +101,7 @@ man/man1/glib-mkenums.1
 man/man1/gobject-query.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
+share/doc/glib/file-name-encodings.png
 share/doc/glib/glib-Arrays.html
 share/doc/glib/glib-Asynchronous-Queues.html
 share/doc/glib/glib-Atomic-Operations.html
@@ -244,6 +245,7 @@ ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/glib20.mo
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index d166f0fffed..0ff9742f683 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.33 2004/06/04 17:52:35 jmmv Exp $
+$NetBSD: distinfo,v 1.34 2004/07/09 15:30:16 jmmv Exp $
 
-SHA1 (glib-2.4.2.tar.bz2) = a516204aedf14f7c52963cc7d7a4e7241d27ce2a
-Size (glib-2.4.2.tar.bz2) = 2043583 bytes
-SHA1 (patch-aa) = e96909af51102ee09136e49d821312d075984334
+SHA1 (glib-2.4.4.tar.bz2) = 30338d55d9c5e667a4be91697b1e3360d6e6d813
+Size (glib-2.4.4.tar.bz2) = 2138838 bytes
+SHA1 (patch-aa) = 389e033ce62ade669cbceeee5e036233472741a2
 SHA1 (patch-ab) = a231346877b6246e086312fda107a90dffdd0adb
 SHA1 (patch-ac) = 5f3d1446a41e71f1bf5556a1dd2a2a04e77d45da
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index c2ae616e41c..727f9a787f5 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,6 +1,5 @@
-$NetBSD: patch-aa,v 1.14 2004/05/02 20:05:53 jmmv Exp $
+$NetBSD: patch-aa,v 1.15 2004/07/09 15:30:16 jmmv Exp $
 
-http://bugzilla.gnome.org/show_bug.cgi?id=139567
 http://bugzilla.gnome.org/show_bug.cgi?id=140329
 http://bugzilla.gnome.org/show_bug.cgi?id=141256
 
@@ -23,24 +22,6 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -31049,13 +31050,13 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifndef RTLD_LAZY
- #  define RTLD_LAZY 0
- #endif
--int pthread_create;
-+int gettext;
- int main () {
-     void *handle, *global, *local;
--    global = &pthread_create;
--    handle = dlopen ("libpthread.so", RTLD_GLOBAL | RTLD_LAZY);
-+    global = &gettext;
-+    handle = dlopen ("libintl.so", RTLD_GLOBAL | RTLD_LAZY);
-     if (!handle) return 0;
--    local = dlsym (handle, "pthread_create");
-+    local = dlsym (handle, "gettext");
-     return global == local;
- }
- _ACEOF
 @@ -31091,6 +31092,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
  	else
    		G_MODULE_BROKEN_RTLD_GLOBAL=0