Hello, here is my anwser for the list. I miss to send it.
Thanks and greetings Simon > Simon Parrer <[email protected]> hat am 20.06.2020 09:31 geschrieben: > > > Good Morning, > > this sounds like a lot of work. > > I ask for update because the problem what i have is that the standard config > work well from /usr/local/share/examples/xmobar/xmobarrc. The Run Weather > plugin not work, i test many stations from > https://tgftp.nws.noaa.gov/data/observations/metar/decoded/. > > Config { font = "fixed" > , additionalFonts = [] > , borderColor = "black" > , border = TopB > , bgColor = "black" > , fgColor = "grey" > , alpha = 255 > , position = Top > , textOffset = -1 > , iconOffset = -1 > , lowerOnStart = True > , pickBroadest = False > , persistent = False > , hideOnStart = False > , iconRoot = "." > , allDesktops = True > , overrideRedirect = True > , commands = [ Run Weather "EGPF" ["-t","<station>: <tempC>C", > "-L","18","-H","25", > "--normal","green", > "--high","red", > "--low","lightblue"] 36000 > , Run Battery ["-t","AC: <status> Batt: <left> > <minleft>"] 10 > , Run Com "uname" ["-s","-r"] "" 36000 > , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10 > ] > , sepChar = "%" > , alignSep = "}{" > , template = "%battery% }{ <fc=#ee9a00>%date%</fc> | %EGPF% | %uname%" > } > When i know at some other options to my ~/.xmobarrc like , Run ThermalZone 0 > ["-t","<id>: <temp>C"] 30 and the template > <temp>C then i get this .xsession-error. > > xmobar: /home/simon/.xmobarrc: configuration file contains errors at: > "Config" (line 28, column 10): > unexpected "s" > expecting space or "Run" > CallStack (from HasCallStack): > error, called at src/Main.hs:91:19 in main:Main > > I add run ThermalZone between Run Com "uname" and Run Date. > > Not the best english sorry for this. > > Greetings Simon > > > > > > > > Matthias Kilian <[email protected]> hat am 19.06.2020 20:40 > > geschrieben: > > > > > > Hi, > > > > On Fri, Jun 19, 2020 at 08:01:36AM +0200, Simon Parrer wrote: > > > i hope is okay to ask. I can't do this on my own but it would be > > > really nice when anyone can maybe update this tool. > > > I like it a lot and it work really good with TWM. > > > > I'm not using it, but I had a look anyways. > > > > First: what features / fixes from newer versions are you missing? > > > > The newest version with a *trivial* update would probably be 0.26, because > > there are no requirements to new and/or updated dependencies. For > > everything newer, an update of x11/hs-dbus>1 would be necessary, which is > > painful (see below), so I'd drop dbus support from xmobar for those > > versions. > > > > For the latest and greates version (0.34) we would need: > > > > - an update of audio/hs-libmpd to 0.9.0.10 > > > > - an update of devel/hs-network to 2.6.3.6 (even newer versions would > > break other ports, including cabal-install, so that can't be done > > before we update the whole ghc gang) > > > > - a new package devel/hs-parsec-numbers (for xmobar itself, starting > > with version 0.27)) > > > > - a new package devel/hs-safe-exceptions (for audio/hs-libmpd) > > > > - in turn, bumps to devel/hs-hslogger, net/hs-HTTP, > > security/hs-hackage-security > > > > - disabling dbus support in xmobar (and probably remove x11/hs-dbus), > > because updating x11/hs-dbus to the required version (>= 1) would > > require a lot of other new hs-ports (lens, th-lift, sml-conduit, > > and in turn call-stack, base-orphans, generic-deriving, hs-reflection, > > kan-extensions, th-abstraction, maybe even more, the usual Haskell > > dependency madness) and a hs-network of at least 3.0.1.0 (which > > would break things; see above) > > > > - and porting the apm patches to the new version of xmobar > > > > For anyone interested in working on this, please find the diffs for > > ports to change below and the two new necessary ports attached (all > > relative to /usr/ports). Of courese, the diff for x11/xmobar itself > > is totally incomplete (it doesn't even build, and zapping all the > > patches isn't correct, either). > > > > Ciao, > > Kili > > > > Index: audio/hs-libmpd/Makefile > > =================================================================== > > RCS file: /cvs/ports/audio/hs-libmpd/Makefile,v > > retrieving revision 1.32 > > diff -u -p -r1.32 Makefile > > --- audio/hs-libmpd/Makefile 30 Sep 2019 11:50:59 -0000 1.32 > > +++ audio/hs-libmpd/Makefile 19 Jun 2020 18:33:44 -0000 > > @@ -2,7 +2,7 @@ > > > > COMMENT= Haskell interface to MPD > > > > -DISTNAME= libmpd-0.9.0.9 > > +DISTNAME= libmpd-0.9.0.10 > > CATEGORIES= audio > > > > HOMEPAGE= https://github.com/joachifm/libmpd-haskell > > @@ -14,12 +14,13 @@ MODULES= lang/ghc > > > > MODGHC_BUILD= cabal hackage haddock register > > > > -MODGHC_PACKAGE_KEY= BcrGFlp1jLt1YyFqRIGAS5 > > +MODGHC_PACKAGE_KEY= HTbL6wNYeYkB8tCeftrL2W > > > > BUILD_DEPENDS= ${RUN_DEPENDS} > > RUN_DEPENDS= devel/hs-data-default>=0.4,<1.0 \ > > - devel/hs-network>=2.1,<3.0 \ > > + devel/hs-network>=2.6.3.5 \ > > + devel/hs-safe-exceptions>=0.1 \ > > devel/hs-utf8-string>=0.3.1,<1.1 \ > > - textproc/hs-attoparsec>=0.10.1,<1.0 > > + textproc/hs-attoparsec>=0.3.1.<1.1 > > > > .include <bsd.port.mk> > > Index: audio/hs-libmpd/distinfo > > =================================================================== > > RCS file: /cvs/ports/audio/hs-libmpd/distinfo,v > > retrieving revision 1.14 > > diff -u -p -r1.14 distinfo > > --- audio/hs-libmpd/distinfo 30 Sep 2019 11:50:59 -0000 1.14 > > +++ audio/hs-libmpd/distinfo 19 Jun 2020 18:33:44 -0000 > > @@ -1,2 +1,2 @@ > > -SHA256 (ghc/libmpd-0.9.0.9.tar.gz) = > > W4Z+5nXeH0kOWPXLOQPh6n5DDryktthua5wsHIeoYaQ= > > -SIZE (ghc/libmpd-0.9.0.9.tar.gz) = 38960 > > +SHA256 (ghc/libmpd-0.9.0.10.tar.gz) = > > ay41ogaiPEPn0a0VrC8zCFEBLmBwxCLjnmjuYOtBwm8= > > +SIZE (ghc/libmpd-0.9.0.10.tar.gz) = 41074 > > Index: audio/hs-libmpd/patches/patch-libmpd_cabal > > =================================================================== > > RCS file: /cvs/ports/audio/hs-libmpd/patches/patch-libmpd_cabal,v > > retrieving revision 1.5 > > diff -u -p -r1.5 patch-libmpd_cabal > > --- audio/hs-libmpd/patches/patch-libmpd_cabal 18 Mar 2015 16:00:19 > > -0000 1.5 > > +++ audio/hs-libmpd/patches/patch-libmpd_cabal 19 Jun 2020 18:33:44 > > -0000 > > @@ -1,21 +1,22 @@ > > $OpenBSD: patch-libmpd_cabal,v 1.5 2015/03/18 16:00:19 dcoppa Exp $ > > ---- libmpd.cabal.orig Wed Mar 18 10:49:48 2015 > > -+++ libmpd.cabal Wed Mar 18 10:50:38 2015 > > +Index: libmpd.cabal > > +--- libmpd.cabal.orig > > ++++ libmpd.cabal > > @@ -49,7 +49,7 @@ Library > > , text >= 0.11 && < 2 > > > > -- Additional dependencies > > - , data-default-class >= 0.0.1 && < 1 > > + , data-default >= 0.4 && < 1 > > - , network >= 2.1 && < 3 > > + , network >= 2.6.3.5 > > + , safe-exceptions >= 0.1 && < 0.2 > > , utf8-string >= 0.3.1 && < 1.1 > > - > > -@@ -123,7 +123,7 @@ Test-Suite specs > > +@@ -126,7 +126,7 @@ Test-Suite specs > > , time > > > > -- Additional dependencies > > - , data-default-class > > + , data-default > > , network > > + , safe-exceptions > > , utf8-string > > - > > Index: audio/hs-libmpd/patches/patch-src_Network_MPD_Commands_Types_hs > > =================================================================== > > RCS file: > > /cvs/ports/audio/hs-libmpd/patches/patch-src_Network_MPD_Commands_Types_hs,v > > retrieving revision 1.1 > > diff -u -p -r1.1 patch-src_Network_MPD_Commands_Types_hs > > --- audio/hs-libmpd/patches/patch-src_Network_MPD_Commands_Types_hs 18 Mar > > 2015 16:00:19 -0000 1.1 > > +++ audio/hs-libmpd/patches/patch-src_Network_MPD_Commands_Types_hs 19 Jun > > 2020 18:33:44 -0000 > > @@ -1,7 +1,8 @@ > > $OpenBSD: patch-src_Network_MPD_Commands_Types_hs,v 1.1 2015/03/18 > > 16:00:19 dcoppa Exp $ > > ---- src/Network/MPD/Commands/Types.hs.orig Wed Mar 18 10:52:29 2015 > > -+++ src/Network/MPD/Commands/Types.hs Wed Mar 18 10:52:43 2015 > > -@@ -38,7 +38,7 @@ module Network.MPD.Commands.Types > > +Index: src/Network/MPD/Commands/Types.hs > > +--- src/Network/MPD/Commands/Types.hs.orig > > ++++ src/Network/MPD/Commands/Types.hs > > +@@ -41,7 +41,7 @@ module Network.MPD.Commands.Types > > > > import Network.MPD.Commands.Arg (MPDArg(prep), Args(Args)) > > > > @@ -9,4 +10,4 @@ $OpenBSD: patch-src_Network_MPD_Commands > > +import Data.Default > > > > import qualified Data.Map as M > > - import Data.Time.Clock (UTCTime) > > + import Data.Map.Strict (insertWith) > > Index: devel/hs-network/Makefile > > =================================================================== > > RCS file: /cvs/ports/devel/hs-network/Makefile,v > > retrieving revision 1.34 > > diff -u -p -r1.34 Makefile > > --- devel/hs-network/Makefile 30 Sep 2019 12:58:09 -0000 1.34 > > +++ devel/hs-network/Makefile 19 Jun 2020 18:33:44 -0000 > > @@ -6,8 +6,7 @@ COMMENT = Haskell networking library > > # Please do *not* update without thinking. > > PORTROACH = ignore:1 > > > > -DISTNAME = network-2.6.2.1 > > -REVISION = 5 > > +DISTNAME = network-2.6.3.6 > > CATEGORIES = devel net > > > > MAINTAINER = Matthias Kilian <[email protected]> > > @@ -19,6 +18,6 @@ MODULES = lang/ghc > > > > MODGHC_BUILD = cabal hackage haddock register > > > > -MODGHC_PACKAGE_KEY = Lfd6hU8QSOtC72PepFdIPJ > > +MODGHC_PACKAGE_KEY = 4mVMJJofAhjBUCFQLnDqdS > > > > .include <bsd.port.mk> > > Index: devel/hs-network/distinfo > > =================================================================== > > RCS file: /cvs/ports/devel/hs-network/distinfo,v > > retrieving revision 1.9 > > diff -u -p -r1.9 distinfo > > --- devel/hs-network/distinfo 19 Sep 2015 07:58:00 -0000 1.9 > > +++ devel/hs-network/distinfo 19 Jun 2020 18:33:44 -0000 > > @@ -1,2 +1,2 @@ > > -SHA256 (ghc/network-2.6.2.1.tar.gz) = > > o/2hXJu+LHJ02X9AOYxs+NHTqf6Jb79lMeG/yEm7G/o= > > -SIZE (ghc/network-2.6.2.1.tar.gz) = 118092 > > +SHA256 (ghc/network-2.6.3.6.tar.gz) = > > m94GCas5RB2qfaN2wJ9QHikTMF72S+XSRcRbqE5VFaU= > > +SIZE (ghc/network-2.6.3.6.tar.gz) = 121002 > > Index: devel/hs-network/patches/patch-Network_Socket_hsc > > =================================================================== > > RCS file: /cvs/ports/devel/hs-network/patches/patch-Network_Socket_hsc,v > > retrieving revision 1.6 > > diff -u -p -r1.6 patch-Network_Socket_hsc > > --- devel/hs-network/patches/patch-Network_Socket_hsc 19 Sep 2015 > > 07:58:00 -0000 1.6 > > +++ devel/hs-network/patches/patch-Network_Socket_hsc 19 Jun 2020 > > 18:33:44 -0000 > > @@ -1,19 +0,0 @@ > > -$OpenBSD: patch-Network_Socket_hsc,v 1.6 2015/09/19 07:58:00 kili Exp $ > > - > > -don't throw an error when attempting to setsockopt IPV6_V6ONLY > > - > > ---- Network/Socket.hsc.orig Tue Jul 7 20:40:52 2015 > > -+++ Network/Socket.hsc Tue Sep 1 10:14:57 2015 > > -@@ -318,9 +318,10 @@ socket family stype protocol = do > > - withSocketsDo $ return () > > - let sock = MkSocket fd family stype protocol socket_status > > - #if HAVE_DECL_IPV6_V6ONLY > > --# if defined(mingw32_HOST_OS) > > -+# if defined(mingw32_HOST_OS) || defined(openbsd_HOST_OS) > > - -- the IPv6Only option is only supported on Windows Vista and later, > > -- -- so trying to change it might throw an error > > -+ -- so trying to change it might throw an error. It's also not > > -+ -- supported on OpenBSD. > > - when (family == AF_INET6) $ > > - E.catch (setSocketOption sock IPv6Only 0) $ (\(_ :: > > E.IOException) -> return ()) > > - # else > > Index: devel/hs-network/pkg/PLIST > > =================================================================== > > RCS file: /cvs/ports/devel/hs-network/pkg/PLIST,v > > retrieving revision 1.13 > > diff -u -p -r1.13 PLIST > > --- devel/hs-network/pkg/PLIST 30 Sep 2019 12:58:09 -0000 1.13 > > +++ devel/hs-network/pkg/PLIST 19 Jun 2020 18:33:44 -0000 > > @@ -43,9 +43,9 @@ lib/ghc/${DISTNAME}/Network/Socket/Types > > lib/ghc/${DISTNAME}/include/ > > lib/ghc/${DISTNAME}/include/HsNet.h > > lib/ghc/${DISTNAME}/include/HsNetworkConfig.h > > -lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}-ghc${MODGHC_VER}.so > > -lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}.a > > -lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}_p.a > > +@so > > lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}-ghc${MODGHC_VER}.so > > +@static-lib lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}.a > > +@static-lib lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}_p.a > > lib/ghc/package.conf.d/${DISTNAME}.conf > > share/doc/hs-${DISTNAME}/ > > share/doc/hs-${DISTNAME}/LICENSE > > Index: devel/hs-hslogger/Makefile > > =================================================================== > > RCS file: /cvs/ports/devel/hs-hslogger/Makefile,v > > retrieving revision 1.36 > > diff -u -p -r1.36 Makefile > > --- devel/hs-hslogger/Makefile 30 Sep 2019 12:58:08 -0000 1.36 > > +++ devel/hs-hslogger/Makefile 19 Jun 2020 18:33:44 -0000 > > @@ -3,7 +3,7 @@ > > COMMENT = versatile logging framework > > > > DISTNAME = hslogger-1.2.10 > > -REVISION = 4 > > +REVISION = 5 > > CATEGORIES = devel sysutils > > HOMEPAGE = https://github.com/jgoerzen/hslogger/wiki > > > > @@ -14,7 +14,7 @@ MODULES = lang/ghc > > > > MODGHC_BUILD = cabal hackage haddock register > > > > -MODGHC_PACKAGE_KEY = AeBcxdsqOAhG5ylU0fE0Kf > > +MODGHC_PACKAGE_KEY = 4YzMMJe3LMc4ZbO7VXhCa9 > > > > RUN_DEPENDS += devel/hs-network \ > > devel/hs-old-locale > > Index: net/hs-HTTP/Makefile > > =================================================================== > > RCS file: /cvs/ports/net/hs-HTTP/Makefile,v > > retrieving revision 1.34 > > diff -u -p -r1.34 Makefile > > --- net/hs-HTTP/Makefile 30 Sep 2019 12:31:18 -0000 1.34 > > +++ net/hs-HTTP/Makefile 19 Jun 2020 18:33:44 -0000 > > @@ -7,6 +7,7 @@ COMMENT = library for client-side HTTP > > PORTROACH = ignore:1 > > > > DISTNAME = HTTP-4000.3.13 > > +REVISION = 0 > > CATEGORIES = net devel > > > > MAINTAINER = Matthias Kilian <[email protected]> > > @@ -18,7 +19,7 @@ MODULES = lang/ghc > > > > MODGHC_BUILD = cabal hackage haddock register > > > > -MODGHC_PACKAGE_KEY = 84dyfwBlJKS3ljJTR3NNxp > > +MODGHC_PACKAGE_KEY = pRQgI2CRlpDh7kkGCropI > > > > RUN_DEPENDS = devel/hs-network-uri>=2.6,<2.7 \ > > devel/hs-network>=2.6,<2.7 > > Index: security/hs-hackage-security/Makefile > > =================================================================== > > RCS file: /cvs/ports/security/hs-hackage-security/Makefile,v > > retrieving revision 1.5 > > diff -u -p -r1.5 Makefile > > --- security/hs-hackage-security/Makefile 30 Sep 2019 12:34:32 -0000 > > 1.5 > > +++ security/hs-hackage-security/Makefile 19 Jun 2020 18:33:44 -0000 > > @@ -5,6 +5,7 @@ > > COMMENT= hackage security library > > > > DISTNAME= hackage-security-0.5.3.0 > > +REVISION= 0 > > CATEGORIES= security > > > > # BSD3 > > @@ -14,7 +15,7 @@ MODULES= lang/ghc > > > > MODGHC_BUILD = cabal hackage haddock register > > > > -MODGHC_PACKAGE_KEY = 1VpHOvLcO2g6J40Ysrc07t > > +MODGHC_PACKAGE_KEY = E4zxic04epgLMIvotbwePQ > > > > RUN_DEPENDS = archivers/hs-zlib>=0.5,<0.7 \ > > devel/hs-base16-bytestring>=0.1.1,<0.2 \ > > Index: x11/hs-dbus/Makefile > > =================================================================== > > RCS file: /cvs/ports/x11/hs-dbus/Makefile,v > > retrieving revision 1.26 > > diff -u -p -r1.26 Makefile > > --- x11/hs-dbus/Makefile 30 Sep 2019 13:02:54 -0000 1.26 > > +++ x11/hs-dbus/Makefile 19 Jun 2020 18:33:44 -0000 > > @@ -3,7 +3,7 @@ > > COMMENT = Haskell implementation of the D-Bus protocol > > > > DISTNAME = dbus-0.10.13 > > -REVISION = 4 > > +REVISION = 5 > > CATEGORIES = devel x11 > > > > HOMEPAGE = https://github.com/rblaze/haskell-dbus#readme > > @@ -15,7 +15,7 @@ MODULES = lang/ghc > > > > MODGHC_BUILD = cabal hackage haddock register > > > > -MODGHC_PACKAGE_KEY = GkT37aCm0RP9JHiW0yK7ST > > +MODGHC_PACKAGE_KEY = EAvLRng4bWn9upDODgPDDA > > > > RUN_DEPENDS = devel/hs-cereal \ > > devel/hs-network \ > > Index: x11/xmobar/Makefile > > =================================================================== > > RCS file: /cvs/ports/x11/xmobar/Makefile,v > > retrieving revision 1.47 > > diff -u -p -r1.47 Makefile > > --- x11/xmobar/Makefile 30 Sep 2019 12:54:32 -0000 1.47 > > +++ x11/xmobar/Makefile 19 Jun 2020 18:33:44 -0000 > > @@ -2,8 +2,7 @@ > > > > COMMENT = minimalistic text based status bar > > > > -DISTNAME = xmobar-0.24.3 > > -REVISION = 5 > > +DISTNAME = xmobar-0.34 > > CATEGORIES = x11 > > HOMEPAGE = http://projects.haskell.org/xmobar > > > > @@ -17,17 +16,18 @@ WANTLIB = X11 Xext Xft Xinerama Xrandr > > MODULES = lang/ghc > > > > MODGHC_BUILD = cabal hackage nort > > -MODGHC_SETUP_CONF_ARGS = --flags="with_xft with_mpd with_mpris > > with_inotify" > > -MODGHC_SETUP_CONF_ARGS += --extra-lib-dirs=${LOCALBASE}/lib/inotify/ > > +MODGHC_SETUP_CONF_ARGS = --flags="with_xft with_mpd with_inotify with_utf8" > > > > > > -BUILD_DEPENDS = devel/hs-hinotify>=0.3 \ > > +BUILD_DEPENDS = devel/hs-async \ > > + devel/hs-extensible-exceptions>=0.1 \ > > + devel/hs-hinotify>=0.3,<0.5 \ > > + devel/hs-parsec-numbers>=0.1.0 \ > > devel/hs-regex-compat \ > > - net/hs-HTTP>=4000.2.4 \ > > + devel/hs-utf8-string>=0.3,<1.1 \ > > x11/hs-X11>=1.6.1 \ > > x11/hs-X11-xft>=0.2,<0.4 \ > > - x11/hs-dbus>=0.10 \ > > - audio/hs-libmpd>=0.9,<0.10 > > + audio/hs-libmpd>=0.9.0.10 > > > > LIB_DEPENDS = converters/libiconv \ > > devel/gmp \ > > @@ -39,17 +39,16 @@ EXAMPLEDIR = ${PREFIX}/share/examples/x > > > > NO_TEST = Yes > > > > -SUBST_VARS += LOCALBASE > > - > > -pre-configure: > > - ${SUBST_CMD} ${WRKDIST}/xmobar.cabal > > - > > post-patch: > > - @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 > > + @cp ${FILESDIR}/Batt.hs ${WRKBUILD}/src/Xmobar/Plugins/Monitors > > + @mkdir ${WRKBUILD}/src/Xmobar/Plugins/Monitors/Batt > > + @cp ${FILESDIR}/Binding.hsc ${WRKBUILD}/src/Xmobar/Plugins/Monitors/Batt > > + @cp ${FILESDIR}/apm.c ${WRKBUILD}/src/Xmobar/Plugins/Monitors/Batt > > + @cp ${FILESDIR}/apm.h ${WRKBUILD}/src/Xmobar/Plugins/Monitors/Batt > > + > > + # No setup.hs (or .lhs) in the distfile -- huh? > > + echo 'import Distribution.Simple' > ${WRKBUILD}/Setup.hs > > + echo 'main = defaultMainWithHooks simpleUserHooks' >> > > ${WRKBUILD}/Setup.hs > > > > post-install: > > ${INSTALL_DATA_DIR} ${EXAMPLEDIR} > > Index: x11/xmobar/distinfo > > =================================================================== > > RCS file: /cvs/ports/x11/xmobar/distinfo,v > > retrieving revision 1.16 > > diff -u -p -r1.16 distinfo > > --- x11/xmobar/distinfo 6 Sep 2016 11:50:52 -0000 1.16 > > +++ x11/xmobar/distinfo 19 Jun 2020 18:33:44 -0000 > > @@ -1,2 +1,2 @@ > > -SHA256 (ghc/xmobar-0.24.3.tar.gz) = > > 0zAHndYOIgBKTPonHrngChuza42vy78bGlmA1AHc9RA= > > -SIZE (ghc/xmobar-0.24.3.tar.gz) = 100317 > > +SHA256 (ghc/xmobar-0.34.tar.gz) = > > PQuRPGEvM1gNHnUbEPGOWJYpZcq3B2kIAF4lf/7qCXQ= > > +SIZE (ghc/xmobar-0.34.tar.gz) = 129252 > > Index: x11/xmobar/files/Batt.hs > > =================================================================== > > RCS file: /cvs/ports/x11/xmobar/files/Batt.hs,v > > retrieving revision 1.4 > > diff -u -p -r1.4 Batt.hs > > --- x11/xmobar/files/Batt.hs 10 Aug 2016 08:50:24 -0000 1.4 > > +++ x11/xmobar/files/Batt.hs 19 Jun 2020 18:33:44 -0000 > > @@ -1,7 +1,7 @@ > > -module Plugins.Monitors.Batt where > > +module Xmobar.Plugins.Monitors.Batt where > > > > -import Plugins.Monitors.Common > > -import Plugins.Monitors.Batt.Binding > > +import Xmobar.Plugins.Monitors.Common > > +import Xmobar.Plugins.Monitors.Batt.Binding > > > > battConfig :: IO MConfig > > battConfig = mkMConfig > > Index: x11/xmobar/files/Binding.hsc > > =================================================================== > > RCS file: /cvs/ports/x11/xmobar/files/Binding.hsc,v > > retrieving revision 1.3 > > diff -u -p -r1.3 Binding.hsc > > --- x11/xmobar/files/Binding.hsc 10 Aug 2016 08:50:24 -0000 1.3 > > +++ x11/xmobar/files/Binding.hsc 19 Jun 2020 18:33:44 -0000 > > @@ -1,6 +1,6 @@ > > {-# LANGUAGE CPP, ForeignFunctionInterface #-} > > > > -module Plugins.Monitors.Batt.Binding ( > > +module Xmobar.Plugins.Monitors.Batt.Binding ( > > getApmPowerInfo, > > ApmPowerInfo (..), > > AcState (..), BatteryState(..) > > Index: x11/xmobar/patches/patch-samples_xmobar_config > > =================================================================== > > RCS file: /cvs/ports/x11/xmobar/patches/patch-samples_xmobar_config,v > > retrieving revision 1.11 > > diff -u -p -r1.11 patch-samples_xmobar_config > > --- x11/xmobar/patches/patch-samples_xmobar_config 10 Aug 2016 08:50:24 > > -0000 1.11 > > +++ x11/xmobar/patches/patch-samples_xmobar_config 19 Jun 2020 18:33:44 > > -0000 > > @@ -1,31 +0,0 @@ > > -$OpenBSD: patch-samples_xmobar_config,v 1.11 2016/08/10 08:50:24 dcoppa > > Exp $ > > ---- samples/xmobar.config.orig Mon Aug 8 23:40:59 2016 > > -+++ samples/xmobar.config Wed Aug 10 09:45:35 2016 > > -@@ -1,4 +1,4 @@ > > --Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" > > -+Config { font = "fixed" > > - , additionalFonts = [] > > - , borderColor = "black" > > - , border = TopB > > -@@ -20,19 +20,11 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*" > > - "--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 Battery ["-t","AC: <status> Batt: <left> > > <minleft>"] 10 > > - , Run Com "uname" ["-s","-r"] "" 36000 > > - , 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%" > > - } > > Index: x11/xmobar/patches/patch-src_Plugins_Monitors_hs > > =================================================================== > > RCS file: /cvs/ports/x11/xmobar/patches/patch-src_Plugins_Monitors_hs,v > > retrieving revision 1.9 > > diff -u -p -r1.9 patch-src_Plugins_Monitors_hs > > --- x11/xmobar/patches/patch-src_Plugins_Monitors_hs 10 Aug 2016 > > 08:50:24 -0000 1.9 > > +++ x11/xmobar/patches/patch-src_Plugins_Monitors_hs 19 Jun 2020 > > 18:33:44 -0000 > > @@ -1,172 +0,0 @@ > > -$OpenBSD: patch-src_Plugins_Monitors_hs,v 1.9 2016/08/10 08:50:24 dcoppa > > Exp $ > > ---- src/Plugins/Monitors.hs.orig Mon Aug 8 23:40:59 2016 > > -+++ src/Plugins/Monitors.hs Wed Aug 10 09:42:10 2016 > > -@@ -21,20 +21,20 @@ import Plugins > > - > > - import Plugins.Monitors.Common (runM, runMD) > > - 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.Bright > > --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.Bright > > -+--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.CatInt > > - #ifdef UVMETER > > - import Plugins.Monitors.UVMeter > > -@@ -54,25 +54,25 @@ import Plugins.Monitors.Mpris > > - #endif > > - > > - data Monitors = Weather Station Args Rate > > -- | Network Interface Args Rate > > -- | DynNetwork Args Rate > > -- | BatteryP Args Args Rate > > -- | BatteryN Args Args Rate Alias > > -+-- | Network Interface Args Rate > > -+-- | DynNetwork Args Rate > > -+-- | BatteryP Args Args Rate > > -+-- | BatteryN Args Args Rate Alias > > - | Battery 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 > > -- | Brightness Args Rate > > -- | CpuFreq Args Rate > > -- | CoreTemp Args Rate > > -- | TopProc Args Rate > > -- | TopMem Args Rate > > -- | Uptime 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 > > -+-- | Brightness Args Rate > > -+-- | CpuFreq Args Rate > > -+-- | CoreTemp Args Rate > > -+-- | TopProc Args Rate > > -+-- | TopMem Args Rate > > -+-- | Uptime Args Rate > > - | CatInt Int FilePath Args Rate > > - #ifdef UVMETER > > - | UVMeter Station Args Rate > > -@@ -105,25 +105,25 @@ type DiskSpec = [(String, String)] > > - > > - instance Exec Monitors where > > - alias (Weather s _ _) = s > > -- alias (Network i _ _) = i > > -- alias (DynNetwork _ _) = "dynnetwork" > > -- 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 (DynNetwork _ _) = "dynnetwork" > > -+-- 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 (BatteryN _ _ _ a)= a > > -- alias (Brightness _ _) = "bright" > > -- 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 (BatteryN _ _ _ a)= a > > -+-- alias (Brightness _ _) = "bright" > > -+-- alias (CpuFreq _ _) = "cpufreq" > > -+-- alias (TopProc _ _) = "top" > > -+-- alias (TopMem _ _) = "topmem" > > -+-- alias (CoreTemp _ _) = "coretemp" > > -+-- alias (DiskU {}) = "disku" > > -+-- alias (DiskIO {}) = "diskio" > > -+-- alias (Uptime _ _) = "uptime" > > - alias (CatInt n _ _ _) = "cat" ++ show n > > - #ifdef UVMETER > > - alias (UVMeter s _ _) = "uv " ++ s > > -@@ -142,27 +142,27 @@ instance Exec Monitors where > > - alias (Mpris1 _ _ _) = "mpris1" > > - alias (Mpris2 _ _ _) = "mpris2" > > - #endif > > -- start (Network i a r) = startNet i a r > > -- start (DynNetwork a r) = startDynNet 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 (DynNetwork a r) = startDynNet 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) = runMD (a ++ [s]) weatherConfig runWeather r > > weatherReady > > -- 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 (BatteryN s a r _) = runM a battConfig (runBatt' s) r > > -- start (Brightness a r) = runM a brightConfig runBright 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 (BatteryN s a r _) = runM a battConfig (runBatt' s) r > > -+-- start (Brightness a r) = runM a brightConfig runBright 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 (CatInt _ s a r) = runM a catIntConfig (runCatInt s) r > > - #ifdef UVMETER > > - start (UVMeter s a r) = runM (a ++ [s]) uvConfig runUVMeter r > > Index: x11/xmobar/patches/patch-src_Window_hs > > =================================================================== > > RCS file: /cvs/ports/x11/xmobar/patches/patch-src_Window_hs,v > > retrieving revision 1.3 > > diff -u -p -r1.3 patch-src_Window_hs > > --- x11/xmobar/patches/patch-src_Window_hs 23 Nov 2016 13:24:05 -0000 > > 1.3 > > +++ x11/xmobar/patches/patch-src_Window_hs 19 Jun 2020 18:33:44 -0000 > > @@ -1,19 +0,0 @@ > > -$OpenBSD: patch-src_Window_hs,v 1.3 2016/11/23 13:24:05 dcoppa Exp $ > > - > > -commit fd10cff3c73cb6fc99c3c34473685bf8b95dccdb > > -Author: jao <[email protected]> > > -Date: Mon Nov 21 21:19:47 2016 +0100 > > - > > -Bug fix: off-by-one drawing borders > > - > > ---- src/Window.hs.orig Mon Sep 5 17:49:18 2016 > > -+++ src/Window.hs Wed Nov 23 14:17:04 2016 > > -@@ -178,7 +178,7 @@ drawBorder b lw d p gc c wi ht = case b of > > - FullBM m -> let mp = fi m > > - pad = 2 * fi mp + fi lw > > - in sf >> sla >> > > -- drawRectangle d p gc mp mp (wi - pad + 1) (ht - pad) > > -+ drawRectangle d p gc mp mp (wi - pad) (ht - pad) > > - where sf = setForeground d gc c > > - sla = setLineAttributes d gc (fi lw) lineSolid capNotLast > > joinMiter > > - boff = borderOffset b lw > > Index: x11/xmobar/patches/patch-src_Xmobar_hs > > =================================================================== > > RCS file: /cvs/ports/x11/xmobar/patches/patch-src_Xmobar_hs,v > > retrieving revision 1.1 > > diff -u -p -r1.1 patch-src_Xmobar_hs > > --- x11/xmobar/patches/patch-src_Xmobar_hs 11 Oct 2016 10:24:12 -0000 > > 1.1 > > +++ x11/xmobar/patches/patch-src_Xmobar_hs 19 Jun 2020 18:33:44 -0000 > > @@ -1,21 +0,0 @@ > > -$OpenBSD: patch-src_Xmobar_hs,v 1.1 2016/10/11 10:24:12 dcoppa Exp $ > > - > > -commit f2d33fa9a2a613fd19c41323f2f11941f8a08e27 > > -Author: michael bishop <[email protected]> > > -Date: Wed Sep 14 09:18:44 2016 -0300 > > - > > -tell the user what went wrong in the event of a failure > > - > > ---- src/Xmobar.hs.orig Mon Sep 5 17:49:18 2016 > > -+++ src/Xmobar.hs Tue Oct 11 12:10:30 2016 > > -@@ -106,8 +106,8 @@ startLoop xcfg@(XConf _ _ w _ _ _) sig vs = do > > - #endif > > - eventLoop tv xcfg [] sig > > - where > > -- handler thing (SomeException _) = > > -- void $ putStrLn ("Thread " ++ thing ++ " failed") > > -+ handler thing (SomeException e) = > > -+ void $ putStrLn ("Thread " ++ thing ++ " failed: " ++ (show e)) > > - -- Reacts on events from X > > - eventer signal = > > - allocaXEvent $ \e -> do > > Index: x11/xmobar/patches/patch-xmobar_cabal > > =================================================================== > > RCS file: /cvs/ports/x11/xmobar/patches/patch-xmobar_cabal,v > > retrieving revision 1.19 > > diff -u -p -r1.19 patch-xmobar_cabal > > --- x11/xmobar/patches/patch-xmobar_cabal 30 Sep 2019 12:54:32 -0000 > > 1.19 > > +++ x11/xmobar/patches/patch-xmobar_cabal 19 Jun 2020 18:33:44 -0000 > > @@ -1,62 +1,20 @@ > > -$OpenBSD: patch-xmobar_cabal,v 1.19 2019/09/30 12:54:32 kili Exp $ > > - > > -commit dfb5dbd6cc5342348fbb46bd117c226d5e8127e4 > > -Author: jao <[email protected]> > > -Date: Thu Feb 23 00:54:19 2017 +0100 > > - > > -Compiling with --with-rtsopts=-V0 to reduce wakeups (issue #89) > > +$OpenBSD$ > > > > Index: xmobar.cabal > > --- xmobar.cabal.orig > > +++ xmobar.cabal > > -@@ -74,6 +74,10 @@ flag with_threaded > > - description: Use threaded runtime. > > - default: False > > +@@ -159,11 +159,13 @@ library > > + Xmobar.Plugins.Monitors.Top, > > + Xmobar.Plugins.Monitors.Uptime, > > + Xmobar.Plugins.Monitors.Bright, > > +- Xmobar.Plugins.Monitors.CatInt > > ++ Xmobar.Plugins.Monitors.CatInt, > > ++ Xmobar.Plugins.Monitors.Batt.Binding > > > > -+flag with_rtsopts > > -+ description: Use -with-rtsopts=-V0 to reduce wakeups > > -+ default: True > > -+ > > - flag with_uvmeter > > - description: UVMeter only useful to australians. > > - default: False > > -@@ -103,9 +107,10 @@ executable xmobar > > - Plugins.Monitors.ThermalZone, Plugins.Monitors.Top, > > - Plugins.Monitors.Uptime, Plugins.Monitors.Weather, > > - Plugins.Monitors.Bright, Plugins.Monitors.CatInt, > > -- Plugins.Monitors.UVMeter > > -+ Plugins.Monitors.UVMeter, Plugins.Monitors.Batt.Binding > > + extra-libraries: Xrandr Xrender > > > > ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind > > -+ c-sources: src/Plugins/Monitors/Batt/apm.c > > - extra-libraries: Xrandr Xrender > > ++ c-sources: src/Xmobar/plugins/Monitors/Batt/apm.c > > > > build-depends: > > -@@ -124,7 +129,7 @@ executable xmobar > > - mtl >= 2.1 && < 2.3, > > - parsec == 3.1.*, > > - HTTP >= 4000.2.4, > > -- stm >= 2.3 && < 2.5 > > -+ stm >= 2.3 && < 2.6 > > - > > - if flag(with_conduit) > > - -- use http-conduit instead of simple-http > > -@@ -138,6 +143,9 @@ executable xmobar > > - ghc-options: -threaded > > - cpp-options: -DTHREADED_RUNTIME > > - > > -+ if flag(with_rtsopts) > > -+ ghc-options: -with-rtsopts=-V0 > > -+ > > - if impl (ghc < 7) > > - cpp-options: -DGHC6 > > - > > -@@ -154,6 +162,8 @@ executable xmobar > > - build-depends: hinotify == 0.3.* > > - other-modules: Plugins.Mail, Plugins.MBox > > - cpp-options: -DINOTIFY > > -+ ld-options: -Wl,-rpath=${LOCALBASE}/lib/inotify > > -+ extra-libraries: inotify > > - > > - if flag(with_iwlib) || flag(all_extensions) > > - extra-libraries: iw > > + base >= 4.9.1.0 && < 4.15,
