Update to 0.8.0. Makes it build again with current gtk+extra, fixing

bulk build failure.
Changes since 0.7.0 (approximate, since the ChangeLog is not very tidy):
11/20/2001  Adrian Feiguin:
	    Gtkextra fine tunning.
	    Matrix support.
	    New cloning strategy for supporting multiple copies of the
	    same dataset.
	    Using gtkplot iterators to retrieve data from worksheets.
	    New tick labels strategy using callback functions.
	    gtkplotart.[ch]: gtkplotpc driver for libart.
	    Anlialiasing using libart.
	    gtkplotgnome.[ch]: gtkplotpc driver for gnome-print.
	    Print preview using gnome-print, still under developement.
	    Custom page size.
	    Layer size in different units.
	    Matrix datasets: bubbles, surfaces, contours and density maps.
	    Symbol scaling for bubbles, boxes, and vectors.
	    Style dialog for new features included in the gtkextra widgets.
	    New fields in the xml file to support additions.
	    Example matrix.sg to show new features.
	    Autoscaling fixes, toghether with Conrad.
	    Gradient autoscaling.
	    New rotations for 3D plots.
	    Arbitrary meshes using Delaunay triangulizations.
	    Enhancements in the GUI, new tools and icons.
	    Data markers, still under developement.
	    Fixes in clipboard.
	    Bugfixes.

	    Randolf Mock:
	    New autoscaling icon.

11/19/2001  Rob Lahaye:
            src/sg_project_rescue.c: revised version, uses sigaction(..) instead of
                                     signal(..) and gtk_idle_add for bailout signals.

11/13/2001  Rob Lahaye:
            src/sg_project_file_sax.c
            src/sg_project_autosave.c: add filename check for newer versions
                                       of autosaved or rescued file.
            src/Makefile.am: remove the sga->scigraphica link.


10/19/2001  Rob Lahaye:
            src/sg_file.c: fix disappearing python terminal

10/10/2001  Conrad Steenberg:
            Matrix formula support
            Autoscaling of 2D layers configuration support
            Remove dumb warnings in some places
            Fix 'formulas not evaluated upon file load' bug
            Update Clarens plugin to import Tags

