diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-11-19 13:45:07 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-11-19 13:45:07 +0000 |
commit | ae1ec8f3dc1e8236595aeed5f87444fdebbc245a (patch) | |
tree | bb7626e4fe5f767b810f8f05d7e9eb4a0ec261a5 /Mk/bsd.port.subdir.mk | |
parent | Fix `read -e' handling when PS1 is longer than the terminal width (diff) |
* Fix INDEX build if MAINTAINER is not defined. [1]
* Remove USE_QT2 since it's obsolete now. [2]
* Clarify comments about ARCH. [3]
* Speedup 'make readmes'. Add a perl script "Tools/make_readmes"
and modify bsd.port.subdir.mk to avoid recursing into individual
port directories to create README.html. [4]
* Fix 'make search' to allow case insensitive search on 5-x/6-x. [5]
* Add the possibility to search the ports by category. [6]
* Remove tk42 and tcl76 from virtual categories since they're
obsolete. [7]
* Introduce new variable - DISTVERSION, vendor version of the
distribution, that can be set instead of PORTVERSION and is
automatically converted in a conforming PORTVERSION. [8]
* Use --suffix instead of -b option for patch(1) to make it
compatible with BSD patch(1) [9]
* Fix {WANT,WITH}_MYSQL_VER behavior, to deal with conflicting
versions. [10]
PR: ports/68895 [1], ports/69486 [2], ports/68539 [3],
ports/70018 [4], ports/68896 [5], ports/73299 [6],
ports/73570 [7], ports/67171 [8], ports/72182 [9]
Submitted by: linimon [1][3], arved [2][7], cperciva [4],
Matthew Seaman <m.seaman@infracaninophile.co.uk> [5],
Radek Kozlowski <radek@raadradd.com> [6],
eik [8], Andreas Hauser <andy-freebsd@splashground.de> [9],
clement [10]
Notes
Notes:
svn path=/head/; revision=121961
Diffstat (limited to 'Mk/bsd.port.subdir.mk')
-rw-r--r-- | Mk/bsd.port.subdir.mk | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index a8f926466762..84d3638846a5 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -236,7 +236,13 @@ describe: .endif .if !target(readmes) +.if defined(PORTSTOP) readmes: readme ${SUBDIR:S/^/_/:S/$/.readmes/} + @${ECHO_MSG} "===> Creating README.html for all ports" + @perl ${.CURDIR}/Tools/make_readmes < ${.CURDIR}/${INDEXFILE} +.else +readmes: readme +.endif .endif .if !target(readme) @@ -332,6 +338,7 @@ search: ${PORTSDIR}/${INDEXFILE} -z "$$path" -a -z "$$xpath" -a \ -z "$$info" -a -z "$$xinfo" -a \ -z "$$maint" -a -z "$$xmaint" -a \ + -z "$$cat" -a -z "$$xcat" -a \ -z "$$bdeps" -a -z "$$xbdeps" -a \ -z "$$rdeps" -a -z "$$xrdeps" ]; \ then \ @@ -351,19 +358,27 @@ search: ${PORTSDIR}/${INDEXFILE} -v rdeps="$$rdeps" -v xrdeps="$$xrdeps" \ -v icase="$${icase:-${PORTSEARCH_IGNORECASE}}" \ -v keylim="$${keylim:-${PORTSEARCH_KEYLIM}}" \ - -v xkeylim="$${xkeylim:-${PORTSEARCH_XKEYLIM}}"\ + -v xkeylim="$${xkeylim:-${PORTSEARCH_XKEYLIM}}" \ -v display="$${display:-${PORTSEARCH_DISPLAY_FIELDS}}" \ 'BEGIN { \ if (substr(there, 1, length(top)) == top) \ there = "${PORTSDIR}" substr(there, 1 + length(top)); \ therelen = length(there); \ - IGNORECASE=icase; \ keylen = length(key); keylim = keylim && keylen; \ if (!keylim && keylen) \ - parms[0] = key; \ + parms[0] = (icase ? tolower(key) : key); \ xkeylen = length(xkey); xkeylim = xkeylim && xkeylen; \ if (!xkeylim && xkeylen) \ - xparms[0] = xkey; \ + xparms[0] = (icase ? tolower(xkey) : xkey); \ + if (icase) { \ + if (length(name)) parms[1] = tolower(name); if (length(xname)) xparms[1] = tolower(xname); \ + if (length(path)) parms[2] = tolower(path); if (length(xpath)) xparms[2] = tolower(xpath); \ + if (length(info)) parms[4] = tolower(info); if (length(xinfo)) xparms[4] = tolower(xinfo); \ + if (length(maint)) parms[6] = tolower(maint); if (length(xmaint)) xparms[6] = tolower(xmaint); \ + if (length(cat)) parms[7] = tolower(cat); if (length(xcat)) xparms[7] = tolower(xcat); \ + if (length(bdeps)) parms[8] = tolower(bdeps); if (length(xbdeps)) xparms[8] = tolower(xbdeps); \ + if (length(rdeps)) parms[9] = tolower(rdeps); if (length(xrdeps)) xparms[9] = tolower(xrdeps); \ + } else { \ if (length(name)) parms[1] = name; if (length(xname)) xparms[1] = xname; \ if (length(path)) parms[2] = path; if (length(xpath)) xparms[2] = xpath; \ if (length(info)) parms[4] = info; if (length(xinfo)) xparms[4] = xinfo; \ @@ -371,6 +386,7 @@ search: ${PORTSDIR}/${INDEXFILE} if (length(cat)) parms[7] = cat; if (length(xcat)) xparms[7] = xcat; \ if (length(bdeps)) parms[8] = bdeps; if (length(xbdeps)) xparms[8] = xbdeps; \ if (length(rdeps)) parms[9] = rdeps; if (length(xrdeps)) xparms[9] = xrdeps; \ + } \ fields["name"] = 1; names[1] = "Port"; \ fields["path"] = 2; names[2] = "Path"; \ fields["info"] = 4; names[4] = "Info"; \ @@ -387,17 +403,17 @@ search: ${PORTSDIR}/${INDEXFILE} if (substr($$2, 1, therelen) != there) \ next; \ for (i in parms) \ - if ($$i !~ parms[i]) \ + if ((icase ? tolower($$i) : $$i) !~ parms[i]) \ next; \ for (i in xparms) \ - if ($$i ~ xparms[i]) \ + if ((icase ? tolower($$i) : $$i) ~ xparms[i]) \ next; \ found = 0; \ for (i = 1; i < 10; i++) \ if (i in disp) { \ - if (xkeylim && $$i ~ xkey) \ + if (xkeylim && (icase ? tolower($$i) : $$i) ~ xkey) \ next; \ - if (!found && keylim && $$i ~ key) \ + if (!found && keylim && (icase ? tolower($$i) : $$i) ~ key) \ found = 1; \ } \ if (keylim && !found) \ |