Reduce redundancy after release-pkg merge to head in r298107

- Use BINDIR instead of FILESDIR
- Default all <FILESGROUPS>MODEs to BINMODE with a single for-loop at the
  bottom of the Makefile
- Move all of the conditionals under the relevant MK_* != no build conditional
  blocks

Sponsored by: EMC / Isilon Storage Division

1 files changed, 17 insertions, 38 deletions

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index f7ea98f1f159..fb0f2a7a291a 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -2,9 +2,8 @@
 
 .include <src.opts.mk>
 
+BINDIR=		/etc/rc.d
 FILESGROUPS=	FILES
-FILESDIR=	/etc/rc.d
-FILESMODE=	${BINMODE}
 
 FILES=	DAEMON \
 	FILESYSTEMS \
@@ -134,18 +133,14 @@ FILES=	DAEMON \
 .if ${MK_ACCT} != "no"
 FILESGROUPS+=	ACCT
 ACCT+=		accounting
-.endif
-ACCTDIR=	/etc/rc.d
-ACCTMODE=	${BINMODE}
 ACCTPACKAGE=	acct
+.endif
 
 .if ${MK_ACPI} != "no"
 FILESGROUPS+=	ACPI
 ACPI=		power_profile
-.endif
-ACPIDIR=	/etc/rc.d
-ACPIMODE=	${BINMODE}
 ACPIPACKAGE=	acpi
+.endif
 
 .if ${MK_ACPI} != "no" || ${MK_APM} != "no"
 FILES+=		powerd
@@ -154,19 +149,15 @@ FILES+=		powerd
 .if ${MK_AMD} != "no"
 FILESGROUPS+=	AMD
 AMD+=		amd
-.endif
-AMDDIR=		/etc/rc.d
-AMDMODE=	${BINMODE}
 AMDPACKAGE=	amd
+.endif
 
 .if ${MK_APM} != "no"
 FILESGROUPS+=	APM
 APM+=		apm
 APM+=		apmd
-.endif
-APMDIR=		/etc/rc.d
-APMMODE=	${BINMODE}
 APMPACKAGE=	apm
+.endif
 
 .if ${MK_AUTOFS} != "no"
 FILES+=		automount
@@ -190,10 +181,8 @@ FILES+=		bootparams
 .if ${MK_BSNMP} != "no"
 FILESGROUPS+=	BSNMP
 BSNMP+=		bsnmpd
-.endif
-BSNMPDIR=	/etc/rc.d
-BSNMPMODE=	${BINMODE}
 BSNMPPACKAGE=	bsnmp
+.endif
 
 .if ${MK_CCD} != "no"
 FILES+=		ccd
@@ -206,10 +195,8 @@ FILES+=		ftpd
 .if ${MK_HAST} != "no"
 FILESGROUPS+=	HAST
 HAST=		hastd
-.endif
-HASTDIR=	/etc/rc.d
-HASTMODE=	${BINMODE}
 HASTPACKAGE=	hast
+.endif
 
 .if ${MK_INETD} != "no"
 FILES+=		inetd
@@ -223,10 +210,8 @@ FILES+=		iscsid
 .if ${MK_JAIL} != "no"
 FILESGROUPS+=	JAIL
 JAIL+=		jail
-.endif
-JAILDIR=	/etc/rc.d
-JAILMODE=	${BINMODE}
 JAILPACKAGE=	jail
+.endif
 
 .if ${MK_LEGACY_CONSOLE} != "no"
 FILES+=		moused
@@ -269,10 +254,8 @@ FILES+=		keyserv
 .if ${MK_OPENSSH} != "no"
 FILESGROUPS+=	SSH
 SSH=		sshd
-.endif
-SSHDIR=		/etc/rc.d
-SSHMODE=	${BINMODE}
 SSHPACKAGE=	ssh
+.endif
 
 .if ${MK_PF} != "no"
 FILES+=		ftp-proxy
@@ -281,10 +264,8 @@ FILES+=		ftp-proxy
 .if ${MK_RCMDS} != "no"
 FILESGROUPS+=	RCMDS
 RCMDS+=		rwho
-.endif
-RCMDSDIR=	/etc/rc.d
-RCMDSMODE=	${BINMODE}
 RCMDSPACKAGE=	rcmds
+.endif
 
 .if ${MK_ROUTED} != "no"
 FILES+=		routed
@@ -293,10 +274,8 @@ FILES+=		routed
 .if ${MK_SENDMAIL} != "no"
 FILESGROUPS+=	SMRCD
 SMRCD=		sendmail
-.endif
-SMRCDDIR=	/etc/rc.d
-SMRCDMODE=	${BINMODE}
 SMRCDPACKAGE=	sendmail
+.endif
 
 .if ${MK_TIMED} != "no"
 FILES+=		timed
@@ -305,10 +284,8 @@ FILES+=		timed
 .if ${MK_UNBOUND} != "no"
 FILESGROUPS+=	UNBOUND
 UNBOUND+=	local_unbound
-.endif
-UNBOUNDDIR=	/etc/rc.d
-UNBOUNDMODE=	${BINMODE}
 UNBOUNDPACKAGE=	unbound
+.endif
 
 .if ${MK_UTMPX} != "no"
 _utx=		utx
@@ -317,14 +294,16 @@ _utx=		utx
 .if ${MK_VI} != "no"
 FILESGROUPS+=	VI
 VI+=		virecover
-.endif
-VIDIR=		/etc/rc.d
-VIMODE=		${BINMODE}
 VIPACKAGE=	vi
+.endif
 
 .if ${MK_WIRELESS} != "no"
 FILES+=		hostapd
 FILES+=		wpa_supplicant
 .endif
 
+.for fg in ${FILESGROUPS}
+${fg}MODE?=	${BINMODE}
+.endfor
+
 .include <bsd.prog.mk>