5 files changed, 202 insertions, 80 deletions

diff --git a/math/siag/Makefile b/math/siag/Makefile
index 4318f3b74f46..f8840734ba09 100644
--- a/math/siag/Makefile
+++ b/math/siag/Makefile
@@ -6,49 +6,43 @@
 #
 
 PORTNAME=	siag
-PORTVERSION=	3.3.8
+PORTVERSION=	3.4.10
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.siag.nu/pub/siag/ \
-		ftp://ftp.edu.stockholm.se/pub/siag/ \
-		ftp://ftp.icm.edu.pl/site/siag/
+MASTER_SITES=	http://siag.nu/pub/siag/ \
+		ftp://ftp.siag.nu/pub/siag/ \
+		${MASTER_SITE_SUNSITE} \
+		ftp://ftp.edu.stockholm.se/pub/siag/
 
 MAINTAINER=	mi@aldan.algebra.com
 
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
+		sdb:${PORTSDIR}/databases/libsdb \
 		Magick:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
-		mswordview:${PORTSDIR}/textproc/mswordview \
+		wvHtml:${PORTSDIR}/textproc/wv \
+		gv:${PORTSDIR}/print/gv \
 		catdoc:${PORTSDIR}/textproc/catdoc
 
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libccm.a:${PORTSDIR}/math/ccmath
+LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm \
+		t1:${PORTSDIR}/devel/t1lib \
+		tcl83:${PORTSDIR}/lang/tcl83
+
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-tcl=tcl83 --with-xawm="-L${X11BASE} -lXaw3d" \
+		--with-ndbm=gdbm \
+		--without-gmp --with-sqlite --with-ccmath --with-t1lib
+CPPFLAGS+=	-DGDBM -I${LOCALBASE}/include -DX11BASE='\"${X11BASE}\"' \
+		-I${LOCALBASE}/include/tcl8.3
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \
+		LDFLAGS=-L${LOCALBASE}/lib \
+		CPPFLAGS="${CPPFLAGS}"
 MAKE_ARGS=	"-j 2"
 
-CPPFLAGS+=	-I${LOCALBASE}/include -DX11BASE='\"${X11BASE}\"'
-
-.if defined(GUILE)
+.if defined(WITH_GUILE) || defined(GUILE)
 LIB_DEPENDS+=	guile.9:${PORTSDIR}/lang/guile
 .endif
 
-.if !defined(NOGDBM)
-LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm
-CPPFLAGS+=	-DGDBM
-.endif
-
-.if !defined(NOT1)
-LIB_DEPENDS+=	t1:${PORTSDIR}/devel/t1lib
-.endif
-
-.if !defined(NOTCL)
-# Feel free to try other versions of TCL here:
-LIB_DEPENDS+=	tcl83:${PORTSDIR}/lang/tcl83
-CPPFLAGS+=	-I${LOCALBASE}/include/tcl8.3
-CONFIGURE_ARGS+=--with-tcl=tcl83
-.endif
-
-CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \
-			LDFLAGS=-L${LOCALBASE}/lib \
-			CPPFLAGS="${CPPFLAGS}"
-
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
@@ -68,14 +62,10 @@ post-install:
 
 post-patch:
 	# Fixing makefiles to put docs in ${LOCALBASE}/share/doc/siag
