Restore cross-compiling ability.

3 files changed, 788 insertions, 1 deletions

diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 8d561971faa..3a83d8c1db9 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2007/11/30 22:12:07 wiz Exp $
+$NetBSD: distinfo,v 1.12 2008/01/15 22:56:57 joerg Exp $
 
 SHA1 (pkg-config-0.22.tar.gz) = 3ec40bda9864d7aa3c912c6ae87a750fd8b6e420
 RMD160 (pkg-config-0.22.tar.gz) = f82754f9892469d2865cc5d2fd3c2ca4513dab5b
@@ -10,3 +10,5 @@ SHA1 (patch-ad) = ad7805b2aa69e3c872fa35eb08a938fa3f8d323b
 SHA1 (patch-ae) = b924f64ee3c7ef9f3efe6d83b60bc0a6fbe1f26d
 SHA1 (patch-af) = 1186777da42151583594fd137e135ef6a77ee09f
 SHA1 (patch-ah) = 9b5e537f2c0606efa45078d02de53700f3d3439a
+SHA1 (patch-ca) = 35c356be48bc2656f652c714b780c644dc0aa879
+SHA1 (patch-cb) = 4ee19e36d7876a99f294c9c2efd19a9edc0e4236
diff --git a/devel/pkg-config/patches/patch-ca b/devel/pkg-config/patches/patch-ca
new file mode 100644
index 00000000000..b9885791d1e
--- /dev/null
+++ b/devel/pkg-config/patches/patch-ca
@@ -0,0 +1,601 @@
+$NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
+
+--- glib-1.2.8/configure.orig	2008-01-15 23:25:54.000000000 +0100
++++ glib-1.2.8/configure
+@@ -20267,119 +20267,6 @@ if test "x$GCC" = "xyes"; then
+   fi
+ fi
+ 
+-{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5
+-echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; }
+-glib_save_LIBS=$LIBS
+-LIBS="$LIBS -lm"
+-if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <math.h>
+-             int main (void) { return (log(1) != log(1.)); }
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  { echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6; }
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-glib_save_CFLAGS=$CFLAGS
+-     CFLAGS="$CFLAGS -std1"
+-     if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <math.h>
+-                 int main (void) { return (log(1) != log(1.)); }
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  { echo "$as_me:$LINENO: result: -std1" >&5
+-echo "${ECHO_T}-std1" >&6; }
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ echo "$as_me:$LINENO: result: " >&5
+-echo "${ECHO_T}" >&6; }
+-         CFLAGS=$glib_save_CFLAGS
+-         { echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5
+-echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;}
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-LIBS=$glib_save_LIBS
+-
+ { echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5
+ echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -23474,14 +23361,7 @@ if test "${glib_cv_has__inline+set}" = s
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-        if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++        cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -23492,41 +23372,33 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	int main () { return foo (); }
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   glib_cv_has__inline=yes
+-
++	glib_cv_has__inline=no
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-glib_cv_has__inline=no
+ 
+ fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+@@ -23544,14 +23416,7 @@ if test "${glib_cv_has__inline__+set}" =
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-        if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++        cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -23562,41 +23427,33 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	int main () { return foo (); }
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   glib_cv_has__inline__=yes
+-
++	glib_cv_has__inline__=no
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-glib_cv_has__inline__=no
+ 
+ fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+@@ -23614,14 +23471,7 @@ if test "${glib_cv_hasinline+set}" = set
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-        if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++        cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -23632,41 +23482,33 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	int main () { return foo (); }
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  glib_cv_hasinline=yes
+-
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  glib_cv_has_inline=yes
++	glib_cv_has_inline=no
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-glib_cv_hasinline=no
+ 
+ fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+@@ -26108,14 +25950,7 @@ if test "${glib_cv_va_copy+set}" = set; 
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-	if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -26135,42 +25970,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	  f (0, 42);
+ 	  return 0;
+ 	}
++int
++main ()
++{
++
++  ;
++  return 0;
++}
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   glib_cv_va_copy=yes
+-
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-glib_cv_va_copy=no
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++	glib_cv_va_copy=no
+ fi
+ 
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+@@ -26182,14 +26015,7 @@ if test "${glib_cv___va_copy+set}" = set
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-	if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -26209,42 +26035,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	  f (0, 42);
+ 	  return 0;
+ 	}
++int
++main ()
++{
++
++  ;
++  return 0;
++}
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  glib_cv___va_copy=yes
+-
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  glib_cv_va___copy=yes
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-glib_cv___va_copy=no
+-
++	glib_cv_va___copy=no
+ fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+@@ -26256,14 +26080,7 @@ if test "${glib_cv_va_val_copy+set}" = s
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-	if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -26283,42 +26100,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	  f (0, 42);
+ 	  return 0;
+ 	}
++int
++main ()
++{
++
++  ;
++  return 0;
++}
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   glib_cv_va_val_copy=yes
+-
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-glib_cv_va_val_copy=no
+-
++	glib_cv_va_val_copy=no
+ fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+@@ -28655,6 +28470,15 @@ _ACEOF
+ 
+ 
+ 
++if test "$cross_compiling" = yes; then
++	{ echo "#define GLIB_SYSDEF_POLLIN =1"
++	echo "#define GLIB_SYSDEF_POLLPRI =2"
++	echo "#define GLIB_SYSDEF_POLLOUT =4"
++	echo "#define GLIB_SYSDEF_POLLERR =8"
++	echo "#define GLIB_SYSDEF_POLLHUP =16"
++	echo "#define GLIB_SYSDEF_POLLNVAL =32"
++	} > glibconfig-sysdefs.h
++else
+ glib_sysdefso="glibconfig-sysdefs.h"
+ glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ 	]*//g'`
+ if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
+@@ -28748,7 +28572,7 @@ fi
+ 
+ rm -f confrun.c
+ 
+-
++fi
+ 
+ 
+ ac_config_commands="$ac_config_commands default-1"
diff --git a/devel/pkg-config/patches/patch-cb b/devel/pkg-config/patches/patch-cb
new file mode 100644
index 00000000000..2559d7ec2ca
--- /dev/null
+++ b/devel/pkg-config/patches/patch-cb
@@ -0,0 +1,184 @@
+$NetBSD: patch-cb,v 1.1 2008/01/15 22:56:57 joerg Exp $
+
+--- glib-1.2.8/configure.in.orig	2008-01-15 23:26:43.000000000 +0100
++++ glib-1.2.8/configure.in
+@@ -157,26 +157,6 @@ if test "x$GCC" = "xyes"; then
+ fi
+ changequote([,])dnl
+ 
+-dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
+-AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
+-glib_save_LIBS=$LIBS
+-LIBS="$LIBS -lm"
+-AC_TRY_RUN([#include <math.h>
+-             int main (void) { return (log(1) != log(1.)); }],
+-     AC_MSG_RESULT(none needed),
+-     glib_save_CFLAGS=$CFLAGS
+-     CFLAGS="$CFLAGS -std1"
+-     AC_TRY_RUN([#include <math.h>
+-                 int main (void) { return (log(1) != log(1.)); }],
+-         AC_MSG_RESULT(-std1),
+-         AC_MSG_RESULT()
+-         CFLAGS=$glib_save_CFLAGS
+-         AC_MSG_WARN(
+-                [No ANSI prototypes found in library. (-std1 didn't work.)])
+-     )
+-)
+-LIBS=$glib_save_LIBS
+-
+ dnl NeXTStep cc seems to need this
+ AC_MSG_CHECKING([for extra flags for POSIX compliance])
+ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
+@@ -213,14 +193,13 @@ dnl truely know which ones of `inline', 
+ dnl actually supported.
+ AC_MSG_CHECKING(for __inline)
+ AC_CACHE_VAL(glib_cv_has__inline,[
+-        AC_TRY_RUN([
++        AC_COMPILE_IFELSE(
++	[AC_LANG_SOURCE([
+ 	__inline int foo () { return 0; }
+ 	int main () { return foo (); }
+-       	],
+-	glib_cv_has__inline=yes
+-        ,
+-	glib_cv_has__inline=no
+-        ,)
++       	])],
++	[glib_cv_has__inline=yes]
++	[glib_cv_has__inline=no])
+ ])
+ AC_MSG_RESULT($glib_cv_has__inline)
+ case x$glib_cv_has__inline in
+@@ -228,14 +207,13 @@ xyes) AC_DEFINE(G_HAVE___INLINE)
+ esac
+ AC_MSG_CHECKING(for __inline__)
+ AC_CACHE_VAL(glib_cv_has__inline__,[
+-        AC_TRY_RUN([
++        AC_COMPILE_IFELSE(
++	[AC_LANG_SOURCE([
+ 	__inline__ int foo () { return 0; }
+ 	int main () { return foo (); }
+-       	],
+-	glib_cv_has__inline__=yes
+-        ,
+-	glib_cv_has__inline__=no
+-        ,)
++       	])],
++	[glib_cv_has__inline__=yes]
++	[glib_cv_has__inline__=no])
+ ])
+ AC_MSG_RESULT($glib_cv_has__inline__)
+ case x$glib_cv_has__inline__ in
+@@ -243,14 +221,13 @@ xyes) AC_DEFINE(G_HAVE___INLINE__)
+ esac
+ AC_MSG_CHECKING(for inline)
+ AC_CACHE_VAL(glib_cv_hasinline,[
+-        AC_TRY_RUN([
++        AC_COMPILE_IFELSE(
++	[AC_LANG_SOURCE([
+ 	inline int foo () { return 0; }
+ 	int main () { return foo (); }
+-       	],
+-	glib_cv_hasinline=yes
+-        ,
+-	glib_cv_hasinline=no
+-        ,)
++       	])],
++	[glib_cv_has_inline=yes]
++	[glib_cv_has_inline=no])
+ ])
+ AC_MSG_RESULT($glib_cv_hasinline)
+ case x$glib_cv_hasinline in
+@@ -401,7 +378,8 @@ dnl we currently check for all three va_
+ dnl all results in config.log for bug reports.
+ AC_MSG_CHECKING(for an implementation of va_copy())
+ AC_CACHE_VAL(glib_cv_va_copy,[
+-	AC_TRY_RUN([
++	AC_COMPILE_IFELSE(
++	[AC_LANG_PROGRAM([
+ 	#include <stdarg.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+@@ -414,16 +392,15 @@ AC_CACHE_VAL(glib_cv_va_copy,[
+ 	int main() {
+ 	  f (0, 42);
+ 	  return 0;
+-	}],
+-	glib_cv_va_copy=yes
+-	,
+-	glib_cv_va_copy=no
+-	,)
++	}])],
++	[glib_cv_va_copy=yes],
++	[glib_cv_va_copy=no])
+ ])
+ AC_MSG_RESULT($glib_cv_va_copy)
+ AC_MSG_CHECKING(for an implementation of __va_copy())
+ AC_CACHE_VAL(glib_cv___va_copy,[
+-	AC_TRY_RUN([
++	AC_COMPILE_IFELSE(
++	[AC_LANG_PROGRAM([
+ 	#include <stdarg.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+@@ -436,16 +413,15 @@ AC_CACHE_VAL(glib_cv___va_copy,[
+ 	int main() {
+ 	  f (0, 42);
+ 	  return 0;
+-	}],
+-	glib_cv___va_copy=yes
+-	,
+-	glib_cv___va_copy=no
+-	,)
++	}])],
++	[glib_cv_va___copy=yes],
++	[glib_cv_va___copy=no])
+ ])
+ AC_MSG_RESULT($glib_cv___va_copy)
+ AC_MSG_CHECKING(whether va_lists can be copied by value)
+ AC_CACHE_VAL(glib_cv_va_val_copy,[
+-	AC_TRY_RUN([
++	AC_COMPILE_IFELSE(
++	[AC_LANG_PROGRAM([
+ 	#include <stdarg.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+@@ -458,11 +434,9 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
+ 	int main() {
+ 	  f (0, 42);
+ 	  return 0;
+-	}],
+-	glib_cv_va_val_copy=yes
+-	,
+-	glib_cv_va_val_copy=no
+-	,)
++	}])],
++	[glib_cv_va_val_copy=yes],
++	[glib_cv_va_val_copy=no])
+ ])
+ if test "x$glib_cv_va_copy" = "xyes"; then
+   AC_DEFINE(G_VA_COPY, va_copy)
+@@ -893,13 +867,22 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes,
+ dnl ****************************************
+ dnl *** GLib POLL* compatibility defines ***
+ dnl ****************************************
++if test "$cross_compiling" = yes; then
++	{ echo "#define GLIB_SYSDEF_POLLIN =1"
++	echo "#define GLIB_SYSDEF_POLLPRI =2"
++	echo "#define GLIB_SYSDEF_POLLOUT =4"
++	echo "#define GLIB_SYSDEF_POLLERR =8"
++	echo "#define GLIB_SYSDEF_POLLHUP =16"
++	echo "#define GLIB_SYSDEF_POLLNVAL =32"
++	} > glibconfig-sysdefs.h
++else
+ GLIB_SYSDEFS(
+ [#include <sys/types.h>
+ #include <sys/poll.h>],
+ 	POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
+ 	glibconfig-sysdefs.h,
+ 	=)
+-
++fi
+ 
+ dnl ******************************
+ dnl *** output the whole stuff ***