From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 18 21:20:09 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 8AF9C16A420 for ; Sat, 18 Feb 2006 21:20:09 +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 E309343D49 for ; Sat, 18 Feb 2006 21:20:08 +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 k1ILK8u3040125 for ; Sat, 18 Feb 2006 21:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k1ILK8YF040124; Sat, 18 Feb 2006 21:20:08 GMT (envelope-from gnats) Resent-Date: Sat, 18 Feb 2006 21:20:08 GMT Resent-Message-Id: <200602182120.k1ILK8YF040124@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, Xin LI Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B64816A422; Sat, 18 Feb 2006 21:18:09 +0000 (GMT) (envelope-from delphij@tarsier.delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [210.51.165.229]) by mx1.FreeBSD.org (Postfix) with ESMTP id ED01C43D45; Sat, 18 Feb 2006 21:18:08 +0000 (GMT) (envelope-from delphij@tarsier.delphij.net) Received: from localhost (tarsier.geekcn.org [210.51.165.229]) by tarsier.geekcn.org (Postfix) with ESMTP id 4B822EB3722; Sun, 19 Feb 2006 05:18:07 +0800 (CST) Received: from tarsier.geekcn.org ([210.51.165.229]) by localhost (mail.geekcn.org [210.51.165.229]) (amavisd-new, port 10024) with ESMTP id 00897-05; Sun, 19 Feb 2006 05:18:06 +0800 (CST) Received: from tarsier.delphij.net (tarsier.geekcn.org [210.51.165.229]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTP id 88357EB2E7D; Sun, 19 Feb 2006 05:18:05 +0800 (CST) Received: from tarsier.delphij.net (localhost [127.0.0.1]) by tarsier.delphij.net (8.13.4/8.13.4) with ESMTP id k1ILI4FI012223; Sun, 19 Feb 2006 05:18:04 +0800 (CST) (envelope-from delphij@tarsier.delphij.net) Received: (from delphij@localhost) by tarsier.delphij.net (8.13.4/8.13.4/Submit) id k1ILHxEB012222; Sun, 19 Feb 2006 05:17:59 +0800 (CST) (envelope-from delphij) Message-Id: <200602182117.k1ILHxEB012222@tarsier.delphij.net> Date: Sun, 19 Feb 2006 05:17:59 +0800 (CST) From: Xin LI To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: re@FreeBSD.org, portmgr@FreeBSD.org Subject: ports/93536: [PATCH] Correct rc.d installation in bsd.port.mk for RELENG_6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Xin LI List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Feb 2006 21:20:09 -0000 >Number: 93536 >Category: ports >Synopsis: [PATCH] Correct rc.d installation in bsd.port.mk for RELENG_6 >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 18 21:20:08 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Xin LI >Release: FreeBSD 6.1-PRERELEASE i386 >Organization: The FreeBSD Project >Environment: System: FreeBSD tarsier.delphij.net 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #8: Sat Feb 18 01:46:38 CST 2006 delphij@tarsier.delphij.net:/usr/obj/usr/src/sys/TARSIER i386 >Description: The new rc.d order was MFC'ed by __FreeBSD_version 600101, however, bsd.port.mk does not have knowledge about it. This is a show-stopper that must be corrected before 6.1-RELEASE or rc.d scripts installed by ports would be unable to run. >How-To-Repeat: Install a port that uses rc.d script on new RELENG_6 system. >Fix: Because 700007 is greater than 600101, we should change it to 600101. --- patch-bsd.port.mk begins here --- Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/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 18 Feb 2006 21:12:17 -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} >= 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}; \ --- patch-bsd.port.mk ends here --- >Release-Note: >Audit-Trail: >Unformatted: