Page MenuHomeFreeBSD
Files F149745672

D8191.id.diff
No OneTemporary
Actions

D8191.id.diff
View Options

Index: head/devel/Makefile
===================================================================
--- head/devel/Makefile
+++ head/devel/Makefile
@@ -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
Index: head/devel/hs-setlocale/Makefile
===================================================================
--- head/devel/hs-setlocale/Makefile
+++ head/devel/hs-setlocale/Makefile
@@ -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>
Index: head/devel/hs-setlocale/distinfo
===================================================================
--- head/devel/hs-setlocale/distinfo
+++ head/devel/hs-setlocale/distinfo
@@ -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
Index: head/devel/hs-setlocale/pkg-descr
===================================================================
--- head/devel/hs-setlocale/pkg-descr
+++ head/devel/hs-setlocale/pkg-descr
@@ -0,0 +1,3 @@
+Haskell setlocale package
+
+WWW: http://hackage.haskell.org/package/setlocale
Index: head/lang/ghc/bsd.hackage.mk
===================================================================
--- head/lang/ghc/bsd.hackage.mk
+++ head/lang/ghc/bsd.hackage.mk
@@ -376,6 +376,7 @@
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
Index: head/x11-wm/hs-xmonad-contrib/Makefile
===================================================================
--- head/x11-wm/hs-xmonad-contrib/Makefile
+++ head/x11-wm/hs-xmonad-contrib/Makefile
@@ -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 @@
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"
Index: head/x11-wm/hs-xmonad-contrib/distinfo
===================================================================
--- head/x11-wm/hs-xmonad-contrib/distinfo
+++ head/x11-wm/hs-xmonad-contrib/distinfo
@@ -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
Index: head/x11-wm/hs-xmonad-contrib/files/patch-XMonad__Prompt__Directory.hs
===================================================================
--- head/x11-wm/hs-xmonad-contrib/files/patch-XMonad__Prompt__Directory.hs
+++ head/x11-wm/hs-xmonad-contrib/files/patch-XMonad__Prompt__Directory.hs
@@ -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
Index: head/x11-wm/hs-xmonad/Makefile
===================================================================
--- head/x11-wm/hs-xmonad/Makefile
+++ head/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 @@
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 @@
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>
Index: head/x11-wm/hs-xmonad/distinfo
===================================================================
--- head/x11-wm/hs-xmonad/distinfo
+++ head/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
Index: head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs
===================================================================
--- head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs
+++ head/x11-wm/hs-xmonad/files/nopatch-XMonad_Core.hs
@@ -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
Index: head/x11-wm/hs-xmonad/files/patch-xmonad.cabal
===================================================================
--- head/x11-wm/hs-xmonad/files/patch-xmonad.cabal
+++ head/x11-wm/hs-xmonad/files/patch-xmonad.cabal
@@ -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

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 27, 5:43 PM (15 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30438165
Default Alt Text
D8191.id.diff (7 KB)

Event Timeline