===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.39
retrieving revision 1.51
diff -u -r1.39 -r1.51
--- ports/Makefile	2003/05/10 13:28:08	1.39
+++ ports/Makefile	2006/10/18 13:52:33	1.51
@@ -1,21 +1,26 @@
-# $OpenBSD: Makefile,v 1.39 2003/05/10 13:28:08 avsm Exp $
+# $OpenBSD: Makefile,v 1.51 2006/10/18 13:52:33 sturm Exp $
 # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
 #
 
 PKGPATH=
-.if defined(key) || defined(category) || defined(author)
+.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)
+.    if defined(key)
 _CMD+=key='${key}'
-.  endif
-.  if defined(category)
+.    endif
+.    if defined(name)
+_CMD+=maintainer='${name}'
+.    endif
+.    if defined(category)
 _CMD+=category='${category}'
-.  endif
-.  if defined(maintainer)
+.    endif
+.    if defined(maintainer)
 _CMD+=maintainer='${maintainer}'
-.  endif
+.    endif
 SUBDIR != ${_CMD}
 .elif defined(SUBDIRLIST)
 SUBDIR != sed -e 's,[ 	]*\#.*,,' -e '/^[ 	]*$$/d' ${SUBDIRLIST}
@@ -24,6 +29,8 @@
 SUBDIR += astro
 SUBDIR += audio
 SUBDIR += benchmarks
+SUBDIR += biology
+SUBDIR += books
 SUBDIR += cad
 SUBDIR += chinese
 SUBDIR += comms
@@ -34,7 +41,6 @@
 SUBDIR += education
 SUBDIR += emulators
 SUBDIR += games
-#SUBDIR += german
 SUBDIR += graphics
 SUBDIR += japanese
 SUBDIR += java
@@ -42,8 +48,8 @@
 SUBDIR += lang
 SUBDIR += mail
 SUBDIR += math
-SUBDIR += mbone
 SUBDIR += misc
+SUBDIR += multimedia
 SUBDIR += net
 SUBDIR += news
 SUBDIR += palm
@@ -54,13 +60,10 @@
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
+SUBDIR += telephony
 SUBDIR += textproc
-#SUBDIR += vietnamese
 SUBDIR += www
 SUBDIR += x11
-.  if exists(mystuff) && !make(describe) && !make(fetch-makefile)
-SUBDIR += mystuff
-.  endif
 .endif
 
 PORTSTOP?=	yes
@@ -84,11 +87,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
+. 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,7 +107,10 @@
 	@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}
 
@@ -114,5 +124,9 @@
 distfiles-update-locatedb:
 	@PORTSDIR=${.CURDIR} /bin/sh ${.CURDIR}/infrastructure/fetch/distfiles-update-locatedb ${DISTFILES_DB}
 
+pkglocatedb:
+	@pkg_mklocatedb ${.CURDIR}/packages/${MACHINE_ARCH}/all/* \
+	    >${.CURDIR}/packages/${MACHINE_ARCH}/ftp/pkglocatedb
+
 .PHONY: mirror-maker index search distfiles-update-locatedb \
-	print-licenses print-index
+	pkglocatedb print-licenses print-index