Update to 0.40.0.

5 files changed, 145 insertions, 161 deletions

diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 0d1f945a9472..3cbf1640e52a 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	guppi
-PORTVERSION=	0.35.5
-PORTREVISION=	3
+PORTVERSION=	0.40.0
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/Guppi
@@ -15,14 +14,16 @@ DISTNAME=	Guppi-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	gnumeric:${PORTSDIR}/math/gnumeric
 LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
+RUN_DEPENDS=	gnumeric:${PORTSDIR}/math/gnumeric
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
 USE_PYTHON=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-explicit-python-linking
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/libglade-1.0" \
 		LIBS="-L${LOCALBASE}/lib -pthread"
@@ -31,7 +32,7 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/math/guppi/distinfo b/math/guppi/distinfo
index a69913fb2182..d3723c523020 100644
--- a/math/guppi/distinfo
+++ b/math/guppi/distinfo
@@ -1 +1 @@
-MD5 (Guppi-0.35.5.tar.gz) = 93ba14b9334e3838466446614149e2b4
+MD5 (Guppi-0.40.0.tar.gz) = 60fa30921cf971232e0e8578b3f8f0d3
diff --git a/math/guppi/files/patch-ltmain.sh b/math/guppi/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/math/guppi/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/math/guppi/files/patch-po::Makefile.in.in b/math/guppi/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..2f04784a681b
--- /dev/null
+++ b/math/guppi/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2001/10/23 11:34:52	1.1
++++ po/Makefile.in.in	2001/10/23 11:35:09
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/math/guppi/pkg-plist b/math/guppi/pkg-plist
index abd65f251470..0eab49a65f03 100644
--- a/math/guppi/pkg-plist
+++ b/math/guppi/pkg-plist
@@ -1,51 +1,40 @@
 bin/gnome-guile-repl
 bin/gnome-python-repl
-bin/guppi
+bin/guppi-gnumeric
 etc/libguppiConf.sh
 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
@@ -179,8 +139,12 @@ lib/guppi/plug-ins/%%VERSION%%/data_impl/curve/func-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/data_impl/curve/func.plugin
 lib/guppi/plug-ins/%%VERSION%%/data_impl/curve/guppi_curve_calc_impl.so
 lib/guppi/plug-ins/%%VERSION%%/data_impl/curve/guppi_curve_func_impl.so
+lib/guppi/plug-ins/%%VERSION%%/data_impl/curve/guppi_curve_interpolate_impl.so
 lib/guppi/plug-ins/%%VERSION%%/data_impl/curve/guppi_curve_poly_impl.so
+lib/guppi/plug-ins/%%VERSION%%/data_impl/curve/interpolate.plugin
 lib/guppi/plug-ins/%%VERSION%%/data_impl/curve/poly.plugin
+lib/guppi/plug-ins/%%VERSION%%/data_impl/data_table/core.plugin
+lib/guppi/plug-ins/%%VERSION%%/data_impl/data_table/guppi_data_table_core.so
 lib/guppi/plug-ins/%%VERSION%%/data_impl/date_series/calc-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/data_impl/date_series/calc.plugin
 lib/guppi/plug-ins/%%VERSION%%/data_impl/date_series/core-pre.scm
@@ -190,7 +154,7 @@ lib/guppi/plug-ins/%%VERSION%%/data_impl/date_series/guppi_date_series_core_impl
 lib/guppi/plug-ins/%%VERSION%%/data_impl/price_series/core.plugin
 lib/guppi/plug-ins/%%VERSION%%/data_impl/price_series/guppi_price_series_core_impl.so
 lib/guppi/plug-ins/%%VERSION%%/data_impl/seq_boolean/core.plugin
-lib/guppi/plug-ins/%%VERSION%%/data_impl/seq_boolean/guppi_seq_boolean_core_impl.so
+lib/guppi/plug-ins/%%VERSION%%/data_impl/seq_boolean/guppi_seq_boolean_core.so
 lib/guppi/plug-ins/%%VERSION%%/data_impl/seq_date/core.plugin
 lib/guppi/plug-ins/%%VERSION%%/data_impl/seq_date/guppi_seq_date_core_impl.so
 lib/guppi/plug-ins/%%VERSION%%/data_impl/seq_integer/core.plugin
