Added wm category to main Makefile; remove packages that have been moved

from x11 to wm; fix paths in packages that depend on the moved ones.

15 files changed, 0 insertions, 456 deletions

diff --git a/x11/uwm/files/md5 b/x11/uwm/files/md5
deleted file mode 100644
index 40cc7f710c2..00000000000
--- a/x11/uwm/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: md5,v 1.2 2000/02/02 08:07:11 itohy Exp $
-
-MD5 (X.V11R3uwm.tar.gz) = 373f6526106d80c03103259adbf3a47a
diff --git a/x11/uwm/files/patch-sum b/x11/uwm/files/patch-sum
deleted file mode 100644
index a15396068f2..00000000000
--- a/x11/uwm/files/patch-sum
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-sum,v 1.5 2000/10/13 01:40:58 itohy Exp $
-
-MD5 (patch-aa) = 6ebca0c68ccc36ead286d15f64558a0d
-MD5 (patch-ab) = b7559a13c915e4fee232047920f43039
-MD5 (patch-ac) = cd52d12bed44d357df4ccb070d2df0e9
-MD5 (patch-ad) = 294879be399f00a841898f7527cc753a
-MD5 (patch-ae) = 7bbaae6465a104ed063ef8fee1f7cf49
-MD5 (patch-af) = 8d2bb3cf85676e259186241611edf4e4
-MD5 (patch-ag) = d8b35baf6f18314b657cab4076cd4a16
-MD5 (patch-ah) = cce76d53168d7de5f0350bc0409026bc
-MD5 (patch-ai) = d2ae89b2ee16602f37f664a9d2229e04
-MD5 (patch-aj) = 481d76eaf7209feead2cb4ee96097096
diff --git a/x11/uwm/patches/patch-aa b/x11/uwm/patches/patch-aa
deleted file mode 100644
index 3208c76049a..00000000000
--- a/x11/uwm/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/23 03:10:59 itohy Exp $
-
---- Imakefile.orig	Mon Oct 24 23:54:50 1988
-+++ Imakefile	Wed Dec 22 13:54:20 1999
-@@ -1,3 +1,5 @@
-+         UWMDIR = $(LIBDIR)/uwm
-+   TOP_INCLUDES = -I../.. -I$(INCROOT) $(TOP_X_INCLUDES)
-         DEFINES = -DSYSFILE=\"$(UWMDIR)$(PATHSEP)system.uwmrc\"
- LOCAL_LIBRARIES = $(XLIB)
-   SYS_LIBRARIES = -ll
diff --git a/x11/uwm/patches/patch-ab b/x11/uwm/patches/patch-ab
deleted file mode 100644
index 5012872dcf4..00000000000
--- a/x11/uwm/patches/patch-ab
+++ /dev/null
@@ -1,137 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/01/19 07:24:07 itohy Exp $
-
---- uwm.c.orig	Sun Oct 23 22:21:55 1988
-+++ uwm.c	Wed Jan 19 08:20:54 2000
-@@ -41,9 +41,18 @@
- 
- #include "uwm.h"
- #include <ctype.h>
-+#include <signal.h>
-+
-+#ifdef CSRG_BASED
-+#undef MIN
-+#undef MAX
-+#include <sys/param.h>
-+#if defined(BSD) && BSD >= 199306
-+#define HAVE_MKSTEMP
-+#endif
-+#endif
- 
- #ifdef PROFIL
--#include <signal.h>
- /*
-  * Dummy handler for profiling.
-  */
-@@ -53,6 +62,27 @@
- }
- #endif
- 
-+#ifdef SIGCHLD
-+#include <sys/wait.h>
-+/*
-+ * clear (probably inherited) children which are dead or will die.
-+ */
-+clear_children()
-+{
-+	int status, pid;
-+
-+	do {
-+#ifdef CSRG_BASED
-+		pid = wait3(&status, WNOHANG, (struct rusage *) 0);
-+#else	/* SVR4 */
-+		pid = waitpid(-1, &status, WNOHANG);
-+#endif
-+	} while (pid != 0 && pid != -1);
-+
-+	signal(SIGCHLD, clear_children);
-+}
-+#endif
-+
- #define gray_width 16
- #define gray_height 16
- static char gray_bits[] = {
-@@ -115,6 +145,10 @@
- #ifdef PROFIL
-     signal(SIGTERM, ptrap);
- #endif
-+#ifdef SIGCHLD
-+    /* no zombies */
-+    clear_children();
-+#endif
- 
-     /*
-      * Set up internal defaults.
-@@ -369,7 +403,7 @@
-     if (IFontInfo == NULL) {
-         fprintf(stderr, "uwm: Unable to open icon font '%s', using server default.\n",
-                 IFontName);
--	IFontInfo = XQueryFont(dpy, DefaultGC(dpy, scr)->gid);
-+	IFontInfo = XQueryFont(dpy, XGContextFromGC(DefaultGC(dpy, scr)));
- 	fallbackIFont = True;
-     }
-     PFontInfo = XLoadQueryFont(dpy, PFontName);
-@@ -379,7 +413,7 @@
- 	if (fallbackIFont)
- 	    PFontInfo = IFontInfo;
- 	else
--	    PFontInfo = XQueryFont(dpy, DefaultGC(dpy, scr)->gid);
-+	    PFontInfo = XQueryFont(dpy, XGContextFromGC(DefaultGC(dpy, scr)));
- 	fallbackPFont = True;
-     }
-     MFontInfo = XLoadQueryFont(dpy, MFontName);
-@@ -389,7 +423,7 @@
- 	if (fallbackIFont || fallbackPFont)
- 	    MFontInfo = fallbackPFont ? PFontInfo : IFontInfo;
- 	else
--	    MFontInfo = XQueryFont(dpy, DefaultGC(dpy, scr)->gid);
-+	    MFontInfo = XQueryFont(dpy, XGContextFromGC(DefaultGC(dpy, scr)));
- 	fallbackMFont = True;
-     }
- 
-@@ -685,7 +719,11 @@
-  */
- InitBindings()
- {
-+#ifdef HAVE_MKSTEMP
-+    int fd;
-+#else
-     char *mktemp();
-+#endif
-     char *tempfile;		/* Temporary filename. */
-     register FILE *fp;		/* Temporary file pointer. */
-     register char **ptr;	/* Default bindings string array pointer. */
-@@ -699,15 +737,26 @@
- 	exit (1);
-     }
-     strcpy (tempfile, TEMPFILE);
-+#ifdef HAVE_MKSTEMP
-+    if ((fd = mkstemp(tempfile)) < 0 || (fp = fdopen(fd, "r+")) == NULL) {
-+        perror("uwm: cannot create temp file");
-+        exit(1);
-+    }
-+#else
-     sfilename = mktemp(tempfile);
-     if ((fp = fopen(tempfile, "w")) == NULL) {
-         perror("uwm: cannot create temp file");
-         exit(1);
-     }
-+#endif
-     for (ptr = DefaultBindings; *ptr; ptr++) {
-         fputs(*ptr, fp);
-         fputc('\n', fp);
-     }
-+#ifdef HAVE_MKSTEMP
-+    rewind(fp);
-+    yyin = fp;
-+#else
-     fclose(fp);
- 
-     /*
-@@ -717,6 +766,7 @@
-         perror("uwm: cannot open temp file");
-         exit(1);
-     }
-+#endif
-     Lineno = 1;
-     yyparse();
-     fclose(yyin);
diff --git a/x11/uwm/patches/patch-ac b/x11/uwm/patches/patch-ac
deleted file mode 100644
index 4f6765f0ddb..00000000000
--- a/x11/uwm/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/12/23 03:10:59 itohy Exp $
-
---- uwm.h.orig	Mon Oct 24 19:08:24 1988
-+++ uwm.h	Thu Dec 23 00:27:02 1999
-@@ -39,6 +39,12 @@
-  
- #include <errno.h>
- #include <stdio.h>
-+#ifdef CSRG_BASED
-+#include <unistd.h>
-+#endif
-+#ifndef X_NOT_STDC_ENV
-+#include <stdlib.h>
-+#endif
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
diff --git a/x11/uwm/patches/patch-ad b/x11/uwm/patches/patch-ad
deleted file mode 100644
index 69e50f267d4..00000000000
--- a/x11/uwm/patches/patch-ad
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1999/12/23 23:12:50 itohy Exp $
-
---- gram.y.orig	Thu Sep 22 22:14:31 1988
-+++ gram.y	Thu Dec 23 22:04:02 1999
-@@ -117,18 +117,18 @@
- 			        case IsString:
- 			            if ($3 == C_STRING) {
- 			                strcpy(KeywordTable[$1].sptr,
--			                        yylval.sval);
-+			                        $<sval>2);
- 			            } else {
- 			                yyerror("illegal construct");
- 			            }
--			            free(yylval.sval);
-+			            free($<sval>2);
- 			            break;
- 			        case IsNumeric:
- 			            if ($3 == C_STRING) {
- 			                *(KeywordTable[$1].nptr) =
--			                                   y_atoi(yylval.sval);
-+			                                   y_atoi($<sval>2);
- 			            } else yyerror("illegal construct");
--			            free(yylval.sval);
-+			            free($<sval>2);
- 			            break;
- 			        case IsBoolTrue:
- 			        case IsBoolFalse:
-@@ -197,12 +197,12 @@
- 			    ml_ptr = $3;
- 			}
- 	|	STRING
--			{ $$ = C_STRING; }
-+			{ $$ = C_STRING; $<sval>0 = $1; }
- 	;
- 
- boolvar:	STRING
- 			{
--			    ki = keywordlookup(yylval.sval);
-+			    ki = keywordlookup($1);
- 			    switch (KeywordTable[ki].type) {
- 			    case IsBoolTrue:
- 			        *(KeywordTable[ki].bptr) = TRUE;
-@@ -220,7 +220,7 @@
- 	;
- 
- keyword:	STRING	{
--			    $$ = keywordlookup(yylval.sval);
-+			    $$ = keywordlookup($1);
- 			}
- 	;
- 
-@@ -246,9 +246,9 @@
- 			{ $$ = CheckButtonState($1); }
- 	;
- 
--kmask:		STRING { $$ = keyexprlookup(yylval.sval); }
-+kmask:		STRING { $$ = keyexprlookup($1); }
- 
--contmask:	STRING { $$ = contexprlookup(yylval.sval); }
-+contmask:	STRING { $$ = contexprlookup($1); }
- 
- buttmodexpr: 	buttmodifier
- 			{ $$ = $1; }
-@@ -257,7 +257,7 @@
- 	;
- 
- buttmodifier:	STRING
--			{ $$ = buttexprlookup(yylval.sval); }
-+			{ $$ = buttexprlookup($1); }
- 	;
- 
- menuname:	STRING
-@@ -304,7 +304,7 @@
- 
- menuaction:	STRING
- 			{
--			    ki = keywordlookup(yylval.sval);
-+			    ki = keywordlookup($1);
- 			    if ((ki != -1) &&
- 			        (KeywordTable[ki].type != IsFunction) &&
- 			        (KeywordTable[ki].type != IsQuitFunction) &&
-@@ -350,7 +350,7 @@
- 			}
- 	;
- 
--strings:	STRING	{ $$ = yylval.sval; }
-+strings:	STRING	{ $$ = $1; }
- 	|	strings STRING
- 			{ $$ = strconcat($1, $2); }
- 	;
-@@ -387,7 +387,7 @@
- 			}
- 	;
- 
--color:		STRING	{ $$ = yylval.sval; }
-+color:		STRING	{ $$ = $1; }
- 	|	/* empty */	{ $$ = NULL; }
- 	;
- %%
-@@ -572,6 +572,8 @@
-         setbinding(ICON, index, mask, name);
-     if (context & WINDOW)
-         setbinding(WINDOW, index, mask, name);
-+    if (name)
-+	free(name);
- }
- 
- /*
-@@ -599,12 +601,13 @@
- char *mname;		/* Pointer to menu name, if needed. */
- {
-     Binding *ptr;
-+    extern char *stash();
- 
-     ptr = AllocBinding();
-     ptr->context = cont;
-     ptr->mask = m;
-     ptr->func = KeywordTable[i].fptr;
--    ptr->menuname = mname;
-+    ptr->menuname = mname ? stash(mname) : NULL;
- 
-     switch (m & (LeftMask | MiddleMask | RightMask)) {
-     case LeftMask:
-@@ -771,9 +774,8 @@
-     else {
-         for(ptr = list; ptr->next; ptr = ptr->next) /* NULL */;
-         ptr->next = link;
--        ptr = ptr->next;
--        ptr->next = NULL;
-     }
-+    link->next = NULL;
-     return(list);
- }
- 
diff --git a/x11/uwm/patches/patch-ae b/x11/uwm/patches/patch-ae
deleted file mode 100644
index e5a46928645..00000000000
--- a/x11/uwm/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/12/23 03:10:59 itohy Exp $
-
---- GetButton.c.orig	Mon Oct 24 19:08:17 1988
-+++ GetButton.c	Wed Dec 22 13:59:28 1999
-@@ -255,7 +255,8 @@
-     /* 
-      * We convert the key pressed event to ascii.
-      */
--    nbytes = XLookupString(kp_event, kbd_str, STRLEN, NULL);
-+    nbytes = XLookupString(kp_event, kbd_str, STRLEN, (KeySym *) NULL,
-+    				(XComposeStatus *) NULL);
- 
-     /*
-      * If kbd_str is a "non-string", then don't do anything.
diff --git a/x11/uwm/patches/patch-af b/x11/uwm/patches/patch-af
deleted file mode 100644
index d0081b90fe6..00000000000
--- a/x11/uwm/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/12/23 03:10:59 itohy Exp $
-
---- Kill.c.orig	Thu Sep  8 00:28:28 1988
-+++ Kill.c	Thu Dec 23 00:54:08 1999
-@@ -11,7 +11,7 @@
- int button;                             /* Button event detail. */
- int x, y;                               /* Event mouse position. */
- {
--    Window *assoc;
-+    Window assoc;
- 
-     if (IsIcon(window, x, y, TRUE, &assoc))
-         XKillClient(dpy, assoc);
diff --git a/x11/uwm/patches/patch-ag b/x11/uwm/patches/patch-ag
deleted file mode 100644
index d89e6ab69c7..00000000000
--- a/x11/uwm/patches/patch-ag
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/12/23 03:10:59 itohy Exp $
-
---- Restart.c.orig	Sat Feb 27 07:38:11 1988
-+++ Restart.c	Thu Dec 23 00:39:16 1999
-@@ -46,6 +46,8 @@
-     XButtonEvent button_event;
-     int percentage;
-     int i;
-+    extern char **environ;
-+    char **oenv;
- 
-     percentage = VOLUME_PERCENTAGE(Volume);
-     XBell(dpy, percentage);
-@@ -55,7 +57,10 @@
-      * Gag, rely on operating system to close connection because we don't
-      * to mess ourselves up in case the exec fails.
-      */
--    execvp(*Argv, Argv, Environ);
-+    oenv = environ;
-+    environ = Environ;
-+    execvp(*Argv, Argv);
-+    environ = oenv;
-     for (i = 0; i < 4; i++) {
- 	XBell(dpy, percentage);
- 	percentage += 10;
diff --git a/x11/uwm/patches/patch-ah b/x11/uwm/patches/patch-ah
deleted file mode 100644
index fe779b52d26..00000000000
--- a/x11/uwm/patches/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/12/23 03:10:59 itohy Exp $
-
---- default.uwmrc.orig	Fri Sep 23 23:08:13 1988
-+++ default.uwmrc	Thu Dec 23 07:59:56 1999
-@@ -38,7 +38,6 @@
- f.circleup=	meta	:root:		right down
- f.circledown=	m|s	::		left down
- f.menu=			:root:		middle down	: "WindowOps"
--f.menu=		m|s	::		middle down	: "WindowOps"
- f.menu=		m|s	::		middle down	: "Preferences"
- f.circleup=	m|s	::		right down
- f.iconify=	m|c	:window|icon:	left down
-@@ -78,8 +77,8 @@
- Click Loud:	!"xset c 8&"
- Click Soft:	!"xset c on&"
- Click Off:	!"xset c off&"
--Lock On:	!"xset l on&"
--Lock Off:	!"xset l off&"
-+Lock On:	!"xset led on&"
-+Lock Off:	!"xset led off&"
- Mouse Fast:	!"xset m 4 2&"
- Mouse Normal:	!"xset m 2 5&"
- Mouse Slow:	!"xset m 1 1&"
diff --git a/x11/uwm/patches/patch-ai b/x11/uwm/patches/patch-ai
deleted file mode 100644
index 63cac0965bc..00000000000
--- a/x11/uwm/patches/patch-ai
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/12/23 03:10:59 itohy Exp $
-
---- Bindings.c.orig	Fri Sep 23 23:08:11 1988
-+++ Bindings.c	Thu Dec 23 07:59:56 1999
-@@ -63,7 +63,6 @@
- "f.circleup=m:r:r d",
- "f.circledown=m|s::l d",
- "f.menu=:r:m d:\"WindowOps\"",
--"f.menu=m|s::m d:\"WindowOps\"",
- "f.menu=m|s::m d:\"Preferences\"",
- "f.circleup=m|s::r d",
- "f.iconify=m|c:w|i:l d",
-@@ -102,8 +101,8 @@
- "Click Loud:!\"xset c 8&\"",
- "Click Soft:!\"xset c on&\"",
- "Click Off:!\"xset c off&\"",
--"Lock On:!\"xset l on&\"",
--"Lock Off:!\"xset l off&\"",
-+"Lock On:!\"xset led on&\"",
-+"Lock Off:!\"xset led off&\"",
- "Mouse Fast:!\"xset m 4 2&\"",
- "Mouse Normal:!\"xset m 2 5&\"",
- "Mouse Slow:!\"xset m 1 1&\"",
diff --git a/x11/uwm/patches/patch-aj b/x11/uwm/patches/patch-aj
deleted file mode 100644
index 7b4315c3e52..00000000000
--- a/x11/uwm/patches/patch-aj
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2000/10/13 01:40:59 itohy Exp $
-
---- Menu.c.orig	Sat Oct  1 18:41:13 1988
-+++ Menu.c	Mon Jan 17 22:09:10 2000
-@@ -84,6 +84,14 @@
- 	char **oldenviron;
- 	extern char **environ, **newenviron;
- 
-+#ifdef SIGCHLD
-+	/*
-+	 * Children are now handled in uwm.c, but make sure
-+	 * uwm blocks :-) for compatibility with other systems.
-+	 */
-+
-+	signal(SIGCHLD, SIG_DFL);
-+#endif
- 	oldenviron = environ;
- 	environ = newenviron;
- 	if ((pid = vfork()) == 0) {
-@@ -107,6 +115,9 @@
- 		status = -1;
- 	signal(SIGINT, istat);
- 	signal(SIGQUIT, qstat);
-+#ifdef SIGCHLD
-+	clear_children();
-+#endif
- 	return(status);
- }
- 
diff --git a/x11/uwm/pkg/COMMENT b/x11/uwm/pkg/COMMENT
deleted file mode 100644
index 91181a17b15..00000000000
--- a/x11/uwm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X11R3 window manager
diff --git a/x11/uwm/pkg/DESCR b/x11/uwm/pkg/DESCR
deleted file mode 100644
index 94877fe1c62..00000000000
--- a/x11/uwm/pkg/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-    uwm is a small, simple windows manager, which came with X11R3.
-The characteristic of uwm is its simplicity.  Superfluous and
-unnecessary features, such as title bars or keyboard short-cuts
-don't exist, much less pixmaps, banners, or themes.
-
-    Since no ``frame'' appears around application windows, there is
-no problem about non-rectangular windows, even though the SHAPE
-extension of X11R4 is not explicitly supported by uwm.
-
-    The behavior of uwm is highly customizable by configuration files.
diff --git a/x11/uwm/pkg/PLIST b/x11/uwm/pkg/PLIST
deleted file mode 100644
index d74f10bcc8e..00000000000
--- a/x11/uwm/pkg/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/23 03:10:59 itohy Exp $
-bin/uwm
-man/cat1/uwm.0
-lib/X11/uwm/system.uwmrc
-@dirrm lib/X11/uwm