prepage for transition to 0.5: don't install html-doc so that we

can have both versions coexist
bump PKGREVISION

4 files changed, 19 insertions, 100 deletions

diff --git a/misc/goffice/Makefile b/misc/goffice/Makefile
index 87fd57f74c3..309d770b0af 100644
--- a/misc/goffice/Makefile
+++ b/misc/goffice/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2007/07/28 07:55:32 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/05 15:55:11 drochner Exp $
 #
 
 DISTNAME=		goffice-0.4.2
+PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.4/}
 
diff --git a/misc/goffice/PLIST b/misc/goffice/PLIST
index a3aca157079..f122c4f2b9b 100644
--- a/misc/goffice/PLIST
+++ b/misc/goffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/05/05 00:33:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/09/05 15:55:11 drochner Exp $
 include/libgoffice-0.4/goffice/app/error-info.h
 include/libgoffice-0.4/goffice/app/file.h
 include/libgoffice-0.4/goffice/app/go-cmd-context-impl.h
@@ -190,101 +190,6 @@ share/goffice/${PKGVERSION}/glade/gog-reg-curve-prefs.glade
 share/goffice/${PKGVERSION}/glade/gog-reg-eqn-prefs.glade
 share/goffice/${PKGVERSION}/glade/gog-style-prefs.glade
 share/goffice/${PKGVERSION}/patterns/svg-patterns.xml
-share/gtk-doc/html/goffice/GOData.html
-share/gtk-doc/html/goffice/GODataMatrix.html
-share/gtk-doc/html/goffice/GODataScalar.html
-share/gtk-doc/html/goffice/GODataVector.html
-share/gtk-doc/html/goffice/GogAxis.html
-share/gtk-doc/html/goffice/GogAxisLine.html
-share/gtk-doc/html/goffice/GogChart.html
-share/gtk-doc/html/goffice/GogDataAllocator.html
-share/gtk-doc/html/goffice/GogDataset.html
-share/gtk-doc/html/goffice/GogErrorBar.html
-share/gtk-doc/html/goffice/GogGraph.html
-share/gtk-doc/html/goffice/GogGrid.html
-share/gtk-doc/html/goffice/GogGridLine.html
-share/gtk-doc/html/goffice/GogLabel.html
-share/gtk-doc/html/goffice/GogLegend.html
-share/gtk-doc/html/goffice/GogObject.html
-share/gtk-doc/html/goffice/GogOutlinedObject.html
-share/gtk-doc/html/goffice/GogPersist.html
-share/gtk-doc/html/goffice/GogPlot.html
-share/gtk-doc/html/goffice/GogRegCurve.html
-share/gtk-doc/html/goffice/GogRegEqn.html
-share/gtk-doc/html/goffice/GogRenderer.html
-share/gtk-doc/html/goffice/GogSeries.html
-share/gtk-doc/html/goffice/GogSeriesLines.html
-share/gtk-doc/html/goffice/GogStyle.html
-share/gtk-doc/html/goffice/GogStyledObject.html
-share/gtk-doc/html/goffice/GogView.html
-share/gtk-doc/html/goffice/ch01.html
-share/gtk-doc/html/goffice/ch02.html
-share/gtk-doc/html/goffice/ch03.html
-share/gtk-doc/html/goffice/ch04.html
-share/gtk-doc/html/goffice/ch05.html
-share/gtk-doc/html/goffice/ch06.html
-share/gtk-doc/html/goffice/ch07.html
-share/gtk-doc/html/goffice/ch08.html
-share/gtk-doc/html/goffice/ch09.html
-share/gtk-doc/html/goffice/ch10.html
-share/gtk-doc/html/goffice/ch11.html
-share/gtk-doc/html/goffice/goffice-GOComboBox.html
-share/gtk-doc/html/goffice/goffice-GOComboColor.html
-share/gtk-doc/html/goffice/goffice-GOComponent.html
-share/gtk-doc/html/goffice/goffice-GODoc.html
-share/gtk-doc/html/goffice/goffice-GODocControl.html
-share/gtk-doc/html/goffice/goffice-GOPluginLoader.html
-share/gtk-doc/html/goffice/goffice-GOPluginService.html
-share/gtk-doc/html/goffice/goffice-GOService.html
-share/gtk-doc/html/goffice/goffice-GoApp.html
-share/gtk-doc/html/goffice/goffice-GoCharmapSel.html
-share/gtk-doc/html/goffice/goffice-GoCmdContext.html
-share/gtk-doc/html/goffice/goffice-GoColor.html
-share/gtk-doc/html/goffice/goffice-GoComboPixmaps.html
-share/gtk-doc/html/goffice/goffice-GoComboText.html
-share/gtk-doc/html/goffice/goffice-GoComponentFactory.html
-share/gtk-doc/html/goffice/goffice-GoFontSel.html
-share/gtk-doc/html/goffice/goffice-GoFormatSel.html
-share/gtk-doc/html/goffice/goffice-GoGeometry.html
-share/gtk-doc/html/goffice/goffice-GoGlibExtras.html
-share/gtk-doc/html/goffice/goffice-GoLibxmlExtras.html
-share/gtk-doc/html/goffice/goffice-GoLocaleSel.html
-share/gtk-doc/html/goffice/goffice-GoObject.html
-share/gtk-doc/html/goffice/goffice-GoOptionMenu.html
-share/gtk-doc/html/goffice/goffice-GoPluginLoaderModule.html
-share/gtk-doc/html/goffice/goffice-GoRotationSel.html
-share/gtk-doc/html/goffice/goffice-GoSearchReplace.html
-share/gtk-doc/html/goffice/goffice-GogAxisMap.html
-share/gtk-doc/html/goffice/goffice-GogChartMap.html
-share/gtk-doc/html/goffice/goffice-GogControlFooCanvas.html
-share/gtk-doc/html/goffice/goffice-GogEditor.html
-share/gtk-doc/html/goffice/goffice-GogGuru.html
-share/gtk-doc/html/goffice/goffice-GogPlotEngine.html
-share/gtk-doc/html/goffice/goffice-GogTool.html
-share/gtk-doc/html/goffice/goffice-Math.html
-share/gtk-doc/html/goffice/goffice-Ranges.html
-share/gtk-doc/html/goffice/goffice-RegUTF8.html
-share/gtk-doc/html/goffice/goffice-Regressions.html
-share/gtk-doc/html/goffice/goffice-Units.html
-share/gtk-doc/html/goffice/goffice-go-format.html
-share/gtk-doc/html/goffice/goffice-go-gradient.html
-share/gtk-doc/html/goffice/goffice-go-line.html
-share/gtk-doc/html/goffice/goffice-go-marker.html
-share/gtk-doc/html/goffice/goffice-go-pattern.html
-share/gtk-doc/html/goffice/goffice-go-plugin.html
-share/gtk-doc/html/goffice/goffice-gog-theme.html
-share/gtk-doc/html/goffice/goffice.devhelp
-share/gtk-doc/html/goffice/goffice.devhelp2
-share/gtk-doc/html/goffice/home.png
-share/gtk-doc/html/goffice/index.html
-share/gtk-doc/html/goffice/index.sgml
-share/gtk-doc/html/goffice/left.png
-share/gtk-doc/html/goffice/pt01.html
-share/gtk-doc/html/goffice/pt02.html
-share/gtk-doc/html/goffice/pt03.html
-share/gtk-doc/html/goffice/right.png
-share/gtk-doc/html/goffice/style.css
-share/gtk-doc/html/goffice/up.png
 share/locale/am/LC_MESSAGES/goffice-${PKGVERSION}.mo
 share/locale/az/LC_MESSAGES/goffice-${PKGVERSION}.mo
 share/locale/bg/LC_MESSAGES/goffice-${PKGVERSION}.mo
