=================================================================== RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- ports/Makefile 2006/10/30 17:49:04 1.53 +++ ports/Makefile 2006/11/27 15:38:01 1.54 @@ -1,26 +1,31 @@ -# $OpenBSD: Makefile,v 1.53 2006/10/30 17:49:04 ckuethe Exp $ +# $OpenBSD: Makefile,v 1.54 2006/11/27 15:38:01 espie Exp $ # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $ # -PKGPATH= +PKGPATH = +MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile +PORTSTOP ?= yes +DISTFILES_DB ?= ${.CURDIR}/infrastructure/db/locate.database + + .if defined(SUBDIR) # nothing to do .elif defined(key) || defined(name) || defined(category) || defined(author) # set up subdirs from the index, assume it's up-to-date -_CMD=perl ${.CURDIR}/infrastructure/build/index-retrieve index='${.CURDIR}/INDEX' -. if defined(key) -_CMD+=key='${key}' -. endif -. if defined(name) -_CMD+=maintainer='${name}' -. endif -. if defined(category) -_CMD+=category='${category}' -. endif -. if defined(maintainer) -_CMD+=maintainer='${maintainer}' -. endif +_CMD = perl ${.CURDIR}/infrastructure/build/index-retrieve index='${.CURDIR}/INDEX' +. if defined(key) +_CMD += key='${key}' +. endif +. if defined(name) +_CMD += maintainer='${name}' +. endif +. if defined(category) +_CMD += category='${category}' +. endif +. if defined(maintainer) +_CMD += maintainer='${maintainer}' +. endif SUBDIR != ${_CMD} .elif defined(SUBDIRLIST) SUBDIR != sed -e 's,[ ]*\#.*,,' -e '/^[ ]*$$/d' ${SUBDIRLIST} @@ -68,8 +73,6 @@ SUBDIR += x11 .endif -PORTSTOP?= yes - .include index: @@ -93,16 +96,14 @@ @echo "The search target requires a keyword or name parameter," @echo "e.g.: \"make search key=somekeyword\" \"make search name=somename\"" .else -. if defined(key) +. if defined(key) @egrep -i -- "${key}" ${.CURDIR}/INDEX | awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nL-deps:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArchs:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10, $$11); }' -. else +. else @awk -F\| '$$1 ~ /${name}/ { printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nL-deps:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArchs:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10, $$11); }' ${.CURDIR}/INDEX -. endif +. endif .endif -MIRROR_MK?= ${.CURDIR}/distfiles/Makefile - mirror-maker: @mkdir -p ${MIRROR_MK:H} # Indirection needed for broken OSes that don't grok this exec @@ -120,8 +121,6 @@ @echo '' >>$@ - -DISTFILES_DB?=${.CURDIR}/infrastructure/db/locate.database distfiles-update-locatedb: @PORTSDIR=${.CURDIR} /bin/sh ${.CURDIR}/infrastructure/fetch/distfiles-update-locatedb ${DISTFILES_DB}