@@ -212,73 +176,11 @@ lib/guppi/plug-ins/%%VERSION%%/data_impl/struct/guppi_struct_core_impl.so
 lib/guppi/plug-ins/%%VERSION%%/import/delimited/delimited-importer.glade
 lib/guppi/plug-ins/%%VERSION%%/import/delimited/delimited.plugin
 lib/guppi/plug-ins/%%VERSION%%/import/delimited/guppi_data_import_delimited.so
-lib/guppi/plug-ins/%%VERSION%%/import/mative-XML/guppi_data_import_native_XML.so
-lib/guppi/plug-ins/%%VERSION%%/import/mative-XML/native-xml.plugin
-lib/guppi/plug-ins/%%VERSION%%/import/net-hist-quotes/guppi_data_import_net_hist_quotes.so
-lib/guppi/plug-ins/%%VERSION%%/import/net-hist-quotes/net-hist-quotes-pre.scm
-lib/guppi/plug-ins/%%VERSION%%/import/net-hist-quotes/net-hist-quotes.plugin
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/XLplots.plugin
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_bar_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_bar_1_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_bar_1_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_bar_2_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_bar_2_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_bar_2_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_bubble_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_column_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_column_1_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_column_1_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_column_2_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_column_2_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_column_2_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_column_3_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cone_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cone_1_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cone_1_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cone_2_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cone_2_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cone_2_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cone_3_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cylinder_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cylinder_1_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cylinder_1_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cylinder_2_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cylinder_2_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cylinder_2_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_cylinder_3_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_line_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_line_1_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_line_1_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_line_2_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_line_2_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_line_2_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_line_3_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pie_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pie_1_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pie_1_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pie_2_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pie_2_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pie_2_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pyramid_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pyramid_1_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pyramid_1_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pyramid_2_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pyramid_2_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pyramid_2_3.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_pyramid_3_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_scatter_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_scatter_2_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_scatter_2_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_scatter_3_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_scatter_3_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_stock_1_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_stock_1_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_stock_2_1.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/chart_stock_2_2.png
-lib/guppi/plug-ins/%%VERSION%%/plot/XLplots/guppi_XLplots.so
 lib/guppi/plug-ins/%%VERSION%%/plot/axis/axis-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/plot/axis/axis.plugin
 lib/guppi/plug-ins/%%VERSION%%/plot/axis/guppi_axis.so
+lib/guppi/plug-ins/%%VERSION%%/plot/background/background.plugin
+lib/guppi/plug-ins/%%VERSION%%/plot/background/guppi_background.so
 lib/guppi/plug-ins/%%VERSION%%/plot/barchart/barchart-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/plot/barchart/barchart-stackswap.png
 lib/guppi/plug-ins/%%VERSION%%/plot/barchart/barchart.plugin
@@ -292,8 +194,9 @@ lib/guppi/plug-ins/%%VERSION%%/plot/frame/guppi_frame.so
 lib/guppi/plug-ins/%%VERSION%%/plot/legend/guppi_legend.so
 lib/guppi/plug-ins/%%VERSION%%/plot/legend/legend-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/plot/legend/legend.plugin
+lib/guppi/plug-ins/%%VERSION%%/plot/linechart/guppi_linechart.so
+lib/guppi/plug-ins/%%VERSION%%/plot/linechart/linechart.plugin
 lib/guppi/plug-ins/%%VERSION%%/plot/linegraph/guppi_linegraph.so
-lib/guppi/plug-ins/%%VERSION%%/plot/linegraph/linegraph-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/plot/linegraph/linegraph.plugin
 lib/guppi/plug-ins/%%VERSION%%/plot/pie/guppi-pie-data.glade
 lib/guppi/plug-ins/%%VERSION%%/plot/pie/guppi-pie-looks.glade
@@ -302,20 +205,12 @@ lib/guppi/plug-ins/%%VERSION%%/plot/pie/pie-explode.png
 lib/guppi/plug-ins/%%VERSION%%/plot/pie/pie-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/plot/pie/pie-spin.png
 lib/guppi/plug-ins/%%VERSION%%/plot/pie/pie.plugin
-lib/guppi/plug-ins/%%VERSION%%/plot/pricebars/guppi_pricebars.so
-lib/guppi/plug-ins/%%VERSION%%/plot/pricebars/pricebars-pre.scm
-lib/guppi/plug-ins/%%VERSION%%/plot/pricebars/pricebars.plugin
 lib/guppi/plug-ins/%%VERSION%%/plot/scatter/guppi-scatter-state.glade
-lib/guppi/plug-ins/%%VERSION%%/plot/scatter/guppi-scatter-style.glade
 lib/guppi/plug-ins/%%VERSION%%/plot/scatter/guppi_scatter.so
 lib/guppi/plug-ins/%%VERSION%%/plot/scatter/scatter-brush.png
 lib/guppi/plug-ins/%%VERSION%%/plot/scatter/scatter-drag.png
 lib/guppi/plug-ins/%%VERSION%%/plot/scatter/scatter-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/plot/scatter/scatter.plugin
-lib/guppi/plug-ins/%%VERSION%%/plot/slinreg/guppi_slinreg.so
-lib/guppi/plug-ins/%%VERSION%%/plot/slinreg/slinreg-pre.scm
-lib/guppi/plug-ins/%%VERSION%%/plot/slinreg/slinreg-statviewer.glade
-lib/guppi/plug-ins/%%VERSION%%/plot/slinreg/slinreg.plugin
 lib/guppi/plug-ins/%%VERSION%%/plot/text/guppi-text-state.glade
 lib/guppi/plug-ins/%%VERSION%%/plot/text/guppi_text.so
 lib/guppi/plug-ins/%%VERSION%%/plot/text/text-pre.scm
@@ -323,54 +218,110 @@ lib/guppi/plug-ins/%%VERSION%%/plot/text/text.plugin
 lib/guppi/plug-ins/%%VERSION%%/plot/xybox/guppi_xybox.so
 lib/guppi/plug-ins/%%VERSION%%/plot/xybox/xybox-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/plot/xybox/xybox.plugin
+lib/libguppi.so
+lib/libguppi.so.13
 lib/libguppibonobo.so
-lib/libguppibonobo.so.11
-lib/libguppidata.so
-lib/libguppidata.so.11
-lib/libguppidataui.so
-lib/libguppidataui.so.11
-lib/libguppieval.so
-lib/libguppieval.so.11
-lib/libguppimath.so
-lib/libguppimath.so.11
-lib/libguppiplot.so
-lib/libguppiplot.so.11
-lib/libguppispecfns.so
-lib/libguppispecfns.so.11
-lib/libguppistat.so
-lib/libguppistat.so.11
+lib/libguppibonobo.so.13
 lib/libguppitank.so
-lib/libguppitank.so.11
-lib/libguppiuseful.so
-lib/libguppiuseful.so.11
+lib/libguppitank.so.13
 share/aclocal/libguppi.m4
 share/gnome/apps/Applications/guppi.desktop
+share/gnome/guppi/glade/guppi-gnumeric-format-guru.glade
 share/gnome/guppi/glade/view-properties.glade
-share/gnome/guppi/scripts/barchart-demo.scm
+share/gnome/guppi/scripts/guppi-gnumeric-plots.xml
 share/gnome/guppi/scripts/guppi-guile-boot.scm
-share/gnome/guppi/scripts/pbars.scm
-share/gnome/guppi/scripts/pie-demo.scm
 share/gnome/guppi/scripts/python/Guppi/__init__.py
 share/gnome/guppi/scripts/python/Guppi/__init__.pyc
 share/gnome/guppi/scripts/python/Guppi/data_impl/__init__.py
 share/gnome/guppi/scripts/python/Guppi/data_impl/__init__.pyc
 share/gnome/guppi/scripts/python/Guppi/plot/__init__.py
 share/gnome/guppi/scripts/python/Guppi/plot/__init__.pyc
