cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to xmonad-0.15.

Browse Source 
Joint work with Greg Steuck.
This commit is contained in:
kili 2019-09-30 12:41:12 +00:00
parent 36cae14336
commit 302816b6dc
6 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x11/xmonad/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.57 2019/09/10 13:51:31 kili Exp $
# $OpenBSD: Makefile,v 1.58 2019/09/30 12:41:12 kili Exp $
COMMENT-main = tiling window manager
COMMENT-lib = libraries for runtime configuration
DISTNAME = xmonad-0.13
REVISION = 1
REVISION-lib = 2
DISTNAME = xmonad-0.15
PKGNAME-main = ${DISTNAME}
PKGNAME-lib = ${DISTNAME:S,-,-lib-,}
CATEGORIES = x11
@ -16,14 +15,14 @@ MULTI_PACKAGES = -main -lib
# BSD3
PERMIT_PACKAGE = Yes
WANTLIB-main = X11 Xext Xinerama Xrandr Xss c m iconv \
pthread util
WANTLIB-main = X11 Xext Xinerama Xrandr Xss c charset ffi gmp \
m iconv pthread util
WANTLIB-lib =
MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register nort
MODGHC_PACKAGE_KEY = 1dqhBbsPfpPL2BQEiEEfSU
MODGHC_PACKAGE_KEY = 9L0IDbyIoHf7Mpz81NeFlT
# Required because of the nort tag in MODGHC_BUILD
SUBST_VARS += MODGHC_PACKAGE_KEY
@ -31,10 +30,11 @@ SUBST_VARS += MODGHC_PACKAGE_KEY
BUILD_DEPENDS = ${RUN_DEPENDS-lib}
RUN_DEPENDS-lib = devel/hs-data-default \
devel/hs-extensible-exceptions \
devel/hs-mtl \
devel/hs-utf8-string>=0.3,<1.1 \
x11/hs-X11>=1.8,<1.9
LIB_DEPENDS-main = converters/libiconv
LIB_DEPENDS-main = converters/libiconv \
devel/gmp \
devel/libffi
# MODGHC_BUILD contains 'nort', an explicity dependency is needed for
# the -lib subpackage (plus the tweaks to MODGHC_SETUP_CONF_ARGS below).

4
x11/xmonad/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ghc/xmonad-0.13.tar.gz) = +fgbY1afGMd3qTl0ECTsOuNOTshAFeXMUPZiIDSjA8o=
SIZE (ghc/xmonad-0.13.tar.gz) = 72034
SHA256 (ghc/xmonad-0.15.tar.gz) = SnlI5u7l40on0VREWJreOz+hreytvze5Q8/4NIOA+Sg=
SIZE (ghc/xmonad-0.15.tar.gz) = 68822

9
x11/xmonad/patches/patch-man_xmonad_1
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-man_xmonad_1,v 1.3 2017/11/07 22:46:32 kili Exp $
--- man/xmonad.1.orig Mon Dec 21 20:12:39 2015
+++ man/xmonad.1 Fri Dec 30 11:21:58 2016
@@ -99,7 +99,7 @@ Launch terminal
$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
.TP
.B mod\-p

4
x11/xmonad/patches/patch-src_XMonad_Main_hs
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_XMonad_Main_hs,v 1.2 2018/01/22 22:08:42 kili Exp $
$OpenBSD: patch-src_XMonad_Main_hs,v 1.3 2019/09/30 12:41:12 kili Exp $
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
@ -15,7 +15,7 @@ Index: src/XMonad/Main.hs
import qualified Control.Exception.Extensible as E
import Data.Bits
import Data.List ((\\))
@@ -162,8 +161,6 @@ sendReplace = do
@@ -168,8 +167,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

18
x11/xmonad/patches/patch-xmonad_cabal
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-xmonad_cabal,v 1.11 2018/01/22 22:08:42 kili Exp $
$OpenBSD: patch-xmonad_cabal,v 1.12 2019/09/30 12:41:12 kili Exp $
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
@@ -73,7 +73,6 @@ library
directory >= 1.2.3,
extensible-exceptions,
filepath,
- setlocale,
mtl,
process,
unix,
@@ -81,7 +81,6 @@ library
, filepath
, mtl
, process
- , setlocale
, unix
, utf8-string >= 0.3 && < 1.1
ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind

