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, 156 insertions, 154 deletions

diff --git a/net/Makefile b/net/Makefile
index 0932dff91b7..328997d8b4e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,158 +1,160 @@
-# $NetBSD: Makefile,v 1.189 2001/02/11 05:24:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.190 2001/02/16 15:51:52 wiz Exp $
 #
 
-    SUBDIR += 6to4
-    SUBDIR += adns
-    SUBDIR += airportbasestationconfig
-    SUBDIR += archie
-    SUBDIR += arla
-    SUBDIR += arpd
-    SUBDIR += arpwatch
-    SUBDIR += batchftp
-    SUBDIR += bind4
-    SUBDIR += bind8
-    SUBDIR += bind9
-    SUBDIR += bind9-current
-    SUBDIR += bing
-    SUBDIR += bounce
-    SUBDIR += cftp
-    SUBDIR += choparp
-    SUBDIR += cia
-    SUBDIR += coda5_client
-    SUBDIR += coda5_server
-    SUBDIR += coda_client
-    SUBDIR += coda_doc
-    SUBDIR += coda_intro
-    SUBDIR += coda_server
-    SUBDIR += dante
-    SUBDIR += ddclient
-    SUBDIR += delegate
-    SUBDIR += dhid
-    SUBDIR += dip
-    SUBDIR += djbdns
-    SUBDIR += dlint
-    SUBDIR += echoping
-    SUBDIR += eggdrop
-    SUBDIR += ethereal
-    SUBDIR += fair-identd
-    SUBDIR += fping
-    SUBDIR += freewais-sf
-    SUBDIR += gated
-    SUBDIR += gnapfetch
-    SUBDIR += gnapster
-    SUBDIR += gnomeicu
-    SUBDIR += gnut
-    SUBDIR += gtk-gnutella
-    SUBDIR += gtksamba
-    SUBDIR += gtm
-    SUBDIR += httptunnel
-    SUBDIR += icsi-finger
-    SUBDIR += irrd
-    SUBDIR += isic
-    SUBDIR += ispman
-    SUBDIR += jwhois
-    SUBDIR += kdenetwork
-    SUBDIR += kmap
-    SUBDIR += lftp
-    SUBDIR += libnids
-    SUBDIR += libpcap
-    SUBDIR += libsscript
-    SUBDIR += lopster
-    SUBDIR += lukemftp
-    SUBDIR += md-whois
-    SUBDIR += mirror
-    SUBDIR += mouse-pppoe
-    SUBDIR += mrt
-    SUBDIR += mrtg
-    SUBDIR += mtr
-    SUBDIR += nap
-    SUBDIR += ncftp2
-    SUBDIR += ncftp3
-    SUBDIR += netatalk
-    SUBDIR += netatalk-asun
-    SUBDIR += netcat
-    SUBDIR += netname
-    SUBDIR += netperf
-    SUBDIR += netsaint-base
-    SUBDIR += netsaint-plugin-snmp
-    SUBDIR += netsaint-plugins
-    SUBDIR += ngrep
-    SUBDIR += nmap
-    SUBDIR += nmapfe
-    SUBDIR += nocol
-    SUBDIR += ntop
-    SUBDIR += ntp4
-    SUBDIR += openh323
-    SUBDIR += ORBit
-    SUBDIR += p5-ispman
-    SUBDIR += p5-Net
-    SUBDIR += p5-Net-DNS
-    SUBDIR += p5-Net-SNMP
-    SUBDIR += p5-Net-TFTP
-    SUBDIR += p5-Net-Telnet
-    SUBDIR += p5-SNMP
-    SUBDIR += p5-Socket6
-    SUBDIR += p5-Wais
-    SUBDIR += pchar
-    SUBDIR += pfnet
-    SUBDIR += pload
-    SUBDIR += poptop
-    SUBDIR += ppp
-    SUBDIR += ppp-mppe
-    SUBDIR += pptp
-    SUBDIR += ra-pna-proxy
-    SUBDIR += ra-rtsp-proxy
-    SUBDIR += radius
-    SUBDIR += rdist6
-    SUBDIR += rp-pppoe
-    SUBDIR += rsync
-    SUBDIR += rumba
-    SUBDIR += samba
-    SUBDIR += sdist
-    SUBDIR += sendfile
-    SUBDIR += sftp
-    SUBDIR += sitescooper
-    SUBDIR += sniffit
-    SUBDIR += snort
-    SUBDIR += socks4
-    SUBDIR += socks5
-    SUBDIR += speakfreely
-    SUBDIR += spegla
-    SUBDIR += srsh
-    SUBDIR += ssync
-    SUBDIR += tacacs
-    SUBDIR += tcl-scotty
-    SUBDIR += tcpdump
-    SUBDIR += tcpillust
-    SUBDIR += tcptrace
-    SUBDIR += tinyfugue
-    SUBDIR += tkined
-    SUBDIR += tn5250
-    SUBDIR += totd
-    SUBDIR += trafshow
-    SUBDIR += ttcp
-    SUBDIR += ttt
-    SUBDIR += ucd-snmp
-    SUBDIR += ucd-snmp-current
-    SUBDIR += ucspi-tcp
-    SUBDIR += unison
-    SUBDIR += upclient
-    SUBDIR += userppp
-    SUBDIR += vnc
-    SUBDIR += vncviewer
-    SUBDIR += vtun
-    SUBDIR += wakeup
-    SUBDIR += wget
-    SUBDIR += wmnet
-    SUBDIR += wmpload
-    SUBDIR += wu-ftpd
-    SUBDIR += xarchie
-    SUBDIR += xipdump
-    SUBDIR += xspeakfree
-    SUBDIR += xtraceroute
-    SUBDIR += ytalk
-    SUBDIR += ywho
-    SUBDIR += zebra
-    SUBDIR += zephyr
+COMMENT=	Networking tools
+
+SUBDIR+=	6to4
+SUBDIR+=	adns
+SUBDIR+=	airportbasestationconfig
+SUBDIR+=	archie
+SUBDIR+=	arla
+SUBDIR+=	arpd
+SUBDIR+=	arpwatch
+SUBDIR+=	batchftp
+SUBDIR+=	bind4
+SUBDIR+=	bind8
+SUBDIR+=	bind9
+SUBDIR+=	bind9-current
+SUBDIR+=	bing
+SUBDIR+=	bounce
+SUBDIR+=	cftp
+SUBDIR+=	choparp
+SUBDIR+=	cia
+SUBDIR+=	coda5_client
+SUBDIR+=	coda5_server
+SUBDIR+=	coda_client
+SUBDIR+=	coda_doc
+SUBDIR+=	coda_intro
+SUBDIR+=	coda_server
+SUBDIR+=	dante
+SUBDIR+=	ddclient
+SUBDIR+=	delegate
+SUBDIR+=	dhid
+SUBDIR+=	dip
+SUBDIR+=	djbdns
+SUBDIR+=	dlint
+SUBDIR+=	echoping
+SUBDIR+=	eggdrop
+SUBDIR+=	ethereal
+SUBDIR+=	fair-identd
+SUBDIR+=	fping
+SUBDIR+=	freewais-sf
+SUBDIR+=	gated
+SUBDIR+=	gnapfetch
+SUBDIR+=	gnapster
+SUBDIR+=	gnomeicu
+SUBDIR+=	gnut
+SUBDIR+=	gtk-gnutella
+SUBDIR+=	gtksamba
+SUBDIR+=	gtm
+SUBDIR+=	httptunnel
+SUBDIR+=	icsi-finger
+SUBDIR+=	irrd
+SUBDIR+=	isic
+SUBDIR+=	ispman
+SUBDIR+=	jwhois
+SUBDIR+=	kdenetwork
+SUBDIR+=	kmap
+SUBDIR+=	lftp
+SUBDIR+=	libnids
+SUBDIR+=	libpcap
+SUBDIR+=	libsscript
+SUBDIR+=	lopster
+SUBDIR+=	lukemftp
+SUBDIR+=	md-whois
+SUBDIR+=	mirror
+SUBDIR+=	mouse-pppoe
+SUBDIR+=	mrt
+SUBDIR+=	mrtg
+SUBDIR+=	mtr
+SUBDIR+=	nap
+SUBDIR+=	ncftp2
+SUBDIR+=	ncftp3
+SUBDIR+=	netatalk
+SUBDIR+=	netatalk-asun
+SUBDIR+=	netcat
+SUBDIR+=	netname
+SUBDIR+=	netperf
+SUBDIR+=	netsaint-base
+SUBDIR+=	netsaint-plugin-snmp
+SUBDIR+=	netsaint-plugins
+SUBDIR+=	ngrep
+SUBDIR+=	nmap
+SUBDIR+=	nmapfe
+SUBDIR+=	nocol
+SUBDIR+=	ntop
+SUBDIR+=	ntp4
+SUBDIR+=	openh323
+SUBDIR+=	ORBit
+SUBDIR+=	p5-ispman
+SUBDIR+=	p5-Net
+SUBDIR+=	p5-Net-DNS
+SUBDIR+=	p5-Net-SNMP
+SUBDIR+=	p5-Net-TFTP
+SUBDIR+=	p5-Net-Telnet
+SUBDIR+=	p5-SNMP
+SUBDIR+=	p5-Socket6
+SUBDIR+=	p5-Wais
+SUBDIR+=	pchar
+SUBDIR+=	pfnet
+SUBDIR+=	pload
+SUBDIR+=	poptop
+SUBDIR+=	ppp
+SUBDIR+=	ppp-mppe
+SUBDIR+=	pptp
+SUBDIR+=	ra-pna-proxy
+SUBDIR+=	ra-rtsp-proxy
+SUBDIR+=	radius
+SUBDIR+=	rdist6
+SUBDIR+=	rp-pppoe
+SUBDIR+=	rsync
+SUBDIR+=	rumba
+SUBDIR+=	samba
+SUBDIR+=	sdist
+SUBDIR+=	sendfile
+SUBDIR+=	sftp
+SUBDIR+=	sitescooper
+SUBDIR+=	sniffit
+SUBDIR+=	snort
+SUBDIR+=	socks4
+SUBDIR+=	socks5
+SUBDIR+=	speakfreely
+SUBDIR+=	spegla
+SUBDIR+=	srsh
+SUBDIR+=	ssync
+SUBDIR+=	tacacs
+SUBDIR+=	tcl-scotty
+SUBDIR+=	tcpdump
+SUBDIR+=	tcpillust
+SUBDIR+=	tcptrace
+SUBDIR+=	tinyfugue
+SUBDIR+=	tkined
+SUBDIR+=	tn5250
+SUBDIR+=	totd
+SUBDIR+=	trafshow
+SUBDIR+=	ttcp
+SUBDIR+=	ttt
+SUBDIR+=	ucd-snmp
+SUBDIR+=	ucd-snmp-current
+SUBDIR+=	ucspi-tcp
+SUBDIR+=	unison
+SUBDIR+=	upclient
+SUBDIR+=	userppp
+SUBDIR+=	vnc
+SUBDIR+=	vncviewer
+SUBDIR+=	vtun
+SUBDIR+=	wakeup
+SUBDIR+=	wget
+SUBDIR+=	wmnet
+SUBDIR+=	wmpload
+SUBDIR+=	wu-ftpd
+SUBDIR+=	xarchie
+SUBDIR+=	xipdump
+SUBDIR+=	xspeakfree
+SUBDIR+=	xtraceroute
+SUBDIR+=	ytalk
+SUBDIR+=	ywho
+SUBDIR+=	zebra
+SUBDIR+=	zephyr
 
 .include "../mk/bsd.pkg.subdir.mk"