upgrade to siag 2.80.

6 files changed, 223 insertions, 101 deletions

diff --git a/math/siag/Makefile b/math/siag/Makefile
index e3650b4c1a44..c9a476d71c74 100644
--- a/math/siag/Makefile
+++ b/math/siag/Makefile
@@ -1,66 +1,37 @@
 # New ports collection makefile for:	siag (Scheme In A Grid)
-# Version required:	2.65
+# Version required:	2.80
 # Date created:		27 Jan 1998
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.2 1998/03/03 09:26:29 asami Exp $
+# $Id: Makefile,v 1.3 1998/03/07 00:21:29 itojun Exp $
 #
 
-DISTNAME=	siag-2.65
+DISTNAME=	siag-2.80
 CATEGORIES=	math
 # Since 2.67 (latest version on 3/7/1998) is seriously broken, I asked
-# asami-san to put 2.65 into ftp.freebsd.org.  Thanks.
+# asami-san to put 2.80 into ftp.freebsd.org.  Thanks.
 MASTER_SITES=	ftp://ftp.edu.stockholm.se/pub/siag/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tsiag-2.80.tar.gz
 
 MAINTAINER=	itojun@itojun.org
 
 USE_X11=	yes
 WRKSRC=		${WRKDIR}/siag
-CONF=	siag/data.scm siag/find.scm siag/keytable.scm siag/menu.scm \
-	siag/plot.scm siag/siag.scm siag/splot.scm siag/startup.siag \
-	siod/siod.scm xcommon/StringDefs.scm xcommon/form.scm
-DOC1=	BUGS CHANGES COPYING Copying README TODO c-expr.html commands.html \
-	concepts.html fileformats.html form.html gnuplot.html howto.html \
-	intro.html invocation.html kalkyl.gif keys.html mouse.html scheme.html \
-	scrollbars.html siag.gif siag.html strings.html toolbar.html
-EXAMPLES=	fibonacci-c.siag fibonacci.siag filemgr.scm fonts.siag \
-		formtest.siag group.siag heaven-c.siag heaven-guile.siag \
-		heaven-tcl.siag heaven.siag heaven.xbm hyperhelp.siag \
-		image.siag kalkyl.siag mailaddr.csv mailto.scm \
-		multtabl-c.siag multtabl.siag passwd.siag plot.siag \
-		property.siag siag-http.scm siag-net.scm sincos.siag \
-		strfib.siag strings.siag surface1.siag surface2.siag \
-		tcltest.siag usermgr.scm
-DOC2=	COPYING.LIB credits.html embedding.html form.html interpreters.html \
-	office.html search.html siaghelp.html
 
 do-build:
-	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} sh INSTALL)
+	(cd ${WRKSRC}; ${XMKMF}; \
+	 ${SETENV} ${MAKE_ENV} ${MAKE} Makefiles; \
+	 ${SETENV} ${MAKE_ENV} ${MAKE} depend; \
+	 ${SETENV} ${MAKE_ENV} ${MAKE})
+	(cd ${WRKSRC}/tsiag; ${XMKMF}; \
+	 ${SETENV} ${MAKE_ENV} ${MAKE} depend; \
+	 ${SETENV} ${MAKE_ENV} ${MAKE})
 
 do-install:
