===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.18
retrieving revision 1.51
diff -u -r1.18 -r1.51
--- ports/Makefile	2000/02/22 03:45:11	1.18
+++ ports/Makefile	2006/10/18 13:52:33	1.51
@@ -1,11 +1,36 @@
-# $OpenBSD: Makefile,v 1.18 2000/02/22 03:45:11 turan 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(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
+SUBDIR != ${_CMD}
+.elif defined(SUBDIRLIST)
+SUBDIR != sed -e 's,[ 	]*\#.*,,' -e '/^[ 	]*$$/d' ${SUBDIRLIST}
+.else
 SUBDIR += archivers
 SUBDIR += astro
 SUBDIR += audio
 SUBDIR += benchmarks
+SUBDIR += biology
+SUBDIR += books
 SUBDIR += cad
 SUBDIR += chinese
 SUBDIR += comms
@@ -13,29 +38,33 @@
 SUBDIR += databases
 SUBDIR += devel
 SUBDIR += editors
+SUBDIR += education
 SUBDIR += emulators
 SUBDIR += games
-#SUBDIR += german
 SUBDIR += graphics
 SUBDIR += japanese
-#SUBDIR += korean
+SUBDIR += java
+SUBDIR += korean
 SUBDIR += lang
 SUBDIR += mail
 SUBDIR += math
-SUBDIR += mbone
 SUBDIR += misc
+SUBDIR += multimedia
 SUBDIR += net
 SUBDIR += news
+SUBDIR += palm
 SUBDIR += plan9
 SUBDIR += print
+SUBDIR += productivity
 SUBDIR += russian
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
+SUBDIR += telephony
 SUBDIR += textproc
-#SUBDIR += vietnamese
 SUBDIR += www
 SUBDIR += x11
+.endif
 
 PORTSTOP?=	yes
 
@@ -43,24 +72,61 @@
 
 index:
 	@rm -f ${.CURDIR}/INDEX
-	@make ${.CURDIR}/INDEX
+	@${MAKE} ${.CURDIR}/INDEX
 
 ${.CURDIR}/INDEX:
 	@echo "Generating INDEX..."
-	@make describe ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
+	@${MAKE} describe ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
 	@echo "Done."
 
 print-index:	${.CURDIR}/INDEX
-	@awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9); }' < ${.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\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }' < ${.CURDIR}/INDEX
 
 print-licenses: ${.CURDIR}/INDEX
-	@printf "Port                               PC PF DC DF L-Type    Maint\n"
-	@awk -F\| '{printf("%-35.35s%-3.2s%-3.2s%-3.2s%-3.2s%-10.9s%-20.20s\n",$$2,$$11,$$12,$$13,$$14,$$15,$$6);}' < ${.CURDIR}/INDEX
+	@printf "Port                                    PC PF DC DF Maint\n"
+	@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
-	@grep -i ${key} ${.CURDIR}/INDEX | awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArchs:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }'
+. 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
+
+
+MIRROR_MK?= ${.CURDIR}/distfiles/Makefile
+
+mirror-maker:
+	@mkdir -p ${MIRROR_MK:H}
+# Indirection needed for broken OSes that don't grok this exec
+	@echo "EXEC=exec" >${MIRROR_MK}
+	@echo "default:: ftp cdrom" >>${MIRROR_MK}
+	@echo ".PHONY: default all ftp cdrom" >>${MIRROR_MK}
+	@_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 '<html><ul>' >$@
+	@${MAKE} homepage-links ECHO_MSG='echo >&2' >>$@
+	@echo '</ul></html>' >>$@
+
+DISTFILES_DB?=${.CURDIR}/infrastructure/db/locate.database
+
+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 \
+	pkglocatedb print-licenses print-index