Update guppi to 0.40.3

Changes are lots of bug fixes and removal of the dependency on python.
Also enable gnumeric support so the graphing functions in gnumeric actually work.

7 files changed, 227 insertions, 432 deletions

diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 02439769132..20ec8417eec 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.15 2002/04/12 13:02:52 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/05/15 20:44:15 mjl Exp $
 
-DISTNAME=	Guppi-0.40.0
+DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
-PKGREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/Guppi/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	tron@netbsd.org
+MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnome.org/guppi/
 COMMENT=	Plot program with integrated statistics capabilities
 
 DEPENDS+=	gnumeric>=0.75:../../math/gnumeric0
 DEPENDS+=	guile>=1.4:../../lang/guile
+
 BUILDLINK_DEPENDS.gnome-core=		gnome-core>=1.4.0.4nb1
 BUILDLINK_DEPENDS.gdk-pixbuf=		gdk-pixbuf>=0.11.0nb1
 BUILDLINK_DEPENDS.gdk-pixbuf-gnome=	gdk-pixbuf-gnome>=0.11.0nb1
@@ -22,18 +22,16 @@ USE_GMAKE=	YES
 USE_LIBTOOL=	YES
 USE_X11BASE=	YES
 
+CONFIGURE_ARGS=	--enable-gnumeric
+
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
-CONFIGURE_ENV+=	PYTHONBIN=${PYTHONBIN}
-MAKE_ENV+=	PYTHONBIN=${PYTHONBIN}
-
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/libguppi.m4 \
 	  ${LOCALBASE}/share/aclocal/libguppi.m4
 
-.include "../../lang/python/application.buildlink.mk"
 .include "../../devel/libglade/buildlink.mk"
 .include "../../devel/readline/buildlink.mk"
 .include "../../x11/gnome-core/buildlink.mk"
