[pkgsrc/trunk]: pkgsrc/textproc/scrollkeeper Switch to use the scrollkeeper c...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6bcb9529ee71
branches:  trunk
changeset: 534785:6bcb9529ee71
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Oct 31 20:26:21 2007 +0000

description:
Switch to use the scrollkeeper compatible wrappers which come with
the new "rarian" document manager. rarian (as configured currently)
can read .omf files directly, so the wrappers are basically no-ops.
Keep the "rarian" dependency anyway to avoid major reorganisations
in the future.

diffstat:

 textproc/scrollkeeper/omf.mk |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (38 lines):

diff -r 099f00704fc8 -r 6bcb9529ee71 textproc/scrollkeeper/omf.mk
--- a/textproc/scrollkeeper/omf.mk      Wed Oct 31 20:20:30 2007 +0000
+++ b/textproc/scrollkeeper/omf.mk      Wed Oct 31 20:26:21 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: omf.mk,v 1.12 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: omf.mk,v 1.13 2007/10/31 20:26:21 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
@@ -16,11 +16,11 @@
 .include "../../mk/bsd.prefs.mk"
 
 # scrollkeeper's data directory.
-SCROLLKEEPER_DATADIR=  ${BUILDLINK_PREFIX.scrollkeeper}/libdata/scrollkeeper
+SCROLLKEEPER_DATADIR=  ${BUILDLINK_PREFIX.rarian}/libdata/scrollkeeper
 
 # scrollkeeper binary programs.
-SCROLLKEEPER_REBUILDDB=        ${BUILDLINK_PREFIX.scrollkeeper}/bin/scrollkeeper-rebuilddb
-SCROLLKEEPER_UPDATEDB= ${BUILDLINK_PREFIX.scrollkeeper}/bin/scrollkeeper-update
+SCROLLKEEPER_REBUILDDB=        ${BUILDLINK_PREFIX.rarian}/bin/scrollkeeper-rebuilddb
+SCROLLKEEPER_UPDATEDB= ${BUILDLINK_PREFIX.rarian}/bin/scrollkeeper-update
 
 INSTALL_TEMPLATES+=    ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
 DEINSTALL_TEMPLATES+=  ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
@@ -29,12 +29,10 @@
 FILES_SUBST+=          SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q}
 FILES_SUBST+=          SCROLLKEEPER_UPDATEDB=${SCROLLKEEPER_UPDATEDB:Q}
 
-PRINT_PLIST_AWK+=      /^libdata\/scrollkeeper/ { next; }
-PRINT_PLIST_AWK+=      /^@dirrm libdata\/scrollkeeper/ { next; }
 PRINT_PLIST_AWK+=      /^@dirrm share\/omf$$/ \
                                { print "@comment in scrollkeeper: " $$0; \
                                  next; }
 
-.include "../../textproc/scrollkeeper/buildlink3.mk"
+.include "../../textproc/rarian/buildlink3.mk"
 
 .endif # SCROLLKEEPER_OMF_MK