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.

54 files changed, 132 insertions, 145 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 113a55024de..75b2fb949c1 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/02/14 20:55:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/18 14:55:54 jmmv Exp $
 #
 
 DISTNAME=	file-roller-2.2.1
+PKGREVISION=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fileroller/}
 
@@ -27,6 +28,6 @@ GCONF2_SCHEMAS=		file-roller.schemas
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index 67db23aa034..8df383eaed4 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/14 20:55:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/18 14:55:54 jmmv Exp $
 bin/file-roller
 lib/bonobo/libfile-roller-component.a
 lib/bonobo/libfile-roller-component.la
@@ -61,6 +61,7 @@ share/omf/file-roller/file-roller-C.omf
 share/omf/file-roller/file-roller-ru.omf
 share/pixmaps/file-roller.png
 @dirrm share/omf/file-roller
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/file-roller/ru/figures
 @dirrm share/gnome/help/file-roller/ru
 @dirrm share/gnome/help/file-roller/C/figures
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index ada2086d584..3d37e1f1f7c 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/01/27 19:47:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2003/02/18 14:55:55 jmmv Exp $
 
 DISTNAME=		gnome-media-1.2.3
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		audio gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/1.2/}
 
@@ -18,11 +18,10 @@ USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 CONFIGURE_ENV+=	XGETTEXT="${LOCALBASE}/bin/xgettext"
 
 .include "../../www/libghttp/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gnome-media/PLIST b/audio/gnome-media/PLIST
index acb9986cc39..b0928a5fe8f 100644
--- a/audio/gnome-media/PLIST
+++ b/audio/gnome-media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/01/27 12:31:29 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/02/18 14:55:55 jmmv Exp $
 bin/cddbslave
 bin/cddbsubmit
 bin/gmix
@@ -70,6 +70,7 @@ share/pixmaps/gnome-vumeter.png
 share/mime-info/grecord.keys
 share/mime-info/grecord.mime
 @dirrm share/omf/gnome-media
+@comment in scrollkeeper: @dirrm share/omf
 @exec ${MKDIR} %D/share/gnome/help/gmix/it/stylesheet-images
 @dirrm share/gnome/help/gmix/it/stylesheet-images
 @dirrm share/gnome/help/gmix/it/figures
@@ -80,5 +81,3 @@ share/mime-info/grecord.mime
 @dirrm share/gnome/help/gmix/C
 @dirrm share/gnome/help/gmix
 @comment in gnome-dirs: @dirrm share/gnome/apps/Multimedia
-@unexec scrollkeeper-rebuilddb
-@exec scrollkeeper-rebuilddb
diff --git a/chat/gabber/DEINSTALL b/chat/gabber/DEINSTALL
deleted file mode 100644
index 978ab49cc36..00000000000
--- a/chat/gabber/DEINSTALL
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1.1.1 2002/07/10 14:16:07 agc Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-
-POST-DEINSTALL)
-	scrollkeeper-update -p ${LOCALBASE}/var/scrollkeeper
-	;;
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index 570b4cc3292..eaf636827e8 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/01/27 19:51:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/02/18 14:55:55 jmmv Exp $
 
 DISTNAME=	gabber-0.8.7
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gabber/}
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--disable-xmms --disable-sigctest
 .include "../../devel/libsigc++/buildlink2.mk"
 .include "../../lang/gcc/buildlink2.mk"
 .include "../../graphics/freetype-lib/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk--/buildlink2.mk"
 .include "../../x11/gnome--/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
diff --git a/chat/gabber/PLIST b/chat/gabber/PLIST
index 1d1ebe94d8d..d669161ae3a 100644
--- a/chat/gabber/PLIST
+++ b/chat/gabber/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/27 12:54:54 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/18 14:55:55 jmmv Exp $
 bin/gabber
 etc/sound/events/gabber.soundlist
 man/man1/gabber.1
@@ -169,7 +169,7 @@ share/sounds/gabber/gabber_subrequest.wav
 @unexec ${RMDIR} %D/share/sounds 2> /dev/null || ${TRUE}
 @dirrm share/pixmaps/gabber
 @dirrm share/omf/gabber
