Update to 3.6, based on PR 20648 by Rhialto.

Changes:
    1 - Fix line numbers for errors when using m4 preprocessor. Send thanks
	to Josh Wilmes.

    2 - Fix the way menu entries are selected with the keyboard. Now
	when you type a letter, the pointer moves to the next entry
	whose first letter is this letter, but does not activate it.
	The new keyword IgnoreCaseInMenuSelection, can be used to
	ignore case for this delection.

    3 - New keyword : DontSave, Takes a window list as argument. All listed
	windows won't have their characteristics saved for the session manager.
	Patch from Matthias Baake

    4 - Also from Matthias Baake. I let him speak :
	With the new keywords BorderLeft, BorderRight, BorderBottom and BorderTop
	(each of them is optional with a default value of 0 and takes a
	nonnegative integer as argument) you can declare a border "off limits" for
	f.move etc.. These borders act the same way as the real borders of the
	screen when moving windows; you can use f.forcemove to override them.

    5 - Sloppy Focus added with keyword "SloppyFocus" in configuration file
	(DINH V. Hoa).

    6 - the keyword "ClickToFocus" has been correctly implemented (DINH V. Hoa).

    7 - the keyword "IgnoreModifier" has been added,
	to use this feature, you have to add a line
	"IgnoreModifier { lock m2 }" in the configuration file.
	All bindings (buttons and keys) will ignore the modifiers
	you specified. It is useful when you use caps locks or
	num locks. You don't need IgnoreLockModifier any more with this option.
	(DINH V. Hoa).

    8 - New keyword : WindowBox : creates a new window called a box, where
        all the client windows that match the windows list are opened in,
	instead of the roor window. This is useful to group small windows
	in the same box (xload for instance) :

WindowBox "xloadbox" "320x100+0-0" {
    "xload"
}

    9 - New function : f.fittocontent. Can be used only with window boxes.
	The result is to have the box have the minimal size that contains
	all its children windows.

   10 - New keyword : WindowGeometries. Used to give a default geometry to some
	clients :

WindowGeometries {
    "Mozilla*"       "1000x800+10+10"
    "jpilot*"        "800x600-0-0"
}

   11 - New keyword : IconMenuDontShow. Don't show the name of these windows
	in the TwmIcons menu.

    And, as usual, a few bug fixes here and there.

5 files changed, 56 insertions, 19 deletions

diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index df1736a3433..1c5bc93e87d 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2003/06/04 04:49:01 simonb Exp $
+# $NetBSD: Makefile,v 1.11 2003/06/10 07:40:52 wiz Exp $
 #
 
-DISTNAME=	ctwm-3.5.2
-PKGREVISION=	1
+DISTNAME=	ctwm-3.6
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://ctwm.free.lp.se/dist/
+# XXX: 3.6 didn't include the XPMs, XPM tarball generated from 3.5.2 manually
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xpm${EXTRACT_SUFX}
 
 MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://ctwm.free.lp.se/
-COMMENT=	Window manager with support for multiple virtual screens
+COMMENT=	Window manager with support for multiple virtual screens and GNOME 1.x
 
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
diff --git a/wm/ctwm/distinfo b/wm/ctwm/distinfo
index 34c6847ec0c..e6012f70cf3 100644
--- a/wm/ctwm/distinfo
+++ b/wm/ctwm/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.4 2003/06/04 04:36:56 simonb Exp $
+$NetBSD: distinfo,v 1.5 2003/06/10 07:40:52 wiz Exp $
 
-SHA1 (ctwm-3.5.2.tar.gz) = 938750b798b53262f00436f7cd2228b414ce3057
-Size (ctwm-3.5.2.tar.gz) = 598142 bytes
-SHA1 (patch-aa) = ad06698a5d0694a98c808685b5dbec8ccf47442f
+SHA1 (ctwm-3.6.tar.gz) = 8a8cefd2273c748fd7ceded4c3553e5ca7a994ec
+Size (ctwm-3.6.tar.gz) = 370563 bytes
+SHA1 (ctwm-3.6-xpm.tar.gz) = dfe7331dba041eff70d561b728ca8d7a16f68ca6
+Size (ctwm-3.6-xpm.tar.gz) = 246505 bytes
+SHA1 (patch-aa) = 4b86b9d19e89b4b53415356c9ee9d4d21a0dd038
+SHA1 (patch-ab) = e03e595241ae1e1bc412772c6805ee115aad80d0
+SHA1 (patch-ac) = 99a28b20904207693a4f25aafaaac447dbcdca95
diff --git a/wm/ctwm/patches/patch-aa b/wm/ctwm/patches/patch-aa
index 75ea9587cb5..ba33ce49f8e 100644
--- a/wm/ctwm/patches/patch-aa
+++ b/wm/ctwm/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2003/06/04 04:36:56 simonb Exp $
+$NetBSD: patch-aa,v 1.2 2003/06/10 07:40:53 wiz Exp $
 
---- util.c.orig	Tue Sep 14 23:26:02 1999
-+++ util.c
-@@ -3897,6 +3897,7 @@ Atom prop;
- 		     ProgramName, XGetAtomName(dpy, prop), w);
- 	    stringptr = NULL;
- 	}
-+	XFree (text_prop.value);
-     } else {
- 	stringptr = NULL;
-     }
+--- gram.y.orig	Tue Dec 11 16:38:52 2001
++++ gram.y
+@@ -683,7 +683,7 @@ wingeom_entries	: /* Empty */
+ 		| wingeom_entries wingeom_entry
+ 		;
+ 
+-wingeom_entry	: string string	{ AddToList (&Scr->WindowGeometries, $1, $2) }
++wingeom_entry	: string string	{ AddToList (&Scr->WindowGeometries, $1, $2); }
+ 
+ 
+ 
diff --git a/wm/ctwm/patches/patch-ab b/wm/ctwm/patches/patch-ab
new file mode 100644
index 00000000000..cc2fb4c75c3
--- /dev/null
+++ b/wm/ctwm/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2003/06/10 07:40:53 wiz Exp $
+
+Enable use of I18N as in other versions.
+
+--- Imakefile.orig	Tue Dec 11 16:38:52 2001
++++ Imakefile
+@@ -12,7 +12,7 @@ XCOMM
+ #define XPM
+ #define USEM4
+ #undef X11R6
+-#undef I18N
++#define I18N
+ 
+          YFLAGS = -d
+         DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB)
diff --git a/wm/ctwm/patches/patch-ac b/wm/ctwm/patches/patch-ac
new file mode 100644
index 00000000000..a75066ffe91
--- /dev/null
+++ b/wm/ctwm/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2003/06/10 07:40:53 wiz Exp $
+
+Remove -s option from call to m4.
+
+--- parse.c.dist	Tue Dec 11 16:38:52 2001
++++ parse.c	Sat Mar  8 13:34:59 2003
+@@ -2097,7 +2097,8 @@
+                 dup2(fids[1], 1);       /* stdout = pipe to parent */
+                 /* get_defs("m4", dpy, display_name) */
+                 tmp_file = m4_defs(dpy, display_name);
+-                execlp("m4", "m4", "-s", tmp_file, "-", NULL);
++		/* Not all m4s know about -s */
++                execlp("m4", "m4", tmp_file, "-", NULL);
+                 /* If we get here we are screwed... */
+                 perror("Can't execlp() m4");
+                 exit(124);