From owner-svn-src-projects@freebsd.org Fri Jan 29 21:35:25 2016 Return-Path: Delivered-To: svn-src-projects@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 93AA8A73567 for ; Fri, 29 Jan 2016 21:35:25 +0000 (UTC) (envelope-from gjb@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 4C8621364; Fri, 29 Jan 2016 21:35:25 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0TLZO7f051883; Fri, 29 Jan 2016 21:35:24 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0TLZOX5051882; Fri, 29 Jan 2016 21:35:24 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601292135.u0TLZOX5051882@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 29 Jan 2016 21:35:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295052 - projects/release-pkg/etc/rc.d X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2016 21:35:25 -0000 Author: gjb Date: Fri Jan 29 21:35:24 2016 New Revision: 295052 URL: https://svnweb.freebsd.org/changeset/base/295052 Log: Cleanup and organize etc/rc.d/Makefile. No functional changes. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/etc/rc.d/Makefile Modified: projects/release-pkg/etc/rc.d/Makefile ============================================================================== --- projects/release-pkg/etc/rc.d/Makefile Fri Jan 29 21:06:59 2016 (r295051) +++ projects/release-pkg/etc/rc.d/Makefile Fri Jan 29 21:35:24 2016 (r295052) @@ -3,6 +3,8 @@ .include FILESGROUPS= FILES +FILESDIR= /etc/rc.d +FILESMODE= ${BINMODE} FILES= DAEMON \ FILESYSTEMS \ @@ -137,11 +139,17 @@ FILES= DAEMON \ FILESGROUPS+= ACCT ACCT+= accounting .endif +ACCTDIR= /etc/rc.d +ACCTMODE= ${BINMODE} +ACCTPACKAGE= acct .if ${MK_ACPI} != "no" FILESGROUPS+= ACPI ACPI= power_profile .endif +ACPIDIR= /etc/rc.d +ACPIMODE= ${BINMODE} +ACPIPACKAGE= acpi .if ${MK_ACPI} != "no" || ${MK_APM} != "no" FILES+= powerd @@ -151,12 +159,18 @@ FILES+= powerd FILESGROUPS+= AMD AMD+= amd .endif +AMDDIR= /etc/rc.d +AMDMODE= ${BINMODE} +AMDPACKAGE= amd .if ${MK_APM} != "no" FILESGROUPS+= APM APM+= apm APM+= apmd .endif +APMDIR= /etc/rc.d +APMMODE= ${BINMODE} +APMPACKAGE= apm .if ${MK_AUTOFS} != "no" FILES+= automount @@ -179,6 +193,9 @@ FILES+= bootparams FILESGROUPS+= BSNMP BSNMP+= bsnmpd .endif +BSNMPDIR= /etc/rc.d +BSNMPMODE= ${BINMODE} +BSNMPPACKAGE= bsnmp .if ${MK_CASPER} != "no" _casperd= casperd @@ -209,6 +226,9 @@ FILES+= iscsid FILESGROUPS+= JAIL JAIL+= jail .endif +JAILDIR= /etc/rc.d +JAILMODE= ${BINMODE} +JAILPACKAGE= jail .if ${MK_LEGACY_CONSOLE} != "no" FILES+= moused @@ -252,6 +272,9 @@ FILES+= keyserv FILESGROUPS+= SSH SSH= sshd .endif +SSHDIR= /etc/rc.d +SSHMODE= ${BINMODE} +SSHPACKAGE= ssh .if ${MK_PF} != "no" FILES+= ftp-proxy @@ -277,6 +300,9 @@ FILES+= timed FILESGROUPS+= UNBOUND UNBOUND+= local_unbound .endif +UNBOUNDDIR= /etc/rc.d +UNBOUNDMODE= ${BINMODE} +UNBOUNDPACKAGE= unbound .if ${MK_UTMPX} != "no" _utx= utx @@ -291,39 +317,4 @@ FILES+= hostapd FILES+= wpa_supplicant .endif -FILESDIR= /etc/rc.d -FILESMODE= ${BINMODE} - -UNBOUNDDIR= /etc/rc.d -UNBOUNDMODE= ${BINMODE} -UNBOUNDPACKAGE= unbound - -ACPIDIR= /etc/rc.d -ACPIMODE= ${BINMODE} -ACPIPACKAGE= acpi - -AMDDIR= /etc/rc.d -AMDMODE= ${BINMODE} -AMDPACKAGE= amd - -SSHDIR= /etc/rc.d -SSHMODE= ${BINMODE} -SSHPACKAGE= ssh - -BSNMPDIR= /etc/rc.d -BSNMPMODE= ${BINMODE} -BSNMPPACKAGE= bsnmp - -JAILDIR= /etc/rc.d -JAILMODE= ${BINMODE} -JAILPACKAGE= jail - -ACCTDIR= /etc/rc.d -ACCTMODE= ${BINMODE} -ACCTPACKAGE= acct - -APMDIR= /etc/rc.d -APMMODE= ${BINMODE} -APMPACKAGE= apm - .include