From owner-cvs-all@FreeBSD.ORG Thu Sep 6 07:42:01 2007 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8816D16A419; Thu, 6 Sep 2007 07:42:01 +0000 (UTC) (envelope-from w@wrzask.pl) Received: from mx.oak.pl (mx.oak.pl [217.96.108.251]) by mx1.freebsd.org (Postfix) with ESMTP id 3A36613C45D; Thu, 6 Sep 2007 07:42:01 +0000 (UTC) (envelope-from w@wrzask.pl) Received: by oak.pl (Postfix, from userid 1002) id 3613E1CCCB; Thu, 6 Sep 2007 09:22:50 +0200 (CEST) Date: Thu, 6 Sep 2007 09:22:50 +0200 From: Jan Srzednicki To: Doug Barton Message-ID: <20070906072250.GD20271@oak.pl> References: <200708301502.l7UF2lmC049603@repoman.freebsd.org> <46D82E0A.7040900@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.16 (2007-06-09) Cc: cvs-ports@FreeBSD.org, ports-committers@FreeBSD.org, cvs-all@FreeBSD.org, Sergey Matveychuk Subject: Re: cvs commit: ports/security/drweb Makefile pkg-plist ports/security/drweb/files drwebd.sh.in X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Sep 2007 07:42:01 -0000 On Fri, Aug 31, 2007 at 10:13:24AM -0700, Doug Barton wrote: > On Fri, 31 Aug 2007, Sergey Matveychuk wrote: > >> Doug Barton ?????: >> >>> The script looks good, just one nit: the filename should not have the .sh >>> extension. It should be "drwebd.in" only. >>> Thanks, >>> Doug >> >> I does not metter at all I think. ".sh" will removed when file will be >> installed. > > Starting in 6.2 it will always be stripped, that's why the name shouldn't > have the .sh at all. Please make the change. Here it comes then, does this solve the thing? Added file(s): - files/drwebd.in Removed file(s): - files/drwebd.sh.in --- drweb-4.33_4.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/drweb/Makefile /srv/home/winfried/tmp/ports/drweb/Makefile --- /usr/ports/security/drweb/Makefile Wed Sep 5 10:28:20 2007 +++ /srv/home/winfried/tmp/ports/drweb/Makefile Thu Sep 6 09:17:50 2007 @@ -2,7 +2,7 @@ # Date created: 14 August 2001 # Whom: Anton Voronin # -# $FreeBSD: ports/security/drweb/Makefile,v 1.54 2007/08/30 15:02:47 sem Exp $ +# $FreeBSD: ports/security/drweb/Makefile,v 1.53 2006/11/06 13:30:48 jmelo Exp $ # PORTNAME= drweb @@ -22,7 +22,7 @@ IA32_BINARY_PORT= yes NO_BUILD= yes -USE_RC_SUBR= drwebd.sh +USE_RC_SUBR= drwebd .include diff -ruN --exclude=CVS /usr/ports/security/drweb/files/drwebd.in /srv/home/winfried/tmp/ports/drweb/files/drwebd.in --- /usr/ports/security/drweb/files/drwebd.in Thu Jan 1 01:00:00 1970 +++ /srv/home/winfried/tmp/ports/drweb/files/drwebd.in Sat Aug 4 17:06:10 2007 @@ -0,0 +1,24 @@ +#!/bin/sh +# +# $FreeBSD$ + +# PROVIDE: drwebd +# REQUIRE: DAEMON +# BEFORE: mail + +. %%RC_SUBR%% + +name="drwebd" +rcvar=`set_rcvar` + +load_rc_config $name + +: ${drwebd_enable="NO"} +: ${drwebd_pidfile="/var/drweb/run/drwebd.pid"} +: ${drwebd_procname="%%PREFIX%%/drweb/drwebd"} + +command=$drwebd_procname +pidfile=$drwebd_pidfile + +run_rc_command "$1" + diff -ruN --exclude=CVS /usr/ports/security/drweb/files/drwebd.sh.in /srv/home/winfried/tmp/ports/drweb/files/drwebd.sh.in --- /usr/ports/security/drweb/files/drwebd.sh.in Thu Aug 30 17:02:47 2007 +++ /srv/home/winfried/tmp/ports/drweb/files/drwebd.sh.in Thu Jan 1 01:00:00 1970 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/security/drweb/files/drwebd.sh.in,v 1.1 2007/08/30 15:02:47 sem Exp $ - -# PROVIDE: drwebd -# REQUIRE: DAEMON -# BEFORE: mail - -. %%RC_SUBR%% - -name="drwebd" -rcvar=`set_rcvar` - -load_rc_config $name - -: ${drwebd_enable="NO"} -: ${drwebd_pidfile="/var/drweb/run/drwebd.pid"} -: ${drwebd_procname="%%PREFIX%%/drweb/drwebd"} - -command=$drwebd_procname -pidfile=$drwebd_pidfile - -run_rc_command "$1" - --- drweb-4.33_4.patch ends here --- -- Jan Srzednicki :: http://wrzask.pl/ "Remember, remember, the fifth of November" -- V for Vendetta