===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.44
retrieving revision 1.51
diff -u -r1.44 -r1.51
--- ports/Makefile	2004/05/07 09:04:21	1.44
+++ ports/Makefile	2006/10/18 13:52:33	1.51
@@ -1,24 +1,26 @@
-# $OpenBSD: Makefile,v 1.44 2004/05/07 09:04:21 xsa 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(name) || 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(name)
+.    endif
+.    if defined(name)
 _CMD+=maintainer='${name}'
-.  endif
-.  if defined(category)
+.    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}
@@ -39,7 +41,6 @@
 SUBDIR += education
 SUBDIR += emulators
 SUBDIR += games
-#SUBDIR += german
 SUBDIR += graphics
 SUBDIR += japanese
 SUBDIR += java
@@ -47,8 +48,8 @@
 SUBDIR += lang
 SUBDIR += mail
 SUBDIR += math
-SUBDIR += mbone
 SUBDIR += misc
+SUBDIR += multimedia
 SUBDIR += net
 SUBDIR += news
 SUBDIR += palm
@@ -59,8 +60,8 @@
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
+SUBDIR += telephony
 SUBDIR += textproc
-#SUBDIR += vietnamese
 SUBDIR += www
 SUBDIR += x11
 .endif
@@ -123,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