diff --git a/math/guppi/PLIST b/math/guppi/PLIST
index f396a027f83..9648f884717 100644
--- a/math/guppi/PLIST
+++ b/math/guppi/PLIST
@@ -1,299 +1,228 @@
-@comment $NetBSD: PLIST,v 1.7 2002/02/24 22:00:09 wiz Exp $
-bin/gnome-guile-repl
-bin/gnome-python-repl
-include/libguppi/delim-import-widget.h
-include/libguppi/gnan.h
-include/libguppi/guppi-2d.h
-include/libguppi/guppi-alpha-template.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-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.h
-include/libguppi/guppi-color-palette.h
-include/libguppi/guppi-config-item.h
-include/libguppi/guppi-configure.h
-include/libguppi/guppi-convenient.h
-include/libguppi/guppi-curve.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-plug-in.h
-include/libguppi/guppi-data-popup.h
-include/libguppi/guppi-data-select.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.h
-include/libguppi/guppi-date-series.h
-include/libguppi/guppi-debug.h
-include/libguppi/guppi-defaults.h
-include/libguppi/guppi-defs.h
-include/libguppi/guppi-delimited-importer.h
-include/libguppi/guppi-dharma.h
-include/libguppi/guppi-dialogs.h
-include/libguppi/guppi-element-print.h
-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-exit.h
-include/libguppi/guppi-file.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-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-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-plug-in-spec.h
-include/libguppi/guppi-plug-in.h
-include/libguppi/guppi-polynomial.h
-include/libguppi/guppi-price-series.h
-include/libguppi/guppi-progress.h
-include/libguppi/guppi-python-data-ui.h
-include/libguppi/guppi-python-plot.h
-include/libguppi/guppi-python-stat.h
-include/libguppi/guppi-python-useful.h
-include/libguppi/guppi-python.h
-include/libguppi/guppi-raster-text.h
-include/libguppi/guppi-regression-linear.h
-include/libguppi/guppi-regression-polynomial.h
-include/libguppi/guppi-regression2d.h
-include/libguppi/guppi-rgb.h
-include/libguppi/guppi-root-group-item.h
-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-plot.h
-include/libguppi/guppi-scm-stat.h
-include/libguppi/guppi-scm-useful.h
-include/libguppi/guppi-scripting.h
-include/libguppi/guppi-seq-boolean.h
-include/libguppi/guppi-seq-categorical.h
-include/libguppi/guppi-seq-date.h
-include/libguppi/guppi-seq-integer.h
-include/libguppi/guppi-seq-object.h
-include/libguppi/guppi-seq-scalar.h
-include/libguppi/guppi-seq-string.h
-include/libguppi/guppi-seq.h
-include/libguppi/guppi-simple-linreg.h
-include/libguppi/guppi-specfns.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.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-vector.h
-include/libguppi/guppi-version.h
-include/libguppi/guppi-view-interval.h
-include/libguppi/guppi-xml.h
-include/libguppi/jitter.h
-include/libguppi/mconf.h
-include/libguppi/specfns_protos.h
-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.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.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.la
-lib/guppi/plug-ins/${PKGVERSION}/data_impl/curve/guppi_curve_func_impl.so
-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.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.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.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.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.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.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.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
-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.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.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.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.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.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.la
-lib/guppi/plug-ins/${PKGVERSION}/import/delimited/guppi_data_import_delimited.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.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.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.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.la
-lib/guppi/plug-ins/${PKGVERSION}/plot/frame/guppi_frame.so
-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/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.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.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/scatter/guppi-scatter-state.glade
-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/text/guppi-text-state.glade
-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.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
+@comment $NetBSD: PLIST,v 1.8 2002/05/15 20:44:15 mjl Exp $
+@exec ${MKDIR} -p %D/share/gnome/help/guppi/C/images
+bin/guppi-gnumeric
+include/gnome-1.0/libguppi/gnan.h
+include/gnome-1.0/libguppi/guppi-2d.h
+include/gnome-1.0/libguppi/guppi-alpha-template.h
+include/gnome-1.0/libguppi/guppi-attribute-bag.h
+include/gnome-1.0/libguppi/guppi-attribute-flavor.h
+include/gnome-1.0/libguppi/guppi-attribute-widget.h
+include/gnome-1.0/libguppi/guppi-axis-markers.h
+include/gnome-1.0/libguppi/guppi-basic-tools.h
+include/gnome-1.0/libguppi/guppi-canvas-group.h
+include/gnome-1.0/libguppi/guppi-canvas-item.h
+include/gnome-1.0/libguppi/guppi-category-core.h
+include/gnome-1.0/libguppi/guppi-category.h
+include/gnome-1.0/libguppi/guppi-color-palette.h
+include/gnome-1.0/libguppi/guppi-config-dialog.h
+include/gnome-1.0/libguppi/guppi-config-model.h
+include/gnome-1.0/libguppi/guppi-convenient.h
+include/gnome-1.0/libguppi/guppi-curve-calc.h
+include/gnome-1.0/libguppi/guppi-curve-func.h
+include/gnome-1.0/libguppi/guppi-curve-interpolate.h
+include/gnome-1.0/libguppi/guppi-curve-poly.h
+include/gnome-1.0/libguppi/guppi-curve.h
+include/gnome-1.0/libguppi/guppi-data-flavor.h
+include/gnome-1.0/libguppi/guppi-data-importer-plug-in.h
+include/gnome-1.0/libguppi/guppi-data-importer.h
+include/gnome-1.0/libguppi/guppi-data-init.h
+include/gnome-1.0/libguppi/guppi-data-plug-in.h
+include/gnome-1.0/libguppi/guppi-data-popup.h
+include/gnome-1.0/libguppi/guppi-data-select.h
+include/gnome-1.0/libguppi/guppi-data-socket.h
+include/gnome-1.0/libguppi/guppi-data-table-core.h
+include/gnome-1.0/libguppi/guppi-data-table.h
+include/gnome-1.0/libguppi/guppi-data-tree-view.h
+include/gnome-1.0/libguppi/guppi-data-tree.h
+include/gnome-1.0/libguppi/guppi-data-ui-init.h
+include/gnome-1.0/libguppi/guppi-data.h
+include/gnome-1.0/libguppi/guppi-dataimpl-init.h
+include/gnome-1.0/libguppi/guppi-date-indexed.h
+include/gnome-1.0/libguppi/guppi-date-series-calc.h
+include/gnome-1.0/libguppi/guppi-date-series-core.h
+include/gnome-1.0/libguppi/guppi-date-series.h
+include/gnome-1.0/libguppi/guppi-debug.h
+include/gnome-1.0/libguppi/guppi-defaults.h
+include/gnome-1.0/libguppi/guppi-defs.h
+include/gnome-1.0/libguppi/guppi-dharma.h
+include/gnome-1.0/libguppi/guppi-dialogs.h
+include/gnome-1.0/libguppi/guppi-element-print.h
+include/gnome-1.0/libguppi/guppi-element-state.h
+include/gnome-1.0/libguppi/guppi-element-view.h
+include/gnome-1.0/libguppi/guppi-enums.h
+include/gnome-1.0/libguppi/guppi-file.h
+include/gnome-1.0/libguppi/guppi-fn-wrapper.h
+include/gnome-1.0/libguppi/guppi-garray.h
+include/gnome-1.0/libguppi/guppi-geometry.h
+include/gnome-1.0/libguppi/guppi-gpl.h
+include/gnome-1.0/libguppi/guppi-group-state.h
+include/gnome-1.0/libguppi/guppi-group-view-layout.h
+include/gnome-1.0/libguppi/guppi-group-view.h
+include/gnome-1.0/libguppi/guppi-gsml.h
+include/gnome-1.0/libguppi/guppi-hash.h
+include/gnome-1.0/libguppi/guppi-i18n.h
+include/gnome-1.0/libguppi/guppi-layout-constraint.h
+include/gnome-1.0/libguppi/guppi-layout-engine.h
+include/gnome-1.0/libguppi/guppi-layout-rule-predef.h
+include/gnome-1.0/libguppi/guppi-layout-rule.h
+include/gnome-1.0/libguppi/guppi-marker.h
+include/gnome-1.0/libguppi/guppi-matrix.h
+include/gnome-1.0/libguppi/guppi-memory.h
+include/gnome-1.0/libguppi/guppi-metric-entry.h
+include/gnome-1.0/libguppi/guppi-metrics.h
+include/gnome-1.0/libguppi/guppi-multiview.h
+include/gnome-1.0/libguppi/guppi-paths.h
+include/gnome-1.0/libguppi/guppi-pixbuf-stock.h
+include/gnome-1.0/libguppi/guppi-pixbuf.h
+include/gnome-1.0/libguppi/guppi-plot-init.h
+include/gnome-1.0/libguppi/guppi-plot-plug-in.h
+include/gnome-1.0/libguppi/guppi-plot-tool.h
+include/gnome-1.0/libguppi/guppi-plot-toolhelp.h
+include/gnome-1.0/libguppi/guppi-plot-toolkit.h
+include/gnome-1.0/libguppi/guppi-plug-in-spec.h
+include/gnome-1.0/libguppi/guppi-plug-in.h
+include/gnome-1.0/libguppi/guppi-polynomial.h
+include/gnome-1.0/libguppi/guppi-price-series-core.h
+include/gnome-1.0/libguppi/guppi-price-series.h
+include/gnome-1.0/libguppi/guppi-raster-text.h
+include/gnome-1.0/libguppi/guppi-regression-linear.h
+include/gnome-1.0/libguppi/guppi-regression-polynomial.h
+include/gnome-1.0/libguppi/guppi-regression2d.h
+include/gnome-1.0/libguppi/guppi-rgb.h
+include/gnome-1.0/libguppi/guppi-root-group-item.h
+include/gnome-1.0/libguppi/guppi-root-group-state.h
+include/gnome-1.0/libguppi/guppi-root-group-tools.h
+include/gnome-1.0/libguppi/guppi-root-group-view.h
+include/gnome-1.0/libguppi/guppi-seq-boolean-core.h
+include/gnome-1.0/libguppi/guppi-seq-boolean.h
+include/gnome-1.0/libguppi/guppi-seq-categorical.h
+include/gnome-1.0/libguppi/guppi-seq-date-core.h
+include/gnome-1.0/libguppi/guppi-seq-date.h
+include/gnome-1.0/libguppi/guppi-seq-integer-core.h
+include/gnome-1.0/libguppi/guppi-seq-integer.h
+include/gnome-1.0/libguppi/guppi-seq-object.h
+include/gnome-1.0/libguppi/guppi-seq-scalar-calc.h
+include/gnome-1.0/libguppi/guppi-seq-scalar-core.h
+include/gnome-1.0/libguppi/guppi-seq-scalar-func.h
+include/gnome-1.0/libguppi/guppi-seq-scalar.h
+include/gnome-1.0/libguppi/guppi-seq-string-core.h
+include/gnome-1.0/libguppi/guppi-seq-string.h
+include/gnome-1.0/libguppi/guppi-seq.h
+include/gnome-1.0/libguppi/guppi-simple-linreg.h
+include/gnome-1.0/libguppi/guppi-specfns.h
+include/gnome-1.0/libguppi/guppi-stat-init.h
+include/gnome-1.0/libguppi/guppi-stream-preview.h
+include/gnome-1.0/libguppi/guppi-stream.h
+include/gnome-1.0/libguppi/guppi-string.h
+include/gnome-1.0/libguppi/guppi-struct-core.h
+include/gnome-1.0/libguppi/guppi-struct.h
+include/gnome-1.0/libguppi/guppi-text-block.h
+include/gnome-1.0/libguppi/guppi-text-tokens.h
+include/gnome-1.0/libguppi/guppi-unique-id.h
+include/gnome-1.0/libguppi/guppi-useful-init.h
+include/gnome-1.0/libguppi/guppi-useful.h
+include/gnome-1.0/libguppi/guppi-vector.h
+include/gnome-1.0/libguppi/guppi-version.h
+include/gnome-1.0/libguppi/guppi-view-interval.h
+include/gnome-1.0/libguppi/guppi-xml.h
+include/gnome-1.0/libguppi/mconf.h
+include/gnome-1.0/libguppi/specfns_protos.h
+include/gnome-1.0/libguppitank/guppi-object.h
+include/gnome-1.0/libguppitank/guppi-tank-init.h
+include/gnome-1.0/libguppitank/guppi-tank.h
+lib/guppi/plug-ins/${PKGVERSION}/plot/compass-box/compass-box.plugin
+lib/guppi/plug-ins/${PKGVERSION}/plot/compass-box/guppi_compass_box.la
+lib/guppi/plug-ins/${PKGVERSION}/plot/compass-box/guppi_compass_box.so
+lib/guppi/plug-ins/${PKGVERSION}/plot/image/guppi_image.la
+lib/guppi/plug-ins/${PKGVERSION}/plot/image/guppi_image.so
+lib/guppi/plug-ins/${PKGVERSION}/plot/image/image.plugin
+lib/guppi/plug-ins/${PKGVERSION}/plot/pie/guppi-pie-state-config.glade
+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.plugin
+lib/guppi/plug-ins/0.40.3/plot/axis/guppi_axis.so
+lib/guppi/plug-ins/0.40.3/plot/axis/guppi_axis.la
+lib/guppi/plug-ins/0.40.3/plot/axis/axis.plugin
+lib/guppi/plug-ins/0.40.3/plot/background/guppi_background.so
+lib/guppi/plug-ins/0.40.3/plot/background/guppi_background.la
+lib/guppi/plug-ins/0.40.3/plot/background/background.plugin
+lib/guppi/plug-ins/0.40.3/plot/barchart/guppi_barchart.so
+lib/guppi/plug-ins/0.40.3/plot/barchart/guppi_barchart.la
+lib/guppi/plug-ins/0.40.3/plot/barchart/barchart.plugin
+lib/guppi/plug-ins/0.40.3/plot/barchart/barchart-stackswap.png
+lib/guppi/plug-ins/0.40.3/plot/boxplot/guppi_boxplot.so
+lib/guppi/plug-ins/0.40.3/plot/boxplot/guppi_boxplot.la
+lib/guppi/plug-ins/0.40.3/plot/boxplot/boxplot.plugin
+lib/guppi/plug-ins/0.40.3/plot/frame/guppi_frame.so
+lib/guppi/plug-ins/0.40.3/plot/frame/guppi_frame.la
+lib/guppi/plug-ins/0.40.3/plot/frame/frame.plugin
+lib/guppi/plug-ins/0.40.3/plot/legend/guppi_legend.so
+lib/guppi/plug-ins/0.40.3/plot/legend/guppi_legend.la
+lib/guppi/plug-ins/0.40.3/plot/legend/legend.plugin
+lib/guppi/plug-ins/0.40.3/plot/linechart/guppi_linechart.so
+lib/guppi/plug-ins/0.40.3/plot/linechart/guppi_linechart.la
+lib/guppi/plug-ins/0.40.3/plot/linechart/linechart.plugin
+lib/guppi/plug-ins/0.40.3/plot/linegraph/guppi_linegraph.so
+lib/guppi/plug-ins/0.40.3/plot/linegraph/guppi_linegraph.la
+lib/guppi/plug-ins/0.40.3/plot/linegraph/linegraph.plugin
+lib/guppi/plug-ins/0.40.3/plot/pie/guppi_pie.so
+lib/guppi/plug-ins/0.40.3/plot/pie/guppi_pie.la
+lib/guppi/plug-ins/0.40.3/plot/pie/pie.plugin
+lib/guppi/plug-ins/0.40.3/plot/pie/pie-explode.png
+lib/guppi/plug-ins/0.40.3/plot/pie/pie-spin.png
+lib/guppi/plug-ins/0.40.3/plot/pie/guppi-pie-data.glade
+lib/guppi/plug-ins/0.40.3/plot/pie/guppi-pie-looks.glade
+lib/guppi/plug-ins/0.40.3/plot/scatter/guppi_scatter.so
+lib/guppi/plug-ins/0.40.3/plot/scatter/guppi_scatter.la
+lib/guppi/plug-ins/0.40.3/plot/scatter/scatter.plugin
+lib/guppi/plug-ins/0.40.3/plot/scatter/guppi-scatter-state.glade
+lib/guppi/plug-ins/0.40.3/plot/scatter/scatter-brush.png
+lib/guppi/plug-ins/0.40.3/plot/scatter/scatter-drag.png
+lib/guppi/plug-ins/0.40.3/plot/text/guppi_text.so
+lib/guppi/plug-ins/0.40.3/plot/text/guppi_text.la
+lib/guppi/plug-ins/0.40.3/plot/text/text.plugin
+lib/guppi/plug-ins/0.40.3/plot/text/guppi-text-state.glade
+lib/guppi/plug-ins/0.40.3/plot/xybox/guppi_xybox.so
+lib/guppi/plug-ins/0.40.3/plot/xybox/guppi_xybox.la
+lib/guppi/plug-ins/0.40.3/plot/xybox/xybox.plugin
 lib/libguppi.la
 lib/libguppi.so
