Take two: Upgrade /math/guppi to 0.40.0

4 files changed, 149 insertions, 242 deletions

diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 431a831eeb7..8c578c3a774 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2001/10/05 19:04:24 tron Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/13 03:16:50 damon Exp $
 
-DISTNAME=	Guppi-0.35.5
-PKGNAME=	guppi-0.35.5nb1
+DISTNAME=	Guppi-0.40.0
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/Guppi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/math/guppi/PLIST b/math/guppi/PLIST
index 4af445375fd..28dd1c6b5e8 100644
--- a/math/guppi/PLIST
+++ b/math/guppi/PLIST
@@ -1,51 +1,40 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:33:37 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/11/13 03:16:50 damon Exp $
 bin/gnome-guile-repl
 bin/gnome-python-repl
-bin/guppi
+bin/guppi-gnumeric
 include/libguppi/delim-import-widget.h
-include/libguppi/ggraph.h
 include/libguppi/gnan.h
 include/libguppi/guppi-2d.h
 include/libguppi/guppi-alpha-template.h
-include/libguppi/guppi-array-impl.h
-include/libguppi/guppi-array.h
-include/libguppi/guppi-attributes.h
+include/libguppi/guppi-attribute-bag.h
+include/libguppi/guppi-attribute-flavor.h
 include/libguppi/guppi-axis-markers.h
 include/libguppi/guppi-basic-tools.h
-include/libguppi/guppi-bonobo-canned-demo.h
 include/libguppi/guppi-bonobo-print.h
 include/libguppi/guppi-bonobo-view.h
 include/libguppi/guppi-bonobo.h
 include/libguppi/guppi-canvas-group.h
 include/libguppi/guppi-canvas-item.h
-include/libguppi/guppi-category-impl.h
 include/libguppi/guppi-category.h
-include/libguppi/guppi-chart-type.h
-include/libguppi/guppi-color-gradient.h
+include/libguppi/guppi-color-palette.h
 include/libguppi/guppi-config-item.h
 include/libguppi/guppi-configure.h
-include/libguppi/guppi-context-xml.h
 include/libguppi/guppi-convenient.h
-include/libguppi/guppi-curve-fit.h
-include/libguppi/guppi-curve-impl.h
 include/libguppi/guppi-curve.h
-include/libguppi/guppi-data-attribute.h
-include/libguppi/guppi-data-impl-plug-in.h
-include/libguppi/guppi-data-impl.h
+include/libguppi/guppi-data-flavor.h
 include/libguppi/guppi-data-importer-plug-in.h
 include/libguppi/guppi-data-importer.h
 include/libguppi/guppi-data-init.h
-include/libguppi/guppi-data-multiselect.h
+include/libguppi/guppi-data-plug-in.h
 include/libguppi/guppi-data-popup.h
 include/libguppi/guppi-data-select.h
-include/libguppi/guppi-data-transform.h
+include/libguppi/guppi-data-socket.h
+include/libguppi/guppi-data-table.h
 include/libguppi/guppi-data-tree-view.h
 include/libguppi/guppi-data-tree.h
 include/libguppi/guppi-data-ui-init.h
 include/libguppi/guppi-data.h
-include/libguppi/guppi-date-indexed-impl.h
 include/libguppi/guppi-date-indexed.h
-include/libguppi/guppi-date-series-impl.h
 include/libguppi/guppi-date-series.h
 include/libguppi/guppi-debug.h
 include/libguppi/guppi-defaults.h
@@ -58,46 +47,41 @@ include/libguppi/guppi-element-state.h
 include/libguppi/guppi-element-view.h
 include/libguppi/guppi-embeddable.h
 include/libguppi/guppi-enums.h
-include/libguppi/guppi-equation-parser.h
-include/libguppi/guppi-equation.h
-include/libguppi/guppi-eval-init.h
 include/libguppi/guppi-exit.h
 include/libguppi/guppi-file.h
-include/libguppi/guppi-fit-slr.h
 include/libguppi/guppi-fn-wrapper.h
 include/libguppi/guppi-garray.h
 include/libguppi/guppi-geometry.h
 include/libguppi/guppi-gpl.h
 include/libguppi/guppi-group-state.h
