Update to xmonad-0.15

* Reimplement sendMessage to deal properly with windowset changes made
  during handling.
* Add new library functions windowBracket and modifyWindowSet to
  XMonad.Operations.

3 files changed, 15 insertions, 21 deletions

diff --git a/wm/xmonad/Makefile b/wm/xmonad/Makefile
index 68d04da6186..2a252f10019 100644
--- a/wm/xmonad/Makefile
+++ b/wm/xmonad/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2020/01/02 17:11:37 pho Exp $
+# $NetBSD: Makefile,v 1.12 2020/01/11 14:01:07 pho Exp $
 
-DISTNAME=	xmonad-0.14
+DISTNAME=	xmonad-0.15
 PKGNAME=	${DISTNAME}
 CATEGORIES=	wm
 
@@ -9,10 +9,12 @@ COMMENT=	Tiling window manager
 LICENSE=	modified-bsd
 
 # don't need default binary (see MESSAGE)
+# TODO: This should probably be reconsidered as the default executable
+# is now capable of loading custom configuration files.
 SUBST_CLASSES+=	1
 SUBST_STAGE.1=	pre-patch
 SUBST_FILES.1=	xmonad.cabal
-SUBST_SED.1=	-e "s|executable xmonad|executable xmonad+    buildable: False|"
+SUBST_SED.1=	-e "s|executable xmonad|executable xmonad+  buildable: False|"
 
 SUBST_CLASSES+=		2
 SUBST_STAGE.2=		pre-configure
@@ -22,22 +24,17 @@ SUBST_FILTER_CMD.2=	${TR} '+' \\n
 # Work around a Cabal bug. It ignores "ld-options" in
 # {package}.buildinfo while linking shared libraries:
 # https://github.com/haskell/cabal/issues/4925
-HASKELL_ENABLE_SHARED_LIBRARY= no
+HASKELL_ENABLE_SHARED_LIBRARY=	no
 
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
+.include "../../mk/haskell.mk"
 .include "../../devel/hs-data-default/buildlink3.mk"
 .include "../../devel/hs-extensible-exceptions/buildlink3.mk"
-.include "../../devel/hs-mtl/buildlink3.mk"
-.include "../../math/hs-semigroups/buildlink3.mk"
 .include "../../devel/hs-setlocale/buildlink3.mk"
 .include "../../devel/hs-utf8-string/buildlink3.mk"
-.include "../../mk/haskell.mk"
 .include "../../x11/hs-X11/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/xmonad/buildlink3.mk b/wm/xmonad/buildlink3.mk
index 31133ab39f6..fa5d27529e8 100644
--- a/wm/xmonad/buildlink3.mk
+++ b/wm/xmonad/buildlink3.mk
@@ -1,19 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.6 2020/01/02 17:11:37 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2020/01/11 14:01:07 pho Exp $
 
 BUILDLINK_TREE+=	xmonad
 
 .if !defined(XMONAD_BUILDLINK3_MK)
 XMONAD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xmonad+=	xmonad>=0.14
-BUILDLINK_ABI_DEPENDS.xmonad+=	xmonad>=0.14
+BUILDLINK_API_DEPENDS.xmonad+=	xmonad>=0.15
+BUILDLINK_ABI_DEPENDS.xmonad+=	xmonad>=0.15
 BUILDLINK_PKGSRCDIR.xmonad?=	../../wm/xmonad
 
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../devel/hs-data-default/buildlink3.mk"
 .include "../../devel/hs-extensible-exceptions/buildlink3.mk"
-.include "../../devel/hs-mtl/buildlink3.mk"
-.include "../../math/hs-semigroups/buildlink3.mk"
 .include "../../devel/hs-setlocale/buildlink3.mk"
 .include "../../devel/hs-utf8-string/buildlink3.mk"
 .include "../../x11/hs-X11/buildlink3.mk"
diff --git a/wm/xmonad/distinfo b/wm/xmonad/distinfo
index 2ca32c195db..813949b120f 100644
--- a/wm/xmonad/distinfo
+++ b/wm/xmonad/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2020/01/02 17:11:37 pho Exp $
+$NetBSD: distinfo,v 1.5 2020/01/11 14:01:07 pho Exp $
 
-SHA1 (xmonad-0.14.tar.gz) = ca54790a9bd74ad7ef952df95db5445f113a7f39
-RMD160 (xmonad-0.14.tar.gz) = 15df267061e46754a690f7aa72419910080696c5
-SHA512 (xmonad-0.14.tar.gz) = 6b9c83ba5a524a2b2c2d0087a95fdabd477995bcf7751dff116df4eb1bfaee5df87a7070963c05bc2509463cf386c8c5946620731eac70c30ea450911952c57d
-Size (xmonad-0.14.tar.gz) = 65744 bytes
+SHA1 (xmonad-0.15.tar.gz) = 817e3235d82652444a3a85debc98f81208c848fb
+RMD160 (xmonad-0.15.tar.gz) = f109498a75c64ac05b47a13d5b5fe241edc95585
+SHA512 (xmonad-0.15.tar.gz) = f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba
+Size (xmonad-0.15.tar.gz) = 68822 bytes