Avoid duplicate main() in va_copy tests as reported by Dan McMahill.

3 files changed, 60 insertions, 36 deletions

diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 3a83d8c1db9..1da2db7037b 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2008/01/15 22:56:57 joerg Exp $
+$NetBSD: distinfo,v 1.13 2008/01/31 21:46:43 joerg Exp $
 
 SHA1 (pkg-config-0.22.tar.gz) = 3ec40bda9864d7aa3c912c6ae87a750fd8b6e420
 RMD160 (pkg-config-0.22.tar.gz) = f82754f9892469d2865cc5d2fd3c2ca4513dab5b
@@ -10,5 +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
+SHA1 (patch-ca) = eacefe584576fe3f78f4b0b52cfcd9199307a8d4
+SHA1 (patch-cb) = d8c7f26fbf9e485658a9c567eff9c4b336a4f300
diff --git a/devel/pkg-config/patches/patch-ca b/devel/pkg-config/patches/patch-ca
index b9885791d1e..8ae63bac9b1 100644
--- a/devel/pkg-config/patches/patch-ca
+++ b/devel/pkg-config/patches/patch-ca
@@ -1,6 +1,6 @@
-$NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
+$NetBSD: patch-ca,v 1.2 2008/01/31 21:46:43 joerg Exp $
 
---- glib-1.2.8/configure.orig	2008-01-15 23:25:54.000000000 +0100
+--- glib-1.2.8/configure.orig	2007-06-18 23:36:00.000000000 +0200
 +++ glib-1.2.8/configure
 @@ -20267,119 +20267,6 @@ if test "x$GCC" = "xyes"; then
    fi
@@ -352,10 +352,15 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -26135,42 +25970,40 @@ cat >>conftest.$ac_ext <<_ACEOF
- 	  f (0, 42);
- 	  return 0;
+@@ -26131,46 +25966,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
  	}
+-	int main() {
+-	  f (0, 42);
+-	  return 0;
+-	}
++
 +int
 +main ()
 +{
@@ -415,7 +420,7 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
  
  fi
  
-@@ -26182,14 +26015,7 @@ if test "${glib_cv___va_copy+set}" = set
+@@ -26182,14 +26012,7 @@ if test "${glib_cv___va_copy+set}" = set
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -431,10 +436,15 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -26209,42 +26035,40 @@ cat >>conftest.$ac_ext <<_ACEOF
- 	  f (0, 42);
- 	  return 0;
+@@ -26205,46 +26028,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
  	}
+-	int main() {
+-	  f (0, 42);
+-	  return 0;
+-	}
++
 +int
 +main ()
 +{
@@ -495,7 +505,7 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
  
  fi
  
-@@ -26256,14 +26080,7 @@ if test "${glib_cv_va_val_copy+set}" = s
+@@ -26256,14 +26074,7 @@ if test "${glib_cv_va_val_copy+set}" = s
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
@@ -511,10 +521,15 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -26283,42 +26100,40 @@ cat >>conftest.$ac_ext <<_ACEOF
- 	  f (0, 42);
- 	  return 0;
+@@ -26279,46 +26090,41 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
  	}
+-	int main() {
+-	  f (0, 42);
+-	  return 0;
+-	}
++
 +int
 +main ()
 +{
@@ -574,7 +589,7 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
  
  fi
  
-@@ -28655,6 +28470,15 @@ _ACEOF
+@@ -28655,6 +28461,15 @@ _ACEOF
  
  
  
@@ -590,7 +605,7 @@ $NetBSD: patch-ca,v 1.1 2008/01/15 22:56:57 joerg Exp $
  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
+@@ -28748,7 +28563,7 @@ fi
  
  rm -f confrun.c
  
diff --git a/devel/pkg-config/patches/patch-cb b/devel/pkg-config/patches/patch-cb
index 2559d7ec2ca..4a667d848cb 100644
--- a/devel/pkg-config/patches/patch-cb
+++ b/devel/pkg-config/patches/patch-cb
@@ -1,6 +1,6 @@
-$NetBSD: patch-cb,v 1.1 2008/01/15 22:56:57 joerg Exp $
+$NetBSD: patch-cb,v 1.2 2008/01/31 21:46:43 joerg Exp $
 
---- glib-1.2.8/configure.in.orig	2008-01-15 23:26:43.000000000 +0100
+--- glib-1.2.8/configure.in.orig	2007-06-18 23:35:54.000000000 +0200
 +++ glib-1.2.8/configure.in
 @@ -157,26 +157,6 @@ if test "x$GCC" = "xyes"; then
  fi
@@ -99,16 +99,19 @@ $NetBSD: patch-cb,v 1.1 2008/01/15 22:56:57 joerg Exp $
  	#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;
+@@ -411,19 +389,15 @@ AC_CACHE_VAL(glib_cv_va_copy,[
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
+ 	}
+-	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])
  ])
@@ -121,16 +124,19 @@ $NetBSD: patch-cb,v 1.1 2008/01/15 22:56:57 joerg Exp $
  	#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;
+@@ -433,19 +407,15 @@ AC_CACHE_VAL(glib_cv___va_copy,[
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
+ 	}
+-	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])
  ])
@@ -143,22 +149,25 @@ $NetBSD: patch-cb,v 1.1 2008/01/15 22:56:57 joerg Exp $
  	#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;
+@@ -455,14 +425,9 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
+ 	}
+-	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,
+@@ -893,13 +858,22 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes,
  dnl ****************************************
  dnl *** GLib POLL* compatibility defines ***
  dnl ****************************************