+include/libguppi/guppi-group-view-layout.h
 include/libguppi/guppi-group-view.h
 include/libguppi/guppi-gsml.h
 include/libguppi/guppi-guile.h
+include/libguppi/guppi-hash.h
 include/libguppi/guppi-i18n.h
-include/libguppi/guppi-importer-xml.h
-include/libguppi/guppi-layout.h
+include/libguppi/guppi-layout-constraint.h
+include/libguppi/guppi-layout-engine.h
+include/libguppi/guppi-layout-rule-predef.h
+include/libguppi/guppi-layout-rule.h
 include/libguppi/guppi-marker.h
 include/libguppi/guppi-matrix.h
 include/libguppi/guppi-memory.h
 include/libguppi/guppi-metric-entry.h
 include/libguppi/guppi-metrics.h
 include/libguppi/guppi-multiview.h
-include/libguppi/guppi-parameters.h
 include/libguppi/guppi-paths.h
 include/libguppi/guppi-plot-init.h
 include/libguppi/guppi-plot-plug-in.h
 include/libguppi/guppi-plot-tool.h
 include/libguppi/guppi-plot-toolhelp.h
 include/libguppi/guppi-plot-toolkit.h
-include/libguppi/guppi-plot-window.h
 include/libguppi/guppi-plug-in-spec.h
 include/libguppi/guppi-plug-in.h
 include/libguppi/guppi-polynomial.h
-include/libguppi/guppi-price-series-impl.h
 include/libguppi/guppi-price-series.h
 include/libguppi/guppi-progress.h
 include/libguppi/guppi-python-data-ui.h
-include/libguppi/guppi-python-data.h
-include/libguppi/guppi-python-eval.h
 include/libguppi/guppi-python-plot.h
 include/libguppi/guppi-python-stat.h
 include/libguppi/guppi-python-useful.h
@@ -112,55 +96,31 @@ include/libguppi/guppi-root-group-state.h
 include/libguppi/guppi-root-group-tools.h
 include/libguppi/guppi-root-group-view.h
 include/libguppi/guppi-scm-data-ui.h
-include/libguppi/guppi-scm-data.h
-include/libguppi/guppi-scm-eval.h
 include/libguppi/guppi-scm-plot.h
 include/libguppi/guppi-scm-stat.h
 include/libguppi/guppi-scm-useful.h
 include/libguppi/guppi-scripting.h
-include/libguppi/guppi-seq-boolean-impl.h
 include/libguppi/guppi-seq-boolean.h
 include/libguppi/guppi-seq-categorical.h
-include/libguppi/guppi-seq-data.h
-include/libguppi/guppi-seq-date-impl.h
 include/libguppi/guppi-seq-date.h
-include/libguppi/guppi-seq-impl.h
-include/libguppi/guppi-seq-integer-impl.h
 include/libguppi/guppi-seq-integer.h
-include/libguppi/guppi-seq-object-impl.h
 include/libguppi/guppi-seq-object.h
-include/libguppi/guppi-seq-point-impl.h
-include/libguppi/guppi-seq-point.h
-include/libguppi/guppi-seq-scalar-impl.h
 include/libguppi/guppi-seq-scalar.h
-include/libguppi/guppi-seq-string-impl.h
 include/libguppi/guppi-seq-string.h
-include/libguppi/guppi-seq-style.h
 include/libguppi/guppi-seq.h
-include/libguppi/guppi-shared-hash.h
-include/libguppi/guppi-shared.h
 include/libguppi/guppi-simple-linreg.h
 include/libguppi/guppi-specfns.h
-include/libguppi/guppi-splash.h
 include/libguppi/guppi-stat-init.h
 include/libguppi/guppi-stream-preview.h
 include/libguppi/guppi-stream.h
 include/libguppi/guppi-string.h
-include/libguppi/guppi-struct-impl.h
 include/libguppi/guppi-struct.h
-include/libguppi/guppi-style.h
 include/libguppi/guppi-text-block.h
 include/libguppi/guppi-text-squeeze.h
 include/libguppi/guppi-text-tokens.h
 include/libguppi/guppi-timer.h
 include/libguppi/guppi-unique-id.h
 include/libguppi/guppi-useful.h
