Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT.

While I'm here, unify category Makefiles to more standard style.
(If you have tools depending on the previous form, please fix them.)

1 files changed, 112 insertions, 110 deletions

diff --git a/www/Makefile b/www/Makefile
index b26fa9e5f7f..7b8dda9cc07 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,114 +1,116 @@
-# $NetBSD: Makefile,v 1.117 2001/02/12 15:26:39 jlam Exp $
+# $NetBSD: Makefile,v 1.118 2001/02/16 15:51:54 wiz Exp $
 #
 
-    SUBDIR += Mosaic
-    SUBDIR += adzap
-    SUBDIR += amaya
-    SUBDIR += analog
-    SUBDIR += ap-DBI
-    SUBDIR += ap-Embperl
-    SUBDIR += ap-auth-cookie
-    SUBDIR += ap-auth-ldap
-    SUBDIR += ap-auth-postgresql
-    SUBDIR += ap-csacek
-    SUBDIR += ap-dtcl
-    SUBDIR += ap-fastcgi
-    SUBDIR += ap-jserv
-    SUBDIR += ap-perl
-    SUBDIR += ap-php3
-    SUBDIR += ap-php4
-    SUBDIR += ap-ssl
-    SUBDIR += apache
-    SUBDIR += apache6
-    SUBDIR += arena
-    SUBDIR += asp2php
-    SUBDIR += asWedit
-    SUBDIR += bluefish
-    SUBDIR += bozohttpd
-    SUBDIR += calamaris
-    SUBDIR += cgilib
-    SUBDIR += checkbot
-    SUBDIR += chimera
-    SUBDIR += cocoon
-    SUBDIR += communicator
-    SUBDIR += curl
-    SUBDIR += galway
-    SUBDIR += glibwww
-    SUBDIR += grail
-    SUBDIR += gtkhtml
-    SUBDIR += haskell-cgi
-    SUBDIR += horde
-    SUBDIR += htdig
-    SUBDIR += htmldoc
-    SUBDIR += hypermail
-    SUBDIR += ijb
-    SUBDIR += jakarta-tomcat
-    SUBDIR += jsdk20
-    SUBDIR += jssi
-    SUBDIR += kannel
-    SUBDIR += libghttp
-    SUBDIR += libwww
-    SUBDIR += links
-    SUBDIR += lynx
-    SUBDIR += lynx-current
-    SUBDIR += mozilla
-    SUBDIR += navigator
-    SUBDIR += navigator3
-    SUBDIR += netscape
-    SUBDIR += ns-plugger-common
-    SUBDIR += ns-plugger-communicator
-    SUBDIR += ns-plugger-navigator
-    SUBDIR += ns-remote
-    SUBDIR += opera
-    SUBDIR += p5-Apache-ASP
-    SUBDIR += p5-Apache-ePerl
-    SUBDIR += p5-CGI
-    SUBDIR += p5-CGI-Application
-    SUBDIR += p5-CGI_Lite
-    SUBDIR += p5-FCGI
-    SUBDIR += p5-HTML-Format
-    SUBDIR += p5-HTML-Parser
-    SUBDIR += p5-HTML-PrettyPrinter
-    SUBDIR += p5-HTML-Table
-    SUBDIR += p5-HTML-Tagset
-    SUBDIR += p5-HTML-Template
-    SUBDIR += p5-HTML-Tree
-    SUBDIR += p5-URI
-    SUBDIR += p5-VRML
-    SUBDIR += p5-libwww
-    SUBDIR += php3
-    SUBDIR += php3-gd
-    SUBDIR += php3-ldap
-    SUBDIR += php3-mysql
-    SUBDIR += php3-pgsql
-    SUBDIR += php3-snmp
-    SUBDIR += php4
-    SUBDIR += php4-gd
-    SUBDIR += php4-imap
-    SUBDIR += php4-ldap
-    SUBDIR += php4-mysql
-    SUBDIR += php4-pgsql
-    SUBDIR += py-pcgi
-    SUBDIR += py-zpublisher
-    SUBDIR += spfc
-    SUBDIR += squid
-    SUBDIR += surfraw
-    SUBDIR += swish-e
-    SUBDIR += tcl-cgi
-    SUBDIR += thttpd
-    SUBDIR += tidy
-    SUBDIR += urlget
-    SUBDIR += w3
-    SUBDIR += w3c-httpd
-    SUBDIR += w3m
-    SUBDIR += waplet
-    SUBDIR += web500gw
-    SUBDIR += webalizer
-    SUBDIR += weblint
-    SUBDIR += wml
-    SUBDIR += wwwcount
-    SUBDIR += wwwoffle
-    SUBDIR += zope
-    SUBDIR += zope-confera
+COMMENT=	Packages related to the World Wide Web
+
+SUBDIR+=	Mosaic
+SUBDIR+=	adzap
+SUBDIR+=	amaya
+SUBDIR+=	analog
+SUBDIR+=	ap-DBI
+SUBDIR+=	ap-Embperl
+SUBDIR+=	ap-auth-cookie
+SUBDIR+=	ap-auth-ldap
+SUBDIR+=	ap-auth-postgresql
+SUBDIR+=	ap-csacek
+SUBDIR+=	ap-dtcl
+SUBDIR+=	ap-fastcgi
+SUBDIR+=	ap-jserv
+SUBDIR+=	ap-perl
+SUBDIR+=	ap-php3
+SUBDIR+=	ap-php4
+SUBDIR+=	ap-ssl
+SUBDIR+=	apache
+SUBDIR+=	apache6
+SUBDIR+=	arena
+SUBDIR+=	asp2php
+SUBDIR+=	asWedit
+SUBDIR+=	bluefish
+SUBDIR+=	bozohttpd
+SUBDIR+=	calamaris
+SUBDIR+=	cgilib
+SUBDIR+=	checkbot
+SUBDIR+=	chimera
+SUBDIR+=	cocoon
+SUBDIR+=	communicator
+SUBDIR+=	curl
+SUBDIR+=	galway
+SUBDIR+=	glibwww
+SUBDIR+=	grail
+SUBDIR+=	gtkhtml
+SUBDIR+=	haskell-cgi
+SUBDIR+=	horde
+SUBDIR+=	htdig
+SUBDIR+=	htmldoc
+SUBDIR+=	hypermail
+SUBDIR+=	ijb
+SUBDIR+=	jakarta-tomcat
+SUBDIR+=	jsdk20
+SUBDIR+=	jssi
+SUBDIR+=	kannel
+SUBDIR+=	libghttp
+SUBDIR+=	libwww
+SUBDIR+=	links
+SUBDIR+=	lynx
+SUBDIR+=	lynx-current
+SUBDIR+=	mozilla
+SUBDIR+=	navigator
+SUBDIR+=	navigator3
+SUBDIR+=	netscape
+SUBDIR+=	ns-plugger-common
+SUBDIR+=	ns-plugger-communicator
+SUBDIR+=	ns-plugger-navigator
+SUBDIR+=	ns-remote
+SUBDIR+=	opera
+SUBDIR+=	p5-Apache-ASP
+SUBDIR+=	p5-Apache-ePerl
+SUBDIR+=	p5-CGI
+SUBDIR+=	p5-CGI-Application
+SUBDIR+=	p5-CGI_Lite
+SUBDIR+=	p5-FCGI
+SUBDIR+=	p5-HTML-Format
+SUBDIR+=	p5-HTML-Parser
+SUBDIR+=	p5-HTML-PrettyPrinter
+SUBDIR+=	p5-HTML-Table
+SUBDIR+=	p5-HTML-Tagset
+SUBDIR+=	p5-HTML-Template
+SUBDIR+=	p5-HTML-Tree
+SUBDIR+=	p5-URI
+SUBDIR+=	p5-VRML
+SUBDIR+=	p5-libwww
+SUBDIR+=	php3
+SUBDIR+=	php3-gd
+SUBDIR+=	php3-ldap
+SUBDIR+=	php3-mysql
+SUBDIR+=	php3-pgsql
+SUBDIR+=	php3-snmp
+SUBDIR+=	php4
+SUBDIR+=	php4-gd
+SUBDIR+=	php4-imap
+SUBDIR+=	php4-ldap
+SUBDIR+=	php4-mysql
+SUBDIR+=	php4-pgsql
+SUBDIR+=	py-pcgi
+SUBDIR+=	py-zpublisher
+SUBDIR+=	spfc
+SUBDIR+=	squid
+SUBDIR+=	surfraw
+SUBDIR+=	swish-e
+SUBDIR+=	tcl-cgi
+SUBDIR+=	thttpd
+SUBDIR+=	tidy
+SUBDIR+=	urlget
+SUBDIR+=	w3
+SUBDIR+=	w3c-httpd
+SUBDIR+=	w3m
+SUBDIR+=	waplet
+SUBDIR+=	web500gw
+SUBDIR+=	webalizer
+SUBDIR+=	weblint
+SUBDIR+=	wml
+SUBDIR+=	wwwcount
+SUBDIR+=	wwwoffle
+SUBDIR+=	zope
+SUBDIR+=	zope-confera
 
 .include "../mk/bsd.pkg.subdir.mk"