kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update x11-wm/hs-xmonad & x11-wm/hs-xmonad-contrib to 0.12

Browse source 
* Removes all patches including XFORK_FIX (it seems it is not needed anymore).
* New port as dependency: devel/hs-setlocale

PR:             213579
Submitted by:   Martin Sugioarto <martin@sugioarto.com>
Approved by:    maintainer timeout (2 months), rakuco (mentor)
Differential Revision:  https://reviews.freebsd.org/D8191
This commit is contained in:
Tobias C. Berner 2016-12-28 21:00:27 +00:00
parent 05bbd37324
commit f24942a5ca
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=429826
12 changed files with 31 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devel/Makefile
View file

@ -1028,6 +1028,7 @@
SUBDIR += hs-scientific
SUBDIR += hs-securemem
SUBDIR += hs-setenv
SUBDIR += hs-setlocale
SUBDIR += hs-shake
SUBDIR += hs-show
SUBDIR += hs-silently

13
devel/hs-setlocale/Makefile Normal file
View file

@ -0,0 +1,13 @@
# $FreeBSD$
PORTNAME= setlocale
PORTVERSION= 1.0.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell setlocale package
LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>

3
devel/hs-setlocale/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1475870204
SHA256 (cabal/setlocale-1.0.0.4.tar.gz) = 32396aedcb8fdd6c56821dcde25c2cbd76462b13a6dc229bec29cb78df1fa7e9
SIZE (cabal/setlocale-1.0.0.4.tar.gz) = 2138

3
devel/hs-setlocale/pkg-descr Normal file
View file

@ -0,0 +1,3 @@
Haskell setlocale package
WWW: http://hackage.haskell.org/package/setlocale

1
lang/ghc/bsd.hackage.mk
View file

@ -376,6 +376,7 @@ semigroupoids_port= math/hs-semigroupoids
semigroups_port= math/hs-semigroups
sendfile_port= net/hs-sendfile
setenv_port= devel/hs-setenv
setlocale_port= devel/hs-setlocale
SHA_port= security/hs-SHA # executable
shake_port= devel/hs-shake # executable
shakespeare_port= www/hs-shakespeare

11
x11-wm/hs-xmonad-contrib/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xmonad-contrib
PORTVERSION= 0.11.4
PORTVERSION= 0.12
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@ -11,18 +11,11 @@ COMMENT= Third-party extensions for xmonad
LICENSE= BSD3CLAUSE
USE_CABAL= extensible-exceptions mtl>=1 old-time random utf8-string \
X11>=1.6.1 xmonad>=0.11
X11>=1.6.1 X11-xft>=0.2 xmonad==0.12
USE_XORG= x11
RUN_DEPENDS+= bash:shells/bash
FLAGS_DEFINE= XFT
FLAGS_DEFAULT= XFT
XFT_DESC= Use Xft to render text
XFT_FLAG_ENABLE= use_xft
XFT_FLAG_CABAL= X11-xft>=0.2
FLAGS_DISABLE= testing
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"

5
x11-wm/hs-xmonad-contrib/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (cabal/xmonad-contrib-0.11.4.tar.gz) = a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc
SIZE (cabal/xmonad-contrib-0.11.4.tar.gz) = 401743
TIMESTAMP = 1475870490
SHA256 (cabal/xmonad-contrib-0.12.tar.gz) = 131d31c471ac02ece9c7e920497b4839a45df786a2096f56adb1f2de1221f311
SIZE (cabal/xmonad-contrib-0.12.tar.gz) = 464978

11
x11-wm/hs-xmonad-contrib/files/patch-XMonad__Prompt__Directory.hs
View file

@ -1,11 +0,0 @@
--- ./XMonad/Prompt/Directory.hs.orig 2011-08-21 14:07:27.601179305 +0300
+++ ./XMonad/Prompt/Directory.hs 2011-08-21 14:08:20.213520774 +0300
@@ -35,7 +35,7 @@
getDirCompl :: String -> IO [String]
getDirCompl s = (filter notboring . lines) `fmap`
- runProcessWithInput "/bin/bash" [] ("compgen -A directory " ++ s ++ "\n")
+ runProcessWithInput "bash" [] ("compgen -A directory " ++ s ++ "\n")
notboring :: String -> Bool
notboring ('.':'.':_) = True

13
x11-wm/hs-xmonad/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xmonad
PORTVERSION= 0.11.1
PORTVERSION= 0.12
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@ -10,7 +10,7 @@ COMMENT= Tiling window manager
LICENSE= BSD3CLAUSE
USE_CABAL= extensible-exceptions mtl utf8-string>=0.3 X11>=1.5
USE_CABAL= extensible-exceptions mtl setlocale utf8-string>=0.3 X11>=1.5
USE_XORG= x11
MAN1PAGES= xmonad.1
@ -18,17 +18,8 @@ MAN1SRC= man
EXECUTABLE= xmonad
OPTIONS_DEFINE+= XFORK_FIX
OPTIONS_DEFAULT+= XFORK_FIX
FLAGS_DISABLE= testing
XFORK_FIX_DESC= Apply workaround for losing hotkeys (XMonad \#576)
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.if ${PORT_OPTIONS:MXFORK_FIX}
EXTRA_PATCHES+= ${PATCHDIR}/nopatch-XMonad_Core.hs
.endif
.include <bsd.port.mk>

5
x11-wm/hs-xmonad/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (cabal/xmonad-0.11.1.tar.gz) = 39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd
SIZE (cabal/xmonad-0.11.1.tar.gz) = 59307
TIMESTAMP = 1475869373
SHA256 (cabal/xmonad-0.12.tar.gz) = e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7
SIZE (cabal/xmonad-0.12.tar.gz) = 61436

20
x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs
View file

@ -1,20 +0,0 @@
--- XMonad/Core.hs.orig 2013-01-01 01:31:47 UTC
+++ XMonad/Core.hs
@@ -400,10 +400,13 @@ spawnPID x = xfork $ executeFile "/bin/s
-- | A replacement for 'forkProcess' which resets default signal handlers.
xfork :: MonadIO m => IO () -> m ProcessID
-xfork x = io . forkProcess . finally nullStdin $ do
- uninstallSignalHandlers
- createSession
- x
+xfork x = do
+ pid <- liftIO $ forkProcess $ finally nullStdin $ do
+ forkProcess $ do
+ uninstallSignalHandlers
+ createSession
+ x
+ return pid
where
nullStdin = do
fd <- openFd "/dev/null" ReadOnly Nothing defaultFileFlags

11
x11-wm/hs-xmonad/files/patch-xmonad.cabal
View file

@ -1,11 +0,0 @@
--- xmonad.cabal.orig 2015-03-27 17:59:21 UTC
+++ xmonad.cabal
@@ -58,7 +58,7 @@ library
else
build-depends: base < 3
build-depends: X11>=1.5 && < 1.7, mtl, unix,
- utf8-string >= 0.3 && < 0.4
+ utf8-string >= 0.3
if true
ghc-options: -funbox-strict-fields -Wall