Update to 0.10.46 and only keep one libgoffice version

libgoffice 0.10 has been introduced long enough ago 6 years ago, stopping support
for libgoffice 0.8, it is now more than time, to remove libgoffice 0.8 and only
keep 0.10.

Remove the optionnal goffice option for projects not supporting 0.10.

17 files changed, 236 insertions, 909 deletions

diff --git a/MOVED b/MOVED
index 3349e02b04a9..f7a6a2ef293e 100644
--- a/MOVED
+++ b/MOVED
@@ -13532,3 +13532,4 @@ sysutils/pcbsd-utils||2019-12-15|Has expired: Abandoned upstream
 sysutils/warden||2019-12-15|Has expired: Abandoned upstream
 devel/glade3|devel/glade|2019-12-16|Overcome by newer version
 devel/glade2|devel/glade|2019-12-16|Overcome by newer version
+devel/goffice010|devel/goffice|2019-12-16|Main port updated to latest version
diff --git a/devel/Makefile b/devel/Makefile
index c356f821b053..7751f82e7291 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -870,7 +870,6 @@
     SUBDIR += godot2
     SUBDIR += godot2-tools
     SUBDIR += goffice
-    SUBDIR += goffice010
     SUBDIR += gogland-eap
     SUBDIR += gogs
     SUBDIR += golint
diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile
index bc36c2ebc259..19ae0b86b1fc 100644
--- a/devel/cutter/Makefile
+++ b/devel/cutter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cutter
 PORTVERSION=	1.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -27,16 +27,11 @@ USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=	GOFFICE SOUP LCOV NLS
+OPTIONS_DEFINE=	SOUP LCOV NLS
 OPTIONS_SUB=	yes
-GOFFICE_DESC=	GOffice support
 SOUP_DESC=	libsoup support
 LCOV_DESC=	Force dependency on lcov
 
-GOFFICE_CONFIGURE_ENABLE=goffice
-# the 0.8 is part of the library name don't remove it.
-GOFFICE_LIB_DEPENDS=	libgoffice-0.8.so:devel/goffice
-
 LCOV_RUN_DEPENDS=	lcov:devel/lcov
 
 SOUP_CONFIGURE_ENABLE=	libsoup
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index f3821182544e..c62963d0fe35 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -1,13 +1,10 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/goffice/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	goffice
-PORTVERSION=	0.8.17
-PORTREVISION=	9
+PORTVERSION=	0.10.46
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
-PKGNAMESUFFIX=	08
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib/GTK+ set of document centric objects and utilities
@@ -15,29 +12,29 @@ COMMENT=	GLib/GTK+ set of document centric objects and utilities
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PORTSCOUT=	ignore:1
+LIB_DEPENDS=	libspectre.so:print/libspectre \
+		libfribidi.so:converters/fribidi
 
-LIB_DEPENDS=	libpcre.so:devel/pcre
-
-USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gnomeprefix intlhack gtk20 libgsf
+USES=		gettext gmake gnome libtool pathfix perl5 pkgconfig \
+		shebangfix tar:xz xorg
+USE_GNOME=	cairo gtk30 intlhack introspection:build libgsf librsvg2 libxslt
+USE_XORG=	xrender xext
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
-PLIST_SUB=	VERSION=${PORTVERSION} \
-		SHORT_VER=0.8
-
-OPTIONS_DEFINE=	GCONF
-OPTIONS_DEFAULT=GCONF
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGCONF}
-USE_GNOME+=	gconf2
-.else
-CONFIGURE_ARGS+=--with-config-backend=keyfile
-.endif
+CONFIGURE_ARGS=	--with-lasem=no --with-config-backend=gsettings \
+		--enable-compile-warnings=no \
+		--enable-introspection
+USE_PERL5=	build
+SHEBANG_FILES=	${WRKSRC}/tools/introspection-identifier-filter
+
+PLIST_SUB=	VERSION=${PORTVERSION} SHORT_VER=${PORTVERSION:R}
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/goffice/${SHORT_VER}/plugins
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgoffice-0.10.so.*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/goffice/${PORTVERSION}/plugins/*/*.so
 
 .include <bsd.port.mk>
diff --git a/devel/goffice/distinfo b/devel/goffice/distinfo
index 2925f625f32d..01c540f49858 100644
--- a/devel/goffice/distinfo
+++ b/devel/goffice/distinfo
@@ -1,2 +1,3 @@
-SHA256 (goffice-0.8.17.tar.xz) = 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15
-SIZE (goffice-0.8.17.tar.xz) = 1814488
+TIMESTAMP = 1576515304
+SHA256 (goffice-0.10.46.tar.xz) = 058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9
+SIZE (goffice-0.10.46.tar.xz) = 2397976
diff --git a/devel/goffice/files/patch-configure b/devel/goffice/files/patch-configure
deleted file mode 100644
index 353df3a8c29f..000000000000
--- a/devel/goffice/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2012-06-04 20:59:55.000000000 +0200
-+++ configure	2012-06-04 21:00:30.000000000 +0200
-@@ -15161,7 +15161,7 @@
- $as_echo_n "checking for G_REGEX_ERROR_STRAY_BACKSLASH... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <glib/gregex.h>
-+#include <glib.h>
- int
- main ()
- {
diff --git a/devel/goffice/files/patch-goffice_utils_regutf8.c b/devel/goffice/files/patch-goffice_utils_regutf8.c
deleted file mode 100644
index 4a0633af7496..000000000000
--- a/devel/goffice/files/patch-goffice_utils_regutf8.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- goffice/utils/regutf8.c.orig	2009-09-05 23:52:09.000000000 +0000
-+++ goffice/utils/regutf8.c	2013-03-13 17:22:39.000000000 +0000
-@@ -21,11 +21,7 @@ void
- go_regfree (GORegexp *gor)
- {
- 	if (gor->ppcre) {
--#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
- 		g_regex_unref (gor->ppcre);
--#else
--		pcre_free (gor->ppcre);
--#endif
- 		gor->ppcre = NULL;
- 	}
- }
-@@ -70,7 +66,6 @@ go_regerror (int errcode, const GORegexp
- int
- go_regcomp (GORegexp *gor, const char *pat, int cflags)
- {
--#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
- 	GError *error = NULL;
- 	GRegex *r;
- 	int coptions =
-@@ -119,7 +114,7 @@ go_regcomp (GORegexp *gor, const char *p
- 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
- 		return 0;
- 	}
--#else
-+#if 0
- 	const char *errorptr;
- 	int errorofs, errorcode;
- 	pcre *r;
-@@ -167,7 +162,6 @@ int
- go_regexec (const GORegexp *gor, const char *txt,
- 	    size_t nmatch, GORegmatch *pmatch, int eflags)
- {
--#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
- 	int eoptions =
- 		((eflags & GO_REG_NOTBOL) ? G_REGEX_MATCH_NOTBOL : 0) |
- 		((eflags & GO_REG_NOTEOL) ? G_REGEX_MATCH_NOTEOL : 0);
-@@ -196,7 +190,7 @@ go_regexec (const GORegexp *gor, const c
- 		g_match_info_free (match_info);
- 
- 	return matched ? GO_REG_NOERROR : GO_REG_NOMATCH;
--#else
-+#if 0
- 	size_t txtlen = strlen (txt);
- 	int eoptions =
- 		((eflags & GO_REG_NOTBOL) ? PCRE_NOTBOL : 0) |
diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist
index 816f549c9c07..8c4439d8aa31 100644
--- a/devel/goffice/pkg-plist
+++ b/devel/goffice/pkg-plist
@@ -12,6 +12,7 @@ include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-loader.h
 include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service-impl.h
 include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service.h
 include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin.h
+include/libgoffice-%%SHORT_VER%%/goffice/app/go-view.h
 include/libgoffice-%%SHORT_VER%%/goffice/app/goffice-app.h
 include/libgoffice-%%SHORT_VER%%/goffice/app/io-context-priv.h
 include/libgoffice-%%SHORT_VER%%/goffice/app/io-context.h
@@ -19,9 +20,11 @@ include/libgoffice-%%SHORT_VER%%/goffice/app/module-plugin-defs.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-arc.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-canvas.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-circle.h
+include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-component.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-ellipse.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-graph.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-group.h
+include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-image.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-item.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-line.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-path.h
@@ -36,29 +39,18 @@ include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-utils.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-widget.h
 include/libgoffice-%%SHORT_VER%%/goffice/canvas/goffice-canvas.h
 include/libgoffice-%%SHORT_VER%%/goffice/component/go-component-factory.h
+include/libgoffice-%%SHORT_VER%%/goffice/component/go-component-mime-dialog.h
 include/libgoffice-%%SHORT_VER%%/goffice/component/go-component.h
 include/libgoffice-%%SHORT_VER%%/goffice/component/goffice-component.h
 include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-impl.h
 include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-simple.h
 include/libgoffice-%%SHORT_VER%%/goffice/data/go-data.h
 include/libgoffice-%%SHORT_VER%%/goffice/data/goffice-data.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-anchor.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-default-attributes.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-group.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-renderer-gdk.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing-view.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-drawing.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image-store.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-image.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-paragraph-attributes.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-property-table.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-shape.h
-include/libgoffice-%%SHORT_VER%%/goffice/drawing/god-text-model.h
 include/libgoffice-%%SHORT_VER%%/goffice/goffice-features.h
 include/libgoffice-%%SHORT_VER%%/goffice/goffice.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/goffice-graph.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-3d-box.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-line-impl.h
+include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-color-map.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-line.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-impl.h
@@ -66,8 +58,10 @@ include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map-3d.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-child-button.h
+include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-color-scale.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-allocator.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-set.h
+include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-equation.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-error-bar.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph-impl.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph.h
@@ -85,6 +79,7 @@ include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-reg-curve.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-renderer.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-impl.h
+include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-labels.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-lines.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series.h
 include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-smoothed-curve.h
@@ -97,6 +92,7 @@ include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-color.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-pixmaps.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-stack.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-text.h
+include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-arrow-sel.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-calendar-button.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-charmap-sel.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-group.h
@@ -105,7 +101,7 @@ include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-selector.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-box.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-color.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-pixmaps.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-text.h
+include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-font-sel-dialog.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-font-sel.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-format-sel.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-gradient-selector.h
@@ -114,36 +110,37 @@ include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-image-sel.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-line-selector.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-locale-sel.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-marker-selector.h
+include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-math-editor.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-optionmenu.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-palette.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pattern-selector.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pixbuf.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-rotation-sel.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-selector.h
 include/libgoffice-%%SHORT_VER%%/goffice/gtk/goffice-gtk.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-R.h
+include/libgoffice-%%SHORT_VER%%/goffice/math/go-accumulator.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-complex.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-cspline.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-distribution.h
+include/libgoffice-%%SHORT_VER%%/goffice/math/go-dtoa.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-fft.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-math.h
+include/libgoffice-%%SHORT_VER%%/goffice/math/go-matrix.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-matrix3x3.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-quad.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-rangefunc.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/go-regression.h
 include/libgoffice-%%SHORT_VER%%/goffice/math/goffice-math.h
-include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/go-ms-parser.h
-include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms-client-handler.h
-include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-drawing-ms.h
-include/libgoffice-%%SHORT_VER%%/goffice/ms-compat/god-image-ms.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/datetime.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-bezier.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-cairo.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-color.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-editor.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-emf.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-file.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-font.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-format.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-gdk-pixbuf.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-geometry.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-glib-extras.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-gradient.h
@@ -152,50 +149,39 @@ include/libgoffice-%%SHORT_VER%%/goffice/utils/go-libxml-extras.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-line.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-locale.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-marker.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-mml-to-itex.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pango-extras.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-path.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pattern.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-persist.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pixbuf.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-rsm.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-spectre.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-string.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-style.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-styled-object.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-svg.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-undo.h
+include/libgoffice-%%SHORT_VER%%/goffice/utils/go-unit.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/go-units.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/goffice-utils.h
 include/libgoffice-%%SHORT_VER%%/goffice/utils/regutf8.h
+lib/girepository-1.0/GOffice-%%SHORT_VER%%.typelib
 lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so
-lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-area-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-barcol-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_barcol/gog-minmax-prefs.ui
 lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml
 lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml
 lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.so
-lib/goffice/%%VERSION%%/plugins/plot_distrib/gog-boxplot-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_distrib/gog-double-histogram-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_distrib/gog-histogram-prefs.ui
 lib/goffice/%%VERSION%%/plugins/plot_distrib/plot-types.xml
 lib/goffice/%%VERSION%%/plugins/plot_distrib/plugin.xml
-lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_pie/gog-pie-series.ui
-lib/goffice/%%VERSION%%/plugins/plot_pie/gog-ring-prefs.ui
 lib/goffice/%%VERSION%%/plugins/plot_pie/pie.so
 lib/goffice/%%VERSION%%/plugins/plot_pie/plot-types.xml
 lib/goffice/%%VERSION%%/plugins/plot_pie/plugin.xml
-lib/goffice/%%VERSION%%/plugins/plot_radar/gog-color-polar-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_radar/gog-polar-prefs.ui
 lib/goffice/%%VERSION%%/plugins/plot_radar/plot-types.xml
 lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml
 lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so
-lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_surface/gog-xyz-surface-prefs.ui
 lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml
 lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml
 lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so
-lib/goffice/%%VERSION%%/plugins/plot_xy/gog-bubble-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-color-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-dropbar-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-prefs.ui
-lib/goffice/%%VERSION%%/plugins/plot_xy/gog-xy-series-prefs.ui
 lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml
 lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml
 lib/goffice/%%VERSION%%/plugins/plot_xy/xy.so
@@ -205,185 +191,188 @@ lib/goffice/%%VERSION%%/plugins/reg_linear/reg-types.xml
 lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so
 lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml
 lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml
-lib/goffice/%%VERSION%%/plugins/smoothing/gog-exp-smooth.ui
-lib/goffice/%%VERSION%%/plugins/smoothing/gog-moving-avg.ui
 lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml
 lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so
 lib/goffice/%%VERSION%%/plugins/smoothing/types.xml
 lib/libgoffice-%%SHORT_VER%%.so
-lib/libgoffice-%%SHORT_VER%%.so.8
-lib/libgoffice-%%SHORT_VER%%.so.8.0.17
+lib/libgoffice-%%SHORT_VER%%.so.10
+lib/libgoffice-%%SHORT_VER%%.so.10.0.46
 libdata/pkgconfig/libgoffice-%%SHORT_VER%%.pc
-%%DOCSDIR%%-%%SHORT_VER%%/GOCalendarButton.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOCharmapSel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOCmdContext.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOComboBox.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOComboColor.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOComboPixmaps.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOComboText.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOComponent.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOData.html
-%%DOCSDIR%%-%%SHORT_VER%%/GODataMatrix.html
-%%DOCSDIR%%-%%SHORT_VER%%/GODataScalar.html
-%%DOCSDIR%%-%%SHORT_VER%%/GODataVector.html
-%%DOCSDIR%%-%%SHORT_VER%%/GODoc.html
-%%DOCSDIR%%-%%SHORT_VER%%/GODocControl.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOFileOpener.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOFileSaver.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOFontSel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOFormatSel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOGraphWidget.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOIOContext.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOLocaleSel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOMarker.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOOptionMenu.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOPersist.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOPluginLoader.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOPluginLoaderModule.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOPluginService.html
-%%DOCSDIR%%-%%SHORT_VER%%/GORotationSel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOSearchReplace.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOSelector.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOStyle.html
-%%DOCSDIR%%-%%SHORT_VER%%/GOStyledObject.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocArc.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocCanvas.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocCircle.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocEllipse.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocGraph.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocGroup.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocItem.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocLine.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocPixbuf.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocPolygon.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocPolyline.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocRectangle.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocStyledItem.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocText.html
-%%DOCSDIR%%-%%SHORT_VER%%/GocWidget.html
-%%DOCSDIR%%-%%SHORT_VER%%/Gog3DBox.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogAxis.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogAxisLine.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogChart.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogDataAllocator.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogDataset.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogErrorBar.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogGraph.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogGrid.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogGridLine.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogLabel.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogLegend.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogObject.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogOutlinedObject.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogPlot.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogRegCurve.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogRegEqn.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogRenderer.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogSeries.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogSeriesLines.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogSmoothedCurve.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogStyledObject.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogText.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogTheme.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogTrendLine.html
-%%DOCSDIR%%-%%SHORT_VER%%/GogView.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch01.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch02.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch03.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch04.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch05.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch06.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch07.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch08.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch09.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch10.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch11.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch12.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch13.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch14.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch15.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch16.html
-%%DOCSDIR%%-%%SHORT_VER%%/ch17.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOArrow.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOBezierSpline.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOCSpline.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOCairo.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOColor.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOComplex.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOComponentFactory.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOEditor.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOFft.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOFile.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOFont.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOFormat.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOGeometry.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOGlibExtras.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOGradient.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOLibxmlExtras.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOLine.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOMath.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOPalette.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOPath.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOPattern.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GORange.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOReg.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GORegression.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOUndo.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOUrl.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GOffice.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogAxisMap.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogChartMap.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogGuru.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogPlotEngine.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-GogTool.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-Other-utilities.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-Other.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-Simple-structures.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-Units.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-color-group.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-data-simple.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-distribution.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-image.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-plugin.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8-go-string.html
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8.devhelp
-%%DOCSDIR%%-%%SHORT_VER%%/goffice-0.8.devhelp2
-%%DOCSDIR%%-%%SHORT_VER%%/home.png
-%%DOCSDIR%%-%%SHORT_VER%%/index.html
-%%DOCSDIR%%-%%SHORT_VER%%/index.sgml
-%%DOCSDIR%%-%%SHORT_VER%%/left.png
-%%DOCSDIR%%-%%SHORT_VER%%/pt01.html
-%%DOCSDIR%%-%%SHORT_VER%%/pt02.html
-%%DOCSDIR%%-%%SHORT_VER%%/pt03.html
-%%DOCSDIR%%-%%SHORT_VER%%/pt04.html
-%%DOCSDIR%%-%%SHORT_VER%%/right.png
-%%DOCSDIR%%-%%SHORT_VER%%/style.css
-%%DOCSDIR%%-%%SHORT_VER%%/up.png
-%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml
-%%DATADIR%%/%%VERSION%%/ui/go-3d-rotation-sel.ui
-%%DATADIR%%/%%VERSION%%/ui/go-font-sel.ui
-%%DATADIR%%/%%VERSION%%/ui/go-format-sel.ui
-%%DATADIR%%/%%VERSION%%/ui/go-image-save-dialog-extra.ui
-%%DATADIR%%/%%VERSION%%/ui/go-image-sel.ui
-%%DATADIR%%/%%VERSION%%/ui/go-rotation-sel.ui
-%%DATADIR%%/%%VERSION%%/ui/go-style-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-3d-box-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-axis-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-equation-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-error-bar-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-graph-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-guru-type-selector.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-guru.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-object-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-plot-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-reg-curve-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-reg-eqn-prefs.ui
-%%DATADIR%%/%%VERSION%%/ui/gog-series-prefs.ui
+share/gir-1.0/GOffice-%%SHORT_VER%%.gir
+%%DATADIR%%/%%VERSION%%/mmlitex/README
+%%DATADIR%%/%%VERSION%%/mmlitex/cmarkup.xsl
+%%DATADIR%%/%%VERSION%%/mmlitex/entities.xsl
+%%DATADIR%%/%%VERSION%%/mmlitex/glayout.xsl
+%%DATADIR%%/%%VERSION%%/mmlitex/mmlitex.xsl
+%%DATADIR%%/%%VERSION%%/mmlitex/scripts.xsl
+%%DATADIR%%/%%VERSION%%/mmlitex/tables.xsl
+%%DATADIR%%/%%VERSION%%/mmlitex/tokens.xsl
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOArrow.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOBezierSpline.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOCalendarButton.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOCharmapSel.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOCmdContext.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOColorGroup.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComboBox.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComboColor.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComboPixmaps.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComplex.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComponent.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOData.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GODataMatrix.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GODataScalar.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GODateConventions.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GODistribution.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GODoc.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GODocControl.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOEditor.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOErrorInfo.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFileSaver.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFont.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFontSel.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFormat.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFormatSel.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOGraphWidget.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOIOContext.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOImage.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOLocaleSel.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOMarker.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOOptionMenu.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPalette.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPath.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPersist.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPixbuf.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPlugin.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPluginLoader.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPluginLoaderModule.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPluginService.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GORotationSel.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOSearchReplace.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOSelector.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOString.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOStyle.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOStyledObject.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GOUndoUnary.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GoView.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocArc.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocCanvas.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocCircle.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocEllipse.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocGraph.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocGroup.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocItem.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocLine.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocPixbuf.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocPolygon.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocPolyline.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocRectangle.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocStyledItem.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocText.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GocWidget.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/Gog3DBox.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogAxis.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogAxisColorMap.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogAxisLine.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogAxisMap.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogChart.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogChartMap.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogColorScale.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogDataEditor.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogDataset.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogErrorBar.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogGraph.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogGrid.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogGridLine.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogLabel.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogLegend.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogObject.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogOutlinedView.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogPlot.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogRegCurve.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogRegEqn.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogRenderer.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogSeries.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogSeriesLabels.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogSeriesLines.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogSmoothedCurve.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogStyledObject.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogText.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogTrendLine.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/GogView.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/annotation-glossary.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch01.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch02.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch03.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch04.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch05.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch06.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch07.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch08.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch09.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch10.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch11.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch12.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch13.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch14.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch15.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch16.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/ch17.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Cairo-utilities.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Components-factory.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Cubic-splines.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Encapsulated-Postscript-support.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Families-and-types.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Fast-Fourier-transform.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-File-utilities.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Files.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GLib-extras.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOAccumulator.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOColor.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GODataCVector.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOFileOpeners.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOPattern.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOQuad.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GORange.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GORegexp.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GORegression.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Geometry-helpers.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Gettings-Started-with-GOffice.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GogTool.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Gradient.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Graph-editor-dialog.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-LibXML-extras.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Line.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Mathematics.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Miscellaneous.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Scalable-Vector-Graphics-support.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Simple-data.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Structures.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Theming.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-URL-utilities.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Units.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Utils.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Windows-Metafiles-support.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%.devhelp2
+share/gtk-doc/html/goffice-%%SHORT_VER%%/gsf-index.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/home.png
+share/gtk-doc/html/goffice-%%SHORT_VER%%/index.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/left-insensitive.png
+share/gtk-doc/html/goffice-%%SHORT_VER%%/left.png
+share/gtk-doc/html/goffice-%%SHORT_VER%%/pt01.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/pt02.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/pt03.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/pt04.html
+share/gtk-doc/html/goffice-%%SHORT_VER%%/right-insensitive.png
+share/gtk-doc/html/goffice-%%SHORT_VER%%/right.png
+share/gtk-doc/html/goffice-%%SHORT_VER%%/style.css
+share/gtk-doc/html/goffice-%%SHORT_VER%%/up-insensitive.png
+share/gtk-doc/html/goffice-%%SHORT_VER%%/up.png
 share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/ast/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/bs/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/ca@valencia/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo
@@ -392,16 +381,19 @@ share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/eo/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/fur/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo
@@ -424,129 +416,11 @@ share/locale/sl/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/sr@latin/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/pixmaps/goffice/%%VERSION%%/area.xpm
-share/pixmaps/goffice/%%VERSION%%/bar-hboth.png
-share/pixmaps/goffice/%%VERSION%%/bar-hminus.png
-share/pixmaps/goffice/%%VERSION%%/bar-hplus.png
-share/pixmaps/goffice/%%VERSION%%/bar-none.png
-share/pixmaps/goffice/%%VERSION%%/bar-vboth.png
-share/pixmaps/goffice/%%VERSION%%/bar-vminus.png
-share/pixmaps/goffice/%%VERSION%%/bar-vplus.png
-share/pixmaps/goffice/%%VERSION%%/bar.xpm
-share/pixmaps/goffice/%%VERSION%%/bubble.xpm
-share/pixmaps/goffice/%%VERSION%%/chart_area_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_area_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_area_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_bar_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_bar_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_bar_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_bar_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_bar_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_bar_2_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_boxplot_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_boxplot_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_bubble_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_color_polar_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_colored_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_column_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_column_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_column_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_column_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_column_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_column_2_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_column_3_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_cone_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_cone_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_cone_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_cone_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_cone_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_cone_2_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_cone_3_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_contour_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_contour_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_cylinder_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_cylinder_2_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_cylinder_3_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_dropbar_1_4.png
-share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_histogram_1_4.png
-share/pixmaps/goffice/%%VERSION%%/chart_histogram_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_line_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_line_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_line_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_line_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_line_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_line_2_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_line_3_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_minmax_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_minmax_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_pie_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_pie_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_pie_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_pie_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_pie_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_pie_2_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_pie_3_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_pie_3_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_polar_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_prob_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_pyramid_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_pyramid_2_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_pyramid_3_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_radar_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_radar_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_radar_1_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_ring_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_ring_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_3_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_3.png
-share/pixmaps/goffice/%%VERSION%%/chart_scatter_4_4.png
-share/pixmaps/goffice/%%VERSION%%/chart_stock_1_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_stock_1_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_stock_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_stock_2_2.png
-share/pixmaps/goffice/%%VERSION%%/chart_surface_2_1.png
-share/pixmaps/goffice/%%VERSION%%/chart_surface_2_2.png
-share/pixmaps/goffice/%%VERSION%%/color.xpm
-share/pixmaps/goffice/%%VERSION%%/column.xpm
-share/pixmaps/goffice/%%VERSION%%/contour.xpm
-share/pixmaps/goffice/%%VERSION%%/dist.xpm
-share/pixmaps/goffice/%%VERSION%%/doughnut.xpm
-share/pixmaps/goffice/%%VERSION%%/dropbar.xpm
-share/pixmaps/goffice/%%VERSION%%/linegraph.xpm
-share/pixmaps/goffice/%%VERSION%%/minmax.xpm
-share/pixmaps/goffice/%%VERSION%%/pie.xpm
-share/pixmaps/goffice/%%VERSION%%/polar.png
-share/pixmaps/goffice/%%VERSION%%/radar.xpm
-share/pixmaps/goffice/%%VERSION%%/scatter.xpm
-share/pixmaps/goffice/%%VERSION%%/stock.xpm
-share/pixmaps/goffice/%%VERSION%%/surface.xpm
+@dir lib/goffice/plugins
diff --git a/devel/goffice010/Makefile b/devel/goffice010/Makefile
deleted file mode 100644
index 6b2ffdd0ce49..000000000000
--- a/devel/goffice010/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	goffice
-PORTVERSION=	0.10.43
-CATEGORIES=	devel gnome
-MASTER_SITES=	GNOME
-PKGNAMESUFFIX=	010
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GLib/GTK+ set of document centric objects and utilities
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libspectre.so:print/libspectre \
-		libfribidi.so:converters/fribidi
-
-USES=		gettext gmake gnome libtool pathfix perl5 pkgconfig \
-		shebangfix tar:xz xorg
-USE_GNOME=	cairo gtk30 intlhack introspection:build libgsf librsvg2 libxslt
-USE_XORG=	xrender xext
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--with-lasem=no --with-config-backend=gsettings \
-		--enable-compile-warnings=no \
-		--enable-introspection
-USE_PERL5=	build
-SHEBANG_FILES=	${WRKSRC}/tools/introspection-identifier-filter
-
-PLIST_SUB=	VERSION=${PORTVERSION} SHORT_VER=${PORTVERSION:R}
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/goffice/${SHORT_VER}/plugins
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgoffice-0.10.so.*
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/goffice/${PORTVERSION}/plugins/*/*.so
-
-.include <bsd.port.mk>
diff --git a/devel/goffice010/distinfo b/devel/goffice010/distinfo
deleted file mode 100644
index efe34ae53e28..000000000000
--- a/devel/goffice010/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1537813735
-SHA256 (goffice-0.10.43.tar.xz) = 550fceefa74622b8fe57dd0b030003e31db50edf7f87068ff5e146365108b64e
-SIZE (goffice-0.10.43.tar.xz) = 2381804
diff --git a/devel/goffice010/pkg-descr b/devel/goffice010/pkg-descr
deleted file mode 100644
index 0d48f505271e..000000000000
--- a/devel/goffice010/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Goffice is a set of document centric components for GLib and GTK+.
-
-There are common operations for document centric applications that are
-conceptually simple, but complex to implement fully.
-    - plugins
-    - load/save documents
-    - undo/redo
-
-Goffice provides a single library for performing such operations.
-
-WWW: http://live.gnome.org/libgoffice
diff --git a/devel/goffice010/pkg-plist b/devel/goffice010/pkg-plist
deleted file mode 100644
index cad1003da325..000000000000
--- a/devel/goffice010/pkg-plist
+++ /dev/null
@@ -1,425 +0,0 @@
-include/libgoffice-%%SHORT_VER%%/goffice/app/error-info.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/file.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-cmd-context-impl.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-cmd-context.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-conf.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-control-impl.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-control.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc-impl.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-doc.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-loader-module.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-loader.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service-impl.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin-service.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-plugin.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/go-view.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/goffice-app.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/io-context-priv.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/io-context.h
-include/libgoffice-%%SHORT_VER%%/goffice/app/module-plugin-defs.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-arc.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-canvas.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-circle.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-component.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-ellipse.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-graph.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-group.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-image.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-item.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-line.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-path.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-pixbuf.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-polygon.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-polyline.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-rectangle.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-structs.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-styled-item.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-text.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-utils.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goc-widget.h
-include/libgoffice-%%SHORT_VER%%/goffice/canvas/goffice-canvas.h
-include/libgoffice-%%SHORT_VER%%/goffice/component/go-component-factory.h
-include/libgoffice-%%SHORT_VER%%/goffice/component/go-component-mime-dialog.h
-include/libgoffice-%%SHORT_VER%%/goffice/component/go-component.h
-include/libgoffice-%%SHORT_VER%%/goffice/component/goffice-component.h
-include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-impl.h
-include/libgoffice-%%SHORT_VER%%/goffice/data/go-data-simple.h
-include/libgoffice-%%SHORT_VER%%/goffice/data/go-data.h
-include/libgoffice-%%SHORT_VER%%/goffice/data/goffice-data.h
-include/libgoffice-%%SHORT_VER%%/goffice/goffice-features.h
-include/libgoffice-%%SHORT_VER%%/goffice/goffice.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/goffice-graph.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-3d-box.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-color-map.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis-line.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-axis.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-impl.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map-3d.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart-map.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-chart.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-child-button.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-color-scale.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-allocator.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-data-set.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-equation.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-error-bar.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph-impl.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-graph.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-grid-line.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-grid.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-guru.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-label.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-legend.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-object-xml.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-object.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-outlined-object.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot-engine.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot-impl.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-plot.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-reg-curve.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-renderer.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-impl.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-labels.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series-lines.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-series.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-smoothed-curve.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-styled-object.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-theme.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-trend-line.h
-include/libgoffice-%%SHORT_VER%%/goffice/graph/gog-view.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-3d-rotation-sel.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-color.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-pixmaps.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-stack.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-action-combo-text.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-arrow-sel.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-calendar-button.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-charmap-sel.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-group.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-palette.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-color-selector.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-box.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-color.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-combo-pixmaps.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-font-sel-dialog.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-font-sel.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-format-sel.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-gradient-selector.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-graph-widget.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-image-sel.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-line-selector.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-locale-sel.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-marker-selector.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-math-editor.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-optionmenu.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-palette.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-pattern-selector.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-rotation-sel.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/go-selector.h
-include/libgoffice-%%SHORT_VER%%/goffice/gtk/goffice-gtk.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-R.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-accumulator.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-complex.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-cspline.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-distribution.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-dtoa.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-fft.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-math.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-matrix.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-matrix3x3.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-quad.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-rangefunc.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/go-regression.h
-include/libgoffice-%%SHORT_VER%%/goffice/math/goffice-math.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/datetime.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-bezier.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-cairo.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-color.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-editor.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-emf.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-file.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-font.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-format.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-gdk-pixbuf.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-geometry.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-glib-extras.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-gradient.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-image.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-libxml-extras.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-line.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-locale.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-marker.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-mml-to-itex.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pango-extras.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-path.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pattern.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-persist.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-pixbuf.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-rsm.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-spectre.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-string.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-style.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-styled-object.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-svg.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-undo.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-unit.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/go-units.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/goffice-utils.h
-include/libgoffice-%%SHORT_VER%%/goffice/utils/regutf8.h
-lib/girepository-1.0/GOffice-%%SHORT_VER%%.typelib
-lib/goffice/%%VERSION%%/plugins/plot_barcol/barcol.so
-lib/goffice/%%VERSION%%/plugins/plot_barcol/plot-types.xml
-lib/goffice/%%VERSION%%/plugins/plot_barcol/plugin.xml
-lib/goffice/%%VERSION%%/plugins/plot_distrib/distrib.so
-lib/goffice/%%VERSION%%/plugins/plot_distrib/plot-types.xml
-lib/goffice/%%VERSION%%/plugins/plot_distrib/plugin.xml
-lib/goffice/%%VERSION%%/plugins/plot_pie/pie.so
-lib/goffice/%%VERSION%%/plugins/plot_pie/plot-types.xml
-lib/goffice/%%VERSION%%/plugins/plot_pie/plugin.xml
-lib/goffice/%%VERSION%%/plugins/plot_radar/plot-types.xml
-lib/goffice/%%VERSION%%/plugins/plot_radar/plugin.xml
-lib/goffice/%%VERSION%%/plugins/plot_radar/radar.so
-lib/goffice/%%VERSION%%/plugins/plot_surface/plot-types.xml
-lib/goffice/%%VERSION%%/plugins/plot_surface/plugin.xml
-lib/goffice/%%VERSION%%/plugins/plot_surface/surface.so
-lib/goffice/%%VERSION%%/plugins/plot_xy/plot-types.xml
-lib/goffice/%%VERSION%%/plugins/plot_xy/plugin.xml
-lib/goffice/%%VERSION%%/plugins/plot_xy/xy.so
-lib/goffice/%%VERSION%%/plugins/reg_linear/linreg.so
-lib/goffice/%%VERSION%%/plugins/reg_linear/plugin.xml
-lib/goffice/%%VERSION%%/plugins/reg_linear/reg-types.xml
-lib/goffice/%%VERSION%%/plugins/reg_logfit/logfit.so
-lib/goffice/%%VERSION%%/plugins/reg_logfit/plugin.xml
-lib/goffice/%%VERSION%%/plugins/reg_logfit/reg-types.xml
-lib/goffice/%%VERSION%%/plugins/smoothing/plugin.xml
-lib/goffice/%%VERSION%%/plugins/smoothing/smoothing.so
-lib/goffice/%%VERSION%%/plugins/smoothing/types.xml
-lib/libgoffice-%%SHORT_VER%%.so
-lib/libgoffice-%%SHORT_VER%%.so.10
-lib/libgoffice-%%SHORT_VER%%.so.10.0.43
-libdata/pkgconfig/libgoffice-%%SHORT_VER%%.pc
-share/gir-1.0/GOffice-%%SHORT_VER%%.gir
-%%DATADIR%%/%%VERSION%%/mmlitex/README
-%%DATADIR%%/%%VERSION%%/mmlitex/cmarkup.xsl
-%%DATADIR%%/%%VERSION%%/mmlitex/entities.xsl
-%%DATADIR%%/%%VERSION%%/mmlitex/glayout.xsl
-%%DATADIR%%/%%VERSION%%/mmlitex/mmlitex.xsl
-%%DATADIR%%/%%VERSION%%/mmlitex/scripts.xsl
-%%DATADIR%%/%%VERSION%%/mmlitex/tables.xsl
-%%DATADIR%%/%%VERSION%%/mmlitex/tokens.xsl
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOArrow.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOBezierSpline.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOCalendarButton.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOCharmapSel.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOCmdContext.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOColorGroup.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComboBox.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComboColor.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComboPixmaps.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComplex.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOComponent.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOData.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GODataMatrix.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GODataScalar.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GODateConventions.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GODistribution.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GODoc.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GODocControl.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOEditor.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOErrorInfo.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFileSaver.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFont.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFontSel.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFormat.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOFormatSel.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOGraphWidget.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOIOContext.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOImage.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOLocaleSel.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOMarker.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOOptionMenu.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPalette.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPath.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPersist.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPixbuf.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPlugin.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPluginLoader.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPluginLoaderModule.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOPluginService.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GORotationSel.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOSearchReplace.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOSelector.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOString.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOStyle.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOStyledObject.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GOUndoUnary.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GoView.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocArc.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocCanvas.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocCircle.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocEllipse.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocGraph.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocGroup.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocItem.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocLine.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocPixbuf.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocPolygon.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocPolyline.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocRectangle.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocStyledItem.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocText.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GocWidget.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/Gog3DBox.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogAxis.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogAxisColorMap.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogAxisLine.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogAxisMap.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogChart.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogChartMap.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogColorScale.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogDataEditor.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogDataset.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogErrorBar.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogGraph.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogGrid.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogGridLine.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogLabel.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogLegend.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogObject.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogOutlinedView.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogPlot.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogRegCurve.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogRegEqn.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogRenderer.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogSeries.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogSeriesLabels.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogSeriesLines.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogSmoothedCurve.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogStyledObject.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogText.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogTrendLine.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/GogView.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/annotation-glossary.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch01.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch02.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch03.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch04.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch05.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch06.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch07.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch08.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch09.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch10.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch11.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch12.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch13.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch14.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch15.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch16.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/ch17.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Cairo-utilities.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Components-factory.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Cubic-splines.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Encapsulated-Postscript-support.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Families-and-types.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Fast-Fourier-transform.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-File-utilities.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Files.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GLib-extras.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOAccumulator.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOColor.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GODataCVector.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOFileOpeners.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOPattern.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GOQuad.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GORange.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GORegexp.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GORegression.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Geometry-helpers.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Gettings-Started-with-GOffice.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-GogTool.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Gradient.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Graph-editor-dialog.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-LibXML-extras.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Line.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Mathematics.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Miscellaneous.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Scalable-Vector-Graphics-support.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Simple-data.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Structures.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Theming.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-URL-utilities.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Units.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Utils.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%-Windows-Metafiles-support.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/goffice-%%SHORT_VER%%.devhelp2
-share/gtk-doc/html/goffice-%%SHORT_VER%%/gsf-index.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/home.png
-share/gtk-doc/html/goffice-%%SHORT_VER%%/index.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/left-insensitive.png
-share/gtk-doc/html/goffice-%%SHORT_VER%%/left.png
-share/gtk-doc/html/goffice-%%SHORT_VER%%/pt01.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/pt02.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/pt03.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/pt04.html
-share/gtk-doc/html/goffice-%%SHORT_VER%%/right-insensitive.png
-share/gtk-doc/html/goffice-%%SHORT_VER%%/right.png
-share/gtk-doc/html/goffice-%%SHORT_VER%%/style.css
-share/gtk-doc/html/goffice-%%SHORT_VER%%/up-insensitive.png
-share/gtk-doc/html/goffice-%%SHORT_VER%%/up.png
-share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ar/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ast/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/bs/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ca@valencia/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/eo/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/eu/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/lt/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/oc/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/sl/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/sr@latin/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ta/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/zh_HK/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
-@dir lib/goffice/plugins
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index e7f34db1a109..2cecb4ddfb9b 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	abiword
 PORTVERSION=	3.0.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/abiword/${PORTVERSION}/source/
 DIST_SUBDIR=	AbiWord
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libpng.so:graphics/png \
 		libwv.so:textproc/wv \
 		libfribidi.so:converters/fribidi \
