cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use apm(8) instead of linux-only acpi for battery status.

Browse Source 
Patch by Jona Joachim (maintainer).

OK espie@
This commit is contained in:
dcoppa 2010-08-02 11:24:41 +00:00
parent fb05fe457a
commit eff0043492
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/hs-xmonad-contrib/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2010/07/27 20:23:34 dcoppa Exp $
# $OpenBSD: Makefile,v 1.8 2010/08/02 11:24:41 dcoppa Exp $
COMMENT = third party xmonad extensions
DISTNAME = xmonad-contrib-0.9.1
REVISION = 5
REVISION = 6
CATEGORIES = x11
HOMEPAGE = http://www.xmonad.org/

15
x11/hs-xmonad-contrib/patches/patch-XMonad_Util_Loggers_hs Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-XMonad_Util_Loggers_hs,v 1.1 2010/08/02 11:24:41 dcoppa Exp $
Use our apm(8) instead of linux-only acpi
--- XMonad/Util/Loggers.hs.orig Mon Aug 2 01:15:02 2010
+++ XMonad/Util/Loggers.hs Mon Aug 2 01:24:00 2010
@@ -116,7 +116,7 @@ aumixVolume = logCmd "aumix -vq"
-- At some point it would be nice to make this more general\/have
-- fewer dependencies (assumes @\/usr\/bin\/acpi@ and @sed@ are installed.)
battery :: Logger
-battery = logCmd "/usr/bin/acpi | sed -r 's/.*?: (.*%).*/\\1/; s/discharging, ([0-9]+%)/\\1-/; s/charging, ([0-9]+%)/\\1+/; s/charged, //'"
+battery = logCmd "printf \"%s%% %s\" \"`apm -l`\" \"`apm -a -v | sed 's|A/C adapter state: ||'`\""
-- | Get the current date and time, and format them via the
-- given format string. The format used is the same as that used