31 files changed, 61 insertions, 81 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index a2cde4166002..8b59daf20132 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -3,12 +3,12 @@
 # Date created:		1 May 1998
 # Whom:			Brett Taylor
 #
-# $Id: Makefile,v 1.22 1998/06/29 03:46:27 mph Exp $
+# $Id: Makefile,v 1.23 1998/07/14 02:42:18 mph Exp $
 #
 
 DISTNAME=	AfterStep-1.4.5.0
 PKGNAME=	afterstep-1.4.5.3
-CATEGORIES=     x11
+CATEGORIES=     x11-wm
 MASTER_SITES=   ftp://peloton.physics.montana.edu/pub/distfiles/
 EXTRACT_SUFX=   .tgz
 
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index a544ec108468..88996be81e12 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -3,12 +3,12 @@
 # Date created:		October 29th 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.18 1997/06/07 02:55:41 jfitz Exp $
+# $Id: Makefile,v 1.19 1998/08/05 09:31:40 asami Exp $
 #
 
 DISTNAME=	AfterStep-1.0
 PKGNAME=	afterstep-1.0
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://afterstep.foo.net/pub/AfterStep/
 
 MAINTAINER=	jfitz@FreeBSD.ORG
diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index 4eb854c0a9e3..42f75a74c446 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -3,12 +3,12 @@
 # Date created: 13 November 1997
 # Whom: Douglas Carmichael <dcarmich@mcs.com>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/14 09:37:44 tg Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:31:40 asami Exp $
 #
 
 DISTNAME=	amiwm0.20pl28
 PKGNAME=	amiwm-0.20p28
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index e965d008afec..7eefcd49b91f 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -3,11 +3,11 @@
 # Date created:		June 15, 1998
 # Whom:			Brian Handy <handy@physics.montana.edu>
 #
-# $Id: Makefile,v 1.3 1998/07/17 20:33:55 steve Exp $
+# $Id: Makefile,v 1.4 1998/07/27 00:42:42 steve Exp $
 #
 
 DISTNAME=	blackbox-0.34.4
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	http://linux.wiw.org/blackbox/sources/
 
 MAINTAINER=	ports@FreeBSD.ORG
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 44b1921f4462..b52200ac8b30 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		13 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.14 1997/11/25 11:07:54 asami Exp $
+# $Id: Makefile,v 1.15 1997/11/27 17:31:20 obrien Exp $
 #
 
 DISTNAME=	ctwm-3.5
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://slhp1.epfl.ch/pub/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index a998bc06f30e..10a6867b1ba5 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -3,11 +3,11 @@
 # Date created:        10 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.19 1998/08/05 09:31:41 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/06 15:32:15 vanilla Exp $
 #
 
 DISTNAME=	enlightenment-0.14
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
 		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index a998bc06f30e..10a6867b1ba5 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:        10 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.19 1998/08/05 09:31:41 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/06 15:32:15 vanilla Exp $
 #
 
 DISTNAME=	enlightenment-0.14
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
 		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index a998bc06f30e..10a6867b1ba5 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -3,11 +3,11 @@
 # Date created:        10 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.19 1998/08/05 09:31:41 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/06 15:32:15 vanilla Exp $
 #
 
 DISTNAME=	enlightenment-0.14
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
 		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index 550a41e6ad55..f528efd26774 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		12 May 1995
 # Whom:			me
 #
-# $Id: Makefile,v 1.22 1997/10/28 21:59:55 gj Exp $
+# $Id: Makefile,v 1.23 1998/04/04 07:36:46 asami Exp $
 #
 
 DISTNAME=	fvwm-1.24r
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-1/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/1.x/
 
diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
index 1f60442339e0..b6a6deccaf86 100644
--- a/x11-wm/fvwm2-beta/Makefile
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.11 1997/10/11 02:19:50 max Exp $
+# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
 #
 
 DISTNAME=	fvwm-2.0.46
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 1f60442339e0..b6a6deccaf86 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.11 1997/10/11 02:19:50 max Exp $
+# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
 #
 
 DISTNAME=	fvwm-2.0.46
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
index 1f60442339e0..b6a6deccaf86 100644
--- a/x11-wm/fvwm2-i18n/Makefile
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.11 1997/10/11 02:19:50 max Exp $
+# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
 #
 
 DISTNAME=	fvwm-2.0.46
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 1f60442339e0..b6a6deccaf86 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.11 1997/10/11 02:19:50 max Exp $
+# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
 #
 
 DISTNAME=	fvwm-2.0.46
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 1f60442339e0..b6a6deccaf86 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.11 1997/10/11 02:19:50 max Exp $
+# $Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp $
 #
 
 DISTNAME=	fvwm-2.0.46
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index 00031a4ed522..60f9bb15edc9 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp $
+# $Id: Makefile,v 1.18 1998/08/05 09:31:43 asami Exp $
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
 PKGNAME=	fvwm95-2.0.43a
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/fvwm95/
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index 00031a4ed522..60f9bb15edc9 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Sa   1 Feb 1997 14:46:05 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp $
+# $Id: Makefile,v 1.18 1998/08/05 09:31:43 asami Exp $
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
 PKGNAME=	fvwm95-2.0.43a
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/fvwm95/
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index 03ef32c1bb8f..a0a18dcf6c2e 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		14 November 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.3 1996/11/18 09:55:28 asami Exp $
+# $Id: Makefile,v 1.4 1998/04/28 14:50:48 mph Exp $
 #
 
 DISTNAME=	gwm-1.8c
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	window_managers/gwm
 
