 @@ -1,18 +1,18 @@
-# $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/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.18/ \
 			${MASTER_SITE_GNOME:=sources/glib/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
 COMMENT=		Some useful routines for C programming (glib2)
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir

 @@ -1,18 +1,18 @@
-$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
+SHA1 (glib-2.18.2.tar.bz2) = 4eaf73feda42e8ecf00654f56e38f7fedd6a9266
-RMD160 (glib-2.18.1.tar.bz2) = 264b37584419d983685910adde8f7b282eccc1ad
+RMD160 (glib-2.18.2.tar.bz2) = 52df56375dd97c07837ae085dc045cf29d6f59a1
-Size (glib-2.18.1.tar.bz2) = 4725213 bytes
+Size (glib-2.18.2.tar.bz2) = 4760532 bytes
-SHA1 (patch-aa) = 78fd660b00dd4006392d83a9719326105635cd3d
+SHA1 (patch-aa) = 7cddba48d8ad2616279a5e9fff0c57bcdbba4fba
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c
 SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
 SHA1 (patch-ai) = 29faa9647a201bf82b016af0d48f61fc06baac7c
 SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
 SHA1 (patch-ak) = f382189966f073b3b6e6de89ea7709571241a9a0
 SHA1 (patch-al) = de5135c328027b3c4543bb09994d31b6ffedeafa
 SHA1 (patch-ba) = 739f407f6e19bb9c5e7a0e15a3b5cb5ea0431f9a
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff

 @@ -1,34 +1,34 @@
-$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
+@@ -986,6 +986,7 @@ MKDIR_P
- G_MODULE_LDFLAGS
+ INSTALL_STRIP_PROGRAM
- G_MODULE_HAVE_DLERROR
+ STRIP
- G_MODULE_BROKEN_RTLD_GLOBAL
+ install_sh
 +G_MODULE_BROKEN_DLOPEN_NULL
- G_MODULE_NEED_USCORE
+ MAKEINFO
- GLIB_DEBUG_FLAGS
+ AUTOHEADER
- GSPAWN
+ AUTOMAKE
-@@ -37197,6 +37198,7 @@ else
+@@ -37256,6 +37257,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
 +G_MODULE_BROKEN_DLOPEN_NULL=0
  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
 +	{ $as_echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5
 +$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; }
 +if test "${glib_cv_dlopennull_broken+set}" = set; then
 +  $as_echo_n "(cached) " >&6
 +else
++
 +		if test "$cross_compiling" = yes; then
 +  glib_cv_dlopennull_broken=no
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
 @@ -96,36 +96,36 @@ $NetBSD: patch-aa,v 1.43 2008/09/06 11:0
++
++
 +fi
 +{ $as_echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5
 +$as_echo "$glib_cv_dlopennull_broken" >&6; }
 +	if test "x$glib_cv_dlopennull_broken" = "xyes"; then
 +		G_MODULE_BROKEN_DLOPEN_NULL=1
 +	else
 +		G_MODULE_BROKEN_DLOPEN_NULL=0
 +	fi
  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
++
++
  { $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"
          ;;
        *)
 -        for flag in pthread pthreads mt; do
 -          glib_save_CFLAGS="$CFLAGS"
 -          CFLAGS="$CFLAGS -$flag"
 -          if test "$cross_compiling" = yes; then
 -  cat >conftest.$ac_ext <<_ACEOF
+-
 -#include <pthread.h>
 -int check_me = 0;
 -void* func(void* data) {check_me = 42; return &check_me;}
 -int main()
 @@ -225,44 +225,44 @@ $NetBSD: patch-aa,v 1.43 2008/09/06 11:0
+-
 -          CFLAGS="$glib_save_CFLAGS"
 -          if test $glib_flag_works = yes ; then
 -             G_THREAD_CFLAGS=-$flag
 -	     G_THREAD_LIBS=-$flag
 -	     break;
 -          fi
 -        done
 +	G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
 +	G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
           ;;
      esac
    fi
-@@ -42106,6 +42082,10 @@ case $host in
+@@ -42177,6 +42153,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
 +  *-*-netbsd*)
 +    # On NetBSD, pkgsrc's libtool does the right thing.
 +    G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
 +    ;;
  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]
 -  prefix = substr(line, 1, index(line, defundef) - 1)
    if (D_is_set[macro]) {
      # Preserve the white space surrounding the "#".
 +    prefix = substr(line, 1, index(line, defundef) - 1)
      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") {
 -      print "/*", prefix defundef, macro, "*/"
 +      print "/*", line, "*/"
        next
+     }
+   }