-share/gnome/guppi/scripts/scatter-demo.scm
-share/gnome/guppi/scripts/scatter-grid-demo.scm
+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/gnome/oaf/GNOME_Guppi.oafinfo
+share/gnome/oaf/GNOME_Guppi_Gnumeric.oaf
 share/gnome/pixmaps/gnome-guppi.png
+share/gnome/pixmaps/guppi/area.xpm
+share/gnome/pixmaps/guppi/bar.xpm
 share/gnome/pixmaps/guppi/basic-home.png
 share/gnome/pixmaps/guppi/basic-move.png
 share/gnome/pixmaps/guppi/basic-reframe.png
 share/gnome/pixmaps/guppi/basic-zoom.png
+share/gnome/pixmaps/guppi/bubble.xpm
+share/gnome/pixmaps/guppi/chart_bar_1_1.png
+share/gnome/pixmaps/guppi/chart_bar_1_2.png
+share/gnome/pixmaps/guppi/chart_bar_1_3.png
+share/gnome/pixmaps/guppi/chart_bar_2_1.png
+share/gnome/pixmaps/guppi/chart_bar_2_2.png
+share/gnome/pixmaps/guppi/chart_bar_2_3.png
+share/gnome/pixmaps/guppi/chart_bubble_1_1.png
+share/gnome/pixmaps/guppi/chart_column_1_1.png
+share/gnome/pixmaps/guppi/chart_column_1_2.png
+share/gnome/pixmaps/guppi/chart_column_1_3.png
+share/gnome/pixmaps/guppi/chart_column_2_1.png
+share/gnome/pixmaps/guppi/chart_column_2_2.png
+share/gnome/pixmaps/guppi/chart_column_2_3.png
+share/gnome/pixmaps/guppi/chart_column_3_1.png
+share/gnome/pixmaps/guppi/chart_cone_1_1.png
+share/gnome/pixmaps/guppi/chart_cone_1_2.png
+share/gnome/pixmaps/guppi/chart_cone_1_3.png
+share/gnome/pixmaps/guppi/chart_cone_2_1.png
+share/gnome/pixmaps/guppi/chart_cone_2_2.png
+share/gnome/pixmaps/guppi/chart_cone_2_3.png
+share/gnome/pixmaps/guppi/chart_cone_3_1.png
+share/gnome/pixmaps/guppi/chart_cylinder_1_1.png
+share/gnome/pixmaps/guppi/chart_cylinder_1_2.png
+share/gnome/pixmaps/guppi/chart_cylinder_1_3.png
+share/gnome/pixmaps/guppi/chart_cylinder_2_1.png
+share/gnome/pixmaps/guppi/chart_cylinder_2_2.png
+share/gnome/pixmaps/guppi/chart_cylinder_2_3.png
+share/gnome/pixmaps/guppi/chart_cylinder_3_1.png
+share/gnome/pixmaps/guppi/chart_line_1_1.png
+share/gnome/pixmaps/guppi/chart_line_1_2.png
+share/gnome/pixmaps/guppi/chart_line_1_3.png
+share/gnome/pixmaps/guppi/chart_line_2_1.png
+share/gnome/pixmaps/guppi/chart_line_2_2.png
+share/gnome/pixmaps/guppi/chart_line_2_3.png
+share/gnome/pixmaps/guppi/chart_line_3_1.png
+share/gnome/pixmaps/guppi/chart_pie_1_1.png
+share/gnome/pixmaps/guppi/chart_pie_1_2.png
+share/gnome/pixmaps/guppi/chart_pie_1_3.png
+share/gnome/pixmaps/guppi/chart_pie_2_1.png
+share/gnome/pixmaps/guppi/chart_pie_2_2.png
+share/gnome/pixmaps/guppi/chart_pie_2_3.png
+share/gnome/pixmaps/guppi/chart_pyramid_1_1.png
+share/gnome/pixmaps/guppi/chart_pyramid_1_2.png
+share/gnome/pixmaps/guppi/chart_pyramid_1_3.png
+share/gnome/pixmaps/guppi/chart_pyramid_2_1.png
+share/gnome/pixmaps/guppi/chart_pyramid_2_2.png
+share/gnome/pixmaps/guppi/chart_pyramid_2_3.png
+share/gnome/pixmaps/guppi/chart_pyramid_3_1.png
+share/gnome/pixmaps/guppi/chart_scatter_1_1.png
+share/gnome/pixmaps/guppi/chart_scatter_2_1.png
+share/gnome/pixmaps/guppi/chart_scatter_2_2.png
+share/gnome/pixmaps/guppi/chart_scatter_3_1.png
+share/gnome/pixmaps/guppi/chart_scatter_3_2.png
+share/gnome/pixmaps/guppi/chart_stock_1_1.png
+share/gnome/pixmaps/guppi/chart_stock_1_2.png
+share/gnome/pixmaps/guppi/chart_stock_2_1.png
+share/gnome/pixmaps/guppi/chart_stock_2_2.png
+share/gnome/pixmaps/guppi/column.xpm
+share/gnome/pixmaps/guppi/doughnut.xpm
 share/gnome/pixmaps/guppi/fill-best.png
 share/gnome/pixmaps/guppi/fill-horiz.png
 share/gnome/pixmaps/guppi/fill-vert.png
 share/gnome/pixmaps/guppi/guppi-splash.png
