A new release arrived while this was pending. How does this look? OK?
I'm running it here.
From 8b1e44c8278b356ccdc2958da81264204dc788bd Mon Sep 17 00:00:00 2001
From: Greg Steuck <greg@nest.cx>
Date: Sun, 17 Oct 2021 18:47:22 -0700
Subject: [PATCH] Upgrade x11/xmonad 0.15->0.17.0
---
x11/xmonad/Makefile | 20 +++++--------
x11/xmonad/distinfo | 32 ++++++---------------
x11/xmonad/patches/patch-man_xmonad_1 | 8 +++---
x11/xmonad/patches/patch-src_XMonad_Main_hs | 8 +++---
x11/xmonad/patches/patch-xmonad_cabal | 8 +++---
x11/xmonad/pkg/PLIST | 2 +-
6 files changed, 28 insertions(+), 50 deletions(-)
diff --git a/x11/xmonad/Makefile b/x11/xmonad/Makefile
index 361408e7dde..37722552b9f 100644
--- a/x11/xmonad/Makefile
+++ b/x11/xmonad/Makefile
@@ -3,8 +3,7 @@
COMMENT = tiling window manager
MODCABAL_STEM = xmonad
-MODCABAL_VERSION = 0.15
-REVISION = 0
+MODCABAL_VERSION = 0.17.0
PKGNAME = ${DISTNAME}
CATEGORIES = x11
@@ -18,25 +17,20 @@ WANTLIB = X11 Xext Xinerama Xrandr Xss c charset ffi gmp \
MODULES = devel/cabal
MODCABAL_MANIFEST = \
- X11 1.9.2 0 \
- data-default 0.7.1.1 0 \
- data-default-class 0.1.2.0 0 \
- data-default-instances-containers 0.0.1 0 \
- data-default-instances-dlist 0.0.1 0 \
- data-default-instances-old-locale 0.0.1 0 \
- dlist 1.0 0 \
- extensible-exceptions 0.1.1.4 0 \
- old-locale 1.0.0.7 2 \
- utf8-string 1.0.1.1 3 \
+ X11 1.10.2 0 \
+ data-default-class 0.1.2.0 0 \
+ hsc2hs 0.68.7 1 \
LIB_DEPENDS = converters/libiconv \
devel/gmp \
devel/libffi
+FIX_CRLF_FILES = xmonad.cabal
+
post-install:
${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${DISTNAME}
- ${INSTALL_DATA} ${WRKSRC}/CONFIG \
+ ${INSTALL_DATA} ${WRKSRC}/TUTORIAL.md \
${PREFIX}/share/doc/${DISTNAME}
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${DISTNAME}
${INSTALL_DATA} ${FILESDIR}/xmonad-config.cabal \
diff --git a/x11/xmonad/distinfo b/x11/xmonad/distinfo
index 6fd50cc4e3a..2f09a3a6ca4 100644
--- a/x11/xmonad/distinfo
+++ b/x11/xmonad/distinfo
@@ -1,26 +1,10 @@
-SHA256 (hackage/X11-1.9.2.tar.gz) = BbDZo3n0arihcDoLyxsLl8CAdkOyEHHuREkv3oi3fgQ=
-SHA256 (hackage/data-default-0.7.1.1.tar.gz) = sPldJ5zXXKyqgVKgFZDcNGD3E09oQLNwUquzujyypRE=
+SHA256 (hackage/X11-1.10.2.tar.gz) = 4S9kPaazJGNBzxe4uyIHDs2nSBE63a4a4Rbpk+gB4sY=
SHA256 (hackage/data-default-class-0.1.2.0.tar.gz) = TwG0I/AAw+BpqvUqNIVkplNnl/MUmLuFw9tL0tCXPlY=
-SHA256 (hackage/data-default-instances-containers-0.0.1.tar.gz) = pV4HrwBcmBXYLz/JXhJduCmUN3yfSnaUKIeHAdTsCBo=
-SHA256 (hackage/data-default-instances-dlist-0.0.1.tar.gz) = fWg3Ecvwir163NWsK+glOBMI0iA5cxWlVw/mG3GbWVk=
-SHA256 (hackage/data-default-instances-old-locale-0.0.1.tar.gz) = YNOwKSKVjEkI178rJN32FRFmV0X3hCJ9IGdFeEsMCAI=
-SHA256 (hackage/dlist-1.0.tar.gz) = Fz1jcyi7Fz/MNl8w0p/0qUKSoeDlVYrrPfwR3oFRARU=
-SHA256 (hackage/extensible-exceptions-0.1.1.4.tar.gz) = bOXogBdgOFpAjatxtTVQ+HYp5mGyYL3CzUHGpDm244g=
-SHA256 (hackage/old-locale-1.0.0.7.tar.gz) = 26+L9riI+5iEVwUHkpaiPD9A7i9EnfcxL39/HeGNe1A=
-SHA256 (hackage/old-locale-1.0.0.7_2.cabal) = +pmL4sfgDNJqbpB1vqeQyq85Msqj6Ul61pvCA4DdaRE=
-SHA256 (hackage/utf8-string-1.0.1.1.tar.gz) = +wueOsvgYFvNHGPlHykKe7vmYo36MpT/RT5CNfuu8UA=
-SHA256 (hackage/utf8-string-1.0.1.1_3.cabal) = aMxs9mXnISM0pRtj1pNtrqygI7LP6GN9EwrP6V+RcAs=
-SHA256 (hackage/xmonad-0.15.tar.gz) = SnlI5u7l40on0VREWJreOz+hreytvze5Q8/4NIOA+Sg=
-SIZE (hackage/X11-1.9.2.tar.gz) = 190757
-SIZE (hackage/data-default-0.7.1.1.tar.gz) = 1627
+SHA256 (hackage/hsc2hs-0.68.7.tar.gz) = /XkV5B4+07x3UP7g6K3StPMtysi3xUTP31VCKTIjiUo=
+SHA256 (hackage/hsc2hs-0.68.7_1.cabal) = Sg9oYKF+fCRWRpdePCmBQWr9y2p7NVPDEAXrNkGn9Vs=
+SHA256 (hackage/xmonad-0.17.0.tar.gz) = HrdNafxi3A1BJPsWlDAyjJdUQP+iV3Zt4Lcbnn67GhM=
+SIZE (hackage/X11-1.10.2.tar.gz) = 192634
SIZE (hackage/data-default-class-0.1.2.0.tar.gz) = 2522
-SIZE (hackage/data-default-instances-containers-0.0.1.tar.gz) = 1659
-SIZE (hackage/data-default-instances-dlist-0.0.1.tar.gz) = 1503
-SIZE (hackage/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
-SIZE (hackage/dlist-1.0.tar.gz) = 18667
-SIZE (hackage/extensible-exceptions-0.1.1.4.tar.gz) = 8531
-SIZE (hackage/old-locale-1.0.0.7.tar.gz) = 3384
-SIZE (hackage/old-locale-1.0.0.7_2.cabal) = 1071
-SIZE (hackage/utf8-string-1.0.1.1.tar.gz) = 8667
-SIZE (hackage/utf8-string-1.0.1.1_3.cabal) = 1151
-SIZE (hackage/xmonad-0.15.tar.gz) = 68822
+SIZE (hackage/hsc2hs-0.68.7.tar.gz) = 38630
+SIZE (hackage/hsc2hs-0.68.7_1.cabal) = 2794
+SIZE (hackage/xmonad-0.17.0.tar.gz) = 93489
diff --git a/x11/xmonad/patches/patch-man_xmonad_1 b/x11/xmonad/patches/patch-man_xmonad_1
index e77913d611a..6bdae4b9491 100644
--- a/x11/xmonad/patches/patch-man_xmonad_1
+++ b/x11/xmonad/patches/patch-man_xmonad_1
@@ -2,12 +2,12 @@ $OpenBSD: patch-man_xmonad_1,v 1.4 2019/09/30 12:41:12 kili Exp $
Index: man/xmonad.1
--- man/xmonad.1.orig
+++ man/xmonad.1
-@@ -100,7 +100,7 @@ Launch terminal
- .RE
+@@ -87,7 +87,7 @@ Display detailed version of \f[I]xmonad\f[R]
+ Launch terminal
.TP
.B mod\-p
-Launch dmenu
+Launch dmenu_run
- .RS
- .RE
.TP
+ .B mod\-shift\-p
+ Launch gmrun
diff --git a/x11/xmonad/patches/patch-src_XMonad_Main_hs b/x11/xmonad/patches/patch-src_XMonad_Main_hs
index 2455a58efdd..ea9abc5a430 100644
--- a/x11/xmonad/patches/patch-src_XMonad_Main_hs
+++ b/x11/xmonad/patches/patch-src_XMonad_Main_hs
@@ -12,13 +12,13 @@ Index: src/XMonad/Main.hs
module XMonad.Main (xmonad, launch) where
-import System.Locale.SetLocale
- import qualified Control.Exception.Extensible as E
+ import qualified Control.Exception as E
import Data.Bits
import Data.List ((\\))
-@@ -168,8 +167,6 @@ sendReplace = do
+@@ -169,8 +168,6 @@ sendReplace = do
-- your custom binary with the resume flag set to @True@.
- launch :: (LayoutClass l Window, Read (l Window)) => XConfig l -> IO ()
- launch initxmc = do
+ launch :: (LayoutClass l Window, Read (l Window)) => XConfig l -> Directories -> IO ()
+ launch initxmc drs = do
- -- setup locale information from environment
- setLocale LC_ALL (Just "")
-- ignore SIGPIPE and SIGCHLD
diff --git a/x11/xmonad/patches/patch-xmonad_cabal b/x11/xmonad/patches/patch-xmonad_cabal
index d6e554b224b..1132815976d 100644
--- a/x11/xmonad/patches/patch-xmonad_cabal
+++ b/x11/xmonad/patches/patch-xmonad_cabal
@@ -1,4 +1,4 @@
-$OpenBSD: patch-xmonad_cabal,v 1.12 2019/09/30 12:41:12 kili Exp $
+$OpenBSD$
I don't like the idea of yet another port with nothing than a binding
for setlocale(3), and I don't know which part of xmonad would benefit
@@ -7,11 +7,11 @@ from it.
Index: xmonad.cabal
--- xmonad.cabal.orig
+++ xmonad.cabal
-@@ -81,7 +81,6 @@ library
+@@ -75,7 +75,6 @@ library
, filepath
, mtl
, process
- , setlocale
+ , time
+ , transformers >= 0.3
, unix
- , utf8-string >= 0.3 && < 1.1
- ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind
diff --git a/x11/xmonad/pkg/PLIST b/x11/xmonad/pkg/PLIST
index 112db1d8580..27a00db7612 100644
--- a/x11/xmonad/pkg/PLIST
+++ b/x11/xmonad/pkg/PLIST
@@ -4,7 +4,7 @@
@bin bin/${MODCABAL_STEM}
@man man/man1/${MODCABAL_STEM}.1
share/doc/${PKGNAME}/
-share/doc/${PKGNAME}/CONFIG
+share/doc/${PKGNAME}/TUTORIAL.md
share/examples/${PKGNAME}/
share/examples/${PKGNAME}/build
share/examples/${PKGNAME}/${MODCABAL_STEM}-config.cabal
--
2.33.1
No comments:
Post a Comment