Update to 1.0.57. For changes since 1.0.56 please see:

http://yacas.sourceforge.net/changes.html
The new optimze-compiled-plugin-size feature had to be disabled
otherwise yacas would dump core.

Approved by:	netchild

11 files changed, 21 insertions, 99 deletions

diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 9333adec8485..9e494e5d5c19 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	yacas
-PORTVERSION=	1.0.56
-PORTREVISION=	1
+PORTVERSION=	1.0.57
 CATEGORIES=	math
 MASTER_SITES=	http://yacas.sourceforge.net/backups/
 
diff --git a/math/yacas/distinfo b/math/yacas/distinfo
index 1184734c9741..4e60ed4b4dcd 100644
--- a/math/yacas/distinfo
+++ b/math/yacas/distinfo
@@ -1,2 +1,2 @@
-MD5 (yacas-1.0.56.tar.gz) = cde348f0a4274e1f487b7483003cf119
-SIZE (yacas-1.0.56.tar.gz) = 1931182
+MD5 (yacas-1.0.57.tar.gz) = 0e5161457cb7d818aa8009676998696b
+SIZE (yacas-1.0.57.tar.gz) = 1974503
diff --git a/math/yacas/files/patch-scripts::compile.rep::compilecpp.ys b/math/yacas/files/patch-scripts::compile.rep::compilecpp.ys
index 4fd81a2fc8fa..bc28ab9211d7 100644
--- a/math/yacas/files/patch-scripts::compile.rep::compilecpp.ys
+++ b/math/yacas/files/patch-scripts::compile.rep::compilecpp.ys
@@ -1,11 +1,11 @@
 --- scripts/compile.rep/compilecpp.ys.orig	Sun Aug 24 14:35:27 2003
 +++ scripts/compile.rep/compilecpp.ys	Thu Jul 29 15:48:30 2004
-@@ -312,7 +312,7 @@
- {
-     return NEW <?WriteString(\"Plugin_\":pluginName);?>;
- }
--};
-+}
- ";
- //{cname,fname,nrargs}
+@@ -395,7 +395,7 @@
  
+ // The define OPTIMIZE_COMPILED_PLUGIN_SIZE should be defined somewhere else.
+ #ifndef WIN32 // some macro expansion is failing on Win platform, no idea why.
+-#define OPTIMIZE_COMPILED_PLUGIN_SIZE
++// #define OPTIMIZE_COMPILED_PLUGIN_SIZE
+ #endif // WIN32
+ 
+ #ifdef OPTIMIZE_COMPILED_PLUGIN_SIZE
diff --git a/math/yacas/files/patch-scripts::cstubgen.rep::code.ys b/math/yacas/files/patch-scripts::cstubgen.rep::code.ys
deleted file mode 100644
index 88378d171a89..000000000000
--- a/math/yacas/files/patch-scripts::cstubgen.rep::code.ys
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/cstubgen.rep/code.ys.orig	Sun Aug 24 14:37:32 2003
-+++ scripts/cstubgen.rep/code.ys	Thu Jul 29 15:59:31 2004
-@@ -262,7 +262,7 @@
-     return NEW <? WriteString(pluginname); ?>;
- }
- 
--};
-+}
- 
- <?
- WriteString(postlog);
diff --git a/math/yacas/files/patch-src::Makefile.in b/math/yacas/files/patch-src::Makefile.in
index 93fdc585b500..e6818f64fda0 100644
--- a/math/yacas/files/patch-src::Makefile.in
+++ b/math/yacas/files/patch-src::Makefile.in
@@ -1,11 +1,11 @@
 --- src/Makefile.in.orig	Wed May 21 05:56:37 2003
 +++ src/Makefile.in	Wed May 21 12:55:31 2003
-@@ -791,7 +791,7 @@
- 	grep '^CORE_KERNEL_FUNCTION' $(srcdir)/yacasmain.cpp > $@
+@@ -809,7 +809,7 @@
+ # The libmath.cpp source file is generated as follows
  
- $(srcdir)/libmath.cpp: yacas $(top_srcdir)/scripts/base.rep/math.ys gencorefunctions core_yacasmain.h 
+ $(srcdir)/libmath.cpp: $(top_srcdir)/scripts/base.rep/math.ys yacas$(EXEEXT)
 -	(cd ../scripts && make packages.ys corefunctions.ys)
 +	(cd ../scripts && $(MAKE) packages.ys corefunctions.ys)
  	echo "Set(LoadPlugIns,False);Use(\"yacasinit.ys\");" > compileinit.txt
  	echo "CompileCpp(\"base.rep/math.ys\",\"libmath\");" > compile.txt
- 	./yacas --rootdir  $(srcdir)/../scripts:../scripts -pc --init compileinit.txt compile.txt
+ 	./yacas$(EXEEXT) --rootdir  $(top_srcdir)/scripts -pc --init compileinit.txt compile.txt
diff --git a/math/yacas/files/patch-src::cyacas.h b/math/yacas/files/patch-src::cyacas.h
deleted file mode 100644
index 4a7669ec0669..000000000000
--- a/math/yacas/files/patch-src::cyacas.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cyacas.h	2002/07/31 19:26:14	1.4
-+++ src/cyacas.h	2004/07/03 19:32:14	1.5
-@@ -63,7 +63,7 @@
-     

- 

- #ifdef __cplusplus

--};

-+}

- #endif

- 

- 

diff --git a/math/yacas/files/patch-src::grower.inl b/math/yacas/files/patch-src::grower.inl
deleted file mode 100644
index 8c15d111ad98..000000000000
--- a/math/yacas/files/patch-src::grower.inl
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/grower.inl	2001/07/18 19:59:34	1.5
-+++ src/grower.inl	2004/07/03 19:32:15	1.6
-@@ -123,10 +123,10 @@
- inline CDeletingArrayGrower<T>::~CDeletingArrayGrower()
- {
-   LispInt i,nr;
--  nr = NrItems();
-+  nr = CDeletingArrayGrower::NrItems();
-   for (i=0;i<nr;i++)
-   {
--    delete Item(i);
-+    delete CDeletingArrayGrower::Item(i);
-   }
- }
- #endif
diff --git a/math/yacas/files/patch-src::mathcommands.h b/math/yacas/files/patch-src::mathcommands.h
deleted file mode 100644
index bcb9f348eec6..000000000000
--- a/math/yacas/files/patch-src::mathcommands.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/mathcommands.h	2003/03/11 16:53:16	1.27
-+++ src/mathcommands.h	2004/07/03 19:32:15	1.28
-@@ -11,9 +11,9 @@
- 
- //#define CORE_FUNCTION(NAME) void NAME(LispEnvironment& aEnvironment, LispPtr& aResult, LispPtr& aArguments);
- 
--#define CORE_KERNEL_FUNCTION(iname,fname,nrargs,flags) void fname(LispEnvironment& aEnvironment, LispInt aStackTop);
--#define CORE_KERNEL_FUNCTION_ALIAS(iname,fname,nrargs,flags) 
--#define OPERATOR(kind, prec, yacas_name)
-+#define CORE_KERNEL_FUNCTION(iname,fname,nrargs,flags) void fname(LispEnvironment& aEnvironment, LispInt aStackTop)
-+#define CORE_KERNEL_FUNCTION_ALIAS(iname,fname,nrargs,flags)  int JimDummyFunction()
-+#define OPERATOR(kind, prec, yacas_name) int JimDummyFunction()
- 
- #include "corefunctions.h"
- #undef CORE_KERNEL_FUNCTION
diff --git a/math/yacas/files/patch-src::obmalloc.cpp b/math/yacas/files/patch-src::obmalloc.cpp
deleted file mode 100644
index d7a888c2ff71..000000000000
--- a/math/yacas/files/patch-src::obmalloc.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/obmalloc.cpp	2002/11/24 17:48:08	1.5
-+++ src/obmalloc.cpp	2004/07/03 19:32:15	1.6
-@@ -318,7 +318,7 @@
- /*
-  * This malloc lock
-  */
--SIMPLELOCK_DECL(_malloc_lock);
-+SIMPLELOCK_DECL(_malloc_lock)
- #define LOCK()		SIMPLELOCK_LOCK(_malloc_lock)
- #define UNLOCK()	SIMPLELOCK_UNLOCK(_malloc_lock)
- #define LOCK_INIT()	SIMPLELOCK_INIT(_malloc_lock)
diff --git a/math/yacas/files/patch-src::stdfileio.cpp b/math/yacas/files/patch-src::stdfileio.cpp
deleted file mode 100644
index 6e2c0e2a7a5d..000000000000
--- a/math/yacas/files/patch-src::stdfileio.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/stdfileio.cpp	2003/02/10 18:53:56	1.5
-+++ src/stdfileio.cpp	2004/07/03 19:32:15	1.6
-@@ -99,7 +99,7 @@
-     iCurrentPos = 0;
-     fread(iBuffer,iNrBytes,1,iFile);
-     iBuffer[iNrBytes] = '\0';
--};
-+}
- 
- LispChar CachedStdFileInput::Next()
- {
-@@ -222,7 +222,7 @@
- {
- //printf("CachedStdUserInput:construct\n");
-     Rewind();
--};
-+}
- LispChar CachedStdUserInput::Next()
- {
- //printf("CachedStdUserInput:Next\n");
diff --git a/math/yacas/pkg-plist b/math/yacas/pkg-plist
index f891d904e22f..512e9c59c4da 100644
--- a/math/yacas/pkg-plist
+++ b/math/yacas/pkg-plist
@@ -123,6 +123,7 @@ lib/yacas/yacas_gsl.so
 %%DATADIR%%/documentation/codingmanual.html
 %%DATADIR%%/documentation/essays.html
 %%DATADIR%%/documentation/essayschapter1.html
+%%DATADIR%%/documentation/essayschapter12.html
 %%DATADIR%%/documentation/essayschapter2.html
 %%DATADIR%%/documentation/essayschapter3.html
 %%DATADIR%%/documentation/essayschapter4.html
@@ -284,6 +285,7 @@ lib/yacas/yacas_gsl.so
 %%DATADIR%%/include/unipoly.h
 %%DATADIR%%/include/unixcommandline.h
 %%DATADIR%%/include/version.h
+%%DATADIR%%/include/vm.h
 %%DATADIR%%/include/win32dll.h
 %%DATADIR%%/include/win32dllresource.h
 %%DATADIR%%/include/win32yacasdll.h
@@ -418,6 +420,10 @@ lib/yacas/yacas_gsl.so
 %%DATADIR%%/substitute.rep/code.ys.def
 %%DATADIR%%/sums.rep/code.ys
 %%DATADIR%%/sums.rep/code.ys.def
+%%DATADIR%%/sums.rep/taylor.ys
+%%DATADIR%%/sums.rep/taylor.ys.def
+%%DATADIR%%/sums.rep/taylor3.ys
+%%DATADIR%%/sums.rep/taylor3.ys.def
 %%DATADIR%%/tensor.rep/code.ys
 %%DATADIR%%/tensor.rep/code.ys.def
 %%DATADIR%%/testers.rep/code.ys