Update from 3.1.22 to 3.5.4. In four years change!

Summary of changes from NEWS file.  Note that this is the changes from
the last major version.  One of most notable things is that PDF output
support is added to some sub programs.

PW
==

 + Left-, right- and center aligned adjustable tabs.
 + Left-, right- and center aligned plugins.
 + "Full" adjustment with straight left and right edges.
 + Print raised, lowered and underlined text properly.
 + Strikethrough.
 + Faster HTML (and hence Word) loader.
 + Display LaTeX and DVI files in the Clipart plugin.
 + Fetch stock quotes from Yahoo over the Internet.
 - Load and save as PDF
 - Colour printing.
 - Zoom.
 - Redisplay more efficiently.

Siag
====

 + $A$1 style references, which are not updated when cells are moved.
 + Examples for all functions.
 + Hundreds of functions, many Excel compatible, all documented in
   the function reference.
 + Arbitrary precision integer functions.
 + Arbitrary precision floating-point functions.
 + Rudimentary loading of ABS files.
 + New operators ** (power) and \ (quotient).
 + Complex numbers; example in complex.siag.
 + Matrix functions; example in matrix.siag.
 + New or updated documentation, automatically generated from the source.
 + "C" interpreter translates expressions to Scheme rather than evaluating
   the expression itself.
 + Convert currencies, using information from Yahoo over the Internet.
 - Save as PDF.
 - Colour printing.
 - Zoom.
 - Redisplay more efficiently.

Egon
====

 - Save as PDF.
 - Load and save plaintext.
 - Load and save HTML.
 - Load Powerpoint.
 - Load MagicPoint (rudimentary).
 - Keyboard control.
 - Updated documentation.
 - Postscript output and printing.
 - Background gradients.
 - Multiple buffers and sheets (pages).
 - Full-screen mode.

All
===

 + Support for the XDND drag and drop protocol.
 - New or updated translations: Brazilian, Czech, Danish, German,
   Russian, Spanish, Swedish
 - Image plugin redisplays more efficiently.

And lots of small changes that are either invisible or too insignificant
to mention here.

22 files changed, 236 insertions, 344 deletions

diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 3fc89f935de..dfd36676b80 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2003/01/16 03:05:01 uebayasi Exp $
+# $NetBSD: Makefile,v 1.30 2003/01/17 02:09:36 uebayasi Exp $
 #
 
-DISTNAME=       siag-3.1.20
-PKGREVISION=	1
+DISTNAME=       siag-3.5.4
 CATEGORIES=     misc textproc math
-MASTER_SITES=   ftp://ftp.edu.stockholm.se/pub/siag/
+MASTER_SITES=   ftp://siag.nu/pub/siag/
 
 MAINTAINER=     packages@netbsd.org
 HOMEPAGE=       http://siag.nu/
@@ -13,22 +12,32 @@ COMMENT=	Poor man's office suite with spreadsheet, word processor, etc
 DEPENDS+=	gv>=3.5.8nb1:../../print/gv
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
-CONFIGURE_ARGS=	--with-x --with-guile --includedir=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+=--with-x
+CONFIGURE_ARGS+=--with-guile
+CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/siag
 GNU_CONFIGURE=  YES
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 USE_X11=	YES
 
-CFLAGS+=	-Dunix
-_STRIPFLAG_INSTALL=
+#CFLAGS+=	-Dunix
+#_STRIPFLAG_INSTALL=
 
-# XXX The source assumes Xaw3d.  Need work to use standard.
 .include "../../mk/bsd.prefs.mk"
 
-XAW_TYPE=	3d
+.if ${XAW_TYPE} == "xpm"
+CONFIGURE_ARGS+=--with-xawm=XawXpm
+.elif ${XAW_TYPE} == "3d"
+CONFIGURE_ARGS+=--with-xawm=Xaw3d
+.elif ${XAW_TYPE} == "neXtaw"
+CONFIGURE_ARGS+=--with-xawm=neXtaw
+.else
+CONFIGURE_ARGS+=--with-xawm=Xaw
+.endif
 
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/guile14/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/xaw.buildlink2.mk"
+.include "../../x11/mowitz/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/siag/PLIST b/misc/siag/PLIST
index 0a9fdbfe4ef..304ad64e27a 100644
--- a/misc/siag/PLIST
+++ b/misc/siag/PLIST
@@ -1,34 +1,38 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:35 zuntum Exp $
-bin/pw
-bin/gvu
+@comment $NetBSD: PLIST,v 1.2 2003/01/17 02:09:37 uebayasi Exp $
+bin/siaghelp
+bin/siagrun
 bin/siag
 bin/tsiag
+bin/pw
+bin/mgptotxt
 bin/egon
 bin/xedplus
 bin/xfiler
 bin/runcmd
-libexec/siag/plugins/dummy
-libexec/siag/plugins/image
-libexec/siag/plugins/hello
-libexec/siag/plugins/plot
-libexec/siag/plugins/text
-libexec/siag/plugins/form
-libexec/siag/plugins/clipart
+bin/antiword
+bin/gvu
+lib/siag/plugins/dummy
+lib/siag/plugins/image
+lib/siag/plugins/hello
+lib/siag/plugins/plot
+lib/siag/plugins/text
+lib/siag/plugins/form
+lib/siag/plugins/clipart
+lib/siag/antiword/8859-1.txt
 man/man1/siod.1
 man/man1/siag.1
 man/man1/pw.1
 man/man1/egon.1
 man/man1/dummy_plugin.1
 man/man1/xedplus.1
-man/man1/gvu.1
 man/man1/xfiler.1
+man/man1/runcmd.1
+man/man1/gvu.1
 share/doc/siag/siod/siod.html
-share/doc/siag/common/siaghelp
-share/doc/siag/common/COPYING
 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/fonts.html
 share/doc/siag/common/form.html
 share/doc/siag/common/interpreters.html
 share/doc/siag/common/office.html
@@ -40,7 +44,7 @@ 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/save.gif
 share/doc/siag/common/bitmaps/grid.gif
 share/doc/siag/common/bitmaps/hcenter.gif
 share/doc/siag/common/bitmaps/hleft.gif
@@ -63,18 +67,12 @@ 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/excel.html
 share/doc/siag/siag/fileformats.html
 share/doc/siag/siag/form.html
 share/doc/siag/siag/gnuplot.html
@@ -86,10 +84,14 @@ 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/siag-functions.html
 share/doc/siag/siag/strings.html
 share/doc/siag/siag/toolbar.html
+share/doc/siag/siag/examples/allfunctions.siag
 share/doc/siag/siag/examples/allfuncs.wk1
 share/doc/siag/siag/examples/cheeses.siag
+share/doc/siag/siag/examples/complex.siag
+share/doc/siag/siag/examples/database.siag
 share/doc/siag/siag/examples/emprestimo.wk1
 share/doc/siag/siag/examples/example.wk1
 share/doc/siag/siag/examples/fibonacci-c.siag
@@ -98,6 +100,7 @@ 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/gmp.siag
 share/doc/siag/siag/examples/group.siag
 share/doc/siag/siag/examples/heaven-c.siag
 share/doc/siag/siag/examples/heaven-guile.siag
@@ -113,6 +116,7 @@ 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/portfolj.siag
 share/doc/siag/siag/examples/prestacao.wk1
 share/doc/siag/siag/examples/property.siag
 share/doc/siag/siag/examples/sincos.siag
@@ -123,10 +127,6 @@ 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
@@ -162,10 +162,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
-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
@@ -184,54 +180,175 @@ share/doc/siag/egon/examples/ms.egon
 share/doc/siag/egon/examples/propeller.egon
 share/doc/siag/egon/examples/rondo.egon
 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/README
 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
+share/doc/siag/AUTHORS
+share/doc/siag/FILES
+share/doc/siag/NLS
+share/doc/siag/COPYING
 share/siag/siod/siod.scm
