Fixes PR pkg/42336 (STD C99 requires to use XPG6)

3 files changed, 179 insertions, 24 deletions

diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index f7a70f09d63..82d8be5a951 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.124 2009/10/15 11:46:25 hasso Exp $
+$NetBSD: distinfo,v 1.125 2009/11/22 16:51:17 sno Exp $
 
 SHA1 (glib-2.22.2.tar.bz2) = bdd9c4b930e81203ea69fe83876cb6c82bdc5a38
 RMD160 (glib-2.22.2.tar.bz2) = 77227f8feb61c88f9f7fcff586a59ec38114a73d
 Size (glib-2.22.2.tar.bz2) = 5490926 bytes
-SHA1 (patch-aa) = f5b0f0803aba8a765b51355573c62d8a3de9bbd0
+SHA1 (patch-aa) = 3db80f776e97c6fa27db5d19b5506db26475f5cd
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
 SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
 SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f
 SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = 35bd1cbd5ebdb480e32b391a65ffeff24ce565f9
+SHA1 (patch-ak) = 04e3d1eb9648186776dee81d2db9507c0df0c62e
 SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e
 SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index c7e33eb9bc1..6e87ae99bd5 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $
+$NetBSD: patch-aa,v 1.47 2009/11/22 16:51:17 sno Exp $
 
---- configure.orig	2009-08-29 01:17:41.000000000 +0200
-+++ configure
-@@ -837,6 +837,7 @@ GIO
+--- configure.orig	2009-10-07 15:56:34.000000000 +0200
++++ configure	2009-11-22 15:17:13.373473285 +0100
+@@ -837,6 +837,7 @@
  GSPAWN
  GLIB_DEBUG_FLAGS
  G_MODULE_NEED_USCORE
@@ -10,7 +10,126 @@ $NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -34078,10 +34079,11 @@ if test x"$glib_native_win32" = xyes; th
+@@ -27923,14 +27924,12 @@
+   HAVE_GNUC_VISIBILITY_FALSE=
+ fi
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUNC" >&5
++$as_echo "$SUNC" >&6; }
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether using Sun Studio C compiler" >&5
+-$as_echo_n "checking whether using Sun Studio C compiler... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler visibilily" >&5
++$as_echo_n "checking whether using Sun Studio C compiler visibilily... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
+ #else
+@@ -27945,7 +27944,6 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+@@ -27965,14 +27963,10 @@
+        } && test -s conftest.$ac_objext; then
+    g_have_sunstudio_visibility=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 g_have_sunstudio_visibility=no
++   g_have_sunstudio_visibility=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $g_have_sunstudio_visibility" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $g_have_sunstudio_visibility" >&5
+ $as_echo "$g_have_sunstudio_visibility" >&6; }
+  if test x$g_have_sunstudio_visibility = xyes; then
+   HAVE_SUNSTUDIO_VISIBILITY_TRUE=
+@@ -35159,22 +35153,64 @@
+ 
+ case $host in
+   *-*-solaris* )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether using Sun Studio C compiler with C99" >&5
++$as_echo_n "checking whether using Sun Studio C compiler with C99... " >&6; }
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#if defined(__STDC_VERSION__) || (__STDC_VERSION__ - 0 >= 199901L)
++#else
++# include "error: this is STD C99."
++#endif
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define _XOPEN_SOURCE_EXTENDED 1
++int
++main ()
++{
++
++  ;
++  return 0;
++}
+ _ACEOF
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++   g_have_sunstudio_c99=yes
++else
++   g_have_sunstudio_c99=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $g_have_sunstudio_c99" >&5
++$as_echo "$g_have_sunstudio_c99" >&6; }
++    if test $g_have_sunstudio_c99 = yes; then
+ 
++$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define _XOPEN_SOURCE 2
+-_ACEOF
++    else
+ 
++$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define __EXTENSIONS__ 1
+-_ACEOF
+ 
+-     ;;
++$as_echo "#define _XOPEN_SOURCE 2" >>confdefs.h
++
++    fi
++
++
++$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
++
++    ;;
+ esac
+ 
+ if test "$ac_cv_func_statfs" = yes ; then
+@@ -37110,10 +37146,11 @@
      G_MODULE_LDFLAGS=
  else
    export SED