+share/gnome/pixmaps/guppi/linegraph.xpm
 share/gnome/pixmaps/guppi/lock.png
+share/gnome/pixmaps/guppi/pie.xpm
+share/gnome/pixmaps/guppi/radar.xpm
 share/gnome/pixmaps/guppi/resize-to-win.png
+share/gnome/pixmaps/guppi/scatter.xpm
+share/gnome/pixmaps/guppi/stock.xpm
+share/gnome/pixmaps/guppi/surface.xpm
 share/locale/da/LC_MESSAGES/Guppi.mo
 share/locale/de/LC_MESSAGES/Guppi.mo
 share/locale/es/LC_MESSAGES/Guppi.mo
@@ -383,7 +334,9 @@ 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
 @dirrm share/gnome/pixmaps/guppi
 @dirrm share/gnome/help/guppi/C/images
@@ -398,20 +351,17 @@ share/locale/uk/LC_MESSAGES/Guppi.mo
 @dirrm share/gnome/guppi
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/xybox
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/text
-@dirrm lib/guppi/plug-ins/%%VERSION%%/plot/slinreg
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/scatter
-@dirrm lib/guppi/plug-ins/%%VERSION%%/plot/pricebars
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/pie
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/linegraph
+@dirrm lib/guppi/plug-ins/%%VERSION%%/plot/linechart
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/legend
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/frame
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/boxplot
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/barchart
+@dirrm lib/guppi/plug-ins/%%VERSION%%/plot/background
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/axis
-@dirrm lib/guppi/plug-ins/%%VERSION%%/plot/XLplots
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot
-@dirrm lib/guppi/plug-ins/%%VERSION%%/import/net-hist-quotes
-@dirrm lib/guppi/plug-ins/%%VERSION%%/import/mative-XML
 @dirrm lib/guppi/plug-ins/%%VERSION%%/import/delimited
 @dirrm lib/guppi/plug-ins/%%VERSION%%/import
 @dirrm lib/guppi/plug-ins/%%VERSION%%/data_impl/struct
@@ -423,6 +373,7 @@ share/locale/uk/LC_MESSAGES/Guppi.mo
 @dirrm lib/guppi/plug-ins/%%VERSION%%/data_impl/seq_boolean
 @dirrm lib/guppi/plug-ins/%%VERSION%%/data_impl/price_series
 @dirrm lib/guppi/plug-ins/%%VERSION%%/data_impl/date_series
+@dirrm lib/guppi/plug-ins/%%VERSION%%/data_impl/data_table
 @dirrm lib/guppi/plug-ins/%%VERSION%%/data_impl/curve
 @dirrm lib/guppi/plug-ins/%%VERSION%%/data_impl/category
 @dirrm lib/guppi/plug-ins/%%VERSION%%/data_impl