Update of xmobar to 0.13, based on a diff by Ido Admon. One of the new cool features is mpd support. I also enabled xft support.
Since the source code moved from ${WRKBUILD} to ${WRKBUILD}/src, some
patches changed their name. Because of this I couldn't get the diff
right with "cvs diff" (I couldn't cvs add the new files).
Apply the diff with patch -p1 in the port folder.
The following files will be 0 byte afterwards and should be cvs removed:
x11/xmobar/patches/patch-Plugins_Monitors_hs
x11/xmobar/patches/patch-StatFS_hsc
x11/xmobar/patches/patch-xmobar_config-sample
I tested this on i386 and amd64 -CURRENT.
Please test & comment.
Best regards,
Jona
--
Worse is better
Richard P. Gabriel
diff -Nur /usr/ports/x11/xmobar/Makefile xmobar/Makefile --- /usr/ports/x11/xmobar/Makefile Sat Apr 23 16:32:51 2011 +++ xmobar/Makefile Sat Jun 11 23:10:47 2011 @@ -2,10 +2,9 @@ COMMENT = minimalistic text based status bar -DISTNAME = xmobar-0.11.1 -REVISION = 1 +DISTNAME = xmobar-0.13 CATEGORIES = x11 -HOMEPAGE = http://code.haskell.org/~arossato/xmobar/ +HOMEPAGE = http://projects.haskell.org/xmobar MAINTAINER = Jona Joachim <[email protected]> @@ -15,31 +14,36 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = X11 Xext Xinerama c gmp m pthread util +WANTLIB = c expat fontconfig freetype gmp m pthread pthread-stubs util \ + X11 Xau xcb Xdmcp Xext Xft Xinerama Xrender z MODULES = lang/ghc converters/libiconv + MODGHC_BUILD = cabal hackage nort +MODGHC_SETUP_CONF_ARGS = --flags="with_xft with_mpd with_utf8" LIB_DEPENDS = devel/gmp BUILD_DEPENDS = devel/hs-mtl \ devel/hs-parsec \ devel/hs-stm \ - x11/hs-X11>=1.3.0 + x11/hs-X11>=1.3.0 \ + x11/hs-X11-xft>=0.2 \ + audio/hs-libmpd>=0.5 EXAMPLEDIR = ${PREFIX}/share/examples/xmobar post-patch: - @cp ${FILESDIR}/Batt.hs ${WRKBUILD}/Plugins/Monitors - @mkdir ${WRKBUILD}/Plugins/Monitors/Batt - @cp ${FILESDIR}/Binding.hsc ${WRKBUILD}/Plugins/Monitors/Batt - @cp ${FILESDIR}/apm.c ${WRKBUILD}/Plugins/Monitors/Batt - @cp ${FILESDIR}/apm.h ${WRKBUILD}/Plugins/Monitors/Batt + @cp ${FILESDIR}/Batt.hs ${WRKBUILD}/src/Plugins/Monitors + @mkdir ${WRKBUILD}/src/Plugins/Monitors/Batt + @cp ${FILESDIR}/Binding.hsc ${WRKBUILD}/src/Plugins/Monitors/Batt + @cp ${FILESDIR}/apm.c ${WRKBUILD}/src/Plugins/Monitors/Batt + @cp ${FILESDIR}/apm.h ${WRKBUILD}/src/Plugins/Monitors/Batt post-install: ${INSTALL_DATA_DIR} ${EXAMPLEDIR} - ${INSTALL_DATA} ${WRKSRC}/xmobar.config-sample ${EXAMPLEDIR}/xmobarrc + ${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config ${EXAMPLEDIR}/xmobarrc NO_REGRESS = Yes diff -Nur /usr/ports/x11/xmobar/distinfo xmobar/distinfo --- /usr/ports/x11/xmobar/distinfo Sat Apr 23 22:24:27 2011 +++ xmobar/distinfo Sat Jun 11 20:45:45 2011 @@ -1,5 +1,5 @@ -MD5 (ghc/xmobar-0.11.1.tar.gz) = dm/lBJCThGKDIft0cv22IQ== -RMD160 (ghc/xmobar-0.11.1.tar.gz) = pu3ektCASdWtDq8JOJnXVnPljYs= -SHA1 (ghc/xmobar-0.11.1.tar.gz) = O5oSpOA/W2F026cyNvhUaNnJzBs= -SHA256 (ghc/xmobar-0.11.1.tar.gz) = dTt1W5aFIAi7v4x5kz2eu4dVS/flYoiOjW+1uDIKanM= -SIZE (ghc/xmobar-0.11.1.tar.gz) = 45872 +MD5 (ghc/xmobar-0.13.tar.gz) = 95RiNsBoseeUTxa3wHMoVw== +RMD160 (ghc/xmobar-0.13.tar.gz) = yK9pIR1l8LHvZv8lb523G32ABe4= +SHA1 (ghc/xmobar-0.13.tar.gz) = oekxIxmjeLLWD8k4jT6BWOh7g18= +SHA256 (ghc/xmobar-0.13.tar.gz) = x8FRwSSR4jAxCnriJ5bP4/edhzHdxFO2YbUJu4HaSkY= +SIZE (ghc/xmobar-0.13.tar.gz) = 55874 diff -Nur /usr/ports/x11/xmobar/patches/patch-Plugins_Monitors_hs xmobar/patches/patch-Plugins_Monitors_hs --- /usr/ports/x11/xmobar/patches/patch-Plugins_Monitors_hs Sat Jul 17 16:55:21 2010 +++ xmobar/patches/patch-Plugins_Monitors_hs Thu Jan 1 01:00:00 1970 @@ -1,133 +0,0 @@ -$OpenBSD: patch-Plugins_Monitors_hs,v 1.2 2010/07/17 14:55:21 kili Exp $ ---- Plugins/Monitors.hs.orig Tue Jul 6 13:08:05 2010 -+++ Plugins/Monitors.hs Tue Jul 6 13:09:37 2010 -@@ -20,17 +20,17 @@ import Plugins - - import Plugins.Monitors.Common ( runM ) - import Plugins.Monitors.Weather --import Plugins.Monitors.Net --import Plugins.Monitors.Mem --import Plugins.Monitors.Swap --import Plugins.Monitors.Cpu --import Plugins.Monitors.MultiCpu -+--import Plugins.Monitors.Net -+--import Plugins.Monitors.Mem -+--import Plugins.Monitors.Swap -+--import Plugins.Monitors.Cpu -+--import Plugins.Monitors.MultiCpu - import Plugins.Monitors.Batt --import Plugins.Monitors.Thermal --import Plugins.Monitors.CpuFreq --import Plugins.Monitors.CoreTemp --import Plugins.Monitors.Disk --import Plugins.Monitors.Top -+--import Plugins.Monitors.Thermal -+--import Plugins.Monitors.CpuFreq -+--import Plugins.Monitors.CoreTemp -+--import Plugins.Monitors.Disk -+--import Plugins.Monitors.Top - #ifdef IWLIB - import Plugins.Monitors.Wireless - #endif -@@ -39,20 +39,20 @@ import Plugins.Monitors.MPD - #endif - - data Monitors = Weather Station Args Rate -- | Network Interface Args Rate -- | Memory Args Rate -- | Swap Args Rate -- | Cpu Args Rate -- | MultiCpu Args Rate -+-- | Network Interface Args Rate -+-- | Memory Args Rate -+-- | Swap Args Rate -+-- | Cpu Args Rate -+-- | MultiCpu Args Rate - | Battery Args Rate -- | BatteryP [String] Args Rate -- | DiskU DiskSpec Args Rate -- | DiskIO DiskSpec Args Rate -- | Thermal Zone Args Rate -- | CpuFreq Args Rate -- | CoreTemp Args Rate -- | TopProc Args Rate -- | TopMem Args Rate -+-- | BatteryP [String] Args Rate -+-- | DiskU DiskSpec Args Rate -+-- | DiskIO DiskSpec Args Rate -+-- | Thermal Zone Args Rate -+-- | CpuFreq Args Rate -+-- | CoreTemp Args Rate -+-- | TopProc Args Rate -+-- | TopMem Args Rate - #ifdef IWLIB - | Wireless Interface Args Rate - #endif -@@ -72,20 +72,20 @@ type DiskSpec = [(String, String)] - - instance Exec Monitors where - alias (Weather s _ _) = s -- alias (Network i _ _) = i -- alias (Thermal z _ _) = z -- alias (Memory _ _) = "memory" -- alias (Swap _ _) = "swap" -- alias (Cpu _ _) = "cpu" -- alias (MultiCpu _ _) = "multicpu" -+-- alias (Network i _ _) = i -+-- alias (Thermal z _ _) = z -+-- alias (Memory _ _) = "memory" -+-- alias (Swap _ _) = "swap" -+-- alias (Cpu _ _) = "cpu" -+-- alias (MultiCpu _ _) = "multicpu" - alias (Battery _ _) = "battery" -- alias (BatteryP _ _ _)= "battery" -- alias (CpuFreq _ _) = "cpufreq" -- alias (TopProc _ _) = "top" -- alias (TopMem _ _) = "topmem" -- alias (CoreTemp _ _) = "coretemp" -- alias (DiskU _ _ _) = "disku" -- alias (DiskIO _ _ _) = "diskio" -+-- alias (BatteryP _ _ _)= "battery" -+-- alias (CpuFreq _ _) = "cpufreq" -+-- alias (TopProc _ _) = "top" -+-- alias (TopMem _ _) = "topmem" -+-- alias (CoreTemp _ _) = "coretemp" -+-- alias (DiskU _ _ _) = "disku" -+-- alias (DiskIO _ _ _) = "diskio" - #ifdef IWLIB - alias (Wireless i _ _) = i ++ "wi" - #endif -@@ -93,20 +93,20 @@ instance Exec Monitors where - alias (MPD _ _) = "mpd" - #endif - start (Weather s a r) = runM (a ++ [s]) weatherConfig runWeather r -- start (Network i a r) = runM (a ++ [i]) netConfig runNet r -- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r -- start (Memory a r) = runM a memConfig runMem r -- start (Swap a r) = runM a swapConfig runSwap r -- start (Cpu a r) = runM a cpuConfig runCpu r -- start (MultiCpu a r) = runM a multiCpuConfig runMultiCpu r -+-- start (Network i a r) = runM (a ++ [i]) netConfig runNet r -+-- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r -+-- start (Memory a r) = runM a memConfig runMem r -+-- start (Swap a r) = runM a swapConfig runSwap r -+-- start (Cpu a r) = runM a cpuConfig runCpu r -+-- start (MultiCpu a r) = runM a multiCpuConfig runMultiCpu r - start (Battery a r) = runM a battConfig runBatt r -- start (BatteryP s a r) = runM a battConfig (runBatt' s) r -- start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r -- start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r -- start (DiskU s a r) = runM a diskUConfig (runDiskU s) r -- start (DiskIO s a r) = runM a diskIOConfig (runDiskIO s) r -- start (TopMem a r) = runM a topMemConfig runTopMem r -- start (TopProc a r) = startTop a r -+-- start (BatteryP s a r) = runM a battConfig (runBatt' s) r -+-- start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r -+-- start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r -+-- start (DiskU s a r) = runM a diskUConfig (runDiskU s) r -+-- start (DiskIO s a r) = runM a diskIOConfig (runDiskIO s) r -+-- start (TopMem a r) = runM a topMemConfig runTopMem r -+-- start (TopProc a r) = startTop a r - #ifdef IWLIB - start (Wireless i a r) = runM (a ++ [i]) wirelessConfig runWireless r - #endif diff -Nur /usr/ports/x11/xmobar/patches/patch-StatFS_hsc xmobar/patches/patch-StatFS_hsc --- /usr/ports/x11/xmobar/patches/patch-StatFS_hsc Sat Jul 17 16:55:21 2010 +++ xmobar/patches/patch-StatFS_hsc Thu Jan 1 01:00:00 1970 @@ -1,25 +0,0 @@ -$OpenBSD: patch-StatFS_hsc,v 1.1 2010/07/17 14:55:21 kili Exp $ ---- StatFS.hsc.orig Mon May 17 12:17:50 2010 -+++ StatFS.hsc Tue Jul 6 12:29:51 2010 -@@ -23,8 +23,11 @@ import Foreign.C.String - import Data.ByteString (useAsCString) - import Data.ByteString.Char8 (pack) - --#if defined (__FreeBSD__) -+#if (defined(__unix__) || defined(unix)) && !defined(USG) - # include <sys/param.h> -+#endif -+ -+#if defined (BSD4_4) - # include <sys/mount.h> - #else - #include <sys/vfs.h> -@@ -47,7 +50,7 @@ data FileSystemStats = FileSystemStats { - - data CStatfs - --#if defined(__FreeBSD__) -+#if defined(BSD4_4) - foreign import ccall unsafe "sys/mount.h statfs" - #else - foreign import ccall unsafe "sys/vfs.h statfs64" diff -Nur /usr/ports/x11/xmobar/patches/patch-samples_xmobar_config xmobar/patches/patch-samples_xmobar_config --- /usr/ports/x11/xmobar/patches/patch-samples_xmobar_config Thu Jan 1 01:00:00 1970 +++ xmobar/patches/patch-samples_xmobar_config Sat Jun 11 23:47:04 2011 @@ -0,0 +1,22 @@ +$OpenBSD$ +--- samples/xmobar.config.orig Mon Mar 28 01:16:24 2011 ++++ samples/xmobar.config Sat Jun 11 23:46:39 2011 +@@ -4,15 +4,11 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" + , position = Top + , lowerOnStart = True + , commands = [ Run Weather "EGPF" ["-t","<station>: <tempC>C","-L","18","-H","25","--normal","green","--high","red","--low","lightblue"] 36000 +- , Run Network "eth0" ["-L","0","-H","32","--normal","green","--high","red"] 10 +- , Run Network "eth1" ["-L","0","-H","32","--normal","green","--high","red"] 10 +- , Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10 +- , Run Memory ["-t","Mem: <usedratio>%"] 10 +- , Run Swap [] 10 + , Run Com "uname" ["-s","-r"] "" 36000 +- , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10 ++ , Run Battery ["-t","Batt: <left> <minleft>"] 10 ++ , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10 + ] + , sepChar = "%" + , alignSep = "}{" +- , template = "%cpu% | %memory% * %swap% | %eth0% - %eth1% }{ <fc=#ee9a00>%date%</fc>| %EGPF% | %uname%" ++ , template = "%battery% }{ <fc=#ee9a00>%date%</fc>| %EGPF% | %uname%" + } diff -Nur /usr/ports/x11/xmobar/patches/patch-src_Plugins_Monitors_MPD_hs xmobar/patches/patch-src_Plugins_Monitors_MPD_hs --- /usr/ports/x11/xmobar/patches/patch-src_Plugins_Monitors_MPD_hs Thu Jan 1 01:00:00 1970 +++ xmobar/patches/patch-src_Plugins_Monitors_MPD_hs Sat Jun 11 20:45:45 2011 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/Plugins/Monitors/MPD.hs.orig Mon May 2 20:48:52 2011 ++++ src/Plugins/Monitors/MPD.hs Mon May 2 20:49:06 2011 +@@ -91,7 +91,7 @@ parseSong (Right Nothing) = return $ repeat "" + parseSong (Right (Just s)) = + let join [] = "" + join (x:xs) = foldl (\a o -> a ++ ", " ++ o) x xs +- str sel = maybe "" join (M.sgGet sel s) ++ str sel = maybe "" join (M.sgGetTag sel s) + sels = [ M.Name, M.Artist, M.Composer, M.Performer + , M.Album, M.Title, M.Track, M.Genre ] + fields = M.sgFilePath s : map str sels diff -Nur /usr/ports/x11/xmobar/patches/patch-src_Plugins_Monitors_hs xmobar/patches/patch-src_Plugins_Monitors_hs --- /usr/ports/x11/xmobar/patches/patch-src_Plugins_Monitors_hs Thu Jan 1 01:00:00 1970 +++ xmobar/patches/patch-src_Plugins_Monitors_hs Sat Jun 11 20:45:45 2011 @@ -0,0 +1,152 @@ +$OpenBSD$ +--- src/Plugins/Monitors.hs.orig Mon May 2 19:50:32 2011 ++++ src/Plugins/Monitors.hs Mon May 2 19:55:06 2011 +@@ -21,19 +21,19 @@ import Plugins + + import Plugins.Monitors.Common ( runM ) + import Plugins.Monitors.Weather +-import Plugins.Monitors.Net +-import Plugins.Monitors.Mem +-import Plugins.Monitors.Swap +-import Plugins.Monitors.Cpu +-import Plugins.Monitors.MultiCpu ++--import Plugins.Monitors.Net ++--import Plugins.Monitors.Mem ++--import Plugins.Monitors.Swap ++--import Plugins.Monitors.Cpu ++--import Plugins.Monitors.MultiCpu + import Plugins.Monitors.Batt +-import Plugins.Monitors.Thermal +-import Plugins.Monitors.ThermalZone +-import Plugins.Monitors.CpuFreq +-import Plugins.Monitors.CoreTemp +-import Plugins.Monitors.Disk +-import Plugins.Monitors.Top +-import Plugins.Monitors.Uptime ++--import Plugins.Monitors.Thermal ++--import Plugins.Monitors.ThermalZone ++--import Plugins.Monitors.CpuFreq ++--import Plugins.Monitors.CoreTemp ++--import Plugins.Monitors.Disk ++--import Plugins.Monitors.Top ++--import Plugins.Monitors.Uptime + #ifdef IWLIB + import Plugins.Monitors.Wireless + #endif +@@ -45,22 +45,22 @@ import Plugins.Monitors.Volume + #endif + + data Monitors = Weather Station Args Rate +- | Network Interface Args Rate +- | BatteryP [String] Args Rate +- | DiskU DiskSpec Args Rate +- | DiskIO DiskSpec Args Rate +- | Thermal Zone Args Rate +- | ThermalZone ZoneNo Args Rate +- | Memory Args Rate +- | Swap Args Rate +- | Cpu Args Rate +- | MultiCpu Args Rate ++-- | Network Interface Args Rate ++-- | BatteryP [String] Args Rate ++-- | DiskU DiskSpec Args Rate ++-- | DiskIO DiskSpec Args Rate ++-- | Thermal Zone Args Rate ++-- | ThermalZone ZoneNo Args Rate ++-- | Memory Args Rate ++-- | Swap Args Rate ++-- | Cpu Args Rate ++-- | MultiCpu Args Rate + | Battery Args Rate +- | CpuFreq Args Rate +- | CoreTemp Args Rate +- | TopProc Args Rate +- | TopMem Args Rate +- | Uptime Args Rate ++-- | CpuFreq Args Rate ++-- | CoreTemp Args Rate ++-- | TopProc Args Rate ++-- | TopMem Args Rate ++-- | Uptime Args Rate + #ifdef IWLIB + | Wireless Interface Args Rate + #endif +@@ -84,22 +84,22 @@ type DiskSpec = [(String, String)] + + instance Exec Monitors where + alias (Weather s _ _) = s +- alias (Network i _ _) = i +- alias (Thermal z _ _) = z +- alias (ThermalZone z _ _) = "thermal" ++ show z +- alias (Memory _ _) = "memory" +- alias (Swap _ _) = "swap" +- alias (Cpu _ _) = "cpu" +- alias (MultiCpu _ _) = "multicpu" ++-- alias (Network i _ _) = i ++-- alias (Thermal z _ _) = z ++-- alias (ThermalZone z _ _) = "thermal" ++ show z ++-- alias (Memory _ _) = "memory" ++-- alias (Swap _ _) = "swap" ++-- alias (Cpu _ _) = "cpu" ++-- alias (MultiCpu _ _) = "multicpu" + alias (Battery _ _) = "battery" +- alias (BatteryP _ _ _)= "battery" +- alias (CpuFreq _ _) = "cpufreq" +- alias (TopProc _ _) = "top" +- alias (TopMem _ _) = "topmem" +- alias (CoreTemp _ _) = "coretemp" +- alias (DiskU _ _ _) = "disku" +- alias (DiskIO _ _ _) = "diskio" +- alias (Uptime _ _) = "uptime" ++-- alias (BatteryP _ _ _)= "battery" ++-- alias (CpuFreq _ _) = "cpufreq" ++-- alias (TopProc _ _) = "top" ++-- alias (TopMem _ _) = "topmem" ++-- alias (CoreTemp _ _) = "coretemp" ++-- alias (DiskU _ _ _) = "disku" ++-- alias (DiskIO _ _ _) = "diskio" ++-- alias (Uptime _ _) = "uptime" + #ifdef IWLIB + alias (Wireless i _ _) = i ++ "wi" + #endif +@@ -109,24 +109,24 @@ instance Exec Monitors where + #ifdef ALSA + alias (Volume m c _ _) = m ++ ":" ++ c + #endif +- start (Network i a r) = startNet i a r +- start (Cpu a r) = startCpu a r +- start (MultiCpu a r) = startMultiCpu a r +- start (TopProc a r) = startTop a r +- start (TopMem a r) = runM a topMemConfig runTopMem r ++-- start (Network i a r) = startNet i a r ++-- start (Cpu a r) = startCpu a r ++-- start (MultiCpu a r) = startMultiCpu a r ++-- start (TopProc a r) = startTop a r ++-- start (TopMem a r) = runM a topMemConfig runTopMem r + start (Weather s a r) = runM (a ++ [s]) weatherConfig runWeather r +- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r +- start (ThermalZone z a r) = +- runM (a ++ [show z]) thermalZoneConfig runThermalZone r +- start (Memory a r) = runM a memConfig runMem r +- start (Swap a r) = runM a swapConfig runSwap r ++-- start (Thermal z a r) = runM (a ++ [z]) thermalConfig runThermal r ++-- start (ThermalZone z a r) = ++-- runM (a ++ [show z]) thermalZoneConfig runThermalZone r ++-- start (Memory a r) = runM a memConfig runMem r ++-- start (Swap a r) = runM a swapConfig runSwap r + start (Battery a r) = runM a battConfig runBatt r +- start (BatteryP s a r) = runM a battConfig (runBatt' s) r +- start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r +- start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r +- start (DiskU s a r) = runM a diskUConfig (runDiskU s) r +- start (DiskIO s a r) = startDiskIO s a r +- start (Uptime a r) = runM a uptimeConfig runUptime r ++-- start (BatteryP s a r) = runM a battConfig (runBatt' s) r ++-- start (CpuFreq a r) = runM a cpuFreqConfig runCpuFreq r ++-- start (CoreTemp a r) = runM a coreTempConfig runCoreTemp r ++-- start (DiskU s a r) = runM a diskUConfig (runDiskU s) r ++-- start (DiskIO s a r) = startDiskIO s a r ++-- start (Uptime a r) = runM a uptimeConfig runUptime r + #ifdef IWLIB + start (Wireless i a r) = runM (a ++ [i]) wirelessConfig runWireless r + #endif diff -Nur /usr/ports/x11/xmobar/patches/patch-src_StatFS_hsc xmobar/patches/patch-src_StatFS_hsc --- /usr/ports/x11/xmobar/patches/patch-src_StatFS_hsc Thu Jan 1 01:00:00 1970 +++ xmobar/patches/patch-src_StatFS_hsc Sat Jun 11 20:45:45 2011 @@ -0,0 +1,25 @@ +$OpenBSD$ +--- src/StatFS.hsc.orig Sun Mar 27 19:16:24 2011 ++++ src/StatFS.hsc Mon May 2 20:32:56 2011 +@@ -23,8 +23,11 @@ import Foreign.C.String + import Data.ByteString (useAsCString) + import Data.ByteString.Char8 (pack) + +-#if defined (__FreeBSD__) || defined (__APPLE__) ++#if (defined(__unix__) || defined(unix)) && !defined(USG) + # include <sys/param.h> ++#endif ++ ++#if defined(BSD4_4) + # include <sys/mount.h> + #else + # include <sys/vfs.h> +@@ -47,7 +50,7 @@ data FileSystemStats = FileSystemStats { + + data CStatfs + +-#if defined (__FreeBSD__) || defined (__APPLE__) ++#if defined(BSD4_4) + foreign import ccall unsafe "sys/mount.h statfs" + #else + foreign import ccall unsafe "sys/vfs.h statfs64" diff -Nur /usr/ports/x11/xmobar/patches/patch-xmobar_cabal xmobar/patches/patch-xmobar_cabal --- /usr/ports/x11/xmobar/patches/patch-xmobar_cabal Sat Jul 17 16:55:21 2010 +++ xmobar/patches/patch-xmobar_cabal Sat Jun 11 22:56:52 2011 @@ -1,23 +1,16 @@ $OpenBSD: patch-xmobar_cabal,v 1.1 2010/07/17 14:55:21 kili Exp $ ---- xmobar.cabal.orig Mon May 17 12:17:50 2010 -+++ xmobar.cabal Tue Jul 6 18:56:36 2010 -@@ -15,8 +15,6 @@ maintainer: [email protected] - cabal-version: >= 1.6 - build-type: Simple +--- xmobar.cabal.orig Mon Mar 28 01:16:24 2011 ++++ xmobar.cabal Sat Jun 11 22:56:38 2011 +@@ -71,9 +71,11 @@ executable xmobar + Plugins.Monitors.MultiCpu, Plugins.Monitors.Net, + Plugins.Monitors.Swap, Plugins.Monitors.Thermal, + Plugins.Monitors.ThermalZone, Plugins.Monitors.Top, +- Plugins.Monitors.Uptime, Plugins.Monitors.Weather ++ Plugins.Monitors.Uptime, Plugins.Monitors.Weather, ++ Plugins.Monitors.Batt.Binding --data-files: xmobar.config-sample -- - flag small_base - description: Choose the new smaller, split-up base package. - -@@ -42,8 +40,9 @@ flag with_mpd - - executable xmobar - main-is: Main.hs -- other-modules: Xmobar, Config, Parsers, Commands, XUtil, StatFS, Runnable, Plugins -+ other-modules: Xmobar, Config, Parsers, Commands, XUtil, StatFS, Runnable, Plugins, Plugins.Monitors.Batt.Binding ghc-prof-options: -prof -auto-all -+ c-sources: Plugins/Monitors/Batt/apm.c ++ c-sources: src/Plugins/Monitors/Batt/apm.c if true ghc-options: -funbox-strict-fields -Wall diff -Nur /usr/ports/x11/xmobar/patches/patch-xmobar_config-sample xmobar/patches/patch-xmobar_config-sample --- /usr/ports/x11/xmobar/patches/patch-xmobar_config-sample Sat Jul 17 16:55:21 2010 +++ xmobar/patches/patch-xmobar_config-sample Thu Jan 1 01:00:00 1970 @@ -1,22 +0,0 @@ -$OpenBSD: patch-xmobar_config-sample,v 1.2 2010/07/17 14:55:21 kili Exp $ ---- xmobar.config-sample.orig Mon May 17 12:17:50 2010 -+++ xmobar.config-sample Mon Jul 12 16:03:46 2010 -@@ -4,15 +4,11 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" - , position = Top - , lowerOnStart = True - , commands = [ Run Weather "EGPF" ["-t","<station>: <tempC>C","-L","18","-H","25","--normal","green","--high","red","--low","lightblue"] 36000 -- , Run Network "eth0" ["-L","0","-H","32","--normal","green","--high","red"] 10 -- , Run Network "eth1" ["-L","0","-H","32","--normal","green","--high","red"] 10 -- , Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10 -- , Run Memory ["-t","Mem: <usedratio>%"] 10 -- , Run Swap [] 10 - , Run Com "uname" ["-s","-r"] "" 36000 -- , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10 -+ , Run Battery ["-t","Batt: <left> <minleft>"] 10 -+ , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10 - ] - , sepChar = "%" - , alignSep = "}{" -- , template = "%cpu% | %memory% * %swap% | %eth0% - %eth1% }{ <fc=#ee9a00>%date%</fc>| %EGPF% | %uname%" -+ , template = "%battery% }{ <fc=#ee9a00>%date%</fc>| %EGPF% | %uname%" - }
pgpvsgu8DUOG5.pgp
Description: PGP signature