-include/libguppi/guppi-var-bool.h
-include/libguppi/guppi-var-data.h
-include/libguppi/guppi-var-double.h
-include/libguppi/guppi-var-int.h
-include/libguppi/guppi-var-private.h
-include/libguppi/guppi-var.h
 include/libguppi/guppi-vector.h
 include/libguppi/guppi-version.h
 include/libguppi/guppi-view-interval.h
@@ -172,51 +132,46 @@ include/libguppitank/guppi-object.h
 include/libguppitank/guppi-tank-init.h
 include/libguppitank/guppi-tank.h
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/category/core.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/category/guppi_category_core_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/category/guppi_category_core_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/category/guppi_category_core_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/calc-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/calc.plugin
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/func-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/func.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_calc_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_calc_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_calc_impl.so
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_func_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_func_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_func_impl.so
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_poly_impl.a
+lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_interpolate_impl.la
+lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_interpolate_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_poly_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_poly_impl.so
+lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/interpolate.plugin
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/poly.plugin
+lib/guppi/plug-ins/${PKGVERSION}/data_impl/data_table/core.plugin
+lib/guppi/plug-ins/${PKGVERSION}/data_impl/data_table/guppi_data_table_core.la
+lib/guppi/plug-ins/${PKGVERSION}/data_impl/data_table/guppi_data_table_core.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/calc-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/calc.plugin
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/core-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/core.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/guppi_date_series_calc_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/guppi_date_series_calc_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/guppi_date_series_calc_impl.so
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/guppi_date_series_core_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/guppi_date_series_core_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series/guppi_date_series_core_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/price_series/core.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/price_series/guppi_price_series_core_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/price_series/guppi_price_series_core_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/price_series/guppi_price_series_core_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_boolean/core.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_boolean/guppi_seq_boolean_core_impl.a
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_boolean/guppi_seq_boolean_core_impl.la
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_boolean/guppi_seq_boolean_core_impl.so
+lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_boolean/guppi_seq_boolean_core.la
+lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_boolean/guppi_seq_boolean_core.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_date/core.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_date/guppi_seq_date_core_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_date/guppi_seq_date_core_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_date/guppi_seq_date_core_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_integer/core.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_integer/guppi_seq_integer_core_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_integer/guppi_seq_integer_core_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_integer/guppi_seq_integer_core_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_object/core.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_object/guppi_seq_object_core_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_object/guppi_seq_object_core_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_object/guppi_seq_object_core_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/calc-pre.scm
@@ -224,249 +179,207 @@ lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/calc.plugin
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/core.plugin
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/func-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/func.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/guppi_seq_scalar_calc_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/guppi_seq_scalar_calc_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/guppi_seq_scalar_calc_impl.so
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/guppi_seq_scalar_core_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/guppi_seq_scalar_core_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/guppi_seq_scalar_core_impl.so
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/guppi_seq_scalar_func_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/guppi_seq_scalar_func_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar/guppi_seq_scalar_func_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_string/core.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_string/guppi_seq_string_core_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_string/guppi_seq_string_core_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_string/guppi_seq_string_core_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/struct/core.plugin
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/struct/guppi_struct_core_impl.a
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/struct/guppi_struct_core_impl.la
 lib/guppi/plug-ins/${PKGVERSION}/data_impl/struct/guppi_struct_core_impl.so
 lib/guppi/plug-ins/${PKGVERSION}/import/delimited/delimited-importer.glade
 lib/guppi/plug-ins/${PKGVERSION}/import/delimited/delimited.plugin
-lib/guppi/plug-ins/${PKGVERSION}/import/delimited/guppi_data_import_delimited.a
 lib/guppi/plug-ins/${PKGVERSION}/import/delimited/guppi_data_import_delimited.la
 lib/guppi/plug-ins/${PKGVERSION}/import/delimited/guppi_data_import_delimited.so
