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, 13 insertions, 17 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index d0779f313bb..47c5a9b88ef 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/01/06 00:06:06 rh Exp $
+# $NetBSD: Makefile,v 1.10 2003/02/18 14:55:56 jmmv Exp $
 #
 
 DISTNAME=		anjuta-1.0.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=anjuta/}
 
@@ -28,7 +29,7 @@ LOCALSTATEDIR=          ${X11PREFIX}/var
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../sysutils/gnome-vfs/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../textproc/xml-i18n-tools/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
 
diff --git a/devel/anjuta/PLIST b/devel/anjuta/PLIST
index 04bbb3307e0..9c343e04260 100644
--- a/devel/anjuta/PLIST
+++ b/devel/anjuta/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/06 00:06:06 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/18 14:55:56 jmmv Exp $
 bin/anjuta
 bin/anjuta_import.sh
 bin/anjuta_launcher
@@ -464,10 +464,9 @@ share/pixmaps/anjuta/wizard.xpm
 @unexec rm -f %D/lib/anjuta/libanjuta_sample1.so
 @exec ln -fs libanjuta_sample1.so.0.0 %D/lib/anjuta/libanjuta_sample1.so.0
 @unexec rm -f %D/lib/anjuta/libanjuta_sample1.so.0
-@exec scrollkeeper-update
-@unexec scrollkeeper-update
 @dirrm share/pixmaps/anjuta
 @dirrm share/omf/anjuta
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
 @dirrm share/gnome/help/anjuta/ja/anjuta-manual/figures
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 172dce940ed..76d8f4bf852 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2003/01/28 22:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2003/02/18 14:55:57 jmmv Exp $
 #
 
 DISTNAME=	glade-0.6.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNOME:=sources/glade/0.6/}
 
@@ -16,7 +16,6 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--with-bonobo
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/glade
@@ -30,6 +29,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/portability.txt ${PREFIX}/share/doc/glade
 	${INSTALL_DATA} ${WRKSRC}/doc/source_code.txt ${PREFIX}/share/doc/glade
 
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glade/PLIST b/devel/glade/PLIST
index af0a84c8160..d64955b3774 100644
--- a/devel/glade/PLIST
+++ b/devel/glade/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/17 12:45:29 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/18 14:55:57 jmmv Exp $
 bin/glade
 share/doc/glade/README
 share/doc/glade/TODO
@@ -182,8 +182,7 @@ share/omf/glade/user-guide-C.omf
 @dirrm share/pixmaps/glade
 @dirrm share/doc/glade
 @dirrm share/omf/glade
+@comment in scrollkeeper: share/omf
 @dirrm share/glade/gnome
 @dirrm share/glade/gtk
 @dirrm share/glade
-@unexec scrollkeeper-rebuilddb
-@exec scrollkeeper-rebuilddb
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 5beb143cbf3..f124dbb954d 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/12/24 06:09:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/18 14:55:57 jmmv Exp $
 #
 
 DISTNAME=		glade-1.1.2
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel gnome
 MASTER_SITES=		http://glade.pn.org/				\
 			${MASTER_SITE_GNOME:=sources/glade/1.1/}
@@ -23,9 +23,7 @@ USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
-
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../print/libgnomeprintui/buildlink2.mk"
 .include "../../databases/gnome-db/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"