Bug 95332 - [UPDATE]: sysutils/tenshi: Update to version 0.4
Summary: [UPDATE]: sysutils/tenshi: Update to version 0.4
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Renato Botelho
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-04-05 03:50 UTC by Frank J. Laszlo
Modified: 2006-04-05 20:37 UTC (History)
0 users

See Also:

Attachments
tenshi-0.4.diff (871 bytes, patch)
2006-04-05 03:50 UTC, Frank J. Laszlo 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Frank J. Laszlo 2006-04-05 03:50:11 UTC 
	This patch will update sysutils/tenshi to version 0.4. This version adds several features and fixes a few bugs
	outlined below:

	- added uid, gid options for setting effective UID, GID
	- added colourization of debug messages
	- added filter, filterargs options for report pre-processing
	- added [pager:]<mail_to> syntax for sending pager friendly reports
	- added mailtimeout option
	- fixed tail, tailargs incorrectly being treated as dynamic options
Comment 1 Renato Botelho freebsd_committer freebsd_triage 2006-04-05 18:09:51 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->garga

I'll take it.
Comment 2 Renato Botelho freebsd_committer freebsd_triage 2006-04-05 20:04:30 UTC 
Dear maintainer.

Since i'm here, I propose you following patch. It use USE_RC_SUBR facility,
and remove 2 lines pkg-plist.

Do you approve it?

--------------------- tenshi.diff starts here -----------------------
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/tenshi/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	16 Dec 2005 12:34:42 -0000	1.2
+++ Makefile	5 Apr 2006 17:20:40 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		tenshi
-PORTVERSION=		0.3.4
+PORTVERSION=		0.4
 CATEGORIES=		sysutils
 MASTER_SITES=		http://dev.gentoo.org/~lcars/%SUBDIR%/
 MASTER_SITE_SUBDIR=	tenshi
@@ -20,11 +20,10 @@
 
 USE_PERL5=		yes
 NO_BUILD=		yes
-USE_RC_SUBR=		yes
+USE_RC_SUBR=		tenshi.sh
+SUB_LIST=		PERL=${PERL}
 
-SED_SCRIPT=		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-			-e 's,%%PREFIX%%,${PREFIX},g' \
-			-e 's,%%PERL%%,${PERL},g'
+PLIST_FILES=		bin/tenshi etc/tenshi.conf.sample
 
 PORTDOCS=		README Changelog
 
@@ -56,8 +55,4 @@
 	done
 .endif
 
-post-install:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/tenshi.sh >${WRKDIR}/tenshi.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/tenshi.sh ${PREFIX}/etc/rc.d
-
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/tenshi/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	16 Dec 2005 12:34:42 -0000	1.3
+++ distinfo	5 Apr 2006 17:20:40 -0000
@@ -1,3 +1,3 @@
-MD5 (tenshi-0.3.4.tar.gz) = f3e875540833a85c43052d96c5698463
-SHA256 (tenshi-0.3.4.tar.gz) = 3b3b3706a8066f701b2e2a17d8a3e0fd0096a28389ae67df0414a5a3cf875215
-SIZE (tenshi-0.3.4.tar.gz) = 22737
+MD5 (tenshi-0.4.tar.gz) = 3b614e5eed200d93c205cf46d17f3a2d
+SHA256 (tenshi-0.4.tar.gz) = 2df0bd4a7f9ae0815a3ca28b808da02c73269e918925e3b1fc136e2e884ad8f5
+SIZE (tenshi-0.4.tar.gz) = 24541
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	21 Jul 2004 20:03:52 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-bin/tenshi
-etc/rc.d/tenshi.sh
-etc/tenshi.conf.sample
Index: files/tenshi.sh
===================================================================
RCS file: files/tenshi.sh
diff -N files/tenshi.sh
--- files/tenshi.sh	20 Feb 2006 20:47:44 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/sysutils/tenshi/files/tenshi.sh,v 1.2 2006/02/20 20:47:44 dougb Exp $
-#
-
-# PROVIDE: tenshi
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable `tenshi':
-#
-#tenshi_enable="YES"
-#
-
-. '%%RC_SUBR%%'
-
-name='tenshi'
-rcvar=`set_rcvar`
-
-extra_commands='reload'
-
-command='%%PREFIX%%/bin/tenshi'
-command_interpreter='%%PERL%%'
-
-pidfile='/var/run/tenshi.pid'
-
-required_files='%%PREFIX%%/etc/tenshi.conf'
-
-# set defaults
-
-tenshi_enable="${tenshi_enable:-NO}"
-
-load_rc_config "$name"
-run_rc_command "$1"
Index: files/tenshi.sh.in
===================================================================
RCS file: files/tenshi.sh.in
diff -N files/tenshi.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/tenshi.sh.in	5 Apr 2006 17:20:40 -0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: tenshi
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable `tenshi':
+#
+#tenshi_enable="YES"
+#
+
+. '%%RC_SUBR%%'
+
+name='tenshi'
+rcvar=`set_rcvar`
+
+extra_commands='reload'
+
+command='%%PREFIX%%/bin/tenshi'
+command_interpreter='%%PERL%%'
+
+pidfile='/var/run/tenshi.pid'
+
+required_files='%%PREFIX%%/etc/tenshi.conf'
+
+# set defaults
+
+tenshi_enable="${tenshi_enable:-NO}"
+
+load_rc_config "$name"
+run_rc_command "$1"
--------------------- tenshi.diff stops here -----------------------