+share/siag/common/bitmaps/kde/back.xpm
+share/siag/common/bitmaps/kde/cancel.xpm
+share/siag/common/bitmaps/kde/copy.xpm
+share/siag/common/bitmaps/kde/cut.xpm
+share/siag/common/bitmaps/kde/fld_open.xpm
+share/siag/common/bitmaps/kde/save.xpm
+share/siag/common/bitmaps/kde/forward.xpm
+share/siag/common/bitmaps/kde/home.xpm
+share/siag/common/bitmaps/kde/info.xpm
+share/siag/common/bitmaps/kde/larger.xpm
+share/siag/common/bitmaps/kde/new.xpm
+share/siag/common/bitmaps/kde/next.xpm
+share/siag/common/bitmaps/kde/paste.xpm
+share/siag/common/bitmaps/kde/play.xpm
+share/siag/common/bitmaps/kde/preview.xpm
+share/siag/common/bitmaps/kde/previous.xpm
+share/siag/common/bitmaps/kde/printer.xpm
+share/siag/common/bitmaps/kde/quit.xpm
+share/siag/common/bitmaps/kde/reload.xpm
+share/siag/common/bitmaps/kde/saveas.xpm
+share/siag/common/bitmaps/kde/search.xpm
+share/siag/common/bitmaps/kde/smaller.xpm
+share/siag/common/bitmaps/kde/stop.xpm
+share/siag/common/bitmaps/kde/handlebg.xpm
+share/siag/common/bitmaps/kde2/back.xpm
+share/siag/common/bitmaps/kde2/bold.xpm
+share/siag/common/bitmaps/kde2/borders.xpm
+share/siag/common/bitmaps/kde2/cancel.xpm
+share/siag/common/bitmaps/kde2/copy.xpm
+share/siag/common/bitmaps/kde2/cut.xpm
+share/siag/common/bitmaps/kde2/editor.xpm
+share/siag/common/bitmaps/kde2/fld_new.xpm
+share/siag/common/bitmaps/kde2/fld_open.xpm
+share/siag/common/bitmaps/kde2/fld_up.xpm
+share/siag/common/bitmaps/kde2/forward.xpm
+share/siag/common/bitmaps/kde2/grid.xpm
+share/siag/common/bitmaps/kde2/handlebg.xpm
+share/siag/common/bitmaps/kde2/hcenter.xpm
+share/siag/common/bitmaps/kde2/hfull.xpm
+share/siag/common/bitmaps/kde2/hleft.xpm
+share/siag/common/bitmaps/kde2/home.xpm
+share/siag/common/bitmaps/kde2/hright.xpm
+share/siag/common/bitmaps/kde2/info.xpm
+share/siag/common/bitmaps/kde2/italic.xpm
+share/siag/common/bitmaps/kde2/larger.xpm
+share/siag/common/bitmaps/kde2/lline.xpm
+share/siag/common/bitmaps/kde2/new.xpm
+share/siag/common/bitmaps/kde2/none.xpm
+share/siag/common/bitmaps/kde2/paste.xpm
+share/siag/common/bitmaps/kde2/preview.xpm
+share/siag/common/bitmaps/kde2/printer.xpm
+share/siag/common/bitmaps/kde2/quit.xpm
+share/siag/common/bitmaps/kde2/redo.xpm
+share/siag/common/bitmaps/kde2/reload.xpm
+share/siag/common/bitmaps/kde2/rline.xpm
+share/siag/common/bitmaps/kde2/save.xpm
+share/siag/common/bitmaps/kde2/saveas.xpm
+share/siag/common/bitmaps/kde2/security.xpm
+share/siag/common/bitmaps/kde2/sigma.xpm
+share/siag/common/bitmaps/kde2/smaller.xpm
+share/siag/common/bitmaps/kde2/spell.xpm
+share/siag/common/bitmaps/kde2/stop.xpm
+share/siag/common/bitmaps/kde2/uchar.xpm
+share/siag/common/bitmaps/kde2/uline.xpm
+share/siag/common/bitmaps/kde2/undo.xpm
+share/siag/common/bitmaps/gnome/back.xpm
+share/siag/common/bitmaps/gnome/bold.xpm
+share/siag/common/bitmaps/gnome/cancel.xpm
+share/siag/common/bitmaps/gnome/copy.xpm
+share/siag/common/bitmaps/gnome/cut.xpm
+share/siag/common/bitmaps/gnome/fld_open.xpm
+share/siag/common/bitmaps/gnome/save.xpm
+share/siag/common/bitmaps/gnome/forward.xpm
+share/siag/common/bitmaps/gnome/hcenter.xpm
+share/siag/common/bitmaps/gnome/hleft.xpm
+share/siag/common/bitmaps/gnome/home.xpm
+share/siag/common/bitmaps/gnome/hfull.xpm
+share/siag/common/bitmaps/gnome/hright.xpm
+share/siag/common/bitmaps/gnome/info.xpm
+share/siag/common/bitmaps/gnome/saveas.xpm
+share/siag/common/bitmaps/gnome/italic.xpm
+share/siag/common/bitmaps/gnome/new.xpm
+share/siag/common/bitmaps/gnome/next.xpm
+share/siag/common/bitmaps/gnome/paste.xpm
+share/siag/common/bitmaps/gnome/play.xpm
+share/siag/common/bitmaps/gnome/previous.xpm
+share/siag/common/bitmaps/gnome/preview.xpm
+share/siag/common/bitmaps/gnome/printer.xpm
+share/siag/common/bitmaps/gnome/quit.xpm
+share/siag/common/bitmaps/gnome/redo.xpm
+share/siag/common/bitmaps/gnome/reload.xpm
+share/siag/common/bitmaps/gnome/search.xpm
+share/siag/common/bitmaps/gnome/spell.xpm
+share/siag/common/bitmaps/gnome/stop.xpm
+share/siag/common/bitmaps/gnome/uchar.xpm
+share/siag/common/bitmaps/gnome/undo.xpm
+share/siag/common/bitmaps/gnome/handlebg.xpm
+share/siag/common/bitmaps/ms/bold.xpm
+share/siag/common/bitmaps/ms/copy.xpm
+share/siag/common/bitmaps/ms/cut.xpm
+share/siag/common/bitmaps/ms/fld_open.xpm
+share/siag/common/bitmaps/ms/hcenter.xpm
+share/siag/common/bitmaps/ms/handlebg.xpm
+share/siag/common/bitmaps/ms/hfull.xpm
+share/siag/common/bitmaps/ms/hleft.xpm
+share/siag/common/bitmaps/ms/hright.xpm
+share/siag/common/bitmaps/ms/italic.xpm
+share/siag/common/bitmaps/ms/new.xpm
+share/siag/common/bitmaps/ms/paste.xpm
+share/siag/common/bitmaps/ms/plotter.xpm
+share/siag/common/bitmaps/ms/printer.xpm
+share/siag/common/bitmaps/ms/redo.xpm
+share/siag/common/bitmaps/ms/saveas.xpm
+share/siag/common/bitmaps/ms/save.xpm
+share/siag/common/bitmaps/ms/sigma.xpm
+share/siag/common/bitmaps/ms/sortaz.xpm
+share/siag/common/bitmaps/ms/sortza.xpm
+share/siag/common/bitmaps/ms/undo.xpm
 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/egon.xpm
 share/siag/common/bitmaps/fld_open.xpm
 share/siag/common/bitmaps/fld_closed.xpm
 share/siag/common/bitmaps/fld_up.xpm
 share/siag/common/bitmaps/fld_new.xpm
