Add MAIN__ to the tela.C file instead of creating a new file.

4 files changed, 19 insertions, 30 deletions

diff --git a/math/tela/files/patch-sum b/math/tela/files/patch-sum
index 50ef3a64483..f467151aaa9 100644
--- a/math/tela/files/patch-sum
+++ b/math/tela/files/patch-sum
@@ -1,11 +1,10 @@
-$NetBSD: patch-sum,v 1.10 2001/04/09 03:09:11 jtb Exp $
+$NetBSD: patch-sum,v 1.11 2001/04/09 03:55:20 jtb Exp $
 
 SHA1 (patch-aa) = 2a2033c3d3bddbfcfaebb189223fc320fb82c4cc
 SHA1 (patch-ab) = 56de2601fa5bebfcdcc035682ac8452d3af82985
-SHA1 (patch-ac) = 065065f4011eb14a4d3a3481be609323e5e316b1
-SHA1 (patch-ad) = f4b749758518472800320a99b648b4acc19a6b81
+SHA1 (patch-ac) = abc92a9e69daa5744fb046608943aecfec34d633
+SHA1 (patch-ad) = 1276a6d1ef5876376a4dcd9a1dacfd7e09f106fd
 SHA1 (patch-ae) = ad36a0b3d6d9e4e48e3e266ea9d88c6d3e5d918d
 SHA1 (patch-af) = a126910bd70b2f1fbde2f4609cace499795d0e0c
 SHA1 (patch-ag) = 5090a139f0a7dfb04e0714db698d5f2e5680f8c1
 SHA1 (patch-ah) = 4db7d142e30ee5d813e8a827ee49e72faacebd25
-SHA1 (patch-ai) = 91011269c2bd640ffce04b37710b4ce55833d1ed
diff --git a/math/tela/patches/patch-ac b/math/tela/patches/patch-ac
index e542cd85a48..5d4b6fdfe4c 100644
--- a/math/tela/patches/patch-ac
+++ b/math/tela/patches/patch-ac
@@ -1,14 +1,23 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/28 22:34:08 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2001/04/09 03:55:20 jtb Exp $
 
---- tela.C.orig	Mon Feb 12 08:08:40 2001
+--- tela.C.orig	Thu Mar  8 07:20:04 2001
 +++ tela.C
-@@ -14,7 +14,9 @@
+@@ -14,7 +14,7 @@
  #include "d.l.h"
  #include "version.H"
  #include <signal.h>
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
+-#include <values.h>
++//#include <values.h>
  //#include <unistd.h>
  extern "C" {
  #include "readline/chardefs.h"
+@@ -30,9 +30,7 @@
+ // On some Linux versions the libf77.so refers to external symbol MAIN__ which is supposed
+ // to be the Fortran main program. Since we do not have a Fortran main program here, we define it here.
+ // Hope it doesn't conflict with anything else.
+-#ifdef LINUX
+ int MAIN__;
+-#endif
+ }
+ 
+ char *VersionString = VERSION;
diff --git a/math/tela/patches/patch-ad b/math/tela/patches/patch-ad
index a6d76c050e6..6c88fe3d276 100644
--- a/math/tela/patches/patch-ad
+++ b/math/tela/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2001/04/09 03:09:12 jtb Exp $
+$NetBSD: patch-ad,v 1.7 2001/04/09 03:55:20 jtb Exp $
 
 --- Makefile.orig	Tue Mar  6 18:25:25 2001
 +++ Makefile
@@ -11,15 +11,6 @@ $NetBSD: patch-ad,v 1.6 2001/04/09 03:09:12 jtb Exp $
  SGML2PS = sgml2latex
  #HDFLIBS = /usr/local/lib/libdf.a
  #DLDINCLUDE =
-@@ -94,7 +94,7 @@
- TSYGANENKO_O = geopack_ct.o
- TSYGLIB = libtsyg.a
- MPEG2ENCODELIB = libmpeg2encode.a
--CTELA_MODULES = std.o files.o plotmtv.o sppc.o la.o fft.o dld.o fileio.o \
-+CTELA_MODULES = MAIN__.o std.o files.o plotmtv.o sppc.o la.o fft.o dld.o fileio.o \
- 				numerics.o ani.o $(MATLABENG_O) $(CDF_O) $(TSYGANENKO_O)
- NEEDED_BY_CTELA_MODULES = $(MATLABLIB) $(VECFFTPACK_O) fftpack.o $(TSYGLIB) $(MPEG2ENCODELIB)
- #---------------------------------------------------------------------
 @@ -113,7 +113,7 @@
  OBJECTDEPS = objarithm.H object.H def.H deftyp.h Tcomplex.H error.H ctinfo.H common.H $(srcdir)/templ/tLL.H
  EXECUTABLES = testobject testil testerror testtree tela ctpp
diff --git a/math/tela/patches/patch-ai b/math/tela/patches/patch-ai
deleted file mode 100644
index 58cb3cfa61d..00000000000
--- a/math/tela/patches/patch-ai
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2001/04/09 03:09:12 jtb Exp $
-
---- /dev/null	Mon Apr  9 02:50:05 2001
-+++ MAIN__.c
-@@ -0,0 +1,5 @@
-+void
-+MAIN__ (void)
-+{
-+  abort();
-+}