New ports/{java,irc,x11-servers} categories, Step #4 - Adjust new Makefiles.

75 files changed, 150 insertions, 150 deletions

diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 09f3aec41e55..5396bb339875 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -3,12 +3,12 @@
 # Date created:		26 Jan 1998
 # Whom:			griffin
 #
-# $Id: Makefile,v 1.6 1999/06/27 05:25:00 cpiazza Exp $
+# $Id: Makefile,v 1.5 1999/06/27 16:16:16 cpiazza Exp $
 #
 
 DISTNAME=	ircii-pana-75p3
 PKGNAME=	bitchx-75p3
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.bitchx.org/pub/BitchX/source/ \
 		ftp://ftp.buk.net/pub/software/bitchx/source/
 
diff --git a/irc/blackened/Makefile b/irc/blackened/Makefile
index f04da406f7dd..9ca7cae9af20 100644
--- a/irc/blackened/Makefile
+++ b/irc/blackened/Makefile
@@ -3,11 +3,11 @@
 # Date created:		11 Jun 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/19 08:57:16 cpiazza Exp $
+# $Id: Makefile,v 1.2 1999/06/19 09:13:39 cpiazza Exp $
 #
 
 DISTNAME=	blackened-1.6.2
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.blackened.com/pub/irc/blackened/ \
 		http://www.cana.net/~acme/blackened/ \
 		http://www.psn.net/~andrews/blackened/
diff --git a/irc/bnc/Makefile b/irc/bnc/Makefile
index c325d8c03aa8..9860429f42a2 100644
--- a/irc/bnc/Makefile
+++ b/irc/bnc/Makefile
@@ -3,12 +3,12 @@
 # Date created:        06 July 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
-# $Id: Makefile,v 1.2 1998/12/29 18:22:58 billf Exp $
+# $Id: Makefile,v 1.3 1999/05/16 23:07:23 mharo Exp $
 #
 
 DISTNAME=	bnc2.6.2
 PKGNAME=	bnc-2.6.2
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://irc.themes.org/downloads/misc/
 
 MAINTAINER=	billf@FreeBSD.org
diff --git a/irc/ezbounce-devel/Makefile b/irc/ezbounce-devel/Makefile
index 828be97f4769..5743c01c4a01 100644
--- a/irc/ezbounce-devel/Makefile
+++ b/irc/ezbounce-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:	 	19 February 1999
 # Whom:			Chris Piazza <cpiazza@FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1999/05/25 10:08:17 mharo Exp $
+# $Id: Makefile,v 1.4 1999/06/19 08:25:40 cpiazza Exp $
 #
 
 DISTNAME=	ezbounce-0.85.2
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=  	http://druglord.freelsd.org/ezbounce/ \
 		http://irc.themes.org/downloads/misc/
 
diff --git a/irc/ezbounce/Makefile b/irc/ezbounce/Makefile
index 828be97f4769..5743c01c4a01 100644
--- a/irc/ezbounce/Makefile
+++ b/irc/ezbounce/Makefile
@@ -3,11 +3,11 @@
 # Date created:	 	19 February 1999
 # Whom:			Chris Piazza <cpiazza@FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1999/05/25 10:08:17 mharo Exp $
+# $Id: Makefile,v 1.4 1999/06/19 08:25:40 cpiazza Exp $
 #
 
 DISTNAME=	ezbounce-0.85.2
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=  	http://druglord.freelsd.org/ezbounce/ \
 		http://irc.themes.org/downloads/misc/
 
diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index 0f823beb2e9a..7f6dcd10a235 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		23 August 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.18 1998/01/26 10:44:18 asami Exp $
+# $Id: Makefile,v 1.19 1998/12/09 20:15:29 billf Exp $
 #
 
 DISTNAME=	irc2.10.1
 PKGNAME=	irc-2.10.1
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.funet.fi/pub/networking/services/irc/server/ \
 		ftp://ftp.irc.org/irc/server/ \
 		ftp://tau.ac.il/pub/unix/irc/server/ \
diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile
index f1097ee76984..288cdaa15a71 100644
--- a/irc/ircII/Makefile
+++ b/irc/ircII/Makefile
@@ -3,11 +3,11 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.15 1998/01/25 20:40:00 torstenb Exp $
+# $Id: Makefile,v 1.16 1999/04/19 05:55:09 mharo Exp $
 #
 
 DISTNAME=	ircii-4.4
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/clients/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index 66a74851ec18..5b6ca390080a 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -3,11 +3,11 @@
 # Date created:		9 January 1998
 # Whom:			desmo@bandwidth.org
 #