-@unexec ${RMDIR} %D/share/omf 2> /dev/null || ${TRUE}
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/gabber/C/stylesheet-images
 @dirrm share/gnome/help/gabber/C
 @dirrm share/gnome/help/gabber
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
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"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 1c40f91ce8f..3546095bab5 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/02/14 21:10:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/02/18 14:55:57 jmmv Exp $
 #
 
 DISTNAME=		gedit-2.2.0.1
+PKGREVISION=		1
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,11 +22,10 @@ USE_X11=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 GCONF2_SCHEMAS=		gedit.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/editors/gedit/PLIST b/editors/gedit/PLIST
index 9f7d2f538e1..3a4fe97a35d 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/14 21:10:14 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/18 14:55:57 jmmv Exp $
 bin/gedit
 bin/gnome-text-editor
 lib/bonobo/servers/GNOME_Gedit.server
@@ -126,6 +126,7 @@ share/pixmaps/gedit-icon.png
 share/pixmaps/gedit-logo.png
 share/pixmaps/gedit-plugin-manager.png
 @dirrm share/omf/gedit
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/gedit/ro/figures
 @dirrm share/gnome/help/gedit/ro
 @dirrm share/gnome/help/gedit/C/figures
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index f2fba7d4efa..877d37c93cf 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2002/12/24 06:10:02 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/02/18 14:55:58 jmmv Exp $
 
 DISTNAME=		gnome-chess-0.3.3
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-chess/0.3/}
 
@@ -13,9 +13,8 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/games/gnome-chess/PLIST b/games/gnome-chess/PLIST
index 3d754d714f0..2b370a84e71 100644
--- a/games/gnome-chess/PLIST
+++ b/games/gnome-chess/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/01 02:00:14 salo Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/18 14:55:58 jmmv Exp $
 bin/gnome-chess
 share/gnome-chess/glade/level.glade
 share/gnome-chess/glade/login.glade
@@ -71,11 +71,10 @@ share/pixmaps/gnome-chess/r.png
 share/pixmaps/gnome-chess/start.png
 @dirrm share/pixmaps/gnome-chess
 @dirrm share/omf/gnome-chess
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/gnome-chess-manual/C/stylesheet-images
 @dirrm share/gnome/help/gnome-chess-manual/C/figures
 @dirrm share/gnome/help/gnome-chess-manual/C
 @dirrm share/gnome/help/gnome-chess-manual
 @dirrm share/gnome-chess/glade
 @dirrm share/gnome-chess
-@unexec scrollkeeper-rebuilddb
-@exec scrollkeeper-rebuilddb
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 02de1d3a820..cb29a14db9e 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2003/01/10 10:18:31 mycroft Exp $
+# $NetBSD: Makefile,v 1.49 2003/02/18 14:55:58 jmmv Exp $
 
 DISTNAME=		gnome-games-1.4.0.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/1.4/}\
 			${MASTER_SITE_LOCAL}
@@ -67,6 +67,7 @@ post-install:
 .include "../../devel/ncurses/buildlink2.mk"
 # Required for ports which don't build "libgtop".
 .include "../../lang/guile/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index f2170dff801..42498d82f2c 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/12/24 06:10:03 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/18 14:55:58 jmmv Exp $
 #
 
 DISTNAME=		gturing-0.1.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gturing/0.1/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,9 +20,8 @@ USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gturing/PLIST b/games/gturing/PLIST
index 36b0b7f30a2..10195175a10 100644
--- a/games/gturing/PLIST
+++ b/games/gturing/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/04 07:40:37 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/18 14:55:58 jmmv Exp $
 bin/gturing
 share/gnome/apps/Applications/gturing.desktop
 share/gnome/help/gturing/C/figures/mainwin.png
@@ -43,6 +43,7 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gturing-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gturing-2.0.mo
 share/omf/gturing/gturing-C.omf
 @dirrm share/omf/gturing
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gturing/pixmaps
 @dirrm share/gturing
 @dirrm share/gnome/help/gturing/C/figures
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index bf4ae8c533f..4b6b0e5157d 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/02/14 21:11:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/02/18 14:55:59 jmmv Exp $
 #
 
 DISTNAME=		eog-2.2.0
+PKGREVISION=		1
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eog/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -18,11 +19,10 @@ USE_X11=		YES
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 GCONF2_SCHEMAS= 	eog.schemas
 
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../print/libgnomeprint/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/graphics/eog2/PLIST b/graphics/eog2/PLIST
index 1dfde07df75..7bf28c6b651 100644
--- a/graphics/eog2/PLIST
+++ b/graphics/eog2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/14 21:11:26 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/18 14:55:59 jmmv Exp $
 bin/eog
 lib/bonobo/servers/GNOME_EOG.server
 libexec/eog-image-viewer
@@ -65,6 +65,7 @@ share/pixmaps/eog/right-down.png
 share/pixmaps/gnome-eog.png
 @dirrm share/pixmaps/eog
 @dirrm share/omf/eog
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/eog/C/figures
 @dirrm share/gnome/help/eog/C
 @dirrm share/gnome/help/eog
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 1465e9528cb..ae7e46f7559 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2003/01/09 13:59:25 rh Exp $
+# $NetBSD: Makefile,v 1.32 2003/02/18 14:55:59 jmmv Exp $
 
 DISTNAME=		evolution-1.2.1
+PKGREVISION=		1
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/1.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -78,6 +79,7 @@ MAKE_ENV+=	DISPLAY=${DISPLAY}
 pre-build: checkforx
 
 .include "../../textproc/libunicode/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../sysutils/gnome-vfs/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../print/gnome-print/buildlink2.mk"
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index 2a154f4a919..a1f5b30b9b8 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2003/01/09 13:59:25 rh Exp $
+@comment $NetBSD: PLIST,v 1.11 2003/02/18 14:55:59 jmmv Exp $
 bin/csv2vcard
 bin/evolution
 bin/evolution-addressbook
@@ -1436,6 +1436,7 @@ share/omf/evolution/evolution-C.omf
 share/omf/evolution/evolution-no.omf
 share/pixmaps/evolution.png
 @dirrm share/omf/evolution
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/libical-evolution/zoneinfo/Pacific
 @dirrm share/libical-evolution/zoneinfo/Indian
 @dirrm share/libical-evolution/zoneinfo/Europe
@@ -1516,5 +1517,3 @@ share/pixmaps/evolution.png
 @dirrm include/evolution
 @dirrm include/ename
 @dirrm include/camel
-@exec scrollkeeper-update
-@unexec scrollkeeper-update
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 48eb0ae530d..b6564a11014 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2003/01/17 02:23:21 rh Exp $
+# $NetBSD: Makefile,v 1.68 2003/02/18 14:56:00 jmmv Exp $
 #
 
 DISTNAME=		gnumeric-1.0.12
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.0/}
 
@@ -25,7 +25,6 @@ USE_PERL5=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-psiconv
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 LIBS+=      		-lunicode
 
 USE_LIBTOOL=		YES
@@ -41,6 +40,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 .include "../../print/gnome-print/buildlink2.mk"
 .include "../../textproc/libunicode/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gnumeric/PLIST b/math/gnumeric/PLIST
index b9ee6948f7e..79b8256811a 100644
--- a/math/gnumeric/PLIST
+++ b/math/gnumeric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2003/01/17 02:23:21 rh Exp $
+@comment $NetBSD: PLIST,v 1.20 2003/02/18 14:56:00 jmmv Exp $
 bin/gnumeric
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.a
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.la
@@ -978,6 +978,7 @@ share/pixmaps/gnumeric/stf-druid.png
 share/pixmaps/gnumeric/top_border
 @dirrm share/pixmaps/gnumeric
 @dirrm share/omf/gnumeric
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/templates
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/idl
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/guile
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 249c7b888da..bd52928d80f 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2003/01/12 06:49:36 rh Exp $
+# $NetBSD: Makefile,v 1.55 2003/02/18 14:56:00 jmmv Exp $
 
 DISTNAME=		gnome-utils-1.4.1.2
+PKGREVISION=		1
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/1.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -18,12 +19,11 @@ USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 CONFIGURE_ENV+=		BUILD_GUILE=no
 CONFIGURE_ENV+=		PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/gnome-objc/buildlink2.mk"
 .include "../../devel/libglade/buildlink2.mk"
diff --git a/misc/gnome-utils/PLIST b/misc/gnome-utils/PLIST
index 943f94e6a5a..fca982ac106 100644
--- a/misc/gnome-utils/PLIST
+++ b/misc/gnome-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/01/12 06:49:37 rh Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/02/18 14:56:00 jmmv Exp $
 bin/gcalc
 bin/gcharmap
 bin/gcolorsel
@@ -720,6 +720,7 @@ share/stripchart/stripchart.params
 @dirrm share/stripchart
 @dirrm share/pixmaps/logview
 @dirrm share/omf/gnome-utils
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/logview
 @dirrm share/gnome/help/stripchart/es/stylesheet-images
 @dirrm share/gnome/help/stripchart/es/figures
@@ -829,5 +830,3 @@ share/stripchart/stripchart.params
 @dirrm share/gnome/help/gcalc
 @dirrm share/gcolorsel/glade
 @dirrm share/gcolorsel
-@unexec scrollkeeper-rebuilddb
-@exec scrollkeeper-rebuilddb
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 633cc8e8f32..56d38ac1c2f 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/01/10 07:42:23 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/18 14:56:01 jmmv Exp $
 #
 
 DISTNAME=		bug-buddy-2.2.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bug-buddy/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,9 +20,8 @@ USE_GMAKE=		YES
 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 "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
diff --git a/net/bug-buddy/PLIST b/net/bug-buddy/PLIST
index a12e3e359e7..506c02d8b2d 100644
--- a/net/bug-buddy/PLIST
+++ b/net/bug-buddy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/02 02:48:27 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/18 14:56:01 jmmv Exp $
 bin/bug-buddy
 man/man1/bug-buddy.1
 share/application-registry/bug-buddy.applications
@@ -63,6 +63,7 @@ share/mime-info/bug-buddy.mime
 share/omf/bug-buddy/bug-buddy-C.omf
 share/pixmaps/bug-buddy.png
 @dirrm share/omf/bug-buddy
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/bug-buddy/C
 @dirrm share/gnome/help/bug-buddy
 @dirrm share/bug-buddy/bugzilla/ximian
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
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 9f4660f88f8..c77d83c8fb1 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/02/15 11:03:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/18 14:56:02 jmmv Exp $
 
 DISTNAME=	seahorse-0.7.0
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=seahorse/}
 
@@ -24,5 +25,5 @@ GCONF2_SCHEMAS= 	seahorse.schemas
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../security/gpgme/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index a55070a5194..061b270037a 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/15 11:03:42 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/18 14:56:02 jmmv Exp $
 bin/seahorse
 share/applications/seahorse.desktop
 share/gconf/schemas/seahorse.schemas
@@ -49,6 +49,7 @@ share/seahorse/glade/seahorse-text-editor.glade2
 @dirrm share/seahorse/glade
 @dirrm share/seahorse
 @dirrm share/omf/seahorse
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
 @dirrm share/gnome/help/seahorse
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index b43bf68f0d2..f9979cf9e3f 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2003/02/17 14:34:00 taya Exp $
+# $NetBSD: Makefile,v 1.44 2003/02/18 14:56:02 jmmv Exp $
 
 DISTNAME=	galeon-1.2.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --with-mozilla-snapshot=1.2
 .include	"../../devel/oaf/buildlink2.mk"
 .include	"../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
 .include	"../../textproc/libxml/buildlink2.mk"
-.include	"../../textproc/scrollkeeper/buildlink2.mk"
+.include	"../../textproc/scrollkeeper/omf.mk"
 .include	"../../sysutils/gnome-vfs/buildlink2.mk"
 .include	"../../www/mozilla/buildlink2.mk"
 .include	"../../x11/gnome-libs/buildlink2.mk"
diff --git a/www/galeon/PLIST b/www/galeon/PLIST
index 53c374d09dd..3f5f18559d0 100644
--- a/www/galeon/PLIST
+++ b/www/galeon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2003/02/17 14:34:00 taya Exp $
+@comment $NetBSD: PLIST,v 1.16 2003/02/18 14:56:02 jmmv Exp $
 bin/galeon
 bin/galeon-bin
 bin/galeon-config-tool
@@ -334,6 +334,7 @@ share/sounds/galeon/clicked.wav
 @exec env GCONF_CONFIG_SOURCE=xml::${X11PREFIX}/etc/gconf/gconf.xml.defaults gconftool-1 --makefile-install-rule ${X11PREFIX}/etc/gconf/schemas/galeon.schemas
 @dirrm share/sounds/galeon
 @dirrm share/omf/galeon
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/galeon-manual/C/stylesheet-images
 @dirrm share/gnome/help/galeon-manual/C/figures
 @dirrm share/gnome/help/galeon-manual/C
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index c58b533df08..c2da2ccafae 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2002/10/19 10:55:00 rh Exp $
+# $NetBSD: Makefile,v 1.45 2003/02/18 14:56:03 jmmv Exp $
 
 DISTNAME=		control-center-1.4.0.4
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/control-center/1.4/}
 
@@ -32,7 +33,7 @@ post-install:
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf/buildlink2.mk"
 .include "../../sysutils/gnome-vfs/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/controlcenter/PLIST b/x11/controlcenter/PLIST
index aed544ea56c..1e4ff552b61 100644
--- a/x11/controlcenter/PLIST
+++ b/x11/controlcenter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/02/15 10:59:03 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/02/18 14:56:03 jmmv Exp $
 bin/background-properties-capplet
 bin/file-types-capplet
 bin/gnome-edit-properties-capplet
@@ -153,6 +153,7 @@ share/pixmaps/ccsplash.png
 share/pixmaps/control-center.png
 @exec ${MKDIR} -m 0755 %D/share/control-center/capplets
 @dirrm share/omf/control-center
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/wm-properties
 @dirrm share/gnome/help/control-center/C/stylesheet-images
 @dirrm share/gnome/help/control-center/C/figures
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 51cfc449e1a..cdede499655 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2003/01/10 07:58:08 cjep Exp $
+# $NetBSD: Makefile,v 1.26 2003/02/18 14:56:03 jmmv Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/1.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -22,9 +22,8 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=        --localstatedir=${SCROLLKEEPER_DATADIR}
 
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../devel/libgtop/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-applets/PLIST b/x11/gnome-applets/PLIST
index 3d306478839..09086e7ca76 100644
--- a/x11/gnome-applets/PLIST
+++ b/x11/gnome-applets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/10/08 17:50:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/02/18 14:56:03 jmmv Exp $
 bin/another_clock_applet
 bin/asclock_applet
 bin/battery_applet
@@ -1526,6 +1526,7 @@ share/xmodmap/xmodmap.yu
 @dirrm share/pixmaps/gweather
 @dirrm share/pixmaps/gkb
 @dirrm share/omf/gnome-applets
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/odometer/smplst
 @dirrm share/odometer/o
 @dirrm share/odometer/default
@@ -1962,5 +1963,3 @@ share/xmodmap/xmodmap.yu
 @dirrm share/asclock/Newstone
 @dirrm share/asclock/Freeamp
 @dirrm share/asclock
-@unexec scrollkeeper-rebuilddb
-@exec scrollkeeper-rebuilddb
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 66f73217cd5..c846bf1b7a1 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2003/02/07 15:33:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.87 2003/02/18 14:56:03 jmmv Exp $
 #
 
 DISTNAME=		gnome-core-1.4.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-core/1.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -50,6 +50,7 @@ post-install:
 .include "../../graphics/gnome-pixmaps/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../www/gtkhtml/buildlink2.mk"
 .include "../../www/libghttp/buildlink2.mk"
 
diff --git a/x11/gnome-core/PLIST b/x11/gnome-core/PLIST
index 6bd09f86b3f..a273f907922 100644
--- a/x11/gnome-core/PLIST
+++ b/x11/gnome-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/01/30 11:14:43 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2003/02/18 14:56:04 jmmv Exp $
 bin/deskguide_applet
 bin/gmenu
 bin/gnome-about
