Tue Feb 14 21:27:04 2017 UTC ()
Pointers are not ordered relative to 0, so compare the elements
as likely intended. Bump revision.


(joerg)
diff -r1.10 -r1.11 pkgsrc/math/ordCalc/Makefile
diff -r1.10 -r1.11 pkgsrc/math/ordCalc/distinfo
diff -r1.1 -r1.2 pkgsrc/math/ordCalc/patches/patch-ac
cvs diff -r1.10 -r1.11 pkgsrc/math/ordCalc/Makefile (expand / switch to unified diff)

--- pkgsrc/math/ordCalc/Makefile 2015/08/18 07:31:12 1.10
+++ pkgsrc/math/ordCalc/Makefile 2017/02/14 21:27:04 1.11
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.10 2015/08/18 07:31:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2017/02/14 21:27:04 joerg Exp $
2# 2#
3 3
4ORDCALCVER= 0.2 4ORDCALCVER= 0.2
5PKGNAME= ordCalc-${ORDCALCVER} 5PKGNAME= ordCalc-${ORDCALCVER}
6DISTNAME= ordCalc_${ORDCALCVER} 6DISTNAME= ordCalc_${ORDCALCVER}
7PKGREVISION= 6 7PKGREVISION= 7
8CATEGORIES= math 8CATEGORIES= math
9MASTER_SITES= http://mtnmath.com/ord/ 9MASTER_SITES= http://mtnmath.com/ord/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= is@NetBSD.org 12MAINTAINER= is@NetBSD.org
13HOMEPAGE= http://mtnmath.com/ord/ 13HOMEPAGE= http://mtnmath.com/ord/
14COMMENT= Ordinal arithmetic calculator and research tool 14COMMENT= Ordinal arithmetic calculator and research tool
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17USE_LANGUAGES= c++ 17USE_LANGUAGES= c++
18USE_TOOLS+= bash bison flex gmake 18USE_TOOLS+= bash bison flex gmake
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20 20
cvs diff -r1.10 -r1.11 pkgsrc/math/ordCalc/distinfo (expand / switch to unified diff)