-# $Id: Makefile,v 1.9 1998/12/15 22:05:33 billf Exp $
+# $Id: Makefile,v 1.10 1999/03/15 01:29:23 steve Exp $
 #
 
 DISTNAME=	ircd-hybrid-5.3p6
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.blackened.com/pub/irc/hybrid/
 
 MAINTAINER=	desmo@bandwidth.org
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index b28751db42c5..5b15772a2312 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -3,12 +3,12 @@
 # Date created:			14 Apr 1999
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.3 1999/05/29 03:55:52 steve Exp $
+# $Id: Makefile,v 1.4 1999/06/19 20:09:23 cpiazza Exp $
 #
 
 DISTNAME=	irssi-0.7.11-2
 PKGNAME=	irssi-0.7.11
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://www.sicom.fi/~ikioma/irssi/
 
 MAINTAINER=	jim@phrantic.phear.net
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index b28751db42c5..5b15772a2312 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -3,12 +3,12 @@
 # Date created:			14 Apr 1999
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.3 1999/05/29 03:55:52 steve Exp $
+# $Id: Makefile,v 1.4 1999/06/19 20:09:23 cpiazza Exp $
 #
 
 DISTNAME=	irssi-0.7.11-2
 PKGNAME=	irssi-0.7.11
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://www.sicom.fi/~ikioma/irssi/
 
 MAINTAINER=	jim@phrantic.phear.net
diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile
index 6903170fa248..0279fd50f82c 100644
--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:		Mon Feb 15 02:53:29 CET 1999
 # Whom:			Anders Nordby <anders@fix.no>
 #
-# $Id: Makefile,v 1.1.1.1 1999/04/10 19:08:24 jseger Exp $
+# $Id: Makefile,v 1.2 1999/04/13 23:11:07 mharo Exp $
 #
 
 DISTNAME=	kvirc-0.9.0
-CATEGORIES=	net kde
+CATEGORIES=	irc kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR=	 stable/1.1/apps/network
 
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index 6903170fa248..0279fd50f82c 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -3,11 +3,11 @@
 # Date created:		Mon Feb 15 02:53:29 CET 1999
 # Whom:			Anders Nordby <anders@fix.no>
 #
-# $Id: Makefile,v 1.1.1.1 1999/04/10 19:08:24 jseger Exp $
+# $Id: Makefile,v 1.2 1999/04/13 23:11:07 mharo Exp $
 #
 
 DISTNAME=	kvirc-0.9.0
-CATEGORIES=	net kde
+CATEGORIES=	irc kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR=	 stable/1.1/apps/network
 
diff --git a/irc/muh/Makefile b/irc/muh/Makefile
index 67a7f3b20eb2..c39fd2e63ff8 100644
--- a/irc/muh/Makefile
+++ b/irc/muh/Makefile
@@ -3,12 +3,12 @@
 # Date created:        25 Sept 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
-# $Id: Makefile,v 1.2 1999/03/03 20:45:18 billf Exp $
+# $Id: Makefile,v 1.3 1999/04/07 21:22:54 billf Exp $
 #
 
 DISTNAME=	muh2.04
 PKGNAME=	muh-2.04
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://mind.riot.org/download/
 
 MAINTAINER=	billf@FreeBSD.org
diff --git a/irc/ninja/Makefile b/irc/ninja/Makefile
index b6a75cc92e6d..72c76354c7fb 100644
--- a/irc/ninja/Makefile
+++ b/irc/ninja/Makefile
@@ -3,12 +3,12 @@
 # Date created:	 	10 April 1999
 # Whom:			Chris Piazza <cpiazza@FreeBSD.org>
 #
-# $Id: Makefile,v 1.4 1999/06/17 13:19:52 billf Exp $
+# $Id: Makefile,v 1.5 1999/06/19 08:25:49 cpiazza Exp $
 #
 
 DISTNAME= 	ninja-src
 PKGNAME=	ninja-1.1
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://ninja.pimped.org/
 
 MAINTAINER=	cpiazza@FreeBSD.org
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index 5e864e0a74d9..1d343728cf7b 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 May 1999
 # Whom:			Chris Piazza <cpiazza@FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/09 01:58:17 steve Exp $
+# $Id: Makefile,v 1.2 1999/06/19 08:25:54 cpiazza Exp $
 #
 
 DISTNAME=	quirc
 PKGNAME=	quirc-0.9.77
-CATEGORIES=	net tk80
+CATEGORIES=	irc tk80
 MASTER_SITES=	http://www.quirc.org/ \
 		http://patearl.powersurfr.com/quirc/
 
diff --git a/irc/roxirc/Makefile b/irc/roxirc/Makefile
index 581b9ed78e7e..ef7675ffb05a 100644
--- a/irc/roxirc/Makefile
+++ b/irc/roxirc/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Mar 15 1999
 # Whom:                 rox@fearme.com
 #
-# $Id: Makefile,v 1.3 1999/06/22 00:08:52 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/06/23 19:44:22 cpiazza Exp $
 #
 
 DISTNAME=	roxirc-1.3
-CATEGORIES=	net tk80
+CATEGORIES=	irc tk80
 MASTER_SITES=	http://roxirc.lighter.net/download/
 
 MAINTAINER=	rox@fearme.com
