===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.36
retrieving revision 1.58
diff -u -r1.36 -r1.58
--- ports/Makefile	2001/11/22 16:06:27	1.36
+++ ports/Makefile	2008/05/18 11:22:14	1.58
@@ -1,20 +1,30 @@
-# $OpenBSD: Makefile,v 1.36 2001/11/22 16:06:27 naddy Exp $
+# $OpenBSD: Makefile,v 1.58 2008/05/18 11:22:14 espie Exp $
 # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
 #
 
-PKGPATH=
-.if defined(key) || defined(category) || defined(author)
+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'
+_CMD = perl ${.CURDIR}/infrastructure/build/index-retrieve index='${.CURDIR}/INDEX'
 .  if defined(key)
-_CMD+=key='${key}'
+_CMD += key='${key}'
 .  endif
+.  if defined(name)
+_CMD += maintainer='${name}'
+.  endif
 .  if defined(category)
-_CMD+=category='${category}'
+_CMD += category='${category}'
 .  endif
 .  if defined(maintainer)
-_CMD+=maintainer='${maintainer}'
+_CMD += maintainer='${maintainer}'
 .  endif
 SUBDIR != ${_CMD}
 .elif defined(SUBDIRLIST)
@@ -24,6 +34,8 @@
 SUBDIR += astro
 SUBDIR += audio
 SUBDIR += benchmarks
+SUBDIR += biology
+SUBDIR += books
 SUBDIR += cad
 SUBDIR += chinese
 SUBDIR += comms
@@ -34,16 +46,17 @@
 SUBDIR += education
 SUBDIR += emulators
 SUBDIR += games
-#SUBDIR += german
+SUBDIR += geo
 SUBDIR += graphics
+SUBDIR += inputmethods
 SUBDIR += japanese
 SUBDIR += java
 SUBDIR += korean
 SUBDIR += lang
 SUBDIR += mail
 SUBDIR += math
-SUBDIR += mbone
 SUBDIR += misc
+SUBDIR += multimedia
 SUBDIR += net
 SUBDIR += news
 SUBDIR += palm
@@ -54,17 +67,12 @@
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
+SUBDIR += telephony
 SUBDIR += textproc
-#SUBDIR += vietnamese
 SUBDIR += www
 SUBDIR += x11
-.  if exists(mystuff) && !make(describe)
-SUBDIR += mystuff
-.  endif
 .endif
 
-PORTSTOP?=	yes
-
 .include <bsd.port.subdir.mk>
 
 index:
@@ -73,7 +81,7 @@
 
 ${.CURDIR}/INDEX:
 	@echo "Generating INDEX..."
-	@${MAKE} describe ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
+	@${MAKE} describe MACHINE_ARCH=i386 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
 	@echo "Done."
 
 print-index:	${.CURDIR}/INDEX
@@ -84,30 +92,55 @@
 	@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
 
+LOCKDIR ?=
 
-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 "EXEC = exec" >${MIRROR_MK}
+	@echo "SIMPLE_LOCK = : ">>${MIRROR_MK}
+.if !empty(LOCKDIR)
+	@echo 'LOCKDIR = ${LOCKDIR}' >>${MIRROR_MK}
+	@echo 'PORTSDIR = ${PORTSDIR}' >>${MIRROR_MK}
+	@echo 'LOCK_CMD = perl $${PORTSDIR}/infrastructure/build/dolock' >>${MIRROR_MK}
+	@echo 'UNLOCK_CMD = rm -f' >>${MIRROR_MK}
+	@echo 'SIMPLE_LOCK = $${LOCK_CMD} $${LOCKDIR}/$$$$lock.lock; trap "$${UNLOCK_CMD} $$$$lock.lock" 0 1 2 3 13 15' >>${MIRROR_MK}
+.else
+	@echo 'SIMPLE_LOCK = :' >>${MIRROR_MK}
+.endif
+
+	@echo '' >>${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}
+		_FETCH_MAKEFILE=${MIRROR_MK}
 
-DISTFILES_DB?=${.CURDIR}/infrastructure/db/locate.database
+homepages.html:
+	@echo '<html><ul>' >$@
+	@${MAKE} homepage-links ECHO_MSG='echo >&2' >>$@
+	@echo '</ul></html>' >>$@
 
 distfiles-update-locatedb:
 	@PORTSDIR=${.CURDIR} /bin/sh ${.CURDIR}/infrastructure/fetch/distfiles-update-locatedb ${DISTFILES_DB}
 
+pkglocatedb:
+	@pkg_mklocatedb -d ${.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