ports/129704: [PATCH]fixed a CONFLICTS of rc script

[Chifeng Qu]

>Number:         129704
>Category:       ports
>Synopsis:       [PATCH]fixed a CONFLICTS of rc script
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 17 02:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Chifeng Qu
>Release:        FreeBSD 7.0-RELEASE-p5
>Organization:
extmail team
>Environment:
FreeBSD chifeng.chifeng.name 7.0-RELEASE-p5 FreeBSD 7.0-RELEASE-p5 #0: Fri Nov 28 11:44:52 UTC 2008     root at chifeng.chifeng.name:/usr/obj/usr/src/sys/CHIFENG  amd64
>Description:
mail/policyd2

The rc script have a CONFLICTS for policyd v1(mail/postfix-policyd-sf).

>How-To-Repeat:
NONE
>Fix:
apply this patch.

Patch attached with submission follows:

diff -ruN policyd2.old/Makefile policyd2/Makefile
--- policyd2.old/Makefile	2008-12-04 03:53:23.000000000 +0000
+++ policyd2/Makefile	2008-12-17 01:47:17.000000000 +0000
@@ -24,7 +24,7 @@
 USE_PERL5=	yes
 USE_PHP=	yes
 NO_BUILD=	yes
-USE_RC_SUBR=	policyd.sh
+USE_RC_SUBR=	policyd2.sh
 SUB_FILES=	pkg-message
 
 WEBUIDIR=	${PREFIX}/www/policyd
diff -ruN policyd2.old/files/policyd.sh.in policyd2/files/policyd.sh.in
--- policyd2.old/files/policyd.sh.in	2008-12-04 03:42:36.000000000 +0000
+++ policyd2/files/policyd.sh.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Start or stop policyd
-# $FreeBSD: ports/mail/policyd2/files/policyd.sh.in,v 1.1 2008/12/04 03:42:36 beech Exp $
-
-# PROVIDE: policyd
-# KEYWORD: shutdown
-#
-# Define these policyd_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-
-. %%RC_SUBR%%
-
-name="policyd"
-rcvar=`set_rcvar`
-
-command="%%LOCALBASE%%/bin/cbpolicyd"
-procname="/usr/bin/perl"
-
-load_rc_config $name
-
-: ${policyd_enable="NO"}
-
-run_rc_command "$1"
diff -ruN policyd2.old/files/policyd2.sh.in policyd2/files/policyd2.sh.in
--- policyd2.old/files/policyd2.sh.in	1970-01-01 00:00:00.000000000 +0000
+++ policyd2/files/policyd2.sh.in	2008-12-17 01:51:21.000000000 +0000
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Start or stop policyd2
+# $FreeBSD: ports/mail/policyd2/files/policyd.sh.in,v 1.1 2008/12/04 03:42:36 beech Exp $
+
+# PROVIDE: policyd2
+# KEYWORD: shutdown
+#
+# Define these policyd2_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+
+. %%RC_SUBR%%
+
+name="policyd2"
+rcvar=`set_rcvar`
+
+command="%%LOCALBASE%%/bin/cbpolicyd"
+procname="/usr/bin/perl"
+
+load_rc_config $name
+
+: ${policyd_enable="NO"}
+
+run_rc_command "$1"


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