ports/93265: [PATCH] RELENG_6 after local_startup MFC should install foo, not foo.sh

[Doug Barton]

>Number:         93265
>Category:       ports
>Synopsis:       [PATCH] RELENG_6 after local_startup MFC should install foo, not foo.sh
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 13 07:30:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Doug Barton
>Release:        FreeBSD 7.0-CURRENT-0212 i386
>Organization:
AAAG
>Environment:
	N/A
>Description:
	In 1.519 of bsd.port.mk the code was added to cause USE_RC_SUBR
	to install startup scripts as foo, rather than foo.sh, based on
	an OSVERSION after the local_startup changes that introduced these
	scripts to the base rcorder. This code has been MFC'ed since before
	the first of the year, and no substantial problems have been reported
	in any branch for some time now. 

	Backporting this part of the change to RELENG_6 systems after the MFC
	will significantly advance the goal of eventually being able to
	drop the test and install all boot scripts as foo, which will in
	turn give us the option of adding special semantics to local *.sh
	scripts, as they currently are treated in the base.
>How-To-Repeat:
	N/A
>Fix:
	Apply the following patch to bsd.port.mk, ideally prior to 6.1-RELEASE:

Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.525
diff -u -r1.525 bsd.port.mk
--- bsd.port.mk	11 Feb 2006 02:34:48 -0000	1.525
+++ bsd.port.mk	13 Feb 2006 07:12:24 -0000
@@ -5123,7 +5123,7 @@
 .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
 	@${ECHO_CMD} "===> Installing rc.d startup script(s)"
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
-.if ${OSVERSION} >= 700007
+.if (${OSVERSION} >= 700007 || (${OSVERSION} < 700000 && ${OSVERSION} >= 600101))
 	@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}; \


>Release-Note:
>Audit-Trail:
>Unformatted: