diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2004-07-14 08:18:16 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2004-07-14 08:18:16 +0000 |
| commit | 3a7c8c1833c80610310b11754d8c95670604cdc5 (patch) | |
| tree | 164faae3cef070a9beee3bfc71457c82b042a549 /Mk/bsd.port.subdir.mk | |
| parent | Fix maintainer email address (diff) | |
* Be even more explicit about partial ports trees being unsupported
for INDEX builds [1]
* Remove the parallel target from Makefile; this is heavily tied to
the package build cluster and can be better done in the makeparallel
script (commit to follow) [2]
* Extend the format of INDEX to separately list the
EXTRACT/PATCH/FETCH_DEPENDS instead of lumping them all in together
with BUILD_DEPENDS. The three new fields are appended to the end of
the record in that order. [2]
* Change BROKEN to IGNORE in BROKEN_WITH_MYSQL failure code [3]
* Support non-default PREFIX for perl 5.00503 [5]
* Use pkg_info -I instead of ls when searching for conflicts [6]
* Allow local customization of the port subdirectories by including
${.CURDIR}/Makefile.local in bsd.subdir.mk if it exists [7]
* Fix 'make search' when ${PORTSDIR} is a symlink to a directory name
containing extended regexp metacharacters [8]
Submitted by: linimon [1] [3], kris [2], lth [4], sem [5], eik [5] [6],
Roman Neuhauser <neuhauser@chello.cz> [7]
PR: 68299 [1], 67705 [3], 67264 [4], 59696 [5], 66568 [6],
68072 [7]
Notes
Notes:
svn path=/head/; revision=113603
Diffstat (limited to 'Mk/bsd.port.subdir.mk')
| -rw-r--r-- | Mk/bsd.port.subdir.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index 8c7969948d9e..a8f926466762 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -82,6 +82,11 @@ OPSYS!= /usr/bin/uname -s ECHO_MSG?= echo +# local customization of the ports tree +.if exists(${.CURDIR}/Makefile.local) +.include "${.CURDIR}/Makefile.local" +.endif + TARGETS+= all TARGETS+= build TARGETS+= checksum @@ -349,7 +354,9 @@ search: ${PORTSDIR}/${INDEXFILE} -v xkeylim="$${xkeylim:-${PORTSEARCH_XKEYLIM}}"\ -v display="$${display:-${PORTSEARCH_DISPLAY_FIELDS}}" \ 'BEGIN { \ - sub(top, "${PORTSDIR}", there); \ + 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) \ @@ -377,7 +384,7 @@ search: ${PORTSDIR}/${INDEXFILE} } \ } \ { \ - if ($$2 !~ there) \ + if (substr($$2, 1, therelen) != there) \ next; \ for (i in parms) \ if ($$i !~ parms[i]) \ |