-lib/libguppi.so.13
-lib/libguppi.so.13.0
+lib/libguppi.so.16.0
+lib/libguppi.so.16
 lib/libguppiConf.sh
-lib/libguppibonobo.la
-lib/libguppibonobo.so
-lib/libguppibonobo.so.13
-lib/libguppibonobo.so.13.0
 lib/libguppitank.la
 lib/libguppitank.so
-lib/libguppitank.so.13
-lib/libguppitank.so.13.0
+lib/libguppitank.so.16.0
+lib/libguppitank.so.16
 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
-@exec ${MKDIR} -p %D/share/gnome/help/guppi/C/images
+share/guppi/glade/guppi-gnumeric-format-guru.glade
 share/guppi/glade/view-properties.glade
-share/guppi/scripts/guppi-guile-boot.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/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/guppi/scripts/guppi-gnumeric-plots.xml
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/Guppi.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/Guppi.mo
+share/oaf/GNOME_Guppi_Gnumeric.oaf
 share/pixmaps/gnome-guppi.png
 share/pixmaps/guppi/area.xpm
 share/pixmaps/guppi/bar.xpm
@@ -374,16 +303,14 @@ share/pixmaps/guppi/scatter.xpm
 share/pixmaps/guppi/stock.xpm
 share/pixmaps/guppi/surface.xpm
 @dirrm share/pixmaps/guppi
-@dirrm share/guppi/scripts/python/Guppi/plot
-@dirrm share/guppi/scripts/python/Guppi/data_impl
-@dirrm share/guppi/scripts/python/Guppi
-@dirrm share/guppi/scripts/python
 @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 include/gnome-1.0/libguppi
+@dirrm include/gnome-1.0/libguppitank
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/xybox
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/text
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/scatter
@@ -396,26 +323,12 @@ share/pixmaps/guppi/surface.xpm
 @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/compass-box
+@dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/image
+@dirrm lib/guppi/plug-ins/${PKGVERSION}/plot/pricebars
 @dirrm lib/guppi/plug-ins/${PKGVERSION}/plot
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/import/delimited
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/import
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/struct
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_string
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_scalar
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_object
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_integer
-@dirrm lib/guppi/plug-ins/${PKGVERSION}/data_impl/seq_date
-@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
 @unexec test %D = ${LOCALBASE} || ${RM} -f ${LOCALBASE}/share/aclocal/libguppi.m4
diff --git a/math/guppi/distinfo b/math/guppi/distinfo
index 337909be7a0..ac3d243ec41 100644
--- a/math/guppi/distinfo
+++ b/math/guppi/distinfo
@@ -1,8 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/01/28 09:36:52 drochner Exp $
+$NetBSD: distinfo,v 1.6 2002/05/15 20:44:15 mjl Exp $
 
