From 4c400acdea7b85dbcb8389f33bf5305c88a0140b Mon Sep 17 00:00:00 2001
From: is <is@pkgsrc.org>
Date: Sat, 23 Jan 2010 23:27:55 +0000
Subject: Don't depend on accidental line buffering.

---
 math/ordCalc/Makefile         |  4 ++--
 math/ordCalc/distinfo         |  3 ++-
 math/ordCalc/patches/patch-ad | 24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 math/ordCalc/patches/patch-ad

(limited to 'math/ordCalc')

diff --git a/math/ordCalc/Makefile b/math/ordCalc/Makefile
index d43894748f9..8218ae7b451 100644
--- a/math/ordCalc/Makefile
+++ b/math/ordCalc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/01/23 23:21:45 is Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/23 23:27:55 is Exp $
 #
 
 ORDCALCVER=	0.2
 PKGNAME=	ordCalc-${ORDCALCVER}
 DISTNAME=	ordCalc_${ORDCALCVER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://mtnmath.com/ord/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/math/ordCalc/distinfo b/math/ordCalc/distinfo
index 145cf671ccb..5152ed2978d 100644
--- a/math/ordCalc/distinfo
+++ b/math/ordCalc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2010/01/23 23:21:45 is Exp $
+$NetBSD: distinfo,v 1.4 2010/01/23 23:27:55 is Exp $
 
 SHA1 (ordCalc_0.2.tar.bz2) = 6b3e1e5b714cc50d1e2c48b8f06b8dd41fbde134
 RMD160 (ordCalc_0.2.tar.bz2) = caf9c89a2a54fe3e5414cb7f1e1a4e1d4aad0397
@@ -6,3 +6,4 @@ Size (ordCalc_0.2.tar.bz2) = 1123521 bytes
 SHA1 (patch-aa) = 8e07a797e1f258727e1320ffe4e6256cd5049a69
 SHA1 (patch-ab) = 0adfeaa3a1018d3197a26480e9a736e7d9da962d
 SHA1 (patch-ac) = a716cc6dc42d46b5c9c0d0fe5bda8a226ab71638
+SHA1 (patch-ad) = e8a1fa4fcfdf8d43d70f614ef63127885dc885b4
diff --git a/math/ordCalc/patches/patch-ad b/math/ordCalc/patches/patch-ad
new file mode 100644
index 00000000000..50c9d114869
--- /dev/null
+++ b/math/ordCalc/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2010/01/23 23:27:55 is Exp $
+
+--- src/validate2.cpp.orig	2010-01-17 04:48:09.000000000 +0000
++++ src/validate2.cpp
+@@ -883,13 +883,16 @@ void Validate::cmpExitCodeTest()
+ #define LC(a,b)  outStream() << "Doing " << #b << "\n"; \
+     bool a = b ; outStream() << #b << " = " << a << "\n";
+ 
+-#define CMP_TST(str,aa,bb,eqf) { Validate::outCompareExit= true ; \
++#define CMP_TST(str,aa,bb,eqf) { \
++    string axn; string bxn; \
++    Validate::outCompareExit= true ; \
+     outStream() << "Test " << #str << "\n" ; \
+     const Ordinal& ax = aa ; const Ordinal &bx =bb ; \
+     LC(agb,ax>bx) ; LC(aeb, ax==bx) ; LC(alb, ax < bx) ; \
+     LC(bga, bx>ax) ; LC(bea, bx==ax) ; LC(bla, bx < ax) ; \
+-    outStream() << "Test " << #str << " summary \na = " << ax.normalForm() << "\n" \
+-        << "b = " << bx.normalForm() << "\na>b " << agb << ", a==b " << aeb \
++    axn = ax.normalForm(); bxn = bx.normalForm(); \
++    outStream() << "Test " << #str << " summary \na = " << axn << "\n" \
++        << "b = " << bxn << "\na>b " << agb << ", a==b " << aeb \
+         << ". a<b " << alb << ", b>a " << bga << ", b==a " << bea << \
+         ". b<a " << bla << "\n" ; \
+     if (eqf) assert (aeb && bea && !alb && ! bla & !agb & !bga) ; \
-- 
cgit v1.2.3