diff --git a/x11-wm/hackedbox/Makefile b/x11-wm/hackedbox/Makefile
index e965d008afec..7eefcd49b91f 100644
--- a/x11-wm/hackedbox/Makefile
+++ b/x11-wm/hackedbox/Makefile
@@ -3,11 +3,11 @@
 # Date created:		June 15, 1998
 # Whom:			Brian Handy <handy@physics.montana.edu>
 #
-# $Id: Makefile,v 1.3 1998/07/17 20:33:55 steve Exp $
+# $Id: Makefile,v 1.4 1998/07/27 00:42:42 steve Exp $
 #
 
 DISTNAME=	blackbox-0.34.4
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	http://linux.wiw.org/blackbox/sources/
 
 MAINTAINER=	ports@FreeBSD.ORG
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 3759d79013e4..40ae8d043540 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -3,11 +3,11 @@
 # Date created:        10 August 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.12 1998/07/27 00:40:53 steve Exp $
+# $Id: Makefile,v 1.13 1998/08/05 09:31:43 asami Exp $
 #
 
 DISTNAME=	icewm-0.9.10
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	http://berta.fri.uni-lj.si/~markom/icewm/devel/
 EXTRACT_SUFX=	.src.tar.gz
 
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index 0afd29550a2c..707d49070042 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -3,12 +3,12 @@
 # Date created:		17 March 1998
 # Whom:			J Han <hjh@best.com>
 #
-# $Id: Makefile,v 1.2 1998/06/04 20:25:42 steve Exp $
+# $Id: Makefile,v 1.3 1998/07/17 20:52:03 steve Exp $
 #
 
 DISTNAME=	lwm
 PKGNAME=	lwm-0.06
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	http://users.ch.genedata.com/~enh/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index 091af7c00791..c534790f7660 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -3,11 +3,11 @@
 # Date created:        19 Januruary 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.6 1997/12/16 20:13:09 vanilla Exp $
+# $Id: Makefile,v 1.7 1998/03/11 07:31:11 vanilla Exp $
 #
 
 DISTNAME=	mlvwm-0.8.6
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.bioele.nuee.nagoya-u.ac.jp/member/tak/mlvwm/ \
 		http://www.bioele.nuee.nagoya-u.ac.jp/member/tak/
 DISTFILES=	mlvwm-0.8.6.tar.gz mini-icons.tar.gz
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 4f0336d9fd97..afe1ad321990 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 October 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.0 1994/10/21 00:00:00 smace Exp $
+# $Id: Makefile,v 1.10 1996/11/18 13:06:09 asami Exp $
 #
 
 DISTNAME=	olvwm4
 PKGNAME=	olvwm-4.1
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTFILES=	olvwm4.tar.Z
 
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index e965d008afec..7eefcd49b91f 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -3,11 +3,11 @@
 # Date created:		June 15, 1998
 # Whom:			Brian Handy <handy@physics.montana.edu>
 #
-# $Id: Makefile,v 1.3 1998/07/17 20:33:55 steve Exp $
+# $Id: Makefile,v 1.4 1998/07/27 00:42:42 steve Exp $
 #
 
 DISTNAME=	blackbox-0.34.4
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	http://linux.wiw.org/blackbox/sources/
 
 MAINTAINER=	ports@FreeBSD.ORG
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index bf0523e5ad39..5d870f655cb2 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -3,12 +3,12 @@
 # Date created:		24 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.10 1996/11/18 11:43:26 asami Exp $
+# $Id: Makefile,v 1.11 1997/12/25 22:29:50 asami Exp $
 #
 
 DISTNAME=	piewm
 PKGNAME=	piewm-1.0
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index fac4d48cd60a..441e808e5943 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -3,11 +3,11 @@
 # Date created:        2 January 1997
 # Whom:                Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.15 1998/06/02 17:04:08 mph Exp $
+# $Id: Makefile,v 1.16 1998/07/03 23:20:14 steve Exp $
 #
 
 DISTNAME=       qvwm-1.0b10a
-CATEGORIES=     x11
+CATEGORIES=     x11-wm
 MASTER_SITES=   http://www-masuda.is.s.u-tokyo.ac.jp/~kourai/qvwm/program/
 
 MAINTAINER=     Nakai@technologist.com
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 39f863bd53e4..54ad79dcd788 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -3,12 +3,12 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer
 #
-# $Id: Makefile,v 1.8 1995/04/22 11:59:12 asami Exp $
+# $Id: Makefile,v 1.9 1996/11/18 09:55:32 asami Exp $
 #
 
 DISTNAME=	tvtwm
 PKGNAME=	tvtwm-pl11
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	window_managers
 DISTFILES=	tvtwm.pl11.tar.gz
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 3f5bb212b2ae..14c462cab501 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -3,11 +3,11 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.17 1998/07/28 06:17:29 tg Exp $
+# $Id: Makefile,v 1.18 1998/08/05 09:31:49 asami Exp $
 
 DISTNAME=	WindowMaker-0.17.5
 PKGNAME=	windowmaker-0.17.5
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
 		http://jgo.local.net/cool_downloads/wm/
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 3f5bb212b2ae..14c462cab501 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -3,11 +3,11 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.17 1998/07/28 06:17:29 tg Exp $
+# $Id: Makefile,v 1.18 1998/08/05 09:31:49 asami Exp $
 
 DISTNAME=	WindowMaker-0.17.5
 PKGNAME=	windowmaker-0.17.5
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
 		http://jgo.local.net/cool_downloads/wm/
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 2dc44a5874b1..cccd5de2244a 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 February 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1997/07/08 06:23:30 max Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:31:49 asami Exp $
 #
 
 DISTNAME=	wm2-3
 PKGNAME=        wm2-3.0
-CATEGORIES=    x11
+CATEGORIES=     x11-wm
 MASTER_SITES=   http://www.netcomuk.co.uk/~cannam/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
diff --git a/x11-wm/wmx/Makefile b/x11-wm/wmx/Makefile
index 8b66c7c5cc2e..a4d625aacb5c 100644
--- a/x11-wm/wmx/Makefile
+++ b/x11-wm/wmx/Makefile
@@ -3,12 +3,12 @@
 # Date created:		11. Jan 1998
 # Whom:			Stefan Zehl <sec@42.org>
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/24 10:52:08 max Exp $
+# $Id: Makefile,v 1.2 1998/08/05 09:31:49 asami Exp $
 #
 
 DISTNAME=	wmx-4
 PKGNAME=        wmx-4.0
-CATEGORIES=	x11
+CATEGORIES=	x11-wm
 MASTER_SITES=   http://www.netcomuk.co.uk/~cannam/
 
 MAINTAINER=	sec@42.org
diff --git a/x11/Makefile b/x11/Makefile
index fe27aa9e12ac..8c91fd5e013d 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,28 +1,17 @@
-# $Id: Makefile,v 1.225 1998/08/07 22:42:53 asami Exp $
+# $Id: Makefile,v 1.226 1998/08/07 22:56:12 asami Exp $
 #
 
     SUBDIR += XFree86
     SUBDIR += XFree86-contrib
-    SUBDIR += afterstep
-    SUBDIR += afterstep-devel
-    SUBDIR += amiwm
-    SUBDIR += blackbox
     SUBDIR += blast
     SUBDIR += bricons
     SUBDIR += camltk41
-    SUBDIR += ctwm
     SUBDIR += dgs
     SUBDIR += dxpc
     SUBDIR += emu
-    SUBDIR += enlightenment
     SUBDIR += eterm
     SUBDIR += fbsd-icons
-    SUBDIR += fvwm
-    SUBDIR += fvwm2
-    SUBDIR += fvwm95
     SUBDIR += gtk
-    SUBDIR += gwm
-    SUBDIR += icewm
     SUBDIR += kb2mb2
     SUBDIR += kde
     SUBDIR += kdebase
@@ -32,26 +21,17 @@
     SUBDIR += libhelp
     SUBDIR += libsx
     SUBDIR += lupe
-    SUBDIR += lwm
-    SUBDIR += mlvwm
     SUBDIR += offix-clipboard
     SUBDIR += offix-execute
-    SUBDIR += olvwm
     SUBDIR += p5-Gtk
     SUBDIR += p5-Tcl-Tk
     SUBDIR += p5-Tk
-    SUBDIR += piewm
     SUBDIR += props
     SUBDIR += pythonqt
-    SUBDIR += qvwm
     SUBDIR += rxvt
     SUBDIR += sxpc
     SUBDIR += tkgoodstuff
-    SUBDIR += tvtwm
     SUBDIR += tycoon
-    SUBDIR += windowmaker
-    SUBDIR += wm2
-    SUBDIR += wmx
     SUBDIR += x3270
     SUBDIR += xaniroc
     SUBDIR += xantfarm