Page MenuHomeFreeBSD
Files F144506837

D23690.1775102279.diff
No OneTemporary
Actions

Size
22 KB
Referenced Files
None
Subscribers
None

D23690.1775102279.diff
View Options

Index: bin/csh/Makefile
===================================================================
--- bin/csh/Makefile
+++ bin/csh/Makefile
@@ -8,12 +8,9 @@
.include <src.opts.mk>
-CONFGROUPS= ETC ROOT
+.PATH: ${SRCTOP}/etc
+CONFGROUPS= ETC
ETC= csh.cshrc csh.login csh.logout
-ROOT= dot.cshrc dot.login
-ROOTDIR= /root
-ROOTNAME_dot.cshrc= .cshrc
-ROOTNAME_dot.login= .login
PACKAGE=runtime
TCSHDIR= ${SRCTOP}/contrib/tcsh
.PATH: ${TCSHDIR}
@@ -155,10 +152,4 @@
sort >> ${.TARGET}
@echo '#endif /* _h_tc_const */' >> ${.TARGET}
-beforeinstallconfig:
- rm -f ${DESTDIR}/.cshrc
-
-afterinstallconfig:
- ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
-
.include <bsd.prog.mk>
Index: bin/sh/Makefile
===================================================================
--- bin/sh/Makefile
+++ bin/sh/Makefile
@@ -3,12 +3,9 @@
.include <src.opts.mk>
-CONFGROUPS= ETC ROOT
+.PATH: ${SRCTOP}/etc
+CONFGROUPS= ETC
ETC= profile
-ROOT= dot.shrc dot.profile
-ROOTDIR= /root
-ROOTNAME_dot.shrc= .shrc
-ROOTNAME_dot.profile= .profile
PACKAGE=runtime
PROG= sh
INSTALLFLAGS= -S
@@ -67,10 +64,4 @@
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
-beforeinstallconfig:
- rm -f ${DESTDIR}/.profile
-
-afterinstallconfig:
- ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
-
.include <bsd.prog.mk>
Index: etc/Makefile
===================================================================
--- etc/Makefile
+++ etc/Makefile
@@ -11,9 +11,21 @@
# No need as it is empty and just causes rebuilds since this file does so much.
UPDATE_DEPENDFILE= no
+SUBDIR.${MK_AUTOFS}+= autofs
+SUBDIR.${MK_BLUETOOTH}+=bluetooth
+SUBDIR+= cron.d
+SUBDIR.${MK_CXX}+= devd
+SUBDIR+= defaults
+SUBDIR+= newsyslog.conf.d
+SUBDIR.${MK_NTP}+= ntp
+SUBDIR+= pam.d
+SUBDIR+= periodic
+SUBDIR+= pkg
+SUBDIR+= root
.if ${MK_SENDMAIL} != "no"
SUBDIR+=sendmail
.endif
+SUBDIR+= syslog.d
# NB: keep these sorted by MK_* knobs
Index: etc/bluetooth/Makefile
===================================================================
--- /dev/null
+++ etc/bluetooth/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PACKAGE= bluetooth
+CONFS= hcsecd.conf hosts protocols
+CONFSDIR= /etc/bluetooth
+CONFSMODE_hcsecd.conf= 600
+CONFSMODE_protocols= 444
+
+.include <bsd.prog.mk>
Index: etc/cron.d/Makefile
===================================================================
--- /dev/null
+++ etc/cron.d/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+.if ${MK_AT} != "no"
+CONFS= atrun
+CONFSDIR= /etc/cron.d
+CONFSNAME= at
+CONFSPACKAGE= at
+.endif
+
+.include <bsd.prog.mk>
Index: etc/defaults/Makefile
===================================================================
--- /dev/null
+++ etc/defaults/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+CONFGROUPS= BLUETOOTH CONFS RUNTIME
+
+CONFS= periodic.conf
+CONFSDIR= /etc/defaults
+
+RUNTIME= devfs.rules
+RUNTIMEDIR= ${CONFSDIR}
+RUNTIMEPACKAGE= runtime
+RUNTIMEMODE_devfs.rules= 600
+
+.if ${MK_BLUETOOTH} != "no"
+BLUETOOTH= bluetooth.device.conf
+BLUETOOTHDIR= ${CONFSDIR}
+BLUETOOTHPACKAGE= bluetooth
+.endif
+
+.include <bsd.prog.mk>
Index: etc/devd/Makefile
===================================================================
--- /dev/null
+++ etc/devd/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+CONFS= devmatch.conf
+CONFSDIR= /etc/devd
+.if ${MK_ACPI} != "no"
+CONFS+= asus.conf
+.endif
+
+.if ${MK_HYPERV} != "no"
+CONFS+= hyperv.conf
+.endif
+
+.if ${MK_USB} != "no"
+CONFS+= uath.conf ulpt.conf
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+CONFS+= apple.conf
+.endif
+
+.if ${MK_ZFS} != "no"
+CONFS+= zfs.conf
+.endif
+
+.include <bsd.prog.mk>
Index: etc/ntp/Makefile
===================================================================
--- /dev/null
+++ etc/ntp/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+DIRS= ETC_NTP
+ETC_NTP= /etc/ntp
+ETC_NTP_MODE= 0700
+
+FILES= leap-seconds
+FILESDIR= ETC_NTP
+FILESMODE= 644
+
+.include <bsd.prog.mk>
Index: etc/pkg/Makefile
===================================================================
--- /dev/null
+++ etc/pkg/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH
+BRANCH?= ${_BRANCH}
+.if ${BRANCH:MCURRENT} != ""
+PKGCONFBRANCH?= latest
+.else
+. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
+PKGCONFBRANCH?= quarterly
+. else
+. if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
+PKGCONFBRANCH?= quarterly
+. else
+PKGCONFBRANCH?= latest
+. endif
+. endif
+.endif
+CONFS= FreeBSD.conf.${PKGCONFBRANCH}
+CONFSNAME= FreeBSD.conf
+CONFSDIR= /etc/pkg
+CONFSMODE= 644
+
+.include <bsd.prog.mk>
Index: etc/root/Makefile
===================================================================
--- /dev/null
+++ etc/root/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+CONFS= dot.cshrc dot.login dot.profile dot.shrc
+CONFSDIR= /root
+CONFSNAME_dot.cshrc= .cshrc
+CONFSNAME_dot.login= .login
+CONFSNAME_dot.shrc= .shrc
+CONFSNAME_dot.profile= .profile
+PACKAGE= runtime
+
+beforeinstallconfig:
+ rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile
+
+afterinstallconfig:
+ ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+ ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
+
+.include <bsd.prog.mk>
Index: etc/syslog.d/Makefile
===================================================================
--- /dev/null
+++ etc/syslog.d/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+
+CONFS=
+CONFSDIR= /etc/syslog.d
+.if ${MK_FTP} != "no"
+CONFS+= ftp.conf
+.endif
+
+.if ${MK_LPR} != "no"
+CONFS+= lpr.conf
+.endif
+
+.if ${MK_PPP} != "no"
+CONFS+= ppp.conf
+.endif
+
+.include <bsd.prog.mk>
Index: lib/lib80211/Makefile
===================================================================
--- lib/lib80211/Makefile
+++ lib/lib80211/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
PACKAGE= runtime
CONFS= regdomain.xml
LIB= 80211
Index: lib/libalias/libalias/Makefile
===================================================================
--- lib/libalias/libalias/Makefile
+++ lib/libalias/libalias/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${SRCTOP}/sys/netinet/libalias
+.PATH: ${SRCTOP}/sys/netinet/libalias ${SRCTOP}/etc
CONFS= libalias.conf
LIB= alias
Index: lib/libbluetooth/Makefile
===================================================================
--- lib/libbluetooth/Makefile
+++ lib/libbluetooth/Makefile
@@ -2,9 +2,6 @@
# $FreeBSD$
PACKAGE= bluetooth
-CONFS= hosts protocols
-CONFSDIR= /etc/bluetooth
-CONFSMODE_protocols= 444
LIB= bluetooth
MAN= bluetooth.3
Index: lib/libc/net/Makefile.inc
===================================================================
--- lib/libc/net/Makefile.inc
+++ lib/libc/net/Makefile.inc
@@ -2,9 +2,9 @@
# $FreeBSD$
# machine-independent net sources
-.PATH: ${LIBC_SRCTOP}/net
+.PATH: ${LIBC_SRCTOP}/net ${SRCTOP}/etc
-CONFS+= net/hosts net/hosts.equiv net/networks net/nsswitch.conf net/protocols
+CONFS+= hosts hosts.equiv networks nsswitch.conf protocols
SRCS+= base64.c ether_addr.c eui64.c \
gai_strerror.c getaddrinfo.c \
gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
Index: lib/libc/posix1e/Makefile.inc
===================================================================
--- lib/libc/posix1e/Makefile.inc
+++ lib/libc/posix1e/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${LIBC_SRCTOP}/posix1e
+.PATH: ${LIBC_SRCTOP}/posix1e ${SRCTOP}/etc
CFLAGS+=-D_ACL_PRIVATE
@@ -8,7 +8,7 @@
subr_acl_nfs4.c: ${SRCTOP}/sys/kern/subr_acl_nfs4.c
cat ${.ALLSRC} > ${.TARGET}
-CONFS+= posix1e/mac.conf
+CONFS+= mac.conf
SRCS+= acl_branding.c \
acl_calc_mask.c \
acl_copy.c \
Index: lib/libc/rpc/Makefile.inc
===================================================================
--- lib/libc/rpc/Makefile.inc
+++ lib/libc/rpc/Makefile.inc
@@ -1,8 +1,8 @@
# @(#)Makefile 5.11 (Berkeley) 9/6/90
# $FreeBSD$
-.PATH: ${LIBC_SRCTOP}/rpc ${LIBC_SRCTOP}/.
-CONFS+= rpc/netconfig rpc/rpc
+.PATH: ${LIBC_SRCTOP}/rpc ${LIBC_SRCTOP}/. ${SRCTOP}/etc
+CONFS+= netconfig ${SRCTOP}/etc/rpc
SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \
Index: lib/libopie/Makefile
===================================================================
--- lib/libopie/Makefile
+++ lib/libopie/Makefile
@@ -3,6 +3,7 @@
# $FreeBSD$
#
+.PATH: ${SRCTOP}/etc
CONFS= opieaccess
CONFSMODE= 600
PACKAGE=lib${LIB}
Index: lib/libpam/Makefile
===================================================================
--- lib/libpam/Makefile
+++ lib/libpam/Makefile
@@ -25,7 +25,7 @@
# $FreeBSD$
# The modules link in libpam. They build the static modules as well.
-SUBDIR+= libpam modules pam.d
+SUBDIR+= libpam modules
SUBDIR_DEPEND_modules= libpam
SUBDIR+= static_libpam
SUBDIR_DEPEND_static_libpam= modules
Index: lib/libsmb/Makefile
===================================================================
--- lib/libsmb/Makefile
+++ lib/libsmb/Makefile
@@ -2,6 +2,7 @@
.include <src.opts.mk>
+.PATH: ${SRCTOP}/etc
CONFS= nsmb.conf
CONFSMODE= 600
PACKAGE=lib${LIB}
Index: lib/libwrap/Makefile
===================================================================
--- lib/libwrap/Makefile
+++ lib/libwrap/Makefile
@@ -4,6 +4,7 @@
.include <src.opts.mk>
+.PATH: ${SRCTOP}/etc
CONFS= hosts.allow
LIB= wrap
SHLIB_MAJOR= 6
Index: libexec/ftpd/Makefile
===================================================================
--- libexec/ftpd/Makefile
+++ libexec/ftpd/Makefile
@@ -3,6 +3,7 @@
.include <src.opts.mk>
+.PATH: ${SRCTOP}/etc
CONFS= ftpusers
PROG= ftpd
MAN= ftpd.8 ftpchroot.5
Index: libexec/getty/Makefile
===================================================================
--- libexec/getty/Makefile
+++ libexec/getty/Makefile
@@ -1,6 +1,7 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
CONFS= gettytab
PROG= getty
SRCS= main.c init.c subr.c chat.c
Index: libexec/rtld-elf/Makefile
===================================================================
--- libexec/rtld-elf/Makefile
+++ libexec/rtld-elf/Makefile
@@ -11,6 +11,7 @@
MK_PIE= no # Always position independent using local rules
MK_SSP= no
+.PATH: ${SRCTOP}/etc
CONFS= libmap.conf
PROG?= ld-elf.so.1
.if (${PROG:M*ld-elf32*} != "")
Index: sbin/bsdlabel/Makefile
===================================================================
--- sbin/bsdlabel/Makefile
+++ sbin/bsdlabel/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 3/17/94
# $FreeBSD$
-.PATH: ${SRCTOP}/sys/geom
+.PATH: ${SRCTOP}/sys/geom ${SRCTOP}/etc
CONFS= disktab
PACKAGE=runtime
Index: sbin/ddb/Makefile
===================================================================
--- sbin/ddb/Makefile
+++ sbin/ddb/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
CONFS= ddb.conf
PACKAGE=runtime
PROG= ddb
Index: sbin/devd/Makefile
===================================================================
--- sbin/devd/Makefile
+++ sbin/devd/Makefile
@@ -2,31 +2,11 @@
.include <src.opts.mk>
+.PATH: ${SRCTOP}/etc
WARNS?= 3
PACKAGE=utilities
-CONFGROUPS= CONFS DEVD
+CONFGROUPS= CONFS
CONFS= devd.conf
-DEVD= devmatch.conf
-DEVDDIR= /etc/devd
-.if ${MK_ACPI} != "no"
-DEVD+= asus.conf
-.endif
-
-.if ${MK_HYPERV} != "no"
-DEVD+= hyperv.conf
-.endif
-
-.if ${MK_USB} != "no"
-DEVD+= uath.conf ulpt.conf
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-DEVD+= apple.conf
-.endif
-
-.if ${MK_ZFS} != "no"
-DEVD+= zfs.conf
-.endif
PROG_CXX=devd
SRCS= devd.cc token.l parse.y y.tab.h
Index: sbin/devfs/Makefile
===================================================================
--- sbin/devfs/Makefile
+++ sbin/devfs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
-CONFS= devfs.conf devfs.rules
-CONFSDIR_devfs.rules= /etc/defaults
-CONFSMODE_devfs.rules= 600
+.PATH: ${SRCTOP}/etc
+CONFS= devfs.conf
PACKAGE=runtime
PROG= devfs
SRCS= devfs.c rule.c
Index: sbin/dhclient/Makefile
===================================================================
--- sbin/dhclient/Makefile
+++ sbin/dhclient/Makefile
@@ -33,6 +33,7 @@
.include <src.opts.mk>
+.PATH: ${SRCTOP}/etc
CONFS= dhclient.conf
PACKAGE=runtime
SRCS= dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \
Index: sbin/init/Makefile
===================================================================
--- sbin/init/Makefile
+++ sbin/init/Makefile
@@ -1,6 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
+TTYSRC= ${SRCTOP}/etc
+.PATH: ${TTYSRC}
+
CONFGROUPS= CONFTTYS
PACKAGE=runtime
PROG= init
@@ -12,11 +15,11 @@
LIBADD= util crypt
CONFTTYSNAME= ttys
-.if exists(${.CURDIR}/ttys.${MACHINE})
+.if exists(${TTYSRC}/ttys.${MACHINE})
CONFTTYS+= ttys.${MACHINE}
-.elif exists(${.CURDIR}/ttys.${MACHINE_ARCH})
+.elif exists(${TTYSRC}/ttys.${MACHINE_ARCH})
CONFTTYS+= ttys.${MACHINE_ARCH}
-.elif exists(${.CURDIR}/ttys.${MACHINE_CPUARCH})
+.elif exists(${TTYSRC}/ttys.${MACHINE_CPUARCH})
CONFTTYS+= ttys.${MACHINE_CPUARCH}
.else
.error MACHINE.ttys missing
Index: sbin/pfctl/Makefile
===================================================================
--- sbin/pfctl/Makefile
+++ sbin/pfctl/Makefile
@@ -3,7 +3,7 @@
.include <src.opts.mk>
# pf_ruleset.c is shared between kernel and pfctl
-.PATH: ${SRCTOP}/sys/netpfil/pf
+.PATH: ${SRCTOP}/sys/netpfil/pf ${SRCTOP}/etc
PACKAGE=pf
CONFS= pf.os
Index: sbin/savecore/Makefile
===================================================================
--- sbin/savecore/Makefile
+++ sbin/savecore/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
PACKAGE=runtime
CONFS= minfree
VAR_CRASH= /var/crash
Index: sbin/sysctl/Makefile
===================================================================
--- sbin/sysctl/Makefile
+++ sbin/sysctl/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
PACKAGE=runtime
CONFS= sysctl.conf
PROG= sysctl
Index: usr.bin/at/Makefile
===================================================================
--- usr.bin/at/Makefile
+++ usr.bin/at/Makefile
@@ -2,9 +2,6 @@
.include "${.CURDIR}/Makefile.inc"
-CONFS= atrun
-CONFSDIR= /etc/cron.d
-CONFSNAME= at
PROG= at
SRCS= at.c panic.c parsetime.c perm.c
LINKS= ${BINDIR}/at ${BINDIR}/atq \
Index: usr.bin/login/Makefile
===================================================================
--- usr.bin/login/Makefile
+++ usr.bin/login/Makefile
@@ -3,6 +3,7 @@
.include <src.opts.mk>
+.PATH: ${SRCTOP}/etc
CONFS= fbtab login.conf motd.template login.access
PROG= login
SRCS= login.c login_fbtab.c
Index: usr.bin/tip/tip/Makefile
===================================================================
--- usr.bin/tip/tip/Makefile
+++ usr.bin/tip/tip/Makefile
@@ -31,6 +31,7 @@
# explicitly to remcap.c if not 1024
# CONNECT enable ~C command (connect pgm to remote)
+.PATH: ${SRCTOP}/etc
CONFS= phones remote
PROG= tip
LINKS= ${BINDIR}/tip ${BINDIR}/cu
Index: usr.sbin/amd/amd/Makefile
===================================================================
--- usr.sbin/amd/amd/Makefile
+++ usr.sbin/amd/amd/Makefile
@@ -8,7 +8,7 @@
.include <bsd.init.mk>
-.PATH: ${SRCTOP}/contrib/amd/amd
+.PATH: ${SRCTOP}/contrib/amd/amd ${SRCTOP}/etc
CONFS= amd.map
PROG= amd
Index: usr.sbin/apmd/Makefile
===================================================================
--- usr.sbin/apmd/Makefile
+++ usr.sbin/apmd/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
CONFS= apmd.conf
PROG= apmd
MAN= apmd.8
Index: usr.sbin/auditd/Makefile
===================================================================
--- usr.sbin/auditd/Makefile
+++ usr.sbin/auditd/Makefile
@@ -7,17 +7,17 @@
CFLAGS+= -I${OPENBSMDIR}
-OPENBSMETCDIR= ${OPENBSMDIR}/etc
-CONFS= ${OPENBSMETCDIR}/audit_class
-CONFSMODE_${OPENBSMETCDIR}/audit_class= 444
-CONFS+= ${OPENBSMETCDIR}/audit_control
-CONFSMODE_${OPENBSMETCDIR}/audit_control= 600
-CONFS+= ${OPENBSMETCDIR}/audit_event
-CONFSMODE_${OPENBSMETCDIR}/audit_event= 444
-CONFS+= ${OPENBSMETCDIR}/audit_user
-CONFSMODE_${OPENBSMETCDIR}/audit_user= 600
-CONFS+= ${OPENBSMETCDIR}/audit_warn
-CONFSMODE_${OPENBSMETCDIR}/audit_warn= 500
+.PATH: ${OPENBSMDIR}/etc
+CONFS= audit_class
+CONFSMODE_audit_class= 444
+CONFS+= audit_control
+CONFSMODE_audit_control= 600
+CONFS+= audit_event
+CONFSMODE_audit_event= 444
+CONFS+= audit_user
+CONFSMODE_audit_user= 600
+CONFS+= audit_warn
+CONFSMODE_audit_warn= 500
CONFSDIR= /etc/security
PROG= auditd
SRCS= auditd.c audit_warn.c auditd_fbsd.c
Index: usr.sbin/autofs/Makefile
===================================================================
--- usr.sbin/autofs/Makefile
+++ usr.sbin/autofs/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
CONFS= auto_master
PACKAGE=autofs
PROG= automountd
@@ -31,6 +32,4 @@
.PATH: ${MOUNT}
-SUBDIR= autofs
-
.include <bsd.prog.mk>
Index: usr.sbin/blacklistd/Makefile
===================================================================
--- usr.sbin/blacklistd/Makefile
+++ usr.sbin/blacklistd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
BLACKLIST_DIR=${SRCTOP}/contrib/blacklist
-.PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port
+.PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port ${SRCTOP}/etc
CONFS= blacklistd.conf
PROG= blacklistd
Index: usr.sbin/bluetooth/hccontrol/Makefile
===================================================================
--- usr.sbin/bluetooth/hccontrol/Makefile
+++ usr.sbin/bluetooth/hccontrol/Makefile
@@ -2,8 +2,6 @@
# $FreeBSD$
PACKAGE= bluetooth
-CONFS= bluetooth.device.conf
-CONFSDIR= /etc/defaults
PROG= hccontrol
MAN= hccontrol.8
SRCS= send_recv.c link_policy.c link_control.c le.c\
Index: usr.sbin/bluetooth/hcsecd/Makefile
===================================================================
--- usr.sbin/bluetooth/hcsecd/Makefile
+++ usr.sbin/bluetooth/hcsecd/Makefile
@@ -2,9 +2,6 @@
# $FreeBSD$
PACKAGE= bluetooth
-CONFS= hcsecd.conf
-CONFSDIR= /etc/bluetooth
-CONFSMODE_hcsecd.conf= 600
PROG= hcsecd
MAN= hcsecd.8 hcsecd.conf.5
SRCS= hcsecd.c lexer.l parser.y
Index: usr.sbin/bsnmpd/bsnmpd/Makefile
===================================================================
--- usr.sbin/bsnmpd/bsnmpd/Makefile
+++ usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -7,7 +7,7 @@
CONTRIB=${SRCTOP}/contrib/bsnmp
.PATH: ${CONTRIB}/snmpd
-CONFS= snmpd.config
+CONFS= ${SRCTOP}/etc/snmpd.config
CONFSMODE= 600
PROG= bsnmpd
SRCS= main.c action.c config.c export.c trap.c trans_udp.c trans_lsock.c
Index: usr.sbin/cron/cron/Makefile
===================================================================
--- usr.sbin/cron/cron/Makefile
+++ usr.sbin/cron/cron/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
CONFS= crontab
PROG= cron
MAN= cron.8
Index: usr.sbin/freebsd-update/Makefile
===================================================================
--- usr.sbin/freebsd-update/Makefile
+++ usr.sbin/freebsd-update/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
CONFS= freebsd-update.conf
SCRIPTS=freebsd-update.sh
MAN= freebsd-update.8
Index: usr.sbin/inetd/Makefile
===================================================================
--- usr.sbin/inetd/Makefile
+++ usr.sbin/inetd/Makefile
@@ -3,6 +3,7 @@
.include <src.opts.mk>
+.PATH: ${SRCTOP}/etc
CONFS= inetd.conf
PROG= inetd
MAN= inetd.8
Index: usr.sbin/lpr/lpd/Makefile
===================================================================
--- usr.sbin/lpr/lpd/Makefile
+++ usr.sbin/lpr/lpd/Makefile
@@ -1,6 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
CONFS= hosts.lpd printcap
PROG= lpd
MAN= lpd.8
Index: usr.sbin/newsyslog/Makefile
===================================================================
--- usr.sbin/newsyslog/Makefile
+++ usr.sbin/newsyslog/Makefile
@@ -2,6 +2,7 @@
.include <src.opts.mk>
+.PATH: ${SRCTOP}/etc
CONFS= newsyslog.conf
PROG= newsyslog
MAN= newsyslog.8 newsyslog.conf.5
@@ -10,6 +11,5 @@
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
-SUBDIR+= newsyslog.conf.d
.include <bsd.prog.mk>
Index: usr.sbin/nscd/Makefile
===================================================================
--- usr.sbin/nscd/Makefile
+++ usr.sbin/nscd/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
CONFS= nscd.conf
PROG= nscd
MAN= nscd.conf.5 nscd.8
Index: usr.sbin/ntp/ntpd/Makefile
===================================================================
--- usr.sbin/ntp/ntpd/Makefile
+++ usr.sbin/ntp/ntpd/Makefile
@@ -4,16 +4,10 @@
.include <src.opts.mk>
-.PATH: ${SRCTOP}/contrib/ntp/ntpd \
+.PATH: ${SRCTOP}/contrib/ntp/ntpd ${SRCTOP}/etc \
${.OBJDIR}
-DIRS= ETC_NTP
-ETC_NTP= /etc/ntp
-ETC_NTP_MODE= 0700
CONFS= ntp.conf
-FILES= leap-seconds
-FILESDIR= ETC_NTP
-FILESMODE= 644
PROG= ntpd
SRCS= cmd_args.c ntp_config.c ntp_control.c ntp_crypto.c ntp_filegen.c \
Index: usr.sbin/periodic/Makefile
===================================================================
--- usr.sbin/periodic/Makefile
+++ usr.sbin/periodic/Makefile
@@ -1,10 +1,6 @@
# $FreeBSD$
-CONFS= periodic.conf
-CONFSDIR= /etc/defaults
SCRIPTS=periodic.sh
MAN= periodic.8
-SUBDIR= etc
-
.include <bsd.prog.mk>
Index: usr.sbin/pkg/Makefile
===================================================================
--- usr.sbin/pkg/Makefile
+++ usr.sbin/pkg/Makefile
@@ -1,24 +1,5 @@
# $FreeBSD$
-_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH
-BRANCH?= ${_BRANCH}
-.if ${BRANCH:MCURRENT} != ""
-PKGCONFBRANCH?= latest
-.else
-. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
-PKGCONFBRANCH?= quarterly
-. else
-. if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
-PKGCONFBRANCH?= quarterly
-. else
-PKGCONFBRANCH?= latest
-. endif
-. endif
-.endif
-CONFS= FreeBSD.conf.${PKGCONFBRANCH}
-CONFSNAME= FreeBSD.conf
-CONFSDIR= /etc/pkg
-CONFSMODE= 644
PROG= pkg
SRCS= pkg.c dns_utils.c config.c
MAN= pkg.7
Index: usr.sbin/portsnap/portsnap/Makefile
===================================================================
--- usr.sbin/portsnap/portsnap/Makefile
+++ usr.sbin/portsnap/portsnap/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.PATH: ${SRCTOP}/etc
CONFS= portsnap.conf
SCRIPTS=portsnap.sh
MAN= portsnap.8
Index: usr.sbin/services_mkdb/Makefile
===================================================================
--- usr.sbin/services_mkdb/Makefile
+++ usr.sbin/services_mkdb/Makefile
@@ -2,6 +2,7 @@
PACKAGE= runtime
+.PATH: ${SRCTOP}/etc
CONFS= services
PROG= services_mkdb
MAN= services_mkdb.8
Index: usr.sbin/syslogd/Makefile
===================================================================
--- usr.sbin/syslogd/Makefile
+++ usr.sbin/syslogd/Makefile
@@ -3,9 +3,9 @@
.include <src.opts.mk>
-.PATH: ${SRCTOP}/usr.bin/wall
+.PATH: ${SRCTOP}/usr.bin/wall ${SRCTOP}/etc
-CONFGROUPS= CONFS SYSLOGD_D
+CONFGROUPS= CONFS
CONFS= syslog.conf
PROG= syslogd
MAN= syslog.conf.5 syslogd.8
@@ -20,20 +20,6 @@
CFLAGS+= -DINET6
.endif
-SYSLOGD_D=
-SYSLOGD_DDIR= /etc/syslog.d
-.if ${MK_FTP} != "no"
-SYSLOGD_D+= ftp.conf
-.endif
-
-.if ${MK_LPR} != "no"
-SYSLOGD_D+= lpr.conf
-.endif
-
-.if ${MK_PPP} != "no"
-SYSLOGD_D+= ppp.conf
-.endif
-
CFLAGS+= -I${SRCTOP}/usr.bin/wall
.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 2, 3:57 AM (8 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28241784
Default Alt Text
D23690.1775102279.diff (22 KB)

Event Timeline