Update to xmonad-0.10

ok kili@
This commit is contained in:
dcoppa 2012-01-12 11:11:58 +00:00
parent 0f482aed97
commit ccdc7f82ff
8 changed files with 18 additions and 46 deletions

View File

@ -1,13 +1,11 @@
# $OpenBSD: Makefile,v 1.32 2011/12/27 21:30:26 kili Exp $
# $OpenBSD: Makefile,v 1.33 2012/01/12 11:11:58 dcoppa Exp $
COMMENT-main = tiling window manager
COMMENT-lib = libraries for runtime configuration
DISTNAME = xmonad-0.9.2
DISTNAME = xmonad-0.10
PKGNAME-main = ${DISTNAME}
REVISION-main = 5
PKGNAME-lib = ${DISTNAME:S,-,-lib-,}
REVISION-lib = 4
CATEGORIES = x11
HOMEPAGE = http://www.xmonad.org/

View File

@ -1,5 +1,5 @@
MD5 (ghc/xmonad-0.9.2.tar.gz) = WkEX95hmTXctKoNOpskPHA==
RMD160 (ghc/xmonad-0.9.2.tar.gz) = TY5vAFeDNpWodurYdr68Thh48Xs=
SHA1 (ghc/xmonad-0.9.2.tar.gz) = bwUkgiX15v/Xd4DOHCwqETAOC3s=
SHA256 (ghc/xmonad-0.9.2.tar.gz) = rc2j9beln7H6T39I6MTrBZlkLn0hWwE/sHL5iu+YhR8=
SIZE (ghc/xmonad-0.9.2.tar.gz) = 56974
MD5 (ghc/xmonad-0.10.tar.gz) = +DgeHsFRN4Y1WKRU1EZkZw==
RMD160 (ghc/xmonad-0.10.tar.gz) = cH8GYEmkn4F98pgnJt0+nE3B+a0=
SHA1 (ghc/xmonad-0.10.tar.gz) = gSGvuITJ8cD5cuEPD+WnHzgQbJ0=
SHA256 (ghc/xmonad-0.10.tar.gz) = RnZxdhXTZ6uvLiu2Cc9TJCft/YdFUmj6SFUvf83w5ac=
SIZE (ghc/xmonad-0.10.tar.gz) = 57681

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-XMonad_Config_hs,v 1.1 2011/08/21 17:32:28 kili Exp $
--- XMonad/Config.hs.orig Fri Dec 24 01:42:54 2010
+++ XMonad/Config.hs Sun Aug 21 19:09:49 2011
@@ -181,7 +181,7 @@ keys :: XConfig Layout -> M.Map (KeyMask, KeySym) (X (
keys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
-- launching and killing programs
[ ((modMask .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf) -- %! Launch terminal
- , ((modMask, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") -- %! Launch dmenu
+ , ((modMask, xK_p ), spawn "dmenu_run") -- %! Launch dmenu
, ((modMask .|. shiftMask, xK_p ), spawn "gmrun") -- %! Launch gmrun
, ((modMask .|. shiftMask, xK_c ), kill) -- %! Close the focused window

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-XMonad_Core_hs,v 1.2 2011/04/04 22:40:55 kili Exp $
$OpenBSD: patch-XMonad_Core_hs,v 1.3 2012/01/12 11:11:58 dcoppa Exp $
From Tomas Janousek.
--- XMonad/Core.hs.orig Fri Dec 24 01:42:54 2010
+++ XMonad/Core.hs Mon Apr 4 10:45:53 2011
@@ -465,7 +465,11 @@ trace = io . hPutStrLn stderr
--- XMonad/Core.hs.orig Sat Nov 19 00:14:36 2011
+++ XMonad/Core.hs Wed Jan 11 10:04:38 2012
@@ -502,7 +502,11 @@ trace = io . hPutStrLn stderr
installSignalHandlers :: MonadIO m => m ()
installSignalHandlers = io $ do
installHandler openEndedPipe Ignore Nothing

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-man_xmonad_1,v 1.1 2011/08/21 17:32:28 kili Exp $
--- man/xmonad.1.orig Fri Dec 24 01:42:54 2010
+++ man/xmonad.1 Sun Aug 21 19:10:40 2011
@@ -87,7 +87,7 @@ Launch terminal
$OpenBSD: patch-man_xmonad_1,v 1.2 2012/01/12 11:11:58 dcoppa Exp $
--- man/xmonad.1.orig Sat Nov 19 00:14:36 2011
+++ man/xmonad.1 Wed Jan 11 10:04:38 2012
@@ -96,7 +96,7 @@ Launch terminal
.RE
.TP
.B mod-p

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-man_xmonad_hs,v 1.1 2011/08/21 17:32:28 kili Exp $
--- man/xmonad.hs.orig Fri Dec 24 01:42:54 2010
+++ man/xmonad.hs Sun Aug 21 19:11:07 2011
@@ -74,7 +74,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.from
[ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf)
-- launch dmenu
- , ((modm, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"")
+ , ((modm, xK_p ), spawn "dmenu_run")
-- launch gmrun
, ((modm .|. shiftMask, xK_p ), spawn "gmrun")

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-lib,v 1.6 2011/04/04 22:40:55 kili Exp $
@comment $OpenBSD: PLIST-lib,v 1.7 2012/01/12 11:11:58 dcoppa Exp $
lib/ghc/
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
@ -18,5 +18,5 @@ lib/ghc/${DISTNAME}/register.sh
lib/ghc/${DISTNAME}/unregister.sh
share/doc/hs-${DISTNAME}/
share/doc/hs-${DISTNAME}/CONFIG
share/doc/hs-${DISTNAME}/LICENSE
@comment share/doc/hs-${DISTNAME}/LICENSE
share/doc/hs-${DISTNAME}/xmonad.hs

View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2010/10/28 13:55:21 jasper Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2012/01/12 11:11:58 dcoppa Exp $
@pkgpath x11/xmonad
@bin bin/xmonad
@man man/man1/xmonad.1
@comment share/doc/hs-${DISTNAME}/
@comment share/doc/hs-${DISTNAME}/LICENSE