Update ctwm to 3.8.2.

Based on maintainer update request per PR pkg/48820.

From CHANGES:
    Changes from version 3.8.1 to 3.8.2
    2014-??-??
    -----------------------------------

    1 - Various code cleanups.
	Cleanup re: raising and warping to windows (previous location of
	pointer in windows), SaveWorkspaceFocus. A few extra NULL
	pointer checks.
	Logical hasfocusvisible cleanup.
	Rename TwmWindow.list to iconmanagerlist, and various smaller
	cleanups.
	Eliminated TwmWindow TwmRoot from struct ScreenInfo. Mostly a
	mechanical change.
	I found some cases where the dummy TwmWindow was apparently
	mistakenly included in a loop. Replaced .next with TwmWindow
	*FirstWindow and .cmaps witn Colormaps RootColormaps. Other
	members were not used.

    2 - Fix a bug where insufficient validation of the size hints
        resulted in a division by zero when considering aspect ratio.

    3 - Lots of minor compiler warnings and build fixes, a few of which
        were real current or latent bugs.  Leave warnings enabled by
        default.  A few of the build system adjustments may break very
        old systems (e.g., those with original AT&T yacc).

    4 - Fix incorrect inclusion of $DESTDIR in some paths.

    5 - Update for new website and mailing list at ctwm.org.

    6 - Look at _MOTIF_WM_HINTS for titlebar-less or border-less
	windows.

4 files changed, 17 insertions, 41 deletions

diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index 065328ded05..249aaaf8629 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.32 2013/08/15 20:26:51 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2014/07/18 10:40:48 obache Exp $
 #
 
-DISTNAME=	ctwm-3.8.1
+DISTNAME=	ctwm-3.8.2
 CATEGORIES=	x11 wm
-MASTER_SITES=	http://ctwm.free.lp.se/dist/
+MASTER_SITES=	http://ctwm.org/dist/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	rhialto@falu.nl
-HOMEPAGE=	http://ctwm.free.lp.se/
+HOMEPAGE=	http://ctwm.org/
 COMMENT=	Window manager with support for multiple virtual screens and Gnome 1.x
+LICENSE=	mit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -16,9 +18,13 @@ USE_IMAKE=	YES
 .include "../../mk/bsd.prefs.mk"
 
 # We need an m4 that understands the -s option.
+.if !empty(TOOLS_PLATFORM.m4)
+.  if !empty(:!${ECHO} yes | ${TOOLS_PLATFORM.m4} -s 2>/dev/null||${ECHO}!)
+TOOLS_PLATFORM.gm4?=	${TOOLS_PLATFORM.m4}
+.  endif
+.endif
 USE_TOOLS+=		gm4:run
 OPSYSVARS+=		EXTRA_DEFINES
-EXTRA_DEFINES+=		-DPATH_TO_M4=\"${TOOLS_PATH.gm4:Q}\"
 # The __EXTENSIONS__ is needed for sigjmp_buf.
 EXTRA_DEFINES.SunOS+=	-D__EXTENSIONS__
 MAKE_ENV+=		EXTRA_DEFINES=${EXTRA_DEFINES:Q}
@@ -28,6 +34,8 @@ pre-configure:
 	( ${ECHO} 'USER_JPEGLIBDIR = -L${JPEGBASE}/lib ${COMPILER_RPATH_FLAG}${JPEGBASE}/lib'; \
 	  ${ECHO} 'USER_JPEGINCDIR = -I${JPEGBASE}/include'; \
 	  ${CAT} ${WRKSRC}/Imakefile.local-template; \
+	  ${ECHO} '#undef M4_CMD'; \
+	  ${ECHO} '#define M4_CMD ${TOOLS_PATH.gm4}'; \
 	) >${WRKSRC}/Imakefile.local
 
 pre-install:
diff --git a/wm/ctwm/distinfo b/wm/ctwm/distinfo
index b6250e91f39..fd4a9855340 100644
--- a/wm/ctwm/distinfo
+++ b/wm/ctwm/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.16 2013/06/09 15:26:45 ryoon Exp $
+$NetBSD: distinfo,v 1.17 2014/07/18 10:40:48 obache Exp $
 
-SHA1 (ctwm-3.8.1.tar.gz) = 4844b352457d4f7ffda7c5b80ae744c30a46806a
-RMD160 (ctwm-3.8.1.tar.gz) = 5990ed604fadaa6ad484f6b3221278a4f6fcb34e
-Size (ctwm-3.8.1.tar.gz) = 737958 bytes
-SHA1 (patch-aa) = 5f6d7f7d5552815cd40a2d2d1a43a9a22a202037
-SHA1 (patch-ac) = bb4cbcb8e4a68d1f2844aa16e85918aa5368a869
+SHA1 (ctwm-3.8.2.tar.xz) = b1bb8c75c4896738686c1f42222be20508ea2cb2
+RMD160 (ctwm-3.8.2.tar.xz) = e5fc23208e019814388e6336ad7af80f1c208238
+Size (ctwm-3.8.2.tar.xz) = 549984 bytes
diff --git a/wm/ctwm/patches/patch-aa b/wm/ctwm/patches/patch-aa
deleted file mode 100644
index dff7559ea8d..00000000000
--- a/wm/ctwm/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2010/05/15 00:05:00 wiz Exp $
-
---- util.c.orig	2007-02-16 09:24:27.000000000 +0000
-+++ util.c
-@@ -3942,7 +3942,7 @@ void ConstrainByBorders (TwmWindow *twmw
- #ifdef JPEG
- 
- unsigned short int *buffer_16bpp;
--long *buffer_32bpp;
-+int32_t *buffer_32bpp;
- 
- static void convert_for_16 (int w, int x, int y, int r, int g, int b) {
-   buffer_16bpp [y * w + x] = ((r >> 3) << 11) + ((g >> 2) << 5) + (b >> 3);
diff --git a/wm/ctwm/patches/patch-ac b/wm/ctwm/patches/patch-ac
deleted file mode 100644
index 36b21dad6b0..00000000000
--- a/wm/ctwm/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2007/02/17 08:27:11 obache Exp $
-
---- parse.c.orig	2007-02-16 12:37:42.000000000 +0100
-+++ parse.c	2007-02-16 12:37:58.000000000 +0100
-@@ -2128,11 +2128,7 @@
-                 dup2(fids[1], 1);       /* stdout = pipe to parent */
-                 /* get_defs("m4", dpy, display_name) */
-                 tmp_file = m4_defs(dpy, display_name);
--                execlp("m4", "m4",
--#if !defined(__NetBSD__)
--			"-s",
--#endif
--			tmp_file, "-", NULL);
-+                execlp(PATH_TO_M4, "m4", "-s", tmp_file, "-", NULL);
- 
-                 /* If we get here we are screwed... */
-                 perror("Can't execlp() m4");