From 55fa90af5f06165694c2b19f11de75277ea6260e Mon Sep 17 00:00:00 2001
From: wiz
Include
- ../../textproc/scrollkeeper/omf.mk
+ ../../textproc/rarian/omf.mk
instead of its buildlink3.mk
file. This
takes care of rebuilding the scrollkeeper database at
installation and deinstallation time, and disallows any access
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 78f47b6576e..03c6e7c4e5a 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -7506,7 +7506,7 @@ take some extra steps to make sure they get registered in the database:
If a package installs .omf files, used by scrollkeeper, you need to take some
extra steps to make sure they get registered in the database:
- 1. Include ../../textproc/scrollkeeper/omf.mk instead of its buildlink3.mk
+ 1. Include ../../textproc/rarian/omf.mk instead of its buildlink3.mk
file. This takes care of rebuilding the scrollkeeper database at
installation and deinstallation time, and disallows any access to it
directly from the package.
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 8ff03d0d00f..dc43f3ffc84 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/06/12 02:14:29 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2009/01/04 18:00:59 wiz Exp $
#
DISTNAME= conglomerate-0.9.1
@@ -38,7 +38,7 @@ GCONF_SCHEMAS= conglomerate.schemas
.include "../../textproc/enchant/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtksourceview/buildlink3.mk"
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 678bd404402..e050a71334e 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/07/14 12:56:03 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2009/01/04 18:00:59 wiz Exp $
DISTNAME= gtranslator-1.1.7
PKGREVISION= 4
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-debug
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/editors/tomboy/Makefile b/editors/tomboy/Makefile
index ee95a213066..8e1bfc65afd 100644
--- a/editors/tomboy/Makefile
+++ b/editors/tomboy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/12/04 16:45:09 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= tomboy-0.12.1
@@ -37,7 +37,7 @@ BUILDLINK_API_DEPENDS.mono-addins+= mono-addins>=0.3.1
.include "../../sysutils/ndesk-dbus/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gnome-desktop-sharp/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../x11/gnome-sharp/buildlink3.mk"
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index c55304b55d3..1952d35e245 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/06/20 01:09:19 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2009/01/04 18:01:00 wiz Exp $
DISTNAME= gnucash-docs-2.2.0
CATEGORIES= finance
@@ -17,5 +17,5 @@ USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake
GNU_CONFIGURE= YES
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index ba3e796d6b3..8515fcce821 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/07/14 12:56:04 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= gturing-0.1.1
@@ -22,5 +22,5 @@ BUILDLINK_TRANSFORM+= rm:-D.*_DISABLE_DEPRECATED
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index feb59c5c4dd..bc16e307ffd 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/06/12 02:14:30 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= pioneers-0.11.3
@@ -28,6 +28,6 @@ SUBST_SED.paths= -e s,/usr/share/,${PREFIX}/share/,
.include "../../devel/libgnome/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/quarry/Makefile b/games/quarry/Makefile
index e80033feb22..418570bd5ab 100644
--- a/games/quarry/Makefile
+++ b/games/quarry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:20 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= quarry-0.2.0
@@ -20,5 +20,5 @@ USE_TOOLS+= gmake pkg-config
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index a11a59c8a34..8484710c586 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2007/11/17 15:56:06 rillig Exp $
+# $NetBSD: Makefile.common,v 1.20 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= dia-0.96.1
@@ -57,5 +57,5 @@ BUILDLINK_DEPMETHOD.gtk2+= build
.include "../../graphics/libart/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index c02595b2175..6da9c5463fb 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/30 23:56:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= f-spot-0.5.0.3
@@ -33,7 +33,7 @@ REPLACE_BASH+= tools/f-spot-import
.include "../../graphics/libexif/buildlink3.mk"
.include "../../lang/mono/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gnome-sharp/buildlink3.mk"
.include "../../x11/gnome-desktop-sharp/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 634c484c042..5ac07f4a4b8 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2008/12/14 20:52:04 hasso Exp $
+# $NetBSD: Makefile,v 1.39 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= gtkam-0.1.16
@@ -26,6 +26,6 @@ CONFIGURE_ARGS+= --without-gimp
.include "../../devel/libgphoto2/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../graphics/libexif-gtk/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile
index fd1381a0962..f3463e16ee3 100644
--- a/ham/gmfsk/Makefile
+++ b/ham/gmfsk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/06/20 01:09:23 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= gmfsk-0.6
@@ -23,6 +23,6 @@ CONFIGURE_ARGS+=--enable-hamlib
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../math/fftw2/buildlink3.mk"
.include "../../ham/hamlib/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 35e17a3a65c..7cb91b2f5ae 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2008/10/29 00:18:51 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2009/01/04 18:01:00 wiz Exp $
DISTNAME= balsa-2.3.26
CATEGORIES= mail gnome
@@ -54,7 +54,7 @@ BUILDLINK_API_DEPENDS.gmime+= gmime>=2.1.9
.include "../../security/gpgme/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../www/gtkhtml314/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtksourceview2/buildlink3.mk"
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index e2e1b613552..462c01dafae 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/07/14 12:56:08 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= mail-notification-5.0
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --disable-ssl
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/genius/Makefile b/math/genius/Makefile
index 037f44aa07d..cb1a45d5504 100644
--- a/math/genius/Makefile
+++ b/math/genius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/06/23 17:16:56 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= genius-1.0.3
@@ -29,7 +29,7 @@ do-test:
.include "../../devel/readline/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../math/mpfr/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtksourceview/buildlink3.mk"
.include "../../x11/vte/buildlink3.mk"
diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index a7bef8ca140..b64962522c6 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/12/20 18:47:00 reed Exp $
+# $NetBSD: Makefile,v 1.26 2009/01/04 18:01:00 wiz Exp $
DISTNAME= qalculate-gtk-0.9.6
PKGREVISION= 1
@@ -25,5 +25,5 @@ pre-configure:
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../math/qalculate/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 035a7d10969..d5f702f1cd9 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2008/10/25 10:20:06 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= gnome-utils-2.24.1
@@ -62,7 +62,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../sysutils/libgtop/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/mousetweaks/Makefile b/misc/mousetweaks/Makefile
index e4a7cfe01ee..c614a7afd9f 100644
--- a/misc/mousetweaks/Makefile
+++ b/misc/mousetweaks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/12/03 09:26:00 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= mousetweaks-2.24.2
@@ -26,7 +26,7 @@ BUILDLINK_API_DEPENDS.libglade+= libglade>=2.4.0
.include "../../devel/libglade/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/libXcursor/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXtst/buildlink3.mk"
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index cacacc2a5e3..a35aa13ad3d 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2008/03/06 14:53:52 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2009/01/04 18:01:00 wiz Exp $
DISTNAME= etherape-0.9.7
PKGREVISION= 5
@@ -31,5 +31,5 @@ post-install:
.include "../../net/libpcap/buildlink3.mk"
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 52605510ae6..f8ebeadc724 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2008/11/08 18:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= gnome-netstatus-2.12.2
@@ -27,7 +27,7 @@ GCONF_SCHEMAS= netstatus.schemas
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 75b20a9a994..07f66817b49 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/12/02 20:56:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= gnome-nettool-2.22.1
@@ -22,6 +22,6 @@ USE_PKGLOCALEDIR= yes
.include "../../devel/libglade/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 1af76b310b7..95344093db9 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2008/07/14 12:56:11 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= lilypond-2.10.33
@@ -46,6 +46,6 @@ DEPENDS+= potrace>=1.8:../../graphics/potrace
.include "../../fonts/mftrace/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../lang/python/application.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../mk/tex.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 3df770b95ad..59417c89476 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/06/20 01:09:33 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/01/04 18:01:00 wiz Exp $
#
DISTNAME= gnome-keyring-manager-2.20.0
@@ -30,6 +30,6 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
.include "../../security/gnome-keyring/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/Makefile b/textproc/Makefile
index ffc6eff8e96..5ec7679cf0a 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.452 2009/01/04 00:30:02 adrianp Exp $
+# $NetBSD: Makefile,v 1.453 2009/01/04 18:01:01 wiz Exp $
#
COMMENT= Text processing utilities (does not include desktop publishing)
@@ -420,7 +420,6 @@ SUBDIR+= sablotron
SUBDIR+= sary
SUBDIR+= saxon
SUBDIR+= scew
-#SUBDIR+= scrollkeeper # incomplete package (only provides omf.mk)
SUBDIR+= soprano
SUBDIR+= source-highlight
SUBDIR+= stardic
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index a584cef434a..635e42baa34 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2008/11/18 11:55:58 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2009/01/04 18:01:01 wiz Exp $
#
DISTNAME= gtk-doc-1.11
@@ -26,6 +26,6 @@ USE_TOOLS+= gmake perl:run pkg-config
.include "../../lang/python/application.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../textproc/xmlcatmgr/catalogs.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/rarian/omf.mk b/textproc/rarian/omf.mk
new file mode 100644
index 00000000000..ce48e5a2533
--- /dev/null
+++ b/textproc/rarian/omf.mk
@@ -0,0 +1,40 @@
+# $NetBSD: omf.mk,v 1.1 2009/01/04 18:01:01 wiz Exp $
+#
+# This Makefile fragment is intended to be included by packages that install
+# OMF files. It takes care of registering them in scrollkeeper's global
+# database.
+#
+# The following variables are automatically defined for free use in packages:
+# SCROLLKEEPER_DATADIR - scrollkeeper's data directory.
+# SCROLLKEEPER_REBUILDDB - scrollkeeper-rebuilddb binary program.
+# SCROLLKEEPER_UPDATEDB - scrollkeeper-update binary program.
+#
+
+.if !defined(SCROLLKEEPER_OMF_MK)
+SCROLLKEEPER_OMF_MK= # defined
+
+.include "../../mk/bsd.prefs.mk"
+
+# scrollkeeper's data directory.
+SCROLLKEEPER_DATADIR= ${BUILDLINK_PREFIX.rarian}/libdata/scrollkeeper
+
+# scrollkeeper binary programs.
+SCROLLKEEPER_REBUILDDB= ${BUILDLINK_PREFIX.rarian}/bin/scrollkeeper-rebuilddb
+SCROLLKEEPER_UPDATEDB= ${BUILDLINK_PREFIX.rarian}/bin/scrollkeeper-update
+
+INSTALL_TEMPLATES+= \
+ ${.CURDIR}/../../textproc/rarian/files/install-scrollkeeper.tmpl
+DEINSTALL_TEMPLATES+= \
+ ${.CURDIR}/../../textproc/rarian/files/install-scrollkeeper.tmpl
+
+FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q}
+FILES_SUBST+= SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q}
+FILES_SUBST+= SCROLLKEEPER_UPDATEDB=${SCROLLKEEPER_UPDATEDB:Q}
+
+PRINT_PLIST_AWK+= /^@dirrm share\/omf$$/ \
+ { print "@comment in rarian: " $$0; \
+ next; }
+
+.include "../../textproc/rarian/buildlink3.mk"
+
+.endif # SCROLLKEEPER_OMF_MK
diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk
deleted file mode 100644
index c7920ec0304..00000000000
--- a/textproc/scrollkeeper/omf.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: omf.mk,v 1.14 2007/11/12 20:41:18 drochner Exp $
-#
-# This Makefile fragment is intended to be included by packages that install
-# OMF files. It takes care of registering them in scrollkeeper's global
-# database.
-#
-# The following variables are automatically defined for free use in packages:
-# SCROLLKEEPER_DATADIR - scrollkeeper's data directory.
-# SCROLLKEEPER_REBUILDDB - scrollkeeper-rebuilddb binary program.
-# SCROLLKEEPER_UPDATEDB - scrollkeeper-update binary program.
-#
-
-.if !defined(SCROLLKEEPER_OMF_MK)
-SCROLLKEEPER_OMF_MK= # defined
-
-.include "../../mk/bsd.prefs.mk"
-
-# scrollkeeper's data directory.
-SCROLLKEEPER_DATADIR= ${BUILDLINK_PREFIX.rarian}/libdata/scrollkeeper
-
-# scrollkeeper binary programs.
-SCROLLKEEPER_REBUILDDB= ${BUILDLINK_PREFIX.rarian}/bin/scrollkeeper-rebuilddb
-SCROLLKEEPER_UPDATEDB= ${BUILDLINK_PREFIX.rarian}/bin/scrollkeeper-update
-
-INSTALL_TEMPLATES+= \
- ${.CURDIR}/../../textproc/rarian/files/install-scrollkeeper.tmpl
-DEINSTALL_TEMPLATES+= \
- ${.CURDIR}/../../textproc/rarian/files/install-scrollkeeper.tmpl
-
-FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q}
-FILES_SUBST+= SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q}
-FILES_SUBST+= SCROLLKEEPER_UPDATEDB=${SCROLLKEEPER_UPDATEDB:Q}
-
-PRINT_PLIST_AWK+= /^@dirrm share\/omf$$/ \
- { print "@comment in rarian: " $$0; \
- next; }
-
-.include "../../textproc/rarian/buildlink3.mk"
-
-.endif # SCROLLKEEPER_OMF_MK
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index e82eca96561..3018e626965 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/10/28 23:38:33 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2009/01/04 18:01:01 wiz Exp $
DISTNAME= gnotime-2.3.0
CATEGORIES= time gnome
@@ -31,7 +31,7 @@ MAKE_ENV+= GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR:Q}
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../www/gtkhtml314/buildlink3.mk"
.include "../../x11/libXScrnSaver/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/time/planner/Makefile b/time/planner/Makefile
index e4934cc3fb4..c20025e5876 100644
--- a/time/planner/Makefile
+++ b/time/planner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/11/09 02:55:05 dsainty Exp $
+# $NetBSD: Makefile,v 1.11 2009/01/04 18:01:01 wiz Exp $
#
DISTNAME= planner-0.14.3
@@ -36,7 +36,7 @@ GCONF_SCHEMAS= planner.schemas
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index c241fa2c669..9894661f3e8 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/06/12 02:14:54 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/01/04 18:01:01 wiz Exp $
#
DISTNAME= e16menuedit2-0.0.3
@@ -29,6 +29,6 @@ pre-configure:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 7175182162c..990dca166c2 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/06/12 02:14:55 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2009/01/04 18:01:01 wiz Exp $
#
DISTNAME= drivel-2.0.3
@@ -37,7 +37,7 @@ BUILDLINK_API_DEPENDS.curl+= curl>=7.14.0nb1
.include "../../sysutils/gnome-vfs/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtksourceview/buildlink3.mk"
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 44ec9bd39af..609a3b887e0 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2008/10/25 00:36:12 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/01/04 18:01:01 wiz Exp $
#
DISTNAME= fast-user-switch-applet-2.24.0
@@ -43,7 +43,7 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index eac29e4609c..040ea591072 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2008/06/20 01:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2009/01/04 18:01:01 wiz Exp $
#
DISTNAME= gnopernicus-1.1.1
@@ -72,7 +72,7 @@ BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.7
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
.include "../../x11/gnome-mag/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
--
cgit v1.2.3