Update to 2.4.1:

* Win32 bug fixes [Tor Lillqvist, Roger Leigh, John Ehresman]
* Miscellaneous bug and portability fixes [Owen Taylor,
  Matthias Clasen, Jonas Jonsson, Christian Krause,
  Nickolay V. Shmyrev, Christophe Saout, Philippe Blain,
  Piotr Klaban]
* Documentation updates [Matthias]
* New and updated translations (ca,cs,cy,el,en_CA,en_GB,es,eu,fi,
  fr,gu,he,id,nl,pt,pl,ru,sr,sr@ije,sr@Latn,sv,uk)

4 files changed, 144 insertions, 135 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 5cc0e777abe..77ca6911b6d 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2004/04/24 04:56:17 minskim Exp $
+# $NetBSD: Makefile,v 1.50 2004/05/02 20:05:53 jmmv Exp $
 
-DISTNAME=		glib-2.4.0
+DISTNAME=		glib-2.4.1
 PKGNAME=		${DISTNAME:S/glib/glib2/}
-PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.4/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.4/ \
@@ -33,7 +32,7 @@ GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 
 CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=gnu
@@ -58,6 +57,11 @@ SUBST_MESSAGE.thr=	"Fixing libgthread."
 
 .endif
 
+# Handle directories shared with devel/glib.
+PRINT_PLIST_AWK+=	/^@dirrm include\/glib$$/ \
+				{ print "@unexec $${RMDIR} %D/" $$2 \
+				  " 2>/dev/null || $${TRUE}"; next; }
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 46c421b22e5..589370b0931 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2004/04/24 04:54:07 minskim Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/05/02 20:05:53 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.0
+lib/libglib-2.0.so.400.1
 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.0
+lib/libgmodule-2.0.so.400.1
 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.0
+lib/libgobject-2.0.so.400.1
 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.0
+lib/libgthread-2.0.so.400.1
 lib/pkgconfig/glib-2.0.pc
 lib/pkgconfig/gmodule-2.0.pc
 lib/pkgconfig/gobject-2.0.pc
@@ -101,109 +101,111 @@ man/man1/glib-mkenums.1
 man/man1/gobject-query.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
