To be a friend, you have to know the other function. Make sure that the

ordinal.h header is include guarded. Fix main prototype.

4 files changed, 64 insertions, 1 deletions

diff --git a/math/ordCalc/distinfo b/math/ordCalc/distinfo
index 5152ed2978d..bead1f97041 100644
--- a/math/ordCalc/distinfo
+++ b/math/ordCalc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2010/01/23 23:27:55 is Exp $
+$NetBSD: distinfo,v 1.5 2012/12/20 21:47:31 joerg Exp $
 
 SHA1 (ordCalc_0.2.tar.bz2) = 6b3e1e5b714cc50d1e2c48b8f06b8dd41fbde134
 RMD160 (ordCalc_0.2.tar.bz2) = caf9c89a2a54fe3e5414cb7f1e1a4e1d4aad0397
@@ -7,3 +7,6 @@ SHA1 (patch-aa) = 8e07a797e1f258727e1320ffe4e6256cd5049a69
 SHA1 (patch-ab) = 0adfeaa3a1018d3197a26480e9a736e7d9da962d
 SHA1 (patch-ac) = a716cc6dc42d46b5c9c0d0fe5bda8a226ab71638
 SHA1 (patch-ad) = e8a1fa4fcfdf8d43d70f614ef63127885dc885b4
+SHA1 (patch-src_mn.cpp) = da8ff526d95f171566d0cd8061a1439975342554
+SHA1 (patch-src_ordBase.h) = 22a0bf9c135bbcb88f10c25871c619718ceb40ad
+SHA1 (patch-src_ordinal.h) = e1dde6caf141c82b7f740ce18280be6507bacd9e
diff --git a/math/ordCalc/patches/patch-src_mn.cpp b/math/ordCalc/patches/patch-src_mn.cpp
new file mode 100644
index 00000000000..ae1897790e0
--- /dev/null
+++ b/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)
+ {
+     
diff --git a/math/ordCalc/patches/patch-src_ordBase.h b/math/ordCalc/patches/patch-src_ordBase.h
new file mode 100644
index 00000000000..4793e7053c4
--- /dev/null
+++ b/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 ;
diff --git a/math/ordCalc/patches/patch-src_ordinal.h b/math/ordCalc/patches/patch-src_ordinal.h
new file mode 100644
index 00000000000..a4820f6e6ac
--- /dev/null
+++ b/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