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.

5 files changed, 11 insertions, 6 deletions

diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 3dd8178fe50..31aaab66bd5 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/30 03:11:19 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/18 14:55:56 jmmv Exp $
 #
 
 .include "Makefile.common"
@@ -7,4 +7,5 @@ COMMENT=		GNU Database access library
 
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libgda.pc.in
 
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index aa640336f53..d6405f837d5 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2003/02/13 18:19:29 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.7 2003/02/18 14:55:56 jmmv Exp $
 #
 
 DISTNAME?=		libgda-0.10.0
+PKGREVISION?=		1
 CATEGORIES?=		databases gnome
 MASTER_SITES?=		${MASTER_SITE_GNOME:=sources/libgda/0.10/}
 EXTRACT_SUFX?=		.tar.bz2
@@ -29,7 +30,6 @@ CONF_FILES+=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
 
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../textproc/libxslt/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../lang/python22/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
diff --git a/databases/libgda/PLIST b/databases/libgda/PLIST
index ed0da65771b..8243dd2340a 100644
--- a/databases/libgda/PLIST
+++ b/databases/libgda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/13 18:19:29 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/18 14:55:56 jmmv Exp $
 bin/gda-report-test
 bin/gda-run
 bin/gda-test
@@ -215,6 +215,7 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgda-2.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgda-2.mo
 share/omf/libgda/libgda-C.omf
 @dirrm share/omf/libgda
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/libgda/xml
 @dirrm share/examples/libgda
 @dirrm share/doc/html/libgda
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 8b136b7a340..9f616d01d40 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/02/14 20:18:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/18 14:55:56 jmmv Exp $
 #
 
 DISTNAME=		libgnomedb-0.10.0
+PKGREVISION=		1
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomedb/0.10/}
 EXTRACT_SUFX=		.tar.bz2
@@ -44,4 +45,5 @@ GCONF2_SCHEMAS=		libgnomedb.schemas
 .include "../../devel/libbonoboui/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgnomedb/PLIST b/databases/libgnomedb/PLIST
index 7f5862e75c2..bcc612b7363 100644
--- a/databases/libgnomedb/PLIST
+++ b/databases/libgnomedb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/14 20:18:03 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/18 14:55:56 jmmv Exp $
 bin/gnome-database-properties
 include/libgnomedb/gnome-db-browser.h
 include/libgnomedb/gnome-db-combo.h
@@ -159,6 +159,7 @@ share/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png
 share/pixmaps/libgnomedb/gnome-db.png
 @dirrm share/pixmaps/libgnomedb
 @dirrm share/omf/libgnomedb
+@comment in scrollkeeper: @dirrm share/omf
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/examples/libgnomedb
 @dirrm share/doc/html/libgnomedb