-share/doc/html/glib/glib-Arrays.html
-share/doc/html/glib/glib-Asynchronous-Queues.html
-share/doc/html/glib/glib-Atomic-Operations.html
-share/doc/html/glib/glib-Automatic-String-Completion.html
-share/doc/html/glib/glib-Balanced-Binary-Trees.html
-share/doc/html/glib/glib-Basic-Types.html
-share/doc/html/glib/glib-Byte-Arrays.html
-share/doc/html/glib/glib-Byte-Order-Macros.html
-share/doc/html/glib/glib-Caches.html
-share/doc/html/glib/glib-Character-Set-Conversion.html
-share/doc/html/glib/glib-Datasets.html
-share/doc/html/glib/glib-Date-and-Time-Functions.html
-share/doc/html/glib/glib-Double-ended-Queues.html
-share/doc/html/glib/glib-Doubly-Linked-Lists.html
-share/doc/html/glib/glib-Dynamic-Loading-of-Modules.html
-share/doc/html/glib/glib-Error-Reporting.html
-share/doc/html/glib/glib-File-Utilities.html
-share/doc/html/glib/glib-Glob-style-pattern-matching.html
-share/doc/html/glib/glib-Hash-Tables.html
-share/doc/html/glib/glib-Hook-Functions.html
-share/doc/html/glib/glib-I18N.html
-share/doc/html/glib/glib-IO-Channels.html
-share/doc/html/glib/glib-Keyed-Data-Lists.html
-share/doc/html/glib/glib-Lexical-Scanner.html
-share/doc/html/glib/glib-Limits-of-Basic-Types.html
-share/doc/html/glib/glib-Memory-Allocation.html
-share/doc/html/glib/glib-Memory-Allocators.html
-share/doc/html/glib/glib-Memory-Chunks.html
-share/doc/html/glib/glib-Message-Logging.html
-share/doc/html/glib/glib-Miscellaneous-Macros.html
-share/doc/html/glib/glib-Miscellaneous-Utility-Functions.html
-share/doc/html/glib/glib-N-ary-Trees.html
-share/doc/html/glib/glib-Numerical-Definitions.html
-share/doc/html/glib/glib-Pointer-Arrays.html
-share/doc/html/glib/glib-Quarks.html
-share/doc/html/glib/glib-Random-Numbers.html
-share/doc/html/glib/glib-Relations-and-Tuples.html
-share/doc/html/glib/glib-Shell-related-Utilities.html
-share/doc/html/glib/glib-Simple-XML-Subset-Parser.html
-share/doc/html/glib/glib-Singly-Linked-Lists.html
-share/doc/html/glib/glib-Spawning-Processes.html
-share/doc/html/glib/glib-Standard-Macros.html
-share/doc/html/glib/glib-String-Chunks.html
-share/doc/html/glib/glib-String-Utility-Functions.html
-share/doc/html/glib/glib-Strings.html
-share/doc/html/glib/glib-The-Main-Event-Loop.html
-share/doc/html/glib/glib-Thread-Pools.html
-share/doc/html/glib/glib-Threads.html
-share/doc/html/glib/glib-Timers.html
-share/doc/html/glib/glib-Trash-Stacks.html
-share/doc/html/glib/glib-Type-Conversion-Macros.html
-share/doc/html/glib/glib-Unicode-Manipulation.html
-share/doc/html/glib/glib-Warnings-and-Assertions.html
-share/doc/html/glib/glib-Windows-Compatability-Functions.html
-share/doc/html/glib/glib-building.html
-share/doc/html/glib/glib-changes.html
-share/doc/html/glib/glib-compiling.html
-share/doc/html/glib/glib-core.html
-share/doc/html/glib/glib-cross-compiling.html
-share/doc/html/glib/glib-data-types.html
-share/doc/html/glib/glib-fundamentals.html
-share/doc/html/glib/glib-gettextize.html
-share/doc/html/glib/glib-resources.html
-share/doc/html/glib/glib-running.html
-share/doc/html/glib/glib-utilities.html
-share/doc/html/glib/glib.devhelp
-share/doc/html/glib/glib.html
-share/doc/html/glib/home.png
-share/doc/html/glib/index.html
-share/doc/html/glib/index.sgml
-share/doc/html/glib/ix01.html
-share/doc/html/glib/left.png
-share/doc/html/glib/mainloop-states.gif
-share/doc/html/glib/right.png
-share/doc/html/glib/tools.html
-share/doc/html/glib/up.png
-share/doc/html/gobject/GTypeModule.html
-share/doc/html/gobject/GTypePlugin.html
-share/doc/html/gobject/glib-genmarshal.html
-share/doc/html/gobject/glib-mkenums.html
-share/doc/html/gobject/gobject-Boxed-Types.html
-share/doc/html/gobject/gobject-Closures.html
-share/doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
-share/doc/html/gobject/gobject-GParamSpec.html
-share/doc/html/gobject/gobject-Generic-values.html
-share/doc/html/gobject/gobject-Signals.html
-share/doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
-share/doc/html/gobject/gobject-The-Base-Object-Type.html
-share/doc/html/gobject/gobject-Type-Information.html
-share/doc/html/gobject/gobject-Value-arrays.html
-share/doc/html/gobject/gobject-Varargs-Value-Collection.html
-share/doc/html/gobject/gobject-query.html
-share/doc/html/gobject/gobject.devhelp
-share/doc/html/gobject/home.png
-share/doc/html/gobject/index.html
-share/doc/html/gobject/index.sgml
-share/doc/html/gobject/ix01.html
-share/doc/html/gobject/left.png
-share/doc/html/gobject/pr01.html
-share/doc/html/gobject/right.png
-share/doc/html/gobject/rn01.html
-share/doc/html/gobject/rn02.html
-share/doc/html/gobject/up.png
+share/doc/glib/glib-Arrays.html
+share/doc/glib/glib-Asynchronous-Queues.html
+share/doc/glib/glib-Atomic-Operations.html
+share/doc/glib/glib-Automatic-String-Completion.html
+share/doc/glib/glib-Balanced-Binary-Trees.html
+share/doc/glib/glib-Basic-Types.html
+share/doc/glib/glib-Byte-Arrays.html
+share/doc/glib/glib-Byte-Order-Macros.html
+share/doc/glib/glib-Caches.html
+share/doc/glib/glib-Character-Set-Conversion.html
+share/doc/glib/glib-Datasets.html
+share/doc/glib/glib-Date-and-Time-Functions.html
+share/doc/glib/glib-Double-ended-Queues.html
+share/doc/glib/glib-Doubly-Linked-Lists.html
+share/doc/glib/glib-Dynamic-Loading-of-Modules.html
+share/doc/glib/glib-Error-Reporting.html
+share/doc/glib/glib-File-Utilities.html
+share/doc/glib/glib-Glob-style-pattern-matching.html
+share/doc/glib/glib-Hash-Tables.html
+share/doc/glib/glib-Hook-Functions.html
+share/doc/glib/glib-I18N.html
+share/doc/glib/glib-IO-Channels.html
+share/doc/glib/glib-Keyed-Data-Lists.html
+share/doc/glib/glib-Lexical-Scanner.html
+share/doc/glib/glib-Limits-of-Basic-Types.html
+share/doc/glib/glib-Memory-Allocation.html
+share/doc/glib/glib-Memory-Allocators.html
+share/doc/glib/glib-Memory-Chunks.html
+share/doc/glib/glib-Message-Logging.html
+share/doc/glib/glib-Miscellaneous-Macros.html
+share/doc/glib/glib-Miscellaneous-Utility-Functions.html
+share/doc/glib/glib-N-ary-Trees.html
+share/doc/glib/glib-Numerical-Definitions.html
+share/doc/glib/glib-Pointer-Arrays.html
+share/doc/glib/glib-Quarks.html
+share/doc/glib/glib-Random-Numbers.html
+share/doc/glib/glib-Relations-and-Tuples.html
+share/doc/glib/glib-Shell-related-Utilities.html
+share/doc/glib/glib-Simple-XML-Subset-Parser.html
+share/doc/glib/glib-Singly-Linked-Lists.html
+share/doc/glib/glib-Spawning-Processes.html
+share/doc/glib/glib-Standard-Macros.html
+share/doc/glib/glib-String-Chunks.html
+share/doc/glib/glib-String-Utility-Functions.html
+share/doc/glib/glib-Strings.html
+share/doc/glib/glib-The-Main-Event-Loop.html
+share/doc/glib/glib-Thread-Pools.html
+share/doc/glib/glib-Threads.html
+share/doc/glib/glib-Timers.html
+share/doc/glib/glib-Trash-Stacks.html
+share/doc/glib/glib-Type-Conversion-Macros.html
+share/doc/glib/glib-Unicode-Manipulation.html
+share/doc/glib/glib-Warnings-and-Assertions.html
+share/doc/glib/glib-Windows-Compatability-Functions.html
+share/doc/glib/glib-building.html
+share/doc/glib/glib-changes.html
+share/doc/glib/glib-compiling.html
+share/doc/glib/glib-core.html
+share/doc/glib/glib-cross-compiling.html
+share/doc/glib/glib-data-types.html
+share/doc/glib/glib-fundamentals.html
+share/doc/glib/glib-gettextize.html
+share/doc/glib/glib-resources.html
+share/doc/glib/glib-running.html
+share/doc/glib/glib-utilities.html
+share/doc/glib/glib.devhelp
+share/doc/glib/glib.html
+share/doc/glib/home.png
+share/doc/glib/index.html
+share/doc/glib/index.sgml
+share/doc/glib/ix01.html
+share/doc/glib/left.png
+share/doc/glib/mainloop-states.gif
+share/doc/glib/right.png
+share/doc/glib/style.css
+share/doc/glib/tools.html
+share/doc/glib/up.png
+share/doc/gobject/GTypeModule.html
+share/doc/gobject/GTypePlugin.html
+share/doc/gobject/glib-genmarshal.html
+share/doc/gobject/glib-mkenums.html
+share/doc/gobject/gobject-Boxed-Types.html
+share/doc/gobject/gobject-Closures.html
+share/doc/gobject/gobject-Enumeration-and-Flag-Types.html
+share/doc/gobject/gobject-GParamSpec.html
+share/doc/gobject/gobject-Generic-values.html
+share/doc/gobject/gobject-Signals.html
+share/doc/gobject/gobject-Standard-Parameter-and-Value-Types.html
+share/doc/gobject/gobject-The-Base-Object-Type.html
+share/doc/gobject/gobject-Type-Information.html
+share/doc/gobject/gobject-Value-arrays.html
+share/doc/gobject/gobject-Varargs-Value-Collection.html
+share/doc/gobject/gobject-query.html
+share/doc/gobject/gobject.devhelp
+share/doc/gobject/home.png
+share/doc/gobject/index.html
+share/doc/gobject/index.sgml
+share/doc/gobject/ix01.html
+share/doc/gobject/left.png
+share/doc/gobject/pr01.html
+share/doc/gobject/right.png
+share/doc/gobject/rn01.html
+share/doc/gobject/rn02.html
+share/doc/gobject/style.css
+share/doc/gobject/up.png
 share/glib-2.0/gettext/po/Makefile.in.in
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/glib20.mo
@@ -217,6 +219,8 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/glib20.mo
@@ -226,6 +230,7 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/glib20.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/glib20.mo
@@ -265,8 +270,8 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrm share/glib-2.0/gettext/po
 @dirrm share/glib-2.0/gettext
 @dirrm share/glib-2.0
