CVS commit: pkgsrc/audio/rplay

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Fri Jan 26 12:45:27 UTC 2018

Modified Files:
        pkgsrc/audio/rplay: Makefile distinfo
Added Files:
        pkgsrc/audio/rplay/patches: patch-include_config.h.in

Log Message:
Add a patch / build fix for NetBSD 8.0:

Avoid problems resulting from the SIZE macro expanding to "two
arguments", but the argument list already having been scanned,
leading to build failure with SSP on NetBSD 8.0.

Thanks for hint from joerg@
PKGREVISION bumped.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/audio/rplay/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/audio/rplay/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/rplay/patches/patch-include_config.h.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/rplay/Makefile
diff -u pkgsrc/audio/rplay/Makefile:1.66 pkgsrc/audio/rplay/Makefile:1.67
--- pkgsrc/audio/rplay/Makefile:1.66    Sun Dec 24 10:15:53 2017
+++ pkgsrc/audio/rplay/Makefile Fri Jan 26 12:45:27 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2017/12/24 10:15:53 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2018/01/26 12:45:27 he Exp $
 
 DISTNAME=      rplay-3.3.2
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    audio
 #MASTER_SITES= http://rplay.doit.org/dist/
 

Index: pkgsrc/audio/rplay/distinfo
diff -u pkgsrc/audio/rplay/distinfo:1.17 pkgsrc/audio/rplay/distinfo:1.18
--- pkgsrc/audio/rplay/distinfo:1.17    Tue Nov  3 01:12:49 2015
+++ pkgsrc/audio/rplay/distinfo Fri Jan 26 12:45:27 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 01:12:49 agc Exp $
+$NetBSD: distinfo,v 1.18 2018/01/26 12:45:27 he Exp $
 
 SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
 RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861
@@ -37,3 +37,4 @@ SHA1 (patch-cb) = 24c810e43d6735c24908ba
 SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce
 SHA1 (patch-devrplay_Makefile.in) = 0e158606fefa128cfcd798cd7919fe589ba04144
 SHA1 (patch-devrplay_devrplay.c) = b9a5434a8060347217e5a683cfc84d9bf73d9572
+SHA1 (patch-include_config.h.in) = 1b706770619f17517f78eb3cd125263910a7c479

Added files:

Index: pkgsrc/audio/rplay/patches/patch-include_config.h.in
diff -u /dev/null pkgsrc/audio/rplay/patches/patch-include_config.h.in:1.1
--- /dev/null   Fri Jan 26 12:45:27 2018
+++ pkgsrc/audio/rplay/patches/patch-include_config.h.in        Fri Jan 26 12:45:27 2018
@@ -0,0 +1,25 @@
+$NetBSD: patch-include_config.h.in,v 1.1 2018/01/26 12:45:27 he Exp $
+
+Provide a sneaky way to avoid problems resulting from the SIZE macro
+expanding to two arguments, but the argument list already having been
+scanned, leading to build failure with SSP on NetBSD 8.0.
+Thanks for hint from joerg@
+
+--- include/config.h.in.orig   2018-01-26 10:57:53.228900262 +0000
++++ include/config.h.in
+@@ -287,13 +287,13 @@
+ #endif
+ 
+ #ifdef HAVE_SNPRINTF
+-#define SNPRINTF snprintf
++#define SNPRINTF(str, ...) snprintf(str, __VA_ARGS__)
+ #else
+ #define SNPRINTF sprintf
+ #endif
+ 
+ #ifdef HAVE_VSNPRINTF
+-#define VSNPRINTF vsnprintf
++#define VSNPRINTF(str, ...) vsnprintf(str, __VA_ARGS__)
+ #else
+ #define VSNPRINTF vsprintf
+ #endif