diff options
Diffstat (limited to 'x11-wm/hs-xmonad')
| -rw-r--r-- | x11-wm/hs-xmonad/Makefile | 13 | ||||
| -rw-r--r-- | x11-wm/hs-xmonad/distinfo | 5 | ||||
| -rw-r--r-- | x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs | 20 | ||||
| -rw-r--r-- | x11-wm/hs-xmonad/files/patch-xmonad.cabal | 11 |
4 files changed, 5 insertions, 44 deletions
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile index ce204d73d907..5e312e72aa69 100644 --- a/x11-wm/hs-xmonad/Makefile +++ b/x11-wm/hs-xmonad/Makefile @@ -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> diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo index c48469c9bf12..1f355c048615 100644 --- a/x11-wm/hs-xmonad/distinfo +++ b/x11-wm/hs-xmonad/distinfo @@ -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 diff --git a/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs b/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs deleted file mode 100644 index f913dacd3cde..000000000000 --- a/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs +++ /dev/null @@ -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 diff --git a/x11-wm/hs-xmonad/files/patch-xmonad.cabal b/x11-wm/hs-xmonad/files/patch-xmonad.cabal deleted file mode 100644 index 31e082540956..000000000000 --- a/x11-wm/hs-xmonad/files/patch-xmonad.cabal +++ /dev/null @@ -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 |