-lib/guppi/plug-ins/${PKGVERSION}/import/mative-XML/guppi_data_import_native_XML.a
-lib/guppi/plug-ins/${PKGVERSION}/import/mative-XML/guppi_data_import_native_XML.la
-lib/guppi/plug-ins/${PKGVERSION}/import/mative-XML/guppi_data_import_native_XML.so
-lib/guppi/plug-ins/${PKGVERSION}/import/mative-XML/native-xml.plugin
-lib/guppi/plug-ins/${PKGVERSION}/import/net-hist-quotes/guppi_data_import_net_hist_quotes.a
-lib/guppi/plug-ins/${PKGVERSION}/import/net-hist-quotes/guppi_data_import_net_hist_quotes.la
-lib/guppi/plug-ins/${PKGVERSION}/import/net-hist-quotes/guppi_data_import_net_hist_quotes.so
-lib/guppi/plug-ins/${PKGVERSION}/import/net-hist-quotes/net-hist-quotes-pre.scm
-lib/guppi/plug-ins/${PKGVERSION}/import/net-hist-quotes/net-hist-quotes.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/XLplots.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_bar_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_bar_1_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_bar_1_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_bar_2_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_bar_2_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_bar_2_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_bubble_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_column_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_column_1_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_column_1_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_column_2_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_column_2_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_column_2_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_column_3_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cone_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cone_1_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cone_1_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cone_2_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cone_2_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cone_2_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cone_3_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cylinder_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cylinder_1_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cylinder_1_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cylinder_2_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cylinder_2_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cylinder_2_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_cylinder_3_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_line_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_line_1_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_line_1_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_line_2_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_line_2_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_line_2_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_line_3_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pie_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pie_1_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pie_1_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pie_2_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pie_2_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pie_2_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pyramid_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pyramid_1_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pyramid_1_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pyramid_2_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pyramid_2_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pyramid_2_3.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_pyramid_3_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_scatter_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_scatter_2_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_scatter_2_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_scatter_3_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_scatter_3_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_stock_1_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_stock_1_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_stock_2_1.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/chart_stock_2_2.png
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/guppi_XLplots.a
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/guppi_XLplots.la
-lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots/guppi_XLplots.so
 lib/guppi/plug-ins/${PKGVERSION}/plot/axis/axis-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/axis/axis.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/axis/guppi_axis.a
 lib/guppi/plug-ins/${PKGVERSION}/plot/axis/guppi_axis.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/axis/guppi_axis.so
+lib/guppi/plug-ins/${PKGVERSION}/plot/background/background.plugin
+lib/guppi/plug-ins/${PKGVERSION}/plot/background/guppi_background.la
+lib/guppi/plug-ins/${PKGVERSION}/plot/background/guppi_background.so
 lib/guppi/plug-ins/${PKGVERSION}/plot/barchart/barchart-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/barchart/barchart-stackswap.png
 lib/guppi/plug-ins/${PKGVERSION}/plot/barchart/barchart.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/barchart/guppi_barchart.a
 lib/guppi/plug-ins/${PKGVERSION}/plot/barchart/guppi_barchart.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/barchart/guppi_barchart.so
 lib/guppi/plug-ins/${PKGVERSION}/plot/boxplot/boxplot-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/boxplot/boxplot.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/boxplot/guppi_boxplot.a
 lib/guppi/plug-ins/${PKGVERSION}/plot/boxplot/guppi_boxplot.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/boxplot/guppi_boxplot.so
 lib/guppi/plug-ins/${PKGVERSION}/plot/frame/frame-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/frame/frame.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/frame/guppi_frame.a
 lib/guppi/plug-ins/${PKGVERSION}/plot/frame/guppi_frame.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/frame/guppi_frame.so
-lib/guppi/plug-ins/${PKGVERSION}/plot/legend/guppi_legend.a
 lib/guppi/plug-ins/${PKGVERSION}/plot/legend/guppi_legend.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/legend/guppi_legend.so
 lib/guppi/plug-ins/${PKGVERSION}/plot/legend/legend-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/legend/legend.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/linegraph/guppi_linegraph.a
+lib/guppi/plug-ins/${PKGVERSION}/plot/linechart/guppi_linechart.la
+lib/guppi/plug-ins/${PKGVERSION}/plot/linechart/guppi_linechart.so
+lib/guppi/plug-ins/${PKGVERSION}/plot/linechart/linechart.plugin
 lib/guppi/plug-ins/${PKGVERSION}/plot/linegraph/guppi_linegraph.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/linegraph/guppi_linegraph.so
-lib/guppi/plug-ins/${PKGVERSION}/plot/linegraph/linegraph-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/linegraph/linegraph.plugin
 lib/guppi/plug-ins/${PKGVERSION}/plot/pie/guppi-pie-data.glade
 lib/guppi/plug-ins/${PKGVERSION}/plot/pie/guppi-pie-looks.glade
-lib/guppi/plug-ins/${PKGVERSION}/plot/pie/guppi_pie.a
 lib/guppi/plug-ins/${PKGVERSION}/plot/pie/guppi_pie.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/pie/guppi_pie.so
 lib/guppi/plug-ins/${PKGVERSION}/plot/pie/pie-explode.png
 lib/guppi/plug-ins/${PKGVERSION}/plot/pie/pie-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/pie/pie-spin.png
 lib/guppi/plug-ins/${PKGVERSION}/plot/pie/pie.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/pricebars/guppi_pricebars.a
-lib/guppi/plug-ins/${PKGVERSION}/plot/pricebars/guppi_pricebars.la
-lib/guppi/plug-ins/${PKGVERSION}/plot/pricebars/guppi_pricebars.so
-lib/guppi/plug-ins/${PKGVERSION}/plot/pricebars/pricebars-pre.scm
-lib/guppi/plug-ins/${PKGVERSION}/plot/pricebars/pricebars.plugin
 lib/guppi/plug-ins/${PKGVERSION}/plot/scatter/guppi-scatter-state.glade
-lib/guppi/plug-ins/${PKGVERSION}/plot/scatter/guppi-scatter-style.glade
-lib/guppi/plug-ins/${PKGVERSION}/plot/scatter/guppi_scatter.a
 lib/guppi/plug-ins/${PKGVERSION}/plot/scatter/guppi_scatter.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/scatter/guppi_scatter.so
 lib/guppi/plug-ins/${PKGVERSION}/plot/scatter/scatter-brush.png
 lib/guppi/plug-ins/${PKGVERSION}/plot/scatter/scatter-drag.png
 lib/guppi/plug-ins/${PKGVERSION}/plot/scatter/scatter-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/scatter/scatter.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/slinreg/guppi_slinreg.a
-lib/guppi/plug-ins/${PKGVERSION}/plot/slinreg/guppi_slinreg.la
-lib/guppi/plug-ins/${PKGVERSION}/plot/slinreg/guppi_slinreg.so
-lib/guppi/plug-ins/${PKGVERSION}/plot/slinreg/slinreg-pre.scm
-lib/guppi/plug-ins/${PKGVERSION}/plot/slinreg/slinreg-statviewer.glade
-lib/guppi/plug-ins/${PKGVERSION}/plot/slinreg/slinreg.plugin
 lib/guppi/plug-ins/${PKGVERSION}/plot/text/guppi-text-state.glade
-lib/guppi/plug-ins/${PKGVERSION}/plot/text/guppi_text.a
 lib/guppi/plug-ins/${PKGVERSION}/plot/text/guppi_text.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/text/guppi_text.so
 lib/guppi/plug-ins/${PKGVERSION}/plot/text/text-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/text/text.plugin
-lib/guppi/plug-ins/${PKGVERSION}/plot/xybox/guppi_xybox.a
 lib/guppi/plug-ins/${PKGVERSION}/plot/xybox/guppi_xybox.la
 lib/guppi/plug-ins/${PKGVERSION}/plot/xybox/guppi_xybox.so
 lib/guppi/plug-ins/${PKGVERSION}/plot/xybox/xybox-pre.scm
 lib/guppi/plug-ins/${PKGVERSION}/plot/xybox/xybox.plugin
+lib/libguppi.la
+lib/libguppi.so
+lib/libguppi.so.13
+lib/libguppi.so.13.0
 lib/libguppiConf.sh
-lib/libguppibonobo.a
 lib/libguppibonobo.la
 lib/libguppibonobo.so
