fixed: hardcoded path to m4, now USE_TOOLS is used

removed: section 1 in MESSAGE
This commit is contained in:
Aleksey Cheusov 2006-07-18 20:43:11 +00:00 committed by Thomas Klausner
parent 1881a885fb
commit ab031fefec
3 changed files with 11 additions and 17 deletions

View file

@ -1,20 +1,11 @@
=========================================================================== ===========================================================================
$NetBSD: MESSAGE,v 1.3 2006/07/12 15:26:32 cheusov Exp $ $NetBSD: MESSAGE,v 1.4 2006/07/18 20:43:11 cheusov Exp $
1) To enable "dictd" to start on boot on NetBSD-1.5 or newer, 1) By default dictd uses '${PATH_TO_M4} -P' for
please copy "${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/dictd" to
"/etc/rc.d/" and add "dictd=YES" to /etc/rc.conf. To do the
same on older systems, add the following to /etc/rc.local:
if [ -x ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/dictd ]; then
${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/dictd
fi
2) By default dictd uses '/usr/bin/m4 -P' for
preprocessing configuration file. If you dislike this default preprocessing configuration file. If you dislike this default
add dictd_flags='<your options>' to /etc/rc.conf. add dictd_flags='<your options>' to /etc/rc.conf.
3) ${VARBASE}/log/dictd is a preferred directory for logging unless 2) ${VARBASE}/log/dictd is a preferred directory for logging unless
syslog is used. syslog is used.
=========================================================================== ===========================================================================

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2006/07/16 19:55:35 cheusov Exp $ # $NetBSD: Makefile,v 1.10 2006/07/18 20:43:11 cheusov Exp $
DISTNAME= dictd-1.10.7 DISTNAME= dictd-1.10.7
PKGNAME= dict-server-1.10.7 PKGNAME= dict-server-1.10.7
@ -10,19 +10,22 @@ MAINTAINER= cheusov@tut.by
HOMEPAGE= http://www.dict.org/ HOMEPAGE= http://www.dict.org/
COMMENT= Dictionary Service Protocol server COMMENT= Dictionary Service Protocol server
USE_TOOLS+= gmake yacc USE_TOOLS+= gmake yacc m4:run
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-cflags=${CFLAGS:M*:Q} CONFIGURE_ARGS+= --with-cflags=${CFLAGS:M*:Q}
CONFIGURE_ARGS+= --disable-plugin CONFIGURE_ARGS+= --disable-plugin
MESSAGE_SUBST+= VARBASE="${VARBASE}" MESSAGE_SUBST+= VARBASE="${VARBASE}"
MESSAGE_SUBST+= PATH_TO_M4="${TOOLS_PATH.m4}"
FILES_SUBST+= PATH_TO_M4="${TOOLS_PATH.m4}"
INSTALLATION_DIRS+= share/dictd INSTALLATION_DIRS+= share/dictd
PKG_GROUPS= dictd PKG_GROUPS= dictd
PKG_USERS= dictd:dictd PKG_USERS= dictd:dictd
PKG_GECOS.dictd= Dictionary\ protocol\ server\ user PKG_GECOS.dictd= Dictionary\ protocol\ server\ user
RCD_SCRIPTS= dictd RCD_SCRIPTS= dictd
# for -L /var/log/dictd/<filename_or_pattern> # for -L /var/log/dictd/<filename_or_pattern>
OWN_DIRS_PERMS= ${VARBASE}/log/dictd ${DICTD_USER} ${DICTD_GROUP} 0750 OWN_DIRS_PERMS= ${VARBASE}/log/dictd ${DICTD_USER} ${DICTD_GROUP} 0750

View file

@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@ #!@RCD_SCRIPTS_SHELL@
# #
# $NetBSD: dictd.sh,v 1.2 2006/07/12 15:26:32 cheusov Exp $ # $NetBSD: dictd.sh,v 1.3 2006/07/18 20:43:11 cheusov Exp $
# #
# PROVIDE: dictd # PROVIDE: dictd
# REQUIRE: LOGIN # REQUIRE: LOGIN
@ -8,7 +8,7 @@
. /etc/rc.subr . /etc/rc.subr
name="dictd" name="dictd"
dictd_flags=${dictd_flags-"--pp '/usr/bin/m4 -P'"} dictd_flags=${dictd_flags-"--pp '@PATH_TO_M4@ -P'"}
rcvar=$name rcvar=$name
command="@PREFIX@/sbin/${name}" command="@PREFIX@/sbin/${name}"
pidfile="/var/run/${name}.pid" pidfile="/var/run/${name}.pid"