From nobody@FreeBSD.org  Mon Jan  2 22:09:56 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA0EB1065680
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  2 Jan 2012 22:09:56 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id AA9378FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  2 Jan 2012 22:09:56 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q02M9uJc017278
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 2 Jan 2012 22:09:56 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q02M9uHT017277;
	Mon, 2 Jan 2012 22:09:56 GMT
	(envelope-from nobody)
Message-Id: <201201022209.q02M9uHT017277@red.freebsd.org>
Date: Mon, 2 Jan 2012 22:09:56 GMT
From: Garrett Cooper <yaneurabeya@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Make etc/Makefile more conflict resistant
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         163789
>Category:       conf
>Synopsis:       [patch] Make etc/Makefile more conflict resistant
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 02 22:10:08 UTC 2012
>Closed-Date:    Tue Apr 24 01:57:55 UTC 2012
>Last-Modified:  Sun Feb 03 22:30:05 UTC 2013
>Originator:     Garrett Cooper
>Release:        9.0-PRERELEASE
>Organization:
n/a
>Environment:
FreeBSD bayonetta.local 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #0 r229187M: Sun Jan  1 14:39:27 PST 2012     gcooper@bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA  amd64
>Description:
The attached patch makes etc/Makefile more conflict resistant, s.t. it's easier for developers and vendors to make changes to the installed files.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: etc/Makefile
===================================================================
--- etc/Makefile	(revision 229316)
+++ etc/Makefile	(working copy)
@@ -7,18 +7,48 @@
 SUBDIR=	sendmail
 .endif
 
-BIN1=	auth.conf \
-	crontab devd.conf devfs.conf \
-	ddb.conf dhclient.conf disktab fbtab \
-	ftpusers gettytab group \
-	hosts hosts.allow hosts.equiv \
-	inetd.conf libalias.conf login.access login.conf mac.conf motd \
-	netconfig network.subr networks newsyslog.conf nsswitch.conf \
-	phones profile protocols \
-	rc rc.bsdextended rc.firewall rc.initdiskless \
-	rc.sendmail rc.shutdown \
-	rc.subr remote rpc services shells \
-	sysctl.conf syslog.conf termcap.small
+BIN1=	auth.conf
+BIN1+=	crontab
+BIN1+=	devd.conf
+BIN1+=	devfs.conf
+BIN1+=	ddb.conf
+BIN1+=	dhclient.conf
+BIN1+=	disktab
+BIN1+=	fbtab
+BIN1+=	ftpusers
+BIN1+=	gettytab
+BIN1+=	group
+BIN1+=	hosts
+BIN1+=	hosts.allow
+BIN1+=	hosts.equiv
+BIN1+=	inetd.conf
+BIN1+=	libalias.conf
+BIN1+=	login.access
+BIN1+=	login.conf
+BIN1+=	mac.conf
+BIN1+=	motd
+BIN1+=	netconfig
+BIN1+=	network.subr
+BIN1+=	networks
+BIN1+=	newsyslog.conf
+BIN1+=	nsswitch.conf
+BIN1+=	phones
+BIN1+=	profile
+BIN1+=	protocols
+BIN1+=	rc
+BIN1+=	rc.bsdextended
+BIN1+=	rc.firewall
+BIN1+=	rc.initdiskless
+BIN1+=	rc.sendmail
+BIN1+=	rc.shutdown
+BIN1+=	rc.subr
+BIN1+=	remote
+BIN1+=	rpc
+BIN1+=	services
+BIN1+=	shells
+BIN1+=	sysctl.conf
+BIN1+=	syslog.conf
+BIN1+=	termcap.small
 
 .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
 BIN1+=	etc.${MACHINE}/ttys


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Sun Jan 22 05:42:32 UTC 2012 
Responsible-Changed-Why:  
n1 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163789 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: conf/163789: commit references a PR
Date: Thu,  9 Feb 2012 20:44:34 +0000 (UTC)

 Author: eadler
 Date: Thu Feb  9 20:44:20 2012
 New Revision: 231298
 URL: http://svn.freebsd.org/changeset/base/231298
 
 Log:
   Make etc/Makefile more conflict resistant
   
   PR:		conf/163789
   Submitted by:	gcooper (iXsystems)
   Approved by:	cperciva
   MFC after:	3 days
 
 Modified:
   head/etc/Makefile
 
 Modified: head/etc/Makefile
 ==============================================================================
 --- head/etc/Makefile	Thu Feb  9 19:13:36 2012	(r231297)
 +++ head/etc/Makefile	Thu Feb  9 20:44:20 2012	(r231298)
 @@ -7,18 +7,48 @@
  SUBDIR=	sendmail
  .endif
  
 -BIN1=	auth.conf \
 -	crontab devd.conf devfs.conf \
 -	ddb.conf dhclient.conf disktab fbtab \
 -	ftpusers gettytab group \
 -	hosts hosts.allow hosts.equiv \
 -	inetd.conf libalias.conf login.access login.conf mac.conf motd \
 -	netconfig network.subr networks newsyslog.conf nsswitch.conf \
 -	phones profile protocols \
 -	rc rc.bsdextended rc.firewall rc.initdiskless \
 -	rc.sendmail rc.shutdown \
 -	rc.subr remote rpc services shells \
 -	sysctl.conf syslog.conf termcap.small
 +BIN1=	auth.conf
 +BIN1+=	crontab
 +BIN1+=	devd.conf
 +BIN1+=	devfs.conf
 +BIN1+=	ddb.conf
 +BIN1+=	dhclient.conf
 +BIN1+=	disktab
 +BIN1+=	fbtab
 +BIN1+=	ftpusers
 +BIN1+=	gettytab
 +BIN1+=	group
 +BIN1+=	hosts
 +BIN1+=	hosts.allow
 +BIN1+=	hosts.equiv
 +BIN1+=	inetd.conf
 +BIN1+=	libalias.conf
 +BIN1+=	login.access
 +BIN1+=	login.conf
 +BIN1+=	mac.conf
 +BIN1+=	motd
 +BIN1+=	netconfig
 +BIN1+=	network.subr
 +BIN1+=	networks
 +BIN1+=	newsyslog.conf
 +BIN1+=	nsswitch.conf
 +BIN1+=	phones
 +BIN1+=	profile
 +BIN1+=	protocols
 +BIN1+=	rc
 +BIN1+=	rc.bsdextended
 +BIN1+=	rc.firewall
 +BIN1+=	rc.initdiskless
 +BIN1+=	rc.sendmail
 +BIN1+=	rc.shutdown
 +BIN1+=	rc.subr
 +BIN1+=	remote
 +BIN1+=	rpc
 +BIN1+=	services
 +BIN1+=	shells
 +BIN1+=	sysctl.conf
 +BIN1+=	syslog.conf
 +BIN1+=	termcap.small
  
  .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
  BIN1+=	etc.${MACHINE}/ttys
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: eadler 
State-Changed-When: Thu Feb 9 20:53:57 UTC 2012 
State-Changed-Why:  
committed in r231298 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163789 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Tue Apr 24 01:57:54 UTC 2012 
State-Changed-Why:  
MFCed to 9; not going to MFC further 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163789 
>Unformatted:
