Update to 3.1.18 and un-BROKEN it.

PR:	12352
Submitted by:	Mikhail Teterin <mi@aldan.algebra.com>

1 files changed, 227 insertions, 176 deletions

diff --git a/math/siag/pkg-plist b/math/siag/pkg-plist
index 5bea10f1a6b9..2e8141a4aab3 100644
--- a/math/siag/pkg-plist
+++ b/math/siag/pkg-plist
@@ -2,6 +2,10 @@ bin/siag
 bin/tsiag
 bin/pw
 bin/egon
+bin/xedplus
+bin/xfiler
+bin/runcmd
+bin/gvu
 share/siag/siod/siod.scm
 share/siag/common/bitmaps/blank.xpm
 share/siag/common/bitmaps/bold.xpm
@@ -47,6 +51,27 @@ 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/SO3.xpm
+share/siag/common/bitmaps/center.xpm
+share/siag/common/bitmaps/compress.xpm
+share/siag/common/bitmaps/data.xpm
+share/siag/common/bitmaps/editor.xpm
+share/siag/common/bitmaps/fld_closed.xpm
+share/siag/common/bitmaps/fld_new.xpm
+share/siag/common/bitmaps/fld_up.xpm
+share/siag/common/bitmaps/fonts.xpm
+share/siag/common/bitmaps/ghost.xpm
+share/siag/common/bitmaps/image.xpm
+share/siag/common/bitmaps/landscape.xpm
+share/siag/common/bitmaps/larger.xpm
+share/siag/common/bitmaps/netscape.xpm
+share/siag/common/bitmaps/portrait.xpm
+share/siag/common/bitmaps/smaller.xpm
+share/siag/common/bitmaps/sortmode.xpm
+share/siag/common/bitmaps/unknown.xpm
+share/siag/common/bitmaps/viewmode.xpm
+share/siag/common/bitmaps/xedplus.xpm
+share/siag/common/bitmaps/xterm16.xpm
 share/siag/common/any2xpm
 share/siag/common/readpfa
 share/siag/common/colors.scm
@@ -64,6 +89,7 @@ share/siag/common/dictionary.de
 share/siag/common/dictionary.fr
 share/siag/common/dictionary.no
 share/siag/common/dictionary.hr
+share/siag/common/dictionary.da
 share/siag/xcommon/StringDefs.scm
 share/siag/xcommon/form.scm
 share/siag/siag/123.scm
@@ -96,178 +122,194 @@ share/siag/egon/external.load
 share/siag/egon/external.save
 share/siag/plugins/dummy.scm
 share/siag/plugins/plugin.scm
+share/siag/xfiler/FilesMagic
+share/siag/xfiler/Filesrc
 libexec/siag/plugins/dummy
 libexec/siag/plugins/image
 libexec/siag/plugins/hello
 libexec/siag/plugins/plot
 libexec/siag/plugins/text
 libexec/siag/plugins/form