@@ -23,7 +142,7 @@ $NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -34656,7 +34658,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+@@ -37688,7 +37725,7 @@
  	LIBS="$G_MODULE_LIBS $LIBS"
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -32,7 +151,7 @@ $NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $
  		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
  	{ $as_echo "$as_me:$LINENO: checking for RTLD_GLOBAL brokenness" >&5
  $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
-@@ -34917,6 +34919,87 @@ fi
+@@ -37949,6 +37986,87 @@
  
  	LIBS="$LIBS_orig"
  fi
@@ -120,7 +239,7 @@ $NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -34927,7 +35010,7 @@ fi
+@@ -37959,7 +38077,7 @@
  { $as_echo "$as_me:$LINENO: checking for the suffix of module shared libraries" >&5
  $as_echo_n "checking for the suffix of module shared libraries... " >&6; }
  export SED
@@ -129,7 +248,7 @@ $NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -34953,6 +35036,8 @@ fi
+@@ -37985,6 +38103,8 @@
  
  
  
@@ -138,7 +257,7 @@ $NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $
  { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -36800,117 +36885,8 @@ if test x"$have_threads" != xno; then
+@@ -39832,117 +39952,8 @@
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -258,7 +377,7 @@ $NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $
           ;;
      esac
    fi
-@@ -39104,6 +39080,10 @@ case $host in
+@@ -42136,6 +42147,10 @@
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 7d6237c1af3..7516e4fb6de 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,8 +1,44 @@
-$NetBSD: patch-ak,v 1.4 2009/09/22 15:50:46 joerg Exp $
+$NetBSD: patch-ak,v 1.5 2009/11/22 16:51:17 sno Exp $
 
---- configure.in.orig	2009-08-28 05:43:57.000000000 +0200
-+++ configure.in
-@@ -1297,11 +1297,12 @@ if test x"$glib_native_win32" = xyes; th
+--- configure.in.orig	2009-10-07 15:29:47.000000000 +0200
++++ configure.in	2009-11-22 15:18:00.124347084 +0100
+@@ -835,7 +835,7 @@
+ AC_MSG_RESULT($g_have_gnuc_visibility)
+ AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
+ 
+-AC_MSG_CHECKING([whether using Sun Studio C compiler])
++AC_MSG_CHECKING([whether using Sun Studio C compiler visibilily])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
+ #else
+ # include "error: this is not Sun Studio."
+@@ -1023,10 +1023,22 @@
+ 
+ case $host in
+   *-*-solaris* )
+-     AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+-     AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
+-     AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+-     ;;
++    AC_MSG_CHECKING([whether using Sun Studio C compiler with C99])
++    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__STDC_VERSION__) || (__STDC_VERSION__ - 0 >= 199901L)
++#else
++# include "error: this is STD C99."
++#endif
++    ]], [[]])], [ g_have_sunstudio_c99=yes ], [ g_have_sunstudio_c99=no ])
++    AC_MSG_RESULT($g_have_sunstudio_c99)
++    if test $g_have_sunstudio_c99 = yes; then
++      AC_DEFINE(_XOPEN_SOURCE,          600, Needed to get declarations for msg_control and msg_controllen on Solaris)
++    else
++      AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
++      AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
++    fi
++
++    AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
++    ;;
+ esac
+ 
+ dnl
+@@ -1379,11 +1391,12 @@
    G_MODULE_LDFLAGS=
  else
    export SED
@@ -16,7 +52,7 @@ $NetBSD: patch-ak,v 1.4 2009/09/22 15:50:46 joerg Exp $
  G_MODULE_HAVE_DLERROR=0
  dnl *** force native WIN32 shared lib loader 
  if test -z "$G_MODULE_IMPL"; then
-@@ -1362,7 +1363,7 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+@@ -1444,7 +1457,7 @@
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -25,7 +61,7 @@ $NetBSD: patch-ak,v 1.4 2009/09/22 15:50:46 joerg Exp $
  		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
  	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
  		glib_cv_rtldglobal_broken,[
-@@ -1426,6 +1427,38 @@ dnl *** check for having dlerror()
+@@ -1508,6 +1521,38 @@
  		[G_MODULE_HAVE_DLERROR=0])
  	LIBS="$LIBS_orig"
  fi
@@ -64,7 +100,7 @@ $NetBSD: patch-ak,v 1.4 2009/09/22 15:50:46 joerg Exp $
  dnl *** done, have we got an implementation?
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
-@@ -1436,7 +1469,7 @@ fi
+@@ -1518,7 +1563,7 @@
  
  AC_MSG_CHECKING(for the suffix of module shared libraries)
  export SED
@@ -73,7 +109,7 @@ $NetBSD: patch-ak,v 1.4 2009/09/22 15:50:46 joerg Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -1455,6 +1488,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
+@@ -1537,6 +1582,8 @@
  AC_SUBST(G_MODULE_LDFLAGS)
  AC_SUBST(G_MODULE_HAVE_DLERROR)
  AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
@@ -82,7 +118,7 @@ $NetBSD: patch-ak,v 1.4 2009/09/22 15:50:46 joerg Exp $
  AC_SUBST(G_MODULE_NEED_USCORE)
  AC_SUBST(GLIB_DEBUG_FLAGS)
  
-@@ -1843,22 +1878,8 @@ if test x"$have_threads" != xno; then
+@@ -1925,22 +1972,8 @@
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
@@ -107,7 +143,7 @@ $NetBSD: patch-ak,v 1.4 2009/09/22 15:50:46 joerg Exp $
           ;;
      esac 
    fi
-@@ -2254,6 +2275,10 @@ case $host in
+@@ -2336,6 +2369,10 @@
    *) 	 
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" 	 
      ;;