[pkgsrc/trunk]: pkgsrc/devel/check Replaced the last patch. It had been for c...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d616421fc3bd
branches:  trunk
changeset: 490516:d616421fc3bd
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Mar 14 14:19:01 2005 +0000

description:
Replaced the last patch. It had been for check-0.9.2, but we currently only
have check-0.9.1.

diffstat:

 devel/check/distinfo         |   4 ++--
 devel/check/patches/patch-ab |  28 +++++++++++++++++++---------
 2 files changed, 21 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r e1542fb1a13f -r d616421fc3bd devel/check/distinfo
--- a/devel/check/distinfo      Mon Mar 14 13:56:57 2005 +0000
+++ b/devel/check/distinfo      Mon Mar 14 14:19:01 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/03/11 22:20:49 rillig Exp $
+$NetBSD: distinfo,v 1.7 2005/03/14 14:19:01 rillig Exp $
 
 SHA1 (check-0.9.1.tar.gz) = 8fa632d083b6b6fd7ff8cd3bc267d42a92732dcf
 RMD160 (check-0.9.1.tar.gz) = fe2e9d12387da2b35b47f49f836721f1c829940d
 Size (check-0.9.1.tar.gz) = 158743 bytes
 SHA1 (patch-aa) = 959c2a5b72eb722b54b8c486b2a69f8202c0a053
-SHA1 (patch-ab) = 73bf6f1a40138065b2a020b2ebc2d79ecab52322
+SHA1 (patch-ab) = d8329fdd10dbb01c528213282c2e5849d607dfd1
diff -r e1542fb1a13f -r d616421fc3bd devel/check/patches/patch-ab
--- a/devel/check/patches/patch-ab      Mon Mar 14 13:56:57 2005 +0000
+++ b/devel/check/patches/patch-ab      Mon Mar 14 14:19:01 2005 +0000
@@ -1,18 +1,28 @@
-$NetBSD: patch-ab,v 1.1 2005/03/11 22:20:49 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/14 14:19:01 rillig Exp $
 
 This patch makes check compile with cpp-2.95.3. The bug which it fixes
 is quite subtile. When fail_if(x) is expanded, the preprocessor deletes
 the last token before the ##. For cpp-2.95, this token starts with the
-"o" of occured. Later versions of cpp just remove the comma.
+"f" of failed. Later versions of cpp just remove the comma.
 
---- src/check.h.in.orig        Tue Nov  9 14:22:16 2004
-+++ src/check.h.in     Fri Mar 11 22:08:46 2005
-@@ -168,7 +168,7 @@ static void __testname (void)\
+--- src/check.h.in.orig        Wed Aug 18 14:03:46 2004
++++ src/check.h.in     Mon Mar 14 13:29:49 2005
+@@ -157,15 +157,15 @@ static void __testname (void)\
+ /* Fail the test case unless expr is true */
+ #define fail_unless(expr, msg, args...)\
+         _fail_unless(expr, __FILE__, __LINE__,\
+-        msg ? msg : "Assertion '"#expr"' failed", ##args)
++        msg ? msg : "Assertion '"#expr"' failed" , ##args)
+ 
  /* Fail the test case if expr is true */
- #define fail_if(expr, ...)\
+ #define fail_if(expr, msg, args...)\
          _fail_unless(!(expr), __FILE__, __LINE__,\
--        "Failure '"#expr"' occured", ## __VA_ARGS__, NULL)
-+        "Failure '"#expr"' occured" , ## __VA_ARGS__, NULL)
+-        msg ?msg :"Assertion '"#expr"' failed", ##args)
++        msg ?msg :"Assertion '"#expr"' failed" , ##args)
  
  /* Always fail */
- #define fail(...) _fail_unless(0, __FILE__, __LINE__, "Failed" , ## __VA_ARGS__, NULL)
+-#define fail(msg, args...) _fail_unless(0, __FILE__, __LINE__, msg, ##args)
++#define fail(msg, args...) _fail_unless(0, __FILE__, __LINE__, msg , ##args)
+ 
+ /* Non macro version of #fail_unless, with more complicated interface */
+ void _fail_unless (int result, const char *file,