Update to FriCAS 1.0.5, change default Lisp to CLISP.

Changes since FriCAS 1.0.4:

- improvement to normalize function, it performs now much
  stronger simplifications than before
- better integration: due to improved normalize FriCAS can
  now integrate many functions that it previously considered
  unintegrable
- improvement to Martin Rubey guessing package, for example
  it can now guess differential equation for the generating
  function of integer partitions
- better support for using type valued functions
- several bug fixes


Changes since FriCAS 1.0.3:

User Interface:
- Add a new emacs mode: just (require 'fricas), M-x fricas and enjoy.
- Add support for inline display of LaTeXed code.
- Add support for mouse wheel.
- Supress SBCL style warnings due to autoloading.

Merge Ralf's wonderful new Aldor interface.
Allow calling type-valued functions.
Improve coercion of types.
Add coercions to InputForm.
Improve unparse.
Use SExpression as representation of OutputForm.
Miscellaneous improvements, bug fixes and cleanups.


Approved by <obache>.

5 files changed, 42 insertions, 37 deletions

diff --git a/math/fricas/Makefile b/math/fricas/Makefile
index d602aea0426..6b9d48a3dc6 100644
--- a/math/fricas/Makefile
+++ b/math/fricas/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2009/01/07 00:00:15 asau Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/27 15:54:23 asau Exp $
 
-PKGNAME=		fricas-1.0.3
+PKGNAME=		fricas-1.0.5
 DISTNAME=		${PKGNAME}-full
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fricas/}
@@ -20,6 +20,14 @@ USE_TOOLS+=		gmake
 PKG_DESTDIR_SUPPORT=	user-destdir
 MAKE_JOBS_SAFE=		no
 
+# Problems:
+# 4. Emacs files should go into "site-lisp".
+# 5. view3D hangs sometimes (?), killing it doesn't affect binary package.
+
 .include "options.mk"
 
+.if !empty(PKG_OPTIONS:Mclisp)
+INSTALL_UNSTRIPPED=	yes	# don't strip AXIOMsys, it breaks FFI
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fricas/PLIST b/math/fricas/PLIST
index bf63cfa46b9..cc63dc8add8 100644
--- a/math/fricas/PLIST
+++ b/math/fricas/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/14 12:25:30 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/27 15:54:23 asau Exp $
 bin/axiom
+bin/efricas
 bin/fricas
+lib/fricas/emacs/fricas-cpl.el
+lib/fricas/emacs/fricas.el
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/A1AGG-.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/A1AGG.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ABELGRP-.${FASL}
@@ -44,9 +47,22 @@ lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ARRAY12.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ARRAY2.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ASSOCEQ.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ASTACK.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATADDVA.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATAPPRO.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATARBEX.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATARBPR.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATCANCL.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATCANON.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATCS.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATCUNOR.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATFINAG.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATMULVA.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATNZDIV.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATPOSET.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATRIG-.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATRIG.${FASL}
-lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATTREG.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATSHMUT.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/ATUNIKN.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/AUTOMOR.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/BALFACT.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/BASTYPE-.${FASL}
@@ -344,6 +360,7 @@ lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/GB.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/GBEUCLID.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/GBF.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/GBINTERN.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/GCDBAS.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/GCDDOM-.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/GCDDOM.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/GCNAALG.${FASL}
@@ -605,7 +622,9 @@ lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/MSET.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/MSETAGG.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/MSYSCMD.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/MTHING.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/MTSCAT-.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/MTSCAT.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/MULDEP.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/MULTFACT.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/MULTSQFR.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/NAALG-.${FASL}
@@ -960,6 +979,7 @@ lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/STAGG.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/STBL.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/STEP.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/STINPROD.${FASL}
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/STNSR.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/STREAM.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/STREAM1.${FASL}
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra/STREAM2.${FASL}
@@ -1195,10 +1215,6 @@ ${ecl}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/iterator.o
 ${clisp-sbcl}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/mark.${FASL}
 ${clisp}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/mark.lib
 ${ecl}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/mark.o
-${clisp-sbcl}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/metalex.${FASL}
-${ecl}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/metalex.o
-${clisp-sbcl}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/metameta.${FASL}
-${ecl}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/metameta.o
 ${clisp-sbcl}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/modemap.${FASL}
 ${clisp}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/modemap.lib
 ${ecl}lib/fricas/target/${MACHINE_GNU_PLATFORM}/autoload/modemap.o
@@ -2579,7 +2595,7 @@ lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/alql.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/any.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/array1.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/array2.spad.pamphlet
-lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/attreg.spad.pamphlet
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/attribs.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/bags.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/bezout.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/boolean.spad.pamphlet
@@ -2738,6 +2754,7 @@ lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/moebius.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/mring.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/mset.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/mts.spad.pamphlet
+lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/muldep.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/multfact.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/multpoly.spad.pamphlet
 lib/fricas/target/${MACHINE_GNU_PLATFORM}/src/algebra/multsqfr.spad.pamphlet
@@ -3055,4 +3072,5 @@ ${x11}@dirrm lib/fricas/target/${MACHINE_GNU_PLATFORM}/lib/graph
 @dirrm lib/fricas/target/${MACHINE_GNU_PLATFORM}/algebra
 @dirrm lib/fricas/target/${MACHINE_GNU_PLATFORM}
 @dirrm lib/fricas/target
+@dirrm lib/fricas/emacs
 @dirrm lib/fricas
diff --git a/math/fricas/distinfo b/math/fricas/distinfo
index 910a877e422..02281f572ca 100644
--- a/math/fricas/distinfo
+++ b/math/fricas/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/14 12:25:30 ahoka Exp $
+$NetBSD: distinfo,v 1.2 2009/01/27 15:54:23 asau Exp $
 
-SHA1 (fricas-1.0.3-full.tar.bz2) = 06027763d886de3e4856d3533511d6f6b1df5fbc
-RMD160 (fricas-1.0.3-full.tar.bz2) = 23cb885421884dd9242cf0ef38b08c1cf29bd8e7
-Size (fricas-1.0.3-full.tar.bz2) = 9017198 bytes
-SHA1 (patch-aa) = f8526591c54085c1977c72f7f5930698ecf2f105
+SHA1 (fricas-1.0.5-full.tar.bz2) = 6668123652d062ba3a9ead8a72661846227a06d6
+RMD160 (fricas-1.0.5-full.tar.bz2) = bc11531b479e5f92493d3d8fe4dc525c112e5faa
+Size (fricas-1.0.5-full.tar.bz2) = 9006445 bytes
diff --git a/math/fricas/options.mk b/math/fricas/options.mk
index 374ba55eeea..e7682b5ff8d 100644
--- a/math/fricas/options.mk
+++ b/math/fricas/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/09/14 12:25:30 ahoka Exp $
+# $NetBSD: options.mk,v 1.2 2009/01/27 15:54:23 asau Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.fricas
 PKG_OPTIONS_REQUIRED_GROUPS=	lisp
@@ -6,9 +6,7 @@ PKG_OPTIONS_GROUP.lisp=		clisp sbcl ecl
 
 PKG_SUPPORTED_OPTIONS+=		x11
 
-# We should use CLISP instead of ECL, but it became problematic
-# in FriCAS 1.0.3:
-PKG_SUGGESTED_OPTIONS+=		ecl x11
+PKG_SUGGESTED_OPTIONS+=		clisp x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -41,7 +39,7 @@ PRINT_PLIST_AWK+=	{if ($$0 ~ /\.lib$$/) {$$0 = "$${clisp}" $$0;}}
 
 # X11-only files:
 .if !empty(PKG_OPTIONS:Mx11)
-PRINT_PLIST_AWK+=	{if ($$0 ~ /\.(bitmap|xbm|xbm.tiny|bm|bakmap|xpm|ht|pht|ps)$$/) {$$0 = "$${x11}" $$0;}}
+PRINT_PLIST_AWK+=	{if ($$0 ~ /\/share\/viewports\// || $$0 ~ /\.(bitmap|xbm|xbm.tiny|bm|bakmap|xpm|ht|pht|ps)$$/) {$$0 = "$${x11}" $$0;}}
 .endif
 
 # X11
diff --git a/math/fricas/patches/patch-aa b/math/fricas/patches/patch-aa
deleted file mode 100644
index 58b8597d20b..00000000000
--- a/math/fricas/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/14 12:25:30 ahoka Exp $
-
-Don't remove what is there already.
-Precreate "lib" subdirectory.
-
---- Makefile.in.orig	2008-06-24 01:41:17.000000000 +0400
-+++ Makefile.in	2008-09-13 16:02:52.000000000 +0400
-@@ -103,9 +103,8 @@
- 
- install:
- 	@echo Installing FriCAS in $(prefix)
--	rm -rf '$(DESTDIR)$(libdir)/fricas'
- 	$(mkinstalldirs) '$(DESTDIR)$(libdir)/fricas'
--	for A in algebra autoload doc share src lib/graph ; do \
-+	for A in algebra autoload doc share src lib lib/graph ; do \
- 	  for B in `find $(reltarget)/$$A -type d -print` ; do \
- 	     $(mkinstalldirs) '$(DESTDIR)$(libdir)'/fricas/$$B \
- 	       || exit 1 ; \