diff --git a/irc/sic/Makefile b/irc/sic/Makefile
index ade8bf15941f..0bf374038e05 100644
--- a/irc/sic/Makefile
+++ b/irc/sic/Makefile
@@ -3,11 +3,11 @@
 # Date created:		04 Apr 1998
 # Whom:			sec@42.org
 #
-# $Id: Makefile,v 1.2 1998/05/27 19:12:12 mph Exp $
+# $Id: Makefile,v 1.3 1998/12/16 00:12:46 jseger Exp $
 #
 
 DISTNAME=	sic-0.18a
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/irc/sic/
 EXTRACT_SUFX=	.tgz
 
diff --git a/irc/sirc/Makefile b/irc/sirc/Makefile
index 466631d41ee3..9b81b4aea783 100644
--- a/irc/sirc/Makefile
+++ b/irc/sirc/Makefile
@@ -3,7 +3,7 @@
 # Date created:                      4 May 1998
 # Whom:                              Studded <Studded@dal.net>
 #
-# $Id: Makefile,v 1.2 1998/05/07 21:58:53 mph Exp $
+# $Id: Makefile,v 1.3 1998/09/16 06:55:15 asami Exp $
 #
 # If you need SOCKS support, define SOCKS_SERVER with
 # the name of your SOCKS proxy and remove the '#'.
@@ -13,7 +13,7 @@
 # SOCKS_SERVER= your.socks.proxy
 
 DISTNAME=	sirc-2.211
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://www.eleves.ens.fr:8080/home/espel/sirc/ \
 		ftp://ftp1.dal.net/dalnet/clients/unix/sirc/ \
 		ftp://ftp2.dal.net/dalnet/clients/unix/sirc/
diff --git a/irc/tkirc/Makefile b/irc/tkirc/Makefile
index 8f6aaeb87ae7..889050ac3372 100644
--- a/irc/tkirc/Makefile
+++ b/irc/tkirc/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Jan 15 1998
 # Whom:                 brianfeldman@hotmail.com
 #
-# $Id: Makefile,v 1.5 1998/04/14 09:27:21 jkh Exp $
+# $Id: Makefile,v 1.6 1998/08/07 23:56:44 asami Exp $
 #
 
 DISTNAME=	tkirc1.202
 PKGNAME=	tkirc-1.202
-CATEGORIES=	net tk80
+CATEGORIES=	irc tk80
 MASTER_SITES=	ftp://ftp.informatik.uni-oldenburg.de/pub/tkirc/
 
 MAINTAINER=	brianfeldman@hotmail.com
diff --git a/irc/trickyirc/Makefile b/irc/trickyirc/Makefile
index 6552f5579523..7ec6a00aea91 100644
--- a/irc/trickyirc/Makefile
+++ b/irc/trickyirc/Makefile
@@ -3,12 +3,12 @@
 # Date created:				Jun 20th 1999
 # Whom:					Trolld
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/06/21 01:19:34 cpiazza Exp $
 #
 
 DISTNAME=	TrickyIRC-0.99
 PKGNAME=	trickyirc-0.99
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://www.leb.net/~troll/
 
 MAINTAINER=	troll@digitalspark.net
diff --git a/irc/xchat-devel/Makefile b/irc/xchat-devel/Makefile
index 7dc3fdb1bd31..5950da2adf97 100644
--- a/irc/xchat-devel/Makefile
+++ b/irc/xchat-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:			17 Nov 1998
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.12 1999/06/08 23:41:54 steve Exp $
+# $Id: Makefile,v 1.13 1999/06/21 01:53:27 cpiazza Exp $
 #
 
 DISTNAME=	xchat-0.9.9
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://xchat.linuxpower.org/files/ \
 		http://www.ozemail.com.au/~peterzelezny/xchat/ \
 		http://www.spyda.co.za/pub/linux/x11/irc/xchat/
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 7dc3fdb1bd31..5950da2adf97 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -3,11 +3,11 @@
 # Date created:			17 Nov 1998
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.12 1999/06/08 23:41:54 steve Exp $
+# $Id: Makefile,v 1.13 1999/06/21 01:53:27 cpiazza Exp $
 #
 
 DISTNAME=	xchat-0.9.9
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://xchat.linuxpower.org/files/ \
 		http://www.ozemail.com.au/~peterzelezny/xchat/ \
 		http://www.spyda.co.za/pub/linux/x11/irc/xchat/
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 7dc3fdb1bd31..5950da2adf97 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -3,11 +3,11 @@
 # Date created:			17 Nov 1998
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.12 1999/06/08 23:41:54 steve Exp $
+# $Id: Makefile,v 1.13 1999/06/21 01:53:27 cpiazza Exp $
 #
 
 DISTNAME=	xchat-0.9.9
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://xchat.linuxpower.org/files/ \
 		http://www.ozemail.com.au/~peterzelezny/xchat/ \
 		http://www.spyda.co.za/pub/linux/x11/irc/xchat/
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 7dc3fdb1bd31..5950da2adf97 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -3,11 +3,11 @@
 # Date created:			17 Nov 1998
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.12 1999/06/08 23:41:54 steve Exp $
+# $Id: Makefile,v 1.13 1999/06/21 01:53:27 cpiazza Exp $
 #
 
 DISTNAME=	xchat-0.9.9
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://xchat.linuxpower.org/files/ \
 		http://www.ozemail.com.au/~peterzelezny/xchat/ \
 		http://www.spyda.co.za/pub/linux/x11/irc/xchat/
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 7dc3fdb1bd31..5950da2adf97 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -3,11 +3,11 @@
 # Date created:			17 Nov 1998
 # Whom:				Jim Mock <jim@phrantic.phear.net>
 #
-# $Id: Makefile,v 1.12 1999/06/08 23:41:54 steve Exp $
+# $Id: Makefile,v 1.13 1999/06/21 01:53:27 cpiazza Exp $
 #
 
 DISTNAME=	xchat-0.9.9
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://xchat.linuxpower.org/files/ \
 		http://www.ozemail.com.au/~peterzelezny/xchat/ \
 		http://www.spyda.co.za/pub/linux/x11/irc/xchat/
diff --git a/irc/yagirc/Makefile b/irc/yagirc/Makefile
index c1b99db15606..8b67c9592d59 100644
--- a/irc/yagirc/Makefile
+++ b/irc/yagirc/Makefile
@@ -3,11 +3,11 @@
 # Date created:				6 July 1998
 # Whom:					mph
 #
-# $Id: Makefile,v 1.14 1999/03/15 18:30:05 nectar Exp $
+# $Id: Makefile,v 1.15 1999/05/29 04:42:25 steve Exp $
 #
 
 DISTNAME=	yagirc-0.66.1
-CATEGORIES=	net
+CATEGORIES=	irc
 MASTER_SITES=	http://www.elpaso.net/~spoon/yagirc/
 
 MAINTAINER=	mph@freebsd.org
diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index 5ac49f2f5f24..ede7e6e9e5f2 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -3,11 +3,11 @@
 # Date created:		19 Aug 1995
 # Whom:			jkh / pst
 #
-# $Id: Makefile,v 1.37 1999/02/22 03:20:03 steve Exp $
+# $Id: Makefile,v 1.38 1999/04/03 21:41:55 jseger Exp $
 #
 
 DISTNAME=	zircon-1.18.213
-CATEGORIES=	net tk80
+CATEGORIES=	irc tk80
 MASTER_SITES=	ftp://catless.ncl.ac.uk/pub/ \
 		ftp://ftp.dinoex.sub.org/pub/approved/
 
diff --git a/java/guavac/Makefile b/java/guavac/Makefile
index c6a6c842cd03..8bae814ae20c 100644
--- a/java/guavac/Makefile
+++ b/java/guavac/Makefile
@@ -3,11 +3,11 @@
 # Date created:        10 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.12 1999/05/04 12:00:21 asami Exp $
+# $Id: Makefile,v 1.13 1999/05/12 22:45:03 asami Exp $
 #
 
 DISTNAME=	guavac-1.2
-CATEGORIES=	lang
+CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.yggdrasil.com/pub/dist/devel/compilers/guavac/
 
 MAINTAINER=	nacai@iname.com
diff --git a/java/java-cup/Makefile b/java/java-cup/Makefile
index 3e1232dfff9c..3a3c9ee769e2 100644
--- a/java/java-cup/Makefile
+++ b/java/java-cup/Makefile
@@ -3,12 +3,12 @@
 # Date created:		10 May 1998
 # Whom:			nordwick@xcf.berkeley.edu
 #
-# $Id: Makefile,v 1.1.1.1 1999/04/11 02:51:41 jseger Exp $
+# $Id: Makefile,v 1.2 1999/05/20 14:05:05 kuriyama Exp $
 #
 
 DISTNAME=	java_cup_v10g
 PKGNAME=	java_cup-10.g
-CATEGORIES=	devel
+CATEGORIES=	java
 MASTER_SITES=	http://www.cs.princeton.edu/~appel/modern/java/CUP/
 
 MAINTAINER=	nordwick@xcf.berkeley.edu
diff --git a/java/java-tutorial/Makefile b/java/java-tutorial/Makefile
index 5a30cc35a18d..5c60aefa3a02 100644
--- a/java/java-tutorial/Makefile
+++ b/java/java-tutorial/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Tue Mar 23 10:18:20 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
-# $Id: Makefile,v 1.3 1999/05/05 15:23:20 fenner Exp $
+# $Id: Makefile,v 1.4 1999/05/06 00:14:03 taoka Exp $
 #
 
 DISTNAME=	tutorial
 PKGNAME=	jdk-tutorial-1.1.7
-CATEGORIES=	lang
+CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.javasoft.com/docs/
 
 MAINTAINER=	martti.kuparinen@ericsson.com