-	(cd ${WRKSRC}/xsiag; ${SETENV} ${MAKE_ENV} ${MAKE} install)
-	(cd ${WRKSRC}/tsiag; ${SETENV} ${MAKE_ENV} ${MAKE} install)
-	dst=${PREFIX}/lib/siag; \
-	${MKDIR} $$dst/siag; \
-	${MKDIR} $$dst/siod; \
-	${MKDIR} $$dst/xcommon; \
-	for i in ${CONF}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i $$dst/$$i; \
-	done
-.if !defined(NOPORTDOCS)
-	dst=${PREFIX}/lib/siag/siag/docs; ${MKDIR} $$dst; \
-	for i in ${DOC1}; do \
-		${INSTALL_DATA} ${WRKSRC}/siag/docs/$$i $$dst; \
-	done
-	dst=${PREFIX}/lib/siag/siag/examples; ${MKDIR} $$dst; \
-	for i in ${EXAMPLES}; do \
-		${INSTALL_DATA} ${WRKSRC}/siag/examples/$$i $$dst; \
-	done
-	dst=${PREFIX}/lib/siag/common/docs; ${MKDIR} $$dst; \
-	for i in ${DOC2}; do \
-		${INSTALL_DATA} ${WRKSRC}/common/docs/$$i $$dst; \
-	done
-.endif
-	@${SED} -e 's#/usr/X11R6#${PREFIX}#' ${PKGDIR}/MESSAGE
+	-(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} install install-misc)
+	-(cd ${WRKSRC}/tsiag; ${SETENV} ${MAKE_ENV} ${MAKE} install)
+
+post-install:
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/math/siag/distinfo b/math/siag/distinfo
index 38e5bd7eb89e..f6e4ada72fc0 100644
--- a/math/siag/distinfo
+++ b/math/siag/distinfo
@@ -1 +1,2 @@
-MD5 (siag-2.65.tar.gz) = 9fdf8837c8b7025153009f8ad30658b5
+MD5 (siag-2.80.tar.gz) = 71cca12d79b055bbfc71bb3f69047a7e
+MD5 (tsiag-2.80.tar.gz) = bb9bc1cba909cbf4514b75646e230ec9
diff --git a/math/siag/files/patch-aa b/math/siag/files/patch-aa
index da215d1a3156..4639b751226c 100644
--- a/math/siag/files/patch-aa
+++ b/math/siag/files/patch-aa
@@ -1,54 +1,21 @@
---- topdir.mk.orig	Fri Jan 23 05:03:22 1998
-+++ topdir.mk	Wed Jan 28 03:08:06 1998
-@@ -1,10 +1,10 @@
+--- topdir.mk.orig	Tue Jun 30 02:14:15 1998
++++ topdir.mk	Tue Jul  7 01:55:37 1998
+@@ -1,7 +1,7 @@
  
- # Set this to wherever you unpacked the archive.
- # This is normally not needed, it should be autodetected
--#SIAG_HOME = -DSIAGHOME=\"/usr/local/siag\"
-+SIAG_HOME = -DSIAGHOME=\"${PREFIX}/lib/siag\"
+ # Set this to where you want the support files installed
+-SIAG_HOME = /usr/local/lib/siag
+-XCOMM SIAG_HOME = $(LIBDIR)/siag
++SIAG_HOME = $(PREFIX)/lib/siag
++# SIAG_HOME = $(LIBDIR)/siag
  
  # Set this to your web browser of choice
- SIAG_HELP = -DSIAGHELP=\"chimera\"
- 
- # This creates a file TRACEME in the current directory
- #DEBUG = -DDEBUG
-@@ -25,11 +25,12 @@
+ SIAG_HELP = chimera
+@@ -28,7 +28,7 @@
  NDBM = -DNDBM
- # And one of the following two lines
+ # And one of the following two lines (none for Solaris)
  #DBLIB = -lndbm
 -DBLIB = -ldb
 +#DBLIB = -ldb
  
  # Uncomment one of the following:
--SYSDEP_LIB =				# for Linux or HP/UX
-+#SYSDEP_LIB =				# for Linux or HP/UX
- #SYSDEP_LIB = -lposix4			# for Solaris
-+SYSDEP_LIB = -lcrypt			# FreeBSD
- 
- 
- ######
-@@ -69,7 +70,7 @@
- 
- ######
- # Uncomment this if you want to use Xaw3d widgets
--XAW3D = -lXaw3d
-+#XAW3D = -lXaw3d
- # Or this if you have Xaw95 widgets installed
- #XAW3D = -lXaw95
- # Or this for a NeXT look
-@@ -83,11 +84,11 @@
- 
- ######
- # To use Guile (requires libguile)
--GUILE = -DGUILE
--GUILELIB = -lguile
-+#GUILE = -DGUILE
-+#GUILELIB = -lguile
- # To use Tcl (requires libtcl)
--TCL = -DTCL
--TCLLIB = -ltcl -ldl
-+#TCL = -DTCL
-+#TCLLIB = -ltcl -ldl
- # To use Perl (requires installed Perl library)
- # There is *no* Perl support in Siag yet!
- #PERL = -DPERL
+ #SYSDEP_LIB =				# for Linux or HP/UX
diff --git a/math/siag/files/patch-ae b/math/siag/files/patch-ae
index 71ea2e74f597..2b6ba5f2d803 100644
--- a/math/siag/files/patch-ae
+++ b/math/siag/files/patch-ae
@@ -1,5 +1,5 @@
---- tsiag/window.c.orig	Wed Jan 28 02:38:18 1998
-+++ tsiag/window.c	Wed Jan 28 02:38:24 1998
+--- tsiag/window.c.orig	Tue Jul  7 01:39:45 1998
++++ tsiag/window.c	Tue Jul  7 01:39:51 1998
 @@ -27,7 +27,7 @@
  #include <string.h>
  #include <stdlib.h>
