conf/163789: [patch] Make etc/Makefile more conflict resistant

Garrett Cooper yanegomi at gmail.com
Mon Jan 2 22:10:09 UTC 2012


>Number:         163789
>Category:       conf
>Synopsis:       [patch] Make etc/Makefile more conflict resistant
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 02 22:10:08 UTC 2012
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted:


More information about the freebsd-bugs mailing list