From owner-freebsd-ports Fri Aug 25 1:10: 9 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id ACA4337B43C for ; Fri, 25 Aug 2000 01:10:00 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id BAA22478; Fri, 25 Aug 2000 01:10:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from bulls.mei.co.jp (bulls.mei.co.jp [202.224.189.25]) by hub.freebsd.org (Postfix) with ESMTP id 280B837B424 for ; Fri, 25 Aug 2000 01:00:21 -0700 (PDT) Received: by bulls.mei.co.jp (8.11.0/3.7W) with ESMTP id e7P80JL09046 for ; Fri, 25 Aug 2000 17:00:19 +0900 (JST) Received: by mariners.mei.co.jp (8.9.1/3.7W) with ESMTP id RAA25077 for ; Fri, 25 Aug 2000 17:00:19 +0900 (JST) Received: by dream.vrl.mei.co.jp (8.9.3/3.7W-11/29/99) id RAA37023; Fri, 25 Aug 2000 17:00:19 +0900 (JST) Message-Id: <200008250800.RAA37023@dream.vrl.mei.co.jp> Date: Fri, 25 Aug 2000 17:00:19 +0900 (JST) From: takamune@avrl.mei.co.jp Reply-To: takamune@avrl.mei.co.jp To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/20836: Update: japanese/ndtpd Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20836 >Category: ports >Synopsis: Update: japanese/ndtpd >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 25 01:10:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Kazu TAKAMUNE >Release: FreeBSD 4.1-STABLE i386 >Organization: Matsushita Electric Industrial Co., Ltd. >Environment: FreeBSD 4.1-STABLE(Thu Aug 24 10:44:56 JST 2000) ports/Mk/bsd.port.mk,v 1.346 2000/08/15 22:39:00 >Description: Please apply this patch to upgrade the port (of which I'm the maintainer). - Updates japanese/ndtpd for the latest version ja-ndtpd-2.3.8(patched). - Refine startup script. o Be friends with `/etc/rc.shutdown'. o Accept only standard arguments. o Add a $FreeBSD$ keyword. - No files have been added or removed. >How-To-Repeat: >Fix: diff -x CVS -Nur /usr/ports/japanese/ndtpd/Makefile japanese/ndtpd/Makefile --- /usr/ports/japanese/ndtpd/Makefile Wed Jul 5 10:32:23 2000 +++ japanese/ndtpd/Makefile Fri Aug 25 17:00:00 2000 @@ -10,6 +10,9 @@ CATEGORIES= japanese MASTER_SITES= ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/ +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= ${DISTNAME}+2.diff + MAINTAINER= takamune@avrl.mei.co.jp LIB_DEPENDS= eb.3:${PORTSDIR}/japanese/eb diff -x CVS -Nur /usr/ports/japanese/ndtpd/files/md5 japanese/ndtpd/files/md5 --- /usr/ports/japanese/ndtpd/files/md5 Wed Jul 5 10:32:23 2000 +++ japanese/ndtpd/files/md5 Fri Aug 25 17:00:00 2000 @@ -1 +1,2 @@ MD5 (ndtpd-2.3.8.tar.gz) = eef3dd6caa2c2e9c86ad6ca458670567 +MD5 (ndtpd-2.3.8+2.diff) = f2df1db77591257c758a5f726a626eb7 diff -x CVS -Nur /usr/ports/japanese/ndtpd/files/ndtpd.sh.sample japanese/ndtpd/files/ndtpd.sh.sample --- /usr/ports/japanese/ndtpd/files/ndtpd.sh.sample Mon Jan 24 11:03:33 2000 +++ japanese/ndtpd/files/ndtpd.sh.sample Fri Aug 25 17:00:00 2000 @@ -1,19 +1,25 @@ #!/bin/sh -e - +# +# $FreeBSD$ +# # startup script for ndtpd - -# Usage: ndtpd.sh [kill|restart|status|terminate|stop|start] +# Usage: ndtpd.sh {start|stop} command=$1 standalone=YES # Run ndtpd as a standalone daemon. #standalone=NO # Run ndtpd as a child of inetd. GetDirective() { + local directive + directive=$1 awk '/^[ ]*'${directive}'[ ]+/ {print $2; exit}' ${conf} } MakeWorkingDirectory() { + local user group work + user="`GetDirective user`" group="`GetDirective group`" work="`GetDirective work-path`" @@ -24,26 +30,25 @@ conf=@prefix@/etc/ndtpd.conf -[ -f ${conf} ] || exit -ndtpcheck || exit - -if [ "${standalone}" = YES ]; then - ctrl=ndtpcontrol - start="echo -n ' ndtpd'; ndtpd" -else - ctrl="echo 'Error: inetd invokes ndtpd.' >&2; false" -fi +ndtpcheck -c ${conf} || exit case "${command}" in -kill|restart|status|terminate) - eval ${ctrl} ${command};; +start) + MakeWorkingDirectory + if [ "${standalone}" = YES ]; then + ndtpd && echo -n " ndtpd" + fi + ;; stop) - eval ${ctrl} terminate;; - -start|*) - MakeWorkingDirectory - eval ${start};; + if [ "${standalone}" = YES ]; then + ndtpcontrol terminate && echo -n " ndtpd" + fi + ;; +*) + echo "usage: `basename $0` {start|stop}" >&2 + exit 22 + ;; esac exit >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message