Update 9wm to 1.4.0, now developed on GitHub.

There are no release notes from upstream (short of commit
logs), here is a partial list of changes:

- no more manual window placement
- color support
- support for fullscreen and shaped windows
- format string and memory fixes
- compatibility fixes for some toolkits
- window titles are UTF-8

6 files changed, 42 insertions, 96 deletions

diff --git a/wm/9wm/DESCR b/wm/9wm/DESCR
index da925f2e9da..1d9c0588fe3 100644
--- a/wm/9wm/DESCR
+++ b/wm/9wm/DESCR
@@ -1,9 +1,3 @@
-                        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
diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile
index 3cf3cd15004..ad3236684bd 100644
--- a/wm/9wm/Makefile
+++ b/wm/9wm/Makefile
@@ -1,17 +1,23 @@
-# $NetBSD: Makefile,v 1.17 2012/10/23 10:24:13 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2017/05/16 21:10:02 bsiegert Exp $
 
-DISTNAME=		9wm-1.1
-PKGREVISION=		2
+DISTNAME=		9wm-1.4.0
 CATEGORIES=		plan9 wm
-MASTER_SITES=		ftp://ftp.freefriends.org/arnold/Source/
-EXTRACT_SUFX=		.shar.gz
+MASTER_SITES=		${MASTER_SITE_GITHUB:=9wm/}
+GITHUB_PROJECT=		9wm
+GITHUB_TAG=		1.4.0
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://dhog.g7.org/dhog/9wm.html
-COMMENT=		8 1/2-like Window Manager for X
+HOMEPAGE=		https://github.com/9wm/9wm
+COMMENT=		Rio-like Window Manager for X
+LICENSE=		mit
 
-WRKSRC=			${WRKDIR}
-USE_IMAKE=		yes
+USE_TOOLS=		gmake
+
+INSTALLATION_DIRS=      bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/9wm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/9wm.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/9wm.1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/9wm/PLIST b/wm/9wm/PLIST
index a363de8410a..81ad71e901c 100644
--- a/wm/9wm/PLIST
+++ b/wm/9wm/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:32:32 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/05/16 21:10:02 bsiegert Exp $
 bin/9wm
-${IMAKE_MAN_DIR}/9wm.${IMAKE_MANNEWSUFFIX}
+man/man1/9wm.man
diff --git a/wm/9wm/distinfo b/wm/9wm/distinfo
index 70d2f04a93d..e8319b74a89 100644
--- a/wm/9wm/distinfo
+++ b/wm/9wm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/02 23:42:50 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/05/16 21:10:02 bsiegert Exp $
 
-SHA1 (9wm-1.1.shar.gz) = 43a4e28a0665d54331d81d9691abae65927738ac
-RMD160 (9wm-1.1.shar.gz) = d2daa96d1b8dec45d349e49406156629e4b2c50a
-SHA512 (9wm-1.1.shar.gz) = 61114b96896bf16f66af7727d039e9d09d85971f6cffa10cfea1719697bc355d18f56d3813dfefe6cfb8b2bec16683fa541735debdca2dc25b2ddc11363a0714
-Size (9wm-1.1.shar.gz) = 19517 bytes
-SHA1 (patch-aa) = 3e0c11e450876ee882694fb653fa8222ee53340a
+SHA1 (9wm-1.4.0.tar.gz) = 9cc1530cd324a76a1553f82fa585bfd7e457fd1b
+RMD160 (9wm-1.4.0.tar.gz) = 21960a25cc0dfc55e0a61ff1a4de34b56c681120
+SHA512 (9wm-1.4.0.tar.gz) = dc78b28f146fbac0ca4e336c91cc8013b4af49889d8638b6b3f8c15d47c0801e22412eb9f840eb0b3d8888ef8455bf6fa68c0333b47fb212ee3d6ced1673d0a5
+Size (9wm-1.4.0.tar.gz) = 21579 bytes
+SHA1 (patch-Makefile) = 9290c1d1af46c17d7b0f1e83c78a7a915b40b3f8
diff --git a/wm/9wm/patches/patch-Makefile b/wm/9wm/patches/patch-Makefile
new file mode 100644
index 00000000000..9ed2b20f135
--- /dev/null
+++ b/wm/9wm/patches/patch-Makefile
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile,v 1.1 2017/05/16 21:10:02 bsiegert Exp $
+
+Correctly install into $PREFIX, remove -Werror (which breaks with clang).
+
+--- Makefile.orig	2017-05-12 22:39:16.000000000 +0000
++++ Makefile
+@@ -1,8 +1,9 @@
+-CFLAGS += -DSHAPE -DCOLOR -Wall -Werror -pedantic
++CFLAGS += -DSHAPE -DCOLOR -Wall -pedantic
+ LDLIBS = -lXext -lX11
+-BIN = $(DESTDIR)/usr/bin/
++PREFIX ?= /usr
++BIN = $(DESTDIR)$(PREFIX)/bin/
+ 
+-MANDIR = $(DESTDIR)/usr/share/man/man1
++MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1
+ MANSUFFIX = 1
+ 
+ all: 9wm
diff --git a/wm/9wm/patches/patch-aa b/wm/9wm/patches/patch-aa
deleted file mode 100644
index a1fa7ec1722..00000000000
--- a/wm/9wm/patches/patch-aa
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 13:05:02 wiz 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);
-     }
-