Date: Fri, 9 Dec 2005 17:41:21 +0100 (CET) From: Pav Lucistnik <pav@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/90150: update USE_RC_SUBR for >= 700007 Message-ID: <200512091641.jB9GfLLi001182@ikaros.oook.cz> Resent-Message-ID: <200512091650.jB9Go3al053813@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90150
>Category: ports
>Synopsis: update USE_RC_SUBR for >= 700007
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 09 16:50:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Pav Lucistnik
>Release: FreeBSD 6.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD ikaros.oook.cz 6.0-STABLE FreeBSD 6.0-STABLE #1: Mon Dec 5 20:09:10 CET 2005 root@ikaros.oook.cz:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Doug Barton checked a new infrastructure that integrates startup scripts
installed by ports into /usr/local/etc/rc.d into system rcorder. It's strongly
desirable to install startup scripts without .sh suffix, because scripts
suffixed with .sh are considered "non-compatible" and rcorder is not used with
them.
I'm not addressing USE_RCORDER consumers for now. They can be converted to
USE_RC_SUBR once we deprecate systems older then 700007, or on case-by-case
basis now.
Please consider attached fix:
>How-To-Repeat:
>Fix:
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.518
diff -a -u -r1.518 bsd.port.mk
--- bsd.port.mk 8 Nov 2005 09:02:51 -0000 1.518
+++ bsd.port.mk 9 Dec 2005 16:27:32 -0000
@@ -4952,11 +4952,18 @@
.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
@${ECHO_CMD} "===> Installing rcNG startup script(s)"
@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
+.if ${OSVERSION} >= 700007
+ @for i in ${USE_RC_SUBR}; do \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}; \
+ ${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+ done
+.else
@for i in ${USE_RC_SUBR}; do \
${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}.sh; \
${ECHO_CMD} "etc/rc.d/$${i%.sh}.sh" >> ${TMPPLIST}; \
done
.endif
+.endif
.else
@${DO_NADA}
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512091641.jB9GfLLi001182>