Update to 3.5.7. Note conflict with antiword, which is included.

Sort PLIST.
XXX: should we switch to neXtaw by default? See 030226 entry below.
Changes:
3.5.7:
030228  PW, Siag: Got rid of selection size limit.
        Removed siag/selection.c.

030226  Xedplus: PRIMARY and CLIPBOARD fixed here as well, however
        neXtaw is required as no other Xaw cousins recognize
        CLIPBOARD at all!
        Xedplus: xedCallMenu unbroken. Cut, Copy, Paste work from
        menu, toolbar and using keybindings ^X, ^C, ^V.

030225  Siag, PW: PRIMARY and CLIPBOARD selections work according to the
        current interpretation of the ICCCM.
        PW: Moved xpw/selection.c into window.c.

030224  Added local copy of libstocks, updated for stocks outside
        the US. Removed --with-stocks configuration option.
        Siag: removed xsiag/selection.c and moved the code into
        window.c

3.5.6:
030221  Added Dutch translation by Bram Schoenmakers <bram@schnmkrs.myweb.nl>
        Released 3.5.6.

030128  PW: replaced Emacsy keybindings with modern ones.
        Siag: Added lots of translations in Siag.ad to override
        Emacsy bindings in keytable.scm.

3.5.5:
030127  Added the function get_utf8_char in common/o3read.c to
        get rid of utf8tolatin1 dependency.
        Made sxc reader grok repeated columns.
        Released 3.5.5.

030122  PW: Native OpenOffice.org reader in fileio_sxw.c.
        Siag: Native OpenOffice.org reader in fileio_sxc.c.

030118  Added o3read.[ch] from o3read.

4 files changed, 258 insertions, 252 deletions

diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index d2c9df870c2..3c7ab7680eb 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2003/01/17 02:58:59 uebayasi Exp $
+# $NetBSD: Makefile,v 1.32 2003/03/05 14:30:59 wiz Exp $
 #
 
-DISTNAME=       siag-3.5.4
+DISTNAME=       siag-3.5.7
 CATEGORIES=     misc textproc math
 MASTER_SITES=   ftp://siag.nu/pub/siag/
 
@@ -12,6 +12,8 @@ COMMENT=	Poor man's office suite with spreadsheet, word processor, etc
 DEPENDS+=	gv>=3.5.8nb1:../../print/gv
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
+CONFLICTS+=	antiword-[0-9]*
+
 CONFIGURE_ARGS+=--with-x
 CONFIGURE_ARGS+=--with-guile
 CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/siag
diff --git a/misc/siag/PLIST b/misc/siag/PLIST
index 304ad64e27a..aee3317437b 100644
--- a/misc/siag/PLIST
+++ b/misc/siag/PLIST
@@ -1,50 +1,45 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/17 02:09:37 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/05 14:30:59 wiz Exp $
+bin/antiword
+bin/egon
+bin/gvu
+bin/mgptotxt
+bin/pw
+bin/runcmd
+bin/siag
 bin/siaghelp
 bin/siagrun
-bin/siag
 bin/tsiag
-bin/pw
-bin/mgptotxt
-bin/egon
 bin/xedplus
 bin/xfiler
-bin/runcmd
-bin/antiword
-bin/gvu
+lib/siag/antiword/8859-1.txt
+lib/siag/plugins/clipart
 lib/siag/plugins/dummy
-lib/siag/plugins/image
+lib/siag/plugins/form
 lib/siag/plugins/hello
+lib/siag/plugins/image
 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/egon.1
+man/man1/gvu.1
+man/man1/pw.1
+man/man1/runcmd.1
+man/man1/siag.1
+man/man1/siod.1
 man/man1/xedplus.1
 man/man1/xfiler.1
-man/man1/runcmd.1
-man/man1/gvu.1
-share/doc/siag/siod/siod.html
+share/doc/siag/AUTHORS
+share/doc/siag/COPYING
+share/doc/siag/FILES
+share/doc/siag/NLS
+share/doc/siag/README
 share/doc/siag/common/COPYING.LIB
 share/doc/siag/common/Copyright
