@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.146 2008/10/06 15:20:26 tnn Exp $
+# $NetBSD: Makefile,v 1.147 2008/10/24 15:59:52 wiz Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
-DISTNAME=		glib-2.18.1
+DISTNAME=		glib-2.18.2
 PKGNAME=		${DISTNAME:S/glib/glib2/}
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.18/ \

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.102 2008/10/06 15:20:26 tnn Exp $
+$NetBSD: distinfo,v 1.103 2008/10/24 15:59:52 wiz Exp $
 
-SHA1 (glib-2.18.1.tar.bz2) = d34a30cfccc8322dfe4198d26cf6bfc0210f141b
-RMD160 (glib-2.18.1.tar.bz2) = 264b37584419d983685910adde8f7b282eccc1ad
-Size (glib-2.18.1.tar.bz2) = 4725213 bytes
-SHA1 (patch-aa) = 78fd660b00dd4006392d83a9719326105635cd3d
+SHA1 (glib-2.18.2.tar.bz2) = 4eaf73feda42e8ecf00654f56e38f7fedd6a9266
+RMD160 (glib-2.18.2.tar.bz2) = 52df56375dd97c07837ae085dc045cf29d6f59a1
+Size (glib-2.18.2.tar.bz2) = 4760532 bytes
+SHA1 (patch-aa) = 7cddba48d8ad2616279a5e9fff0c57bcdbba4fba
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3

@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.43 2008/09/06 11:07:20 obache Exp $
+$NetBSD: patch-aa,v 1.44 2008/10/24 15:59:52 wiz Exp $
 
---- configure.orig	2008-09-02 19:29:47.000000000 +0000
+--- configure.orig	2008-10-16 14:41:13.000000000 +0000
 +++ configure
-@@ -986,6 +986,7 @@ G_MODULE_PLUGIN_LIBS
- G_MODULE_LDFLAGS
- G_MODULE_HAVE_DLERROR
- G_MODULE_BROKEN_RTLD_GLOBAL
+@@ -986,6 +986,7 @@ MKDIR_P
+ INSTALL_STRIP_PROGRAM
+ STRIP
+ install_sh
 +G_MODULE_BROKEN_DLOPEN_NULL
- G_MODULE_NEED_USCORE
- GLIB_DEBUG_FLAGS
- GSPAWN
-@@ -37197,6 +37198,7 @@ else
+ MAKEINFO
+ AUTOHEADER
+ AUTOMAKE
+@@ -37256,6 +37257,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -18,7 +18,7 @@
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -38030,6 +38032,87 @@ fi
+@@ -38091,6 +38093,87 @@ fi
  
  	LIBS="$LIBS_orig"
  fi
@@ -106,7 +106,7 @@
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -38066,6 +38149,8 @@ fi
+@@ -38127,6 +38210,8 @@ fi
  
  
  
@@ -115,7 +115,7 @@
  { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -39807,117 +39892,8 @@ if test x"$have_threads" != xno; then
+@@ -39873,117 +39958,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -235,7 +235,7 @@
           ;;
      esac
    fi
-@@ -42106,6 +42082,10 @@ case $host in
+@@ -42177,6 +42153,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -246,7 +246,7 @@
  esac
  
  
-@@ -47398,9 +47378,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -47480,9 +47460,9 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
    }
    split(mac1, mac2, "(") #)
    macro = mac2[1]
@@ -257,7 +257,7 @@
      print prefix "define", macro P[macro] D[macro]
      next
    } else {
-@@ -47408,7 +47388,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -47490,7 +47470,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
      # in the case of _POSIX_SOURCE, which is predefined and required
      # on some systems where configure will not decide to define it.
      if (defundef == "undef") {