Date: Thu, 6 Sep 2007 09:22:50 +0200 From: Jan Srzednicki <w@wrzask.pl> To: Doug Barton <dougb@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, ports-committers@FreeBSD.org, cvs-all@FreeBSD.org, Sergey Matveychuk <sem@FreeBSD.org> Subject: Re: cvs commit: ports/security/drweb Makefile pkg-plist ports/security/drweb/files drwebd.sh.in Message-ID: <20070906072250.GD20271@oak.pl> In-Reply-To: <alpine.BSF.0.999.0708311011310.72038@qbhto.arg> References: <200708301502.l7UF2lmC049603@repoman.freebsd.org> <alpine.BSF.0.999.0708301116460.66100@qbhto.arg> <46D82E0A.7040900@FreeBSD.org> <alpine.BSF.0.999.0708311011310.72038@qbhto.arg>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <anton@chelcom.ru>
#
-# $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 <bsd.port.pre.mk>
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070906072250.GD20271>