bspwm: update to 0.9.2

From John Vogel

4 files changed, 21 insertions, 17 deletions

diff --git a/wm/bspwm/Makefile b/wm/bspwm/Makefile
index c7eda0e158f..a2db13bb301 100644
--- a/wm/bspwm/Makefile
+++ b/wm/bspwm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/09/06 18:32:10 wiedi Exp $
+# $NetBSD: Makefile,v 1.5 2017/05/31 05:22:09 maya Exp $
 
-DISTNAME=		bspwm-0.9
+DISTNAME=		bspwm-0.9.2
 CATEGORIES=		wm
 MASTER_SITES=		${MASTER_SITE_GITHUB:=baskerville/}
 GITHUB_TAG=		${PKGVERSION_NOREV}
@@ -11,7 +11,6 @@ COMMENT=		Binary space partitioning window manager
 LICENSE=		2-clause-bsd
 
 USE_TOOLS+=		gmake bash:run
-REPLACE_BASH+=		contrib/freedesktop/bspwm-session
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
@@ -28,4 +27,5 @@ SUBST_SED.makefile+=	-e 's,$$(DOCPREFIX)"/examples,${EXAMPLESDIR}",1'
 
 .include "../../x11/xcb-util/buildlink3.mk"
 .include "../../x11/xcb-util-wm/buildlink3.mk"
+.include "../../x11/xcb-util-keysyms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bspwm/PLIST b/wm/bspwm/PLIST
index 2262641bb0e..08dc1feca01 100644
--- a/wm/bspwm/PLIST
+++ b/wm/bspwm/PLIST
@@ -1,17 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 2015/06/05 22:48:18 youri Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/05/31 05:22:09 maya Exp $
 bin/bspc
 bin/bspwm
-bin/bspwm-session
 man/man1/bspc.1
 man/man1/bspwm.1
 share/bash-completion/completions/bspc
+share/doc/bspwm/CHANGELOG.md
 share/doc/bspwm/CONTRIBUTING.md
 share/doc/bspwm/INSTALL.md
 share/doc/bspwm/MISC.md
+share/doc/bspwm/README.md
 share/doc/bspwm/TODO.md
 share/examples/bspwm/bspwmrc
 share/examples/bspwm/external_rules/bspwmrc
 share/examples/bspwm/external_rules/external_rules
+share/examples/bspwm/external_rules/pseudo_automatic_mode/README.md
+share/examples/bspwm/external_rules/pseudo_automatic_mode/external_rules
 share/examples/bspwm/loop/bspwmrc
 share/examples/bspwm/loop/profile
 share/examples/bspwm/loop/sxhkdrc
@@ -25,5 +28,6 @@ share/examples/bspwm/panel/panel_colors
 share/examples/bspwm/panel/profile
 share/examples/bspwm/panel/sxhkdrc
 share/examples/bspwm/sxhkdrc
+share/fish/vendor_completions.d/bspc.fish
 share/xsessions/bspwm.desktop
 share/zsh/site-functions/_bspc
diff --git a/wm/bspwm/distinfo b/wm/bspwm/distinfo
index 4d698c05d1e..78c7f212b81 100644
--- a/wm/bspwm/distinfo
+++ b/wm/bspwm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/02 23:42:51 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/05/31 05:22:09 maya Exp $
 
-SHA1 (bspwm-0.9.tar.gz) = df3c31d603c8fe19d8a3c897bd16a12cb7bcf21a
-RMD160 (bspwm-0.9.tar.gz) = 21a27e64cf576e4ab1505476609f19cc7c97e853
-SHA512 (bspwm-0.9.tar.gz) = 09c4a52dc9f2635973d3b31d507373c27e17a8fb172b2783422049cfc4fa8416bb87a29dea74c2e0e71febdfa53f86a9c09004aa7328b6a08490537329c48370
-Size (bspwm-0.9.tar.gz) = 62798 bytes
-SHA1 (patch-Makefile) = d15f3435444cec825c99582a9fabcf40a9787793
+SHA1 (bspwm-0.9.2.tar.gz) = 9f6a7b16c95eb21a1ff6acb2102389c8c8c72226
+RMD160 (bspwm-0.9.2.tar.gz) = 66b2ae8ea46542732a44aa0ac9a58136f3cbf6cc
+SHA512 (bspwm-0.9.2.tar.gz) = fe46d74ecc1ab29caa038d8bb54e13cde8a40e28a014f8b313222db6e8a3323d3ec2103f4ff78008bb0252fa2d560424788ea3be66faaf38a2b8aa3b46b09e2c
+Size (bspwm-0.9.2.tar.gz) = 92558 bytes
+SHA1 (patch-Makefile) = 3880d785f02f60ba4291738070e6f9c8f7494f22
diff --git a/wm/bspwm/patches/patch-Makefile b/wm/bspwm/patches/patch-Makefile
index d8d78c27a83..e34e62df4b1 100644
--- a/wm/bspwm/patches/patch-Makefile
+++ b/wm/bspwm/patches/patch-Makefile
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile,v 1.1 2015/09/06 18:32:10 wiedi Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/05/31 05:22:09 maya Exp $
 
 make cp portable
 
---- Makefile.orig	2015-09-06 15:46:55.165764871 +0000
-+++ Makefile
-@@ -49,7 +49,7 @@ install:
- 	cp -p contrib/freedesktop/bspwm-session "$(DESTDIR)$(BINPREFIX)"
+--- Makefile.orig	2017-05-30 14:30:11.527194924 -0400
++++ Makefile	2017-05-30 14:30:19.632593865 -0400
+@@ -41,7 +41,7 @@
+ 	cp -pf bspc "$(DESTDIR)$(BINPREFIX)"
  	mkdir -p "$(DESTDIR)$(MANPREFIX)"/man1
  	cp -p doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1
 -	cp -Pp doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1
 +	cp -p doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1
  	mkdir -p "$(DESTDIR)$(BASHCPL)"
  	cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
- 	mkdir -p "$(DESTDIR)$(ZSHCPL)"
+ 	mkdir -p "$(DESTDIR)$(FISHCPL)"