From owner-svn-ports-all@FreeBSD.ORG Mon Jun 22 19:55:44 2015 Return-Path: Delivered-To: svn-ports-all@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0618348; Mon, 22 Jun 2015 19:55:44 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 C2D9EAD; Mon, 22 Jun 2015 19:55:44 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MJtiDD069486; Mon, 22 Jun 2015 19:55:44 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MJtifC069485; Mon, 22 Jun 2015 19:55:44 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201506221955.t5MJtifC069485@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 22 Jun 2015 19:55:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390321 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 19:55:45 -0000 Author: bapt Date: Mon Jun 22 19:55:44 2015 New Revision: 390321 URL: https://svnweb.freebsd.org/changeset/ports/390321 Log: Make USE_RC_SUBR install rc.d scripts in /etc/rc.d if PREFIX is /usr Remove now useless USE_RC_ORDER Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Jun 22 19:52:35 2015 (r390320) +++ head/Mk/bsd.port.mk Mon Jun 22 19:55:44 2015 (r390321) @@ -474,12 +474,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # If this is set to a list of files, these files will be # automatically added to ${SUB_FILES}, some %%VAR%%'s will # automatically be expanded, they will be installed in -# ${PREFIX}/etc/rc.d and added to the packing list. -# USE_RCORDER - List of rc.d startup scripts to be called early in the boot -# process. This acts exactly like USE_RC_SUBR except that -# scripts are installed in /etc/rc.d. -# Because local rc.d scripts are included in the base rcorder -# this option is not needed unless the port installs in the base. +# ${PREFIX}/etc/rc.d if ${PREFIX} is not /usr, otherwise they +# will be installed in /etc/rc.d/ and added to the packing list. ## # USE_APACHE - If set, this port relies on an apache webserver. # @@ -5166,24 +5162,17 @@ add-plist-post: .endif .if !target(install-rc-script) -.if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} != "YES" -install-rc-script: -.if defined(USE_RCORDER) - @${ECHO_MSG} "===> Staging early rc.d startup script(s)" - @for i in ${USE_RCORDER}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}/etc/rc.d/$${i%.sh}; \ - ${ECHO_CMD} "/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ - done -.endif .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} != "YES" +install-rc-script: @${ECHO_MSG} "===> Staging rc.d startup script(s)" @for i in ${USE_RC_SUBR}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}${PREFIX}/etc/rc.d/$${i%.sh}; \ - ${ECHO_CMD} "${PREFIX}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ + _prefix=${PREFIX}; \ + [ "${PREFIX}" = "/usr" ] && _prefix="" ; \ + ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \ + ${ECHO_CMD} "$${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ done .endif .endif -.endif .if !target(check-man) check-man: stage