-man/man1/siod.1
-man/man1/siag.1
-man/man1/pw.1
-man/man1/egon.1
-man/man1/dummy_plugin.1
-doc/siag/siod/siod.html
-doc/siag/common/siaghelp
-doc/siag/common/COPYING.LIB
-doc/siag/common/Copyright
-doc/siag/common/credits.html
-doc/siag/common/embedding.html
-doc/siag/common/form.html
-doc/siag/common/interpreters.html
-doc/siag/common/office.html
-doc/siag/common/plugins.html
-doc/siag/common/search.html
-doc/siag/common/siaghelp.html
-doc/siag/common/bitmaps/bold.gif
-doc/siag/common/bitmaps/borders.gif
-doc/siag/common/bitmaps/copyright.gif
-doc/siag/common/bitmaps/egon_fg.gif
-doc/siag/common/bitmaps/fld_open.gif
-doc/siag/common/bitmaps/floppy3.gif
-doc/siag/common/bitmaps/grid.gif
-doc/siag/common/bitmaps/hcenter.gif
-doc/siag/common/bitmaps/hleft.gif
-doc/siag/common/bitmaps/hright.gif
-doc/siag/common/bitmaps/info.gif
-doc/siag/common/bitmaps/italic.gif
-doc/siag/common/bitmaps/new.gif
-doc/siag/common/bitmaps/next.gif
-doc/siag/common/bitmaps/none.gif
-doc/siag/common/bitmaps/play.gif
-doc/siag/common/bitmaps/plotter.gif
-doc/siag/common/bitmaps/preview.gif
-doc/siag/common/bitmaps/previous.gif
-doc/siag/common/bitmaps/printer.gif
-doc/siag/common/bitmaps/pw_fg.gif
-doc/siag/common/bitmaps/siag_fg.gif
-doc/siag/common/bitmaps/sigma.gif
-doc/siag/common/bitmaps/stop.gif
-doc/siag/common/bitmaps/uchar.gif
-doc/siag/common/bitmaps/uline.gif
-doc/siag/common/bitmaps/vbottom.gif
-doc/siag/common/bitmaps/vtop.gif
-doc/siag/xcommon/CHANGES
-doc/siag/xcommon/TODO
-doc/siag/xcommon/filesel.html
-doc/siag/xcommon/form.scm
-doc/siag/siag/BUGS
-doc/siag/siag/CHANGES
-doc/siag/siag/COPYING
-doc/siag/siag/README
-doc/siag/siag/TODO
-doc/siag/siag/c-expr.html
-doc/siag/siag/commands.html
-doc/siag/siag/concepts.html
-doc/siag/siag/fileformats.html
-doc/siag/siag/form.html
-doc/siag/siag/gnuplot.html
-doc/siag/siag/howto.html
-doc/siag/siag/intro.html
-doc/siag/siag/invocation.html
-doc/siag/siag/keys.html
-doc/siag/siag/mouse.html
-doc/siag/siag/scheme.html
-doc/siag/siag/scrollbars.html
-doc/siag/siag/siag.gif
-doc/siag/siag/siag.html
-doc/siag/siag/strings.html
-doc/siag/siag/toolbar.html
-doc/siag/siag/examples/allfuncs.wk1
-doc/siag/siag/examples/cheeses.siag
-doc/siag/siag/examples/emprestimo.wk1
-doc/siag/siag/examples/example.wk1
-doc/siag/siag/examples/fibonacci-c.siag
-doc/siag/siag/examples/fibonacci.siag
-doc/siag/siag/examples/fonts.siag
-doc/siag/siag/examples/foo.siag
-doc/siag/siag/examples/foo.wk1
-doc/siag/siag/examples/formtest.siag
-doc/siag/siag/examples/group.siag
-doc/siag/siag/examples/heaven-c.siag
-doc/siag/siag/examples/heaven-guile.siag
-doc/siag/siag/examples/heaven-tcl.siag
-doc/siag/siag/examples/heaven.siag
-doc/siag/siag/examples/hyperhelp.siag
-doc/siag/siag/examples/image_plugin.siag
-doc/siag/siag/examples/kalkyl.siag
-doc/siag/siag/examples/mailaddr.csv
-doc/siag/siag/examples/morefonts.siag
-doc/siag/siag/examples/multtabl-c.siag
-doc/siag/siag/examples/multtabl.siag
-doc/siag/siag/examples/obras.wk1
-doc/siag/siag/examples/passwd.siag
-doc/siag/siag/examples/plot.siag
-doc/siag/siag/examples/prestacao.wk1
-doc/siag/siag/examples/property.siag
-doc/siag/siag/examples/sincos.siag
-doc/siag/siag/examples/strfib.siag
-doc/siag/siag/examples/strings.siag
-doc/siag/siag/examples/surface1.siag
-doc/siag/siag/examples/surface2.siag
-doc/siag/siag/examples/tables.wk1
-doc/siag/siag/examples/tcltest.siag
-doc/siag/siag/data.scm
-doc/siag/pw/BUGS
-doc/siag/pw/CHANGES
-doc/siag/pw/COPYING
-doc/siag/pw/TODO
-doc/siag/pw/commands.html
-doc/siag/pw/concepts.html
-doc/siag/pw/fileformats.html
-doc/siag/pw/intro.html
-doc/siag/pw/invocation.html
-doc/siag/pw/keys.html
-doc/siag/pw/mouse.html
-doc/siag/pw/pw.gif
-doc/siag/pw/pw.html
-doc/siag/pw/scheme.html
-doc/siag/pw/scrollbars.html
-doc/siag/pw/spell.html
-doc/siag/pw/strings.html
-doc/siag/pw/toolbar.html
-doc/siag/pw/examples/changes.pw
-doc/siag/pw/examples/chead.doc
-doc/siag/pw/examples/chead.html
-doc/siag/pw/examples/chead.pw
-doc/siag/pw/examples/chead.rtf
-doc/siag/pw/examples/chead.txt
-doc/siag/pw/examples/color.pw
-doc/siag/pw/examples/egon.pw
-doc/siag/pw/examples/egon.rtf
-doc/siag/pw/examples/morefonts.pw
-doc/siag/pw/examples/newpw.pw
-doc/siag/pw/examples/rtfex.rtf
-doc/siag/pw/examples/rtftest.rtf
-doc/siag/pw/examples/rtftest2.rtf
-doc/siag/pw/examples/rtftest3.rtf
-doc/siag/pw/examples/standard.bmk
-doc/siag/pw/examples/styles.html
-doc/siag/pw/examples/styles.pw
-doc/siag/pw/examples/styles2.pw
-doc/siag/pw/examples/svenska.pw
-doc/siag/pw/examples/svenska.rtf
-doc/siag/egon/BUGS
-doc/siag/egon/CHANGES
-doc/siag/egon/COPYING
-doc/siag/egon/TODO
-doc/siag/egon/commands.html
-doc/siag/egon/concepts.html
-doc/siag/egon/egon.gif
-doc/siag/egon/egon.html
-doc/siag/egon/fileformats.html
-doc/siag/egon/intro.html
-doc/siag/egon/invocation.html
-doc/siag/egon/keys.html
-doc/siag/egon/mouse.html
-doc/siag/egon/scheme.html
-doc/siag/egon/scrollbars.html
-doc/siag/egon/strings.html
-doc/siag/egon/toolbar.html
-doc/siag/egon/examples/bounce.egon
-doc/siag/egon/examples/ms.egon
-doc/siag/egon/examples/propeller.egon
-doc/siag/egon/examples/rondo.egon
+libexec/siag/plugins/clipart
+share/doc/siag/siod/siod.html
+share/doc/siag/common/siaghelp
+share/doc/siag/common/COPYING.LIB
+share/doc/siag/common/Copyright
+share/doc/siag/common/credits.html
+share/doc/siag/common/embedding.html
+share/doc/siag/common/form.html
+share/doc/siag/common/interpreters.html
+share/doc/siag/common/office.html
+share/doc/siag/common/plugins.html
+share/doc/siag/common/search.html
+share/doc/siag/common/siaghelp.html
+share/doc/siag/common/bitmaps/bold.gif
+share/doc/siag/common/bitmaps/borders.gif
+share/doc/siag/common/bitmaps/copyright.gif
+share/doc/siag/common/bitmaps/egon_fg.gif
+share/doc/siag/common/bitmaps/fld_open.gif
+share/doc/siag/common/bitmaps/floppy3.gif
+share/doc/siag/common/bitmaps/grid.gif
+share/doc/siag/common/bitmaps/hcenter.gif
+share/doc/siag/common/bitmaps/hleft.gif
+share/doc/siag/common/bitmaps/hright.gif
+share/doc/siag/common/bitmaps/info.gif
+share/doc/siag/common/bitmaps/italic.gif
+share/doc/siag/common/bitmaps/new.gif
+share/doc/siag/common/bitmaps/next.gif
+share/doc/siag/common/bitmaps/none.gif
+share/doc/siag/common/bitmaps/play.gif
+share/doc/siag/common/bitmaps/plotter.gif
+share/doc/siag/common/bitmaps/preview.gif
+share/doc/siag/common/bitmaps/previous.gif
+share/doc/siag/common/bitmaps/printer.gif
+share/doc/siag/common/bitmaps/pw_fg.gif
+share/doc/siag/common/bitmaps/siag_fg.gif
+share/doc/siag/common/bitmaps/sigma.gif
+share/doc/siag/common/bitmaps/stop.gif
+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
+share/doc/siag/xcommon/CHANGES
+share/doc/siag/xcommon/TODO
+share/doc/siag/xcommon/filesel.html
+share/doc/siag/xcommon/form.scm
+share/doc/siag/siag/BUGS
+share/doc/siag/siag/CHANGES
+share/doc/siag/siag/COPYING
+share/doc/siag/siag/README
+share/doc/siag/siag/TODO
+share/doc/siag/siag/c-expr.html
+share/doc/siag/siag/commands.html
+share/doc/siag/siag/concepts.html
+share/doc/siag/siag/fileformats.html
+share/doc/siag/siag/form.html
+share/doc/siag/siag/gnuplot.html
+share/doc/siag/siag/intro.html
+share/doc/siag/siag/invocation.html
+share/doc/siag/siag/keys.html
+share/doc/siag/siag/mouse.html
+share/doc/siag/siag/scheme.html
+share/doc/siag/siag/scrollbars.html
+share/doc/siag/siag/siag.gif
+share/doc/siag/siag/siag.html
+share/doc/siag/siag/strings.html
+share/doc/siag/siag/toolbar.html
+share/doc/siag/siag/examples/allfuncs.wk1
+share/doc/siag/siag/examples/cheeses.siag
+share/doc/siag/siag/examples/emprestimo.wk1
+share/doc/siag/siag/examples/example.wk1
+share/doc/siag/siag/examples/fibonacci-c.siag
+share/doc/siag/siag/examples/fibonacci.siag
+share/doc/siag/siag/examples/fonts.siag
+share/doc/siag/siag/examples/foo.siag
+share/doc/siag/siag/examples/foo.wk1
+share/doc/siag/siag/examples/formtest.siag
+share/doc/siag/siag/examples/group.siag
+share/doc/siag/siag/examples/heaven-c.siag
+share/doc/siag/siag/examples/heaven-guile.siag
+share/doc/siag/siag/examples/heaven-tcl.siag
+share/doc/siag/siag/examples/heaven.siag
+share/doc/siag/siag/examples/hyperhelp.siag
+share/doc/siag/siag/examples/image_plugin.siag
+share/doc/siag/siag/examples/kalkyl.siag
+share/doc/siag/siag/examples/mailaddr.csv
+share/doc/siag/siag/examples/morefonts.siag
+share/doc/siag/siag/examples/multtabl-c.siag
+share/doc/siag/siag/examples/multtabl.siag
+share/doc/siag/siag/examples/obras.wk1
+share/doc/siag/siag/examples/passwd.siag
+share/doc/siag/siag/examples/plot.siag
+share/doc/siag/siag/examples/prestacao.wk1
+share/doc/siag/siag/examples/property.siag
+share/doc/siag/siag/examples/sincos.siag
+share/doc/siag/siag/examples/strfib.siag
+share/doc/siag/siag/examples/strings.siag
+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
+share/doc/siag/siag/data.scm
+share/doc/siag/pw/BUGS
+share/doc/siag/pw/CHANGES
+share/doc/siag/pw/COPYING
+share/doc/siag/pw/TODO
+share/doc/siag/pw/commands.html
+share/doc/siag/pw/concepts.html
+share/doc/siag/pw/fileformats.html
+share/doc/siag/pw/intro.html
+share/doc/siag/pw/invocation.html
+share/doc/siag/pw/keys.html
+share/doc/siag/pw/mouse.html
+share/doc/siag/pw/pw.gif
+share/doc/siag/pw/pw.html
+share/doc/siag/pw/scheme.html
+share/doc/siag/pw/scrollbars.html
+share/doc/siag/pw/spell.html
+share/doc/siag/pw/strings.html
+share/doc/siag/pw/toolbar.html
+share/doc/siag/pw/examples/changes.pw
+share/doc/siag/pw/examples/chead.doc
+share/doc/siag/pw/examples/chead.html
+share/doc/siag/pw/examples/chead.pw
+share/doc/siag/pw/examples/chead.rtf
+share/doc/siag/pw/examples/chead.txt
+share/doc/siag/pw/examples/color.pw
+share/doc/siag/pw/examples/egon.pw
+share/doc/siag/pw/examples/egon.rtf
+share/doc/siag/pw/examples/morefonts.pw
+share/doc/siag/pw/examples/newpw.pw
+share/doc/siag/pw/examples/rtfex.rtf
+share/doc/siag/pw/examples/rtftest.rtf
+share/doc/siag/pw/examples/rtftest2.rtf
+share/doc/siag/pw/examples/rtftest3.rtf
+share/doc/siag/pw/examples/standard.bmk
+share/doc/siag/pw/examples/styles.html
+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
+share/doc/siag/egon/BUGS
+share/doc/siag/egon/CHANGES
+share/doc/siag/egon/COPYING
+share/doc/siag/egon/TODO
+share/doc/siag/egon/commands.html
+share/doc/siag/egon/concepts.html
+share/doc/siag/egon/egon.gif
+share/doc/siag/egon/egon.html
+share/doc/siag/egon/fileformats.html
+share/doc/siag/egon/intro.html
+share/doc/siag/egon/invocation.html
+share/doc/siag/egon/keys.html
+share/doc/siag/egon/mouse.html
+share/doc/siag/egon/scheme.html
+share/doc/siag/egon/scrollbars.html
+share/doc/siag/egon/strings.html
+share/doc/siag/egon/toolbar.html
+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/common/COPYING
+share/doc/siag/plugins/README
+share/doc/siag/plugins/CHANGES
+share/doc/siag/xedplus/xedplus.html
+share/doc/siag/xedplus/CHANGES
+share/doc/siag/xedplus/README
+share/doc/siag/xedplus/TODO
+share/doc/siag/xfiler/xfiler.html
+share/doc/siag/xfiler/README
+share/doc/siag/xfiler/CHANGES
+share/doc/siag/xfiler/TODO
+share/doc/siag/gvu/README
+share/doc/siag/gvu/COPYING
+share/doc/siag/gvu/CHANGES
+share/doc/siag/gvu/TODO
+share/doc/siag/gvu/gs.interface
+share/doc/siag/gvu/comments.doc
+share/doc/siag/gvu/gvu.html
+share/doc/siag/gvu/copyright.html
 @dirrm share/siag/common/bitmaps
 @dirrm share/siag/common
 @dirrm share/siag/xcommon
@@ -276,16 +318,25 @@ doc/siag/egon/examples/rondo.egon
 @dirrm share/siag/egon
 @dirrm share/siag/plugins
 @dirrm share/siag/siod
+@dirrm share/siag/xfiler
 @dirrm share/siag
 @dirrm libexec/siag/plugins
 @dirrm libexec/siag
-@dirrm doc/siag/common/bitmaps
-@dirrm doc/siag/common
-@dirrm doc/siag/egon
-@dirrm doc/siag/pw/examples
-@dirrm doc/siag/pw
-@dirrm doc/siag/siag/examples
-@dirrm doc/siag/siag
-@dirrm doc/siag/siod
-@dirrm doc/siag/xcommon
-@dirrm doc/siag
+@dirrm share/doc/siag/common/bitmaps
+@dirrm share/doc/siag/common
+@dirrm share/doc/siag/egon/examples
+@dirrm share/doc/siag/egon
+@dirrm share/doc/siag/pw/examples
+@dirrm share/doc/siag/pw
+@dirrm share/doc/siag/siag/examples
+@dirrm share/doc/siag/siag
+@dirrm share/doc/siag/siod
+@dirrm share/doc/siag/xcommon
+@dirrm share/doc/siag/plugins
+@dirrm share/doc/siag/xedplus
+@dirrm share/doc/siag/xfiler
+@dirrm share/doc/siag/gvu
+@dirrm share/doc/siag
+@exec echo Examples  and  documentation  went  into  %D/share/doc. Note, that the Siag's wordprocessor. the Pathetic Writer (or pw) is install  in %D/bin/pw. Depending on  your users' PATH it  may  or may  not  interfere  with simple  invocation  of /usr/sbin/pw. | fmt
+@exec echo
+@exec test -e %D/lib/X11/app-defaults/Siag && echo "It seems, you have old app-defaults file(s) from Siag. Consider removing it(them) if new siag fails to come up" | fmt; true