From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 22 12:30:17 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 C450A16A421 for ; Sat, 22 Oct 2005 12:30:17 +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 2B54943D48 for ; Sat, 22 Oct 2005 12:30:17 +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 j9MCUGip027824 for ; Sat, 22 Oct 2005 12:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9MCUGY4027823; Sat, 22 Oct 2005 12:30:16 GMT (envelope-from gnats) Resent-Date: Sat, 22 Oct 2005 12:30:16 GMT Resent-Message-Id: <200510221230.j9MCUGY4027823@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, Arseny Nasokin Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8891416A41F for ; Sat, 22 Oct 2005 12:27:06 +0000 (GMT) (envelope-from tarc@tarc.po.cs.msu.su) Received: from tarc.po.cs.msu.su (tarc.po.cs.msu.su [158.250.16.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3C8D43D46 for ; Sat, 22 Oct 2005 12:27:05 +0000 (GMT) (envelope-from tarc@tarc.po.cs.msu.su) Received: from tarc.po.cs.msu.su (localhost [127.0.0.1]) by tarc.po.cs.msu.su (8.13.4/8.13.4) with ESMTP id j9MCR4lx083349 for ; Sat, 22 Oct 2005 16:27:04 +0400 (MSD) (envelope-from tarc@tarc.po.cs.msu.su) Received: (from tarc@localhost) by tarc.po.cs.msu.su (8.13.4/8.13.3/Submit) id j9MCR4vd083348; Sat, 22 Oct 2005 16:27:04 +0400 (MSD) (envelope-from tarc) Message-Id: <200510221227.j9MCR4vd083348@tarc.po.cs.msu.su> Date: Sat, 22 Oct 2005 16:27:04 +0400 (MSD) From: Arseny Nasokin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/87840: bsd.port.subdir.mk improving(make search) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Arseny Nasokin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2005 12:30:17 -0000 >Number: 87840 >Category: ports >Synopsis: bsd.port.subdir.mk improving(make search) >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: Sat Oct 22 12:30:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Arseny Nasokin >Release: >Organization: CMC MSU >Environment: $ head -n 2 ${PORTSDIR}/Mk/bsd.port.subdir.mk # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # $FreeBSD: ports/Mk/bsd.port.subdir.mk,v 1.59 2005/02/07 11:17:50 krion Exp $ >Description: All variables except `display' has opposite. There patch for add `xdisplay'. >How-To-Repeat: Update Mk/bsd.port.subdir.mk up to version 1.59 and see it. >Fix: --- bsd.port.subdir.mk.orig Fri Oct 21 14:03:32 2005 +++ bsd.port.subdir.mk Fri Oct 21 14:02:32 2005 @@ -364,6 +364,7 @@ -v keylim="$${keylim:-${PORTSEARCH_KEYLIM}}" \ -v xkeylim="$${xkeylim:-${PORTSEARCH_XKEYLIM}}" \ -v display="$${display:-${PORTSEARCH_DISPLAY_FIELDS}}" \ + -v xdisplay="$$xdisplay" \ 'BEGIN { \ if (substr(there, 1, length(top)) == top) \ there = "${PORTSDIR}" substr(there, 1 + length(top)); \ @@ -401,9 +402,15 @@ fields["bdeps"] = 8; names[8] = "B-deps"; \ fields["rdeps"] = 9; names[9] = "R-deps"; \ fields["www"] = 10; names[10] = "WWW"; \ split(display, d, /,[ \t]*/); \ for (i in d) { \ disp[fields[d[i]]] = 1; \ + } \ + split(xdisplay, xd, /,[ \t]*/); \ + for (i in xd) { \ + delete disp[fields[xd[i]]]; \ } \ } \ { \ >Release-Note: >Audit-Trail: >Unformatted: