Break up the "plan9" category -- all the ports are where they belong, and

"plan9" is a virtual category now.

Reviewed by:	the ports list

14 files changed, 30 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index ff55921cc6f4..956309cbfd61 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.40 1998/12/12 07:41:46 asami Exp $
+# $Id: Makefile,v 1.41 1998/12/28 12:35:10 asami Exp $
 #
 
 SUBDIR += archivers
@@ -27,7 +27,6 @@ SUBDIR += mbone
 SUBDIR += misc
 SUBDIR += net
 SUBDIR += news
-SUBDIR += plan9
 SUBDIR += print
 SUBDIR += russian
 SUBDIR += security
diff --git a/editors/Makefile b/editors/Makefile
index a7839d048d5b..00b6578bac24 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.62 1998/12/20 05:24:18 msmith Exp $
+# $Id: Makefile,v 1.63 1999/01/07 12:12:03 asami Exp $
 #
 
     SUBDIR += apel-emacs
@@ -26,6 +26,7 @@
     SUBDIR += nvi-m17n
     SUBDIR += nvi-perl
     SUBDIR += offix-editor
+    SUBDIR += sam
     SUBDIR += staroffice
     SUBDIR += sted
     SUBDIR += textedit
@@ -36,6 +37,7 @@
     SUBDIR += vilearn
     SUBDIR += vim4
     SUBDIR += vim5
+    SUBDIR += wily
     SUBDIR += wordperfect
     SUBDIR += xcoral
     SUBDIR += xed
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 16da55400a01..bac42bd9c179 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.5 1998/11/21 17:18:16 steve Exp $
+# $Id: Makefile,v 1.6 1998/11/28 09:07:17 asami Exp $
 #
 
 DISTNAME=	sam
 PKGNAME=	sam-4.3
-CATEGORIES=	plan9 editors
+CATEGORIES=	editors plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 EXTRACT_SUFX=	.msg.gz
 
diff --git a/editors/wily/Makefile b/editors/wily/Makefile
index 35023eeb9ea2..caf5a35a64e6 100644
--- a/editors/wily/Makefile
+++ b/editors/wily/Makefile
@@ -3,11 +3,11 @@
 # Date created:   	23 September 1997
 # Whom: 		koshy
 #
-# $Id: Makefile,v 1.7 1998/10/16 03:17:47 jseger Exp $
+# $Id: Makefile,v 1.8 1998/11/28 09:07:19 asami Exp $
 #
 
 DISTNAME=	wily-0.13.41
-CATEGORIES=	plan9 editors
+CATEGORIES=	editors plan9
 MASTER_SITES=	ftp://ftp.northsea.com/pub/plan9_unix/wily/src/ \
 		ftp://ftp.cs.york.ac.uk/pub/mhw/wily/src/ \
 		ftp://ftp.cs.su.oz.au/gary/wily/src/
diff --git a/shells/Makefile b/shells/Makefile
index 8165d8a0c924..1aa7b1615e53 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,10 +1,11 @@
-# $Id: Makefile,v 1.15 1998/12/07 02:22:12 asami Exp $
+# $Id: Makefile,v 1.16 1998/12/24 08:02:30 steve Exp $
 #
 
     SUBDIR += bash1
     SUBDIR += bash2
     SUBDIR += es
     SUBDIR += pdksh
+    SUBDIR += rc
     SUBDIR += scsh
     SUBDIR += tcsh
     SUBDIR += zsh
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index de5e2bd12d2c..16b9fad62dc4 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.4 1998/10/04 00:56:48 steve Exp $
+# $Id: Makefile,v 1.5 1998/11/21 17:18:16 steve Exp $
 #
 
 DISTNAME=       rc-1.5betadev-1
 PKGNAME=	rc-1.5b1
-CATEGORIES=	plan9 shells
+CATEGORIES=	shells plan9
 MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/rc/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index c38c8657827b..23388743e619 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -1,6 +1,7 @@
-# $Id: Makefile,v 1.2 1998/09/09 08:11:49 tg Exp $
+# $Id: Makefile,v 1.3 1998/12/13 13:53:49 jseger Exp $
 #
 
+    SUBDIR += Xg
     SUBDIR += etlfonts
     SUBDIR += freefonts
     SUBDIR += getbdf
diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile
index a684a3a2c72b..14379ade4fd0 100644
--- a/x11-fonts/Xg/Makefile
+++ b/x11-fonts/Xg/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.5 1998/08/05 09:31:36 asami Exp $
+# $Id: Makefile,v 1.6 1998/11/21 17:18:16 steve Exp $
 #
 
 DISTNAME=	libXg.utf.fonts
 PKGNAME=	libXgFonts-1.0
-CATEGORIES=	plan9 x11-fonts
+CATEGORIES=	x11-fonts plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/x11-wm/9menu/Makefile b/x11-wm/9menu/Makefile
index 593f4e9d54d9..d59eb64b4d58 100644
--- a/x11-wm/9menu/Makefile
+++ b/x11-wm/9menu/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.6 1998/11/21 17:18:12 steve Exp $
+# $Id: Makefile,v 1.7 1998/11/28 09:07:16 asami Exp $
 #
 
 DISTNAME=	9menu-1.5
-CATEGORIES=	plan9 misc
+CATEGORIES=	x11-wm plan9
 MASTER_SITES=	ftp://ftp.mathcs.emory.edu/pub/arnold/
 EXTRACT_SUFX=	.shar.gz
 
diff --git a/x11-wm/9wm/Makefile b/x11-wm/9wm/Makefile
index eba4dd4d6b68..c84ad3e6b47c 100644
--- a/x11-wm/9wm/Makefile
+++ b/x11-wm/9wm/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.5 1998/10/04 00:56:47 steve Exp $
+# $Id: Makefile,v 1.6 1998/11/21 17:18:15 steve Exp $
 #
 
 DISTNAME=	9wm-1.1
-CATEGORIES=	plan9 x11-wm
+CATEGORIES=	x11-wm plan9
 MASTER_SITES=	ftp://ftp.mathcs.emory.edu/pub/arnold/
 EXTRACT_SUFX=	.shar.gz
 
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index afc4dc3c5536..c56061def4b8 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -1,6 +1,8 @@
-# $Id: Makefile,v 1.7 1998/11/25 10:53:10 flathill Exp $
+# $Id: Makefile,v 1.8 1998/12/24 13:18:53 flathill Exp $
 #
 
+    SUBDIR += 9menu
+    SUBDIR += 9wm
     SUBDIR += afterstep
     SUBDIR += afterstep-devel
     SUBDIR += afterstep-i18n
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index 593f4e9d54d9..d59eb64b4d58 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.6 1998/11/21 17:18:12 steve Exp $
+# $Id: Makefile,v 1.7 1998/11/28 09:07:16 asami Exp $
 #
 
 DISTNAME=	9menu-1.5
-CATEGORIES=	plan9 misc
+CATEGORIES=	x11-wm plan9
 MASTER_SITES=	ftp://ftp.mathcs.emory.edu/pub/arnold/
 EXTRACT_SUFX=	.shar.gz
 
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index d9862cae8130..d77cb2fa42e8 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.8 1998/11/28 09:07:17 asami Exp $
+# $Id: Makefile,v 1.9 1998/12/26 22:03:26 asami Exp $
 #
 
 DISTNAME=       9term.1.6.3
 PKGNAME=	9term-1.6.3
-CATEGORIES=	plan9 x11
+CATEGORIES=	x11 plan9
 MASTER_SITES=   ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 
 MAINTAINER=	erich@FreeBSD.org
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/plan9/sam:extract
 USE_XLIB=	yes
 MAN1=		9term.1
 MANCOMPRESSED=	yes
-MAKE_ENV=	SAMDIR=${WRKDIRPREFIX}${PORTSDIR}/plan9/sam
+MAKE_ENV=	SAMDIR=${WRKDIRPREFIX}${.CURDIR}/../../editors/sam
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/Makefile b/x11/Makefile
index 30a352bce045..057461c52523 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,6 +1,7 @@
-# $Id: Makefile,v 1.245 1999/01/02 19:20:21 sada Exp $
+# $Id: Makefile,v 1.246 1999/01/07 12:05:29 asami Exp $
 #
 
+    SUBDIR += 9term
     SUBDIR += XFree86
     SUBDIR += XFree86-contrib
     SUBDIR += Xfstt