From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Dec 9 16:50:21 2005 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 ACE8E16A41F for ; Fri, 9 Dec 2005 16:50:21 +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 6DE6643D72 for ; Fri, 9 Dec 2005 16:50:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jB9Go3qi053814 for ; Fri, 9 Dec 2005 16:50:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jB9Go3al053813; Fri, 9 Dec 2005 16:50:03 GMT (envelope-from gnats) Resent-Date: Fri, 9 Dec 2005 16:50:03 GMT Resent-Message-Id: <200512091650.jB9Go3al053813@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, Pav Lucistnik Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8559C16A41F for ; Fri, 9 Dec 2005 16:41:24 +0000 (GMT) (envelope-from pav@oook.cz) Received: from hood.oook.cz (hood.oook.cz [195.250.137.134]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE26F43D66 for ; Fri, 9 Dec 2005 16:41:23 +0000 (GMT) (envelope-from pav@oook.cz) Received: from ikaros.oook.cz (localhost [127.0.0.1]) by hood.oook.cz (8.13.4/8.13.4) with ESMTP id jB9GfLQh001183 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 9 Dec 2005 17:41:21 +0100 (CET) (envelope-from pav@localhost.my.domain) Received: (from pav@localhost) by ikaros.oook.cz (8.13.4/8.13.4/Submit) id jB9GfLLi001182; Fri, 9 Dec 2005 17:41:21 +0100 (CET) (envelope-from pav) Message-Id: <200512091641.jB9GfLLi001182@ikaros.oook.cz> Date: Fri, 9 Dec 2005 17:41:21 +0100 (CET) From: Pav Lucistnik To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/90150: update USE_RC_SUBR for >= 700007 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Pav Lucistnik List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2005 16:50:21 -0000 >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: