Update to xmonad-0.17.0

0.17.0 (October 27, 2021)
Enhancements
* Migrated X.L.LayoutCombinators.(|||) into XMonad.Layout, providing the
  ability to directly jump to a layout with the JumpToLayout message.
* Recompilation now detects stack.yaml (can be a symlink) alongside
  xmonad.hs and switches to using stack ghc. We also updated INSTALL.md
  with instructions for cabal-install that lead to correct recompilation.
* Deprecation warnings during recompilation are no longer suppressed to
  make it easier for us to clean up the codebase. These can still be
  suppressed manually using an OPTIONS_GHC pragma with -Wno-deprecations.
* Improve handling of XDG directories.
  * If all three of xmonad's environment variables (XMONAD_DATA_DIR,
    XMONAD_CONFIG_DIR, and XMONAD_CACHE_DIR) are set, use them.
  * If there is a build script called build (see these build scripts for
    usage examples) or configuration xmonad.hs in ~/.xmonad, set all three
    directories to ~/.xmonad.
  * Otherwise, use the xmonad directory in XDG_DATA_HOME, XDG_CONFIG_HOME,
    and XDG_CACHE_HOME (or their respective fallbacks). These directories
    are created if necessary.
* In the cases of 1. and 3., the build script or executable is expected to
  be in the config dir.
* Additionally, the xmonad config binary and intermediate object files were
  moved to the cache directory (only relevant if using XDG or
  XMONAD_CACHE_DIR).
* Added Foldable, Functor, and Traversable instances for Stack.
* Added Typeable layout constraint to LayoutClass, making it possible to
  cast Layout back into a concrete type and extract current layout state
  from it.
* Export constructor for Choose and CLR from Module.Layout to allow
  pattern-matching on the left and right sub-layouts of Choose l r a.
* Added withUnfocused function to XMonad.Operations, allowing for X
  operations to be applied to unfocused windows.

Bug Fixes
* Fixed a bug when using multiple screens with different dimensions,
  causing some floating windows to be smaller/larger than the size they
  requested.
* Compatibility with GHC 9.0
* Fixed dunst notifications being obscured when moving
  floats. https://github.com/xmonad/xmonad/issues/208

Breaking Changes
* Made (<&&>) and (<||>) non-strict in their right operand; i.e., these
  operators now implement short-circuit evaluation so the right operand is
  evaluated only if the left operand does not suffice to determine the
  result.
* Change ScreenDetail to a newtype and make RationalRect strict in its
  contents.
* Added the extensibleConf field to XConfig which makes it easier for
  contrib modules to have composable configuration (custom hooks, …).
* util/GenerateManpage.hs is no longer distributed in the tarball. Instead,
  the manpage source is regenerated and manpage rebuilt automatically in
  CI.
* DestroyWindowEvent is now broadcasted to layouts to let them know
  window-specific resources can be discarded.

6 files changed, 29 insertions, 46 deletions

diff --git a/wm/xmonad/MESSAGE b/wm/xmonad/MESSAGE
index 3119e1ef8c0..34ab074332b 100644
--- a/wm/xmonad/MESSAGE
+++ b/wm/xmonad/MESSAGE
@@ -1,8 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2021/04/25 14:19:34 pho Exp $
+$NetBSD: MESSAGE,v 1.3 2022/02/11 15:57:01 pho Exp $
 
     1. create ~/.xmonad/xmonad.hs
-    2. $ ghc --make ~/.xmonad/xmonad.hs
-    3. add exec xmonad to .xinitrc
-    4. add ~/.xmonad to your $PATH
+    2. add exec xmonad to .xinitrc
+
+You no longer need to compile your xmonad.hs manually. It is now
+automatically compiled and loaded by the main executable of xmonad.
 ===========================================================================
diff --git a/wm/xmonad/Makefile b/wm/xmonad/Makefile
index 2290315d974..0b8e2dc6019 100644
--- a/wm/xmonad/Makefile
+++ b/wm/xmonad/Makefile
@@ -1,31 +1,19 @@
-# $NetBSD: Makefile,v 1.16 2022/01/18 02:48:30 pho Exp $
+# $NetBSD: Makefile,v 1.17 2022/02/11 15:57:01 pho Exp $
 
