Date: Sun, 21 Aug 2011 11:33:49 GMT From: Aldis Berjoza <aldis@bsdroot.lv> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/159968: [PATCH] x11-wm/hs-xmonad-contrib fix Message-ID: <201108211133.p7LBXngr025653@red.freebsd.org> Resent-Message-ID: <201108211140.p7LBeBeH061437@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159968
>Category: ports
>Synopsis: [PATCH] x11-wm/hs-xmonad-contrib fix
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 21 11:40:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Aldis Berjoza
>Release:
>Organization:
>Environment:
>Description:
Some xmonad modules in x11-wm/hs-xmonad-contrib require bash to run.
One of them needs to be patched to use bash instead of /bin/bash
I attached patch to fix this problem.
Because of this XMonad.Prompt.Directory was driving me nuts for months, until I finally checked the source.
I will also submit this patch upstream.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN hs-xmonad-contrib.bak/Makefile hs-xmonad-contrib/Makefile
--- hs-xmonad-contrib.bak/Makefile 2011-05-26 03:51:15.000000000 +0300
+++ hs-xmonad-contrib/Makefile 2011-08-21 14:21:15.408220265 +0300
@@ -7,7 +7,7 @@
PORTNAME= xmonad-contrib
PORTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -18,6 +18,8 @@
USE_CABAL= mtl xmonad>=0.9.1 X11>=1.5 utf8-string
USE_XORG= x11
+RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
+
OPTIONS= XFT "Enable Xft support for fonts" On
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
diff -urN hs-xmonad-contrib.bak/files/patch-XMonad__Prompt__Directory.hs hs-xmonad-contrib/files/patch-XMonad__Prompt__Directory.hs
--- hs-xmonad-contrib.bak/files/patch-XMonad__Prompt__Directory.hs 1970-01-01 03:00:00.000000000 +0300
+++ hs-xmonad-contrib/files/patch-XMonad__Prompt__Directory.hs 2011-08-21 14:08:42.179758998 +0300
@@ -0,0 +1,11 @@
+--- ./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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108211133.p7LBXngr025653>