diff --git a/java/jdk-doc/Makefile b/java/jdk-doc/Makefile
index de6ed5022b58..c755f6222909 100644
--- a/java/jdk-doc/Makefile
+++ b/java/jdk-doc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
-# $Id: Makefile,v 1.4 1999/05/06 00:13:56 taoka Exp $
+# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $
 #
 
 DISTNAME=	jdk118-doc
 PKGNAME=	jdk-doc-1.1.8
-CATEGORIES=	lang
+CATEGORIES=	java
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
diff --git a/java/jdk-tutorial/Makefile b/java/jdk-tutorial/Makefile
index 5a30cc35a18d..5c60aefa3a02 100644
--- a/java/jdk-tutorial/Makefile
+++ b/java/jdk-tutorial/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Tue Mar 23 10:18:20 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
-# $Id: Makefile,v 1.3 1999/05/05 15:23:20 fenner Exp $
+# $Id: Makefile,v 1.4 1999/05/06 00:14:03 taoka Exp $
 #
 
 DISTNAME=	tutorial
 PKGNAME=	jdk-tutorial-1.1.7
-CATEGORIES=	lang
+CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.javasoft.com/docs/
 
 MAINTAINER=	martti.kuparinen@ericsson.com
diff --git a/java/jdk/Makefile b/java/jdk/Makefile
index f80c6256eaa9..a911566e1714 100644
--- a/java/jdk/Makefile
+++ b/java/jdk/Makefile
@@ -3,11 +3,11 @@
 # Date created:		Feb, 8, 1998
 # Whom:			Nate Williams <nate@FreeBSD.org>
 #
-# $Id: Makefile,v 1.21 1999/06/08 21:57:38 steve Exp $
+# $Id: Makefile,v 1.22 1999/06/08 23:13:20 steve Exp $
 #
 
 DISTNAME=	jdk-${JDK_VERSION}
-CATEGORIES=	lang devel
+CATEGORIES=	java devel
 #MASTER_SITES=	ftp://ftp.nuxi.com/pub/FreeBSD/JDK/ \
 MASTER_SITES=		http://www.freebsd.org/java/
 
diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile
index de6ed5022b58..c755f6222909 100644
--- a/java/jdk11-doc/Makefile
+++ b/java/jdk11-doc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
-# $Id: Makefile,v 1.4 1999/05/06 00:13:56 taoka Exp $
+# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $
 #
 
 DISTNAME=	jdk118-doc
 PKGNAME=	jdk-doc-1.1.8
-CATEGORIES=	lang
+CATEGORIES=	java
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile
index f80c6256eaa9..a911566e1714 100644
--- a/java/jdk11/Makefile
+++ b/java/jdk11/Makefile
@@ -3,11 +3,11 @@
 # Date created:		Feb, 8, 1998
 # Whom:			Nate Williams <nate@FreeBSD.org>
 #
-# $Id: Makefile,v 1.21 1999/06/08 21:57:38 steve Exp $
+# $Id: Makefile,v 1.22 1999/06/08 23:13:20 steve Exp $
 #
 
 DISTNAME=	jdk-${JDK_VERSION}
-CATEGORIES=	lang devel
+CATEGORIES=	java devel
 #MASTER_SITES=	ftp://ftp.nuxi.com/pub/FreeBSD/JDK/ \
 MASTER_SITES=		http://www.freebsd.org/java/
 
diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile
index de6ed5022b58..c755f6222909 100644
--- a/java/jdk12-doc/Makefile
+++ b/java/jdk12-doc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
-# $Id: Makefile,v 1.4 1999/05/06 00:13:56 taoka Exp $
+# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $
 #
 
 DISTNAME=	jdk118-doc
 PKGNAME=	jdk-doc-1.1.8
-CATEGORIES=	lang
+CATEGORIES=	java
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
diff --git a/java/jdk13-doc/Makefile b/java/jdk13-doc/Makefile
index de6ed5022b58..c755f6222909 100644
--- a/java/jdk13-doc/Makefile
+++ b/java/jdk13-doc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
-# $Id: Makefile,v 1.4 1999/05/06 00:13:56 taoka Exp $
+# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $
 #
 
 DISTNAME=	jdk118-doc
 PKGNAME=	jdk-doc-1.1.8
-CATEGORIES=	lang
+CATEGORIES=	java
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
diff --git a/java/jdk14-doc/Makefile b/java/jdk14-doc/Makefile
index de6ed5022b58..c755f6222909 100644
--- a/java/jdk14-doc/Makefile
+++ b/java/jdk14-doc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
-# $Id: Makefile,v 1.4 1999/05/06 00:13:56 taoka Exp $
+# $Id: Makefile,v 1.5 1999/06/21 02:56:36 cpiazza Exp $
 #
 
 DISTNAME=	jdk118-doc
 PKGNAME=	jdk-doc-1.1.8
