Update to 3.1.11.

Changes: Redesigned file selector, made plotting plugin not barf
on non-numeric cells, portability patches fixed a couple of broken
casts, new text editor (a heavily modified version of Xed), very
alpha importing of Excel documents using Victor Wagner's xls2csv,
improved recognition of very old Siag files and deallocate unused
rows at the bottom of a sheet.

5 files changed, 145 insertions, 113 deletions

diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 147aab8bc48..e18a5e6ff6e 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 1999/03/05 01:52:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1999/04/10 02:25:08 hubertf Exp $
 
-DISTNAME=       siag-3.1.7
+DISTNAME=       siag-3.1.11
 CATEGORIES=     misc textproc math
 MASTER_SITES=   ftp://ftp.edu.stockholm.se/pub/siag/
 
diff --git a/misc/siag/files/md5 b/misc/siag/files/md5
index 7bff4f947c0..62d409cfe73 100644
--- a/misc/siag/files/md5
+++ b/misc/siag/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/03/05 01:52:32 hubertf Exp $
+$NetBSD: md5,v 1.4 1999/04/10 02:25:08 hubertf Exp $
 
-MD5 (siag-3.1.7.tar.gz) = 1e2d368fb56bff66650208d747726ee8
+MD5 (siag-3.1.11.tar.gz) = 736b1eea068889bd2f1bba6a094556b3
diff --git a/misc/siag/patches/patch-ae b/misc/siag/patches/patch-ae
new file mode 100644
index 00000000000..23c487d44b9
--- /dev/null
+++ b/misc/siag/patches/patch-ae
@@ -0,0 +1,11 @@
+--- common/Makefile.in.BAK	Sat Apr 10 01:35:23 1999
++++ common/Makefile.in	Sat Apr 10 01:35:38 1999
+@@ -94,7 +94,7 @@
+ 
+ INCLUDES = -DLIBEXECDIR=\"$(libexecdir)/siag\" \
+ 	-DDATADIR=\"$(datadir)/siag\" \
+-	-DDOCDIR=\"$(prefix)/doc/siag\" \
++	-DDOCDIR=\"$(prefix)/share/doc/siag\" \
+ 	-DVERSION_NO=\"@VERSION@\" \
+ 	$(DEBUG)
+ 
diff --git a/misc/siag/pkg/DESCR b/misc/siag/pkg/DESCR
index 98d35de8bc5..eb7a1ebfc19 100644
--- a/misc/siag/pkg/DESCR
+++ b/misc/siag/pkg/DESCR
@@ -1,3 +1,5 @@
-egon:	Egon Animator, presentation generator, similar to MS PowerPoint
-siag:	Scheme In A Grid, spreadsheet, similar to MS Excel
-pw:	Pathetic Writer, text processor, similar to MS Word (well... :-)
+egon:	 Egon Animator, presentation generator, similar to MS PowerPoint
+siag:	 Scheme In A Grid, spreadsheet, similar to MS Excel
+tsiag:	 Curses-Based version of siag
+pw:	 Pathetic Writer, text processor, similar to MS Word (well... :-)
+xedplus: Lightweight text editor which can easily be configured away
diff --git a/misc/siag/pkg/PLIST b/misc/siag/pkg/PLIST
index d4fdb8c10b0..74ac7263754 100644
--- a/misc/siag/pkg/PLIST
+++ b/misc/siag/pkg/PLIST
@@ -1,117 +1,23 @@
-@comment $NetBSD: PLIST,v 1.3 1999/03/29 00:33:40 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/04/10 02:25:09 hubertf Exp $
 bin/siag
 bin/tsiag
 bin/pw
 bin/egon
+bin/xedplus
 libexec/siag/plugins/dummy
 libexec/siag/plugins/image
 libexec/siag/plugins/hello
 libexec/siag/plugins/plot
 libexec/siag/plugins/text
-@dirrm libexec/siag/plugins
-@dirrm libexec/siag
+libexec/siag/plugins/form
+libexec/siag/converters/xls2csv
 man/man1/siod.1
 man/man1/siag.1
 man/man1/pw.1
 man/man1/egon.1
 man/man1/dummy_plugin.1
-share/siag/siod/siod.scm
-@dirrm share/siag/siod
-share/siag/common/bitmaps/blank.xpm
-share/siag/common/bitmaps/bold.xpm
-share/siag/common/bitmaps/borders.xpm
-share/siag/common/bitmaps/copy.xpm
-share/siag/common/bitmaps/copyright.xpm
-share/siag/common/bitmaps/cut.xpm
-share/siag/common/bitmaps/egon_fg.xpm
-share/siag/common/bitmaps/fld_open.xpm
-share/siag/common/bitmaps/floppy3.xpm
-share/siag/common/bitmaps/grid.xpm
-share/siag/common/bitmaps/hcenter.xpm
-share/siag/common/bitmaps/hleft.xpm
-share/siag/common/bitmaps/hright.xpm
-share/siag/common/bitmaps/info.xpm
-share/siag/common/bitmaps/italic.xpm
-share/siag/common/bitmaps/new.xpm
-share/siag/common/bitmaps/next.xpm
-share/siag/common/bitmaps/none.xpm
-share/siag/common/bitmaps/paste.xpm
-share/siag/common/bitmaps/play.xpm
-share/siag/common/bitmaps/plotter.xpm
-share/siag/common/bitmaps/preview.xpm
-share/siag/common/bitmaps/previous.xpm
-share/siag/common/bitmaps/printer.xpm
-share/siag/common/bitmaps/pw_fg.xpm
-share/siag/common/bitmaps/redo.xpm
-share/siag/common/bitmaps/siag_fg.xpm
-share/siag/common/bitmaps/sigma.xpm
-share/siag/common/bitmaps/sortaz.xpm
-share/siag/common/bitmaps/sortza.xpm
-share/siag/common/bitmaps/spell.xpm
-share/siag/common/bitmaps/stop.xpm
-share/siag/common/bitmaps/uchar.xpm
-share/siag/common/bitmaps/uline.xpm
-share/siag/common/bitmaps/undo.xpm
-share/siag/common/bitmaps/vbottom.xpm
-share/siag/common/bitmaps/vtop.xpm
-share/siag/common/bitmaps/back.xpm
-share/siag/common/bitmaps/cancel.xpm
-share/siag/common/bitmaps/home.xpm
-share/siag/common/bitmaps/quit.xpm
-share/siag/common/bitmaps/reload.xpm
-share/siag/common/bitmaps/search.xpm
-share/siag/common/bitmaps/ksiag.xpm
-@dirrm share/siag/common/bitmaps
-share/siag/common/any2xpm
-share/siag/common/colors.scm
-share/siag/common/fonts.scm
-share/siag/common/tools.scm
-share/siag/common/dictionary.sv
-share/siag/common/dictionary.es
-share/siag/common/dictionary.de
-share/siag/common/dictionary.fr
-share/siag/common/dictionary.no
-share/siag/common/dictionary.hr
-@dirrm share/siag/common
-share/siag/xcommon/StringDefs.scm
-share/siag/xcommon/form.scm
-@dirrm share/siag/xcommon
-share/siag/siag/123.scm
-share/siag/siag/data.scm
-share/siag/siag/external.load
-share/siag/siag/external.save
-share/siag/siag/filemgr.scm
-share/siag/siag/find.scm
-share/siag/siag/keytable.scm
-share/siag/siag/mailto.scm
-share/siag/siag/menu.scm
-share/siag/siag/plot.scm
-share/siag/siag/siag-http.scm
-share/siag/siag/siag-net.scm
-share/siag/siag/siag.scm
-share/siag/siag/sort.scm
-share/siag/siag/splot.scm
-share/siag/siag/styles.scm
-share/siag/siag/usermgr.scm
-@dirrm share/siag/siag
-share/siag/pw/external.load
-share/siag/pw/external.save
-share/siag/pw/menu.scm
-share/siag/pw/pw.scm
-share/siag/pw/styles.scm
-@dirrm share/siag/pw
-share/siag/egon/animator.scm
-share/siag/egon/egon.scm
-share/siag/egon/menu.scm
-share/siag/egon/external.load
-share/siag/egon/external.save
-@dirrm share/siag/egon
-share/siag/plugins/dummy.scm
-share/siag/plugins/plugin.scm
-@dirrm share/siag/plugins
-@dirrm share/siag
+man/man1/xedplus.1
 share/doc/siag/siod/siod.html
-@dirrm share/doc/siag/siod
 share/doc/siag/common/siaghelp
 share/doc/siag/common/COPYING.LIB
 share/doc/siag/common/Copyright
@@ -151,13 +57,10 @@ share/doc/siag/common/bitmaps/uchar.gif
 share/doc/siag/common/bitmaps/uline.gif
 share/doc/siag/common/bitmaps/vbottom.gif
 share/doc/siag/common/bitmaps/vtop.gif
-@dirrm share/doc/siag/common/bitmaps
-@dirrm share/doc/siag/common
 share/doc/siag/xcommon/CHANGES
 share/doc/siag/xcommon/TODO
 share/doc/siag/xcommon/filesel.html
 share/doc/siag/xcommon/form.scm
-@dirrm share/doc/siag/xcommon
 share/doc/siag/siag/BUGS
 share/doc/siag/siag/CHANGES
 share/doc/siag/siag/COPYING
@@ -214,9 +117,7 @@ share/doc/siag/siag/examples/surface1.siag
 share/doc/siag/siag/examples/surface2.siag
 share/doc/siag/siag/examples/tables.wk1
 share/doc/siag/siag/examples/tcltest.siag
-@dirrm share/doc/siag/siag/examples
 share/doc/siag/siag/data.scm
-@dirrm share/doc/siag/siag
 share/doc/siag/pw/BUGS
 share/doc/siag/pw/CHANGES
 share/doc/siag/pw/COPYING
@@ -256,8 +157,6 @@ share/doc/siag/pw/examples/styles.pw
 share/doc/siag/pw/examples/styles2.pw
 share/doc/siag/pw/examples/svenska.pw
 share/doc/siag/pw/examples/svenska.rtf
-@dirrm share/doc/siag/pw/examples
-@dirrm share/doc/siag/pw
 share/doc/siag/egon/BUGS
 share/doc/siag/egon/CHANGES
 share/doc/siag/egon/COPYING
@@ -279,6 +178,126 @@ share/doc/siag/egon/examples/bounce.egon
 share/doc/siag/egon/examples/ms.egon
 share/doc/siag/egon/examples/propeller.egon
 share/doc/siag/egon/examples/rondo.egon
+share/doc/siag/xedplus/xedplus.html
+share/doc/siag/xedplus/CHANGES
+share/doc/siag/xedplus/README
+share/doc/siag/xedplus/TODO
+share/siag/siod/siod.scm
+share/siag/common/bitmaps/blank.xpm
+share/siag/common/bitmaps/bold.xpm
+share/siag/common/bitmaps/borders.xpm
+share/siag/common/bitmaps/copy.xpm
+share/siag/common/bitmaps/copyright.xpm
+share/siag/common/bitmaps/cut.xpm
+share/siag/common/bitmaps/egon_fg.xpm
+share/siag/common/bitmaps/fld_open.xpm
+share/siag/common/bitmaps/floppy3.xpm
+share/siag/common/bitmaps/grid.xpm
+share/siag/common/bitmaps/hcenter.xpm
+share/siag/common/bitmaps/hleft.xpm
+share/siag/common/bitmaps/hright.xpm
+share/siag/common/bitmaps/info.xpm
+share/siag/common/bitmaps/italic.xpm
+share/siag/common/bitmaps/new.xpm
+share/siag/common/bitmaps/next.xpm
+share/siag/common/bitmaps/none.xpm
+share/siag/common/bitmaps/paste.xpm
+share/siag/common/bitmaps/play.xpm
+share/siag/common/bitmaps/plotter.xpm
+share/siag/common/bitmaps/preview.xpm
+share/siag/common/bitmaps/previous.xpm
+share/siag/common/bitmaps/printer.xpm
+share/siag/common/bitmaps/pw_fg.xpm
+share/siag/common/bitmaps/redo.xpm
+share/siag/common/bitmaps/siag_fg.xpm
+share/siag/common/bitmaps/sigma.xpm
+share/siag/common/bitmaps/sortaz.xpm
+share/siag/common/bitmaps/sortza.xpm
+share/siag/common/bitmaps/spell.xpm
+share/siag/common/bitmaps/stop.xpm
+share/siag/common/bitmaps/uchar.xpm
+share/siag/common/bitmaps/uline.xpm
+share/siag/common/bitmaps/undo.xpm
+share/siag/common/bitmaps/vbottom.xpm
+share/siag/common/bitmaps/vtop.xpm
+share/siag/common/bitmaps/back.xpm
+share/siag/common/bitmaps/cancel.xpm
+share/siag/common/bitmaps/home.xpm
+share/siag/common/bitmaps/quit.xpm
+share/siag/common/bitmaps/reload.xpm
+share/siag/common/bitmaps/search.xpm
+share/siag/common/bitmaps/ksiag.xpm
+share/siag/common/bitmaps/xedplus.xpm
+share/siag/common/any2xpm
+share/siag/common/readpfa
+share/siag/common/colors.scm
+share/siag/common/common.scm
+share/siag/common/position.scm
+share/siag/common/fonts.scm
+share/siag/common/tools.scm
+share/siag/common/t1lib.config
+share/siag/common/FontDataBase
+share/siag/common/IsoLatin1.enc
+share/siag/common/IsoLatin2.enc
+share/siag/common/dictionary.sv
+share/siag/common/dictionary.es
+share/siag/common/dictionary.de
+share/siag/common/dictionary.fr
+share/siag/common/dictionary.no
+share/siag/common/dictionary.hr
+share/siag/xcommon/StringDefs.scm
+share/siag/xcommon/form.scm
+share/siag/siag/123.scm
+share/siag/siag/data.scm
+share/siag/siag/external.load
+share/siag/siag/external.save
+share/siag/siag/filemgr.scm
+share/siag/siag/find.scm
+share/siag/siag/keytable.scm
+share/siag/siag/mailto.scm
+share/siag/siag/menu.scm
+share/siag/siag/plot.scm
+share/siag/siag/siag-http.scm
+share/siag/siag/siag-net.scm
+share/siag/siag/siag.scm
+share/siag/siag/sort.scm
+share/siag/siag/splot.scm
+share/siag/siag/styles.scm
+share/siag/siag/usermgr.scm
+share/siag/siag/toolbar.scm
+share/siag/pw/external.load
+share/siag/pw/external.save
+share/siag/pw/menu.scm
+share/siag/pw/pw.scm
+share/siag/pw/styles.scm
+share/siag/egon/animator.scm
+share/siag/egon/egon.scm
+share/siag/egon/menu.scm
+share/siag/egon/external.load
+share/siag/egon/external.save
+share/siag/plugins/dummy.scm
+share/siag/plugins/plugin.scm
+@dirrm share/siag/xcommon
+@dirrm share/siag/siod
+@dirrm share/siag/siag
+@dirrm share/siag/pw
+@dirrm share/siag/plugins
+@dirrm share/siag/egon
+@dirrm share/siag/common/bitmaps
+@dirrm share/siag/common
+@dirrm share/siag
+@dirrm share/doc/siag/xedplus
+@dirrm share/doc/siag/xcommon
+@dirrm share/doc/siag/siod
+@dirrm share/doc/siag/siag/examples
+@dirrm share/doc/siag/siag
+@dirrm share/doc/siag/pw/examples
+@dirrm share/doc/siag/pw
 @dirrm share/doc/siag/egon/examples
 @dirrm share/doc/siag/egon
+@dirrm share/doc/siag/common/bitmaps
+@dirrm share/doc/siag/common
 @dirrm share/doc/siag
+@dirrm libexec/siag/plugins
+@dirrm libexec/siag/converters
+@dirrm libexec/siag