update to 0.7.0

Changes:
dozens of bugfixes and enhancements. Among other things, embedding images is
now possible, as well as setting background images for the plots. Clipboard for
plots: copy a plot, and paste it on a different plot window. Improved
PostScript and WYSIWYG. It includes pysga.py, a Python module for interacting
with plots and worksheets from the terminal. New scheme for storing numerical
data in worksheets.
Examples are included.

5 files changed, 99 insertions, 29 deletions

diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 1370e4a147c..5699936f7d4 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/04/28 14:34:12 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2001/07/11 10:39:09 drochner Exp $
 #
 
-DISTNAME=	sg-0.6.3
-PKGNAME=	scigraphica-0.6.3
+DISTNAME=	sg-0.7.0
+PKGNAME=	scigraphica-0.7.0
 CATEGORIES=	graphics math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scigraphica/}
 
@@ -14,14 +14,16 @@ DEPENDS+=	gtk+-*:../../x11/gtk
 DEPENDS+=	gtk+extra>=0.99.14:../../x11/gtk+extra
 DEPENDS+=	imlib-*:../../graphics/imlib
 DEPENDS+=	libxml-*:../../textproc/libxml
-DEPENDS+=	python-*:../../lang/python
 DEPENDS+=	py-Numeric-*:../../math/py-Numeric
 DEPENDS+=	readline>=4.0:../../devel/readline
 
 USE_X11=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+=	--without-gnome
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+USE_PYTHON=	yes
+PY_PATCHPLIST=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/scigraphica/distinfo b/graphics/scigraphica/distinfo
index bd1d1a23444..01a8332c882 100644
--- a/graphics/scigraphica/distinfo
+++ b/graphics/scigraphica/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/04/28 14:34:12 drochner Exp $
+$NetBSD: distinfo,v 1.4 2001/07/11 10:39:09 drochner Exp $
 
-SHA1 (sg-0.6.3.tar.gz) = 59e376cbde03487de5be81bbf89a2b04c29a061f
-Size (sg-0.6.3.tar.gz) = 592835 bytes
-SHA1 (patch-ab) = 99b38611c7afc8ebab2f60fc2a12285b96442563
+SHA1 (sg-0.7.0.tar.gz) = 2b5e07f4e6aacfbf6ca51f3f54e96debe8ed1f42
+Size (sg-0.7.0.tar.gz) = 677749 bytes
+SHA1 (patch-ab) = a8b55efd65d773785247c1c798fdcd1925ae0385
+SHA1 (patch-ac) = 603070a4dbdd2d98f94786408218d056eff9b8f4
diff --git a/graphics/scigraphica/patches/patch-ab b/graphics/scigraphica/patches/patch-ab
index 84e09e74819..9b963b411c8 100644
--- a/graphics/scigraphica/patches/patch-ab
+++ b/graphics/scigraphica/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/01/15 12:37:57 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2001/07/11 10:39:10 drochner Exp $
 
---- src/Makefile.in.orig	Tue Dec  5 17:06:49 2000
-+++ src/Makefile.in	Wed Dec 13 15:36:26 2000
-@@ -139,7 +139,7 @@
+--- src/Makefile.in.orig	Mon Jul  2 23:02:06 2001
++++ src/Makefile.in	Tue Jul 10 13:52:18 2001
+@@ -151,7 +151,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
  CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 +LDFLAGS = @LDFLAGS@ -export-dynamic
- sga_OBJECTS =  sg.o sg_arrange_dialog.o sg_axis_dialog.o sg_clipboard.o \
- sg_column_dialog.o sg_dataset.o sg_dataset_dialog.o sg_dialogs.o \
- sg_edit_function_dialog.o sg_ellipse_dialog.o sg_entry.o sg_file.o \
+ sga_OBJECTS =  gtkpixmapmenuitem.o sg.o sg_arrange_dialog.o \
+ sg_axis_dialog.o sg_clipboard.o sg_column_dialog.o sg_dataset.o \
+ sg_dataset_dialog.o sg_dialogs.o sg_edit_function_dialog.o \
diff --git a/graphics/scigraphica/patches/patch-ac b/graphics/scigraphica/patches/patch-ac
new file mode 100644
index 00000000000..eab7012e334
--- /dev/null
+++ b/graphics/scigraphica/patches/patch-ac
@@ -0,0 +1,41 @@
+$NetBSD: patch-ac,v 1.1 2001/07/11 10:39:10 drochner Exp $
+
+--- zvt/subshell.c.orig	Tue Jul 10 16:53:42 2001
++++ zvt/subshell.c	Tue Jul 10 16:54:32 2001
+@@ -242,6 +242,7 @@
+ }
+ #endif
+ 
++#if 0
+ static int
+ path_max (void)
+ {
+@@ -255,7 +256,7 @@
+ #  endif
+ #endif
+ }
+-
++#endif
+ 
+ static struct termios*
+ init_term_with_defaults(struct termios* term)
+@@ -423,18 +424,15 @@
+ static void *
+ get_ptys (int *master, int *slave, int update_wutmp)
+ {
+-	GnomePtyOps op;
+ 	int result, n;
+ 	void *tag;
+ 	struct termios term;	
+-        char *term_name;
+ 
+ //	*master = receive_fd (helper_socket_fdpassing [0]);
+ //	*slave  = receive_fd (helper_socket_fdpassing [0]);
+ 
+-        term_name = ((char *) alloca (path_max())) + 1;
+ 	init_term_with_defaults(&term);
+-	openpty (master, slave, term_name, &term, NULL);
++	openpty (master, slave, 0, &term, NULL);
+         tag=master;
+ 	return tag;
+ }
diff --git a/graphics/scigraphica/pkg/PLIST b/graphics/scigraphica/pkg/PLIST
index 063e90a9783..f4f3ba024dd 100644
--- a/graphics/scigraphica/pkg/PLIST
+++ b/graphics/scigraphica/pkg/PLIST
@@ -1,15 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2001/03/10 12:41:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/07/11 10:39:10 drochner Exp $
 bin/sga
-share/examples/3d.sg
-share/examples/multicolumn.sg
-share/examples/polar.sg
-share/examples/simpletest.sg
-share/examples/ticks.sg
-share/examples/trigonometric.sg
-share/examples/vectors.sg
-share/examples/test.dat
+share/gnome/apps/Applications/sg.desktop
+share/gnome/help/scigraphica/C/FAQ.html
+share/gnome/help/scigraphica/C/Introduction.html
+share/gnome/help/scigraphica/C/Tutorial.html
+share/gnome/help/scigraphica/C/UserGuide.html
+share/gnome/help/scigraphica/C/topic.dat
 share/pixmaps/2d_small.xpm
 share/pixmaps/3d_small.xpm
+share/pixmaps/about_small.xpm
 share/pixmaps/add_column.xpm
 share/pixmaps/arrange.xpm
 share/pixmaps/arrow.xpm
@@ -20,8 +19,9 @@ share/pixmaps/arrow_right.xpm
 share/pixmaps/arrow_up.xpm
 share/pixmaps/autoscale.xpm
 share/pixmaps/bold.xpm
+share/pixmaps/book_small.xpm
 share/pixmaps/bullet.xpm
-share/pixmaps/center.xpm
+share/pixmaps/button_ok.xpm
 share/pixmaps/color.xpm
 share/pixmaps/control.xpm
 share/pixmaps/copy.xpm
@@ -29,10 +29,12 @@ share/pixmaps/cut.xpm
 share/pixmaps/dennied.xpm
 share/pixmaps/empty.xpm
 share/pixmaps/error.xpm
+share/pixmaps/exec_small.xpm
+share/pixmaps/exit_small.xpm
+share/pixmaps/eye.xpm
 share/pixmaps/fitpage.xpm
 share/pixmaps/folder.xpm
 share/pixmaps/font.xpm
-share/pixmaps/font_large.xpm
 share/pixmaps/function_small.xpm
 share/pixmaps/g_2dlayer.xpm
 share/pixmaps/g_3dcontour.xpm
@@ -60,7 +62,6 @@ share/pixmaps/g_surface.xpm
 share/pixmaps/g_vectors.xpm
 share/pixmaps/italic.xpm
 share/pixmaps/layer.xpm
-share/pixmaps/left.xpm
 share/pixmaps/logo.xpm
 share/pixmaps/new.xpm
 share/pixmaps/new_2d.xpm
@@ -72,25 +73,32 @@ share/pixmaps/new_plot.xpm
 share/pixmaps/new_polar.xpm
 share/pixmaps/new_polar_small.xpm
 share/pixmaps/new_sheet.xpm
+share/pixmaps/new_small.xpm
 share/pixmaps/open.xpm
+share/pixmaps/open_small.xpm
 share/pixmaps/paint.xpm
 share/pixmaps/paste.xpm
+share/pixmaps/pixmaps.h
 share/pixmaps/plot_icon.xpm
 share/pixmaps/plot_icon2.xpm
 share/pixmaps/plot_small.xpm
 share/pixmaps/point.xpm
 share/pixmaps/pointers.xpm
 share/pixmaps/polar_small.xpm
+share/pixmaps/preferences_small.xpm
 share/pixmaps/print.xpm
+share/pixmaps/python_small.xpm
 share/pixmaps/reload.xpm
 share/pixmaps/reset.xpm
-share/pixmaps/right.xpm
 share/pixmaps/rotate_x.xpm
 share/pixmaps/rotate_y.xpm
 share/pixmaps/rotate_z.xpm
 share/pixmaps/save.xpm
 share/pixmaps/save_as.xpm
+share/pixmaps/save_as_small.xpm
+share/pixmaps/save_small.xpm
 share/pixmaps/sg.xpm
+share/pixmaps/sg_small.xpm
 share/pixmaps/sheet_icon.xpm
 share/pixmaps/sheet_icon2.xpm
 share/pixmaps/sheet_small.xpm
@@ -115,5 +123,23 @@ share/pixmaps/warning.xpm
 share/pixmaps/zoom.xpm
 share/pixmaps/zoom_minus.xpm
 share/pixmaps/zoom_plus.xpm
+share/pixmaps/zoomin.xpm
+share/pixmaps/zoomout.xpm
 share/pixmaps/sg_icon.xpm
-share/gnome/apps/Applications/sg.desktop
+share/scigraphica/examples/3d.sg
+share/scigraphica/examples/image.sg
+share/scigraphica/examples/multicolumn.sg
+share/scigraphica/examples/polar.sg
+share/scigraphica/examples/py_example1.py
+share/scigraphica/examples/py_example2.py
+share/scigraphica/examples/simpletest.sg
+share/scigraphica/examples/test.dat
+share/scigraphica/examples/ticks.sg
+share/scigraphica/examples/trigonometric.sg
+share/scigraphica/examples/vectors.sg
+PYSITELIB/pysga.py
+PYSITELIB/gtkLeastSquares.py
+@dirrm share/gnome/help/scigraphica/C
+@dirrm share/gnome/help/scigraphica
+@dirrm share/scigraphica/examples
+@dirrm share/scigraphica