-share/doc/siag/common/credits.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
-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/save.gif
 share/doc/siag/common/bitmaps/grid.gif
 share/doc/siag/common/bitmaps/hcenter.gif
 share/doc/siag/common/bitmaps/hleft.gif
@@ -60,6 +55,7 @@ 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/save.gif
 share/doc/siag/common/bitmaps/siag_fg.gif
 share/doc/siag/common/bitmaps/sigma.gif
 share/doc/siag/common/bitmaps/stop.gif
@@ -67,28 +63,79 @@ 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/form.scm
+share/doc/siag/common/credits.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
+share/doc/siag/common/plugins.html
+share/doc/siag/common/search.html
+share/doc/siag/common/siaghelp.html
+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/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/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/gvu/README
+share/doc/siag/gvu/comments.doc
+share/doc/siag/gvu/copyright.html
+share/doc/siag/gvu/gs.interface
+share/doc/siag/gvu/gvu.html
+share/doc/siag/plugins/README
+share/doc/siag/pw/commands.html
+share/doc/siag/pw/concepts.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/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/siag/README
 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
-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/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/data.scm
 share/doc/siag/siag/examples/allfuncs.wk1
+share/doc/siag/siag/examples/allfunctions.siag
 share/doc/siag/siag/examples/cheeses.siag
 share/doc/siag/siag/examples/complex.siag
 share/doc/siag/siag/examples/database.siag
@@ -126,82 +173,104 @@ 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/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/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/plugins/README
-share/doc/siag/xedplus/xedplus.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
+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-functions.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/siod/siod.html
+share/doc/siag/xcommon/form.scm
 share/doc/siag/xedplus/README
-share/doc/siag/xfiler/xfiler.html
+share/doc/siag/xedplus/xedplus.html
 share/doc/siag/xfiler/README
-share/doc/siag/README
-share/doc/siag/gvu/README
-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/doc/siag/xfiler/xfiler.html
+share/siag/common/any2xpm
+share/siag/common/bitmaps/SO3.xpm
+share/siag/common/bitmaps/addressbook.xpm
+share/siag/common/bitmaps/back.xpm
+share/siag/common/bitmaps/blank.xpm
+share/siag/common/bitmaps/bold.xpm
+share/siag/common/bitmaps/book-closed.xpm
+share/siag/common/bitmaps/book-open.xpm
+share/siag/common/bitmaps/borders.xpm
+share/siag/common/bitmaps/cancel.xpm
+share/siag/common/bitmaps/center.xpm
+share/siag/common/bitmaps/composer.xpm
+share/siag/common/bitmaps/compress.xpm
+share/siag/common/bitmaps/copy.xpm
+share/siag/common/bitmaps/copyright.xpm
+share/siag/common/bitmaps/cut.xpm
+share/siag/common/bitmaps/data.xpm
+share/siag/common/bitmaps/editor.xpm
+share/siag/common/bitmaps/egon.xpm
+share/siag/common/bitmaps/fld_closed.xpm
+share/siag/common/bitmaps/fld_new.xpm
+share/siag/common/bitmaps/fld_open.xpm
+share/siag/common/bitmaps/fld_up.xpm
+share/siag/common/bitmaps/fonts.xpm
+share/siag/common/bitmaps/ghost.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/forward.xpm
+share/siag/common/bitmaps/gnome/handlebg.xpm
+share/siag/common/bitmaps/gnome/hcenter.xpm
+share/siag/common/bitmaps/gnome/hfull.xpm
+share/siag/common/bitmaps/gnome/hleft.xpm
+share/siag/common/bitmaps/gnome/home.xpm
+share/siag/common/bitmaps/gnome/hright.xpm
+share/siag/common/bitmaps/gnome/info.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/preview.xpm
+share/siag/common/bitmaps/gnome/previous.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/save.xpm
+share/siag/common/bitmaps/gnome/saveas.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/grid.xpm
+share/siag/common/bitmaps/gvu.xpm
+share/siag/common/bitmaps/handlebg.xpm
+share/siag/common/bitmaps/hcenter.xpm
+share/siag/common/bitmaps/hfull.xpm
+share/siag/common/bitmaps/hleft.xpm
+share/siag/common/bitmaps/home.xpm
+share/siag/common/bitmaps/hright.xpm
+share/siag/common/bitmaps/icons.xpm
+share/siag/common/bitmaps/image.xpm
+share/siag/common/bitmaps/info.xpm
+share/siag/common/bitmaps/insert.xpm
+share/siag/common/bitmaps/italic.xpm
 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/handlebg.xpm
 share/siag/common/bitmaps/kde/home.xpm
 share/siag/common/bitmaps/kde/info.xpm
 share/siag/common/bitmaps/kde/larger.xpm