-	for m in `find ${WRKSRC} -name Makefile.in |\
-			xargs ${GREP} -l doc\\/siag`; do \
-		${MV} $$m $$m.orig; \
-		${SED} s@doc/siag@share/doc/siag@ < $$m.orig > $$m; \
-	done
-	# Fixing configure to look for Xaw3d instead of XawM
-	${MV} ${WRKSRC}/configure ${WRKSRC}/configure.XawM
-	${SED} s/XawM/Xaw3d/g < ${WRKSRC}/configure.XawM > ${WRKSRC}/configure
-	${CHMOD} +x ${WRKSRC}/configure
+	${PERL} -pi -e 's@doc/siag@share/doc/siag@' \
+		`find ${WRKSRC} -name Makefile.in | \
+			xargs ${GREP} -l doc\\/siag`
+	# Fixing Makefile.in to remove hardcoded references to Xawm
+	${PERL} -pi -e 's/ XawM//g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/math/siag/distinfo b/math/siag/distinfo
index 7d0e617a4928..7b68fcd0bb03 100644
--- a/math/siag/distinfo
+++ b/math/siag/distinfo
@@ -1 +1 @@
-MD5 (siag-3.3.8.tar.gz) = aed9a2ccbc8fb88403e652a85fd61921
+MD5 (siag-3.4.10.tar.gz) = 7a9ea46554499da20a3746f1111f1ac3
diff --git a/math/siag/files/patch-ae b/math/siag/files/patch-ae
deleted file mode 100644
index 9910c3f6561c..000000000000
--- a/math/siag/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- siag/railway.c.orig	Sun Jun  6 10:30:40 1999
-+++ siag/railway.c	Tue Jun 22 13:59:53 1999
-@@ -375,7 +375,7 @@
- void ref_expander(buffer *buf, char *src, char *dest,
- 		char *brk, char *tmpl, char *rng)
- {
--	int a1_refs = buf->a1_refs;
-+	int a1_refs = buf ? buf->a1_refs : 0;
- 	ref_state state = REF_START;
- 	char *exp;
- 	char *start, *end;
diff --git a/math/siag/files/patch-pw b/math/siag/files/patch-pw
index f86369df9c10..bf2dd2d4d081 100644
--- a/math/siag/files/patch-pw
+++ b/math/siag/files/patch-pw
@@ -1,10 +1,3 @@
---- xpw/window.c	Wed Mar 29 17:20:52 2000
-+++ xpw/window.c	Thu Apr 20 09:00:18 2000
-@@ -1386,3 +1386,3 @@
-                 if (!fork()) {
--                        execlp("pw", "Pw", filename, (char *)0);
-+                        execlp(X11BASE"/bin/pw", "Pw", filename, (char *)0);
-                         exit(1);
 --- pw/pw.scm	Fri Apr 14 17:05:47 2000
 +++ pw/pw.scm	Thu Apr 20 08:50:02 2000
 @@ -139,3 +139,3 @@
@@ -16,8 +9,8 @@
 +++ plugins/plugin.scm	Thu Apr 20 08:51:31 2000
 @@ -16,3 +16,3 @@
  (plugin-register "Pathetic Writer" "pw"
--	"pw -plugin -geometry 400x300+4000+4000 %s")
-+	(string-append datadir "/../../bin/pw -plugin -geometry 400x300+4000+4000 %s")
+-	"pw -plugin -geometry 300x150+4000+4000 %s")
++	(string-append datadir "/../../bin/pw -plugin -geometry 300x150+4000+4000 %s")
  (plugin-register "Egon Animator" "egon"
 --- common/tools.scm	Thu Apr  6 08:53:09 2000
 +++ common/tools.scm	Thu Apr 20 09:14:13 2000
diff --git a/math/siag/pkg-plist b/math/siag/pkg-plist
index 64e61550ce8d..a8214aeadc32 100644
--- a/math/siag/pkg-plist
+++ b/math/siag/pkg-plist
@@ -89,6 +89,84 @@ share/siag/common/bitmaps/viewmode.xpm
 share/siag/common/bitmaps/xedplus.xpm
 share/siag/common/bitmaps/xfiler.xpm
 share/siag/common/bitmaps/xterm16.xpm
+share/siag/common/bitmaps/addressbook.xpm
+share/siag/common/bitmaps/composer.xpm
+share/siag/common/bitmaps/ctab.xpm
+share/siag/common/bitmaps/gnome/handlebg.xpm
+share/siag/common/bitmaps/gnome/hfull.xpm
+share/siag/common/bitmaps/gnome/preview.xpm
+share/siag/common/bitmaps/hfull.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/ltab.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/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
+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/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/navigator.xpm
+share/siag/common/bitmaps/news.xpm
+share/siag/common/bitmaps/rtab.xpm
+share/siag/common/bitmaps/security.xpm
+share/siag/common/bitmaps/strike.xpm
+share/siag/common/bitmaps/table.xpm
 share/siag/common/bitmaps/gnome/back.xpm
 share/siag/common/bitmaps/gnome/bold.xpm
 share/siag/common/bitmaps/gnome/cancel.xpm
@@ -141,8 +219,66 @@ 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/fonts/agd.afm
+share/siag/common/fonts/agdo.afm
+share/siag/common/fonts/agw.afm
+share/siag/common/fonts/agwo.afm
+share/siag/common/fonts/bchb.afm
+share/siag/common/fonts/bchb.pfb
+share/siag/common/fonts/bchbi.afm
+share/siag/common/fonts/bchbi.pfb
+share/siag/common/fonts/bchr.afm
+share/siag/common/fonts/bchr.pfb
+share/siag/common/fonts/bchri.afm
+share/siag/common/fonts/bchri.pfb
+share/siag/common/fonts/bkd.afm
+share/siag/common/fonts/bkdi.afm
+share/siag/common/fonts/bkl.afm
+share/siag/common/fonts/bkli.afm
+share/siag/common/fonts/cob.afm
+share/siag/common/fonts/cobo.afm
+share/siag/common/fonts/com.afm
+share/siag/common/fonts/coo.afm
+share/siag/common/fonts/hv.afm
+share/siag/common/fonts/hvb.afm
+share/siag/common/fonts/hvbo.afm
+share/siag/common/fonts/hvn.afm
+share/siag/common/fonts/hvnb.afm
+share/siag/common/fonts/hvnbo.afm
+share/siag/common/fonts/hvno.afm
+share/siag/common/fonts/hvo.afm
+share/siag/common/fonts/ncb.afm
+share/siag/common/fonts/ncbi.afm
+share/siag/common/fonts/nci.afm
+share/siag/common/fonts/ncr.afm
+share/siag/common/fonts/pob.afm
+share/siag/common/fonts/pobi.afm
+share/siag/common/fonts/poi.afm
+share/siag/common/fonts/por.afm
+share/siag/common/fonts/sy.afm
+share/siag/common/fonts/tib.afm
+share/siag/common/fonts/tibi.afm
+share/siag/common/fonts/tii.afm
+share/siag/common/fonts/tir.afm
+share/siag/common/fonts/tnrl2___.afm
+share/siag/common/fonts/tnrl2___.pfb
+share/siag/common/fonts/tnrl2b__.afm
+share/siag/common/fonts/tnrl2b__.pfb
+share/siag/common/fonts/tnrl2bi_.afm
+share/siag/common/fonts/tnrl2bi_.pfb
+share/siag/common/fonts/tnrl2i__.afm
+share/siag/common/fonts/tnrl2i__.pfb
+share/siag/common/fonts/uhvb8a.afm
+share/siag/common/fonts/uhvbo8a.afm
+share/siag/common/fonts/uhvr8a.afm
+share/siag/common/fonts/uhvro8a.afm
+share/siag/common/fonts/utmb8a.afm
+share/siag/common/fonts/utmbi8a.afm
+share/siag/common/fonts/utmr8a.afm
+share/siag/common/fonts/utmri8a.afm
+share/siag/common/fonts/zcmi.afm
+share/siag/common/fonts/zd.afm
 share/siag/common/any2xpm
-share/siag/common/readpfa
 share/siag/common/common.scm
 share/siag/common/position.scm
 share/siag/common/tools.scm
@@ -150,6 +286,9 @@ share/siag/common/t1lib.config
 share/siag/common/FontDataBase
 share/siag/common/IsoLatin1.enc
 share/siag/common/IsoLatin2.enc
+share/siag/common/dictionary.hu
+share/siag/common/dictionary.it
+share/siag/common/dictionary.pt_BR
 share/siag/common/dictionary.sv
 share/siag/common/dictionary.es
 share/siag/common/dictionary.de
@@ -158,14 +297,21 @@ share/siag/common/dictionary.no
 share/siag/common/dictionary.hr
 share/siag/common/dictionary.da
 share/siag/common/dictionary.pl
+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/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/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
@@ -178,6 +324,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
@@ -193,18 +340,17 @@ share/siag/plugins/plugin.scm
 share/siag/xfiler/FilesMagic
 share/siag/xfiler/Filesrc
 share/siag/xfiler/makeicons
-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
+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
 share/doc/siag/siod/siod.html
 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
@@ -239,12 +385,18 @@ 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/TODO
 share/doc/siag/xcommon/filesel.html
 share/doc/siag/xcommon/form.scm
-share/doc/siag/siag/BUGS
+share/doc/siag/common/fonts.html
+share/doc/siag/siag/excel.html
+share/doc/siag/siag/siag-functions.html
+share/doc/siag/siag/examples/allfunctions.siag
+share/doc/siag/siag/examples/complex.siag
+share/doc/siag/siag/examples/database.siag
+share/doc/siag/siag/examples/gmp.siag
+share/doc/siag/siag/examples/portfolj.siag
+share/doc/siag/gsiag/README
 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
@@ -296,8 +448,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/TODO
 share/doc/siag/pw/commands.html
 share/doc/siag/pw/concepts.html
 share/doc/siag/pw/fileformats.html
@@ -333,8 +483,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/TODO
 share/doc/siag/egon/commands.html
 share/doc/siag/egon/concepts.html
 share/doc/siag/egon/egon.gif
@@ -355,12 +503,9 @@ share/doc/siag/egon/examples/rondo.egon
 share/doc/siag/plugins/README
 share/doc/siag/xedplus/xedplus.html
 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/TODO
 share/doc/siag/gvu/README
-share/doc/siag/gvu/TODO
 share/doc/siag/gvu/gs.interface
 share/doc/siag/gvu/comments.doc
 share/doc/siag/gvu/gvu.html
@@ -370,9 +515,13 @@ share/doc/siag/FILES
 share/doc/siag/NLS
 share/doc/siag/COPYING
 share/doc/siag/README
-@dirrm share/siag/common/bitmaps/kde
 @dirrm share/siag/common/bitmaps/gnome
+@dirrm share/siag/common/bitmaps/kde
+@dirrm share/siag/common/bitmaps/kde2
+@dirrm share/siag/common/bitmaps/ms
 @dirrm share/siag/common/bitmaps
+@dirrm share/siag/common/fonts
+@dirrm share/siag/common/themes
 @dirrm share/siag/common
 @dirrm share/siag/xcommon
 @dirrm share/siag/siag
@@ -382,12 +531,13 @@ share/doc/siag/README
 @dirrm share/siag/siod
 @dirrm share/siag/xfiler
 @dirrm share/siag
-@dirrm libexec/siag/plugins
-@dirrm libexec/siag
+@dirrm lib/siag/plugins
+@dirrm lib/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/gsiag
 @dirrm share/doc/siag/pw/examples
 @dirrm share/doc/siag/pw
 @dirrm share/doc/siag/siag/examples