=================================================================== RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v retrieving revision 1.36 retrieving revision 1.43 diff -u -r1.36 -r1.43 --- ports/Makefile 2001/11/22 16:06:27 1.36 +++ ports/Makefile 2003/12/15 17:56:40 1.43 @@ -1,15 +1,18 @@ -# $OpenBSD: Makefile,v 1.36 2001/11/22 16:06:27 naddy Exp $ +# $OpenBSD: Makefile,v 1.43 2003/12/15 17:56:40 espie Exp $ # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $ # PKGPATH= -.if defined(key) || defined(category) || defined(author) +.if 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 @@ -24,6 +27,7 @@ SUBDIR += astro SUBDIR += audio SUBDIR += benchmarks +SUBDIR += books SUBDIR += cad SUBDIR += chinese SUBDIR += comms @@ -58,9 +62,6 @@ #SUBDIR += vietnamese SUBDIR += www SUBDIR += x11 -. if exists(mystuff) && !make(describe) -SUBDIR += mystuff -. endif .endif PORTSTOP?= yes @@ -84,11 +85,15 @@ @awk -F\| '{printf("%-40.39s%-3.2s%-3.2s%-3.2s%-3.2s%-25.25s\n",$$2,$$12,$$13,$$14,$$15,$$6);}' < ${.CURDIR}/INDEX search: ${.CURDIR}/INDEX -.if !defined(key) - @echo "The search target requires a keyword parameter," - @echo "e.g.: \"make search key=somekeyword\"" +.if !defined(key) && !defined(name) + @echo "The search target requires a keyword or name parameter," + @echo "e.g.: \"make search key=somekeyword\" \"make search name=somename\"" .else - @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); }' +. 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 + @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 @@ -100,9 +105,17 @@ @echo "EXEC=exec" >${MIRROR_MK} @echo "default:: ftp cdrom" >>${MIRROR_MK} @echo ".PHONY: default all ftp cdrom" >>${MIRROR_MK} - @${MAKE} fetch-makefile \ + @_DONE_FILES=`mktemp /tmp/depends.XXXXXXXXX|| exit 1`; \ + export _DONE_FILES; \ + trap "rm -f $${_DONE_FILES}" 0 1 2 3 13 15; \ + ${MAKE} fetch-makefile \ ECHO_MSG='echo >&2' \ >>${MIRROR_MK} + +homepages.html: + @echo '' >>$@ DISTFILES_DB?=${.CURDIR}/infrastructure/db/locate.database