-CATEGORIES=	lang
+CATEGORIES=	java
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
diff --git a/java/jfc/Makefile b/java/jfc/Makefile
index f7fd32dba71b..ac483aa2a062 100644
--- a/java/jfc/Makefile
+++ b/java/jfc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		17 May 1999
 # Whom:			Jun Kuriyama <kuriyama@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/09 13:08:40 kuriyama Exp $
+# $Id: Makefile,v 1.2 1999/06/23 15:26:12 kuriyama Exp $
 #
 
 DISTNAME=	swing11
 PKGNAME=	jfc-1.1
-CATEGORIES=	lang
+CATEGORIES=	java
 MASTER_SITES=	http://java.sun.com/products/jfc/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index 5f546a5b3932..05b4907e3cad 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -3,11 +3,11 @@
 # Date created:         09 December 1998
 # Whom:                 Matthew Dillon <dillon@backplane.com>
 #
-# $Id: Makefile,v 1.9 1999/03/10 02:32:59 archie Exp $
+# $Id: Makefile,v 1.10 1999/03/22 06:40:16 archie Exp $
 #
 
 DISTNAME=	jikes-0.47
-CATEGORIES=	lang
+CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.whistle.com/pub/archie/misc/
 
 MAINTAINER=	dillon@backplane.com
diff --git a/java/jsdk/Makefile b/java/jsdk/Makefile
index a5dc342b1a53..aca0c9c2be3e 100644
--- a/java/jsdk/Makefile
+++ b/java/jsdk/Makefile
@@ -3,12 +3,12 @@
 # Date created:		1999/05/29
 # Whom:			Kensaku Masuda <greg@greg.rim.or.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/06/23 15:05:39 kuriyama Exp $
 #
 
 DISTNAME=	jsdk20-solaris2-sparc
 PKGNAME=	jsdk-2.0
-CATEGORIES=	lang
+CATEGORIES=	java
 MASTER_SITES=	
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index 3d77b707cd71..c17fc47bb560 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -3,11 +3,11 @@
 # Date created:         20 February 1995
 # Whom:                 Tim Wilkinson <tim@sarc.city.ac.uk>
 #
-# $Id: Makefile,v 1.40 1999/03/08 07:28:30 asami Exp $
+# $Id: Makefile,v 1.41 1999/04/10 01:41:01 archie Exp $
 #
 
 DISTNAME=	kaffe-1.0.b4
-CATEGORIES=	lang
+CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.transvirtual.com/pub/kaffe/
 
 MAINTAINER=	xaa@xaa.iae.nl
diff --git a/java/shujit/Makefile b/java/shujit/Makefile
index 923694df6c08..d70c8a17a44c 100644
--- a/java/shujit/Makefile
+++ b/java/shujit/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 April 1999
 # Whom:			jake@checker.org
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/10 23:56:44 steve Exp $
+# $Id: Makefile,v 1.2 1999/06/14 16:57:33 steve Exp $
 #
 
 DISTNAME=	shujit-0.2.10
-CATEGORIES=	lang
+CATEGORIES=	java
 MASTER_SITES=	http://www.shudo.net/jit/dist/
 
 MAINTAINER=	jake@checker.org
diff --git a/java/tya/Makefile b/java/tya/Makefile
index 59df8a9176eb..792ab6a24189 100644
--- a/java/tya/Makefile
+++ b/java/tya/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 May 1999
 # Whom:			jake@checker.org
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/09 00:59:02 steve Exp $
+# $Id: Makefile,v 1.1.1.1 1999/06/10 08:10:14 steve Exp $
 #
 
 DISTNAME=	tya13v2
 PKGNAME=	tya-1.3v2
-CATEGORIES=	lang
+CATEGORIES=	java
 MASTER_SITES=	ftp://gonzalez.cyberus.ca/pub/Linux/java/
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index cb79f8dec889..f991c9180ce9 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -3,11 +3,11 @@
 # Date created:		11 September 1998
 # Whom:			jabley@clear.co.nz
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/12/24 06:36:08 steve Exp $
 #
 
 DISTNAME=	Xfstt-0.9.10
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 MASTER_SITES=	$(MASTER_SITE_SUNSITE)
 MASTER_SITE_SUBDIR=	X11/fonts
 EXTRACT_SUFX=	.tgz
diff --git a/x11-servers/XttXF86srv-3DLabs/Makefile b/x11-servers/XttXF86srv-3DLabs/Makefile
index 72c9c3c30229..f604d9ecbe49 100644
--- a/x11-servers/XttXF86srv-3DLabs/Makefile
+++ b/x11-servers/XttXF86srv-3DLabs/Makefile
@@ -3,12 +3,12 @@
 # Date created:		13 Dec 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/15 09:49:24 asami Exp $
+# $Id: Makefile,v 1.3 1999/04/02 08:27:56 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-3DLabs-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile
index 823bb3fbabae..b1f4f33ddb26 100644
--- a/x11-servers/XttXF86srv-8514/Makefile
+++ b/x11-servers/XttXF86srv-8514/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.7 1999/04/02 08:27:59 taoka Exp $
+# $Id: Makefile,v 1.8 1999/06/13 07:17:36 simokawa Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-8514-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile
index 7de3a333439b..d411d8d57ab7 100644
--- a/x11-servers/XttXF86srv-AGX/Makefile
+++ b/x11-servers/XttXF86srv-AGX/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.7 1999/04/02 08:28:00 taoka Exp $
+# $Id: Makefile,v 1.8 1999/06/13 07:17:38 simokawa Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-AGX-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile
index b45770bd9b56..2dac0b8147b7 100644
--- a/x11-servers/XttXF86srv-I128/Makefile
+++ b/x11-servers/XttXF86srv-I128/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/15 09:49:27 asami Exp $
+# $Id: Makefile,v 1.7 1999/04/02 08:28:02 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-I128-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile
index a5cdcd042c56..ae8b867e8aef 100644
--- a/x11-servers/XttXF86srv-Mach32/Makefile
+++ b/x11-servers/XttXF86srv-Mach32/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.7 1999/04/02 08:28:04 taoka Exp $
+# $Id: Makefile,v 1.8 1999/06/13 07:17:39 simokawa Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-Mach32-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile
index 6b43e982084e..8678ab378aed 100644
--- a/x11-servers/XttXF86srv-Mach64/Makefile
+++ b/x11-servers/XttXF86srv-Mach64/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/15 09:49:28 asami Exp $
+# $Id: Makefile,v 1.7 1999/04/02 08:28:06 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-Mach64-1.2.1
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile
index 2c5f0f245214..b164b7c05ce3 100644
--- a/x11-servers/XttXF86srv-Mach8/Makefile
+++ b/x11-servers/XttXF86srv-Mach8/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.7 1999/04/02 08:28:08 taoka Exp $
+# $Id: Makefile,v 1.8 1999/06/13 07:17:40 simokawa Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-Mach8-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile
index f708f7fcbe46..ada7576a113b 100644
--- a/x11-servers/XttXF86srv-Mono/Makefile
+++ b/x11-servers/XttXF86srv-Mono/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/15 09:49:29 asami Exp $
+# $Id: Makefile,v 1.7 1999/04/02 08:28:10 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-Mono-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile
index 0e179a924d85..349824e479a7 100644
--- a/x11-servers/XttXF86srv-P9000/Makefile
+++ b/x11-servers/XttXF86srv-P9000/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/15 09:49:30 asami Exp $
+# $Id: Makefile,v 1.7 1999/04/02 08:28:13 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-P9000-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile
index 61667bcca509..716202dd2df4 100644
--- a/x11-servers/XttXF86srv-S3/Makefile
+++ b/x11-servers/XttXF86srv-S3/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/15 09:49:30 asami Exp $
+# $Id: Makefile,v 1.7 1999/04/02 08:28:14 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-S3-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile
index 6fac56488637..da681730a1dd 100644
--- a/x11-servers/XttXF86srv-S3V/Makefile
+++ b/x11-servers/XttXF86srv-S3V/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/15 09:49:31 asami Exp $
+# $Id: Makefile,v 1.7 1999/04/02 08:28:17 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-S3V-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile
index 8871a0446700..b8cad1f0d6bc 100644
--- a/x11-servers/XttXF86srv-SVGA/Makefile
+++ b/x11-servers/XttXF86srv-SVGA/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.7 1999/01/15 09:49:32 asami Exp $
+# $Id: Makefile,v 1.8 1999/04/02 08:28:18 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-SVGA-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile
index 36f8c9a5d074..b484bc7c65b3 100644
--- a/x11-servers/XttXF86srv-VGA16/Makefile
+++ b/x11-servers/XttXF86srv-VGA16/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.7 1999/04/02 08:28:20 taoka Exp $
+# $Id: Makefile,v 1.8 1999/06/13 07:17:42 simokawa Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-VGA16-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile
index 17392af89f01..763e58ae43ab 100644
--- a/x11-servers/XttXF86srv-W32/Makefile
+++ b/x11-servers/XttXF86srv-W32/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.7 1999/04/02 08:28:20 taoka Exp $
+# $Id: Makefile,v 1.8 1999/06/13 07:17:42 simokawa Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-W32-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index 526b4071a02a..9b09b7f0e78b 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.17 1999/03/19 22:38:55 asami Exp $
+# $Id: Makefile,v 1.18 1999/04/02 08:28:21 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME?=	xtt-common-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
 		http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/1.x/1.2/
diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile
index 963d08624897..5d8f73ebc88a 100644
--- a/x11-servers/XttXF86srv-xfs/Makefile
+++ b/x11-servers/XttXF86srv-xfs/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/15 09:49:37 asami Exp $
+# $Id: Makefile,v 1.7 1999/04/02 08:28:31 taoka Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-xfs-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/XttXF98srv-EGC/Makefile b/x11-servers/XttXF98srv-EGC/Makefile
index 2704c05dbab8..fbc9a530acb4 100644
--- a/x11-servers/XttXF98srv-EGC/Makefile
+++ b/x11-servers/XttXF98srv-EGC/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:00 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:24 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98EGC-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-GA968/Makefile b/x11-servers/XttXF98srv-GA968/Makefile
index a7a4f0f29ac5..fc5a747a1945 100644
--- a/x11-servers/XttXF98srv-GA968/Makefile
+++ b/x11-servers/XttXF98srv-GA968/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:01 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:26 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98GA968-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-GANBWAP/Makefile b/x11-servers/XttXF98srv-GANBWAP/Makefile
index ac9b81a8b19c..00055f64a7ae 100644
--- a/x11-servers/XttXF98srv-GANBWAP/Makefile
+++ b/x11-servers/XttXF98srv-GANBWAP/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:02 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:29 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98GANBWAP-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-MGA/Makefile b/x11-servers/XttXF98srv-MGA/Makefile
index fd8b1d382bb7..10cebd950a92 100644
--- a/x11-servers/XttXF98srv-MGA/Makefile
+++ b/x11-servers/XttXF98srv-MGA/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:02 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:31 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98MGA-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-NEC480/Makefile b/x11-servers/XttXF98srv-NEC480/Makefile
index 25c61ea6a226..2424f8d8f199 100644
--- a/x11-servers/XttXF98srv-NEC480/Makefile
+++ b/x11-servers/XttXF98srv-NEC480/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:03 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:33 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98NEC480-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-NECS3/Makefile b/x11-servers/XttXF98srv-NECS3/Makefile
index 18125aec49c2..9ca2e65e530c 100644
--- a/x11-servers/XttXF98srv-NECS3/Makefile
+++ b/x11-servers/XttXF98srv-NECS3/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:03 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:36 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98NECS3-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-NKVNEC/Makefile b/x11-servers/XttXF98srv-NKVNEC/Makefile
index 6f3dd5ecb071..ff863859c102 100644
--- a/x11-servers/XttXF98srv-NKVNEC/Makefile
+++ b/x11-servers/XttXF98srv-NKVNEC/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:03 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:39 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98NKVNEC-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-PWLB/Makefile b/x11-servers/XttXF98srv-PWLB/Makefile
index f3a2afb2ece5..d9ce8515bf45 100644
--- a/x11-servers/XttXF98srv-PWLB/Makefile
+++ b/x11-servers/XttXF98srv-PWLB/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:04 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:42 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98PWLB-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-PWSKB/Makefile b/x11-servers/XttXF98srv-PWSKB/Makefile
index 4bbd0d03c2e6..c14802c162cb 100644
--- a/x11-servers/XttXF98srv-PWSKB/Makefile
+++ b/x11-servers/XttXF98srv-PWSKB/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:05 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:45 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98PWSKB-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-SVGA/Makefile b/x11-servers/XttXF98srv-SVGA/Makefile
index 508f9103436a..0b3db2cd030c 100644
--- a/x11-servers/XttXF98srv-SVGA/Makefile
+++ b/x11-servers/XttXF98srv-SVGA/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:06 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:49 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98SVGA-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-TGUI/Makefile b/x11-servers/XttXF98srv-TGUI/Makefile
index 50fa57889daf..8dca8080ece0 100644
--- a/x11-servers/XttXF98srv-TGUI/Makefile
+++ b/x11-servers/XttXF98srv-TGUI/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:06 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:51 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98TGUI-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-WABEP/Makefile b/x11-servers/XttXF98srv-WABEP/Makefile
index ae34535ab50c..e22af09b5391 100644
--- a/x11-servers/XttXF98srv-WABEP/Makefile
+++ b/x11-servers/XttXF98srv-WABEP/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:07 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:54 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98WABEP-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-WABS/Makefile b/x11-servers/XttXF98srv-WABS/Makefile
index beca5c876ed1..e6ab6b021e0d 100644
--- a/x11-servers/XttXF98srv-WABS/Makefile
+++ b/x11-servers/XttXF98srv-WABS/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:07 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:57 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98WABS-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
diff --git a/x11-servers/XttXF98srv-WSNA/Makefile b/x11-servers/XttXF98srv-WSNA/Makefile
index 45050d8c912f..89ec31b3bb36 100644
--- a/x11-servers/XttXF98srv-WSNA/Makefile
+++ b/x11-servers/XttXF98srv-WSNA/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
-# $Id: Makefile,v 1.5 1999/04/13 03:16:08 simokawa Exp $
+# $Id: Makefile,v 1.6 1999/05/17 15:19:58 sada Exp $
 #
 
 DISTNAME=	xc
 PKGNAME=	xtt-98WSNA-${VERSION}.${PATCHLEVEL}
-CATEGORIES=	x11
+CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp