From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 13 07:30:06 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD84716A420 for ; Mon, 13 Feb 2006 07:30:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C3BF43D46 for ; Mon, 13 Feb 2006 07:30:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k1D7U6J8049204 for ; Mon, 13 Feb 2006 07:30:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1D7U66l049203; Mon, 13 Feb 2006 07:30:06 GMT (envelope-from gnats) Resent-Date: Mon, 13 Feb 2006 07:30:06 GMT Resent-Message-Id: <200602130730.k1D7U66l049203@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Doug Barton Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 348D616A420 for ; Mon, 13 Feb 2006 07:24:17 +0000 (GMT) (envelope-from dougb@dougb.net) Received: from lap.dougb.net (70-32-110-40.vnnyca.adelphia.net [70.32.110.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id E56FF43D45 for ; Mon, 13 Feb 2006 07:24:16 +0000 (GMT) (envelope-from dougb@dougb.net) Received: from lap.dougb.net (localhost [127.0.0.1]) by lap.dougb.net (8.13.4/8.13.4) with ESMTP id k1D7OFD4010415 for ; Sun, 12 Feb 2006 23:24:16 -0800 (PST) (envelope-from dougb@dougb.net) Received: (from dougb@localhost) by lap.dougb.net (8.13.4/8.13.4/Submit) id k1D7OF6r010414; Sun, 12 Feb 2006 23:24:15 -0800 (PST) (envelope-from dougb) Message-Id: <200602130724.k1D7OF6r010414@lap.dougb.net> Date: Sun, 12 Feb 2006 23:24:15 -0800 (PST) From: Doug Barton To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/93265: [PATCH] RELENG_6 after local_startup MFC should install foo, not foo.sh X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Doug Barton List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2006 07:30:06 -0000 >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: