===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.25
retrieving revision 1.36
diff -u -r1.25 -r1.36
--- ports/Makefile	2000/06/09 19:34:31	1.25
+++ ports/Makefile	2001/11/22 16:06:27	1.36
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.25 2000/06/09 19:34:31 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2001/11/22 16:06:27 naddy 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
@@ -17,6 +17,8 @@
 _CMD+=maintainer='${maintainer}'
 .  endif
 SUBDIR != ${_CMD}
+.elif defined(SUBDIRLIST)
+SUBDIR != sed -e 's,[ 	]*\#.*,,' -e '/^[ 	]*$$/d' ${SUBDIRLIST}
 .else
 SUBDIR += archivers
 SUBDIR += astro
@@ -29,12 +31,14 @@
 SUBDIR += databases
 SUBDIR += devel
 SUBDIR += editors
+SUBDIR += education
 SUBDIR += emulators
 SUBDIR += games
 #SUBDIR += german
 SUBDIR += graphics
 SUBDIR += japanese
-#SUBDIR += korean
+SUBDIR += java
+SUBDIR += korean
 SUBDIR += lang
 SUBDIR += mail
 SUBDIR += math
@@ -42,8 +46,10 @@
 SUBDIR += misc
 SUBDIR += net
 SUBDIR += news
+SUBDIR += palm
 SUBDIR += plan9
 SUBDIR += print
+SUBDIR += productivity
 SUBDIR += russian
 SUBDIR += security
 SUBDIR += shells
@@ -52,6 +58,9 @@
 #SUBDIR += vietnamese
 SUBDIR += www
 SUBDIR += x11
+.  if exists(mystuff) && !make(describe)
+SUBDIR += mystuff
+.  endif
 .endif
 
 PORTSTOP?=	yes
@@ -60,26 +69,26 @@
 
 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 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,$$11,$$12,$$13,$$14,$$6);}' < ${.CURDIR}/INDEX
+	@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\""
 .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\nArchs:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }'
+	@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); }'
 .endif
 
 
@@ -91,9 +100,9 @@
 	@echo "EXEC=exec" >${MIRROR_MK}
 	@echo "default:: ftp cdrom" >>${MIRROR_MK}
 	@echo ".PHONY: default all ftp cdrom" >>${MIRROR_MK}
-	@make fetch-makefile \
+	@${MAKE} fetch-makefile \
 		ECHO_MSG='echo >&2' \
-		FULL_PACKAGE_NAME=Yes >>${MIRROR_MK}
+		>>${MIRROR_MK}
 
 DISTFILES_DB?=${.CURDIR}/infrastructure/db/locate.database