Update to 0.40.2.

5 files changed, 172 insertions, 144 deletions

diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 3cbf164..d344e4e 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	guppi
-PORTVERSION=	0.40.0
+PORTVERSION=	0.40.2
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/Guppi
diff --git a/math/guppi/distinfo b/math/guppi/distinfo
index d3723c5..85d8de6 100644
--- a/math/guppi/distinfo
+++ b/math/guppi/distinfo
@@ -1 +1 @@
-MD5 (Guppi-0.40.0.tar.gz) = 60fa30921cf971232e0e8578b3f8f0d3
+MD5 (Guppi-0.40.2.tar.gz) = 1fea99266b44aa8352973a4824215cac
diff --git a/math/guppi/files/patch-Makefile.in b/math/guppi/files/patch-Makefile.in
index a0a0c91..b8891ef 100644
--- a/math/guppi/files/patch-Makefile.in
+++ b/math/guppi/files/patch-Makefile.in
@@ -1,23 +1,24 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Fri Jul 27 17:45:27 2001
-+++ Makefile.in	Fri Jul 27 18:18:46 2001
-@@ -188,11 +188,11 @@
- appdir = $(datadir)/apps/Applications
- app_DATA = guppi.desktop
+--- Makefile.in.orig	Fri Nov 23 18:19:00 2001
++++ Makefile.in	Fri Nov 23 18:19:44 2001
+@@ -205,12 +205,12 @@
+ #appdir = $(datadir)/apps/Applications
+ #app_DATA = guppi.desktop
  
 -confexecdir = $(libdir)
 +confexecdir = $(prefix)/etc
  confexec_DATA = libguppiConf.sh
- CLEANFILES = libguppiConf.sh
+ CLEANFILES =  	libguppiConf.sh 	xml-i18n-extract xml-i18n-merge xml-i18n-update
+ 
  
 -aclocaldir = $(datadir)/aclocal
 +aclocaldir = $(prefix)/share/aclocal
  aclocal_DATA = libguppi.m4
  
- EXTRA_DIST =  	ChangeLog README AUTHORS NEWS BIBLIOGRAPHY 	Guppi.spec Guppi.spec.in libguppiConf.sh.in guppi.desktop libguppi.m4 	xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in
-@@ -548,10 +548,10 @@
+ EXTRA_DIST =  	ChangeLog README AUTHORS NEWS BIBLIOGRAPHY 	libguppiConf.sh.in libguppi.m4 	xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in
+@@ -545,10 +545,10 @@
  
  
  libguppiConf.sh: libguppiConf.sh.in Makefile
diff --git a/math/guppi/files/patch-configure b/math/guppi/files/patch-configure
new file mode 100644
index 0000000..54dbe64
--- /dev/null
+++ b/math/guppi/files/patch-configure
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- configure	2001/11/23 16:23:25	1.1
++++ configure	2001/11/23 16:23:38
+@@ -9545,9 +9545,9 @@
+ 
+ ### Configure Guile
+ 
+-	guile_msg = 'Huh?'
++	guile_msg='Huh?'
+ if test x$withval = xno ; then
+-	guile_msg = 'disabled'
++	guile_msg='disabled'
+ 	GUILE_LIBS=
+ 	GUILE_INCS=
+ 	
diff --git a/math/guppi/pkg-plist b/math/guppi/pkg-plist
index 0eab49a..3ecf3f1 100644
--- a/math/guppi/pkg-plist
+++ b/math/guppi/pkg-plist
@@ -2,135 +2,137 @@ bin/gnome-guile-repl
 bin/gnome-python-repl
 bin/guppi-gnumeric
 etc/libguppiConf.sh
+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.h
+include/gnome-1.0/libguppi/guppi-chart-plug-in.h
+include/gnome-1.0/libguppi/guppi-chart.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.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.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-date-indexed.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-exit.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-guile.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.h
+include/gnome-1.0/libguppi/guppi-progress.h
+include/gnome-1.0/libguppi/guppi-python-data-ui.h
+include/gnome-1.0/libguppi/guppi-python-plot.h
+include/gnome-1.0/libguppi/guppi-python-stat.h
+include/gnome-1.0/libguppi/guppi-python-useful.h
+include/gnome-1.0/libguppi/guppi-python.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-scm-data-ui.h
+include/gnome-1.0/libguppi/guppi-scm-plot.h
+include/gnome-1.0/libguppi/guppi-scm-stat.h
+include/gnome-1.0/libguppi/guppi-scm-useful.h
+include/gnome-1.0/libguppi/guppi-scripting.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.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.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.h
+include/gnome-1.0/libguppi/guppi-text-block.h
+include/gnome-1.0/libguppi/guppi-text-squeeze.h
+include/gnome-1.0/libguppi/guppi-text-tokens.h
+include/gnome-1.0/libguppi/guppi-timer.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/jitter.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
 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/%%VERSION%%/data_impl/category/core.plugin
 lib/guppi/plug-ins/%%VERSION%%/data_impl/category/guppi_category_core_impl.so
 lib/guppi/plug-ins/%%VERSION%%/data_impl/curve/calc-pre.scm
@@ -188,9 +190,13 @@ lib/guppi/plug-ins/%%VERSION%%/plot/barchart/guppi_barchart.so
 lib/guppi/plug-ins/%%VERSION%%/plot/boxplot/boxplot-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/plot/boxplot/boxplot.plugin
 lib/guppi/plug-ins/%%VERSION%%/plot/boxplot/guppi_boxplot.so
+lib/guppi/plug-ins/%%VERSION%%/plot/compass-box/compass-box.plugin
+lib/guppi/plug-ins/%%VERSION%%/plot/compass-box/guppi_compass_box.so
 lib/guppi/plug-ins/%%VERSION%%/plot/frame/frame-pre.scm
 lib/guppi/plug-ins/%%VERSION%%/plot/frame/frame.plugin
 lib/guppi/plug-ins/%%VERSION%%/plot/frame/guppi_frame.so
+lib/guppi/plug-ins/%%VERSION%%/plot/image/guppi_image.so
+lib/guppi/plug-ins/%%VERSION%%/plot/image/image.plugin
 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
@@ -200,11 +206,15 @@ lib/guppi/plug-ins/%%VERSION%%/plot/linegraph/guppi_linegraph.so
 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
+lib/guppi/plug-ins/%%VERSION%%/plot/pie/guppi-pie-state-config.glade
 lib/guppi/plug-ins/%%VERSION%%/plot/pie/guppi_pie.so
 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.so
 lib/guppi/plug-ins/%%VERSION%%/plot/scatter/scatter-brush.png
@@ -219,13 +229,10 @@ 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.13
+lib/libguppi.so.15
 lib/libguppitank.so
-lib/libguppitank.so.13
+lib/libguppitank.so.15
 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/guppi-gnumeric-plots.xml
@@ -241,7 +248,6 @@ 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
@@ -352,11 +358,14 @@ share/locale/uk/LC_MESSAGES/Guppi.mo
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/xybox
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/text
 @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/image
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/frame
+@dirrm lib/guppi/plug-ins/%%VERSION%%/plot/compass-box
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/boxplot
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/barchart
 @dirrm lib/guppi/plug-ins/%%VERSION%%/plot/background
@@ -380,5 +389,6 @@ share/locale/uk/LC_MESSAGES/Guppi.mo
 @dirrm lib/guppi/plug-ins/%%VERSION%%
 @dirrm lib/guppi/plug-ins
 @dirrm lib/guppi
-@dirrm include/libguppitank
 @dirrm include/libguppi
+@dirrm include/gnome-1.0/libguppitank
+@dirrm include/gnome-1.0/libguppi