Use the omf.mk file provided by the scrollkeeper package to automatically

rebuild the documentation database at install/deinstall time. This means
that:
- PLIST's do not need to call scrollkeeper-{update,rebuilddb} directly;
  this is done by a bsd.pkg.install.mk template.
- The share/omf directory is only removed by scrollkeeper, which is the
  last package in the dependancy tree.
- PKGREVISION is bumped.

Reviewed by wiz.

4 files changed, 10 insertions, 11 deletions

diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index e06bc5a7f76..5455890e2c5 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2002/12/24 06:10:21 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2003/02/18 14:56:01 jmmv Exp $
 #
 
 DISTNAME=		ggv-1.0.2
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/1.0/}
 
@@ -17,10 +17,9 @@ USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ggv/PLIST b/print/ggv/PLIST
index 8e65c278ad4..4d91d7a4f53 100644
--- a/print/ggv/PLIST
+++ b/print/ggv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/17 12:27:05 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/18 14:56:01 jmmv Exp $
 bin/bonobo-application-ps
 bin/ggv
 share/locale/de/LC_MESSAGES/ggv.mo
@@ -107,6 +107,7 @@ share/omf/ggv/ggv-C.omf
 share/omf/ggv/ggv-it.omf
 share/omf/ggv/ggv-ja.omf
 @dirrm share/omf/ggv
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/ggv/ja/stylesheet-images
 @dirrm share/gnome/help/ggv/ja
 @dirrm share/gnome/help/ggv/C/stylesheet-images
@@ -114,5 +115,3 @@ share/omf/ggv/ggv-ja.omf
 @dirrm share/gnome/help/ggv/it/stylesheet-images
 @dirrm share/gnome/help/ggv/it
 @dirrm share/gnome/help/ggv
-@unexec scrollkeeper-rebuilddb
-@exec scrollkeeper-rebuilddb
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index e7165271bde..4f084b3cf1c 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/02/14 21:12:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/18 14:56:01 jmmv Exp $
 #
 
 DISTNAME=		ggv-1.99.98
+PKGREVISION=		1
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/1.99/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,12 +21,11 @@ USE_LIBTOOL=		YES
 USE_GMAKE=		YES
 USE_X11=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 CONFIGURE_ARGS+=	--disable-install-schemas
 
 GCONF2_SCHEMAS= 	ggv.schemas
 
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../print/libgnomeprintui/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf2/schemas.mk"
diff --git a/print/ggv2/PLIST b/print/ggv2/PLIST
index b4e44be5225..480a9b93132 100644
--- a/print/ggv2/PLIST
+++ b/print/ggv2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/14 21:12:49 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/18 14:56:02 jmmv Exp $
 bin/ggv
 lib/bonobo/servers/GNOME_GGV.server
 libexec/ggv-postscript-viewer
@@ -60,6 +60,7 @@ share/pixmaps/ggv/zoom.xpm
 share/pixmaps/gnome-ghostview.png
 @dirrm share/pixmaps/ggv
 @dirrm share/omf/ggv
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/ggv/C/figures
 @dirrm share/gnome/help/ggv/C
 @dirrm share/gnome/help/ggv