Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Oct 2005 16:27:04 +0400 (MSD)
From:      Arseny Nasokin <tarc.po.cs.msu.su@tarc.po.cs.msu.su>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/87840: bsd.port.subdir.mk improving(make search)
Message-ID:  <200510221227.j9MCR4vd083348@tarc.po.cs.msu.su>
Resent-Message-ID: <200510221230.j9MCUGY4027823@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510221227.j9MCR4vd083348>