diff options
| author | uebayasi <uebayasi@pkgsrc.org> | 2002-04-02 15:59:50 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@pkgsrc.org> | 2002-04-02 15:59:50 +0000 |
| commit | 05e2a2302fb8caab09e3e904edfdc8a5fb74818b (patch) | |
| tree | 2738e9bc6b2757e97b1a48137f0b5ae8d95c5a2f /textproc/ndtpd | |
| parent | 4e6697c2c8929283083accd054758d99cbd09cb4 (diff) | |
| download | pkgsrc-05e2a2302fb8caab09e3e904edfdc8a5fb74818b.tar.gz | |
* Create /var/run/ndtpd just before invoking the server.
* s/ndtpdcheck/ndtpcheck/ in ndtpd.sh.
Pointed out by Koji Kondo <koji@iijmio-mail.jp> in private mail.
Bump PKGREVISION.
Diffstat (limited to 'textproc/ndtpd')
| -rw-r--r-- | textproc/ndtpd/Makefile | 9 | ||||
| -rw-r--r-- | textproc/ndtpd/files/ndtpd.sh | 15 |
2 files changed, 14 insertions, 10 deletions
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile index fe96b67fd56..c0b9ecee041 100644 --- a/textproc/ndtpd/Makefile +++ b/textproc/ndtpd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2002/03/15 17:15:03 uebayasi Exp $ +# $NetBSD: Makefile,v 1.3 2002/04/02 15:59:50 uebayasi Exp $ DISTNAME= ndtpd-3.1.1 +PKGREVISION= 1 CATEGORIES= textproc japanese MASTER_SITES= ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/ @@ -23,14 +24,14 @@ CONFIGURE_ARGS+=--with-zlib MAKE_FLAGS+= INSTALL_INFO=${INSTALL_INFO} # For INSTALL/DEINSTALL scripts. CONF_FILES= ${NDTPD_CONFDIR}/ndtpd.conf.sample ${NDTPD_CONFDIR}/ndtpd.conf -OWN_DIRS= ${NDTPD_RUNDIR}/ndtpd RCD_SCRIPT= ndtpd.sh -# Will be used not only for INSTALL but also ndtpd.sh. -FILES_SUBST+= NDTPD_RUNDIR=${NDTPD_RUNDIR:Q} +# Will be also used for ndtpd.sh. +FILES_SUBST+= NDTPD_RUNDIR=${NDTPD_RUNDIR} NDTPD_CONFDIR= ${PREFIX}/etc NDTPD_LOGDIR= ${DESTDIR}/var/log NDTPD_RUNDIR= ${DESTDIR}/var/run +# XXX NDTPD actually uses ${NDTPD_RUNDIR}/ndtpd. post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/ndtpd.sh >${WRKDIR}/ndtpd.sh diff --git a/textproc/ndtpd/files/ndtpd.sh b/textproc/ndtpd/files/ndtpd.sh index b72910eed3e..c2c9c5f8f1d 100644 --- a/textproc/ndtpd/files/ndtpd.sh +++ b/textproc/ndtpd/files/ndtpd.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: ndtpd.sh,v 1.1.1.1 2002/03/15 07:19:58 uebayasi Exp $ +# $NetBSD: ndtpd.sh,v 1.2 2002/04/02 15:59:50 uebayasi Exp $ # # PROVIDE: ndtpd # REQUIRE: DAEMON @@ -14,23 +14,26 @@ if [ -f /etc/rc.subr ]; then fi name="ndtpd" -rcvar=$name -prog="@PREFIX@/sbin/ndtpd" +rcvar="$name" +prog=@PREFIX@/sbin/ndtpd pidfile=@NDTPD_RUNDIR@/ndtpd/ndtpd.pid case $1 in start) - { @ECHO@ "Starting ${name}."; ${prog} >/dev/null 2>&1; } || { + @ECHO@ "Starting ${name}." + @MKDIR@ @NDTPD_RUNDIR@/ndtpd + ${prog} >/dev/null 2>&1 || { @ECHO@ "Configuration error?" >&2 - @ECHO@ "Try @PREFIX@/sbin/ndtpdcheck" >&2 + @ECHO@ "Try @PREFIX@/sbin/ndtpcheck" >&2 exit 1 } ;; stop) + @ECHO@ "Stopping ${name}." if [ -f ${pidfile} ]; then pid=`@HEAD@ -1 ${pidfile}` - @ECHO@ "Stopping ${name}." kill -s TERM ${pid} + @RM@ -fr @NDTPD_RUNDIR@/ndtpd else @ECHO@ "${name} not running?" exit 1 |