-share/siag/common/bitmaps/floppy3.xpm
+share/siag/common/bitmaps/save.xpm
 share/siag/common/bitmaps/grid.xpm
 share/siag/common/bitmaps/hcenter.xpm
+share/siag/common/bitmaps/hfull.xpm
 share/siag/common/bitmaps/hleft.xpm
 share/siag/common/bitmaps/hright.xpm
 share/siag/common/bitmaps/info.xpm
+share/siag/common/bitmaps/insert.xpm
 share/siag/common/bitmaps/italic.xpm
+share/siag/common/bitmaps/lline.xpm
 share/siag/common/bitmaps/new.xpm
 share/siag/common/bitmaps/next.xpm
 share/siag/common/bitmaps/none.xpm
+share/siag/common/bitmaps/overwrite.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/pw.xpm
 share/siag/common/bitmaps/redo.xpm
-share/siag/common/bitmaps/siag_fg.xpm
+share/siag/common/bitmaps/rline.xpm
+share/siag/common/bitmaps/siag.xpm
+share/siag/common/bitmaps/siagoffice.xpm
 share/siag/common/bitmaps/sigma.xpm
 share/siag/common/bitmaps/sortaz.xpm
 share/siag/common/bitmaps/sortza.xpm
@@ -239,6 +356,7 @@ 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/strike.xpm
 share/siag/common/bitmaps/undo.xpm
 share/siag/common/bitmaps/vbottom.xpm
 share/siag/common/bitmaps/vtop.xpm
@@ -251,9 +369,10 @@ share/siag/common/bitmaps/search.xpm
 share/siag/common/bitmaps/xterm16.xpm
 share/siag/common/bitmaps/viewmode.xpm
 share/siag/common/bitmaps/sortmode.xpm
-share/siag/common/bitmaps/ksiag.xpm
+share/siag/common/bitmaps/table.xpm
 share/siag/common/bitmaps/xedplus.xpm
 share/siag/common/bitmaps/netscape.xpm
+share/siag/common/bitmaps/icons.xpm
 share/siag/common/bitmaps/image.xpm
 share/siag/common/bitmaps/ghost.xpm
 share/siag/common/bitmaps/compress.xpm
@@ -270,29 +389,44 @@ share/siag/common/bitmaps/SO3.xpm
 share/siag/common/bitmaps/book-closed.xpm
 share/siag/common/bitmaps/book-open.xpm
 share/siag/common/bitmaps/handlebg.xpm
-share/siag/common/any2xpm
-share/siag/common/readpfa
-share/siag/common/colors.scm
+share/siag/common/bitmaps/xfiler.xpm
+share/siag/common/bitmaps/gvu.xpm
+share/siag/common/bitmaps/security.xpm
+share/siag/common/bitmaps/navigator.xpm
+share/siag/common/bitmaps/mail.xpm
+share/siag/common/bitmaps/news.xpm
+share/siag/common/bitmaps/addressbook.xpm
+share/siag/common/bitmaps/composer.xpm
+share/siag/common/themes/theme.classic
+share/siag/common/themes/theme.gnome
+share/siag/common/themes/theme.kde
+share/siag/common/themes/theme.kde2
+share/siag/common/themes/theme.ms
+share/siag/common/themes/theme.athena
 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.it
 share/siag/common/dictionary.no
 share/siag/common/dictionary.hr
+share/siag/common/dictionary.hu
 share/siag/common/dictionary.da
 share/siag/common/dictionary.pl
+share/siag/common/dictionary.gl
+share/siag/common/dictionary.ru
+share/siag/common/dictionary.cs
+share/siag/common/dictionary.pt_BR
+share/siag/common/any2xpm
 share/siag/xcommon/StringDefs.scm
 share/siag/xcommon/form.scm
 share/siag/siag/123.scm
+share/siag/siag/ccmath.scm
 share/siag/siag/data.scm
+share/siag/siag/functions.scm
 share/siag/siag/external.load
 share/siag/siag/external.save
 share/siag/siag/filemgr.scm
@@ -309,6 +443,7 @@ share/siag/siag/splot.scm
 share/siag/siag/styles.scm
 share/siag/siag/usermgr.scm
 share/siag/siag/toolbar.scm
+share/siag/siag/trans.scm
 share/siag/pw/external.load
 share/siag/pw/external.save
 share/siag/pw/menu.scm
@@ -323,16 +458,22 @@ share/siag/plugins/dummy.scm
 share/siag/plugins/plugin.scm
 share/siag/xfiler/FilesMagic
 share/siag/xfiler/Filesrc
+share/siag/xfiler/makeicons
+@dirrm share/siag/xfiler
 @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/themes
+@dirrm share/siag/common/bitmaps/ms
+@dirrm share/siag/common/bitmaps/kde2
+@dirrm share/siag/common/bitmaps/kde
+@dirrm share/siag/common/bitmaps/gnome
 @dirrm share/siag/common/bitmaps
 @dirrm share/siag/common
-@dirrm share/siag/xfiler
-@dirrm share/siag
+@dirrm share/doc/siag/xfiler
 @dirrm share/doc/siag/xedplus
 @dirrm share/doc/siag/xcommon
 @dirrm share/doc/siag/siod
@@ -340,13 +481,13 @@ share/siag/xfiler/Filesrc
 @dirrm share/doc/siag/siag
 @dirrm share/doc/siag/pw/examples
 @dirrm share/doc/siag/pw
+@dirrm share/doc/siag/plugins
+@dirrm share/doc/siag/gvu
 @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/gvu
-@dirrm share/doc/siag/xfiler
-@dirrm share/doc/siag/plugins
 @dirrm share/doc/siag
-@dirrm libexec/siag/plugins
-@dirrm libexec/siag
+@dirrm lib/siag/plugins
+@dirrm lib/siag/antiword
+@dirrm lib/siag
diff --git a/misc/siag/distinfo b/misc/siag/distinfo
index 521663e3acd..be9d8d0c765 100644
--- a/misc/siag/distinfo
+++ b/misc/siag/distinfo
@@ -1,22 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/09/03 22:40:37 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/01/17 02:09:37 uebayasi Exp $
 
