Complete move of 9wm from category plan9 to wm.

9 files changed, 3 insertions, 123 deletions

diff --git a/plan9/9wm/Makefile b/plan9/9wm/Makefile
deleted file mode 100644
index bd6943a68c3..00000000000
--- a/plan9/9wm/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.10 1999/04/01 14:07:55 agc Exp $
-# FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp
-#
-
-DISTNAME=		9wm-1.1
-CATEGORIES=		plan9
-MASTER_SITES=		ftp://ftp.mathcs.emory.edu/pub/arnold/
-EXTRACT_SUFX=		.shar.gz
-
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://dhog.g7.org/dhog/9wm.html
-
-NO_WRKSUBDIR=		yes
-EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
-USE_IMAKE=		yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/plan9/9wm/files/md5 b/plan9/9wm/files/md5
deleted file mode 100644
index c0cdc59531c..00000000000
--- a/plan9/9wm/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:27:33 agc Exp $
-
-MD5 (9wm-1.1.shar.gz) = e3ebae40e0d4ba2b4c05448c0bbf43ae
diff --git a/plan9/9wm/files/patch-sum b/plan9/9wm/files/patch-sum
deleted file mode 100644
index 9f250a84448..00000000000
--- a/plan9/9wm/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:17:02 agc Exp $
-
-MD5 (patch-aa) = e2db6d92ecdaa6383aa737861d4d1f22
diff --git a/plan9/9wm/patches/patch-aa b/plan9/9wm/patches/patch-aa
deleted file mode 100644
index f671e482ec2..00000000000
--- a/plan9/9wm/patches/patch-aa
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:11:15 agc Exp $
-
---- 9wm.c~	Mon Oct 21 09:26:24 1996
-+++ 9wm.c	Mon Oct 21 09:27:19 1996
-@@ -471,7 +471,7 @@
-     case NormalState:
-         XMapRaised(dpy, c->parent);
-         XMapWindow(dpy, c->window);
--        setstate(c, NormalState);
-+        _setstate(c, NormalState);
-         if (c->trans != None && current && c->trans == current->window)
-                 active(c);
-         break;
---- fns.h~	Mon Oct 21 09:26:25 1996
-+++ fns.h	Mon Oct 21 09:27:31 1996
-@@ -31,7 +31,7 @@
- Window  getwprop();
- int     getiprop();
- int     getstate();
--void    setstate();
-+void    _setstate();
- void    setlabel();
- void    getproto();
- void    gettrans();
---- manage.c~	Mon Oct 21 09:26:24 1996
-+++ manage.c	Mon Oct 21 09:27:49 1996
-@@ -131,7 +131,7 @@
-             active(c);
-         else
-             setactive(c, 0);
--        setstate(c, NormalState);
-+        _setstate(c, NormalState);
-     }
-     if (current != c)
-         cmapfocus(current);
-@@ -161,7 +161,7 @@
-     XReparentWindow(dpy, c->window, root, c->x, c->y);
-     gravitate(c, 0);
-     XRemoveFromSaveSet(dpy, c->window);
--    setstate(c, WithdrawnState);
-+    _setstate(c, WithdrawnState);
- 
-     /* flush any errors */
-     ignore_badwindow = 1;
-@@ -417,7 +417,7 @@
- }
- 
- void
--setstate(c, state)
-+_setstate(c, state)
- Client *c;
- int state;
- {
---- menu.c~	Mon Oct 21 09:26:24 1996
-+++ menu.c	Mon Oct 21 09:27:45 1996
-@@ -179,7 +179,7 @@
-     }
-     XUnmapWindow(dpy, c->parent);
-     XUnmapWindow(dpy, c->window);
--    setstate(c, IconicState);
-+    _setstate(c, IconicState);
-     if (c == current)
-         nofocus();
-     hiddenc[numhidden] = c;
-@@ -210,7 +210,7 @@
-     if (map) {
-         XMapWindow(dpy, c->window);
-         XMapRaised(dpy, c->parent);
--        setstate(c, NormalState);
-+        _setstate(c, NormalState);
-         active(c);
-     }
- 
diff --git a/plan9/9wm/pkg/COMMENT b/plan9/9wm/pkg/COMMENT
deleted file mode 100644
index 0f7c903f78d..00000000000
--- a/plan9/9wm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-8 1/2-like Window Manager for X
diff --git a/plan9/9wm/pkg/DESCR b/plan9/9wm/pkg/DESCR
deleted file mode 100644
index da925f2e9da..00000000000
--- a/plan9/9wm/pkg/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-                        9wm Version 1.1
-                   Copyright 1994 David Hogan.
-
-What is 9wm?
-============
-
-9wm is an X window manager which attempts to emulate the Plan 9 window
-manager 8-1/2 as far as possible within the constraints imposed by X.
-It provides a simple yet comfortable user interface, without garish
-decorations or title-bars. Or icons.  And it's click-to-type.  This
-will not appeal to everybody, but if you're not put off yet then read
-on.  (And don't knock it until you've tried it).
-
-One major difference between 9wm and 8-1/2 is that the latter provides
-windows of text with a typescript interface, and doesn't need to run a
-separate program to emulate a terminal.  9wm, as an X window manager,
-does require a separate program.  For better 8-1/2 emulation, you should
-obtain Matthew Farrow's "9term" program (ftp://ftp.cs.su.oz.au/matty/unicode),
-version 1.6 or later (earlier versions don't cooperate with 9wm in
-implementing "hold mode").  Of course, you can run xterm under 9wm as well.
diff --git a/plan9/9wm/pkg/PLIST b/plan9/9wm/pkg/PLIST
deleted file mode 100644
index 406119a5a73..00000000000
--- a/plan9/9wm/pkg/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 1997/11/06 10:03:54 agc Exp $
-bin/9wm
-man/cat1/9wm.0.gz
diff --git a/plan9/Makefile b/plan9/Makefile
index ef58a5fdf49..d25ddde5977 100644
--- a/plan9/Makefile
+++ b/plan9/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2000/12/12 01:31:03 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/12/12 13:07:15 wiz Exp $
 #
 
     SUBDIR += 9menu
     SUBDIR += 9term
-    SUBDIR += 9wm
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/wm/Makefile b/wm/Makefile
index 05e7eb8b42b..962f0151213 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2000/12/12 13:07:14 wiz Exp $
 #
 
+    SUBDIR += 9wm
     SUBDIR += afterstep
     SUBDIR += amiwm
     SUBDIR += blackbox