-@dirrm share/doc/html/gobject
-@dirrm share/doc/html/glib
+@dirrm share/doc/gobject
+@dirrm share/doc/glib
 @dirrm lib/glib-2.0/include
 @dirrm lib/glib-2.0
 @dirrm include/glib/glib-2.0/gobject
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index ddb51f098e4..a7b9fb05054 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2004/04/28 14:20:29 tv Exp $
+$NetBSD: distinfo,v 1.32 2004/05/02 20:05:53 jmmv Exp $
 
-SHA1 (glib-2.4.0.tar.bz2) = 17822e7180791f18c1723110e9e757dc5526440c
-Size (glib-2.4.0.tar.bz2) = 2034272 bytes
-SHA1 (patch-aa) = 5a1606c02d7d07d33eecc66e80efb4f93be1ac57
+SHA1 (glib-2.4.1.tar.bz2) = c92b7c6ae2cc983915adb02815ec2a666e9d51dc
+Size (glib-2.4.1.tar.bz2) = 2028551 bytes
+SHA1 (patch-aa) = e96909af51102ee09136e49d821312d075984334
 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 945095ffae3..c2ae616e41c 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.13 2004/04/28 03:43:02 tv Exp $
+$NetBSD: patch-aa,v 1.14 2004/05/02 20:05:53 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
 
