summaryrefslogtreecommitdiff
path: root/textproc/scrollkeeper
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-12-05 20:49:47 +0000
committerrillig <rillig@pkgsrc.org>2005-12-05 20:49:47 +0000
commitb71a1d488b6b45e0a968a4c149990c25b6a09215 (patch)
treedac5b1dd14794d86b061d26b9503adb2552ed3f8 /textproc/scrollkeeper
parent624eed58928f83676fbd7ca01a5f6974bb2cce2a (diff)
downloadpkgsrc-b71a1d488b6b45e0a968a4c149990c25b6a09215.tar.gz
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some other changes are outlined in http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'textproc/scrollkeeper')
-rw-r--r--textproc/scrollkeeper/Makefile10
-rw-r--r--textproc/scrollkeeper/omf.mk8
2 files changed, 9 insertions, 9 deletions
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index bf11bd7b7e7..7297f5a12d4 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:51:08 rillig Exp $
#
DISTNAME= scrollkeeper-0.3.14
@@ -14,7 +14,7 @@ COMMENT= Open Document Cataloging Project
PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
-DEPENDS= docbook-xml>=4.2nb7:../../textproc/docbook-xml
+DEPENDS+= docbook-xml>=4.2nb7:../../textproc/docbook-xml
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
@@ -22,7 +22,7 @@ USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS= --localstatedir=${SCROLLKEEPER_DATADIR}
+CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR}
CONFIGURE_ARGS+= --sharedstatedir=${SCROLLKEEPER_DATADIR}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-partial-db-dir=db
@@ -41,8 +41,8 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
SCROLLKEEPER_DATADIR= ${PREFIX}/libdata/scrollkeeper
SCROLLKEEPER_REBUILDDB= ${PREFIX}/bin/scrollkeeper-rebuilddb
-FILES_SUBST+= SCROLLKEEPER_DATADIR="${SCROLLKEEPER_DATADIR}"
-FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}"
+FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q}
+FILES_SUBST+= SCROLLKEEPER_REBUILDDB=${SCROLLKEEPER_REBUILDDB:Q}
EGDIR= ${PREFIX}/share/examples/scrollkeeper
CONF_FILES= ${EGDIR}/scrollkeeper.conf ${PKG_SYSCONFDIR}/scrollkeeper.conf
diff --git a/textproc/scrollkeeper/omf.mk b/textproc/scrollkeeper/omf.mk
index a3f48d39ad0..120f4910c38 100644
--- a/textproc/scrollkeeper/omf.mk
+++ b/textproc/scrollkeeper/omf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: omf.mk,v 1.8 2005/03/24 22:42:58 jlam Exp $
+# $NetBSD: omf.mk,v 1.9 2005/12/05 20:51:08 rillig 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
@@ -26,9 +26,9 @@ USE_PKGINSTALL= YES
INSTALL_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../textproc/scrollkeeper/files/install.tmpl
-FILES_SUBST+= SCROLLKEEPER_DATADIR="${SCROLLKEEPER_DATADIR}"
-FILES_SUBST+= SCROLLKEEPER_REBUILDDB="${SCROLLKEEPER_REBUILDDB}"
-FILES_SUBST+= SCROLLKEEPER_UPDATEDB="${SCROLLKEEPER_UPDATEDB}"
+FILES_SUBST+= SCROLLKEEPER_DATADIR=${SCROLLKEEPER_DATADIR:Q}
+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; }