Update to 0.4.0:

goffice 0.3.9:

Jean:
	* Add support for cubic splines.
	* Fix graph rendering on big endian machines. [#432532]

--------------------------------------------------------------------------
goffice 0.3.8:

Emmanuel:
	* Fix alignement of rotated axis labels. [#343507]

Morten:
	* Add preconditions to text combo widget's API functions.
	* Unicode-normalize regexps patterns.
	* Improve character set guesser.  [#401588]
	* Fix format selector crash.  [#431256]

--------------------------------------------------------------------------
goffice 0.3.7:

Emmanuel Pacaud:

	* Fix calls to g_object_class_install_property. [#172866]
	* Show a complete dash sequence for sample lines in legends. [#404819]
	* Fix persistence of legend position. [345836]
	* Only round width of sharp line. [#403403]
	* Add more line styles

Morten:
	* Fix UTF-8 problem in format preview.
	* Separate the format selector from format internals.
	* Total rewrite of number formatting.
	* Fix potential memory corruption in format dialog.
	* Make space-filling in formats use thinner spaces when
          available.  [#163438]
	* Remove embedded PCRE.
	* Improve axis labeling.  [#413660]
	* Simplify formats that yield "n\pi/1".  [#417981]

--------------------------------------------------------------------------
goffice 0.3.6:

Jody:
	* Avoid cairo assertion when rendering a 0 sized view. [#397679]

Morten:
	* Generalize number formatting.
	* Simplify format widget a bit.
	* Implement go_strtod and go_strtold.
	* Fix marshalling of pango formats with strikethrough set.
	* Make the GOFormat type private.
	* Extract go-locale.[ch] from go-format.[ch]
	* Fix UMR.

--------------------------------------------------------------------------

goffice 0.3.5:

Emmanuel Pacaud:
	* Fix legend where there's no element to display. [#382354]
	* Fix legend when reordering plots. [#382663]
	* Fix markers in PDF and PS export.

Jody:
	* Make the GogStyle sax parser usable by outside objects.

Morten:
	* Improve number formatting.

--------------------------------------------------------------------------

goffice 0.3.4:

Morten:
	* Handle formats like "dd.mm.yyyy".

J.H.M. Dassen (Ray):
	* Cleanup g_free calls.  [#369662]

--------------------------------------------------------------------------

goffice 0.3.3:

Morten:
	* Fix combo sizing problem.  [#362704]
	* Fix Save problem.  [#365115]
	* Detect more date/time formats.  Part of [#370183]

--------------------------------------------------------------------------

goffice 0.3.2:

Dom:
	* Fixes for usage with gtk 2.6.

Jon Kåre:
        * Use info from gdk-pixbuf to convert from MIME type to image
	  format.
        * Fix bug which hid file save format selector .
        * go_gtk_file_sel_dialog no longer unhides all hidden widgets
	  when displaying dialog.

Morten:
	* Handle errors while loading images better.

--------------------------------------------------------------------------
goffice 0.3.1:

NOTE : This is a _DEVELOPMENT_ release.  Please use the 0.2.x series for
	production systems.  The api/abi in 0.3.x is expected to change without
	notice until 0.4.0.

Emmanuel Pacaud:
	* Composite graph image onto white background when exporting to
	formats that don't support alpha channel [#339126].
	* Add support for background stripes.
	* Add radian and grad unit support for polar plots.
	* Add rotation support for polar plots.
	* Fix display of log axis minor ticks [#341880].
	* Add new ?pi/? format, mainly for polar plot use.
	* Fix bar/col plots when using log scale.
	* Fix a crash when polar plot width or height == 0 [#349238].
	* Swith to cairo renderer [#314211] [#310322].
	* New pattern, gradient, color and line selectors [#152673].

Ivan Wong :
	* [Win32] Add the attribute GO_VAR_DECL for public global
	variable so that public header files are now compatible with
	MSVC.

Jean Brefort:
	* Add a half pie plots.
	* Allow to chose an interpolation type for each series in
	scatter plots.
	* Implement vertical box-plots. [#358153]

Morten:
	* Make text combos work in overflowed toolbars.  [#157901]
	* Avoid CRITICALs on formatting invalid dates.
	* Fix rendered for non-Cairo case.  [#341999]

--------------------------------------------------------------------------

goffice 0.3.0:

NOTE : This is a _DEVELOPMENT_ release.  Please use the 0.2.x series for
	production systems.  The api/abi in 0.3.x is expected to change without
	notice until 0.4.0.

Emmanuel Pacaud:
	* Add initial support for moving objects by mouse.
	* Add a resolution setting in image export file chooser.
	* Add support for PDF and PS export of graphs when using cairo
	renderer.
	* Add gtk-doc support.
	* Improve legend layout by making swatch size proptional to font
       	size.
	* Improve dialog for manual position of dialog.
	* Fix baseline for area plot and histogram when using a log axis.
	* Implement stretched image pattern in cairo renderer.
	* Fix axis label position.
	* Improve scientific format, add an engineering mode and a
	special format with markup for display of exponent as
	superscript (e.g. 10²) (Currently only used by graph engine when
	using cairo renderer).

Ivan Wong :
	* [Win32] Only export symbols which are in the public headers.
	  [#307356]

Jean Brefort:
	* Add a new components system to embed data from other
	applications.
	* Add Histograms.
	* Add regression curves to histograms and line plots.
	* Add power regressions.
	* Add moving average trend curves.
	* Fix use of invalid data in scatter plots. [#334697]

Jody:
	* Some cleanup towards supporting --without-gtk.

Morten:
	* Fix translation problems causing crashes in the character set
	  selector for people not using UTF-8.
	* Add and fix gog-object preconditions.  [Part of #321678]
	* Handle problem with fraction formats for very large values.
          [Debian 340463]
	* Fix problem with colons in filenames.  [#322799]
	* Use system libpcre when available, sufficiently recent, and
	  properly compiled with UTF-8 support.
	* Plug leak.
	* Handle problems with formats containing "ss." but no more.
	* Fix plugin deactivation.  [#336742]
	* Improve fraction format handling.
	* Fix format problem for [$curr].
	* Implement tooltips for text combos.  [#339122]

5 files changed, 436 insertions, 301 deletions

diff --git a/misc/goffice/DESCR b/misc/goffice/DESCR
index 3e7ac8736a6..2d7221a3d44 100644
--- a/misc/goffice/DESCR
+++ b/misc/goffice/DESCR
@@ -1,6 +1,7 @@
-This is a library for common operations for document centric
-applications that are conceptually simple, but complex to implement
-fully. Supported operations include:
+goffice is a GLIB/GTK set of document centric objects and utilities.
+
+There are common operations for document centric applications that are
+conceptually simple, but complex to implement fully.
     - plugins
     - load/save documents
     - undo/redo
diff --git a/misc/goffice/Makefile b/misc/goffice/Makefile
index 0ed78ce4f30..16ad124fdf4 100644
--- a/misc/goffice/Makefile
+++ b/misc/goffice/Makefile
@@ -1,34 +1,38 @@
-# $NetBSD: Makefile,v 1.14 2007/03/21 12:05:50 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/05/05 00:33:43 wiz Exp $
 #
 
-DISTNAME=		goffice-0.2.2
-PKGREVISION=		1
+DISTNAME=		goffice-0.4.0
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.4/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://ftp.gnome.org/pub/GNOME/sources/goffice/0.2/
+HOMEPAGE=		http://ftp.gnome.org/pub/GNOME/sources/goffice/0.4/
 COMMENT=		Library of document-centric objects and utilities
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgoffice-1.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgoffice-0.4.pc.in
 GNU_CONFIGURE=		yes
+USE_DIRS+=		xdg-1.4
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pango+=	pango>=1.8.1
 .include "../../devel/pango/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libart2+=	libart2>=2.3.11
 .include "../../graphics/libart2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/goffice/PLIST b/misc/goffice/PLIST
index f5dcf51dc61..a3aca157079 100644
--- a/misc/goffice/PLIST
+++ b/misc/goffice/PLIST
@@ -1,127 +1,139 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:25 jlam Exp $
-include/libgoffice-1/goffice/app/error-info.h
-include/libgoffice-1/goffice/app/file.h
-include/libgoffice-1/goffice/app/go-cmd-context-impl.h
-include/libgoffice-1/goffice/app/go-cmd-context.h
-include/libgoffice-1/goffice/app/go-doc-control-impl.h
-include/libgoffice-1/goffice/app/go-doc-control.h
-include/libgoffice-1/goffice/app/go-doc-impl.h
-include/libgoffice-1/goffice/app/go-doc.h
-include/libgoffice-1/goffice/app/go-plugin-loader-module.h
-include/libgoffice-1/goffice/app/go-plugin-loader.h
-include/libgoffice-1/goffice/app/go-plugin-service-impl.h
-include/libgoffice-1/goffice/app/go-plugin-service.h
-include/libgoffice-1/goffice/app/go-plugin.h
-include/libgoffice-1/goffice/app/goffice-app.h
-include/libgoffice-1/goffice/app/io-context-priv.h
-include/libgoffice-1/goffice/app/io-context.h
-include/libgoffice-1/goffice/app/module-plugin-defs.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/foo-canvas.h
-include/libgoffice-1/goffice/cut-n-paste/foocanvas/libfoocanvas.h
-include/libgoffice-1/goffice/cut-n-paste/pcre/pcre.h
-include/libgoffice-1/goffice/data/go-data-impl.h
-include/libgoffice-1/goffice/data/go-data-simple.h
-include/libgoffice-1/goffice/data/go-data.h
-include/libgoffice-1/goffice/data/goffice-data.h
-include/libgoffice-1/goffice/drawing/god-anchor.h
-include/libgoffice-1/goffice/drawing/god-default-attributes.h
-include/libgoffice-1/goffice/drawing/god-drawing-group.h
-include/libgoffice-1/goffice/drawing/god-drawing-renderer-gdk.h
-include/libgoffice-1/goffice/drawing/god-drawing-view.h
-include/libgoffice-1/goffice/drawing/god-drawing.h
-include/libgoffice-1/goffice/drawing/god-image-store.h
-include/libgoffice-1/goffice/drawing/god-image.h
-include/libgoffice-1/goffice/drawing/god-paragraph-attributes.h
-include/libgoffice-1/goffice/drawing/god-property-table.h
-include/libgoffice-1/goffice/drawing/god-shape.h
-include/libgoffice-1/goffice/drawing/god-text-model.h
-include/libgoffice-1/goffice/goffice-features.h
-include/libgoffice-1/goffice/goffice.h
-include/libgoffice-1/goffice/graph/goffice-graph.h
-include/libgoffice-1/goffice/graph/gog-axis-line-impl.h
-include/libgoffice-1/goffice/graph/gog-axis-line.h
-include/libgoffice-1/goffice/graph/gog-axis.h
-include/libgoffice-1/goffice/graph/gog-chart-impl.h
-include/libgoffice-1/goffice/graph/gog-chart.h
-include/libgoffice-1/goffice/graph/gog-control-foocanvas.h
-include/libgoffice-1/goffice/graph/gog-data-allocator.h
-include/libgoffice-1/goffice/graph/gog-data-set.h
-include/libgoffice-1/goffice/graph/gog-error-bar.h
-include/libgoffice-1/goffice/graph/gog-graph-impl.h
-include/libgoffice-1/goffice/graph/gog-graph.h
-include/libgoffice-1/goffice/graph/gog-grid-line.h
-include/libgoffice-1/goffice/graph/gog-grid.h
-include/libgoffice-1/goffice/graph/gog-guru.h
-include/libgoffice-1/goffice/graph/gog-label.h
-include/libgoffice-1/goffice/graph/gog-legend.h
-include/libgoffice-1/goffice/graph/gog-object-xml.h
-include/libgoffice-1/goffice/graph/gog-object.h
-include/libgoffice-1/goffice/graph/gog-outlined-object.h
-include/libgoffice-1/goffice/graph/gog-plot-engine.h
-include/libgoffice-1/goffice/graph/gog-plot-impl.h
-include/libgoffice-1/goffice/graph/gog-plot.h
-include/libgoffice-1/goffice/graph/gog-reg-curve.h
-include/libgoffice-1/goffice/graph/gog-renderer-gnome-print.h
-include/libgoffice-1/goffice/graph/gog-renderer-impl.h
-include/libgoffice-1/goffice/graph/gog-renderer-pixbuf.h
-include/libgoffice-1/goffice/graph/gog-renderer-svg.h
-include/libgoffice-1/goffice/graph/gog-renderer.h
-include/libgoffice-1/goffice/graph/gog-series-impl.h
-include/libgoffice-1/goffice/graph/gog-series-lines.h
-include/libgoffice-1/goffice/graph/gog-series.h
-include/libgoffice-1/goffice/graph/gog-style.h
-include/libgoffice-1/goffice/graph/gog-styled-object.h
-include/libgoffice-1/goffice/graph/gog-theme.h
-include/libgoffice-1/goffice/graph/gog-view.h
-include/libgoffice-1/goffice/gtk/go-action-combo-color.h
-include/libgoffice-1/goffice/gtk/go-action-combo-pixmaps.h
-include/libgoffice-1/goffice/gtk/go-action-combo-stack.h
-include/libgoffice-1/goffice/gtk/go-action-combo-text.h
-include/libgoffice-1/goffice/gtk/go-charmap-sel.h
-include/libgoffice-1/goffice/gtk/go-color-group.h
-include/libgoffice-1/goffice/gtk/go-color-palette.h
-include/libgoffice-1/goffice/gtk/go-combo-box.h
-include/libgoffice-1/goffice/gtk/go-combo-color.h
-include/libgoffice-1/goffice/gtk/go-combo-pixmaps.h
-include/libgoffice-1/goffice/gtk/go-combo-text.h
-include/libgoffice-1/goffice/gtk/go-font-sel.h
-include/libgoffice-1/goffice/gtk/go-format-sel.h
-include/libgoffice-1/goffice/gtk/go-graph-widget.h
-include/libgoffice-1/goffice/gtk/go-locale-sel.h
-include/libgoffice-1/goffice/gtk/go-optionmenu.h
-include/libgoffice-1/goffice/gtk/go-rotation-sel.h
-include/libgoffice-1/goffice/gtk/goffice-gtk.h
-include/libgoffice-1/goffice/ms-compat/go-ms-parser.h
-include/libgoffice-1/goffice/ms-compat/god-drawing-ms-client-handler.h
-include/libgoffice-1/goffice/ms-compat/god-drawing-ms.h
-include/libgoffice-1/goffice/ms-compat/god-image-ms.h
-include/libgoffice-1/goffice/utils/datetime.h
-include/libgoffice-1/goffice/utils/format-impl.h
-include/libgoffice-1/goffice/utils/go-color.h
-include/libgoffice-1/goffice/utils/go-file.h
-include/libgoffice-1/goffice/utils/go-font.h
-include/libgoffice-1/goffice/utils/go-format-match.h
-include/libgoffice-1/goffice/utils/go-format.h
-include/libgoffice-1/goffice/utils/go-geometry.h
-include/libgoffice-1/goffice/utils/go-glib-extras.h
-include/libgoffice-1/goffice/utils/go-gradient.h
-include/libgoffice-1/goffice/utils/go-libxml-extras.h
-include/libgoffice-1/goffice/utils/go-line.h
-include/libgoffice-1/goffice/utils/go-marker.h
-include/libgoffice-1/goffice/utils/go-math.h
-include/libgoffice-1/goffice/utils/go-pattern.h
-include/libgoffice-1/goffice/utils/go-rangefunc.h
-include/libgoffice-1/goffice/utils/go-regression.h
-include/libgoffice-1/goffice/utils/go-units.h
-include/libgoffice-1/goffice/utils/goffice-utils.h
-include/libgoffice-1/goffice/utils/regutf8.h
+@comment $NetBSD: PLIST,v 1.3 2007/05/05 00:33:43 wiz Exp $
+include/libgoffice-0.4/goffice/app/error-info.h
+include/libgoffice-0.4/goffice/app/file.h
+include/libgoffice-0.4/goffice/app/go-cmd-context-impl.h
+include/libgoffice-0.4/goffice/app/go-cmd-context.h
+include/libgoffice-0.4/goffice/app/go-doc-control-impl.h
+include/libgoffice-0.4/goffice/app/go-doc-control.h
+include/libgoffice-0.4/goffice/app/go-doc-impl.h
+include/libgoffice-0.4/goffice/app/go-doc.h
+include/libgoffice-0.4/goffice/app/go-plugin-loader-module.h
+include/libgoffice-0.4/goffice/app/go-plugin-loader.h
+include/libgoffice-0.4/goffice/app/go-plugin-service-impl.h
+include/libgoffice-0.4/goffice/app/go-plugin-service.h
+include/libgoffice-0.4/goffice/app/go-plugin.h
+include/libgoffice-0.4/goffice/app/goffice-app.h
+include/libgoffice-0.4/goffice/app/io-context-priv.h
+include/libgoffice-0.4/goffice/app/io-context.h
+include/libgoffice-0.4/goffice/app/module-plugin-defs.h
+include/libgoffice-0.4/goffice/component/go-component-factory.h
+include/libgoffice-0.4/goffice/component/go-component.h
+include/libgoffice-0.4/goffice/component/goffice-component.h
+include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-line.h
+include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h
+include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h
+include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h
+include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-text.h
+include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-util.h
+include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas-widget.h
+include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/foo-canvas.h
+include/libgoffice-0.4/goffice/cut-n-paste/foocanvas/libfoocanvas.h
+include/libgoffice-0.4/goffice/data/go-data-impl.h
+include/libgoffice-0.4/goffice/data/go-data-simple.h
+include/libgoffice-0.4/goffice/data/go-data.h
+include/libgoffice-0.4/goffice/data/goffice-data.h
+include/libgoffice-0.4/goffice/drawing/god-anchor.h
+include/libgoffice-0.4/goffice/drawing/god-default-attributes.h
+include/libgoffice-0.4/goffice/drawing/god-drawing-group.h
+include/libgoffice-0.4/goffice/drawing/god-drawing-renderer-gdk.h
+include/libgoffice-0.4/goffice/drawing/god-drawing-view.h
+include/libgoffice-0.4/goffice/drawing/god-drawing.h
+include/libgoffice-0.4/goffice/drawing/god-image-store.h
+include/libgoffice-0.4/goffice/drawing/god-image.h
+include/libgoffice-0.4/goffice/drawing/god-paragraph-attributes.h
+include/libgoffice-0.4/goffice/drawing/god-property-table.h
+include/libgoffice-0.4/goffice/drawing/god-shape.h
+include/libgoffice-0.4/goffice/drawing/god-text-model.h
+include/libgoffice-0.4/goffice/goffice-features.h
+include/libgoffice-0.4/goffice/goffice.h
+include/libgoffice-0.4/goffice/graph/goffice-graph.h
+include/libgoffice-0.4/goffice/graph/gog-axis-line-impl.h
+include/libgoffice-0.4/goffice/graph/gog-axis-line.h
+include/libgoffice-0.4/goffice/graph/gog-axis.h
+include/libgoffice-0.4/goffice/graph/gog-chart-impl.h
+include/libgoffice-0.4/goffice/graph/gog-chart.h
+include/libgoffice-0.4/goffice/graph/gog-control-foocanvas.h
+include/libgoffice-0.4/goffice/graph/gog-data-allocator.h
+include/libgoffice-0.4/goffice/graph/gog-data-set.h
+include/libgoffice-0.4/goffice/graph/gog-error-bar.h
+include/libgoffice-0.4/goffice/graph/gog-graph-impl.h
+include/libgoffice-0.4/goffice/graph/gog-graph.h
+include/libgoffice-0.4/goffice/graph/gog-grid-line.h
+include/libgoffice-0.4/goffice/graph/gog-grid.h
+include/libgoffice-0.4/goffice/graph/gog-guru.h
+include/libgoffice-0.4/goffice/graph/gog-label.h
+include/libgoffice-0.4/goffice/graph/gog-legend.h
+include/libgoffice-0.4/goffice/graph/gog-object-xml.h
+include/libgoffice-0.4/goffice/graph/gog-object.h
+include/libgoffice-0.4/goffice/graph/gog-outlined-object.h
+include/libgoffice-0.4/goffice/graph/gog-plot-engine.h
+include/libgoffice-0.4/goffice/graph/gog-plot-impl.h
+include/libgoffice-0.4/goffice/graph/gog-plot.h
+include/libgoffice-0.4/goffice/graph/gog-reg-curve.h
+include/libgoffice-0.4/goffice/graph/gog-renderer-cairo.h
+include/libgoffice-0.4/goffice/graph/gog-renderer-gnome-print.h
+include/libgoffice-0.4/goffice/graph/gog-renderer-impl.h
+include/libgoffice-0.4/goffice/graph/gog-renderer.h
+include/libgoffice-0.4/goffice/graph/gog-series-impl.h
+include/libgoffice-0.4/goffice/graph/gog-series-lines.h
+include/libgoffice-0.4/goffice/graph/gog-series.h
+include/libgoffice-0.4/goffice/graph/gog-smoothed-curve.h
+include/libgoffice-0.4/goffice/graph/gog-style.h
+include/libgoffice-0.4/goffice/graph/gog-styled-object.h
+include/libgoffice-0.4/goffice/graph/gog-theme.h
+include/libgoffice-0.4/goffice/graph/gog-trend-line.h
+include/libgoffice-0.4/goffice/graph/gog-view.h
+include/libgoffice-0.4/goffice/gtk/go-action-combo-color.h
+include/libgoffice-0.4/goffice/gtk/go-action-combo-pixmaps.h
+include/libgoffice-0.4/goffice/gtk/go-action-combo-stack.h
+include/libgoffice-0.4/goffice/gtk/go-action-combo-text.h
+include/libgoffice-0.4/goffice/gtk/go-charmap-sel.h
+include/libgoffice-0.4/goffice/gtk/go-color-group.h
+include/libgoffice-0.4/goffice/gtk/go-color-palette.h
+include/libgoffice-0.4/goffice/gtk/go-color-selector.h
+include/libgoffice-0.4/goffice/gtk/go-combo-box.h
+include/libgoffice-0.4/goffice/gtk/go-combo-color.h
+include/libgoffice-0.4/goffice/gtk/go-combo-pixmaps.h
+include/libgoffice-0.4/goffice/gtk/go-combo-text.h
+include/libgoffice-0.4/goffice/gtk/go-font-sel.h
+include/libgoffice-0.4/goffice/gtk/go-format-sel.h
+include/libgoffice-0.4/goffice/gtk/go-gradient-selector.h
+include/libgoffice-0.4/goffice/gtk/go-graph-widget.h
+include/libgoffice-0.4/goffice/gtk/go-line-selector.h
+include/libgoffice-0.4/goffice/gtk/go-locale-sel.h
+include/libgoffice-0.4/goffice/gtk/go-marker-selector.h
+include/libgoffice-0.4/goffice/gtk/go-optionmenu.h
+include/libgoffice-0.4/goffice/gtk/go-palette.h
+include/libgoffice-0.4/goffice/gtk/go-pattern-selector.h
+include/libgoffice-0.4/goffice/gtk/go-rotation-sel.h
+include/libgoffice-0.4/goffice/gtk/go-selector.h
+include/libgoffice-0.4/goffice/gtk/goffice-gtk.h
+include/libgoffice-0.4/goffice/ms-compat/go-ms-parser.h
+include/libgoffice-0.4/goffice/ms-compat/god-drawing-ms-client-handler.h
+include/libgoffice-0.4/goffice/ms-compat/god-drawing-ms.h
+include/libgoffice-0.4/goffice/ms-compat/god-image-ms.h
+include/libgoffice-0.4/goffice/utils/datetime.h
+include/libgoffice-0.4/goffice/utils/go-color.h
+include/libgoffice-0.4/goffice/utils/go-cspline.h
+include/libgoffice-0.4/goffice/utils/go-file.h
+include/libgoffice-0.4/goffice/utils/go-font.h
+include/libgoffice-0.4/goffice/utils/go-format.h
+include/libgoffice-0.4/goffice/utils/go-geometry.h
+include/libgoffice-0.4/goffice/utils/go-glib-extras.h
+include/libgoffice-0.4/goffice/utils/go-gradient.h
+include/libgoffice-0.4/goffice/utils/go-image.h
+include/libgoffice-0.4/goffice/utils/go-libxml-extras.h
+include/libgoffice-0.4/goffice/utils/go-line.h
+include/libgoffice-0.4/goffice/utils/go-locale.h
+include/libgoffice-0.4/goffice/utils/go-marker.h
+include/libgoffice-0.4/goffice/utils/go-math.h
+include/libgoffice-0.4/goffice/utils/go-pattern.h
+include/libgoffice-0.4/goffice/utils/go-rangefunc.h
+include/libgoffice-0.4/goffice/utils/go-regression.h
+include/libgoffice-0.4/goffice/utils/go-undo.h
+include/libgoffice-0.4/goffice/utils/go-units.h
+include/libgoffice-0.4/goffice/utils/goffice-utils.h
+include/libgoffice-0.4/goffice/utils/regutf8.h
 lib/goffice/${PKGVERSION}/plugins/plot_barcol/barcol.la
 lib/goffice/${PKGVERSION}/plugins/plot_barcol/gog-barcol-prefs.glade
 lib/goffice/${PKGVERSION}/plugins/plot_barcol/gog-minmax-prefs.glade
@@ -145,6 +157,8 @@ lib/goffice/${PKGVERSION}/plugins/plot_surface/plot-types.xml
 lib/goffice/${PKGVERSION}/plugins/plot_surface/plugin.xml
 lib/goffice/${PKGVERSION}/plugins/plot_surface/surface.la
 lib/goffice/${PKGVERSION}/plugins/plot_xy/gog-bubble-prefs.glade
+lib/goffice/${PKGVERSION}/plugins/plot_xy/gog-xy-color-prefs.glade
+lib/goffice/${PKGVERSION}/plugins/plot_xy/gog-xy-series-prefs.glade
 lib/goffice/${PKGVERSION}/plugins/plot_xy/plot-types.xml
 lib/goffice/${PKGVERSION}/plugins/plot_xy/plugin.xml
 lib/goffice/${PKGVERSION}/plugins/plot_xy/xy.la
@@ -154,168 +168,283 @@ lib/goffice/${PKGVERSION}/plugins/reg_linear/reg-types.xml
 lib/goffice/${PKGVERSION}/plugins/reg_logfit/logfit.la
 lib/goffice/${PKGVERSION}/plugins/reg_logfit/plugin.xml
 lib/goffice/${PKGVERSION}/plugins/reg_logfit/reg-types.xml
-lib/libgoffice-1.la
-lib/pkgconfig/libgoffice-1.pc
+lib/goffice/${PKGVERSION}/plugins/smoothing/gog-exp-smooth.glade
+lib/goffice/${PKGVERSION}/plugins/smoothing/gog-moving-avg.glade
+lib/goffice/${PKGVERSION}/plugins/smoothing/plugin.xml
+lib/goffice/${PKGVERSION}/plugins/smoothing/smoothing.la
+lib/goffice/${PKGVERSION}/plugins/smoothing/types.xml
+lib/libgoffice-0.la
+lib/pkgconfig/libgoffice-0.4.pc
 share/goffice/${PKGVERSION}/glade/go-font-sel.glade
 share/goffice/${PKGVERSION}/glade/go-format-sel.glade
+share/goffice/${PKGVERSION}/glade/go-image-save-dialog-extra.glade
 share/goffice/${PKGVERSION}/glade/go-rotation-sel.glade
 share/goffice/${PKGVERSION}/glade/gog-axis-prefs.glade
-share/goffice/${PKGVERSION}/glade/gog-chart-prefs.glade
 share/goffice/${PKGVERSION}/glade/gog-error-bar-prefs.glade
+share/goffice/${PKGVERSION}/glade/gog-graph-prefs.glade
 share/goffice/${PKGVERSION}/glade/gog-guru-type-selector.glade
 share/goffice/${PKGVERSION}/glade/gog-guru.glade
 share/goffice/${PKGVERSION}/glade/gog-object-prefs.glade
+share/goffice/${PKGVERSION}/glade/gog-plot-prefs.glade
 share/goffice/${PKGVERSION}/glade/gog-reg-curve-prefs.glade
 share/goffice/${PKGVERSION}/glade/gog-reg-eqn-prefs.glade
 share/goffice/${PKGVERSION}/glade/gog-style-prefs.glade
 share/goffice/${PKGVERSION}/patterns/svg-patterns.xml
-share/locale/am/LC_MESSAGES/goffice.mo
-share/locale/az/LC_MESSAGES/goffice.mo
-share/locale/bg/LC_MESSAGES/goffice.mo
-share/locale/ca/LC_MESSAGES/goffice.mo
-share/locale/cs/LC_MESSAGES/goffice.mo
-share/locale/da/LC_MESSAGES/goffice.mo
-share/locale/de/LC_MESSAGES/goffice.mo
-share/locale/el/LC_MESSAGES/goffice.mo
-share/locale/en_CA/LC_MESSAGES/goffice.mo
-share/locale/en_GB/LC_MESSAGES/goffice.mo
-share/locale/es/LC_MESSAGES/goffice.mo
-share/locale/et/LC_MESSAGES/goffice.mo
-share/locale/fi/LC_MESSAGES/goffice.mo
-share/locale/fr/LC_MESSAGES/goffice.mo
-share/locale/ga/LC_MESSAGES/goffice.mo
-share/locale/gl/LC_MESSAGES/goffice.mo
-share/locale/he/LC_MESSAGES/goffice.mo
-share/locale/hr/LC_MESSAGES/goffice.mo
-share/locale/hu/LC_MESSAGES/goffice.mo
-share/locale/it/LC_MESSAGES/goffice.mo
-share/locale/ja/LC_MESSAGES/goffice.mo
-share/locale/ko/LC_MESSAGES/goffice.mo
-share/locale/lv/LC_MESSAGES/goffice.mo
-share/locale/ml/LC_MESSAGES/goffice.mo
-share/locale/mr/LC_MESSAGES/goffice.mo
-share/locale/ms/LC_MESSAGES/goffice.mo
-share/locale/nb/LC_MESSAGES/goffice.mo
-share/locale/nl/LC_MESSAGES/goffice.mo
-share/locale/nn/LC_MESSAGES/goffice.mo
-share/locale/no/LC_MESSAGES/goffice.mo
-share/locale/pl/LC_MESSAGES/goffice.mo
-share/locale/pt/LC_MESSAGES/goffice.mo
-share/locale/pt_BR/LC_MESSAGES/goffice.mo
-share/locale/ro/LC_MESSAGES/goffice.mo
-share/locale/ru/LC_MESSAGES/goffice.mo
-share/locale/sk/LC_MESSAGES/goffice.mo
-share/locale/sr/LC_MESSAGES/goffice.mo
-share/locale/sr@Latn/LC_MESSAGES/goffice.mo
-share/locale/sv/LC_MESSAGES/goffice.mo
-share/locale/tr/LC_MESSAGES/goffice.mo
-share/locale/uk/LC_MESSAGES/goffice.mo
-share/locale/vi/LC_MESSAGES/goffice.mo
-share/locale/zh_CN/LC_MESSAGES/goffice.mo
-share/locale/zh_TW/LC_MESSAGES/goffice.mo
-share/pixmaps/goffice/area.xpm
-share/pixmaps/goffice/bar-hboth.png
-share/pixmaps/goffice/bar-hminus.png
-share/pixmaps/goffice/bar-hplus.png
-share/pixmaps/goffice/bar-none.png
-share/pixmaps/goffice/bar-vboth.png
-share/pixmaps/goffice/bar-vminus.png
-share/pixmaps/goffice/bar-vplus.png
-share/pixmaps/goffice/bar.xpm
-share/pixmaps/goffice/boxplot.xpm
-share/pixmaps/goffice/bubble.xpm
-share/pixmaps/goffice/chart_area_1_1.png
-share/pixmaps/goffice/chart_area_1_2.png
-share/pixmaps/goffice/chart_area_1_3.png
-share/pixmaps/goffice/chart_bar_1_1.png
-share/pixmaps/goffice/chart_bar_1_2.png
-share/pixmaps/goffice/chart_bar_1_3.png
-share/pixmaps/goffice/chart_bar_2_1.png
-share/pixmaps/goffice/chart_bar_2_2.png
-share/pixmaps/goffice/chart_bar_2_3.png
-share/pixmaps/goffice/chart_boxplot_1_1.png
-share/pixmaps/goffice/chart_bubble_1_1.png
-share/pixmaps/goffice/chart_column_1_1.png
-share/pixmaps/goffice/chart_column_1_2.png
-share/pixmaps/goffice/chart_column_1_3.png
-share/pixmaps/goffice/chart_column_2_1.png
-share/pixmaps/goffice/chart_column_2_2.png
-share/pixmaps/goffice/chart_column_2_3.png
-share/pixmaps/goffice/chart_column_3_1.png
-share/pixmaps/goffice/chart_cone_1_1.png
-share/pixmaps/goffice/chart_cone_1_2.png
-share/pixmaps/goffice/chart_cone_1_3.png
-share/pixmaps/goffice/chart_cone_2_1.png
-share/pixmaps/goffice/chart_cone_2_2.png
-share/pixmaps/goffice/chart_cone_2_3.png
-share/pixmaps/goffice/chart_cone_3_1.png
-share/pixmaps/goffice/chart_contour_1_1.png
-share/pixmaps/goffice/chart_cylinder_1_1.png
-share/pixmaps/goffice/chart_cylinder_1_2.png
-share/pixmaps/goffice/chart_cylinder_1_3.png
-share/pixmaps/goffice/chart_cylinder_2_1.png
-share/pixmaps/goffice/chart_cylinder_2_2.png
-share/pixmaps/goffice/chart_cylinder_2_3.png
-share/pixmaps/goffice/chart_cylinder_3_1.png
-share/pixmaps/goffice/chart_dropbar_1_1.png
-share/pixmaps/goffice/chart_dropbar_1_2.png
-share/pixmaps/goffice/chart_line_1_1.png
-share/pixmaps/goffice/chart_line_1_2.png
-share/pixmaps/goffice/chart_line_1_3.png
-share/pixmaps/goffice/chart_line_2_1.png
-share/pixmaps/goffice/chart_line_2_2.png
-share/pixmaps/goffice/chart_line_2_3.png
-share/pixmaps/goffice/chart_line_3_1.png
-share/pixmaps/goffice/chart_minmax_1_1.png
-share/pixmaps/goffice/chart_minmax_1_2.png
-share/pixmaps/goffice/chart_minmax_2_1.png
-share/pixmaps/goffice/chart_minmax_2_2.png
-share/pixmaps/goffice/chart_pie_1_1.png
-share/pixmaps/goffice/chart_pie_1_2.png
-share/pixmaps/goffice/chart_pie_1_3.png
-share/pixmaps/goffice/chart_pie_2_1.png
-share/pixmaps/goffice/chart_pie_2_2.png
-share/pixmaps/goffice/chart_pie_2_3.png
-share/pixmaps/goffice/chart_polar_1_1.png
-share/pixmaps/goffice/chart_pyramid_1_1.png
-share/pixmaps/goffice/chart_pyramid_1_2.png
-share/pixmaps/goffice/chart_pyramid_1_3.png
-share/pixmaps/goffice/chart_pyramid_2_1.png
-share/pixmaps/goffice/chart_pyramid_2_2.png
-share/pixmaps/goffice/chart_pyramid_2_3.png
-share/pixmaps/goffice/chart_pyramid_3_1.png
-share/pixmaps/goffice/chart_radar_1_1.png
-share/pixmaps/goffice/chart_radar_1_2.png
-share/pixmaps/goffice/chart_radar_1_3.png
-share/pixmaps/goffice/chart_ring_1_1.png
-share/pixmaps/goffice/chart_ring_1_2.png
-share/pixmaps/goffice/chart_scatter_1_1.png
-share/pixmaps/goffice/chart_scatter_2_1.png
-share/pixmaps/goffice/chart_scatter_2_2.png
-share/pixmaps/goffice/chart_scatter_3_1.png
-share/pixmaps/goffice/chart_scatter_3_2.png
-share/pixmaps/goffice/chart_scatter_3_3.png
-share/pixmaps/goffice/chart_stock_1_1.png
-share/pixmaps/goffice/chart_stock_1_2.png
-share/pixmaps/goffice/chart_stock_2_1.png
-share/pixmaps/goffice/chart_stock_2_2.png
-share/pixmaps/goffice/column.xpm
-share/pixmaps/goffice/doughnut.xpm
-share/pixmaps/goffice/dropbar.xpm
-share/pixmaps/goffice/linegraph.xpm
-share/pixmaps/goffice/minmax.xpm
-share/pixmaps/goffice/pie.xpm
-share/pixmaps/goffice/polar.png
-share/pixmaps/goffice/radar.xpm
-share/pixmaps/goffice/scatter.xpm
-share/pixmaps/goffice/stock.xpm
-share/pixmaps/goffice/surface.xpm
+share/gtk-doc/html/goffice/GOData.html
+share/gtk-doc/html/goffice/GODataMatrix.html
+share/gtk-doc/html/goffice/GODataScalar.html
+share/gtk-doc/html/goffice/GODataVector.html
+share/gtk-doc/html/goffice/GogAxis.html
+share/gtk-doc/html/goffice/GogAxisLine.html
+share/gtk-doc/html/goffice/GogChart.html
+share/gtk-doc/html/goffice/GogDataAllocator.html
+share/gtk-doc/html/goffice/GogDataset.html
+share/gtk-doc/html/goffice/GogErrorBar.html
+share/gtk-doc/html/goffice/GogGraph.html
+share/gtk-doc/html/goffice/GogGrid.html
+share/gtk-doc/html/goffice/GogGridLine.html
+share/gtk-doc/html/goffice/GogLabel.html
+share/gtk-doc/html/goffice/GogLegend.html
+share/gtk-doc/html/goffice/GogObject.html
+share/gtk-doc/html/goffice/GogOutlinedObject.html
+share/gtk-doc/html/goffice/GogPersist.html
+share/gtk-doc/html/goffice/GogPlot.html
+share/gtk-doc/html/goffice/GogRegCurve.html
+share/gtk-doc/html/goffice/GogRegEqn.html
+share/gtk-doc/html/goffice/GogRenderer.html
+share/gtk-doc/html/goffice/GogSeries.html
+share/gtk-doc/html/goffice/GogSeriesLines.html
+share/gtk-doc/html/goffice/GogStyle.html
+share/gtk-doc/html/goffice/GogStyledObject.html
+share/gtk-doc/html/goffice/GogView.html
+share/gtk-doc/html/goffice/ch01.html
+share/gtk-doc/html/goffice/ch02.html
+share/gtk-doc/html/goffice/ch03.html
+share/gtk-doc/html/goffice/ch04.html
+share/gtk-doc/html/goffice/ch05.html
+share/gtk-doc/html/goffice/ch06.html
+share/gtk-doc/html/goffice/ch07.html
+share/gtk-doc/html/goffice/ch08.html
+share/gtk-doc/html/goffice/ch09.html
+share/gtk-doc/html/goffice/ch10.html
+share/gtk-doc/html/goffice/ch11.html
+share/gtk-doc/html/goffice/goffice-GOComboBox.html
+share/gtk-doc/html/goffice/goffice-GOComboColor.html
+share/gtk-doc/html/goffice/goffice-GOComponent.html
+share/gtk-doc/html/goffice/goffice-GODoc.html
+share/gtk-doc/html/goffice/goffice-GODocControl.html
+share/gtk-doc/html/goffice/goffice-GOPluginLoader.html
+share/gtk-doc/html/goffice/goffice-GOPluginService.html
+share/gtk-doc/html/goffice/goffice-GOService.html
+share/gtk-doc/html/goffice/goffice-GoApp.html
+share/gtk-doc/html/goffice/goffice-GoCharmapSel.html
+share/gtk-doc/html/goffice/goffice-GoCmdContext.html
+share/gtk-doc/html/goffice/goffice-GoColor.html
+share/gtk-doc/html/goffice/goffice-GoComboPixmaps.html
+share/gtk-doc/html/goffice/goffice-GoComboText.html
+share/gtk-doc/html/goffice/goffice-GoComponentFactory.html
+share/gtk-doc/html/goffice/goffice-GoFontSel.html
+share/gtk-doc/html/goffice/goffice-GoFormatSel.html
+share/gtk-doc/html/goffice/goffice-GoGeometry.html
+share/gtk-doc/html/goffice/goffice-GoGlibExtras.html
+share/gtk-doc/html/goffice/goffice-GoLibxmlExtras.html
+share/gtk-doc/html/goffice/goffice-GoLocaleSel.html
+share/gtk-doc/html/goffice/goffice-GoObject.html
+share/gtk-doc/html/goffice/goffice-GoOptionMenu.html
+share/gtk-doc/html/goffice/goffice-GoPluginLoaderModule.html
+share/gtk-doc/html/goffice/goffice-GoRotationSel.html
+share/gtk-doc/html/goffice/goffice-GoSearchReplace.html
+share/gtk-doc/html/goffice/goffice-GogAxisMap.html
+share/gtk-doc/html/goffice/goffice-GogChartMap.html
+share/gtk-doc/html/goffice/goffice-GogControlFooCanvas.html
+share/gtk-doc/html/goffice/goffice-GogEditor.html
+share/gtk-doc/html/goffice/goffice-GogGuru.html
+share/gtk-doc/html/goffice/goffice-GogPlotEngine.html
+share/gtk-doc/html/goffice/goffice-GogTool.html
+share/gtk-doc/html/goffice/goffice-Math.html
+share/gtk-doc/html/goffice/goffice-Ranges.html
+share/gtk-doc/html/goffice/goffice-RegUTF8.html
+share/gtk-doc/html/goffice/goffice-Regressions.html
+share/gtk-doc/html/goffice/goffice-Units.html
+share/gtk-doc/html/goffice/goffice-go-format.html
+share/gtk-doc/html/goffice/goffice-go-gradient.html
+share/gtk-doc/html/goffice/goffice-go-line.html
+share/gtk-doc/html/goffice/goffice-go-marker.html
+share/gtk-doc/html/goffice/goffice-go-pattern.html
+share/gtk-doc/html/goffice/goffice-go-plugin.html
+share/gtk-doc/html/goffice/goffice-gog-theme.html
+share/gtk-doc/html/goffice/goffice.devhelp
+share/gtk-doc/html/goffice/goffice.devhelp2
+share/gtk-doc/html/goffice/home.png
+share/gtk-doc/html/goffice/index.html
+share/gtk-doc/html/goffice/index.sgml
+share/gtk-doc/html/goffice/left.png
+share/gtk-doc/html/goffice/pt01.html
+share/gtk-doc/html/goffice/pt02.html
+share/gtk-doc/html/goffice/pt03.html
+share/gtk-doc/html/goffice/right.png
+share/gtk-doc/html/goffice/style.css
+share/gtk-doc/html/goffice/up.png
+share/locale/am/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/az/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/bg/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/ca/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/cs/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/da/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/de/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/el/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/en_CA/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/en_GB/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/es/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/et/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/fi/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/fr/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/ga/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/gl/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/he/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/hr/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/hu/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/it/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/ja/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/ko/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/lv/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/ml/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/mr/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/ms/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/nb/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/nl/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/nn/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/pl/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/pt/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/pt_BR/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/ro/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/ru/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/sk/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/sr/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/sr@Latn/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/sv/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/tr/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/uk/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/vi/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/zh_CN/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/locale/zh_TW/LC_MESSAGES/goffice-${PKGVERSION}.mo
+share/pixmaps/goffice/${PKGVERSION}/area.xpm
+share/pixmaps/goffice/${PKGVERSION}/bar-hboth.png
+share/pixmaps/goffice/${PKGVERSION}/bar-hminus.png
+share/pixmaps/goffice/${PKGVERSION}/bar-hplus.png
+share/pixmaps/goffice/${PKGVERSION}/bar-none.png
+share/pixmaps/goffice/${PKGVERSION}/bar-vboth.png
+share/pixmaps/goffice/${PKGVERSION}/bar-vminus.png
+share/pixmaps/goffice/${PKGVERSION}/bar-vplus.png
+share/pixmaps/goffice/${PKGVERSION}/bar.xpm
+share/pixmaps/goffice/${PKGVERSION}/boxplot.xpm
+share/pixmaps/goffice/${PKGVERSION}/bubble.xpm
+share/pixmaps/goffice/${PKGVERSION}/chart_area_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_area_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_area_1_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_bar_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_bar_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_bar_1_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_bar_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_bar_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_bar_2_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_boxplot_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_boxplot_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_bubble_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_colored_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_column_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_column_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_column_1_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_column_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_column_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_column_2_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_column_3_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cone_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cone_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cone_1_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cone_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cone_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cone_2_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cone_3_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_contour_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cylinder_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cylinder_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cylinder_1_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cylinder_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cylinder_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cylinder_2_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_cylinder_3_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_dropbar_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_dropbar_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_histogram_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_line_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_line_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_line_1_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_line_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_line_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_line_2_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_line_3_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_minmax_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_minmax_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_minmax_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_minmax_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pie_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pie_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pie_1_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pie_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pie_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pie_2_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pie_3_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pie_3_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_polar_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pyramid_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pyramid_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pyramid_1_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pyramid_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pyramid_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pyramid_2_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_pyramid_3_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_radar_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_radar_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_radar_1_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_ring_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_ring_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_3_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_3_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_3_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_4_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_4_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_4_3.png
+share/pixmaps/goffice/${PKGVERSION}/chart_scatter_4_4.png
+share/pixmaps/goffice/${PKGVERSION}/chart_stock_1_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_stock_1_2.png
+share/pixmaps/goffice/${PKGVERSION}/chart_stock_2_1.png
+share/pixmaps/goffice/${PKGVERSION}/chart_stock_2_2.png
+share/pixmaps/goffice/${PKGVERSION}/color.xpm
+share/pixmaps/goffice/${PKGVERSION}/column.xpm
+share/pixmaps/goffice/${PKGVERSION}/doughnut.xpm
+share/pixmaps/goffice/${PKGVERSION}/dropbar.xpm
+share/pixmaps/goffice/${PKGVERSION}/hist.xpm
+share/pixmaps/goffice/${PKGVERSION}/linegraph.xpm
+share/pixmaps/goffice/${PKGVERSION}/minmax.xpm
+share/pixmaps/goffice/${PKGVERSION}/pie.xpm
+share/pixmaps/goffice/${PKGVERSION}/polar.png
+share/pixmaps/goffice/${PKGVERSION}/radar.xpm
+share/pixmaps/goffice/${PKGVERSION}/scatter.xpm
+share/pixmaps/goffice/${PKGVERSION}/stock.xpm
+share/pixmaps/goffice/${PKGVERSION}/surface.xpm
+@dirrm share/pixmaps/goffice/${PKGVERSION}
 @dirrm share/pixmaps/goffice
 @comment @dirrm share/pixmaps
+@dirrm share/gtk-doc/html/goffice
 @dirrm share/goffice/${PKGVERSION}/patterns
 @dirrm share/goffice/${PKGVERSION}/glade
 @dirrm share/goffice/${PKGVERSION}
-@dirrm share/goffice
+@unexec ${RMDIR} %D/share/goffice 2>/dev/null || ${TRUE}
+@dirrm lib/goffice/${PKGVERSION}/plugins/smoothing
 @dirrm lib/goffice/${PKGVERSION}/plugins/reg_logfit
 @dirrm lib/goffice/${PKGVERSION}/plugins/reg_linear
 @dirrm lib/goffice/${PKGVERSION}/plugins/plot_xy
@@ -326,16 +455,16 @@ share/pixmaps/goffice/surface.xpm
 @dirrm lib/goffice/${PKGVERSION}/plugins/plot_barcol
 @dirrm lib/goffice/${PKGVERSION}/plugins
 @dirrm lib/goffice/${PKGVERSION}
-@dirrm lib/goffice
-@dirrm include/libgoffice-1/goffice/utils
-@dirrm include/libgoffice-1/goffice/ms-compat
-@dirrm include/libgoffice-1/goffice/gtk
-@dirrm include/libgoffice-1/goffice/graph
-@dirrm include/libgoffice-1/goffice/drawing
-@dirrm include/libgoffice-1/goffice/data
-@dirrm include/libgoffice-1/goffice/cut-n-paste/pcre
-@dirrm include/libgoffice-1/goffice/cut-n-paste/foocanvas
-@dirrm include/libgoffice-1/goffice/cut-n-paste
-@dirrm include/libgoffice-1/goffice/app
-@dirrm include/libgoffice-1/goffice
-@dirrm include/libgoffice-1
+@unexec ${RMDIR} %D/lib/goffice 2>/dev/null || ${TRUE}
+@dirrm include/libgoffice-0.4/goffice/utils
+@dirrm include/libgoffice-0.4/goffice/ms-compat
+@dirrm include/libgoffice-0.4/goffice/gtk
+@dirrm include/libgoffice-0.4/goffice/graph
+@dirrm include/libgoffice-0.4/goffice/drawing
+@dirrm include/libgoffice-0.4/goffice/data
+@dirrm include/libgoffice-0.4/goffice/cut-n-paste/foocanvas
+@dirrm include/libgoffice-0.4/goffice/cut-n-paste
+@dirrm include/libgoffice-0.4/goffice/component
+@dirrm include/libgoffice-0.4/goffice/app
+@dirrm include/libgoffice-0.4/goffice
+@dirrm include/libgoffice-0.4
diff --git a/misc/goffice/buildlink3.mk b/misc/goffice/buildlink3.mk
index c6ee40e5782..76456b63531 100644
--- a/misc/goffice/buildlink3.mk
+++ b/misc/goffice/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/03/21 12:05:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/05/05 00:33:43 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GOFFICE_BUILDLINK3_MK:=	${GOFFICE_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	goffice
 .endif
 
@@ -11,12 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngoffice}
 BUILDLINK_PACKAGES+=	goffice
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}goffice
 
-.if !empty(GOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.goffice+=	goffice>=0.1.2
-BUILDLINK_ABI_DEPENDS.goffice?=	goffice>=0.2.2nb1
+.if ${GOFFICE_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.goffice+=	goffice>=0.4.0
 BUILDLINK_PKGSRCDIR.goffice?=	../../misc/goffice
 .endif	# GOFFICE_BUILDLINK3_MK
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -24,6 +24,7 @@ BUILDLINK_PKGSRCDIR.goffice?=	../../misc/goffice
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/misc/goffice/distinfo b/misc/goffice/distinfo
index 554bcfa4f9d..162f2e01023 100644
--- a/misc/goffice/distinfo
+++ b/misc/goffice/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2006/11/14 16:56:22 drochner Exp $
+$NetBSD: distinfo,v 1.5 2007/05/05 00:33:44 wiz Exp $
 
-SHA1 (goffice-0.2.2.tar.gz) = 1a037163bd5bb0cfb4f2510fed68b54aeeb845c2
-RMD160 (goffice-0.2.2.tar.gz) = e176be07473395ff449e31e782cdf19a812f6518
-Size (goffice-0.2.2.tar.gz) = 2359979 bytes
+SHA1 (goffice-0.4.0.tar.gz) = 90bddf3744e45beb046c0ee6560a3ad132811953
+RMD160 (goffice-0.4.0.tar.gz) = d4dcbef9d4b17073adeab3cf091d88aaf4f1e25e
+Size (goffice-0.4.0.tar.gz) = 2735675 bytes