diff --git a/math/siag/files/patch-af b/math/siag/files/patch-af
index 2112b00e8bec..b73b245b4d3a 100644
--- a/math/siag/files/patch-af
+++ b/math/siag/files/patch-af
@@ -1,5 +1,5 @@
---- tsiag/tsiag.c.orig	Wed Jan 28 02:39:28 1998
-+++ tsiag/tsiag.c	Wed Jan 28 02:39:34 1998
+--- tsiag/tsiag.c.orig	Tue Jul  7 01:39:41 1998
++++ tsiag/tsiag.c	Tue Jul  7 01:39:54 1998
 @@ -2,7 +2,7 @@
  #include <stdio.h>
  #include <stdlib.h>
diff --git a/math/siag/pkg-plist b/math/siag/pkg-plist
index cfe107753b8e..26262859a405 100644
--- a/math/siag/pkg-plist
+++ b/math/siag/pkg-plist
@@ -1,7 +1,79 @@
+bin/egon
+bin/pw
 bin/siag
 bin/tsiag
+lib/X11/app-defaults/Egon
+lib/X11/app-defaults/Pw
 lib/X11/app-defaults/Siag
+lib/siag/common/bitmaps/C.xbm
+lib/siag/common/bitmaps/F1.xbm
+lib/siag/common/bitmaps/N.xbm
+lib/siag/common/bitmaps/O.xbm
+lib/siag/common/bitmaps/P.xbm
+lib/siag/common/bitmaps/S.xbm
+lib/siag/common/bitmaps/V.xbm
+lib/siag/common/bitmaps/W.xbm
+lib/siag/common/bitmaps/blank.xbm
+lib/siag/common/bitmaps/bold.xbm
+lib/siag/common/bitmaps/bold.xpm
+lib/siag/common/bitmaps/borders.xbm
+lib/siag/common/bitmaps/borders.xpm
+lib/siag/common/bitmaps/copyright.xbm
+lib/siag/common/bitmaps/copyright.xpm
+lib/siag/common/bitmaps/egon_bg.xbm
+lib/siag/common/bitmaps/egon_fg.xbm
+lib/siag/common/bitmaps/egon_fg.xpm
+lib/siag/common/bitmaps/egon_old.xpm
+lib/siag/common/bitmaps/fld_closed.xbm
+lib/siag/common/bitmaps/fld_open.xbm
+lib/siag/common/bitmaps/fld_open.xpm
+lib/siag/common/bitmaps/floppy3.xbm
+lib/siag/common/bitmaps/floppy3.xpm
+lib/siag/common/bitmaps/grid.xbm
+lib/siag/common/bitmaps/grid.xpm
+lib/siag/common/bitmaps/hcenter.xbm
+lib/siag/common/bitmaps/hcenter.xpm
+lib/siag/common/bitmaps/hleft.xbm
+lib/siag/common/bitmaps/hleft.xpm
+lib/siag/common/bitmaps/hright.xbm
+lib/siag/common/bitmaps/hright.xpm
+lib/siag/common/bitmaps/info.xbm
+lib/siag/common/bitmaps/info.xpm
+lib/siag/common/bitmaps/italic.xbm
+lib/siag/common/bitmaps/italic.xpm
+lib/siag/common/bitmaps/new.xbm
+lib/siag/common/bitmaps/new.xpm
+lib/siag/common/bitmaps/next.xbm
+lib/siag/common/bitmaps/none.xbm
+lib/siag/common/bitmaps/none.xpm
+lib/siag/common/bitmaps/play.xbm
+lib/siag/common/bitmaps/plotter.xbm
+lib/siag/common/bitmaps/plotter.xpm
+lib/siag/common/bitmaps/preview.xbm
+lib/siag/common/bitmaps/preview.xpm
+lib/siag/common/bitmaps/previous.xbm
+lib/siag/common/bitmaps/printer.xbm
+lib/siag/common/bitmaps/printer.xpm
+lib/siag/common/bitmaps/pw_bg.xbm
+lib/siag/common/bitmaps/pw_fg.xbm
+lib/siag/common/bitmaps/pw_fg.xpm
+lib/siag/common/bitmaps/qmark.xbm
+lib/siag/common/bitmaps/quit.xbm
+lib/siag/common/bitmaps/scr_icon.xbm
+lib/siag/common/bitmaps/siag.xbm
+lib/siag/common/bitmaps/siag_bg.xbm
+lib/siag/common/bitmaps/siag_fg.xbm
+lib/siag/common/bitmaps/siag_fg.xpm
+lib/siag/common/bitmaps/sigma.xbm
+lib/siag/common/bitmaps/sigma.xpm
+lib/siag/common/bitmaps/stop.xbm
+lib/siag/common/bitmaps/uchar.xbm
+lib/siag/common/bitmaps/uline.xbm
+lib/siag/common/bitmaps/uline.xpm
+lib/siag/common/bitmaps/vbottom.xbm
+lib/siag/common/bitmaps/vtop.xbm
 lib/siag/common/docs/COPYING.LIB
