===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.9
retrieving revision 1.74
diff -u -r1.9 -r1.74
--- ports/Makefile	1998/04/29 05:04:13	1.9
+++ ports/Makefile	2013/01/06 16:14:10	1.74
@@ -1,62 +1,119 @@
-# $OpenBSD: Makefile,v 1.9 1998/04/29 05:04:13 angelos Exp $
-# $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
-#
+# $OpenBSD: Makefile,v 1.74 2013/01/06 16:14:10 espie Exp $
 
+.if !defined(BSD_OWN_MK)
+.  include <bsd.own.mk>
+.endif
+
+PKGPATH =
+MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile
+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/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}
+.else
 SUBDIR += archivers
 SUBDIR += astro
 SUBDIR += audio
 SUBDIR += benchmarks
-#SUBDIR += cad
+SUBDIR += biology
+SUBDIR += books
+SUBDIR += cad
 SUBDIR += chinese
 SUBDIR += comms
 SUBDIR += converters
 SUBDIR += databases
 SUBDIR += devel
 SUBDIR += editors
+SUBDIR += education
 SUBDIR += emulators
+SUBDIR += fonts
 SUBDIR += games
-#SUBDIR += german
+SUBDIR += geo
 SUBDIR += graphics
-#SUBDIR += japanese
-#SUBDIR += korean
+SUBDIR += inputmethods
+SUBDIR += japanese
+SUBDIR += java
+SUBDIR += korean
 SUBDIR += lang
 SUBDIR += mail
-#SUBDIR += math
-#SUBDIR += mbone
+SUBDIR += math
+SUBDIR += meta
 SUBDIR += misc
+SUBDIR += multimedia
 SUBDIR += net
 SUBDIR += news
 SUBDIR += plan9
 SUBDIR += print
-#SUBDIR += russian
+SUBDIR += productivity
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
+SUBDIR += telephony
 SUBDIR += textproc
-#SUBDIR += vietnamese
 SUBDIR += www
 SUBDIR += x11
+.endif
 
-PORTSTOP?=	yes
-
 .include <bsd.port.subdir.mk>
 
 index:
 	@rm -f ${.CURDIR}/INDEX
-	@make ${.CURDIR}/INDEX
+	@${_MAKE} USE_CCACHE=No ${.CURDIR}/INDEX
 
 ${.CURDIR}/INDEX:
-	@echo -n "Generating INDEX - please wait.."
-	@make describe ECHO_MSG="echo > /dev/null" > ${.CURDIR}/INDEX
-	@echo " Done."
+	@echo "Generating INDEX..."
+	@${_MAKE} describe MACHINE_ARCH=i386 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 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\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9); }'
+.  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
+
+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 -a -d ${.CURDIR}/packages/${MACHINE_ARCH}/all/ \
+	    >${.CURDIR}/packages/${MACHINE_ARCH}/ftp/pkglocatedb
+
+.PHONY: index search distfiles-update-locatedb \
+	pkglocatedb print-licenses print-index