Move "FWF Xaw3d auis blt iv lesstif neXtaw pmw pygtk qt qt133 qt140

slingshot tix tk41 tk42 tk80 tk81 tkstep80 v xbae xforms xview-clients
xview-config xview-lib" from x11 to x11-toolkits.

31 files changed, 64 insertions, 64 deletions

diff --git a/x11-toolkits/FWF/Makefile b/x11-toolkits/FWF/Makefile
index 5478d085625e..28c70852a258 100644
--- a/x11-toolkits/FWF/Makefile
+++ b/x11-toolkits/FWF/Makefile
@@ -3,11 +3,11 @@
 # Date created:		14 July 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.10 1997/11/22 21:42:31 jseger Exp $
+# $Id: Makefile,v 1.11 1998/04/26 12:50:24 jseger Exp $
 #
 
 DISTNAME=	fwf-4.0
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SUNSITE}	\
 		ftp://ftp.let.rug.nl/pub/FWF/
 MASTER_SITE_SUBDIR=libs/X/fwf
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 06f075f14d4c..11300b94fff0 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -3,11 +3,11 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.15 1997/12/25 22:29:48 asami Exp $
+# $Id: Makefile,v 1.16 1997/12/29 13:29:24 asami Exp $
 #
 
 DISTNAME=	Xaw3d-1.3
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	widgets/Xaw3d/R6.1
 
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index f6f3dc46d5e4..75ff72f089f8 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -3,12 +3,12 @@
 # Date created:		9 July 1998
 # Whom:			Kenjiro Cho <kjc@csl.sony.co.jp>
 #
-# $Id: Makefile,v 1.16 1997/11/22 11:22:00 asami Exp $
+# $Id: Makefile,v 1.17 1998/07/12 17:40:31 kjc Exp $
 #
 
 DISTNAME=	BLT2.4c
 PKGNAME=	blt-2.4c
-CATEGORIES=	x11 tk80
+CATEGORIES=	x11-toolkits tk80
 MASTER_SITES=	ftp://ftp.tcltk.com/pub/blt/
 
 MAINTAINER=	kjc@csl.sony.co.jp
diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index c117d781192d..40a0d86a0613 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -3,11 +3,11 @@
 # Date created:		23.sept.1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.14 1997/02/13 00:40:55 asami Exp $
+# $Id: Makefile,v 1.15 1997/03/02 14:47:31 asami Exp $
 #
 
 DISTNAME=	iv-3.1
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://interviews.stanford.edu/pub/
 DISTFILES=	3.1.tar.Z
 
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index aa432d3ed0bb..4aec973c361f 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -3,11 +3,11 @@
 # Date created:		December 10, 1996
 # Whom:			1wardd@airmail.net
 #
-# $Id: Makefile,v 1.20 1998/07/01 11:35:32 tg Exp $
+# $Id: Makefile,v 1.21 1998/08/05 09:31:43 asami Exp $
 #
 
 DISTNAME=	lesstif-0.85
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/  \
 		ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/
 
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 2edd58f2b2f0..ba923bfccdb3 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -3,11 +3,11 @@
 # Date created:		16 January 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1997/08/13 09:09:21 asami Exp $
+# $Id: Makefile,v 1.6 1997/11/06 08:55:35 tg Exp $
 #
 
 DISTNAME=	neXtaw-0.5.1
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.inf.ufrgs.br/~kojima/nextaw/
 EXTRACT_SUFX=	.tar.gz.bin
 
diff --git a/x11-toolkits/pmw/Makefile b/x11-toolkits/pmw/Makefile
index dc15d5d8d02c..647c67bd40fa 100644
--- a/x11-toolkits/pmw/Makefile
+++ b/x11-toolkits/pmw/Makefile
@@ -3,11 +3,11 @@
 # Date created:		03 June 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/05 06:50:32 tg Exp $
+# $Id: Makefile,v 1.2 1998/06/27 05:19:52 asami Exp $
 
 DISTNAME=	Pmw.0.7
 PKGNAME=	pmw-0.7
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.dscpl.com.au/pub/pmw/
 
 MAINTAINER=	tg@FreeBSD.ORG
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index dc15d5d8d02c..647c67bd40fa 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -3,11 +3,11 @@
 # Date created:		03 June 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/06/05 06:50:32 tg Exp $
+# $Id: Makefile,v 1.2 1998/06/27 05:19:52 asami Exp $
 
 DISTNAME=	Pmw.0.7
 PKGNAME=	pmw-0.7
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.dscpl.com.au/pub/pmw/
 
 MAINTAINER=	tg@FreeBSD.ORG
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 175fd0f1083e..42a8069cc553 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -3,12 +3,12 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1998/08/07 07:48:15 tg Exp $
+# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
 #
 
 DISTNAME=	pygtk-0.4.5
 PKGNAME=	py-gtk-0.4.5
-CATEGORIES=	x11 python
+CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
 		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/python/ \
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 175fd0f1083e..42a8069cc553 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -3,12 +3,12 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1998/08/07 07:48:15 tg Exp $
+# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
 #
 
 DISTNAME=	pygtk-0.4.5
 PKGNAME=	py-gtk-0.4.5
-CATEGORIES=	x11 python
+CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
 		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/python/ \
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 175fd0f1083e..42a8069cc553 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -3,12 +3,12 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1998/08/07 07:48:15 tg Exp $
+# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
 #
 
 DISTNAME=	pygtk-0.4.5
 PKGNAME=	py-gtk-0.4.5
-CATEGORIES=	x11 python
+CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
 		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/python/ \
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 175fd0f1083e..42a8069cc553 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -3,12 +3,12 @@
 # Date created:		30 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1998/08/07 07:48:15 tg Exp $
+# $Id: Makefile,v 1.7 1998/08/07 19:20:19 asami Exp $
 #
 
 DISTNAME=	pygtk-0.4.5
 PKGNAME=	py-gtk-0.4.5
-CATEGORIES=	x11 python
+CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://ftp.daa.com.au/pub/james/python/ \
 		ftp://ftp.gimp.org/pub/gtk/python/ \
 		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/python/ \
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index d7e6b5a2d3b1..367ee14d4296 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/05 09:31:46 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index d7e6b5a2d3b1..367ee14d4296 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/05 09:31:46 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index d7e6b5a2d3b1..367ee14d4296 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/05 09:31:46 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index d7e6b5a2d3b1..367ee14d4296 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/05 09:31:46 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index d7e6b5a2d3b1..367ee14d4296 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/05 09:31:46 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index d7e6b5a2d3b1..367ee14d4296 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/05 09:31:46 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index d7e6b5a2d3b1..367ee14d4296 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.19 1998/07/21 14:05:32 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/05 09:31:46 asami Exp $
 #
 
 DISTNAME=	qt-${MAJ}.${MIN}
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	andreas@FreeBSD.ORG
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index 338d5d3916ba..c383fc0101b8 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -3,12 +3,12 @@
 # Date created:        5 March 1997
 # Whom:                Pedro Giffuni
 #
-# $Id: Makefile,v 1.2 1998/02/20 18:39:58 steve Exp $
+# $Id: Makefile,v 1.3 1998/08/05 09:31:48 asami Exp $
 #
 
 DISTNAME=	SlingShot2.1
 PKGNAME=	slingshot-2.1
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/X11/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 465aae118271..8546beee4b17 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -3,12 +3,12 @@
 # Date created:		22 December 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.13 1997/12/02 10:55:42 tg Exp $
+# $Id: Makefile,v 1.15 1998/03/17 07:55:17 tg Exp $
 #
 
 DISTNAME=	Tix4.1.0.006
 PKGNAME=	tix-4.1.0.006
-CATEGORIES=	x11 tk80
+CATEGORIES=	x11-toolkits tk80
 MASTER_SITES=	ftp://ftp.xpi.com/pub/
 
 MAINTAINER=	ports@FreeBSD.ORG
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index af7ed1b03147..25d6b897ccd0 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -3,12 +3,12 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.9 1998/07/03 23:07:13 steve Exp $
+# $Id: Makefile,v 1.10 1998/07/27 21:36:06 hoek Exp $
 #
 
 DISTNAME=	tk8.0p2
 PKGNAME=	tk-8.0.2
-CATEGORIES=	x11 tk80
+CATEGORIES=	x11-toolkits tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 
 MAINTAINER=	jkh@Freebsd.ORG
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 54158bd12ee9..0d9aae32eaa9 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -3,12 +3,12 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1998/07/12 21:07:21 jdp Exp $
+# $Id: Makefile,v 1.13 1998/07/27 21:36:07 hoek Exp $
 #
 
 DISTNAME=	tk8.1a2
 PKGNAME=	tk-8.1.a2
-CATEGORIES=	x11 tk81
+CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
 MAINTAINER=	jseger@FreeBSD.ORG
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 54158bd12ee9..0d9aae32eaa9 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -3,12 +3,12 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1998/07/12 21:07:21 jdp Exp $
+# $Id: Makefile,v 1.13 1998/07/27 21:36:07 hoek Exp $
 #
 
 DISTNAME=	tk8.1a2
 PKGNAME=	tk-8.1.a2