-- 
Renato Botelho <garga @ FreeBSD.org>
               <freebsd @ galle.com.br>
GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc

Your fault - core dumped
Comment 3 Frank J. Laszlo 2006-04-05 20:07:37 UTC 
Looks good. Thank you for the patch.

__________________________________________________
Frank Laszlo
System Administrator
The VonOstin Group
Email:  laszlof@tvog.net
WWW:    http://www.vonostingroup.com
Mobile: 248-863-7584



Renato Botelho wrote:
> Dear maintainer.
>
> Since i'm here, I propose you following patch. It use USE_RC_SUBR facility,
> and remove 2 lines pkg-plist.
>
> Do you approve it?
>
> --------------------- tenshi.diff starts here -----------------------
> Index: Makefile
> ===================================================================
> RCS file: /home/pcvs/ports/sysutils/tenshi/Makefile,v
> retrieving revision 1.2
> diff -u -r1.2 Makefile
> --- Makefile	16 Dec 2005 12:34:42 -0000	1.2
> +++ Makefile	5 Apr 2006 17:20:40 -0000
> @@ -6,7 +6,7 @@
>  #
>  
>  PORTNAME=		tenshi
> -PORTVERSION=		0.3.4
> +PORTVERSION=		0.4
>  CATEGORIES=		sysutils
>  MASTER_SITES=		http://dev.gentoo.org/~lcars/%SUBDIR%/
>  MASTER_SITE_SUBDIR=	tenshi
> @@ -20,11 +20,10 @@
>  
>  USE_PERL5=		yes
>  NO_BUILD=		yes
> -USE_RC_SUBR=		yes
> +USE_RC_SUBR=		tenshi.sh
> +SUB_LIST=		PERL=${PERL}
>  
> -SED_SCRIPT=		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
> -			-e 's,%%PREFIX%%,${PREFIX},g' \
> -			-e 's,%%PERL%%,${PERL},g'
> +PLIST_FILES=		bin/tenshi etc/tenshi.conf.sample
>  
>  PORTDOCS=		README Changelog
>  
> @@ -56,8 +55,4 @@
>  	done
>  .endif
>  
> -post-install:
> -	@${SED} ${SED_SCRIPT} ${FILESDIR}/tenshi.sh >${WRKDIR}/tenshi.sh
> -	@${INSTALL_SCRIPT} ${WRKDIR}/tenshi.sh ${PREFIX}/etc/rc.d
> -
>  .include <bsd.port.post.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/pcvs/ports/sysutils/tenshi/distinfo,v
> retrieving revision 1.3
> diff -u -r1.3 distinfo
> --- distinfo	16 Dec 2005 12:34:42 -0000	1.3
> +++ distinfo	5 Apr 2006 17:20:40 -0000
> @@ -1,3 +1,3 @@
> -MD5 (tenshi-0.3.4.tar.gz) = f3e875540833a85c43052d96c5698463
> -SHA256 (tenshi-0.3.4.tar.gz) = 3b3b3706a8066f701b2e2a17d8a3e0fd0096a28389ae67df0414a5a3cf875215
> -SIZE (tenshi-0.3.4.tar.gz) = 22737
> +MD5 (tenshi-0.4.tar.gz) = 3b614e5eed200d93c205cf46d17f3a2d
> +SHA256 (tenshi-0.4.tar.gz) = 2df0bd4a7f9ae0815a3ca28b808da02c73269e918925e3b1fc136e2e884ad8f5
> +SIZE (tenshi-0.4.tar.gz) = 24541
> Index: pkg-plist
> ===================================================================
> RCS file: pkg-plist
> diff -N pkg-plist
> --- pkg-plist	21 Jul 2004 20:03:52 -0000	1.1
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -bin/tenshi
> -etc/rc.d/tenshi.sh
> -etc/tenshi.conf.sample
> Index: files/tenshi.sh
> ===================================================================
> RCS file: files/tenshi.sh
> diff -N files/tenshi.sh
> --- files/tenshi.sh	20 Feb 2006 20:47:44 -0000	1.2
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,34 +0,0 @@
> -#!/bin/sh
> -#
> -# $FreeBSD: ports/sysutils/tenshi/files/tenshi.sh,v 1.2 2006/02/20 20:47:44 dougb Exp $
> -#
> -
> -# PROVIDE: tenshi
> -# REQUIRE: LOGIN
> -# KEYWORD: shutdown
> -
> -# Add the following lines to /etc/rc.conf to enable `tenshi':
> -#
> -#tenshi_enable="YES"
> -#
> -
> -. '%%RC_SUBR%%'
> -
> -name='tenshi'
> -rcvar=`set_rcvar`
> -
> -extra_commands='reload'
> -
> -command='%%PREFIX%%/bin/tenshi'
> -command_interpreter='%%PERL%%'
> -
> -pidfile='/var/run/tenshi.pid'
> -
> -required_files='%%PREFIX%%/etc/tenshi.conf'
> -
> -# set defaults
> -
> -tenshi_enable="${tenshi_enable:-NO}"
> -
> -load_rc_config "$name"
> -run_rc_command "$1"
> Index: files/tenshi.sh.in
> ===================================================================
> RCS file: files/tenshi.sh.in
> diff -N files/tenshi.sh.in
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ files/tenshi.sh.in	5 Apr 2006 17:20:40 -0000
> @@ -0,0 +1,34 @@
> +#!/bin/sh
> +#
> +# $FreeBSD$
> +#
> +
> +# PROVIDE: tenshi
> +# REQUIRE: LOGIN
> +# KEYWORD: shutdown
> +
> +# Add the following lines to /etc/rc.conf to enable `tenshi':
> +#
> +#tenshi_enable="YES"
> +#
> +
> +. '%%RC_SUBR%%'
> +
> +name='tenshi'
> +rcvar=`set_rcvar`
> +
> +extra_commands='reload'
> +
> +command='%%PREFIX%%/bin/tenshi'
> +command_interpreter='%%PERL%%'
> +
> +pidfile='/var/run/tenshi.pid'
> +
> +required_files='%%PREFIX%%/etc/tenshi.conf'
> +
> +# set defaults
> +
> +tenshi_enable="${tenshi_enable:-NO}"
> +
> +load_rc_config "$name"
> +run_rc_command "$1"
> --------------------- tenshi.diff stops here -----------------------
>
>
Comment 4 Renato Botelho freebsd_committer freebsd_triage 2006-04-05 20:37:28 UTC 
State Changed
From-To: open->closed

Committed. Thanks!