Date: Fri, 13 Dec 2002 20:14:33 -0500 (EST)
From: Ray Kohler <ataraxia@cox.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/46248: [patch] bsd.port.subdir.mk missing some INDEX->${INDEXFILE} conversions
Message-ID: <20021214011433.99A3C1144D@arkadia.nv.cox.net>
next in thread | raw e-mail | index | archive | help
>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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021214011433.99A3C1144D>