@@ -214,11 +283,11 @@ 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/save.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
@@ -260,44 +329,16 @@ 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/landscape.xpm
+share/siag/common/bitmaps/larger.xpm
+share/siag/common/bitmaps/lline.xpm
+share/siag/common/bitmaps/mail.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/hcenter.xpm
 share/siag/common/bitmaps/ms/hfull.xpm
 share/siag/common/bitmaps/ms/hleft.xpm
 share/siag/common/bitmaps/ms/hright.xpm
@@ -307,130 +348,99 @@ 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/saveas.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.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/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/navigator.xpm
+share/siag/common/bitmaps/netscape.xpm
 share/siag/common/bitmaps/new.xpm
+share/siag/common/bitmaps/news.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/portrait.xpm
 share/siag/common/bitmaps/preview.xpm
 share/siag/common/bitmaps/previous.xpm
 share/siag/common/bitmaps/printer.xpm
 share/siag/common/bitmaps/pw.xpm
+share/siag/common/bitmaps/quit.xpm
 share/siag/common/bitmaps/redo.xpm
+share/siag/common/bitmaps/reload.xpm
 share/siag/common/bitmaps/rline.xpm
+share/siag/common/bitmaps/save.xpm
+share/siag/common/bitmaps/search.xpm
+share/siag/common/bitmaps/security.xpm
 share/siag/common/bitmaps/siag.xpm
 share/siag/common/bitmaps/siagoffice.xpm
 share/siag/common/bitmaps/sigma.xpm
+share/siag/common/bitmaps/smaller.xpm
 share/siag/common/bitmaps/sortaz.xpm
+share/siag/common/bitmaps/sortmode.xpm
 share/siag/common/bitmaps/sortza.xpm
 share/siag/common/bitmaps/spell.xpm
 share/siag/common/bitmaps/stop.xpm
+share/siag/common/bitmaps/strike.xpm
+share/siag/common/bitmaps/table.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/unknown.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/xterm16.xpm
 share/siag/common/bitmaps/viewmode.xpm
-share/siag/common/bitmaps/sortmode.xpm
-share/siag/common/bitmaps/table.xpm
+share/siag/common/bitmaps/vtop.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
-share/siag/common/bitmaps/fonts.xpm
-share/siag/common/bitmaps/data.xpm
-share/siag/common/bitmaps/unknown.xpm
-share/siag/common/bitmaps/center.xpm
-share/siag/common/bitmaps/larger.xpm
-share/siag/common/bitmaps/smaller.xpm
-share/siag/common/bitmaps/portrait.xpm
-share/siag/common/bitmaps/landscape.xpm
-share/siag/common/bitmaps/editor.xpm
-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/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/bitmaps/xterm16.xpm
 share/siag/common/common.scm
-share/siag/common/position.scm
-share/siag/common/tools.scm
-share/siag/common/dictionary.sv
-share/siag/common/dictionary.es
+share/siag/common/dictionary.cs
+share/siag/common/dictionary.da
 share/siag/common/dictionary.de
+share/siag/common/dictionary.es
 share/siag/common/dictionary.fr
-share/siag/common/dictionary.it
-share/siag/common/dictionary.no
+share/siag/common/dictionary.gl
 share/siag/common/dictionary.hr
 share/siag/common/dictionary.hu
-share/siag/common/dictionary.da
+share/siag/common/dictionary.it
+share/siag/common/dictionary.nl
+share/siag/common/dictionary.no
 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/common/dictionary.ru
+share/siag/common/dictionary.sv
+share/siag/common/position.scm
+share/siag/common/themes/theme.athena
+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/tools.scm
+share/siag/egon/animator.scm
+share/siag/egon/egon.scm
+share/siag/egon/external.load
+share/siag/egon/external.save
+share/siag/egon/menu.scm
+share/siag/plugins/dummy.scm
+share/siag/plugins/plugin.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/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
 share/siag/siag/find.scm
+share/siag/siag/functions.scm
 share/siag/siag/keytable.scm
 share/siag/siag/mailto.scm
 share/siag/siag/menu.scm
@@ -441,21 +451,12 @@ 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/siag/trans.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
+share/siag/siag/usermgr.scm
+share/siag/siod/siod.scm
+share/siag/xcommon/StringDefs.scm
+share/siag/xcommon/form.scm
 share/siag/xfiler/FilesMagic
 share/siag/xfiler/Filesrc
 share/siag/xfiler/makeicons
@@ -473,6 +474,7 @@ share/siag/xfiler/makeicons
 @dirrm share/siag/common/bitmaps/gnome
 @dirrm share/siag/common/bitmaps
 @dirrm share/siag/common
+@dirrm share/siag
 @dirrm share/doc/siag/xfiler
 @dirrm share/doc/siag/xedplus
 @dirrm share/doc/siag/xcommon
diff --git a/misc/siag/distinfo b/misc/siag/distinfo
index be9d8d0c765..ad8de710b21 100644
--- a/misc/siag/distinfo
+++ b/misc/siag/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/01/17 02:09:37 uebayasi Exp $
+$NetBSD: distinfo,v 1.5 2003/03/05 14:30:59 wiz Exp $
 
-SHA1 (siag-3.5.4.tar.gz) = e1e9ee8b82984cacca14c7e3857a7b395d2d3b2d
-Size (siag-3.5.4.tar.gz) = 1600827 bytes
-SHA1 (patch-av) = a85bb4b097951a99fca70ab7b5e9ae809a45be00
+SHA1 (siag-3.5.7.tar.gz) = 007030eb29fc1a4d3a0d78f9d93893cf40b6b84b
+Size (siag-3.5.7.tar.gz) = 1653929 bytes
+SHA1 (patch-av) = 2e2598ca694ed93ff6bd34c9bb4625f915d412ad
diff --git a/misc/siag/patches/patch-av b/misc/siag/patches/patch-av
index 083a021e235..9ab67cf82f4 100644
--- a/misc/siag/patches/patch-av
+++ b/misc/siag/patches/patch-av
@@ -1,15 +1,17 @@
-$NetBSD: patch-av,v 1.1 2003/01/17 02:09:47 uebayasi Exp $
+$NetBSD: patch-av,v 1.2 2003/03/05 14:31:00 wiz Exp $
 
---- antiword/Makefile.in.orig	Thu Jan 16 19:24:38 2003
+--- antiword/Makefile.in.orig	Fri Feb 28 19:38:05 2003
 +++ antiword/Makefile.in
-@@ -85,8 +85,8 @@
+@@ -103,10 +103,10 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE
+ am__include = @am__include@
  am__quote = @am__quote@
- install_sh = @install_sh@
  
 -bindir = $(libdir)/siag/antiword
--docdir = $(prefix)/doc/siag/antiword
 +bindir = @bindir@
+ build_alias = @build_alias@
+ datadir = @datadir@
+-docdir = $(prefix)/doc/siag/antiword
 +docdir = @docdir@
- mapdir = $(libdir)/siag/antiword
- 
- map_DATA = 8859-1.txt
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
+ includedir = @includedir@