===================================================================
RCS file: /cvsrepo/anoncvs/cvs/ports/Makefile,v
retrieving revision 1.9
retrieving revision 1.16
diff -u -r1.9 -r1.16
--- ports/Makefile	1998/04/29 05:04:13	1.9
+++ ports/Makefile	1999/07/27 21:56:35	1.16
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 1998/04/29 05:04:13 angelos Exp $
+# $OpenBSD: Makefile,v 1.16 1999/07/27 21:56:35 espie Exp $
 # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
 #
 
@@ -6,7 +6,7 @@
 SUBDIR += astro
 SUBDIR += audio
 SUBDIR += benchmarks
-#SUBDIR += cad
+SUBDIR += cad
 SUBDIR += chinese
 SUBDIR += comms
 SUBDIR += converters
@@ -17,18 +17,18 @@
 SUBDIR += games
 #SUBDIR += german
 SUBDIR += graphics
-#SUBDIR += japanese
+SUBDIR += japanese
 #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 += russian
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
@@ -46,9 +46,9 @@
 	@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
@@ -58,5 +58,5 @@
 	@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); }'
+	@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); }'
 .endif