---- configure.orig	Tue Mar 16 12:13:21 2004
+--- configure.orig	2004-04-30 15:05:01.000000000 +0200
 +++ configure
 @@ -465,7 +465,7 @@ ac_includes_default="\
  # include <unistd.h>
@@ -15,7 +15,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -30441,6 +30441,7 @@ else
+@@ -30442,6 +30442,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -23,7 +23,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -31048,13 +31049,13 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -31049,13 +31050,13 @@ cat >>conftest.$ac_ext <<_ACEOF
  #ifndef RTLD_LAZY
  #  define RTLD_LAZY 0
  #endif
@@ -41,7 +41,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
      return global == local;
  }
  _ACEOF
-@@ -31090,6 +31091,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
+@@ -31091,6 +31092,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
  	else
    		G_MODULE_BROKEN_RTLD_GLOBAL=0
  	fi
@@ -114,16 +114,16 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  	echo "$as_me:$LINENO: checking for preceeding underscore in symbols" >&5
  echo $ECHO_N "checking for preceeding underscore in symbols... $ECHO_C" >&6
  if test "${glib_cv_uscore+set}" = set; then
-@@ -31714,7 +31781,7 @@ if test x"$have_threads" != xno; then
-     # both CPPFLAG and LIBS.
-     # One of them does for most gcc versions and some other platforms/compilers
-     # too and could be considered as the canonical way to go.
--    for flag in pthread pthreads; do
-+    for flag in pthreads pthread; do
-       glib_save_CFLAGS="$CFLAGS"
-       CFLAGS="$CFLAGS -$flag"
-       if test "$cross_compiling" = yes; then
-@@ -31869,6 +31936,15 @@ fi
+@@ -31720,7 +31787,7 @@ if test x"$have_threads" != xno; then
+          # skip cygwin -pthread or -pthreads test
+          ;;
+       *)
+-        for flag in pthread pthreads; do
++        for flag in pthreads pthread; do
+           glib_save_CFLAGS="$CFLAGS"
+           CFLAGS="$CFLAGS -$flag"
+           if test "$cross_compiling" = yes; then
+@@ -31877,6 +31944,15 @@ fi
  
    fi
  
@@ -139,7 +139,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
      # if we are not finding the localtime_r function, then we probably are
      # not using the proper multithread flag
  
-@@ -34181,7 +34257,7 @@ fi
+@@ -34189,7 +34265,7 @@ fi
  #  b) libtool doesn't recognize -pthread as a library dependency.
  #
  case $host in
@@ -148,7 +148,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
      G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
      ;;
    *)
-@@ -38406,6 +38482,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
+@@ -38414,6 +38490,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
  s,@G_MODULE_LDFLAGS@,$G_MODULE_LDFLAGS,;t t
  s,@G_MODULE_HAVE_DLERROR@,$G_MODULE_HAVE_DLERROR,;t t
  s,@G_MODULE_BROKEN_RTLD_GLOBAL@,$G_MODULE_BROKEN_RTLD_GLOBAL,;t t