From owner-svn-src-user@freebsd.org Thu May 5 01:07:18 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B327B2C730 for ; Thu, 5 May 2016 01:07:18 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E745F1E11; Thu, 5 May 2016 01:07:17 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4517HVt002446; Thu, 5 May 2016 01:07:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4517Hon002445; Thu, 5 May 2016 01:07:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201605050107.u4517Hon002445@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 5 May 2016 01:07:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r299101 - user/ngie/detangle-rc/etc/rc.d X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2016 01:07:18 -0000 Author: ngie Date: Thu May 5 01:07:16 2016 New Revision: 299101 URL: https://svnweb.freebsd.org/changeset/base/299101 Log: - Remove redundant *DIR and *MODE variables; BINDIR and BINMODE already specify working defaults. - Move *PACKAGE variables inside conditionals to better localize all of the variables for ease of use/understanding. Modified: user/ngie/detangle-rc/etc/rc.d/Makefile Modified: user/ngie/detangle-rc/etc/rc.d/Makefile ============================================================================== --- user/ngie/detangle-rc/etc/rc.d/Makefile Thu May 5 01:02:03 2016 (r299100) +++ user/ngie/detangle-rc/etc/rc.d/Makefile Thu May 5 01:07:16 2016 (r299101) @@ -127,18 +127,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 @@ -147,29 +143,23 @@ 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_ATM} != "no" FILESGROUPS+= ATM ATM+= atm1 ATM+= atm2 ATM+= atm3 -.endif -ATMDIR= /etc/rc.d -ATMMODE= ${BINMODE} ATMPACKAGE= atm +.endif .if ${MK_AUTOFS} != "no" FILES+= automount @@ -191,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 @@ -207,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_INET6} != "no" FILES+= ip6addrctl @@ -231,10 +217,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 @@ -277,10 +261,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 @@ -289,10 +271,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 @@ -301,10 +281,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 @@ -313,10 +291,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 @@ -325,10 +301,8 @@ _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 @@ -336,8 +310,10 @@ FILES+= wpa_supplicant .endif .if ${MK_ZFS} != "no" -FILES+= zfs -FILES+= zvol +FILESGROUPS+= ZFS +ZFS+= zfs +ZFS+= zvol +ZFSPACKAGE= zfs .endif .include