diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2007-05-25 00:09:37 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2007-05-25 00:09:37 +0000 |
| commit | 942838f1d5788567cd972456ef75252d52a654f1 (patch) | |
| tree | e66f7014adbdbc9afbc6a95d44647943e61b0f12 /Mk/bsd.port.subdir.mk | |
| parent | Update to the long-awaited 2.0.0. This has come a long way since Gaim (diff) | |
* Make 'make-deinstall-all' check for moved ports. [1]
* Defined the installation directories PORTEXAMPLES and PORTDATA. [2]
* Add USE_MAKESELF knob is added for ports that use the makeself archiver. [3]
* Update the description of fetch-list; add targets fetch-required-list,
fetch-url-list, and fetch-urlall-list. [4]
* Make 'make search' also search in ports/MOVED. [5]
* Move several Makevar definitions to the pre-makefile section:
DATADIR, DOCSDIR, ETCDIR, EXAMPLESDIR, WWWDIR. [6]
* The target 'ignorelist-verbose' was added for portsmon. [7]
PR: 69965 [1], 78490 [2], 79398 [3], 86776 [4], 104161 [5], 110781 [6]
Submitted by: Dancho Penev <dpenev at mnet dot bg> [1], mnag [2],
jylefort [3], edwin [4], Lars Engels <lars dot engels
at 0x20 dot net> [5], Alexander Logvinov <ports at
logvinov dot com> [6], linimon [7]
Notes
Notes:
svn path=/head/; revision=191668
Diffstat (limited to 'Mk/bsd.port.subdir.mk')
| -rw-r--r-- | Mk/bsd.port.subdir.mk | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index 97f28a956917..951362d3b158 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -34,7 +34,8 @@ # clean-for-cdrom, clean-restricted, # clean-for-cdrom-list, clean-restricted-list, # configure, deinstall, -# depend, depends, describe, extract, fetch, fetch-list, ignorelist, +# depend, depends, describe, extract, fetch, fetch-list, +# ignorelist, ignorelist-verbose, # install, maintainer, makesum, package, readmes, realinstall, reinstall, # tags # @@ -104,6 +105,7 @@ TARGETS+= extract TARGETS+= fetch TARGETS+= fetch-list TARGETS+= ignorelist +TARGETS+= ignorelist-verbose TARGETS+= makesum TARGETS+= maintainer TARGETS+= package @@ -271,6 +273,8 @@ INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} .else INDEXFILE?= INDEX .endif +MOVEDDIR?= ${PORTSDIR} +MOVEDFILE?= MOVED HTMLIFY= sed -e 's/&/\&/g' -e 's/>/\>/g' -e 's/</\</g' @@ -330,6 +334,7 @@ PORTSEARCH_DISPLAY_FIELDS?=name,path,info,maint,index,bdeps,rdeps,www PORTSEARCH_KEYLIM?=0 PORTSEARCH_XKEYLIM?=0 PORTSEARCH_IGNORECASE?=1 +PORTSEARCH_MOVED?=1 _PORTSEARCH= \ here=${.CURDIR}; \ @@ -408,11 +413,11 @@ _PORTSEARCH= \ split(display, d, /,[ \t]*/); \ split(xdisplay, xd, /,[ \t]*/); \ for (i in d) { \ - toprint = 1;\ + toprint = 1; \ for (j in xd) { \ if (d[i] == xd[j] ) { \ toprint=0; \ - break;\ + break; \ }\ } \ if (toprint == 1 ) disp[fields[d[i]]] = 1; \ @@ -444,7 +449,31 @@ _PORTSEARCH= \ printf("%s:\t%s\n", names[i], $$i); \ print(""); \ }' ${INDEXDIR}/${INDEXFILE}; \ - fi + if [ "$$name" -o "$$xname" ] && [ ${PORTSEARCH_MOVED} -gt 0 ]; \ + then \ + awk -F\| -v name="$$name" -v xname="$$xname" \ + -v icase="$${icase:-${PORTSEARCH_IGNORECASE}}" \ + 'BEGIN { \ + if (icase) { \ + if (length(name)) name = tolower(name); if (length(xname)) xname = tolower(xname); \ + } \ + fields["name"] = 1; names[1] = "Port"; \ + fields["destination"] = 2; names[2] = "Moved"; \ + fields["date"] = 3; names[3] = "Date"; \ + fileds["reason"] = 4; names[4] = "Reason"; \ + } \ + { \ + oldname = $$1; newname = $$2; \ + sub(".*\/", "", oldname); newname = sub(".*\/", "", newname); \ + if (((icase ? tolower(oldname) : oldname) ~ name) || ((icase ? tolower(newname) : newname) ~ name)) { \ + for (i = 1; i <= 4; i++) { \ + printf("%s:\t%s\n", names[i], $$i); \ + } \ + print(""); \ + } \ + }' ${MOVEDDIR}/${MOVEDFILE}; \ + fi \ + fi search: @${_PORTSEARCH} |