===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.51
retrieving revision 1.67
diff -u -r1.51 -r1.67
--- ports/Makefile	2006/10/18 13:52:33	1.51
+++ ports/Makefile	2011/11/12 16:37:35	1.67
@@ -1,26 +1,31 @@
-# $OpenBSD: Makefile,v 1.51 2006/10/18 13:52:33 sturm Exp $
+# $OpenBSD: Makefile,v 1.67 2011/11/12 16:37:35 ajacoutot 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/bin/retrieve-index 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}
@@ -40,14 +45,18 @@
 SUBDIR += editors
 SUBDIR += education
 SUBDIR += emulators
+SUBDIR += fonts
 SUBDIR += games
+SUBDIR += geo
 SUBDIR += graphics
+SUBDIR += inputmethods
 SUBDIR += japanese
 SUBDIR += java
 SUBDIR += korean
 SUBDIR += lang
 SUBDIR += mail
 SUBDIR += math
+SUBDIR += meta
 SUBDIR += misc
 SUBDIR += multimedia
 SUBDIR += net
@@ -66,17 +75,15 @@
 SUBDIR += x11
 .endif
 
-PORTSTOP?=	yes
-
 .include <bsd.port.subdir.mk>
 
 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 MACHINE_ARCH=i386 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
 	@echo "Done."
 
 print-index:	${.CURDIR}/INDEX
@@ -91,41 +98,48 @@
 	@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
-	@echo "EXEC=exec" >${MIRROR_MK}
+.if !empty(LOCKDIR)
+	@echo "EXEC = " >${MIRROR_MK}
+	@echo 'LOCKDIR = ${LOCKDIR}' >>${MIRROR_MK}
+	@echo 'PORTSDIR = ${PORTSDIR}' >>${MIRROR_MK}
+	@echo 'LOCK_CMD = perl $${PORTSDIR}/infrastructure/bin/dolock' >>${MIRROR_MK}
+	@echo 'UNLOCK_CMD = rm -f' >>${MIRROR_MK}
+	@echo 'SIMPLE_LOCK = $${LOCK_CMD} $${LOCKDIR}/$$$$lock.lock; trap "$${UNLOCK_CMD} $${LOCKDIR}/$$$$lock.lock" 0 1 2 3 13 15' >>${MIRROR_MK}
+.else
+	@echo "EXEC = exec" >${MIRROR_MK}
+	@echo 'SIMPLE_LOCK = :' >>${MIRROR_MK}
+.endif
+
+	@echo '' >>${MIRROR_MK}
 	@echo "default:: ftp cdrom" >>${MIRROR_MK}
-	@echo ".PHONY: default all ftp cdrom" >>${MIRROR_MK}
+	@echo ".PHONY: default all ftp cdrom .FORCE" >>${MIRROR_MK}
+	@echo ".FORCE:" >>${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 \
+	${_MAKE} fetch-makefile \
 		ECHO_MSG='echo >&2' \
-		>>${MIRROR_MK}
+		_FETCH_MAKEFILE=${MIRROR_MK}
 
 homepages.html:
 	@echo '<html><ul>' >$@
-	@${MAKE} homepage-links ECHO_MSG='echo >&2' >>$@
+	@${_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/* \
+	@pkg_mklocatedb -a -d ${.CURDIR}/packages/${MACHINE_ARCH}/all/ \
 	    >${.CURDIR}/packages/${MACHINE_ARCH}/ftp/pkglocatedb
 
 .PHONY: mirror-maker index search distfiles-update-locatedb \