@@ -437,9 +342,8 @@ share/pixmaps/goffice/${PKGVERSION}/scatter.xpm
 share/pixmaps/goffice/${PKGVERSION}/stock.xpm
 share/pixmaps/goffice/${PKGVERSION}/surface.xpm
 @dirrm share/pixmaps/goffice/${PKGVERSION}
-@dirrm share/pixmaps/goffice
+@unexec ${RMDIR} %D/share/pixmaps/goffice 2>/dev/null || ${TRUE}
 @comment @dirrm share/pixmaps
-@dirrm share/gtk-doc/html/goffice
 @dirrm share/goffice/${PKGVERSION}/patterns
 @dirrm share/goffice/${PKGVERSION}/glade
 @dirrm share/goffice/${PKGVERSION}
diff --git a/misc/goffice/distinfo b/misc/goffice/distinfo
index 507071d24af..3d61e23ded8 100644
--- a/misc/goffice/distinfo
+++ b/misc/goffice/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2007/07/28 07:55:32 wiz Exp $
+$NetBSD: distinfo,v 1.8 2007/09/05 15:55:11 drochner Exp $
 
 SHA1 (goffice-0.4.2.tar.gz) = e46455cebc30bec9b3ff68db2584db73baa3a9ee
 RMD160 (goffice-0.4.2.tar.gz) = 9719e07024a4f50296b108e4c6bb393320f5e1ff
 Size (goffice-0.4.2.tar.gz) = 2874185 bytes
+SHA1 (patch-aa) = 13d298b580117be2c9b07b85f6b97ac1ef93e1ef
diff --git a/misc/goffice/patches/patch-aa b/misc/goffice/patches/patch-aa
new file mode 100644
index 00000000000..64de6873595
--- /dev/null
+++ b/misc/goffice/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/09/05 15:55:11 drochner Exp $
+
+--- Makefile.in.orig	2007-09-05 17:39:32.000000000 +0200
++++ Makefile.in
+@@ -286,7 +286,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = goffice tests pixmaps plugins po docs
++SUBDIRS = goffice tests pixmaps plugins po
+ EXTRA_DIST = README NEWS BUGS MAINTAINERS AUTHORS \
+ 	goffice.mk \
+ 	goffice-plugins.mk \