19
x11/xmonad/pkg/PLIST-lib
View File

@ -1,29 +1,38 @@
@comment $OpenBSD: PLIST-lib,v 1.17 2019/09/10 13:51:31 kili Exp $
@comment $OpenBSD: PLIST-lib,v 1.18 2019/09/30 12:41:13 kili Exp $
@tag ghc-pkg-recache
lib/ghc/package.conf.d/${DISTNAME}.conf
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/HS${DISTNAME}-${MODGHC_PACKAGE_KEY}.o
lib/ghc/${DISTNAME}/Paths_xmonad.dyn_hi
lib/ghc/${DISTNAME}/Paths_xmonad.hi
lib/ghc/${DISTNAME}/Paths_xmonad.p_hi
lib/ghc/${DISTNAME}/XMonad/
lib/ghc/${DISTNAME}/XMonad.dyn_hi
lib/ghc/${DISTNAME}/XMonad.hi
lib/ghc/${DISTNAME}/XMonad.p_hi
lib/ghc/${DISTNAME}/XMonad/Config.dyn_hi
lib/ghc/${DISTNAME}/XMonad/Config.hi
lib/ghc/${DISTNAME}/XMonad/Config.p_hi
lib/ghc/${DISTNAME}/XMonad/Core.dyn_hi
lib/ghc/${DISTNAME}/XMonad/Core.hi
lib/ghc/${DISTNAME}/XMonad/Core.p_hi
lib/ghc/${DISTNAME}/XMonad/Layout.dyn_hi
lib/ghc/${DISTNAME}/XMonad/Layout.hi
lib/ghc/${DISTNAME}/XMonad/Layout.p_hi
lib/ghc/${DISTNAME}/XMonad/Main.dyn_hi
lib/ghc/${DISTNAME}/XMonad/Main.hi
lib/ghc/${DISTNAME}/XMonad/Main.p_hi
lib/ghc/${DISTNAME}/XMonad/ManageHook.dyn_hi
lib/ghc/${DISTNAME}/XMonad/ManageHook.hi
lib/ghc/${DISTNAME}/XMonad/ManageHook.p_hi
lib/ghc/${DISTNAME}/XMonad/Operations.dyn_hi
lib/ghc/${DISTNAME}/XMonad/Operations.hi
lib/ghc/${DISTNAME}/XMonad/Operations.p_hi
lib/ghc/${DISTNAME}/XMonad/StackSet.dyn_hi
lib/ghc/${DISTNAME}/XMonad/StackSet.hi
lib/ghc/${DISTNAME}/XMonad/StackSet.p_hi
lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}-ghc${MODGHC_VER}.so
lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}.a
lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}_p.a
lib/ghc/package.conf.d/${DISTNAME}.conf
share/doc/hs-${DISTNAME}/
share/doc/hs-${DISTNAME}/CONFIG
@comment share/doc/hs-${DISTNAME}/LICENSE
@ -69,12 +78,14 @@ share/doc/hs-${DISTNAME}/html/doc-index-W.html
share/doc/hs-${DISTNAME}/html/doc-index-X.html
share/doc/hs-${DISTNAME}/html/doc-index-Z.html
share/doc/hs-${DISTNAME}/html/doc-index.html
share/doc/hs-${DISTNAME}/html/haddock-util.js
share/doc/hs-${DISTNAME}/html/haddock-bundle.min.js
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index.html
share/doc/hs-${DISTNAME}/html/meta.json
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
share/doc/hs-${DISTNAME}/html/plus.gif
share/doc/hs-${DISTNAME}/html/quick-jump.css
share/doc/hs-${DISTNAME}/html/synopsis.png
share/doc/hs-${DISTNAME}/html/xmonad.haddock
share/doc/hs-${DISTNAME}/xmonad.hs