-CATEGORIES=	x11 tk81
+CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
 MAINTAINER=	jseger@FreeBSD.ORG
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 54158bd12ee9..0d9aae32eaa9 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -3,12 +3,12 @@
 # Date created:		19 August 1997
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1998/07/12 21:07:21 jdp Exp $
+# $Id: Makefile,v 1.13 1998/07/27 21:36:07 hoek Exp $
 #
 
 DISTNAME=	tk8.1a2
 PKGNAME=	tk-8.1.a2
-CATEGORIES=	x11 tk81
+CATEGORIES=	x11-toolkits tk81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
 
 MAINTAINER=	jseger@FreeBSD.ORG
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index be7a92c03c0d..d0d6a09ba309 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -3,12 +3,12 @@
 # Date created:		06 November 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.9 1998/07/03 23:07:17 steve Exp $
+# $Id: Makefile,v 1.10 1998/07/27 21:36:08 hoek Exp $
 #
 
 DISTNAME=	tk8.0p2
 PKGNAME=	tkstep-8.0p2
-CATEGORIES=	x11 tk80
+CATEGORIES=	x11-toolkits tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 
 PATCH_SITES=	http://rhein-zeitung.de/~ograf/files/ \
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 419f13f3350b..ee06ec18ebb5 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -3,11 +3,11 @@
 # Date created:         8 Feb 1998
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.5 1998/07/25 12:51:12 asami Exp $
+# $Id: Makefile,v 1.6 1998/08/05 09:31:48 asami Exp $
 #
 
 DISTNAME=	v-1.19
-CATEGORIES=	x11 devel graphics
+CATEGORIES=	x11-toolkits devel graphics
 MASTER_SITES=	ftp://objectcentral.com/
 
 MAINTAINER=	dburr@FreeBSD.ORG
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index fb6abdeebb3f..cdf25431a7e4 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -5,12 +5,12 @@
 # With some
 # modifications from:	Andreas Klemm <andreas@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1998/04/09 08:22:47 tg Exp $
+# $Id: Makefile,v 1.3 1998/04/14 04:20:37 asami Exp $
 #
 
 DISTNAME=	Xbae-4.6.2
 PKGNAME=	xbae-4.6.2
-CATEGORIES=	x11 math
+CATEGORIES=	x11-toolkits math
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	widgets/motif
 
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 824d01b9d4ee..4102e3db46d1 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -3,12 +3,12 @@
 # Date created:		28 March 1997
 # Whom:			gena
 #
-# $Id: Makefile,v 1.16 1998/05/12 06:34:18 tg Exp $
+# $Id: Makefile,v 1.17 1998/08/05 09:31:50 asami Exp $
 #
 
 DISTNAME=	bxform-088
 PKGNAME=	xforms-0.88.1
-CATEGORIES=	graphics x11
+CATEGORIES=	graphics x11-toolkits
 MASTER_SITES=	ftp://bragg.phys.uwm.edu/pub/xforms/freeBSD/ \
 		ftp://ftp.via.ecp.fr/pub2/xforms/freeBSD/ \
 		ftp://ftp.st.ryukoku.ac.jp/pub/X11/xforms/freeBSD/
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index d16de02b701c..334174a98172 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -3,16 +3,16 @@
 # Date created:         22 November 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp $
+# $Id: Makefile,v 1.12 1998/08/05 09:31:52 asami Exp $
 #
 
 DISTNAME=	xview-clients
 PKGNAME=	xview-clients-3.2.1
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 
-DEPENDS=        ${PORTSDIR}/x11/xview-lib
+DEPENDS=        ${PORTSDIR}/x11-toolkits/xview-lib
 
-WRKSRC=      	${PORTSDIR}/x11/xview-config/work/xview3.2p1-X11R6/clients
+WRKSRC=      	${PORTSDIR}/x11-toolkits/xview-config/work/xview3.2p1-X11R6/clients
 NO_WRKDIR=	yes
 USE_X_PREFIX=	yes
 
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index d5371fb1470a..4ff07503adfd 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -3,12 +3,12 @@
 # Date created:         22 November 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.8 1997/10/28 12:28:08 tg Exp $
+# $Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp $
 #
 
 DISTNAME=	xview3.2p1-X11R6
 PKGNAME=	xview-config-3.2.1
-CATEGORIES=	x11
+CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	ports@FreeBSD.ORG