From owner-freebsd-ports@FreeBSD.ORG  Sat May 19 23:39:29 2007
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: ports@FreeBSD.org
Delivered-To: freebsd-ports@FreeBSD.ORG
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C970F16A400
	for <ports@FreeBSD.org>; Sat, 19 May 2007 23:39:29 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from mail2.fluidhosting.com (mx24.fluidhosting.com [204.14.89.7])
	by mx1.freebsd.org (Postfix) with SMTP id 7FA1A13C455
	for <ports@FreeBSD.org>; Sat, 19 May 2007 23:39:29 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: (qmail 1934 invoked by uid 399); 19 May 2007 23:39:29 -0000
Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1)
	by localhost with SMTP; 19 May 2007 23:39:29 -0000
X-Originating-IP: 127.0.0.1
Message-ID: <464F8AAF.2010609@FreeBSD.org>
Date: Sat, 19 May 2007 16:39:27 -0700
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://www.FreeBSD.org/
User-Agent: Thunderbird 2.0b2 (X11/20070116)
MIME-Version: 1.0
To: Peter Jeremy <peterjeremy@optushome.com.au>
References: <464F62D8.80200@FreeBSD.org>
	<20070519215700.GC1164@turion.vk2pj.dyndns.org>
	<464F75BF.80203@FreeBSD.org>
	<20070519223641.GE1164@turion.vk2pj.dyndns.org>
In-Reply-To: <20070519223641.GE1164@turion.vk2pj.dyndns.org>
Content-Type: multipart/mixed; boundary="------------050904040905090204040404"
Cc: ports@FreeBSD.org, x11@FreeBSD.org
Subject: Re: X.org 7.2 ports merged into the FreeBSD Ports Tree
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 May 2007 23:39:29 -0000

This is a multi-part message in MIME format.
--------------050904040905090204040404
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Peter Jeremy wrote:

> If you upgrade to xorg 7.2 but don't cleanup the /etc files then rc.d
> and periodic scripts are processe twice.  

Here is a lightly tested patch to rc.subr that should do the trick. If 
someone wants to give this a ride on a system where this issue has 
been a problem, I can commit it in HEAD and let it shake out a bit.

Doug

-- 

     This .signature sanitized for your protection


--------------050904040905090204040404
Content-Type: text/plain;
 name="rc.subr-nodupes.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="rc.subr-nodupes.diff"

Index: rc.subr
===================================================================
RCS file: /usr/local/ncvs/src/etc/rc.subr,v
retrieving revision 1.74
diff -u -r1.74 rc.subr
--- rc.subr	10 Mar 2007 13:37:44 -0000	1.74
+++ rc.subr	19 May 2007 23:36:33 -0000
@@ -1460,14 +1460,20 @@
 }
 
 find_local_scripts_new () {
+	local dir f
+
 	local_rc=''
 	for dir in ${local_startup}; do
 		if [ -d "${dir}" ]; then
-			for file in `grep -l '^# PROVIDE:' ${dir}/* 2>/dev/null`; do
-				case "$file" in
+			for f in `grep -l '^# PROVIDE:' ${dir}/* 2>/dev/null`
+			do
+				case "$f" in
 				*.sample) ;;
-				*)	if [ -x "$file" ]; then
-						local_rc="${local_rc} ${file}"
+				*)	if [ -x "$f" ]; then
+						case "$local_rc" in
+						*[\ ]*${f}[\ ]*|*[\ ]*${f}) ;;
+						*) local_rc="${local_rc} $f" ;;
+						esac
 					fi
 					;;
 				esac

--------------050904040905090204040404--