Declare vsscanf consistent with modern systems. Continue on parentheses

related warnings from clang.

4 files changed, 35 insertions, 2 deletions

diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 0abe0da1bfe..2327eddd10d 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/10/31 11:19:45 asau Exp $
+# $NetBSD: Makefile,v 1.25 2013/09/10 14:18:11 joerg Exp $
 #
 
 # pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000.
@@ -25,6 +25,11 @@ WRKSRC=		${WRKDIR}
 
 AUTO_MKDIRS=			yes
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+CFLAGS+=	-Wno-error=parentheses
+.endif
+
 post-patch:
 	${MV} ${WRKSRC}/man/man3/sfio.3 ${WRKSRC}/man/man3/sfio.3.in
 	${SED} -e 's|@prefix@|${PREFIX}|g' ${WRKSRC}/man/man3/sfio.3.in \
diff --git a/devel/sfio/distinfo b/devel/sfio/distinfo
index bdc821fc634..93522128318 100644
--- a/devel/sfio/distinfo
+++ b/devel/sfio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2011/12/19 14:19:43 wiz Exp $
+$NetBSD: distinfo,v 1.9 2013/09/10 14:18:11 joerg Exp $
 
 SHA1 (sfio_1999.src.unix.cpio) = 6fd3a711ca8f95190c0859934f57a66d02c842a4
 RMD160 (sfio_1999.src.unix.cpio) = 379148273c9979f7a5a921a338465b7579a6ac5e
@@ -21,3 +21,5 @@ SHA1 (patch-src_lib_sfio_Sfio__dc_sfdcseekable.c) = daa5b79246462fe474dc72b4dba3
 SHA1 (patch-src_lib_sfio_Sfio__dc_sfdcsubstream.c) = 57acce973b885a97ef783cab5ffafd07666fca61
 SHA1 (patch-src_lib_sfio_Sfio__dc_sfdctee.c) = a21856a2c6db519e5dda508c7dd3358aef5ffe13
 SHA1 (patch-src_lib_sfio_Sfio__dc_sfdcunion.c) = 95c2113db9c1ff1c9ee7c9388a1324033a7fe697
+SHA1 (patch-src_lib_sfio_Stdio__b_sfstdio.c) = 027041928450e67fdfce77928b52a5889a287f15
+SHA1 (patch-src_lib_sfio_Stdio__b_vsscanf.c) = 39408d8de53c168b4602506bb0be466e481a0769
diff --git a/devel/sfio/patches/patch-src_lib_sfio_Stdio__b_sfstdio.c b/devel/sfio/patches/patch-src_lib_sfio_Stdio__b_sfstdio.c
new file mode 100644
index 00000000000..f673c42ac79
--- /dev/null
+++ b/devel/sfio/patches/patch-src_lib_sfio_Stdio__b_sfstdio.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_lib_sfio_Stdio__b_sfstdio.c,v 1.1 2013/09/10 14:18:11 joerg Exp $
+
+--- src/lib/sfio/Stdio_b/sfstdio.c.orig	2013-09-10 12:08:39.000000000 +0000
++++ src/lib/sfio/Stdio_b/sfstdio.c
+@@ -670,7 +670,7 @@ int main()
+ 	printf("extern int\t\tvprintf _ARG_((const char* , va_list));\n");
+ 	printf("extern int\t\tvscanf _ARG_((const char* , va_list));\n");
+ 	printf("extern int\t\tvsprintf _ARG_((char*, const char* , va_list));\n");
+-	printf("extern int\t\tvsscanf _ARG_((char*, const char* , va_list));\n");
++	printf("extern int\t\tvsscanf _ARG_((const char*, const char* , va_list));\n");
+ 	printf("#if __cplusplus\n");
+ 	printf("}\n");
+ 	printf("#endif\n\n");
diff --git a/devel/sfio/patches/patch-src_lib_sfio_Stdio__b_vsscanf.c b/devel/sfio/patches/patch-src_lib_sfio_Stdio__b_vsscanf.c
new file mode 100644
index 00000000000..9cbb41e845d
--- /dev/null
+++ b/devel/sfio/patches/patch-src_lib_sfio_Stdio__b_vsscanf.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_lib_sfio_Stdio__b_vsscanf.c,v 1.1 2013/09/10 14:18:11 joerg Exp $
+
+--- src/lib/sfio/Stdio_b/vsscanf.c.orig	2013-09-10 12:06:32.000000000 +0000
++++ src/lib/sfio/Stdio_b/vsscanf.c
+@@ -5,7 +5,7 @@
+ */
+ 
+ #if __STD_C
+-int vsscanf(char* s, const char* form, va_list args)
++int vsscanf(const char* s, const char* form, va_list args)
+ #else
+ int vsscanf(s,form,args)
+ reg char*	s;