@@ -1041,6 +1041,7 @@ share/pixmaps/splash/gnome-splash.png
 @dirrm share/pixmaps/mailcheck
 @dirrm share/pixmaps/fish
 @dirrm share/omf/gnome-core
+@comment in scrollkeeper: @dirrm share/omf
 @unexec ${RMDIR} %D/share/mc/templates 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/mc 2>/dev/null || ${TRUE}
 @dirrm share/gnome/panel
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index dce4aba0428..53c400c3a9f 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/02/15 12:02:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/02/18 14:56:04 jmmv Exp $
 #
 
 DISTNAME=		gnome-panel-2.2.0.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -24,7 +24,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
-CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 EGDIR=			${PREFIX}/share/examples/gnome-panel
 .if defined(PKG_SYSCONFDIR.libgnome)
@@ -50,7 +49,7 @@ GCONF2_SCHEMAS+=	tasklist.schemas
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-desktop/buildlink2.mk"
 .include "../../x11/gnome2-control-center/buildlink2.mk"
 
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index f06692ac0ae..6da1a33da93 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/02/15 12:02:34 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/02/18 14:56:04 jmmv Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/gnome-panel-preferences
@@ -150,6 +150,7 @@ share/pixmaps/mailcheck2/tux-anim.png
 @dirrm share/pixmaps/mailcheck2
 @dirrm share/pixmaps/fish2
 @dirrm share/omf/gnome-panel
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/idl/gnome-panel-2.0
 @dirrm share/gnome/panel2
 @dirrm share/gnome/help/workspace-switcher/C/figures
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 2c95a75c803..7eadd7a1496 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/02/14 21:13:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/02/18 14:56:04 jmmv Exp $
 #
 
 DISTNAME=		gnome-terminal-2.0.1
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -31,5 +31,5 @@ GCONF2_SCHEMAS= 	gnome-terminal.schemas
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome2-terminal/PLIST b/x11/gnome2-terminal/PLIST
index 2fd53d8a661..22b25cc73dc 100644
--- a/x11/gnome2-terminal/PLIST
+++ b/x11/gnome2-terminal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/14 21:13:35 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/18 14:56:04 jmmv Exp $
 bin/gnome2-terminal
 lib/bonobo/servers/gnome-terminal.server
 share/applications/gnome-terminal.desktop
@@ -42,6 +42,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 share/omf/gnome-terminal/gnome-terminal-C.omf
 share/pixmaps/gnome-terminal.png
 @dirrm share/omf/gnome-terminal
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/gnome-terminal/C/figures
 @dirrm share/gnome/help/gnome-terminal/C
 @dirrm share/gnome/help/gnome-terminal
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 091d251a4e4..2c02a5d6db8 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/01/10 12:41:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/02/18 14:56:05 jmmv Exp $
 
 DISTNAME=	multi-gnome-terminal-1.6.1
+PKGREVISION=	1
 CATEGORIES=	gnome x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=multignometerm/}
 
@@ -21,6 +22,6 @@ CONFIGURE_ARGS+=	--enable-gtk-doc=no
 
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
-.include "../../textproc/scrollkeeper/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/multi-gnome-terminal/PLIST b/x11/multi-gnome-terminal/PLIST
index f4cbfc12f28..b8795fee89b 100644
--- a/x11/multi-gnome-terminal/PLIST
+++ b/x11/multi-gnome-terminal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/10 12:41:12 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/02/18 14:56:05 jmmv Exp $
 bin/mgt-helper
 bin/multi-gnome-terminal
 etc/CORBA/servers/multi-gnome-terminal.gnorba
@@ -166,6 +166,7 @@ share/pixmaps/mgt/multignometerm.png
 share/pixmaps/mgt/panel-folder.png
 @dirrm share/pixmaps/mgt
 @dirrm share/omf/mgt
+@comment in scrollkeeper: @dirrm share/omf
 @dirrm share/mgt/glade
 @dirrm share/mgt
 @dirrm share/gnome/help/multi-gnome-terminal/no/stylesheet-images