ports/144570: [patch] devel/p5-Gearman-Server fix overlap in startup script

[Andrej Zverev]

>Number:         144570
>Category:       ports
>Synopsis:       [patch] devel/p5-Gearman-Server fix overlap in startup script
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 09 06:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Andrej Zverev
>Release:        
>Organization:
>Environment:


>Description:
	Since devel/gearmand and devel/p5-Gearman-Server have startup script
	with same name we need to resolve this conflict.

	It was discussed with maintainer some time ago.

>How-To-Repeat:
>Fix:
	1. Rename gearmand.in to gearmand-perl.in
	2. add note into UPDATING to inform users about changes
	3. BUMP portrevision

--- p5-Gearmand-Server.diff begins here ---
Index: UPDATING
===================================================================
RCS file: /home/pcvs/ports/UPDATING,v
retrieving revision 1.905
diff -u -r1.905 UPDATING
--- UPDATING	2 Mar 2010 09:13:13 -0000	1.905
+++ UPDATING	9 Mar 2010 06:39:41 -0000
@@ -5,6 +5,14 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20100309:
+  AFFECTS: users of devel/p5-Gearman-Server
+  AUTHOR: commiter_name at FreeBSD.org
+
+  The rc.d script has been renamed from gearmand to gearmand-perl
+  to avoid namespace conflict with devel/gearmand. You need to change
+  runtime variables from gearmand_ to gearmand-perl_ in rc.conf
+
 20100221:
   AFFECTS: users of rblibtorrent-devel
   AUTHOR: dougb at FreeBSD.org
Index: devel/p5-Gearman-Server/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-Gearman-Server/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- devel/p5-Gearman-Server/Makefile	11 Feb 2010 17:02:25 -0000	1.4
+++ devel/p5-Gearman-Server/Makefile	9 Mar 2010 06:39:41 -0000
@@ -7,9 +7,9 @@
 
 PORTNAME=	Gearman-Server
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	../by-authors/id/D/DO/DORMANDO
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vivek at khera.org
@@ -23,7 +23,7 @@
 MAN1=	gearmand.1
 MAN3=	Gearman::Server.3 Gearman::Server::Client.3
 
-USE_RC_SUBR=	gearmand
-SUB_LIST+=	NAME=gearmand
+USE_RC_SUBR=	gearmand-perl
+SUB_LIST+=	NAME=gearmand-perl
 
 .include <bsd.port.mk>
Index: devel/p5-Gearman-Server/files/gearmand-perl.in
===================================================================
RCS file: devel/p5-Gearman-Server/files/gearmand-perl.in
diff -N devel/p5-Gearman-Server/files/gearmand-perl.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ devel/p5-Gearman-Server/files/gearmand-perl.in	9 Mar 2010 06:39:41 -0000
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: %%NAME%%
+# REQUIRE: DAEMON
+
+# Add the following line to /etc/rc.conf to enable `%%NAME%%':
+#
+#%%NAME%%_enable="YES"
+
+. "%%RC_SUBR%%"
+
+name="%%NAME%%"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/bin/gearmand"
+command_interpreter="%%PREFIX%%/bin/perl"
+command_args="--daemon"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${%%NAME%%_enable="NO"}
+
+run_rc_command "$1"
Index: devel/p5-Gearman-Server/files/gearmand.in
===================================================================
RCS file: devel/p5-Gearman-Server/files/gearmand.in
diff -N devel/p5-Gearman-Server/files/gearmand.in
--- devel/p5-Gearman-Server/files/gearmand.in	8 Sep 2007 08:17:15 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/devel/p5-Gearman-Server/files/gearmand.in,v 1.1 2007/09/08 08:17:15 clsung Exp $
-#
-
-# PROVIDE: %%NAME%%
-# REQUIRE: DAEMON
-
-# Add the following line to /etc/rc.conf to enable `%%NAME%%':
-#
-#%%NAME%%_enable="YES"
-
-. "%%RC_SUBR%%"
-
-name="%%NAME%%"
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/bin/gearmand"
-command_interpreter="%%PREFIX%%/bin/perl"
-command_args="--daemon"
-
-# read configuration and set defaults
-load_rc_config "$name"
-: ${%%NAME%%_enable="NO"}
-
-run_rc_command "$1"
--- p5-Gearmand-Server.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: