Import of pkgsrc-2013Q2

math/ordCalc/patches/patch-aa

@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.2 2010/01/21 13:50:55 is Exp $
+
+--- src/Makefile.orig	2010-01-17 05:47:28.000000000 +0100
++++ src/Makefile
+@@ -27,7 +27,7 @@ SCRIPTS = update.sh srTest.sh cmdIntfcTe
+ ALL_FILES = ${SRC} ${HDRS} ${SCRIPTS} Makefile
+ 
+ ord : ${OBJS}
+-	g++ -g ${OBJS} -lgmp -lgmpxx -lreadline -lncurses \
++	${LIBTOOL} --mode=link ${CXX} -g ${OBJS} -lgmp -lgmpxx -lreadline -lncurses \
+ 		-o ord 
+ 
+ DOC : ord
+@@ -37,7 +37,7 @@ ALL : ord
+ 	bash update.sh
+ 
+ TEST test.log : ord
+-	time bash srTest.sh | tee test.log
++	time bash srTest.sh 2>&1 | tee test.log
+ 
+ ##EXPORT : ${ALL_FILES}
+ ##	cp ${ALL_FILES} export/src

math/ordCalc/patches/patch-ab

@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2009/09/18 14:09:26 is Exp $
+
+--- Makefile.orig	2009-09-14 21:59:55.000000000 -0700
++++ Makefile
+@@ -4,7 +4,7 @@ TEST : 
+ 	cd src ; make TEST
+ 
+ EXE :
+-	cd src : make ord
++	cd src ; make ord
+ 
+ ALL :
+ 	cd src ; make ALL

math/ordCalc/patches/patch-ac

@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2010/01/23 23:21:45 is Exp $
+
+--- src/ordinal.cpp.orig	2010-01-17 04:51:35.000000000 +0000
++++ src/ordinal.cpp
+@@ -1341,7 +1341,7 @@ static void limitElementComboTest(const 
+ 	}
+ }
+ 
+-OutStream::OutStream():currentStream(&cerr),debugStream(0)
++OutStream::OutStream():currentStream(&cout),debugStream(0)
+ {
+ }
+ 

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) ; \

math/ordCalc/patches/patch-src_intfc.cpp

@@ -0,0 +1,12 @@
+$NetBSD: patch-src_intfc.cpp,v 1.1 2013/05/23 18:41:21 joerg Exp $
+
+--- src/intfc.cpp.orig	2013-05-23 17:22:49.000000000 +0000
++++ src/intfc.cpp
+@@ -4,6 +4,7 @@
+ #include <map>
+ #include <assert.h>
+ #include <ctype.h>
++#include <unistd.h>
+ #include "ordTop.h"
+ 
+ 

math/ordCalc/patches/patch-src_intfc.h

@@ -0,0 +1,13 @@
+$NetBSD: patch-src_intfc.h,v 1.1 2013/05/23 18:41:21 joerg Exp $
+
+--- src/intfc.h.orig	2013-05-23 17:23:47.000000000 +0000
++++ src/intfc.h
+@@ -170,7 +170,7 @@ public:
+         
+     void parseInput(const char * file);
+     void popFile();
+-    void readline(char * buf, int& char_read, int max_size);
++    void readline(char * buf, size_t& char_read, int max_size);
+     void readFromFile(const string * fileName);
+     void readFromFile();
+     enum logOption {createLog,flushLog,stopLog,exitClean};

math/ordCalc/patches/patch-src_mn.cpp

@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mn.cpp,v 1.1 2012/12/20 21:47:31 joerg Exp $
+
+--- src/mn.cpp.orig	2012-12-20 18:38:51.000000000 +0000
++++ src/mn.cpp
+@@ -218,7 +218,7 @@ void helpTex()
+ 
+ }
+ 
+-
++int
+ main(int argc, char  ** argv)
+ {
+     

math/ordCalc/patches/patch-src_ordBase.h

@@ -0,0 +1,28 @@
+$NetBSD: patch-src_ordBase.h,v 1.1 2012/12/20 21:47:31 joerg Exp $
+
+--- src/ordBase.h.orig	2012-12-20 18:34:49.000000000 +0000
++++ src/ordBase.h
+@@ -5,9 +5,9 @@
+ #include <string>
+ #include <list>
+ 
+-
+ #include "ordDebug.h"
+ #include "gmpxx.h"
++#include "ordinal.h"
+ 
+ using namespace std ;
+ 
+@@ -381,9 +381,9 @@ public:
+ 		friend class NormalFormTerm ;
+ 		friend class Ordinal ;
+ 
+-        friend const Ordinal& ord::admisLevelFunctional(const Ordinal& levCK,
+-		    const Ordinal& iter, const Ordinal* const * params,
+-		    const Ordinal* drillDown);
++	friend const Ordinal& admisLevelFunctional(const Ordinal& levCK,
++		const Ordinal& iter, const Ordinal* const * params=NULL,
++		const Ordinal& drillDown=Ordinal::zero);
+ 
+ 		static int idCount ;
+ 		bool inDeleteList ;

math/ordCalc/patches/patch-src_ordinal.h

@@ -0,0 +1,19 @@
+$NetBSD: patch-src_ordinal.h,v 1.1 2012/12/20 21:47:31 joerg Exp $
+
+--- src/ordinal.h.orig	2012-12-20 18:37:13.000000000 +0000
++++ src/ordinal.h
+@@ -1,3 +1,5 @@
++#ifndef ORDINAL_H
++#define ORDINAL_H
+ #include <stdlib.h>
+ #include <iostream>
+ #include <gmpxx.h>
+@@ -255,7 +257,4 @@ public:
+     extern bool interactiveMode ;
+ }
+ 
+-
+-
+-
+-
++#endif

math/ordCalc/patches/patch-src_parse.cpp

@@ -0,0 +1,13 @@
+$NetBSD: patch-src_parse.cpp,v 1.1 2013/05/23 18:41:21 joerg Exp $
+
+--- src/parse.cpp.orig	2013-05-23 17:24:24.000000000 +0000
++++ src/parse.cpp
+@@ -96,7 +96,7 @@ void ParseSemantics::exampleParse()
+     }
+ }
+ 
+-void ParseSemantics::readline(char * buf, int& char_read, int max_size)
++void ParseSemantics::readline(char * buf, size_t& char_read, int max_size)
+ {
+     if (exampleInput) {
+         int length = strlen(*exampleInput);