+lib/siag/common/docs/Copyright
 lib/siag/common/docs/credits.html
 lib/siag/common/docs/embedding.html
 lib/siag/common/docs/form.html
@@ -9,6 +81,106 @@ lib/siag/common/docs/interpreters.html
 lib/siag/common/docs/office.html
 lib/siag/common/docs/search.html
 lib/siag/common/docs/siaghelp.html
+lib/siag/egon/animator.scm
+lib/siag/egon/docs/CHANGES
+lib/siag/egon/docs/COPYING
+lib/siag/egon/docs/Copying
+lib/siag/egon/docs/TODO
+lib/siag/egon/docs/commands.html
+lib/siag/egon/docs/concepts.html
+lib/siag/egon/docs/egon.gif
+lib/siag/egon/docs/egon.html
+lib/siag/egon/docs/fileformats.html
+lib/siag/egon/docs/intro.html
+lib/siag/egon/docs/invocation.html
+lib/siag/egon/docs/keys.html
+lib/siag/egon/docs/mouse.html
+lib/siag/egon/docs/scheme.html
+lib/siag/egon/docs/scrollbars.html
+lib/siag/egon/docs/strings.html
+lib/siag/egon/docs/toolbar.html
+lib/siag/egon/egon.scm
+lib/siag/egon/examples/Plaid.xpm
+lib/siag/egon/examples/bg_pixmap.xpm
+lib/siag/egon/examples/bounce.scm
+lib/siag/egon/examples/box.scm
+lib/siag/egon/examples/circle.scm
+lib/siag/egon/examples/eye.scm
+lib/siag/egon/examples/eye.xpm
+lib/siag/egon/examples/eye1.xpm
+lib/siag/egon/examples/eye10.xpm
+lib/siag/egon/examples/eye11.xpm
+lib/siag/egon/examples/eye12.xpm
+lib/siag/egon/examples/eye13.xpm
+lib/siag/egon/examples/eye14.xpm
+lib/siag/egon/examples/eye15.xpm
+lib/siag/egon/examples/eye16.xpm
+lib/siag/egon/examples/eye17.xpm
+lib/siag/egon/examples/eye18.xpm
+lib/siag/egon/examples/eye19.xpm
+lib/siag/egon/examples/eye2.scm
+lib/siag/egon/examples/eye2.xpm
+lib/siag/egon/examples/eye20.xpm
+lib/siag/egon/examples/eye21.xpm
+lib/siag/egon/examples/eye22.xpm
+lib/siag/egon/examples/eye23.xpm
+lib/siag/egon/examples/eye24.xpm
+lib/siag/egon/examples/eye3.xpm
+lib/siag/egon/examples/eye4.xpm
+lib/siag/egon/examples/eye5.xpm
+lib/siag/egon/examples/eye6.xpm
+lib/siag/egon/examples/eye7.xpm
+lib/siag/egon/examples/eye8.xpm
+lib/siag/egon/examples/eye9.xpm
+lib/siag/egon/examples/line.scm
+lib/siag/egon/examples/mpfoot.xpm
+lib/siag/egon/examples/ms.scm
+lib/siag/egon/examples/noname.scm
+lib/siag/egon/examples/question.xpm
+lib/siag/egon/examples/ring.xpm
+lib/siag/egon/examples/siag.xbm
+lib/siag/egon/examples/toady.xpm
+lib/siag/egon/examples/window.xpm
+lib/siag/egon/menu.scm
+lib/siag/pw/docs/BUGS
+lib/siag/pw/docs/CHANGES
+lib/siag/pw/docs/COPYING
+lib/siag/pw/docs/Copying
+lib/siag/pw/docs/TODO
+lib/siag/pw/docs/commands.html
+lib/siag/pw/docs/concepts.html
+lib/siag/pw/docs/fileformats.html
+lib/siag/pw/docs/intro.html
+lib/siag/pw/docs/invocation.html
+lib/siag/pw/docs/keys.html
+lib/siag/pw/docs/mouse.html
+lib/siag/pw/docs/pw.gif
+lib/siag/pw/docs/pw.html
+lib/siag/pw/docs/scheme.html
+lib/siag/pw/docs/scrollbars.html
+lib/siag/pw/docs/strings.html
+lib/siag/pw/docs/toolbar.html
+lib/siag/pw/examples/chead.doc
+lib/siag/pw/examples/chead.html
+lib/siag/pw/examples/chead.pw
+lib/siag/pw/examples/chead.rtf
+lib/siag/pw/examples/chead.txt
+lib/siag/pw/examples/color.pw
+lib/siag/pw/examples/formats.html
+lib/siag/pw/examples/formats.pw
+lib/siag/pw/examples/formats.siag
+lib/siag/pw/examples/formats.xbm
+lib/siag/pw/examples/newpw.pw
+lib/siag/pw/examples/rtfex.rtf
+lib/siag/pw/examples/standard.bmk
+lib/siag/pw/examples/styles.html
+lib/siag/pw/examples/styles.pw
+lib/siag/pw/examples/styles2.pw
+lib/siag/pw/examples/svenska.pw
+lib/siag/pw/examples/svenska.rtf
+lib/siag/pw/menu.scm
+lib/siag/pw/pw.scm
+lib/siag/siag/123.scm
 lib/siag/siag/data.scm
 lib/siag/siag/docs/BUGS
 lib/siag/siag/docs/CHANGES
