From 80271817375bdf4f7fedc280c3e97a820fd5c5a1 Mon Sep 17 00:00:00 2001
From: szptvlfn <szptvlfn>
Date: Mon, 4 Jan 2016 12:45:36 +0000
Subject: Update to 0.12

CHANGES:
## 0.12 (December 14, 2015)

  * Compiles with GHC 7.10.2, 7.8.4, and 7.6.3

  * Use of [data-default][] allows using `def` where previously you
    had to write `defaultConfig`, `defaultXPConfig`, etc.

  * The [setlocale][] package is now used instead of a binding shipped
    with xmonad proper allowing the use of `Main.hs` instead of
    `Main.hsc`

  * No longer encodes paths for `spawnPID`

  * The default `manageHook` no longer floats Gimp windows

  * Doesn't crash when there are fewer workspaces than screens

  * `Query` is now an instance of `Applicative`

  * Various improvements to the example configuration file

[data-default]: http://hackage.haskell.org/package/data-default
[setlocale]: https://hackage.haskell.org/package/setlocale
---
 wm/xmonad/MESSAGE       |  8 ++++++++
 wm/xmonad/Makefile      | 18 +++++++++++++++---
 wm/xmonad/PLIST         |  4 ++--
 wm/xmonad/buildlink3.mk |  8 +++++---
 wm/xmonad/distinfo      | 10 +++++-----
 5 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 wm/xmonad/MESSAGE

(limited to 'wm/xmonad')

diff --git a/wm/xmonad/MESSAGE b/wm/xmonad/MESSAGE
new file mode 100644
index 00000000000..849ea774be0
--- /dev/null
+++ b/wm/xmonad/MESSAGE
@@ -0,0 +1,8 @@
+===========================================================================
+# $NetBSD: MESSAGE,v 1.1 2016/01/04 12:45:36 szptvlfn Exp $
+
+    1. create ~/.xmonad/xmonad.hs
+    2. $ ghc --make ~/.xmonad/xmonad.hs
+    3. add exec xmonad to .xinitrc
+    4. add ~/.xmonad to your $PATH
+===========================================================================
diff --git a/wm/xmonad/Makefile b/wm/xmonad/Makefile
index d5e01fb1b95..bfa9e42a3ba 100644
--- a/wm/xmonad/Makefile
+++ b/wm/xmonad/Makefile
@@ -1,21 +1,33 @@
-# $NetBSD: Makefile,v 1.6 2015/05/31 12:59:15 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.7 2016/01/04 12:45:36 szptvlfn Exp $
 
-DISTNAME=	xmonad-0.11
+DISTNAME=	xmonad-0.12
 PKGNAME=	${DISTNAME}
-PKGREVISION=	4
 CATEGORIES=	wm
 
 MAINTAINER=	esg@sdf.lonestar.org
 COMMENT=	Tiling window manager
 LICENSE=	modified-bsd
 
+# don't need default binary
+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_CLASSES+=	2
+SUBST_STAGE.2=	post-patch
+SUBST_FILES.2=	xmonad.cabal
+SUBST_FILTER_CMD.2=	${TR} '+' \\n
+
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
+.include "../../devel/hs-data-default/buildlink3.mk"
 .include "../../devel/hs-extensible-exceptions/buildlink3.mk"
 .include "../../devel/hs-mtl/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"
diff --git a/wm/xmonad/PLIST b/wm/xmonad/PLIST
index 0527853f5ce..7bf90a2d65e 100644
--- a/wm/xmonad/PLIST
+++ b/wm/xmonad/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/22 21:34:24 szptvlfn Exp $
-bin/xmonad
+@comment $NetBSD: PLIST,v 1.2 2016/01/04 12:45:36 szptvlfn Exp $
 lib/${PKGNAME}/${HASKELL_VERSION}/HS${PKGNAME}.o
+lib/${PKGNAME}/${HASKELL_VERSION}/Paths_xmonad.hi
 lib/${PKGNAME}/${HASKELL_VERSION}/XMonad.hi
 lib/${PKGNAME}/${HASKELL_VERSION}/XMonad/Config.hi
 lib/${PKGNAME}/${HASKELL_VERSION}/XMonad/Core.hi
diff --git a/wm/xmonad/buildlink3.mk b/wm/xmonad/buildlink3.mk
index c9b51c179d3..520c36e58fc 100644
--- a/wm/xmonad/buildlink3.mk
+++ b/wm/xmonad/buildlink3.mk
@@ -1,17 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/05/31 12:59:15 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2016/01/04 12:45:36 szptvlfn Exp $
 
 BUILDLINK_TREE+=	xmonad
 
 .if !defined(XMONAD_BUILDLINK3_MK)
 XMONAD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xmonad+=	xmonad>=0.11
-BUILDLINK_ABI_DEPENDS.xmonad+=	xmonad>=0.11nb4
+BUILDLINK_API_DEPENDS.xmonad+=	xmonad>=0.12
+BUILDLINK_ABI_DEPENDS.xmonad+=	xmonad>=0.12
 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 "../../devel/hs-setlocale/buildlink3.mk"
 .include "../../devel/hs-utf8-string/buildlink3.mk"
 .include "../../x11/hs-X11/buildlink3.mk"
 .endif	# XMONAD_BUILDLINK3_MK
diff --git a/wm/xmonad/distinfo b/wm/xmonad/distinfo
index 6e9e1f8f946..c1d85d96bab 100644
--- a/wm/xmonad/distinfo
+++ b/wm/xmonad/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/02 23:42:56 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/01/04 12:45:36 szptvlfn Exp $
 
-SHA1 (xmonad-0.11.tar.gz) = 9ab0c44283812a0a1883ae975221e72d17c4decb
-RMD160 (xmonad-0.11.tar.gz) = f323a335a1e82b26f59063fab381e1410cd9f5fc
-SHA512 (xmonad-0.11.tar.gz) = 34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
-Size (xmonad-0.11.tar.gz) = 59119 bytes
+SHA1 (xmonad-0.12.tar.gz) = e7719e9b3db9994190f4da831dadce51a265a374
+RMD160 (xmonad-0.12.tar.gz) = 957e891dc3976e5dbeb0007a4835e5d07c75a89d
+SHA512 (xmonad-0.12.tar.gz) = e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab
+Size (xmonad-0.12.tar.gz) = 61436 bytes
-- 
cgit v1.2.3