From 5c7346d1916452d3b31b34ae8959626f46b85526 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 14 Feb 2017 21:27:04 +0000
Subject: Pointers are not ordered relative to 0, so compare the elements as
 likely intended. Bump revision.

---
 math/ordCalc/Makefile         |  4 ++--
 math/ordCalc/distinfo         |  4 ++--
 math/ordCalc/patches/patch-ac | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'math')

diff --git a/math/ordCalc/Makefile b/math/ordCalc/Makefile
index 0f7fec8584e..7eb28a9c6bc 100644
--- a/math/ordCalc/Makefile
+++ b/math/ordCalc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2015/08/18 07:31:12 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2017/02/14 21:27:04 joerg Exp $
 #
 
 ORDCALCVER=	0.2
 PKGNAME=	ordCalc-${ORDCALCVER}
 DISTNAME=	ordCalc_${ORDCALCVER}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	http://mtnmath.com/ord/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/math/ordCalc/distinfo b/math/ordCalc/distinfo
index 37e49fba454..9bf65fd95e2 100644
--- a/math/ordCalc/distinfo
+++ b/math/ordCalc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 23:33:37 agc Exp $
+$NetBSD: distinfo,v 1.11 2017/02/14 21:27:04 joerg Exp $
 
 SHA1 (ordCalc_0.2.tar.bz2) = 6b3e1e5b714cc50d1e2c48b8f06b8dd41fbde134
 RMD160 (ordCalc_0.2.tar.bz2) = caf9c89a2a54fe3e5414cb7f1e1a4e1d4aad0397
@@ -6,7 +6,7 @@ SHA512 (ordCalc_0.2.tar.bz2) = 7a8d3b9f88e229144f61077b1d1a45591f9001aedc62b5435
 Size (ordCalc_0.2.tar.bz2) = 1123521 bytes
 SHA1 (patch-aa) = 06099a685082adf353c9902713acc0dc485d6d74
 SHA1 (patch-ab) = 0adfeaa3a1018d3197a26480e9a736e7d9da962d
-SHA1 (patch-ac) = a716cc6dc42d46b5c9c0d0fe5bda8a226ab71638
+SHA1 (patch-ac) = 125934abe1773365f8121f93466ec7b524853c99
 SHA1 (patch-ad) = e8a1fa4fcfdf8d43d70f614ef63127885dc885b4
 SHA1 (patch-src_intfc.cpp) = e2d8f2d2e374c9eda118cd281126c416a7976774
 SHA1 (patch-src_intfc.h) = dbb95eb44fc3abe01fdcabaf824790915117d09c
diff --git a/math/ordCalc/patches/patch-ac b/math/ordCalc/patches/patch-ac
index b2131a2b16a..48915ffad63 100644
--- a/math/ordCalc/patches/patch-ac
+++ b/math/ordCalc/patches/patch-ac
@@ -1,4 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2010/01/23 23:21:45 is Exp $
+$NetBSD: patch-ac,v 1.2 2017/02/14 21:27:04 joerg Exp $
+
+Pointers are not ordered. Fix the code to actually compare to the element
+and not a promoted boolean.
 
 --- src/ordinal.cpp.orig	2010-01-17 04:51:35.000000000 +0000
 +++ src/ordinal.cpp
@@ -11,3 +14,12 @@ $NetBSD: patch-ac,v 1.1 2010/01/23 23:21:45 is Exp $
  {
  }
  
+@@ -1420,7 +1420,7 @@ const Ordinal& ord::finiteFunctionalTest
+ 		if (params[index]->getImpl().psuedoCodeLevel() ==
+ 			CantorNormalElement::cantorCodeLevel) continue ;
+ 		if (maxIndex < 0) maxIndex = index ;
+-		else if (params[maxIndex]->compare(params[index]<0)) maxIndex = index ;
++		else if (params[maxIndex]->compare(*params[index]) < 0) maxIndex = index ;
+ 	}
+ 	if (maxIndex >= 0) {
+ 		bool maxPredNz = false ;
-- 
cgit v1.2.3