@@ -38,6 +210,8 @@ lib/siag/siag/examples/fibonacci-c.siag
 lib/siag/siag/examples/fibonacci.siag
 lib/siag/siag/examples/filemgr.scm
 lib/siag/siag/examples/fonts.siag
+lib/siag/siag/examples/foo.siag
+lib/siag/siag/examples/foo.wk1
 lib/siag/siag/examples/formtest.siag
 lib/siag/siag/examples/group.siag
 lib/siag/siag/examples/heaven-c.siag
@@ -70,13 +244,22 @@ lib/siag/siag/menu.scm
 lib/siag/siag/plot.scm
 lib/siag/siag/siag.scm
 lib/siag/siag/splot.scm
-lib/siag/siag/startup.siag
 lib/siag/siod/siod.scm
 lib/siag/xcommon/StringDefs.scm
 lib/siag/xcommon/form.scm
-@dirrm lib/siag/common/docs
-@dirrm lib/siag/siag/docs
+@dirrm lib/siag/xsiag
+@dirrm lib/siag/xcommon
+@dirrm lib/siag/siod
 @dirrm lib/siag/siag/examples
+@dirrm lib/siag/siag/docs
 @dirrm lib/siag/siag
-@dirrm lib/siag/siod
-@dirrm lib/siag/xcommon
+@dirrm lib/siag/pw/examples
+@dirrm lib/siag/pw/docs
+@dirrm lib/siag/pw
+@dirrm lib/siag/egon/examples
+@dirrm lib/siag/egon/docs
+@dirrm lib/siag/egon
+@dirrm lib/siag/common/docs
+@dirrm lib/siag/common/bitmaps
+@dirrm lib/siag/common
+@dirrm lib/siag