From owner-freebsd-ports Fri Dec 13 17:20: 4 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 308FC37B401 for ; Fri, 13 Dec 2002 17:20:02 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5317743EA9 for ; Fri, 13 Dec 2002 17:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gBE1K1x3056361 for ; Fri, 13 Dec 2002 17:20:01 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gBE1K1Wt056360; Fri, 13 Dec 2002 17:20:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 385E137B401 for ; Fri, 13 Dec 2002 17:14:35 -0800 (PST) Received: from lakemtao01.cox.net (lakemtao01.cox.net [68.1.17.244]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8437343E4A for ; Fri, 13 Dec 2002 17:14:34 -0800 (PST) (envelope-from ataraxia@cox.net) Received: from arkadia.nv.cox.net ([68.98.181.29]) by lakemtao01.cox.net (InterMail vM.5.01.04.05 201-253-122-122-105-20011231) with ESMTP id <20021214011432.ZFHA4411.lakemtao01.cox.net@arkadia.nv.cox.net> for ; Fri, 13 Dec 2002 20:14:32 -0500 Received: by arkadia.nv.cox.net (Postfix, from userid 1001) id 99A3C1144D; Fri, 13 Dec 2002 20:14:33 -0500 (EST) Message-Id: <20021214011433.99A3C1144D@arkadia.nv.cox.net> Date: Fri, 13 Dec 2002 20:14:33 -0500 (EST) From: Ray Kohler To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/46248: [patch] bsd.port.subdir.mk missing some INDEX->${INDEXFILE} conversions Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46248 >Category: ports >Synopsis: [patch] bsd.port.subdir.mk missing some INDEX->${INDEXFILE} conversions >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Dec 13 17:20:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Ray Kohler >Release: FreeBSD 5.0-RC i386 >Organization: >Environment: System: FreeBSD arkadia.nv.cox.net 5.0-RC FreeBSD 5.0-RC #5: Thu Dec 12 19:23:27 EST 2002 root@arkadia.nv.cox.net:/usr/obj/usr/src/sys/ARKADIA i386 bsd.port.subdir.mk: $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.46 2002/12/04 17:17:48 kris Exp $ >Description: The "search:" target of this file still uses hard-coded references to INDEX, which makes the target fail on current. >How-To-Repeat: cd /usr/ports && make search key=foo >Fix: Apply this patch: --- bsd.port.subdir.mk~ Wed Dec 4 18:14:37 2002 +++ bsd.port.subdir.mk Fri Dec 13 20:04:20 2002 @@ -262,15 +262,15 @@ -search: ${PORTSDIR}/INDEX +search: ${PORTSDIR}/${INDEXFILE} @here=`pwd`; \ cd ${PORTSDIR}; \ top=`pwd -P`; \ there=`echo "$$here/" | sed s%$$top%${PORTSDIR}%`; \ if [ -n "$$key" ]; then \ - grep $$there ${PORTSDIR}/INDEX | grep -i "${key}" | awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9); }'; \ + grep $$there ${PORTSDIR}/${INDEXFILE} | grep -i "${key}" | awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9); }'; \ elif [ $$name ]; then \ - grep $$there ${PORTSDIR}/INDEX | grep -i "^[^|]*${name}[^|]*|" | awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9); }'; \ + grep $$there ${PORTSDIR}/${INDEXFILE} | grep -i "^[^|]*${name}[^|]*|" | awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9); }'; \ else \ echo "The search target requires a keyword parameter or name parameter,"; \ echo "e.g.: \"make search key=somekeyword\""; \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message