===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.1
retrieving revision 1.35
diff -u -r1.1 -r1.35
--- ports/Makefile	1997/11/27 23:44:36	1.1
+++ ports/Makefile	2001/11/12 14:19:17	1.35
@@ -1,62 +1,113 @@
-# $OpenBSD: Makefile,v 1.1 1997/11/27 23:44:36 niklas Exp $
+# $OpenBSD: Makefile,v 1.35 2001/11/12 14:19:17 espie Exp $
 # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
 #
 
+PKGPATH=
+.if defined(key) || 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(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 += astro
+SUBDIR += audio
 SUBDIR += benchmarks
-#SUBDIR += cad
+SUBDIR += cad
 SUBDIR += chinese
 SUBDIR += comms
-#SUBDIR += converters
+SUBDIR += converters
 SUBDIR += databases
 SUBDIR += devel
 SUBDIR += editors
+SUBDIR += education
 SUBDIR += emulators
 SUBDIR += games
 #SUBDIR += german
 SUBDIR += graphics
-#SUBDIR += japanese
-#SUBDIR += korean
-#SUBDIR += lang
+SUBDIR += japanese
+SUBDIR += java
+SUBDIR += korean
+SUBDIR += lang
 SUBDIR += mail
-#SUBDIR += math
-#SUBDIR += mbone
+SUBDIR += math
+SUBDIR += mbone
 SUBDIR += misc
 SUBDIR += net
 SUBDIR += news
-#SUBDIR += plan9
-#SUBDIR += print
-#SUBDIR += russian
+SUBDIR += palm
+SUBDIR += plan9
+SUBDIR += print
+SUBDIR += productivity
+SUBDIR += russian
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
 SUBDIR += textproc
 #SUBDIR += vietnamese
 SUBDIR += www
-#SUBDIR += x11
+SUBDIR += x11
+.  if exists(mystuff) && !make(describe)
+SUBDIR += mystuff
+.  endif
+.endif
 
-PORTSTOP=	yes
+PORTSTOP?=	yes
 
 .include <bsd.port.subdir.mk>
 
 index:
 	@rm -f ${.CURDIR}/INDEX
-	@make ${.CURDIR}/INDEX
+	@${MAKE} ${.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 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
 
+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,$$11,$$12,$$13,$$14,$$6);}' < ${.CURDIR}/INDEX
+
 search:	${.CURDIR}/INDEX
 .if !defined(key)
 	@echo "The search target requires a keyword parameter,"
 	@echo "e.g.: \"make search key=somekeyword\""
 .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); }'
+	@egrep -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); }'
 .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}
+	@${MAKE} fetch-makefile \
+		ECHO_MSG='echo >&2' \
+		>>${MIRROR_MK}
+
+DISTFILES_DB?=${.CURDIR}/infrastructure/db/locate.database
+
+distfiles-update-locatedb:
+	@PORTSDIR=${.CURDIR} /bin/sh ${.CURDIR}/infrastructure/fetch/distfiles-update-locatedb ${DISTFILES_DB}
+
+.PHONY: mirror-maker index search distfiles-update-locatedb \
+	print-licenses print-index