Complete move of math/goffice to misc/goffice.

7 files changed, 3 insertions, 420 deletions

diff --git a/math/Makefile b/math/Makefile
index 1ca7d7c4025..7a84d1a5354 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.142 2005/12/17 20:11:58 wiz Exp $
+# $NetBSD: Makefile,v 1.143 2005/12/17 20:19:49 wiz Exp $
 #
 
 COMMENT=	Mathematics
@@ -60,7 +60,6 @@ SUBDIR+=	gcalctool
 SUBDIR+=	geg
 SUBDIR+=	glpk
 SUBDIR+=	gnumeric
-SUBDIR+=	goffice
 SUBDIR+=	gp-autpgrp
 SUBDIR+=	gp-factint
 SUBDIR+=	gp-fplsa
diff --git a/math/goffice/DESCR b/math/goffice/DESCR
deleted file mode 100644
index 3e7ac8736a6..00000000000
--- a/math/goffice/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a library for common operations for document centric
-applications that are conceptually simple, but complex to implement
-fully. Supported operations include:
-    - plugins
-    - load/save documents
-    - undo/redo
diff --git a/math/goffice/Makefile b/math/goffice/Makefile
deleted file mode 100644
index 0486aedda69..00000000000
--- a/math/goffice/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/12/17 20:17:44 wiz Exp $
-#
-
-DISTNAME=		goffice-0.1.2
-CATEGORIES=		math
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.1/}
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://ftp.gnome.org/pub/GNOME/sources/goffice/0.1/
-COMMENT=		Library of document-centric objects and utilities
-
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgoffice-1.pc.in
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/math/goffice/PLIST b/math/goffice/PLIST
deleted file mode 100644
index d46e0659e0d..00000000000
--- a/math/goffice/PLIST
+++ /dev/null
@@ -1,341 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/12/17 20:10:52 wiz 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
-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
-lib/goffice/${PKGVERSION}/plugins/plot_barcol/plot-types.xml
-lib/goffice/${PKGVERSION}/plugins/plot_barcol/plugin.xml
-lib/goffice/${PKGVERSION}/plugins/plot_boxes/boxplot.la
-lib/goffice/${PKGVERSION}/plugins/plot_boxes/gog-boxplot-prefs.glade
-lib/goffice/${PKGVERSION}/plugins/plot_boxes/plot-types.xml
-lib/goffice/${PKGVERSION}/plugins/plot_boxes/plugin.xml
-lib/goffice/${PKGVERSION}/plugins/plot_pie/gog-pie-prefs.glade
-lib/goffice/${PKGVERSION}/plugins/plot_pie/gog-pie-series.glade
-lib/goffice/${PKGVERSION}/plugins/plot_pie/gog-ring-prefs.glade
-lib/goffice/${PKGVERSION}/plugins/plot_pie/pie.la
-lib/goffice/${PKGVERSION}/plugins/plot_pie/plot-types.xml
-lib/goffice/${PKGVERSION}/plugins/plot_pie/plugin.xml
-lib/goffice/${PKGVERSION}/plugins/plot_radar/plot-types.xml
-lib/goffice/${PKGVERSION}/plugins/plot_radar/plugin.xml
-lib/goffice/${PKGVERSION}/plugins/plot_radar/radar.la
-lib/goffice/${PKGVERSION}/plugins/plot_surface/gog-contour-prefs.glade
-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/plot-types.xml
-lib/goffice/${PKGVERSION}/plugins/plot_xy/plugin.xml
-lib/goffice/${PKGVERSION}/plugins/plot_xy/xy.la
-lib/goffice/${PKGVERSION}/plugins/reg_linear/linreg.la
-lib/goffice/${PKGVERSION}/plugins/reg_linear/plugin.xml
-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
-share/goffice/${PKGVERSION}/glade/go-font-sel.glade
-share/goffice/${PKGVERSION}/glade/go-format-sel.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-guru-type-selector.glade
-share/goffice/${PKGVERSION}/glade/gog-guru.glade
-share/goffice/${PKGVERSION}/glade/gog-object-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
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/goffice.mo
-${PKGLOCALEDIR}/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
-@dirrm share/pixmaps/goffice
-@comment @dirrm share/pixmaps
-@dirrm share/goffice/${PKGVERSION}/patterns
-@dirrm share/goffice/${PKGVERSION}/glade
-@dirrm share/goffice/${PKGVERSION}
-@dirrm share/goffice
-@dirrm lib/goffice/${PKGVERSION}/plugins/reg_logfit
-@dirrm lib/goffice/${PKGVERSION}/plugins/reg_linear
-@dirrm lib/goffice/${PKGVERSION}/plugins/plot_xy
-@dirrm lib/goffice/${PKGVERSION}/plugins/plot_surface
-@dirrm lib/goffice/${PKGVERSION}/plugins/plot_radar
-@dirrm lib/goffice/${PKGVERSION}/plugins/plot_pie
-@dirrm lib/goffice/${PKGVERSION}/plugins/plot_boxes
-@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
diff --git a/math/goffice/buildlink3.mk b/math/goffice/buildlink3.mk
deleted file mode 100644
index 52f4f63da2a..00000000000
--- a/math/goffice/buildlink3.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/12/17 20:17:44 wiz Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GOFFICE_BUILDLINK3_MK:=	${GOFFICE_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	goffice
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngoffice}
-BUILDLINK_PACKAGES+=	goffice
-
-.if !empty(GOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.goffice+=	goffice>=0.1.2
-BUILDLINK_PKGSRCDIR.goffice?=	../../math/goffice
-.endif	# GOFFICE_BUILDLINK3_MK
-
-.include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
-.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/goffice/distinfo b/math/goffice/distinfo
deleted file mode 100644
index 1ccc12ce373..00000000000
--- a/math/goffice/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/12/17 20:10:52 wiz Exp $
-
-SHA1 (goffice-0.1.2.tar.gz) = 39f98b4820d22aa5d687ca075a99f568a0d83efc
-RMD160 (goffice-0.1.2.tar.gz) = dd2cb0d9647a9c41c792b6772d5c70ffd9289750
-Size (goffice-0.1.2.tar.gz) = 2346329 bytes
diff --git a/misc/Makefile b/misc/Makefile
index 4df446bfb2e..615bfd2cac4 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.250 2005/12/11 13:06:57 markd Exp $
+# $NetBSD: Makefile,v 1.251 2005/12/17 20:19:49 wiz Exp $
 #
 
 COMMENT=	Miscellaneous utilities
@@ -70,6 +70,7 @@ SUBDIR+=	gnome2-dirs
 SUBDIR+=	gnome2-user-docs
 SUBDIR+=	gnome2-utils
 SUBDIR+=	gnuls
+SUBDIR+=	goffice
 SUBDIR+=	gok
 SUBDIR+=	gone
 SUBDIR+=	gperiodic