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, 132 insertions, 130 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 9c1aa7d0dd6..e95fbb43b85 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,134 +1,136 @@
-# $NetBSD: Makefile,v 1.201 2001/01/16 00:11:48 skrll Exp $
+# $NetBSD: Makefile,v 1.202 2001/02/16 15:51:54 wiz Exp $
 #
 
-    SUBDIR += 9term
-    SUBDIR += XF86Setup
-    SUBDIR += Xaw-Xpm
-    SUBDIR += Xaw3d
-    SUBDIR += Xbae
-    SUBDIR += XmHTML
-    SUBDIR += aterm
-    SUBDIR += blt
-    SUBDIR += controlcenter
-    SUBDIR += dxpc
-    SUBDIR += ebuilder
-    SUBDIR += egtk
-    SUBDIR += eterm
-    SUBDIR += filerunner
-    SUBDIR += fltk
-    SUBDIR += fvwm-wharf
-    SUBDIR += gdm
-    SUBDIR += gnome
-    SUBDIR += gnome-applets
-    SUBDIR += gnome-core
-    SUBDIR += gnome-libs
-    SUBDIR += gnome-python
-    SUBDIR += gnome-users-guide
-    SUBDIR += gtk
-    SUBDIR += gtk+extra
-    SUBDIR += gtk--
-    SUBDIR += gtk-engines
-    SUBDIR += gtk10
-    SUBDIR += gtkglarea
-    SUBDIR += gtkstep
-    SUBDIR += hanterm
-    SUBDIR += kde
-    SUBDIR += kdebase
-    SUBDIR += kdelibs
-    SUBDIR += khostchooser
-    SUBDIR += kterm
-    SUBDIR += lesstif
-    SUBDIR += lesstif12
-    SUBDIR += modeline
-    SUBDIR += oneko
-    SUBDIR += openmotif
-    SUBDIR += p5-Tk
-    SUBDIR += p5-gtk
-    SUBDIR += py-Tk
-    SUBDIR += py-wxWindows
-    SUBDIR += qt1
-    SUBDIR += qt2
-    SUBDIR += qt2-designer
-    SUBDIR += qt2-docs
-    SUBDIR += qt2-examples
-    SUBDIR += qt2-libs
-    SUBDIR += qtarch
-    SUBDIR += qwspritefield
-    SUBDIR += qwt
-    SUBDIR += rep-gtk
-    SUBDIR += ruby-Tk
-    SUBDIR += ruby-gtk
-    SUBDIR += rxvt
-    SUBDIR += speyes
-    SUBDIR += swing
-    SUBDIR += tix
-    SUBDIR += tk
-    SUBDIR += tkinfo
-    SUBDIR += tkman
-    SUBDIR += type1inst
-    SUBDIR += unclutter
-    SUBDIR += wmavgload
-    SUBDIR += wmessage
-    SUBDIR += wmfire
-    SUBDIR += wmfstatus
-    SUBDIR += wmweather
-    SUBDIR += wterm
-    SUBDIR += wxGTK
-    SUBDIR += wxWindows-docs
-    SUBDIR += x2x
-    SUBDIR += x3270
-    SUBDIR += xaniroc
-    SUBDIR += xautolock
-    SUBDIR += xbanner
-    SUBDIR += xcb
-    SUBDIR += xcolors
-    SUBDIR += xcolorsel
-    SUBDIR += xcruise
-    SUBDIR += xdaemon
-    SUBDIR += xdaemon2
-    SUBDIR += xdialog
-    SUBDIR += xdm3d
-    SUBDIR += xearth
-    SUBDIR += xephem
-    SUBDIR += xfce
-    SUBDIR += xfishtank
-    SUBDIR += xflame
-    SUBDIR += xforms
-    SUBDIR += xfstt
-    SUBDIR += xgas
-    SUBDIR += xglobe
-    SUBDIR += xhangglider
-    SUBDIR += xkeycaps
-    SUBDIR += xless
-    SUBDIR += xlockmore
-    SUBDIR += xlogout
-    SUBDIR += xmascot
-    SUBDIR += xmeter
-    SUBDIR += xmindpath
-    SUBDIR += xmon
-    SUBDIR += xmountains
-    SUBDIR += xmove
-    SUBDIR += xmx
-    SUBDIR += xneko
-    SUBDIR += xp
-    SUBDIR += xpenguins
-    SUBDIR += xpmicons
-    SUBDIR += xpmroot
-    SUBDIR += xpns
-    SUBDIR += xscreensaver
-    SUBDIR += xscreensaver-gnome
-    SUBDIR += xscribble
-    SUBDIR += xscript
-    SUBDIR += xsnow
-    SUBDIR += xteddy
-    SUBDIR += xteddy2
-    SUBDIR += xtermset
-    SUBDIR += xview
-    SUBDIR += xview-clients
-    SUBDIR += xview-config
-    SUBDIR += xview-lib
-    SUBDIR += xwatchwin
-    SUBDIR += xworld
-    SUBDIR += xwrits
+COMMENT=	Packages to support the X window system
+
+SUBDIR+=	9term
+SUBDIR+=	XF86Setup
+SUBDIR+=	Xaw-Xpm
+SUBDIR+=	Xaw3d
+SUBDIR+=	Xbae
+SUBDIR+=	XmHTML
+SUBDIR+=	aterm
+SUBDIR+=	blt
+SUBDIR+=	controlcenter
+SUBDIR+=	dxpc
+SUBDIR+=	ebuilder
+SUBDIR+=	egtk
+SUBDIR+=	eterm
+SUBDIR+=	filerunner
+SUBDIR+=	fltk
+SUBDIR+=	fvwm-wharf
+SUBDIR+=	gdm
+SUBDIR+=	gnome
+SUBDIR+=	gnome-applets
+SUBDIR+=	gnome-core
+SUBDIR+=	gnome-libs
+SUBDIR+=	gnome-python
+SUBDIR+=	gnome-users-guide
+SUBDIR+=	gtk
+SUBDIR+=	gtk+extra
+SUBDIR+=	gtk--
+SUBDIR+=	gtk-engines
+SUBDIR+=	gtk10
+SUBDIR+=	gtkglarea
+SUBDIR+=	gtkstep
+SUBDIR+=	hanterm
+SUBDIR+=	kde
+SUBDIR+=	kdebase
+SUBDIR+=	kdelibs
+SUBDIR+=	khostchooser
+SUBDIR+=	kterm
+SUBDIR+=	lesstif
+SUBDIR+=	lesstif12
+SUBDIR+=	modeline
+SUBDIR+=	oneko
+SUBDIR+=	openmotif
+SUBDIR+=	p5-Tk
+SUBDIR+=	p5-gtk
+SUBDIR+=	py-Tk
+SUBDIR+=	py-wxWindows
+SUBDIR+=	qt1
+SUBDIR+=	qt2
+SUBDIR+=	qt2-designer
+SUBDIR+=	qt2-docs
+SUBDIR+=	qt2-examples
+SUBDIR+=	qt2-libs
+SUBDIR+=	qtarch
+SUBDIR+=	qwspritefield
+SUBDIR+=	qwt
+SUBDIR+=	rep-gtk
+SUBDIR+=	ruby-Tk
+SUBDIR+=	ruby-gtk
+SUBDIR+=	rxvt
+SUBDIR+=	speyes
+SUBDIR+=	swing
+SUBDIR+=	tix
+SUBDIR+=	tk
+SUBDIR+=	tkinfo
+SUBDIR+=	tkman
+SUBDIR+=	type1inst
+SUBDIR+=	unclutter
+SUBDIR+=	wmavgload
+SUBDIR+=	wmessage
+SUBDIR+=	wmfire
+SUBDIR+=	wmfstatus
+SUBDIR+=	wmweather
+SUBDIR+=	wterm
+SUBDIR+=	wxGTK
+SUBDIR+=	wxWindows-docs
+SUBDIR+=	x2x
+SUBDIR+=	x3270
+SUBDIR+=	xaniroc
+SUBDIR+=	xautolock
+SUBDIR+=	xbanner
+SUBDIR+=	xcb
+SUBDIR+=	xcolors
+SUBDIR+=	xcolorsel
+SUBDIR+=	xcruise
+SUBDIR+=	xdaemon
+SUBDIR+=	xdaemon2
+SUBDIR+=	xdialog
+SUBDIR+=	xdm3d
+SUBDIR+=	xearth
+SUBDIR+=	xephem
+SUBDIR+=	xfce
+SUBDIR+=	xfishtank
+SUBDIR+=	xflame
+SUBDIR+=	xforms
+SUBDIR+=	xfstt
+SUBDIR+=	xgas
+SUBDIR+=	xglobe
+SUBDIR+=	xhangglider
+SUBDIR+=	xkeycaps
+SUBDIR+=	xless
+SUBDIR+=	xlockmore
+SUBDIR+=	xlogout
+SUBDIR+=	xmascot
+SUBDIR+=	xmeter
+SUBDIR+=	xmindpath
+SUBDIR+=	xmon
+SUBDIR+=	xmountains
+SUBDIR+=	xmove
+SUBDIR+=	xmx
+SUBDIR+=	xneko
+SUBDIR+=	xp
+SUBDIR+=	xpenguins
+SUBDIR+=	xpmicons
+SUBDIR+=	xpmroot
+SUBDIR+=	xpns
+SUBDIR+=	xscreensaver
+SUBDIR+=	xscreensaver-gnome
+SUBDIR+=	xscribble
+SUBDIR+=	xscript
+SUBDIR+=	xsnow
+SUBDIR+=	xteddy
+SUBDIR+=	xteddy2
+SUBDIR+=	xtermset
+SUBDIR+=	xview
+SUBDIR+=	xview-clients
+SUBDIR+=	xview-config
+SUBDIR+=	xview-lib
+SUBDIR+=	xwatchwin
+SUBDIR+=	xworld
+SUBDIR+=	xwrits
 
 .include "../mk/bsd.pkg.subdir.mk"