-lib/libguppibonobo.so.11
-lib/libguppibonobo.so.11.0
-lib/libguppidata.a
-lib/libguppidata.la
-lib/libguppidata.so
-lib/libguppidata.so.11
-lib/libguppidata.so.11.0
-lib/libguppidataui.a
-lib/libguppidataui.la
-lib/libguppidataui.so
-lib/libguppidataui.so.11
-lib/libguppidataui.so.11.0
-lib/libguppieval.a
-lib/libguppieval.la
-lib/libguppieval.so
-lib/libguppieval.so.11
-lib/libguppieval.so.11.0
-lib/libguppimath.a
-lib/libguppimath.la
-lib/libguppimath.so
-lib/libguppimath.so.11
-lib/libguppimath.so.11.0
-lib/libguppiplot.a
-lib/libguppiplot.la
-lib/libguppiplot.so
-lib/libguppiplot.so.11
-lib/libguppiplot.so.11.0
-lib/libguppispecfns.a
-lib/libguppispecfns.la
-lib/libguppispecfns.so
-lib/libguppispecfns.so.11
-lib/libguppispecfns.so.11.0
-lib/libguppistat.a
-lib/libguppistat.la
-lib/libguppistat.so
-lib/libguppistat.so.11
-lib/libguppistat.so.11.0
-lib/libguppitank.a
+lib/libguppibonobo.so.13
+lib/libguppibonobo.so.13.0
 lib/libguppitank.la
 lib/libguppitank.so
-lib/libguppitank.so.11
-lib/libguppitank.so.11.0
-lib/libguppiuseful.a
-lib/libguppiuseful.la
-lib/libguppiuseful.so
-lib/libguppiuseful.so.11
-lib/libguppiuseful.so.11.0
+lib/libguppitank.so.13
+lib/libguppitank.so.13.0
 share/aclocal/libguppi.m4
 share/gnome/apps/Applications/guppi.desktop
+share/gnome/help/guppi/C/c20.html
+share/gnome/help/guppi/C/docbook.css
+share/gnome/help/guppi/C/guppi.html
+share/gnome/help/guppi/C/ln14.html
 share/gnome/help/guppi/C/topic.dat
+share/guppi/glade/guppi-gnumeric-format-guru.glade
 share/guppi/glade/view-properties.glade
-share/guppi/scripts/barchart-demo.scm
+share/guppi/scripts/guppi-gnumeric-plots.xml
 share/guppi/scripts/guppi-guile-boot.scm
-share/guppi/scripts/pbars.scm
-share/guppi/scripts/pie-demo.scm
 share/guppi/scripts/python/Guppi/__init__.py
 share/guppi/scripts/python/Guppi/__init__.pyc
 share/guppi/scripts/python/Guppi/data_impl/__init__.py
 share/guppi/scripts/python/Guppi/data_impl/__init__.pyc
 share/guppi/scripts/python/Guppi/plot/__init__.py
 share/guppi/scripts/python/Guppi/plot/__init__.pyc
-share/guppi/scripts/scatter-demo.scm
-share/guppi/scripts/scatter-grid-demo.scm
+share/locale/da/LC_MESSAGES/Guppi.mo
+share/locale/de/LC_MESSAGES/Guppi.mo
+share/locale/es/LC_MESSAGES/Guppi.mo
+share/locale/fr/LC_MESSAGES/Guppi.mo
+share/locale/is/LC_MESSAGES/Guppi.mo
+share/locale/it/LC_MESSAGES/Guppi.mo
+share/locale/nl/LC_MESSAGES/Guppi.mo
+share/locale/no/LC_MESSAGES/Guppi.mo
+share/locale/pl/LC_MESSAGES/Guppi.mo
+share/locale/pt/LC_MESSAGES/Guppi.mo
+share/locale/pt_BR/LC_MESSAGES/Guppi.mo
+share/locale/ru/LC_MESSAGES/Guppi.mo
+share/locale/sk/LC_MESSAGES/Guppi.mo
+share/locale/sv/LC_MESSAGES/Guppi.mo
+share/locale/tr/LC_MESSAGES/Guppi.mo
+share/locale/uk/LC_MESSAGES/Guppi.mo
 share/oaf/GNOME_Guppi.oafinfo
+share/oaf/GNOME_Guppi_Gnumeric.oaf
 share/pixmaps/gnome-guppi.png
+share/pixmaps/guppi/area.xpm
+share/pixmaps/guppi/bar.xpm
 share/pixmaps/guppi/basic-home.png
 share/pixmaps/guppi/basic-move.png
 share/pixmaps/guppi/basic-reframe.png
 share/pixmaps/guppi/basic-zoom.png
+share/pixmaps/guppi/bubble.xpm
+share/pixmaps/guppi/chart_bar_1_1.png
+share/pixmaps/guppi/chart_bar_1_2.png
+share/pixmaps/guppi/chart_bar_1_3.png
+share/pixmaps/guppi/chart_bar_2_1.png
+share/pixmaps/guppi/chart_bar_2_2.png
+share/pixmaps/guppi/chart_bar_2_3.png
+share/pixmaps/guppi/chart_bubble_1_1.png
+share/pixmaps/guppi/chart_column_1_1.png
+share/pixmaps/guppi/chart_column_1_2.png
+share/pixmaps/guppi/chart_column_1_3.png
+share/pixmaps/guppi/chart_column_2_1.png
+share/pixmaps/guppi/chart_column_2_2.png
+share/pixmaps/guppi/chart_column_2_3.png
+share/pixmaps/guppi/chart_column_3_1.png
+share/pixmaps/guppi/chart_cone_1_1.png
+share/pixmaps/guppi/chart_cone_1_2.png
+share/pixmaps/guppi/chart_cone_1_3.png
+share/pixmaps/guppi/chart_cone_2_1.png
+share/pixmaps/guppi/chart_cone_2_2.png
+share/pixmaps/guppi/chart_cone_2_3.png
+share/pixmaps/guppi/chart_cone_3_1.png
+share/pixmaps/guppi/chart_cylinder_1_1.png
+share/pixmaps/guppi/chart_cylinder_1_2.png
+share/pixmaps/guppi/chart_cylinder_1_3.png
+share/pixmaps/guppi/chart_cylinder_2_1.png
+share/pixmaps/guppi/chart_cylinder_2_2.png
+share/pixmaps/guppi/chart_cylinder_2_3.png
+share/pixmaps/guppi/chart_cylinder_3_1.png
+share/pixmaps/guppi/chart_line_1_1.png
+share/pixmaps/guppi/chart_line_1_2.png
+share/pixmaps/guppi/chart_line_1_3.png
+share/pixmaps/guppi/chart_line_2_1.png
+share/pixmaps/guppi/chart_line_2_2.png
+share/pixmaps/guppi/chart_line_2_3.png
+share/pixmaps/guppi/chart_line_3_1.png
+share/pixmaps/guppi/chart_pie_1_1.png
+share/pixmaps/guppi/chart_pie_1_2.png
+share/pixmaps/guppi/chart_pie_1_3.png
+share/pixmaps/guppi/chart_pie_2_1.png
+share/pixmaps/guppi/chart_pie_2_2.png
+share/pixmaps/guppi/chart_pie_2_3.png
+share/pixmaps/guppi/chart_pyramid_1_1.png
+share/pixmaps/guppi/chart_pyramid_1_2.png
+share/pixmaps/guppi/chart_pyramid_1_3.png
+share/pixmaps/guppi/chart_pyramid_2_1.png
+share/pixmaps/guppi/chart_pyramid_2_2.png
+share/pixmaps/guppi/chart_pyramid_2_3.png
+share/pixmaps/guppi/chart_pyramid_3_1.png
+share/pixmaps/guppi/chart_scatter_1_1.png
+share/pixmaps/guppi/chart_scatter_2_1.png
+share/pixmaps/guppi/chart_scatter_2_2.png
+share/pixmaps/guppi/chart_scatter_3_1.png
+share/pixmaps/guppi/chart_scatter_3_2.png
+share/pixmaps/guppi/chart_stock_1_1.png
+share/pixmaps/guppi/chart_stock_1_2.png
+share/pixmaps/guppi/chart_stock_2_1.png
+share/pixmaps/guppi/chart_stock_2_2.png
+share/pixmaps/guppi/column.xpm
+share/pixmaps/guppi/doughnut.xpm
 share/pixmaps/guppi/fill-best.png
 share/pixmaps/guppi/fill-horiz.png
 share/pixmaps/guppi/fill-vert.png
 share/pixmaps/guppi/guppi-splash.png
+share/pixmaps/guppi/linegraph.xpm
 share/pixmaps/guppi/lock.png
+share/pixmaps/guppi/pie.xpm
+share/pixmaps/guppi/radar.xpm
 share/pixmaps/guppi/resize-to-win.png
+share/pixmaps/guppi/scatter.xpm
+share/pixmaps/guppi/stock.xpm
+share/pixmaps/guppi/surface.xpm
 @dirrm share/pixmaps/guppi
+@dirrm share/oaf
+@dirrm share/locale/is/LC_MESSAGES
+@dirrm share/locale/is
 @dirrm share/guppi/scripts/python/Guppi/plot
 @dirrm share/guppi/scripts/python/Guppi/data_impl
 @dirrm share/guppi/scripts/python/Guppi
@@ -474,25 +387,22 @@ share/pixmaps/guppi/resize-to-win.png
 @dirrm share/guppi/scripts
 @dirrm share/guppi/glade
 @dirrm share/guppi
-@dirrm share/gnome/help/guppi/C/images
 @dirrm share/gnome/help/guppi/C
-@dirrm share/gnome/help/guppi
+@dirrm share/gnome/apps/Applications
+@dirrm share/aclocal
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/xybox
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/text
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/slinreg
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/scatter
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/pricebars
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/pie
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/linegraph
+@dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/linechart
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/legend
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/frame
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/boxplot
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/barchart
+@dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/background
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/axis
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/XLplots
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/import/net-hist-quotes
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/import/mative-XML
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/import/delimited
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/import
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/struct
@@ -504,12 +414,10 @@ share/pixmaps/guppi/resize-to-win.png
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_boolean
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/price_series
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/date_series
+@dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/data_table
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/category
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl
-@dirrm lib/guppi/plug-ins/${PKGVERSION}
-@dirrm lib/guppi/plug-ins
-@dirrm lib/guppi
 @dirrm include/libguppitank
 @dirrm include/libguppi
 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/libguppi.m4 ${LOCALBASE}/share/aclocal/libguppi.m4
diff --git a/math/guppi/distinfo b/math/guppi/distinfo
index 811c78f1e2b..85d1f6e3041 100644
--- a/math/guppi/distinfo
+++ b/math/guppi/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/07/01 11:52:24 tron Exp $
+$NetBSD: distinfo,v 1.4 2001/11/13 03:16:50 damon Exp $
 
-SHA1 (Guppi-0.35.5.tar.bz2) = 063bb719e7fabcaa08d9479713d593f083847dbb
-Size (Guppi-0.35.5.tar.bz2) = 1319291 bytes
-SHA1 (patch-aa) = 80d94b2d3afe5e2a424c00b336b63432be68981b
+SHA1 (Guppi-0.40.0.tar.bz2) = 0b550374163fb6f9913a3cdde8fe7b50c56e72a7
+Size (Guppi-0.40.0.tar.bz2) = 1071424 bytes
+SHA1 (patch-aa) = 728aa34049f726bb36a1d7bf1c9c2ebba79df10c
diff --git a/math/guppi/patches/patch-aa b/math/guppi/patches/patch-aa
index e150dad3dee..5fbdba50264 100644
--- a/math/guppi/patches/patch-aa
+++ b/math/guppi/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2001/07/01 11:51:30 tron Exp $
+$NetBSD: patch-aa,v 1.3 2001/11/13 03:16:51 damon Exp $
 
---- configure.orig	Thu May 10 02:53:41 2001
-+++ configure	Sun Jul  1 11:56:14 2001
-@@ -6498,7 +6498,7 @@
- if test "x$USING_BONOBO" = "x1"; then
- 	LIBGUPPI_LIBS="$LIBGUPPI_LIBS -lguppibonobo"
- fi
+--- configure.orig	Thu Oct 18 13:39:03 2001
++++ configure
+@@ -10821,7 +10821,7 @@
+ LIBGUPPI_INCLUDEDIR='-I${includedir} -I${includedir}/libguppi -I${includedir}/libguppitank' 
+ LIBGUPPI_INCLUDEDIR="$LIBGUPPI_INCLUDEDIR $STANDARD_CFLAGS"
+ LIBGUPPI_LIBS="-lguppitank -lguppi"
 -LIBGUPPI_LIBS="$LIBGUPPI_LIBS $STANDARD_LDFLAGS"
 +LIBGUPPI_LIBS="$LIBGUPPI_LIBS -L$LOCALBASE/lib/python2.0/config -lpython2.0 $STANDARD_LDFLAGS"