Style cosmetics (DESCR has 80 columns, whitespace, remove superfluous

includes, add CATEGORIES).

3 files changed, 30 insertions, 32 deletions

diff --git a/wm/metacity/DESCR b/wm/metacity/DESCR
index c5c70d67e12..a3bd5188785 100644
--- a/wm/metacity/DESCR
+++ b/wm/metacity/DESCR
@@ -1,19 +1,16 @@
-metacity gnome-compliant window manager
+Metacity is not a meta-City as in an urban center, but rather Meta-ness as in
+the state of being meta.  i.e.  metacity :  meta as opacity :  opaque.  Also
+it may have something to do with the Meta key on UNIX keyboards.
 
-Metacity is not a meta-City as in an urban center, but rather
-Meta-ness as in the state of being meta.  i.e.  metacity :  meta as
-opacity :  opaque.  Also it may have something to do with the Meta key
-on UNIX keyboards.
-
- - Boring window manager for the adult in you. Many window managers
-   are like Marshmallow Froot Loops; Metacity is like Cheerios.
- - Uses GTK+ 2.0 for drawing window frames. This means colors, fonts,
-   etc. come from GTK+ theme.
- - Has a simple theme system and a couple of extra themes come with it.
-   Change themes via gconf-editor or gconftool:
-     gconftool-2 --type=string --set /apps/metacity/general/theme Crux
- - Change number of workspaces via gconf-editor or gconftool:
-     gconftool-2 --type=int --set /apps/metacity/general/num_workspaces 5
-   Can also change workspaces from GNOME 2 pager.
- - Change focus mode:
-     gconftool-2 --type=string --set /apps/metacity/general/focus_mode mouse
+- Boring window manager for the adult in you.  Many window managers are like
+  Marshmallow Froot Loops; Metacity is like Cheerios.
+- Uses GTK+ 2.0 for drawing window frames.  This means colors, fonts, etc.
+  come from GTK+ theme.
+- Has a simple theme system and a couple of extra themes come with it.
+  Change themes via gconf-editor or gconftool:
+    gconftool-2 --type=string --set /apps/metacity/general/theme Crux
+- Change number of workspaces via gconf-editor or gconftool:
+    gconftool-2 --type=int --set /apps/metacity/general/num_workspaces 5
+  Can also change workspaces from GNOME 2 pager.
+- Change focus mode:
+    gconftool-2 --type=string --set /apps/metacity/general/focus_mode mouse
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index c87c11efdd2..3745eb2535c 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/05/02 11:56:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/17 06:09:30 salo Exp $
 #
 
 DISTNAME=	metacity-2.4.34
 PKGREVISION=	1
-CATEGORIES=	wm
+CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.4/}
 EXTRACT_SUFX=	.tar.bz2
 
@@ -11,23 +11,25 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnome.org/softwaremap/projects/Metacity
 COMMENT=	gnome-compliant window manager
 
-BUILD_USES_MSGFMT=	yes
+BUILD_USES_MSGFMT=	YES
 DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--without-included-gettext
-USE_GMAKE=		yes
-USE_LIBTOOL=		yes
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11=		YES
+USE_GMAKE=		YES
+GNU_CONFIGURE=		YES
+USE_LIBTOOL=		YES
+
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-USE_X11=		yes
-USE_BUILDLINK2=		yes
-USE_PKGLOCALEDIR=	yes
+
+CONFIGURE_ARGS=		--without-included-gettext
 
 GCONF2_SCHEMAS=		metacity.schemas
 
-.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf2/schemas.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../net/ORBit2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/buildlink2.mk b/wm/metacity/buildlink2.mk
index 640af5414a6..de26610bffe 100644
--- a/wm/metacity/buildlink2.mk
+++ b/wm/metacity/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:56:36 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/17 06:09:30 salo Exp $
 #
 # This Makefile fragment is included by packages that use metacity.
 #
@@ -21,7 +21,6 @@ BUILDLINK_FILES.metacity+=	lib/pkgconfig/libmetacity-private.pc
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../net/ORBit2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	metacity-buildlink