-DISTNAME=	xmonad-0.15
+DISTNAME=	xmonad-0.17.0
 PKGNAME=	${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	wm
 
 MAINTAINER=	esg@sdf.lonestar.org
 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=	post-extract
-SUBST_FILES.1=	xmonad.cabal
-SUBST_SED.1=	-e "s|executable xmonad|executable xmonad+  buildable: False|"
-
-SUBST_CLASSES+=		2
-SUBST_STAGE.2=		pre-configure
-SUBST_FILES.2=		xmonad.cabal
-SUBST_FILTER_CMD.2=	${TR} '+' \\n
-
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	share/examples/xmonad
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/man/xmonad.hs ${DESTDIR}${PREFIX}/share/examples/xmonad
 
 .include "../../devel/hs-data-default/buildlink3.mk"
 .include "../../devel/hs-extensible-exceptions/buildlink3.mk"
diff --git a/wm/xmonad/PLIST b/wm/xmonad/PLIST
index ee375944717..f368a94050d 100644
--- a/wm/xmonad/PLIST
+++ b/wm/xmonad/PLIST
@@ -1,20 +1,31 @@
-@comment $NetBSD: PLIST,v 1.4 2021/04/25 14:19:34 pho Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/02/11 15:57:01 pho Exp $
+bin/xmonad
+lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_xmonad.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Paths_xmonad.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Paths_xmonad.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Config.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Config.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Config.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Core.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Core.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Core.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Layout.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Layout.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Layout.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Main.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Main.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Main.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/ManageHook.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/ManageHook.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/ManageHook.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Operations.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Operations.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Operations.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/StackSet.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/StackSet.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/StackSet.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
@@ -71,3 +82,4 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json
 share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css
 share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png
 share/doc/${HS_PLATFORM}/${PKGNAME}/html/xmonad.haddock
+share/examples/xmonad/xmonad.hs
diff --git a/wm/xmonad/buildlink3.mk b/wm/xmonad/buildlink3.mk
index a7ef592b82d..8e2d9bf61de 100644
--- a/wm/xmonad/buildlink3.mk
+++ b/wm/xmonad/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.9 2022/01/18 02:48:30 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2022/02/11 15:57:01 pho Exp $
 
 BUILDLINK_TREE+=	xmonad
 
 .if !defined(XMONAD_BUILDLINK3_MK)
 XMONAD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xmonad+=	xmonad>=0.15
-BUILDLINK_ABI_DEPENDS.xmonad+=	xmonad>=0.15nb2
+BUILDLINK_API_DEPENDS.xmonad+=	xmonad>=0.17.0
+BUILDLINK_ABI_DEPENDS.xmonad+=	xmonad>=0.17.0
 BUILDLINK_PKGSRCDIR.xmonad?=	../../wm/xmonad
 
 .include "../../devel/hs-data-default/buildlink3.mk"
diff --git a/wm/xmonad/distinfo b/wm/xmonad/distinfo
index d90d0654d4d..85802f65c56 100644
--- a/wm/xmonad/distinfo
+++ b/wm/xmonad/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:25:21 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/02/11 15:57:01 pho Exp $
 
-BLAKE2s (xmonad-0.15.tar.gz) = 14fccf368cdcf0ead36e7c472c00672e8aebf6fe1fe2f10cabb1227f9fec58fb
-SHA512 (xmonad-0.15.tar.gz) = f881f3faa4f5a0de7a5a37118cd7041083ae3a7569c7094b55dedb9aa858176789aff459d426b237ebae5cc4598b06de790938775a7ac968c2d76be3f0efc8ba
-Size (xmonad-0.15.tar.gz) = 68822 bytes
-SHA1 (patch-src_XMonad_Main.hs) = a880f203289cd47f99a406ac81ac0b5ed7aeb910
+BLAKE2s (xmonad-0.17.0.tar.gz) = abaa46d6845a34f516154614879e9930d71958413377f710e2e034344b8b6545
+SHA512 (xmonad-0.17.0.tar.gz) = 1ec46ee61f4bf1879ea638e9be83378273050670ed2ee0f00e7d43b188cc29a874aa5b40076162a1ef0038802cc43f675773951f9b7d1f26329f9d105c28b3f7
+Size (xmonad-0.17.0.tar.gz) = 93489 bytes
diff --git a/wm/xmonad/patches/patch-src_XMonad_Main.hs b/wm/xmonad/patches/patch-src_XMonad_Main.hs
deleted file mode 100644
index b90bdd8dada..00000000000
--- a/wm/xmonad/patches/patch-src_XMonad_Main.hs
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_XMonad_Main.hs,v 1.1 2021/04/25 14:19:34 pho Exp $
-
-Fix build with GHC 9. "as-pattern" can no longer be surrounded by
-whitespace because it's going to make an ambiguity with dependent
-Haskell.
-
---- src/XMonad/Main.hs.orig	2021-04-25 14:11:38.974316759 +0000
-+++ src/XMonad/Main.hs
-@@ -61,7 +61,7 @@ xmonad conf = do
- 
-     let launch' args = do
-               catchIO buildLaunch
--              conf' @ XConfig { layoutHook = Layout l }
-+              conf'@XConfig { layoutHook = Layout l }
-                   <- handleExtraArgs conf args conf{ layoutHook = Layout (layoutHook conf) }
-               withArgs [] $ launch (conf' { layoutHook = l })
-