Using __VA_ARGS__ and expecting the compiler to magically remove the

initial comma when it expands to empty is a GCC extension. Avoid it.

4 files changed, 54 insertions, 2 deletions

diff --git a/mail/libspf2/distinfo b/mail/libspf2/distinfo
index 17c56afac56..6e84bc52a6a 100644
--- a/mail/libspf2/distinfo
+++ b/mail/libspf2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2009/09/08 10:36:27 tron Exp $
+$NetBSD: distinfo,v 1.5 2012/12/22 02:25:57 joerg Exp $
 
 SHA1 (libspf2-1.2.9.tar.gz) = 15dfe3b9172180654f4de4dd85f3f01e3bc11503
 RMD160 (libspf2-1.2.9.tar.gz) = d0754d47e297a00038e4185e17704a24d38a4888
 Size (libspf2-1.2.9.tar.gz) = 518001 bytes
 SHA1 (patch-aa) = 81f60333222b510cb511b80aedbb679d2212ab0d
+SHA1 (patch-src_include_spf__log.h) = 87b534d338b7fa36168cf8b745a285e38598cfed
diff --git a/mail/libspf2/patches/patch-src_include_spf__log.h b/mail/libspf2/patches/patch-src_include_spf__log.h
new file mode 100644
index 00000000000..d77b4c12bb3
--- /dev/null
+++ b/mail/libspf2/patches/patch-src_include_spf__log.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_include_spf__log.h,v 1.1 2012/12/22 02:25:57 joerg Exp $
+
+Dropping a trailing comma when __VA_ARGS__ would be empty is a GCC extension.
+
+--- src/include/spf_log.h.orig	2012-12-21 21:29:20.000000000 +0000
++++ src/include/spf_log.h
+@@ -60,10 +60,10 @@ void SPF_debugv( const char *file, int l
+ 
+ #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L
+ 
+-#define SPF_errorf(format, ... ) SPF_errorx( __FILE__, __LINE__, format, __VA_ARGS__ )
+-#define SPF_warningf(format, ... ) SPF_warningx( __FILE__, __LINE__, format, __VA_ARGS__ )
+-#define SPF_infof(format, ... ) SPF_infox( __FILE__, __LINE__, format, __VA_ARGS__ )
+-#define SPF_debugf(format, ... ) SPF_debugx( __FILE__, __LINE__, format, __VA_ARGS__ )
++#define SPF_errorf(...) SPF_errorx( __FILE__, __LINE__, __VA_ARGS__ )
++#define SPF_warningf(...) SPF_warningx( __FILE__, __LINE__, __VA_ARGS__ )
++#define SPF_infof(...) SPF_infox( __FILE__, __LINE__, __VA_ARGS__ )
++#define SPF_debugf(...) SPF_debugx( __FILE__, __LINE__, __VA_ARGS__ )
+ 
+ #elif defined( __GNUC__ )
+ 
diff --git a/www/clearsilver/distinfo b/www/clearsilver/distinfo
index 53dd2dffd4e..b52511855bd 100644
--- a/www/clearsilver/distinfo
+++ b/www/clearsilver/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2011/12/01 20:50:48 gls Exp $
+$NetBSD: distinfo,v 1.17 2012/12/22 02:25:56 joerg Exp $
 
 SHA1 (clearsilver-0.10.5.tar.gz) = 138865dc91e27328fe29fcaaac1bc6558f19dd75
 RMD160 (clearsilver-0.10.5.tar.gz) = bd5c616f326b544df8a74eec71a98a474b408249
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = cf8708c4bee271d39eca2b1833302fa13aee2b6d
 SHA1 (patch-ae) = 58326210ecef3936579a19f3cbcb9b9374bc3541
 SHA1 (patch-af) = e88106bb0c57d632c348bc16ff673e0ef7487847
 SHA1 (patch-python_neo__cgi.c) = 0baf7f06bdf7c5686131b1b1abbd4fb0fef11c85
+SHA1 (patch-util_neo__err.h) = 599f4d34b958cbdfb673e9b68409eeea5c1861aa
diff --git a/www/clearsilver/patches/patch-util_neo__err.h b/www/clearsilver/patches/patch-util_neo__err.h
new file mode 100644
index 00000000000..451d3e63742
--- /dev/null
+++ b/www/clearsilver/patches/patch-util_neo__err.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-util_neo__err.h,v 1.1 2012/12/22 02:25:57 joerg Exp $
+
+Dropping the comma before __VA_ARGS__ when the list is empty is a GCC
+language extension.
+
+--- util/neo_err.h.orig	2012-12-21 19:08:49.000000000 +0000
++++ util/neo_err.h
+@@ -84,8 +84,8 @@ typedef struct _neo_err 
+  *          NEOERR fails
+  */
+ #if defined(USE_C99_VARARG_MACROS)
+-#define nerr_raise(e,f,...) \
+-   nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__)
++#define nerr_raise(e,...) \
++   nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,__VA_ARGS__)
+ #elif defined(USE_GNUC_VARARG_MACROS)
+ #define nerr_raise(e,f,a...) \
+    nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a)
+@@ -98,8 +98,8 @@ NEOERR *nerr_raisef (const char *func, c
+ 
+ 
+ #if defined(USE_C99_VARARG_MACROS)
+-#define nerr_raise_errno(e,f,...) \
+-   nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__)
++#define nerr_raise_errno(e,...) \
++   nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,__VA_ARGS__)
+ #elif defined(USE_GNUC_VARARG_MACROS)
+ #define nerr_raise_errno(e,f,a...) \
+    nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a)