-		libgoffice-0.10.so:devel/goffice010
+		libgoffice-0.10.so:devel/goffice
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu
 
 USES=		compiler:c++11-lang desktop-file-utils gmake gnome iconv jpeg \
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 557363beec40..cbdd71afbe4e 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	grisbi
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION:R}.x/${PORTVERSION}
 
@@ -13,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libofx.so:finance/libofx		\
 		libfreetype.so:print/freetype2		\
-		libgoffice-0.10.so:devel/goffice010	\
+		libgoffice-0.10.so:devel/goffice	\
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		tar:bzip2 desktop-file-utils gmake gnome iconv localbase	\
diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 58348181476a..adf16d004bb2 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nip2
 PORTVERSION=	8.7.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/libvips/${PORTNAME}/releases/download/v${PORTVERSION}/
 
@@ -29,14 +29,11 @@ LDFLAGS+=	-lm
 
 SUB_FILES=	run-nip2.sh
 
-OPTIONS_DEFINE=		DOCS FFTW GOFFICE GRAPHVIZ GSF GSL
-OPTIONS_DEFAULT=	FFTW GOFFICE GRAPHVIZ GSF GSL
+OPTIONS_DEFINE=		DOCS FFTW GRAPHVIZ GSF GSL
+OPTIONS_DEFAULT=	FFTW GRAPHVIZ GSF GSL
 
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 FFTW_CONFIGURE_WITH=	fftw3
-GOFFICE_DESC=		Use libgoffice to show plots
-GOFFICE_LIB_DEPENDS=	libgoffice-*.so:devel/goffice
-GOFFICE_CONFIGURE_WITH=	libgoffice
 GRAPHVIZ_DESC=		Use libgvc to show workspace dependency graphs
 GRAPHVIZ_LIB_DEPENDS=	libgvc.so:graphics/graphviz
 GRAPHVIZ_CONFIGURE_WITH=	libgvc
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index b40e525415a8..7311e330f061 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnumeric
 PORTVERSION=	1.12.43
+PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -14,7 +15,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	itstool:textproc/itstool
-LIB_DEPENDS=	libgoffice-0.10.so:devel/goffice010 \
+LIB_DEPENDS=	libgoffice-0.10.so:devel/goffice \
 		libfribidi.so:converters/fribidi \
 		libpsiconv.so:converters/psiconv
 
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index d5d3dca4e5f2..6e1fedd92ab3 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gchemutils
 PORTVERSION=	0.14.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	SAVANNAH/${PORTNAME}/${PORTVERSION:R}
 DISTNAME=	gnome-chemistry-utils-${PORTVERSION}
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bodr.pc:science/bodr \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
 		libopenbabel.so:science/openbabel \
-		libgoffice-0.10.so:devel/goffice010
+		libgoffice-0.10.so:devel/goffice
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bodr.pc:science/bodr \
 		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data