10/05/2001  Rob lahaye:
            src/*[ch]: Clean up with stricter coding related to the source vs. header files:
                          - functions in source files declared as static where possible.
                          - strictly applying the extern/global/static rules to variable declarations.
                       Allow strong type checking by making the src-tree g++ compatible.

09/30/2001  Rob Lahaye:
            src/python/import_data.c
            src/python/python_sheet.c: use #ifdef WITH_WARNINGS for developers' warnings
            src/python/python_int.c
            src/python/unpickler.py: change .sgsconfig to .scigrahpica/config

09/29/2001  Rob Lahaye:
            src/sg_preferences_dialog.[ch] : void -> static void
            src/g_project_autosave.c : new file with autosave utilities
            src/Makefile.am : add sg_project_autosave.c
	    src/main.h
	    src/sg.c
	    src/sg_project.h
	    src/sg_project_menu.c
	    src/sg_project_rescue.c
	    src/python/python_int.c : add autosave utilities

09/26/2001  Rob Lahaye:
            Configure.in: Remove duplicate entries in the "Compiler flags"
              of the --version output.

09/13/2001  Conrad Steenberg:
            Adapt the FitWizard module to fit data in plots, and plot the
                resulting function in the same layer.
            Python methods to access the datasets in a layer.

08/22/2001  Conrad Steenberg:
            Plug-in documentation
            New configuration system with python bindings
            Python wizard interface
            Curve fitting wizard from Adrian's gtkLeastSquares plug-in
            Simple statistics plug-in
            New python bindings to access layers and datasets

08/01/2001 Rob Lahaye:
	    sg_dialogs.h, sg_file_dialog.c, sg_project_menu.c:
	        WINDOWCLOSE_CLICKED added to dialogs control
	    sg_entry.c: remove redudant emumerate YES/NO/CANCEL_CLICKED
	    sg_plot_menu.c: add selected layer nr in sg_menu_remove_layer

07/31/2001  Conrad Steenberg:
            Cells are now cleared before new content is added.
            Fixes to number editing in the sheet for non-formula numbers.
            UI fixes for renaming sheets.
            Icons are now installed during 'make install' for use by
            plugins.

07/26/2001  *********  0.7.1 Released ********

07/25/2001 Adrian Feiguin:
	    Bugfixes in gtkextra
	    Enhancements in plugin system
	    Bugfixes in autosymbol
	    Bugfixes in zoom

           Conrad Steenberg:
	    More Python stuff
	    More enhancements in plugin system
            ASCII import fixes for comments at the start of a file.

07/17/2001 Adrian Feiguin:
	    New plugin system (C stuff)
	    Bugfixes in sg_project_file_sax.c
	    Bugfixes in text dialog
	    Bugfixes in gtkextra

           Conrad Steenberg:
	    New plugin system (Python stuff)
            Python call to obtain sheet selection area
            Terminal fixes:
               No more text droppings when closing.
               Prompt now correctly appears after error output, not before
            Python wizard creation framework
            Work around Numeric Python 20.1 bugs, which caused crases
               for a lot of people
            New Configuration option: module search paths.

6 files changed, 206 insertions, 177 deletions

diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index dc497278c3b..b60835ab1af 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2002/01/19 16:06:39 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2002/01/24 19:24:03 wiz Exp $
 #
 
-DISTNAME=	sg-0.7.0
-PKGNAME=	scigraphica-0.7.0
+DISTNAME=	scigraphica-0.8.0
 CATEGORIES=	graphics math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scigraphica/}
 
@@ -10,21 +9,20 @@ MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://scigraphica.sourceforge.net/
 COMMENT=	data analysis and technical graphics
 
-DEPENDS+=	gtk+-[0-9]*:../../x11/gtk
-DEPENDS+=	gtk+extra>=0.99.14:../../x11/gtk+extra
-DEPENDS+=	imlib-[0-9]*:../../graphics/imlib
-DEPENDS+=	libxml-[0-9]*:../../textproc/libxml
-DEPENDS+=	readline>=4.0:../../devel/readline
-
-USE_X11=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	YES
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-gnome
-CONFIGURE_ENV+=	PYTHONBIN=${PYTHONBIN}
-USE_LIBTOOL=	yes
+CONFIGURE_ENV+=		PYTHONBIN=${PYTHONBIN}
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-PY_PATCHPLIST=	yes
+PY_PATCHPLIST=		YES
 
+.include "../../devel/readline/buildlink.mk"
+.include "../../graphics/imlib/buildlink.mk"
 .include "../../lang/python/application.buildlink.mk"
 .include "../../math/py-Numeric/buildlink.mk"
+.include "../../textproc/libxml/buildlink.mk"
+.include "../../x11/gtk/buildlink.mk"
+.include "../../x11/gtk+extra/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/scigraphica/PLIST b/graphics/scigraphica/PLIST
index 22b4a1fff04..898fe8b4b88 100644
--- a/graphics/scigraphica/PLIST
+++ b/graphics/scigraphica/PLIST
@@ -1,133 +1,159 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:57 zuntum Exp $
-bin/sga
+@comment $NetBSD: PLIST,v 1.2 2002/01/24 19:24:04 wiz Exp $
+bin/scigraphica
 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/Modules-1.html
+share/gnome/help/scigraphica/C/Modules-2.html
+share/gnome/help/scigraphica/C/Modules.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
-share/pixmaps/arrow2.xpm
-share/pixmaps/arrow_down.xpm
-share/pixmaps/arrow_left.xpm
-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/button_ok.xpm
-share/pixmaps/color.xpm
-share/pixmaps/control.xpm
-share/pixmaps/copy.xpm
-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/function_small.xpm
-share/pixmaps/g_2dlayer.xpm
-share/pixmaps/g_3dcontour.xpm
-share/pixmaps/g_3dlayer.xpm
-share/pixmaps/g_bars.xpm
-share/pixmaps/g_boxes.xpm
-share/pixmaps/g_bubbles.xpm
-share/pixmaps/g_bubbles3d.xpm
-share/pixmaps/g_colors.xpm
-share/pixmaps/g_colors3d.xpm
-share/pixmaps/g_contour.xpm
-share/pixmaps/g_csurface.xpm
-share/pixmaps/g_density.xpm
-share/pixmaps/g_flux3d.xpm
-share/pixmaps/g_function.xpm
-share/pixmaps/g_hbars.xpm
-share/pixmaps/g_hbox.xpm
-share/pixmaps/g_impulses.xpm
-share/pixmaps/g_lines.xpm
-share/pixmaps/g_lpoints.xpm
-share/pixmaps/g_python.xpm
-share/pixmaps/g_scatter.xpm
-share/pixmaps/g_scatter3d.xpm
-share/pixmaps/g_surface.xpm
-share/pixmaps/g_vectors.xpm
-share/pixmaps/italic.xpm
-share/pixmaps/layer.xpm
-share/pixmaps/logo.xpm
-share/pixmaps/new.xpm
-share/pixmaps/new_2d.xpm
-share/pixmaps/new_2d_small.xpm
-share/pixmaps/new_3d.xpm
-share/pixmaps/new_3d_small.xpm
-share/pixmaps/new_function.xpm
-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/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
-share/pixmaps/sorry.xpm
-share/pixmaps/symbol_circle.xpm
-share/pixmaps/symbol_cross.xpm
-share/pixmaps/symbol_diamond.xpm
-share/pixmaps/symbol_dntriangle.xpm
-share/pixmaps/symbol_dot.xpm
-share/pixmaps/symbol_impulse.xpm
-share/pixmaps/symbol_ltriangle.xpm
-share/pixmaps/symbol_none.xpm
-share/pixmaps/symbol_plus.xpm
-share/pixmaps/symbol_rtriangle.xpm
-share/pixmaps/symbol_square.xpm
-share/pixmaps/symbol_star.xpm
-share/pixmaps/symbol_uptriangle.xpm
-share/pixmaps/target.xpm
-share/pixmaps/text.xpm
-share/pixmaps/tools.xpm
-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/scigraphica/2d_small.xpm
+share/pixmaps/scigraphica/3d_small.xpm
+share/pixmaps/scigraphica/about_small.xpm
+share/pixmaps/scigraphica/add_column.xpm
+share/pixmaps/scigraphica/arrange.xpm
+share/pixmaps/scigraphica/arrow.xpm
+share/pixmaps/scigraphica/arrow2.xpm
+share/pixmaps/scigraphica/arrow_down.xpm
+share/pixmaps/scigraphica/arrow_left.xpm
+share/pixmaps/scigraphica/arrow_right.xpm
+share/pixmaps/scigraphica/arrow_up.xpm
+share/pixmaps/scigraphica/as.xpm
+share/pixmaps/scigraphica/autoscale.xpm
+share/pixmaps/scigraphica/bold.xpm
+share/pixmaps/scigraphica/book_small.xpm
+share/pixmaps/scigraphica/bullet.xpm
+share/pixmaps/scigraphica/button_ok.xpm
+share/pixmaps/scigraphica/color.xpm
+share/pixmaps/scigraphica/control.xpm
+share/pixmaps/scigraphica/copy.xpm
+share/pixmaps/scigraphica/cut.xpm
+share/pixmaps/scigraphica/dennied.xpm
+share/pixmaps/scigraphica/empty.xpm
+share/pixmaps/scigraphica/error.xpm
+share/pixmaps/scigraphica/exec_small.xpm
+share/pixmaps/scigraphica/exit_small.xpm
+share/pixmaps/scigraphica/eye.xpm
+share/pixmaps/scigraphica/fit5.xpm
+share/pixmaps/scigraphica/fit_page.xpm
+share/pixmaps/scigraphica/fitpage.xpm
+share/pixmaps/scigraphica/folder.xpm
+share/pixmaps/scigraphica/font.xpm
+share/pixmaps/scigraphica/function_small.xpm
+share/pixmaps/scigraphica/g_2dlayer.xpm
+share/pixmaps/scigraphica/g_3dcontour.xpm
+share/pixmaps/scigraphica/g_3dlayer.xpm
+share/pixmaps/scigraphica/g_bars.xpm
+share/pixmaps/scigraphica/g_boxes.xpm
+share/pixmaps/scigraphica/g_bubbles.xpm
+share/pixmaps/scigraphica/g_bubbles3d.xpm
+share/pixmaps/scigraphica/g_colors.xpm
+share/pixmaps/scigraphica/g_colors3d.xpm
+share/pixmaps/scigraphica/g_contour.xpm
+share/pixmaps/scigraphica/g_csurface.xpm
+share/pixmaps/scigraphica/g_density.xpm
+share/pixmaps/scigraphica/g_flux3d.xpm
+share/pixmaps/scigraphica/g_function.xpm
+share/pixmaps/scigraphica/g_hbars.xpm
+share/pixmaps/scigraphica/g_hbox.xpm
+share/pixmaps/scigraphica/g_impulses.xpm
+share/pixmaps/scigraphica/g_lines.xpm
+share/pixmaps/scigraphica/g_lpoints.xpm
+share/pixmaps/scigraphica/g_python.xpm
+share/pixmaps/scigraphica/g_scatter.xpm
+share/pixmaps/scigraphica/g_scatter3d.xpm
+share/pixmaps/scigraphica/g_surface.xpm
+share/pixmaps/scigraphica/g_vectors.xpm
+share/pixmaps/scigraphica/italic.xpm
+share/pixmaps/scigraphica/layer.xpm
+share/pixmaps/scigraphica/layer_control.xpm
+share/pixmaps/scigraphica/logo.xpm
+share/pixmaps/scigraphica/markers.xpm
+share/pixmaps/scigraphica/matrix_icon.xpm
+share/pixmaps/scigraphica/new.xpm
+share/pixmaps/scigraphica/new_2d.xpm
+share/pixmaps/scigraphica/new_2d_small.xpm
+share/pixmaps/scigraphica/new_3d.xpm
+share/pixmaps/scigraphica/new_3d_small.xpm
+share/pixmaps/scigraphica/new_function.xpm
+share/pixmaps/scigraphica/new_plot.xpm
+share/pixmaps/scigraphica/new_polar.xpm
+share/pixmaps/scigraphica/new_polar_small.xpm
+share/pixmaps/scigraphica/new_sheet.xpm
+share/pixmaps/scigraphica/new_small.xpm
+share/pixmaps/scigraphica/open.xpm
+share/pixmaps/scigraphica/open_small.xpm
+share/pixmaps/scigraphica/paint.xpm
+share/pixmaps/scigraphica/paste.xpm
+share/pixmaps/scigraphica/pixmaps.h
+share/pixmaps/scigraphica/plot_icon.xpm
+share/pixmaps/scigraphica/plot_icon2.xpm
+share/pixmaps/scigraphica/plot_small.xpm
+share/pixmaps/scigraphica/point.xpm
+share/pixmaps/scigraphica/pointers.xpm
+share/pixmaps/scigraphica/polar_small.xpm
+share/pixmaps/scigraphica/preferences_small.xpm
+share/pixmaps/scigraphica/print.xpm
+share/pixmaps/scigraphica/python_small.xpm
+share/pixmaps/scigraphica/reload.xpm
+share/pixmaps/scigraphica/reset.xpm
+share/pixmaps/scigraphica/rotate_x.xpm
+share/pixmaps/scigraphica/rotate_y.xpm
+share/pixmaps/scigraphica/rotate_z.xpm
+share/pixmaps/scigraphica/save.xpm
+share/pixmaps/scigraphica/save_as.xpm
+share/pixmaps/scigraphica/save_as_small.xpm
+share/pixmaps/scigraphica/save_small.xpm
+share/pixmaps/scigraphica/set_column.xpm
+share/pixmaps/scigraphica/sg.xpm
+share/pixmaps/scigraphica/sg_icon.xpm
+share/pixmaps/scigraphica/sg_small.xpm
+share/pixmaps/scigraphica/sheet_icon.xpm
+share/pixmaps/scigraphica/sheet_icon2.xpm
+share/pixmaps/scigraphica/sheet_small.xpm
+share/pixmaps/scigraphica/sorry.xpm
+share/pixmaps/scigraphica/stock_button_apply.xpm
+share/pixmaps/scigraphica/stock_button_cancel.xpm
+share/pixmaps/scigraphica/stock_button_close.xpm
+share/pixmaps/scigraphica/stock_button_no.xpm
+share/pixmaps/scigraphica/stock_button_ok.xpm
+share/pixmaps/scigraphica/stock_button_yes.xpm
+share/pixmaps/scigraphica/stock_down_arrow.xpm
+share/pixmaps/scigraphica/stock_font.xpm
+share/pixmaps/scigraphica/stock_help.xpm
+share/pixmaps/scigraphica/stock_left_arrow.xpm
+share/pixmaps/scigraphica/stock_open.xpm
+share/pixmaps/scigraphica/stock_pixmaps.h
+share/pixmaps/scigraphica/stock_right_arrow.xpm
+share/pixmaps/scigraphica/stock_up_arrow.xpm
+share/pixmaps/scigraphica/symbol_circle.xpm
+share/pixmaps/scigraphica/symbol_cross.xpm
+share/pixmaps/scigraphica/symbol_diamond.xpm
+share/pixmaps/scigraphica/symbol_dntriangle.xpm
+share/pixmaps/scigraphica/symbol_dot.xpm
+share/pixmaps/scigraphica/symbol_impulse.xpm
+share/pixmaps/scigraphica/symbol_ltriangle.xpm
+share/pixmaps/scigraphica/symbol_none.xpm
+share/pixmaps/scigraphica/symbol_plus.xpm
+share/pixmaps/scigraphica/symbol_rtriangle.xpm
+share/pixmaps/scigraphica/symbol_square.xpm
+share/pixmaps/scigraphica/symbol_star.xpm
+share/pixmaps/scigraphica/symbol_uptriangle.xpm
+share/pixmaps/scigraphica/target.xpm
+share/pixmaps/scigraphica/text.xpm
+share/pixmaps/scigraphica/tools.xpm
+share/pixmaps/scigraphica/warning.xpm
+share/pixmaps/scigraphica/zoom.xpm
+share/pixmaps/scigraphica/zoom_minus.xpm
+share/pixmaps/scigraphica/zoom_plus.xpm
+share/pixmaps/scigraphica/zoomin.xpm
+share/pixmaps/scigraphica/zoomout.xpm
 share/pixmaps/sg_icon.xpm
 share/scigraphica/examples/3d.sg
 share/scigraphica/examples/image.sg
+share/scigraphica/examples/matrix.sg
 share/scigraphica/examples/multicolumn.sg
 share/scigraphica/examples/polar.sg
 share/scigraphica/examples/py_example1.py
@@ -137,9 +163,20 @@ 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
+share/scigraphica/python/FitWizard.py
+share/scigraphica/python/SimpleStats.py
+share/scigraphica/python/clarens.py
+share/scigraphica/python/clarens_histograms.py
+share/scigraphica/python/gtkLeastSquares.py
+share/scigraphica/python/pstat.py
+share/scigraphica/python/pysga.py
+share/scigraphica/python/sgagtk.py
+share/scigraphica/python/stats.py
+share/scigraphica/python/test_plugin.py
+share/scigraphica/python/unpickler.py
+@dirrm share/scigraphica/python
 @dirrm share/scigraphica/examples
 @dirrm share/scigraphica
+@dirrm share/pixmaps/scigraphica
+@dirrm share/gnome/help/scigraphica/C
+@dirrm share/gnome/help/scigraphica
diff --git a/graphics/scigraphica/distinfo b/graphics/scigraphica/distinfo
index a6648fecf5c..e04b2e78b20 100644
--- a/graphics/scigraphica/distinfo
+++ b/graphics/scigraphica/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/01/19 16:06:40 drochner Exp $
+$NetBSD: distinfo,v 1.6 2002/01/24 19:24:04 wiz Exp $
 
-SHA1 (sg-0.7.0.tar.gz) = 2b5e07f4e6aacfbf6ca51f3f54e96debe8ed1f42
-Size (sg-0.7.0.tar.gz) = 677749 bytes
-SHA1 (patch-aa) = f63d16069f94d3c8f9f803edac256410cfe2d677
-SHA1 (patch-ab) = a8b55efd65d773785247c1c798fdcd1925ae0385
-SHA1 (patch-ac) = 603070a4dbdd2d98f94786408218d056eff9b8f4
+SHA1 (scigraphica-0.8.0.tar.gz) = 7a3b932f4e5de39bbf815c0e5629005e3c209421
+Size (scigraphica-0.8.0.tar.gz) = 841199 bytes
+SHA1 (patch-aa) = 5cd12c4adaa496bafc6bb68c57575a4e35d3913a
+SHA1 (patch-ab) = f96a2bf4d9ac22e9ec9c467b010f9f9cf4a642d5
+SHA1 (patch-ac) = c105e7f5ac410bbce44df667594b70cfdba825af
diff --git a/graphics/scigraphica/patches/patch-aa b/graphics/scigraphica/patches/patch-aa
index 03de6a66536..3d2e545d444 100644
--- a/graphics/scigraphica/patches/patch-aa
+++ b/graphics/scigraphica/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2002/01/19 16:06:41 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2002/01/24 19:24:04 wiz Exp $
 
---- configure.orig	Sat Jan 19 16:52:07 2002
-+++ configure	Sat Jan 19 16:58:08 2002
-@@ -4035,35 +4035,7 @@
+--- configure.orig	Fri Nov 30 18:01:37 2001
++++ configure
+@@ -7826,35 +7826,7 @@
  EOF
  
  
 -# Extract the first word of "python", so it can be a program name with args.
 -set dummy python; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:4042: checking for $ac_word" >&5
+-echo "configure:7833: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_prog_python_val'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.4 2002/01/19 16:06:41 drochner Exp $
  
  numpy=false
  
-@@ -4084,8 +4056,8 @@
+@@ -7875,16 +7847,16 @@
  fi
  
            if test x$python_prefix = x; then 
@@ -48,23 +48,15 @@ $NetBSD: patch-aa,v 1.4 2002/01/19 16:06:41 drochner Exp $
 +           PY_PREFIX=`${PYTHONBIN} -c 'import sys ; print sys.prefix'`
 +           PY_EXEC_PREFIX=`${PYTHONBIN} -c 'import sys ; print sys.exec_prefix'`
            else
-            echo "Using elternative python installation under $python_prefix"
+            echo "Using alternative python installation under $python_prefix"
             PY_PREFIX=$python_prefix
-@@ -4093,13 +4065,13 @@
+            PY_EXEC_PREFIX=$python_prefix
            fi
  
- 	            echo PY_PREFIX=$PY_PREFIX
--	  PY_VERSION=`python -c 'import sys ; print sys.version[0:3]'`
+-	  	  PY_VERSION=`python -c 'import sys ; print sys.version[0:3]'`
 -          PY_VVERSION=`python -c 'import sys ; print sys.version[0:5]'`
-+	  PY_VERSION=`${PYTHONBIN} -c 'import sys ; print sys.version[0:3]'`
++	  	  PY_VERSION=`${PYTHONBIN} -c 'import sys ; print sys.version[0:3]'`
 +          PY_VVERSION=`${PYTHONBIN} -c 'import sys ; print sys.version[0:5]'`
- 	  	  if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
+ 	            echo "Searching for arrayobject.h"
+ 	  if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
  		  PY_LIBS="python$PY_VERSION"
- 		  PY_LIB_LOC="$PY_EXEC_PREFIX/lib/python$PY_VERSION/"
--                  array_loc=`find $PY_PREFIX/ -name arrayobject.h | sed s/arrayobject\.h//`
--#                  array_loc=`find $PY_PREFIX/include/python$PY_VERSION/ -name arrayobject.h | sed s/arrayobject\.h//`
-+#                  array_loc=`find $PY_PREFIX/ -name arrayobject.h | sed s/arrayobject\.h//`
-+                  array_loc=`find $PY_PREFIX/include/python$PY_VERSION/ -name arrayobject.h | sed s/arrayobject\.h//`
-                   echo arrayobject.h location: $array_loc
-                   PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
-                   if  test -n $array_loc; then
diff --git a/graphics/scigraphica/patches/patch-ab b/graphics/scigraphica/patches/patch-ab
index 9b963b411c8..760a68083f9 100644
--- a/graphics/scigraphica/patches/patch-ab
+++ b/graphics/scigraphica/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2001/07/11 10:39:10 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2002/01/24 19:24:04 wiz Exp $
 
---- 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 @@
+--- src/Makefile.in.orig	Fri Nov 30 18:03:38 2001
++++ src/Makefile.in
+@@ -161,7 +161,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
  CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 +LDFLAGS = @LDFLAGS@ -export-dynamic
- 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 \
+ scigraphica_OBJECTS =  gtkpixmapmenuitem.$(OBJEXT) gtkplotart.$(OBJEXT) \
+ gtkplotgnome.$(OBJEXT) sg.$(OBJEXT) sg_arrange_dialog.$(OBJEXT) \
+ sg_axis_dialog.$(OBJEXT) sg_clipboard.$(OBJEXT) \
diff --git a/graphics/scigraphica/patches/patch-ac b/graphics/scigraphica/patches/patch-ac
index eab7012e334..07dc2bacedf 100644
--- a/graphics/scigraphica/patches/patch-ac
+++ b/graphics/scigraphica/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2001/07/11 10:39:10 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2002/01/24 19:24:04 wiz Exp $
 
---- zvt/subshell.c.orig	Tue Jul 10 16:53:42 2001
-+++ zvt/subshell.c	Tue Jul 10 16:54:32 2001
+--- zvt/subshell.c.orig	Tue Nov 20 22:41:43 2001
++++ zvt/subshell.c
 @@ -242,6 +242,7 @@
  }
  #endif
@@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.1 2001/07/11 10:39:10 drochner Exp $
  
  static struct termios*
  init_term_with_defaults(struct termios* term)
-@@ -423,18 +424,15 @@
+@@ -423,20 +424,17 @@
  static void *
  get_ptys (int *master, int *slave, int update_wutmp)
  {
@@ -29,8 +29,10 @@ $NetBSD: patch-ac,v 1.1 2001/07/11 10:39:10 drochner Exp $
  	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);