svn commit: r390321 - head/Mk
Baptiste Daroussin
bapt at FreeBSD.org
Mon Jun 22 19:55:45 UTC 2015
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 at 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
More information about the svn-ports-all
mailing list