-SHA1 (Guppi-0.40.0.tar.bz2) = 0b550374163fb6f9913a3cdde8fe7b50c56e72a7
-Size (Guppi-0.40.0.tar.bz2) = 1071424 bytes
-SHA1 (patch-aa) = 9ee4b2d5900a943b8e57d15272020e6f6f0f5b34
-SHA1 (patch-ab) = 0ab01c26e2b2ae3416455a18d069b63ac1bbdbf6
-SHA1 (patch-ac) = 170601ba500106c6831c8297055f1dd446520203
-SHA1 (patch-ad) = f6700919492a5977973b8994e2cdd5d55bf5ce61
+SHA1 (Guppi-0.40.3.tar.bz2) = 7435bddddca9e3347efb006ad33198fbbe593ea7
+Size (Guppi-0.40.3.tar.bz2) = 1016831 bytes
diff --git a/math/guppi/patches/patch-aa b/math/guppi/patches/patch-aa
deleted file mode 100644
index df750bb9662..00000000000
--- a/math/guppi/patches/patch-aa
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/01/28 09:36:53 drochner Exp $
-
---- configure.orig	Thu Oct 18 19:39:03 2001
-+++ configure	Sat Jan 26 21:08:28 2002
-@@ -10350,42 +10350,13 @@
- 
- python_msg=no
- 
--if test "$enable_python" = "yes"; then
--# 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:10358: 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
--  if test -n "$python_val"; then
--  ac_cv_prog_python_val="$python_val" # Let the user override the test.
--else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_python_val="true"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_prog_python_val" && ac_cv_prog_python_val="false"
--fi
--fi
--python_val="$ac_cv_prog_python_val"
--if test -n "$python_val"; then
--  echo "$ac_t""$python_val" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
-+python_val=true
- 
- if $python_val; then
- 
--          PY_PREFIX=`python -c 'import sys ; print sys.prefix'`
--          PY_EXEC_PREFIX=`python -c 'import sys ; print sys.exec_prefix'`
--                    PY_VERSION=`python -c 'import sys ; print sys.version[0:3]'`
-+          PY_PREFIX=`${PYTHONBIN} -c 'import sys ; print sys.prefix'`
-+          PY_EXEC_PREFIX=`${PYTHONBIN} -c 'import sys ; print sys.exec_prefix'`
-+                    PY_VERSION=`${PYTHONBIN} -c 'import sys ; print sys.version[0:3]'`
-                     if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
-                   PY_LIBS="-lpython$PY_VERSION"
-                   PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
-@@ -10400,7 +10371,7 @@
-                   
-                   
- 	
--                  PY_BUILD_CMD='python $(top_srcdir)/build-tools/gen-py.py'
-+                  PY_BUILD_CMD='${PYTHONBIN} $(top_srcdir)/build-tools/gen-py.py'
-                   
- 
- 		  python_val=true
-@@ -10455,12 +10426,6 @@
- 
- fi ### Closes if $python_val; then
- 
--else
--	echo "$ac_t""***" 1>&6	
--	echo "$ac_t""*** Python support explicitly blocked by --disable-python option." 1>&6
--	echo "$ac_t""***" 1>&6		
--	python_val=false
--fi
- 
- 
- 
diff --git a/math/guppi/patches/patch-ab b/math/guppi/patches/patch-ab
deleted file mode 100644
index 2276e6acf9f..00000000000
--- a/math/guppi/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/01/28 09:36:54 drochner Exp $
-
---- python-modules/Guppi/Makefile.in.orig	Sat Jan 26 21:46:50 2002
-+++ python-modules/Guppi/Makefile.in	Sat Jan 26 21:47:56 2002
-@@ -438,7 +438,7 @@
- 	cat $(srcdir)/start.py $(python_wrappers) $(srcdir)/end.py > __init__.py
- 
- __init__.pyc: __init__.py
--	python $(srcdir)/compilefile.py __init__.py
-+	${PYTHONBIN} $(srcdir)/compilefile.py __init__.py
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/math/guppi/patches/patch-ac b/math/guppi/patches/patch-ac
deleted file mode 100644
index 5f575a6ab41..00000000000
--- a/math/guppi/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/01/28 09:36:55 drochner Exp $
-
---- python-modules/Guppi/plot/Makefile.in.orig	Sat Jan 26 21:48:53 2002
-+++ python-modules/Guppi/plot/Makefile.in	Sat Jan 26 21:49:21 2002
-@@ -336,7 +336,7 @@
- 	cat $(srcdir)/start.py $(python_wrappers) $(srcdir)/end.py > __init__.py
- 
- %.pyc: %.py
--	python $(srcdir)/../compilefile.py $<
-+	${PYTHONBIN} $(srcdir)/../compilefile.py $<
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/math/guppi/patches/patch-ad b/math/guppi/patches/patch-ad
deleted file mode 100644
index 3548d79e643..00000000000
--- a/math/guppi/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/01/28 09:36:56 drochner Exp $
-
---- python-modules/Guppi/data_impl/Makefile.in.orig	Sat Jan 26 21:50:47 2002
-+++ python-modules/Guppi/data_impl/Makefile.in	Sat Jan 26 21:51:53 2002
-@@ -332,7 +332,7 @@
- 	cat $(srcdir)/start.py $(python_wrappers) $(srcdir)/end.py > __init__.py
- 
- %.pyc: %.py
--	python $(srcdir)/../compilefile.py $<
-+	${PYTHONBIN} $(srcdir)/../compilefile.py $<
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.