Fix build with GHC 9

5 files changed, 95 insertions, 4 deletions

diff --git a/wm/xmonad/MESSAGE b/wm/xmonad/MESSAGE
index 849ea774be0..3119e1ef8c0 100644
--- a/wm/xmonad/MESSAGE
+++ b/wm/xmonad/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-# $NetBSD: MESSAGE,v 1.1 2016/01/04 12:45:36 szptvlfn Exp $
+$NetBSD: MESSAGE,v 1.2 2021/04/25 14:19:34 pho Exp $
 
     1. create ~/.xmonad/xmonad.hs
     2. $ ghc --make ~/.xmonad/xmonad.hs
diff --git a/wm/xmonad/Makefile b/wm/xmonad/Makefile
index be40be796f7..9bc00aeb40b 100644
--- a/wm/xmonad/Makefile
+++ b/wm/xmonad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/01/11 14:37:18 pho Exp $
+# $NetBSD: Makefile,v 1.14 2021/04/25 14:19:34 pho Exp $
 
 DISTNAME=	xmonad-0.15
 PKGNAME=	${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=	modified-bsd
 # 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_STAGE.1=	post-extract
 SUBST_FILES.1=	xmonad.cabal
 SUBST_SED.1=	-e "s|executable xmonad|executable xmonad+  buildable: False|"
 
diff --git a/wm/xmonad/PLIST b/wm/xmonad/PLIST
new file mode 100644
index 00000000000..ee375944717
--- /dev/null
+++ b/wm/xmonad/PLIST
@@ -0,0 +1,73 @@
+@comment $NetBSD: PLIST,v 1.4 2021/04/25 14:19:34 pho Exp $
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_xmonad.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_xmonad.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad.p_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.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Core.p_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.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Main.p_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.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/XMonad/Operations.p_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
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+lib/${PKGNAME}/${HS_VERSION}/package-description
+lib/${PKGNAME}/${HS_VERSION}/package-id
+man/man1/xmonad.1
+share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Config.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Core.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Layout.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Main.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-ManageHook.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-Operations.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad-StackSet.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/XMonad.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-124.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-45.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-46.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-60.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-61.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-95.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-A.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-All.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-B.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-C.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-D.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-E.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-F.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-G.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-H.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-I.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-J.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-K.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-L.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-M.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-N.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-O.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-P.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Q.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-R.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-S.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-T.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-U.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-V.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-W.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-X.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Z.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css
+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
diff --git a/wm/xmonad/distinfo b/wm/xmonad/distinfo
index 813949b120f..3785f1a378d 100644
--- a/wm/xmonad/distinfo
+++ b/wm/xmonad/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2020/01/11 14:01:07 pho Exp $
+$NetBSD: distinfo,v 1.6 2021/04/25 14:19:34 pho Exp $
 
 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
+SHA1 (patch-src_XMonad_Main.hs) = a880f203289cd47f99a406ac81ac0b5ed7aeb910
diff --git a/wm/xmonad/patches/patch-src_XMonad_Main.hs b/wm/xmonad/patches/patch-src_XMonad_Main.hs
new file mode 100644
index 00000000000..b90bdd8dada
--- /dev/null
+++ b/wm/xmonad/patches/patch-src_XMonad_Main.hs
@@ -0,0 +1,17 @@
+$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 })
+