-SHA1 (siag-3.1.20.tar.gz) = 9c05e18e89aa226f31ddda7e3fdb5e7dff2e5cdc
-Size (siag-3.1.20.tar.gz) = 1178500 bytes
-SHA1 (patch-aa) = 108f69f4374bfb4eca9e0d5a59b9be23e1fa271f
-SHA1 (patch-ae) = 179e1e76347b3191c7378dd8018cbeef227d4c39
-SHA1 (patch-af) = 4042d65d92ceb36ce984ece9338484971df19fd8
-SHA1 (patch-ag) = 107fde05207928fdf3eeb61c0df63ae68c21924b
-SHA1 (patch-ah) = 18f113e7c0ef4fbe7b829acf5f6c52e8a5af964c
-SHA1 (patch-ai) = f52a42f6c9e2155e681c6446c03152bc6cb95de6
-SHA1 (patch-aj) = 0e851a155cd55761da561d39a6ff7b1cc277b83d
-SHA1 (patch-ak) = c75a33b69a620c40f95e7c994a6c263d9f460713
-SHA1 (patch-al) = 54b9a2552c09e835b4f586bea2d5998a8e5e9fab
-SHA1 (patch-am) = 560ceb340c47e013c7f20442acd566695db36540
-SHA1 (patch-an) = 37c064cae28f08d23fbe6daae822e9c236a88db7
-SHA1 (patch-ao) = 2d1397b8b1cada006dac5a3354cd4d575ddc7d4e
-SHA1 (patch-ap) = 77bfab1edc37254a90a5f4da35acfa7b885e2588
-SHA1 (patch-aq) = 4ffeec6fb338f45ad7d8e570a3c2ddc09e741ecd
-SHA1 (patch-ar) = 33ede67b1388f8db2cee7019e18056b953916718
-SHA1 (patch-as) = 3f0810ee8eaa129dcd60d55ca0d7190087b31c31
-SHA1 (patch-at) = bff4f949e5ba263def786ddafa61d6fe738c0b51
-SHA1 (patch-au) = e8baaad4589a20d46a3778562ea988ecab6f1e69
+SHA1 (siag-3.5.4.tar.gz) = e1e9ee8b82984cacca14c7e3857a7b395d2d3b2d
+Size (siag-3.5.4.tar.gz) = 1600827 bytes
+SHA1 (patch-av) = a85bb4b097951a99fca70ab7b5e9ae809a45be00
diff --git a/misc/siag/patches/patch-aa b/misc/siag/patches/patch-aa
deleted file mode 100644
index c441636a764..00000000000
--- a/misc/siag/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2002/09/03 22:40:38 wiz Exp $
-
---- siag/Makefile.in.orig	Tue Jul  6 02:09:00 1999
-+++ siag/Makefile.in	Thu Oct 21 16:07:11 1999
-@@ -423,12 +423,12 @@
- 
- install-data-local:
- 	@echo "Install support files for Siag"
--	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/siag/siag
--	cp $(srcdir)/data.scm $(DESTDIR)$(prefix)/doc/siag/siag
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/siag/siag
-+	cp $(srcdir)/data.scm $(DESTDIR)$(prefix)/share/doc/siag/siag
- 
- uninstall-local:
- 	@echo "Uninstalling support files for Siag"
--	rm -rf $(DESTDIR)$(prefix)/doc/siag/siag
-+	rm -rf $(DESTDIR)$(prefix)/share/doc/siag/siag
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/misc/siag/patches/patch-ae b/misc/siag/patches/patch-ae
deleted file mode 100644
index 7ba21f53ebf..00000000000
--- a/misc/siag/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/01/10 01:24:39 wiz Exp $
---- 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/patches/patch-af b/misc/siag/patches/patch-af
deleted file mode 100644
index d51a954c503..00000000000
--- a/misc/siag/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/07/13 17:52:41 mjl Exp $
-
---- tsiag/window.c.orig	Sun Jul 11 01:54:41 1999
-+++ tsiag/window.c	Sun Jul 11 01:55:18 1999
-@@ -27,7 +27,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <signal.h>
--#include <curses.h>
-+#include <ncurses.h>
- #include <unistd.h>
- #include <ctype.h>
- 
diff --git a/misc/siag/patches/patch-ag b/misc/siag/patches/patch-ag
deleted file mode 100644
index 4b7bbc07813..00000000000
--- a/misc/siag/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/10/21 15:15:02 agc Exp $
-
-Use the correct doc directory
-
---- gvu/Makefile.in	1999/10/21 15:04:19	1.1
-+++ gvu/Makefile.in	1999/10/21 15:04:40
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/gvu
-+docdir = $(prefix)/share/doc/siag/gvu
- 
- doc_DATA = README COPYING CHANGES TODO gs.interface comments.doc gvu.html \
- 	copyright.html
diff --git a/misc/siag/patches/patch-ah b/misc/siag/patches/patch-ah
deleted file mode 100644
index 3703a5d3d94..00000000000
--- a/misc/siag/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/10/21 15:15:02 agc Exp $
-
-Use the correct directory for docs.
-
---- plugins/Makefile.in	1999/10/21 15:05:37	1.1
-+++ plugins/Makefile.in	1999/10/21 15:05:57
-@@ -83,7 +83,7 @@
- 
- bindir = $(libexecdir)/siag/plugins
- 
--docdir = $(prefix)/doc/siag/plugins
-+docdir = $(prefix)/share/doc/siag/plugins
- 
- doc_DATA = README CHANGES
- 
diff --git a/misc/siag/patches/patch-ai b/misc/siag/patches/patch-ai
deleted file mode 100644
index 1d3dc718df8..00000000000
--- a/misc/siag/patches/patch-ai
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/10/21 15:15:03 agc Exp $
-
-Use the correct doc directory
-
---- xcommon/Makefile.in	1999/10/21 15:08:23	1.1
-+++ xcommon/Makefile.in	1999/10/21 15:08:41
-@@ -439,11 +439,11 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/siag/xcommon
--	cp $(srcdir)/form.scm $(DESTDIR)$(prefix)/doc/siag/xcommon
-+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/siag/xcommon
-+	cp $(srcdir)/form.scm $(DESTDIR)$(prefix)/share/doc/siag/xcommon
- 
- uninstall-local:
--	rm -rf $(DESTDIR)@prefix@/doc/siag/xcommon
-+	rm -rf $(DESTDIR)@prefix@/share/doc/siag/xcommon
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/misc/siag/patches/patch-aj b/misc/siag/patches/patch-aj
deleted file mode 100644
index e744df15ecc..00000000000
--- a/misc/siag/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/10/21 15:15:03 agc Exp $
-
-Use the correct doc directory.
-
---- xed/Makefile.in	1999/10/21 15:09:36	1.1
-+++ xed/Makefile.in	1999/10/21 15:09:49
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/xedplus
-+docdir = $(prefix)/share/doc/siag/xedplus
- 
- doc_DATA = xedplus.html CHANGES README TODO
- 
diff --git a/misc/siag/patches/patch-ak b/misc/siag/patches/patch-ak
deleted file mode 100644
index 096d041b72c..00000000000
--- a/misc/siag/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/10/21 15:15:03 agc Exp $
-
-Use the correct documentation directory.
-
---- xfiler/Makefile.in	1999/10/21 15:10:40	1.1
-+++ xfiler/Makefile.in	1999/10/21 15:10:53
-@@ -85,7 +85,7 @@
- 
- xfilerdir = $(datadir)/siag/xfiler
- 
--docdir = $(prefix)/doc/siag/xfiler
-+docdir = $(prefix)/share/doc/siag/xfiler
- 
- doc_DATA = xfiler.html README CHANGES TODO
- 
diff --git a/misc/siag/patches/patch-al b/misc/siag/patches/patch-al
deleted file mode 100644
index 8d99384b6ee..00000000000
--- a/misc/siag/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2000/02/02 04:05:06 wiz Exp $
-
---- egon/docs/Makefile.in.orig	Tue Jul  6 03:09:23 1999
-+++ egon/docs/Makefile.in	Wed Feb  2 04:16:55 2000
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/egon
-+docdir = $(prefix)/share/doc/siag/egon
- 
- doc_DATA = BUGS CHANGES COPYING TODO \
- 	commands.html concepts.html egon.gif egon.html fileformats.html \
diff --git a/misc/siag/patches/patch-am b/misc/siag/patches/patch-am
deleted file mode 100644
index 347c5563758..00000000000
--- a/misc/siag/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2000/02/02 04:05:07 wiz Exp $
-
---- common/docs/Makefile.in.orig	Tue Jul  6 03:08:46 1999
-+++ common/docs/Makefile.in	Wed Feb  2 04:18:12 2000
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/common
-+docdir = $(prefix)/share/doc/siag/common
- 
- doc_DATA = COPYING COPYING.LIB Copyright \
- 	credits.html embedding.html form.html interpreters.html \
diff --git a/misc/siag/patches/patch-an b/misc/siag/patches/patch-an
deleted file mode 100644
index 7a2702fc09a..00000000000
--- a/misc/siag/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2000/02/02 04:05:10 wiz Exp $
-
---- common/bitmaps/Makefile.in.orig	Tue Jul  6 03:08:48 1999
-+++ common/bitmaps/Makefile.in	Wed Feb  2 04:19:18 2000
-@@ -98,7 +98,7 @@
- 	center.xpm larger.xpm smaller.xpm portrait.xpm landscape.xpm \
- 	editor.xpm SO3.xpm book-closed.xpm book-open.xpm handlebg.xpm
- 
--gifdir = $(prefix)/doc/siag/common/bitmaps
-+gifdir = $(prefix)/share/doc/siag/common/bitmaps
- gif_DATA = bold.gif borders.gif copyright.gif egon_fg.gif fld_open.gif \
- 	floppy3.gif grid.gif hcenter.gif hleft.gif hright.gif info.gif \
- 	italic.gif new.gif next.gif none.gif play.gif plotter.gif \
diff --git a/misc/siag/patches/patch-ao b/misc/siag/patches/patch-ao
deleted file mode 100644
index 6e50e805932..00000000000
--- a/misc/siag/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2000/02/02 04:05:11 wiz Exp $
-
---- pw/docs/Makefile.in.orig	Tue Jul  6 03:09:14 1999
-+++ pw/docs/Makefile.in	Wed Feb  2 04:20:17 2000
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/pw
-+docdir = $(prefix)/share/doc/siag/pw
- 
- doc_DATA = BUGS CHANGES COPYING TODO \
- 	commands.html concepts.html fileformats.html intro.html \
diff --git a/misc/siag/patches/patch-ap b/misc/siag/patches/patch-ap
deleted file mode 100644
index c8704f39aeb..00000000000
--- a/misc/siag/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2000/02/02 04:05:12 wiz Exp $
-
---- pw/examples/Makefile.in.orig	Tue Jul  6 03:09:16 1999
-+++ pw/examples/Makefile.in	Wed Feb  2 04:21:06 2000
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/pw/examples
-+docdir = $(prefix)/share/doc/siag/pw/examples
- 
- doc_DATA = changes.pw chead.doc chead.html chead.pw chead.rtf chead.txt \
- 	color.pw egon.pw egon.rtf morefonts.pw newpw.pw rtfex.rtf \
diff --git a/misc/siag/patches/patch-aq b/misc/siag/patches/patch-aq
deleted file mode 100644
index 5ea5f3fd386..00000000000
--- a/misc/siag/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2000/02/02 04:05:13 wiz Exp $
-
---- siag/docs/Makefile.in.orig	Tue Jul  6 03:09:02 1999
-+++ siag/docs/Makefile.in	Wed Feb  2 04:22:17 2000
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/siag
-+docdir = $(prefix)/share/doc/siag/siag
- 
- doc_DATA = BUGS CHANGES COPYING README TODO \
- 	c-expr.html commands.html concepts.html fileformats.html form.html \
diff --git a/misc/siag/patches/patch-ar b/misc/siag/patches/patch-ar
deleted file mode 100644
index 9c573ca88e2..00000000000
--- a/misc/siag/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2000/02/02 04:05:14 wiz Exp $
-
---- siag/examples/Makefile.in.orig	Tue Jul  6 03:09:04 1999
-+++ siag/examples/Makefile.in	Wed Feb  2 04:23:29 2000
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/siag/examples
-+docdir = $(prefix)/share/doc/siag/siag/examples
- 
- doc_DATA = allfuncs.wk1 cheeses.siag \
- 	emprestimo.wk1 example.wk1 fibonacci-c.siag fibonacci.siag \
diff --git a/misc/siag/patches/patch-as b/misc/siag/patches/patch-as
deleted file mode 100644
index 3aa4963c7c7..00000000000
--- a/misc/siag/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2000/02/02 04:05:15 wiz Exp $
-
---- siod/docs/Makefile.in.orig	Tue Jul  6 03:08:41 1999
-+++ siod/docs/Makefile.in	Wed Feb  2 04:24:17 2000
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/siod
-+docdir = $(prefix)/share/doc/siag/siod
- 
- doc_DATA = siod.html
- 
diff --git a/misc/siag/patches/patch-at b/misc/siag/patches/patch-at
deleted file mode 100644
index e0ff3bb29ee..00000000000
--- a/misc/siag/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2000/02/02 04:05:15 wiz Exp $
-
---- xcommon/docs/Makefile.in.orig	Tue Jul  6 03:08:57 1999
-+++ xcommon/docs/Makefile.in	Wed Feb  2 04:25:11 2000
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/xcommon
-+docdir = $(prefix)/share/doc/siag/xcommon
- 
- doc_DATA = CHANGES TODO filesel.html
- 
diff --git a/misc/siag/patches/patch-au b/misc/siag/patches/patch-au
deleted file mode 100644
index 2c2b8aea219..00000000000
--- a/misc/siag/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2000/02/02 04:05:16 wiz Exp $
-
---- egon/examples/Makefile.in.orig	Tue Jul  6 03:09:25 1999
-+++ egon/examples/Makefile.in	Wed Feb  2 04:38:17 2000
-@@ -83,7 +83,7 @@
- VERSION = @VERSION@
- XAWLIB = @XAWLIB@
- 
--docdir = $(prefix)/doc/siag/egon/examples
-+docdir = $(prefix)/share/doc/siag/egon/examples
- 
- doc_DATA = bounce.egon ms.egon propeller.egon rondo.egon
- 
diff --git a/misc/siag/patches/patch-av b/misc/siag/patches/patch-av
new file mode 100644
index 00000000000..083a021e235
--- /dev/null
+++ b/misc/siag/patches/patch-av
@@ -0,0 +1,15 @@
+$NetBSD: patch-av,v 1.1 2003/01/17 02:09:47 uebayasi Exp $
+
+--- antiword/Makefile.in.orig	Thu Jan 16 19:24:38 2003
++++ antiword/Makefile.in
+@@ -85,8 +85,8 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+ 
+-bindir = $(libdir)/siag/antiword
+-docdir = $(prefix)/doc/siag/antiword
++bindir = @bindir@
++docdir = @docdir@
+ mapdir = $(libdir)/siag/antiword
+ 
+ map_DATA = 8859-1.txt