--- pkgsrc/math/ordCalc/distinfo 2015/11/03 23:33:37 1.10
+++ pkgsrc/math/ordCalc/distinfo 2017/02/14 21:27:04 1.11
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.10 2015/11/03 23:33:37 agc Exp $ 1$NetBSD: distinfo,v 1.11 2017/02/14 21:27:04 joerg Exp $
2 2
3SHA1 (ordCalc_0.2.tar.bz2) = 6b3e1e5b714cc50d1e2c48b8f06b8dd41fbde134 3SHA1 (ordCalc_0.2.tar.bz2) = 6b3e1e5b714cc50d1e2c48b8f06b8dd41fbde134
4RMD160 (ordCalc_0.2.tar.bz2) = caf9c89a2a54fe3e5414cb7f1e1a4e1d4aad0397 4RMD160 (ordCalc_0.2.tar.bz2) = caf9c89a2a54fe3e5414cb7f1e1a4e1d4aad0397
5SHA512 (ordCalc_0.2.tar.bz2) = 7a8d3b9f88e229144f61077b1d1a45591f9001aedc62b5435a8a308fad35919d110608c695aa660ec9c1ddb9ea89b84eb365f8082a6ed4726cec4afa862ac778 5SHA512 (ordCalc_0.2.tar.bz2) = 7a8d3b9f88e229144f61077b1d1a45591f9001aedc62b5435a8a308fad35919d110608c695aa660ec9c1ddb9ea89b84eb365f8082a6ed4726cec4afa862ac778
6Size (ordCalc_0.2.tar.bz2) = 1123521 bytes 6Size (ordCalc_0.2.tar.bz2) = 1123521 bytes
7SHA1 (patch-aa) = 06099a685082adf353c9902713acc0dc485d6d74 7SHA1 (patch-aa) = 06099a685082adf353c9902713acc0dc485d6d74
8SHA1 (patch-ab) = 0adfeaa3a1018d3197a26480e9a736e7d9da962d 8SHA1 (patch-ab) = 0adfeaa3a1018d3197a26480e9a736e7d9da962d
9SHA1 (patch-ac) = a716cc6dc42d46b5c9c0d0fe5bda8a226ab71638 9SHA1 (patch-ac) = 125934abe1773365f8121f93466ec7b524853c99
10SHA1 (patch-ad) = e8a1fa4fcfdf8d43d70f614ef63127885dc885b4 10SHA1 (patch-ad) = e8a1fa4fcfdf8d43d70f614ef63127885dc885b4
11SHA1 (patch-src_intfc.cpp) = e2d8f2d2e374c9eda118cd281126c416a7976774 11SHA1 (patch-src_intfc.cpp) = e2d8f2d2e374c9eda118cd281126c416a7976774
12SHA1 (patch-src_intfc.h) = dbb95eb44fc3abe01fdcabaf824790915117d09c 12SHA1 (patch-src_intfc.h) = dbb95eb44fc3abe01fdcabaf824790915117d09c
13SHA1 (patch-src_mn.cpp) = da8ff526d95f171566d0cd8061a1439975342554 13SHA1 (patch-src_mn.cpp) = da8ff526d95f171566d0cd8061a1439975342554
14SHA1 (patch-src_ordBase.h) = ad3c896fbbea6b40ef6f734c1f212dff49856d9a 14SHA1 (patch-src_ordBase.h) = ad3c896fbbea6b40ef6f734c1f212dff49856d9a
15SHA1 (patch-src_ordinal.h) = e1dde6caf141c82b7f740ce18280be6507bacd9e 15SHA1 (patch-src_ordinal.h) = e1dde6caf141c82b7f740ce18280be6507bacd9e
16SHA1 (patch-src_parse.cpp) = 1e7602a33edd62f4d5a119c2e35062499c07d70e 16SHA1 (patch-src_parse.cpp) = 1e7602a33edd62f4d5a119c2e35062499c07d70e
17SHA1 (patch-src_parse.y) = 1339048b37f2bc5e5dfc45256578a1991c53e247 17SHA1 (patch-src_parse.y) = 1339048b37f2bc5e5dfc45256578a1991c53e247
cvs diff -r1.1 -r1.2 pkgsrc/math/ordCalc/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/math/ordCalc/patches/patch-ac 2010/01/23 23:21:45 1.1
+++ pkgsrc/math/ordCalc/patches/patch-ac 2017/02/14 21:27:04 1.2
@@ -1,13 +1,25 @@ @@ -1,13 +1,25 @@
1$NetBSD: patch-ac,v 1.1 2010/01/23 23:21:45 is Exp $ 1$NetBSD: patch-ac,v 1.2 2017/02/14 21:27:04 joerg Exp $
 2
 3Pointers are not ordered. Fix the code to actually compare to the element
 4and not a promoted boolean.
2 5
3--- src/ordinal.cpp.orig 2010-01-17 04:51:35.000000000 +0000 6--- src/ordinal.cpp.orig 2010-01-17 04:51:35.000000000 +0000
4+++ src/ordinal.cpp 7+++ src/ordinal.cpp
5@@ -1341,7 +1341,7 @@ static void limitElementComboTest(const  8@@ -1341,7 +1341,7 @@ static void limitElementComboTest(const
6 } 9 }
7 } 10 }
8  11
9-OutStream::OutStream():currentStream(&cerr),debugStream(0) 12-OutStream::OutStream():currentStream(&cerr),debugStream(0)
10+OutStream::OutStream():currentStream(&cout),debugStream(0) 13+OutStream::OutStream():currentStream(&cout),debugStream(0)
11 { 14 {
12 } 15 }
13  16
 17@@ -1420,7 +1420,7 @@ const Ordinal& ord::finiteFunctionalTest
 18 if (params[index]->getImpl().psuedoCodeLevel() ==
 19 CantorNormalElement::cantorCodeLevel) continue ;
 20 if (maxIndex < 0) maxIndex = index ;
 21- else if (params[maxIndex]->compare(params[index]<0)) maxIndex = index ;
 22+ else if (params[maxIndex]->compare(*params[index]) < 0) maxIndex = index ;
 23 }
 24 if (maxIndex >= 0) {
 25 bool maxPredNz = false ;