>From 67d83df86e902a5f6a042102160d9b2aba20abbd Mon Sep 17 00:00:00 2001
From: Greg Steuck <g...@nest.cx>
Date: Tue, 25 Aug 2020 22:47:41 -0700
Subject: [PATCH 6/7] Use devel/cabal module for x11/xmobar and upgrade to 0.37
Local APM patches still work after minor massaging.
---
x11/xmobar/Makefile | 150 ++++++++--
x11/xmobar/distinfo | 260 +++++++++++++++++-
x11/xmobar/files/Batt.hs | 6 +-
x11/xmobar/files/Binding.hsc | 2 +-
x11/xmobar/files/cabal.project | 11 +
...ar_config => patch-examples_xmobar_config} | 4 +-
.../patches/patch-src_Plugins_Monitors_hs | 172 ------------
x11/xmobar/patches/patch-src_Window_hs | 19 --
.../patch-src_Xmobar_Plugins_Monitors_hs | 32 +++
x11/xmobar/patches/patch-src_Xmobar_hs | 21 --
x11/xmobar/patches/patch-xmobar_cabal | 67 +----
x11/xmobar/pkg/DESCR | 6 +-
x11/xmobar/pkg/PLIST | 10 +-
13 files changed, 453 insertions(+), 307 deletions(-)
create mode 100644 x11/xmobar/files/cabal.project
rename x11/xmobar/patches/{patch-samples_xmobar_config =>
patch-examples_xmobar_config} (93%)
delete mode 100644 x11/xmobar/patches/patch-src_Plugins_Monitors_hs
delete mode 100644 x11/xmobar/patches/patch-src_Window_hs
create mode 100644 x11/xmobar/patches/patch-src_Xmobar_Plugins_Monitors_hs
delete mode 100644 x11/xmobar/patches/patch-src_Xmobar_hs
diff --git a/x11/xmobar/Makefile b/x11/xmobar/Makefile
index 0a2ebbd7b8d..cc1f825c4e5 100644
--- a/x11/xmobar/Makefile
+++ b/x11/xmobar/Makefile
@@ -2,10 +2,10 @@
COMMENT = minimalistic text based status bar
-DISTNAME = xmobar-0.24.3
-REVISION = 5
+MODCABAL_STEM = xmobar
+MODCABAL_VERSION = 0.37
CATEGORIES = x11
-HOMEPAGE = http://projects.haskell.org/xmobar
+HOMEPAGE = http://xmobar.org
# BSD3
PERMIT_PACKAGE = Yes
@@ -14,20 +14,122 @@ WANTLIB = X11 Xext Xft Xinerama Xrandr Xrender \
Xss c charset ffi gmp iconv \
lib/inotify/inotify m pthread util xml2
-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/
-
-
-BUILD_DEPENDS = devel/hs-hinotify>=0.3 \
- devel/hs-regex-compat \
- net/hs-HTTP>=4000.2.4 \
- 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
+MODULES = devel/cabal
+MODCABAL_FLAGS = with_xft with_mpd with_mpris with_inotify
+
+# % cabal get xmobar-0.37
+# % cd ./xmobar-0.37
+# % cabal v2-configure --flags="with_xft with_mpd with_mpris with_inotify"
+# % cabal-bundler --openbsd xmobar -p ./dist-newstyle/cache/plan.json
+
+MODCABAL_MANIFEST = \
+ StateVar 1.2.1 0 \
+ X11 1.9.2 0 \
+ X11-xft 0.3.1 0 \
+ adjunctions 4.4 2 \
+ aeson 1.5.6.0 0 \
+ asn1-encoding 0.9.6 2 \
+ asn1-parse 0.9.5 0 \
+ asn1-types 0.3.4 0 \
+ assoc 1.0.2 1 \
+ async 2.2.3 0 \
+ attoparsec 0.13.2.5 0 \
+ base-compat 0.11.2 0 \
+ base-compat-batteries 0.11.2 0 \
+ base-orphans 0.8.4 0 \
+ base64-bytestring 1.2.0.1 0 \
+ basement 0.0.11 2 \
+ bifunctors 5.5.10 0 \
+ blaze-builder 0.4.2.1 0 \
+ blaze-html 0.9.1.2 0 \
+ blaze-markup 0.8.2.7 0 \
+ call-stack 0.3.0 0 \
+ case-insensitive 1.2.1.0 0 \
+ cereal 0.5.8.1 0 \
+ comonad 5.0.8 0 \
+ conduit 1.3.4 0 \
+ conduit-extra 1.3.5 0 \
+ connection 0.3.1 1 \
+ contravariant 1.5.3 0 \
+ cookie 0.4.5 0 \
+ cryptonite 0.28 0 \
+ data-default 0.7.1.1 0 \
+ data-default-class 0.1.2.0 0 \
+ data-default-instances-containers 0.0.1 0 \
+ data-default-instances-dlist 0.0.1 0 \
+ data-default-instances-old-locale 0.0.1 0 \
+ data-fix 0.3.1 0 \
+ dbus 1.2.19 0 \
+ distributive 0.6.2.1 0 \
+ dlist 1.0 0 \
+ exceptions 0.10.4 1 \
+ extensible-exceptions 0.1.1.4 0 \
+ free 5.1.6 0 \
+ hashable 1.3.1.0 0 \
+ hinotify 0.4.1 0 \
+ hourglass 0.2.12 0 \
+ hsc2hs 0.68.7 1 \
+ http-client 0.7.6 0 \
+ http-client-tls 0.3.5.3 1 \
+ http-conduit 2.3.8 0 \
+ http-types 0.12.3 0 \
+ indexed-traversable 0.1.1 0 \
+ indexed-traversable-instances 0.1 0 \
+ integer-logarithms 1.0.3.1 0 \
+ invariant 0.5.4 0 \
+ kan-extensions 5.2.2 0 \
+ lens 5 0 \
+ libmpd 0.10.0.0 0 \
+ memory 0.15.0 1 \
+ mime-types 0.1.0.9 0 \
+ mono-traversable 1.0.15.1 0 \
+ network 3.1.2.1 1 \
+ network-uri 2.6.4.1 0 \
+ old-locale 1.0.0.7 2 \
+ parallel 3.2.2.0 3 \
+ parsec-numbers 0.1.0 0 \
+ pem 0.2.4 0 \
+ primitive 0.7.1.0 2 \
+ profunctors 5.6.2 0 \
+ random 1.2.0 5 \
+ reflection 2.1.6 0 \
+ regex-base 0.94.0.1 0 \
+ regex-compat 0.95.2.1 0 \
+ regex-posix 0.96.0.0 2 \
+ resourcet 1.2.4.2 0 \
+ safe-exceptions 0.1.7.1 0 \
+ scientific 0.3.6.2 0 \
+ semigroupoids 5.3.5 0 \
+ semigroups 0.19.1 0 \
+ socks 0.6.1 0 \
+ split 0.2.3.4 0 \
+ splitmix 0.1.0.3 0 \
+ streaming-commons 0.2.2.1 0 \
+ strict 0.4.0.1 0 \
+ tagged 0.8.6.1 0 \
+ th-abstraction 0.4.2.0 0 \
+ th-compat 0.1.1 0 \
+ th-lift 0.8.2 0 \
+ these 1.1.1.1 1 \
+ time-compat 1.9.5 1 \
+ tls 1.5.5 0 \
+ transformers-base 0.4.5.2 0 \
+ transformers-compat 0.6.6 0 \
+ typed-process 0.2.6.0 0 \
+ unliftio-core 0.2.0.1 1 \
+ unordered-containers 0.2.13.0 0 \
+ utf8-string 1.0.2 0 \
+ uuid-types 1.0.4 0 \
+ vector 0.12.2.0 0 \
+ vector-algorithms 0.8.0.4 1 \
+ void 0.7.3 0 \
+ x509 1.7.5 1 \
+ x509-store 1.6.7 1 \
+ x509-system 1.6.6 0 \
+ x509-validation 1.6.11 0 \
+ xml-conduit 1.9.0.0 0 \
+ xml-types 0.3.8 0 \
+ zlib 0.6.2.2 0 \
LIB_DEPENDS = converters/libiconv \
devel/gmp \
@@ -41,18 +143,14 @@ 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}/{apm.c,apm.h,Binding.hsc} \
+ ${WRKBUILD}/src/Xmobar/Plugins/Monitors/Batt
post-install:
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
- ${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config ${EXAMPLEDIR}/xmobarrc
+ ${INSTALL_DATA} ${WRKSRC}/examples/xmobar.config ${EXAMPLEDIR}/xmobarrc
.include <bsd.port.mk>
diff --git a/x11/xmobar/distinfo b/x11/xmobar/distinfo
index 8dc5f646d51..c09099f0604 100644
--- a/x11/xmobar/distinfo
+++ b/x11/xmobar/distinfo
@@ -1,2 +1,258 @@
-SHA256 (ghc/xmobar-0.24.3.tar.gz) =
0zAHndYOIgBKTPonHrngChuza42vy78bGlmA1AHc9RA=
-SIZE (ghc/xmobar-0.24.3.tar.gz) = 100317
+SHA256 (hackage/StateVar-1.2.1.tar.gz) =
7iYVUpErYNi5N/AlNhXjEObMJfnEBwAbO8wuPVUAD4s=
+SHA256 (hackage/X11-1.9.2.tar.gz) =
BbDZo3n0arihcDoLyxsLl8CAdkOyEHHuREkv3oi3fgQ=
+SHA256 (hackage/X11-xft-0.3.1.tar.gz) =
Tro/7mJXDgZEdlQDCmL7VfGVh4hLws73epw7LDRY+NE=
+SHA256 (hackage/adjunctions-4.4.tar.gz) =
UHwu9VM3rmHIBfjLwSE9/X0rhRhzQmddZiJUuNihauk=
+SHA256 (hackage/adjunctions-4.4_2.cabal) =
JzjdX11ek3Sa2xSgVHLlipanXQ8pnkY3HG9G3E6X2vk=
+SHA256 (hackage/aeson-1.5.6.0.tar.gz) =
A2HDS+PS7JRSAfAlAWk0NvvaENzFSUaUgaCEst4iv+g=
+SHA256 (hackage/asn1-encoding-0.9.6.tar.gz) =
2fjeq9O5COXPg8DYE8CNwBQ7PsHA2X9mDSz6AsHI2go=
+SHA256 (hackage/asn1-encoding-0.9.6_2.cabal) =
J+2PYEOu15YwMTu5MffI4rUQ8LRYbNVcFq4EDH0eoJg=
+SHA256 (hackage/asn1-parse-0.9.5.tar.gz) =
jx/hNE0ws53FlNdN8sVSCVd3Iq8UlyBLTCttbodH854=
+SHA256 (hackage/asn1-types-0.3.4.tar.gz) =
eO6SolE3kpjKgg+lPtv0szxTm5/NiHyG9SDDDjtOIag=
+SHA256 (hackage/assoc-1.0.2.tar.gz) =
2JiNxuhxjHo0VlFbdpyTNq7uxzDPhvxRdSR5af+PFE8=
+SHA256 (hackage/assoc-1.0.2_1.cabal) =
qCTk9hVGmietlJ2/SQe6JYvWtFne6+wAUkx7yz9lzJ8=
+SHA256 (hackage/async-2.2.3.tar.gz) =
RnrzoAN5R6UjLs9fTvvUzyEYqqIxBWbX9ArIKw4yk1w=
+SHA256 (hackage/attoparsec-0.13.2.5.tar.gz) =
IeDzjqoZV79HEnavoXZRwSWjiSRXXxLCy9L6U0tFaG8=
+SHA256 (hackage/base-compat-0.11.2.tar.gz) =
U6a1FFRC+6WkutbbK83t4X8WRkK0i8OblQFUIqOa29s=
+SHA256 (hackage/base-compat-batteries-0.11.2.tar.gz) =
MeBmpaqWr5T+ZGWtuVnDjWOkngE1dkGqQyLHVKlNMCM=
+SHA256 (hackage/base-orphans-0.8.4.tar.gz) =
N7K1k1bANACi1QmGJnc5PF/3BqCqv4JsEE9v4D2Tu7M=
+SHA256 (hackage/base64-bytestring-1.2.0.1.tar.gz) =
rwmxfQcusTkdkeMLQYbdF5czBkfveSaOzX/M6PWvxjg=
+SHA256 (hackage/basement-0.0.11.tar.gz) =
Z1grNHWlVHklOZ9xnfIfi7vQyk1NsneVwipHT47mNGs=
+SHA256 (hackage/basement-0.0.11_2.cabal) =
r0Pi4zTlFbUsowmRmxNcUbXpQR5tTGjQ6JUNYetfJdE=
+SHA256 (hackage/bifunctors-5.5.10.tar.gz) =
53Kc/Ytq9c7NfdUJ5OST7sDxUih2zAzPT1gFSVwzqQ0=
+SHA256 (hackage/blaze-builder-0.4.2.1.tar.gz) =
bmiJvJw/+SBioX84JdzBsoUQ0mEzTU1OF3Iy2QTqCwY=
+SHA256 (hackage/blaze-html-0.9.1.2.tar.gz) =
YFA/QlRsbBuVQBTRiOoTfkPXTc/9K/YVfBE/2RoMOUw=
+SHA256 (hackage/blaze-markup-0.8.2.7.tar.gz) =
i2SJ7UItmOQ3L0G+H0D3crjU7ZJfMgOza+QHjZGMjuQ=
+SHA256 (hackage/call-stack-0.3.0.tar.gz) =
uA6N4rh/AZIrI7MoZVrS+EP0JJXz4QM66Qeq3mA8cWo=
+SHA256 (hackage/case-insensitive-1.2.1.0.tar.gz) =
KW3BfgxfPfs9gs7YPkycRMM47N50myeLbq5RLx0E5AY=
+SHA256 (hackage/cereal-0.5.8.1.tar.gz) =
LZ6IrJNLnrwFgJfHIBH/WfPxRhdjEOHJV6Dkz2NoG9c=
+SHA256 (hackage/comonad-5.0.8.tar.gz) =
72zfLMKSzEPuaqlsWBsjX96oq0Sgv/sk3HmuKy7zPRM=
+SHA256 (hackage/conduit-1.3.4.tar.gz) =
nwKDGq3qJEicHRggAY7a3W2XAA4R810F2hP6jCFkYPA=
+SHA256 (hackage/conduit-extra-1.3.5.tar.gz) =
imSN7iA8AeZH+jhr/npbKTzlUvi1yrnA3Vy3HHzQEtk=
+SHA256 (hackage/connection-0.3.1.tar.gz) =
XXWVicUyw02Hv8T2/Lcyv1W1WpNVnTuUIp6DR6FTddk=
+SHA256 (hackage/connection-0.3.1_1.cabal) =
ZdocBVYQCVczvNIo2F3/gIBLI6XRj+3plKD5/NGwwSE=
+SHA256 (hackage/contravariant-1.5.3.tar.gz) =
RFNvDjMf3kcScZNzI9yQQJ6V1H9X5CZX/a8kKg/WXcE=
+SHA256 (hackage/cookie-0.4.5.tar.gz) =
cH+U0bMQGLkdah6eGe9UE+INAsqwCtk6X9fXs7RqNYM=
+SHA256 (hackage/cryptonite-0.28.tar.gz) =
dK2IauP3zWyt7LWWcH5J3zewFwzu0xPjgr0VsTEypds=
+SHA256 (hackage/data-default-0.7.1.1.tar.gz) =
sPldJ5zXXKyqgVKgFZDcNGD3E09oQLNwUquzujyypRE=
+SHA256 (hackage/data-default-class-0.1.2.0.tar.gz) =
TwG0I/AAw+BpqvUqNIVkplNnl/MUmLuFw9tL0tCXPlY=
+SHA256 (hackage/data-default-instances-containers-0.0.1.tar.gz) =
pV4HrwBcmBXYLz/JXhJduCmUN3yfSnaUKIeHAdTsCBo=
+SHA256 (hackage/data-default-instances-dlist-0.0.1.tar.gz) =
fWg3Ecvwir163NWsK+glOBMI0iA5cxWlVw/mG3GbWVk=
+SHA256 (hackage/data-default-instances-old-locale-0.0.1.tar.gz) =
YNOwKSKVjEkI178rJN32FRFmV0X3hCJ9IGdFeEsMCAI=
+SHA256 (hackage/data-fix-0.3.1.tar.gz) =
m0XAQEcpIsGXuzMZAZe1iVr6xjGCA7KvswJR1N+LzHk=
+SHA256 (hackage/dbus-1.2.19.tar.gz) =
72KZa7yXnbNgh1jkYyvZJPTPxQDjfqzk0RvtIxiCnPE=
+SHA256 (hackage/distributive-0.6.2.1.tar.gz) =
1zUTkuB49YyqRmMKS5xkPh4und3uRYSMXINY57Exa5E=
+SHA256 (hackage/dlist-1.0.tar.gz) =
Fz1jcyi7Fz/MNl8w0p/0qUKSoeDlVYrrPfwR3oFRARU=
+SHA256 (hackage/exceptions-0.10.4.tar.gz) =
TQv7Q1XP/NZ9MAgR351f5E6jWU7WN1B5W/wfeXq9hM8=
+SHA256 (hackage/exceptions-0.10.4_1.cabal) =
FynvJqYRrniqWM3TQZKv9xDLqm1jHdBC3ftjVW0AtSw=
+SHA256 (hackage/extensible-exceptions-0.1.1.4.tar.gz) =
bOXogBdgOFpAjatxtTVQ+HYp5mGyYL3CzUHGpDm244g=
+SHA256 (hackage/free-5.1.6.tar.gz) =
zH3YRAxEbiq0qWDn0DL9v/0akbtPPKFGBaYk1MD37AQ=
+SHA256 (hackage/hashable-1.3.1.0.tar.gz) =
gGGCOkrFIbU5Eu3Lo2uVbzFZy4hbB+wRmvKVplaMp8Q=
+SHA256 (hackage/hinotify-0.4.1.tar.gz) =
EwexAK6vNdDQ9YLUiX+snN45UF7FLJFeITEY5WZ0+Bo=
+SHA256 (hackage/hourglass-0.2.12.tar.gz) =
RDNbXEAugMYPHbanRGK+TqKdGpBDqplDNP/uEWTxyko=
+SHA256 (hackage/hsc2hs-0.68.7.tar.gz) =
/XkV5B4+07x3UP7g6K3StPMtysi3xUTP31VCKTIjiUo=
+SHA256 (hackage/hsc2hs-0.68.7_1.cabal) =
Sg9oYKF+fCRWRpdePCmBQWr9y2p7NVPDEAXrNkGn9Vs=
+SHA256 (hackage/http-client-0.7.6.tar.gz) =
M/N4l2EY+dgA+lJkUq2gYxTDtPnqsTThpNIVOAuuqJA=
+SHA256 (hackage/http-client-tls-0.3.5.3.tar.gz) =
Rxq/jympCfQLIeqyakEMDhIK4SzjN1EqYdrp9S67Q2I=
+SHA256 (hackage/http-client-tls-0.3.5.3_1.cabal) =
yXw9iOYxijBW5C4s0JE9XEv/OB+DNBu2/waGX9Esi1I=
+SHA256 (hackage/http-conduit-2.3.8.tar.gz) =
z77yk4Vv3M5YYYcm/5Ecoo4q0HyFIrLNHPostuAlQq4=
+SHA256 (hackage/http-types-0.12.3.tar.gz) =
TopKZkd0WfpDajMcdeRoV+yAJig9+YTVT5BXbNMCQBY=
+SHA256 (hackage/indexed-traversable-0.1.1.tar.gz) =
esNq4xU8vnqOmerP/QZTZ7h1RJU8ySmX9CShUNtGgTk=
+SHA256 (hackage/indexed-traversable-instances-0.1.tar.gz) =
+uxEgHkCtY5QyOEjlNFevaHwDA4jW0kPexxK5bWuaNw=
+SHA256 (hackage/integer-logarithms-1.0.3.1.tar.gz) =
mwqfn6tgmxXNAVhlch+wX3RKG8d66S/RM4ct5Si76n8=
+SHA256 (hackage/invariant-0.5.4.tar.gz) =
ufoKGAXd4aTTm+0VTil6N5M9KoKylSMQmKdr6dYDl8o=
+SHA256 (hackage/kan-extensions-5.2.2.tar.gz) =
O/POTKz5xXwD6aHDbssbr12DVnMIU6JZLSES0SSEmKA=
+SHA256 (hackage/lens-5.tar.gz) = ntnL9y2c1qm3Fy3KtX3XMIlcwidKsIEbJZpYpdKr2xo=
+SHA256 (hackage/libmpd-0.10.0.0.tar.gz) =
cGLizkdsSOnv11qALSqTzgZyQ+n+NV+u0JcPC3KkGyE=
+SHA256 (hackage/memory-0.15.0.tar.gz) =
4/+JLBqUcIlU0LssT0q4G8D1BTUtlQlTGcRi2xrrNSk=
+SHA256 (hackage/memory-0.15.0_1.cabal) =
vnAktQ6Hapw7f+uu/dgdXcZyaMWKe05rOCW9xYJ02Iw=
+SHA256 (hackage/mime-types-0.1.0.9.tar.gz) =
CjJDUWnvS6WfSkuK3f0MBEeUEIVNG41poeOPs4m6cdI=
+SHA256 (hackage/mono-traversable-1.0.15.1.tar.gz) =
wt9bee0viPLuMT5XwdWR1EY3iOINOeQ5KX7sW6WDXd8=
+SHA256 (hackage/network-3.1.2.1.tar.gz) =
/KqVREXLV1/wTQiOcZRS41YyS2rLmMWu/SVBoGlDnUo=
+SHA256 (hackage/network-3.1.2.1_1.cabal) =
GI1trqjNkbw1U+/VqQoefG0EJfpmpTuqdNtbbZ/XXIs=
+SHA256 (hackage/network-uri-2.6.4.1.tar.gz) =
V4VtuTYIpNQZ9oG4gcm41ESIANWmh1h9w36KngsiNYQ=
+SHA256 (hackage/old-locale-1.0.0.7.tar.gz) =
26+L9riI+5iEVwUHkpaiPD9A7i9EnfcxL39/HeGNe1A=
+SHA256 (hackage/old-locale-1.0.0.7_2.cabal) =
+pmL4sfgDNJqbpB1vqeQyq85Msqj6Ul61pvCA4DdaRE=
+SHA256 (hackage/parallel-3.2.2.0.tar.gz) =
FwRTpxoqizHMpjElUz93cdfevrY5cAvavdd5w02KbvY=
+SHA256 (hackage/parallel-3.2.2.0_3.cabal) =
QhzhcXYQurgpaVcrlr6J2D6o2K/ndRy1TYC5lv/wY9M=
+SHA256 (hackage/parsec-numbers-0.1.0.tar.gz) =
dwGaSBdxL2v8YcnRSLaAV5lV60DShvd2b3sKkMcm/r8=
+SHA256 (hackage/pem-0.2.4.tar.gz) =
dwxMG5zSSz239RH4pIQEoNCYmZ4oVzw3Q6iilruW+NQ=
+SHA256 (hackage/primitive-0.7.1.0.tar.gz) =
a+vs/fKld4fZ/VIxv9YStlqS7dezOpc7Kg8RMSuJo/A=
+SHA256 (hackage/primitive-0.7.1.0_2.cabal) =
9jV9VyDBxmUJbD4BFGfa9EMZi3hqcI0v+SaViiTVCNQ=
+SHA256 (hackage/profunctors-5.6.2.tar.gz) =
ZZVde1BSWko7zNqx2YLSrjQol/04FA1alLXvOADYySo=
+SHA256 (hackage/random-1.2.0.tar.gz) =
5FGc98BYv9W9vkrMeCKErMniXnRIcghhnKg8vNY/ud4=
+SHA256 (hackage/random-1.2.0_5.cabal) =
MNct9MwdL+LURciPDunSGWWvfOhmYMQ6bDKmodkNUck=
+SHA256 (hackage/reflection-2.1.6.tar.gz) =
vz4UkX67MppTcBo8zgr+Zw8gA3oBSNv6XL+ldO1rps0=
+SHA256 (hackage/regex-base-0.94.0.1.tar.gz) =
cbHZb/8gHzH+jNRTLwVqygOiHNSGiQJW3DAH3XOt7dk=
+SHA256 (hackage/regex-compat-0.95.2.1.tar.gz) =
j3s4bHL9YFopLt+4CbhiAkW0o6t68ZKteeNneFlueUc=
+SHA256 (hackage/regex-posix-0.96.0.0.tar.gz) =
JRMA8aa7LpGruL9ROiGYH4+recmKZazqK7bWpSRBRSE=
+SHA256 (hackage/regex-posix-0.96.0.0_2.cabal) =
vYcPmDohu0dL2WRJc28BHFmZgc5w2oCKIewaKCkuVIE=
+SHA256 (hackage/resourcet-1.2.4.2.tar.gz) =
F/IIQgQ60ZmWGoAbbvsSM7kJjrNTf4OVhEJo9qIj64c=
+SHA256 (hackage/safe-exceptions-0.1.7.1.tar.gz) =
S/bdCisYJ5voQ+zgRKiSSFU8CSux/FvX76VcHB1TfT4=
+SHA256 (hackage/scientific-0.3.6.2.tar.gz) =
J40K/IdFAlT4p26rIbVYOvY5VO/Jt0hEoXohpoATFA8=
+SHA256 (hackage/semigroupoids-5.3.5.tar.gz) =
VS8Y4T7zRxGJEclQlX5K3NoKH5SOJ08p7EScxBPTxrA=
+SHA256 (hackage/semigroups-0.19.1.tar.gz) =
eedh5kuGJWSjRw1dNWy2sGCxRFLWdYWa7TstHhRkZkg=
+SHA256 (hackage/socks-0.6.1.tar.gz) =
c0RHVYuwYc52j1Og3x8kAZAsa+45bMls5ift2YbvanM=
+SHA256 (hackage/split-0.2.3.4.tar.gz) =
Jx/lEEyfQANKqaGq1iabzsyUVLxaV8JH5p4X3plsHyo=
+SHA256 (hackage/splitmix-0.1.0.3.tar.gz) =
RgCfSwAMnmYTN3dnuHGL84R2Rp8qjiFi2YzCRogtWjU=
+SHA256 (hackage/streaming-commons-0.2.2.1.tar.gz) =
MGlAv0h4oLcU5nRqf5NNAYEA78hjMsF2pkgBS/4egd0=
+SHA256 (hackage/strict-0.4.0.1.tar.gz) =
3/arwIrWN+UYkbuLR1d4xAkmxRIZ7aYP1k8NloAiYkE=
+SHA256 (hackage/tagged-0.8.6.1.tar.gz) =
9eD8+V8LtKpj9CjywBlVpB6hpCz885FF7WMfWalhbAI=
+SHA256 (hackage/th-abstraction-0.4.2.0.tar.gz) =
6gayzaJfxLUtrEjMI+WnVvmX34mF7K7lpVQgJQihHEA=
+SHA256 (hackage/th-compat-0.1.1.tar.gz) =
lfogWDrCNryexroBNQSD6HoSGniTtBWGUccApgr2A/k=
+SHA256 (hackage/th-lift-0.8.2.tar.gz) =
OlknA3oQrmPmBcAiKMQCfDK3urGYWue1N55jY7PNXOQ=
+SHA256 (hackage/these-1.1.1.1.tar.gz) =
15jJ9W4X3vRB6PUeVMwRr9s+dsap0enuFU6aeNoL9Qg=
+SHA256 (hackage/these-1.1.1.1_1.cabal) =
6YHGUijbWud6BDYx90oeSkt3D3IThm9YTjR2tSUS8a8=
+SHA256 (hackage/time-compat-1.9.5.tar.gz) =
MSayZ9GfMdUqPDbxOoeIvgMkL4KaW93YowhOE00B46Y=
+SHA256 (hackage/time-compat-1.9.5_1.cabal) =
pYa9Wlm0fqDJ6vxVxpNu3hESb0puYZ1teu7+5zxD2bg=
+SHA256 (hackage/tls-1.5.5.tar.gz) =
iki1ztQ/rBXJkVjw7t7EWNd6ZgXBpDAtQUV/WnDvOUg=
+SHA256 (hackage/transformers-base-0.4.5.2.tar.gz) =
0MgMY/3Oagd92O2k8f8om4VXhwOj8ScuFB1AD+IyReg=
+SHA256 (hackage/transformers-compat-0.6.6.tar.gz) =
fi4CUeXm0oFCYVpLlQo/q6ycC3gEsexKSumF8ZUZqfk=
+SHA256 (hackage/typed-process-0.2.6.0.tar.gz) =
MaKoHzNGP+3DPMUZrVuWeXh+ZI/i7H783r19VL27wrE=
+SHA256 (hackage/unliftio-core-0.2.0.1.tar.gz) =
kZ8NEpfqL1NzEYVTwd8qlAXYueMagwfoKdpn1JU8KZo=
+SHA256 (hackage/unliftio-core-0.2.0.1_1.cabal) =
mz5E6pqsrL/DWztUAVr0UAkZFqw2GKQYaOv2VGl3ZZo=
+SHA256 (hackage/unordered-containers-0.2.13.0.tar.gz) =
hrATaauOsxE4OgUtOJM34s1xpjCIMj8CkydU30qje1U=
+SHA256 (hackage/utf8-string-1.0.2.tar.gz) =
7kjeradgA3ByjEFWywAkQd53DQEhrjOmgTmp7ZwZsJo=
+SHA256 (hackage/uuid-types-1.0.4.tar.gz) =
wqosyqOnQlmsofV8wcJ3giCGQwgUzl5POM/YaP5I7AY=
+SHA256 (hackage/vector-0.12.2.0.tar.gz) =
F6sLhMh4WTM/9oG7n3aDaHeWd5Jb1Yn/S6oFvj/Sa1A=
+SHA256 (hackage/vector-algorithms-0.8.0.4.tar.gz) =
dhdqVneL8wonWxCJ7m2yTsbGfZJSUUX43+IVuAE3rzs=
+SHA256 (hackage/vector-algorithms-0.8.0.4_1.cabal) =
v0dgsjoP7gmruMnjyVLIcPXcl4CHbp1+OKsr3ZjI8oM=
+SHA256 (hackage/void-0.7.3.tar.gz) =
U691jdw33GOYFnHlA0ONAsb2Si2HROm+xVeolEMfcxc=
+SHA256 (hackage/x509-1.7.5.tar.gz) =
sbD8u0qg10ntK1RxDC69bZAMuTIQitFPl2QM9Mpgx8g=
+SHA256 (hackage/x509-1.7.5_1.cabal) =
ARhamhe+5OiSh9njK/qmcxM88rCaOXWWJ77R9y6lKP0=
+SHA256 (hackage/x509-store-1.6.7.tar.gz) =
l4Y1bIv99jHqAYwyRNCFTG2yyyTlg4kepVOWFEP2Hvk=
+SHA256 (hackage/x509-store-1.6.7_1.cabal) =
pwey9Lo8Auus1+zRnp8MCyEbWCcDKcLHdaLB3yaCAhI=
+SHA256 (hackage/x509-system-1.6.6.tar.gz) =
QNzarj7GfzjAjZbUNluQHrisDFkL15cutCnTfViqRBk=
+SHA256 (hackage/x509-validation-1.6.11.tar.gz) =
+UMhy8xKU0rfWImuaVDzZz44tiuJtpcLR39QLOmH0Zs=
+SHA256 (hackage/xml-conduit-1.9.0.0.tar.gz) =
HLS4w1cdwETQAB418sPjoo9ZG7a7Sl737lkgdETYp9w=
+SHA256 (hackage/xml-types-0.3.8.tar.gz) =
2tXkzmArfR9L43wM/ZmiYaRXN0a/2A2RfclVty2oTIA=
+SHA256 (hackage/xmobar-0.37.tar.gz) =
5Li4bvnEdTWoDQVqi0bXJ0hRf41tyJGRDuzcOI6SUi4=
+SHA256 (hackage/zlib-0.6.2.2.tar.gz) =
BLWJDdaemS+M0JVw2B6dXsqxnbjoLL5Huo4CwxwGMbo=
+SIZE (hackage/StateVar-1.2.1.tar.gz) = 5055
+SIZE (hackage/X11-1.9.2.tar.gz) = 190757
+SIZE (hackage/X11-xft-0.3.1.tar.gz) = 13621
+SIZE (hackage/adjunctions-4.4.tar.gz) = 19891
+SIZE (hackage/adjunctions-4.4_2.cabal) = 3067
+SIZE (hackage/aeson-1.5.6.0.tar.gz) = 286364
+SIZE (hackage/asn1-encoding-0.9.6.tar.gz) = 17343
+SIZE (hackage/asn1-encoding-0.9.6_2.cabal) = 2060
+SIZE (hackage/asn1-parse-0.9.5.tar.gz) = 2951
+SIZE (hackage/asn1-types-0.3.4.tar.gz) = 6472
+SIZE (hackage/assoc-1.0.2.tar.gz) = 3047
+SIZE (hackage/assoc-1.0.2_1.cabal) = 1205
+SIZE (hackage/async-2.2.3.tar.gz) = 14056
+SIZE (hackage/attoparsec-0.13.2.5.tar.gz) = 163876
+SIZE (hackage/base-compat-0.11.2.tar.gz) = 34625
+SIZE (hackage/base-compat-batteries-0.11.2.tar.gz) = 16902
+SIZE (hackage/base-orphans-0.8.4.tar.gz) = 22573
+SIZE (hackage/base64-bytestring-1.2.0.1.tar.gz) = 13650
+SIZE (hackage/basement-0.0.11.tar.gz) = 134032
+SIZE (hackage/basement-0.0.11_2.cabal) = 5711
+SIZE (hackage/bifunctors-5.5.10.tar.gz) = 45810
+SIZE (hackage/blaze-builder-0.4.2.1.tar.gz) = 60704
+SIZE (hackage/blaze-html-0.9.1.2.tar.gz) = 81617
+SIZE (hackage/blaze-markup-0.8.2.7.tar.gz) = 14571
+SIZE (hackage/call-stack-0.3.0.tar.gz) = 2544
+SIZE (hackage/case-insensitive-1.2.1.0.tar.gz) = 53609
+SIZE (hackage/cereal-0.5.8.1.tar.gz) = 20114
+SIZE (hackage/comonad-5.0.8.tar.gz) = 15227
+SIZE (hackage/conduit-1.3.4.tar.gz) = 88861
+SIZE (hackage/conduit-extra-1.3.5.tar.gz) = 33189
+SIZE (hackage/connection-0.3.1.tar.gz) = 9051
+SIZE (hackage/connection-0.3.1_1.cabal) = 1554
+SIZE (hackage/contravariant-1.5.3.tar.gz) = 13726
+SIZE (hackage/cookie-0.4.5.tar.gz) = 6048
+SIZE (hackage/cryptonite-0.28.tar.gz) = 616309
+SIZE (hackage/data-default-0.7.1.1.tar.gz) = 1627
+SIZE (hackage/data-default-class-0.1.2.0.tar.gz) = 2522
+SIZE (hackage/data-default-instances-containers-0.0.1.tar.gz) = 1659
+SIZE (hackage/data-default-instances-dlist-0.0.1.tar.gz) = 1503
+SIZE (hackage/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
+SIZE (hackage/data-fix-0.3.1.tar.gz) = 5520
+SIZE (hackage/dbus-1.2.19.tar.gz) = 78140
+SIZE (hackage/distributive-0.6.2.1.tar.gz) = 8140
+SIZE (hackage/dlist-1.0.tar.gz) = 18667
+SIZE (hackage/exceptions-0.10.4.tar.gz) = 20819
+SIZE (hackage/exceptions-0.10.4_1.cabal) = 2796
+SIZE (hackage/extensible-exceptions-0.1.1.4.tar.gz) = 8531
+SIZE (hackage/free-5.1.6.tar.gz) = 61876
+SIZE (hackage/hashable-1.3.1.0.tar.gz) = 21424
+SIZE (hackage/hinotify-0.4.1.tar.gz) = 9173
+SIZE (hackage/hourglass-0.2.12.tar.gz) = 25797
+SIZE (hackage/hsc2hs-0.68.7.tar.gz) = 38630
+SIZE (hackage/hsc2hs-0.68.7_1.cabal) = 2794
+SIZE (hackage/http-client-0.7.6.tar.gz) = 91628
+SIZE (hackage/http-client-tls-0.3.5.3.tar.gz) = 7679
+SIZE (hackage/http-client-tls-0.3.5.3_1.cabal) = 2066
+SIZE (hackage/http-conduit-2.3.8.tar.gz) = 28858
+SIZE (hackage/http-types-0.12.3.tar.gz) = 13547
+SIZE (hackage/indexed-traversable-0.1.1.tar.gz) = 8424
+SIZE (hackage/indexed-traversable-instances-0.1.tar.gz) = 4235
+SIZE (hackage/integer-logarithms-1.0.3.1.tar.gz) = 9023
+SIZE (hackage/invariant-0.5.4.tar.gz) = 26998
+SIZE (hackage/kan-extensions-5.2.2.tar.gz) = 21887
+SIZE (hackage/lens-5.tar.gz) = 697256
+SIZE (hackage/libmpd-0.10.0.0.tar.gz) = 43455
+SIZE (hackage/memory-0.15.0.tar.gz) = 42299
+SIZE (hackage/memory-0.15.0_1.cabal) = 5002
+SIZE (hackage/mime-types-0.1.0.9.tar.gz) = 11384
+SIZE (hackage/mono-traversable-1.0.15.1.tar.gz) = 40815
+SIZE (hackage/network-3.1.2.1.tar.gz) = 136889
+SIZE (hackage/network-3.1.2.1_1.cabal) = 4968
+SIZE (hackage/network-uri-2.6.4.1.tar.gz) = 32373
+SIZE (hackage/old-locale-1.0.0.7.tar.gz) = 3384
+SIZE (hackage/old-locale-1.0.0.7_2.cabal) = 1071
+SIZE (hackage/parallel-3.2.2.0.tar.gz) = 14681
+SIZE (hackage/parallel-3.2.2.0_3.cabal) = 1817
+SIZE (hackage/parsec-numbers-0.1.0.tar.gz) = 4125
+SIZE (hackage/pem-0.2.4.tar.gz) = 4717
+SIZE (hackage/primitive-0.7.1.0.tar.gz) = 52184
+SIZE (hackage/primitive-0.7.1.0_2.cabal) = 2728
+SIZE (hackage/profunctors-5.6.2.tar.gz) = 28522
+SIZE (hackage/random-1.2.0.tar.gz) = 37889
+SIZE (hackage/random-1.2.0_5.cabal) = 6094
+SIZE (hackage/reflection-2.1.6.tar.gz) = 19976
+SIZE (hackage/regex-base-0.94.0.1.tar.gz) = 10095
+SIZE (hackage/regex-compat-0.95.2.1.tar.gz) = 4285
+SIZE (hackage/regex-posix-0.96.0.0.tar.gz) = 12529
+SIZE (hackage/regex-posix-0.96.0.0_2.cabal) = 2861
+SIZE (hackage/resourcet-1.2.4.2.tar.gz) = 16862
+SIZE (hackage/safe-exceptions-0.1.7.1.tar.gz) = 13650
+SIZE (hackage/scientific-0.3.6.2.tar.gz) = 23510
+SIZE (hackage/semigroupoids-5.3.5.tar.gz) = 23362
+SIZE (hackage/semigroups-0.19.1.tar.gz) = 21124
+SIZE (hackage/socks-0.6.1.tar.gz) = 9759
+SIZE (hackage/split-0.2.3.4.tar.gz) = 15942
+SIZE (hackage/splitmix-0.1.0.3.tar.gz) = 20754
+SIZE (hackage/streaming-commons-0.2.2.1.tar.gz) = 86559
+SIZE (hackage/strict-0.4.0.1.tar.gz) = 12488
+SIZE (hackage/tagged-0.8.6.1.tar.gz) = 9842
+SIZE (hackage/th-abstraction-0.4.2.0.tar.gz) = 37848
+SIZE (hackage/th-compat-0.1.1.tar.gz) = 10903
+SIZE (hackage/th-lift-0.8.2.tar.gz) = 14385
+SIZE (hackage/these-1.1.1.1.tar.gz) = 9804
+SIZE (hackage/these-1.1.1.1_1.cabal) = 2631
+SIZE (hackage/time-compat-1.9.5.tar.gz) = 59336
+SIZE (hackage/time-compat-1.9.5_1.cabal) = 4954
+SIZE (hackage/tls-1.5.5.tar.gz) = 158700
+SIZE (hackage/transformers-base-0.4.5.2.tar.gz) = 2849
+SIZE (hackage/transformers-compat-0.6.6.tar.gz) = 41347
+SIZE (hackage/typed-process-0.2.6.0.tar.gz) = 17363
+SIZE (hackage/unliftio-core-0.2.0.1.tar.gz) = 3696
+SIZE (hackage/unliftio-core-0.2.0.1_1.cabal) = 1082
+SIZE (hackage/unordered-containers-0.2.13.0.tar.gz) = 53379
+SIZE (hackage/utf8-string-1.0.2.tar.gz) = 10726
+SIZE (hackage/uuid-types-1.0.4.tar.gz) = 11537
+SIZE (hackage/vector-0.12.2.0.tar.gz) = 142213
+SIZE (hackage/vector-algorithms-0.8.0.4.tar.gz) = 26681
+SIZE (hackage/vector-algorithms-0.8.0.4_1.cabal) = 3752
+SIZE (hackage/void-0.7.3.tar.gz) = 6741
+SIZE (hackage/x509-1.7.5.tar.gz) = 21457
+SIZE (hackage/x509-1.7.5_1.cabal) = 2305
+SIZE (hackage/x509-store-1.6.7.tar.gz) = 12689
+SIZE (hackage/x509-store-1.6.7_1.cabal) = 1781
+SIZE (hackage/x509-system-1.6.6.tar.gz) = 3419
+SIZE (hackage/x509-validation-1.6.11.tar.gz) = 19752
+SIZE (hackage/xml-conduit-1.9.0.0.tar.gz) = 40139
+SIZE (hackage/xml-types-0.3.8.tar.gz) = 4054
+SIZE (hackage/xmobar-0.37.tar.gz) = 139585
+SIZE (hackage/zlib-0.6.2.2.tar.gz) = 148178
diff --git a/x11/xmobar/files/Batt.hs b/x11/xmobar/files/Batt.hs
index 3f561f7dc04..92c31d81987 100644
--- a/x11/xmobar/files/Batt.hs
+++ b/x11/xmobar/files/Batt.hs
@@ -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
diff --git a/x11/xmobar/files/Binding.hsc b/x11/xmobar/files/Binding.hsc
index 2f83230ae54..ac31ec537f0 100644
--- a/x11/xmobar/files/Binding.hsc
+++ b/x11/xmobar/files/Binding.hsc
@@ -1,6 +1,6 @@
{-# LANGUAGE CPP, ForeignFunctionInterface #-}
-module Plugins.Monitors.Batt.Binding (
+module Xmobar.Plugins.Monitors.Batt.Binding (
getApmPowerInfo,
ApmPowerInfo (..),
AcState (..), BatteryState(..)
diff --git a/x11/xmobar/files/cabal.project b/x11/xmobar/files/cabal.project
new file mode 100644
index 00000000000..18f676baca9
--- /dev/null
+++ b/x11/xmobar/files/cabal.project
@@ -0,0 +1,11 @@
+packages: xmobar.cabal
+
+package xmobar
+ flags: +with_xft +with_mpd +with_mpris +with_inotify
+ extra-include-dirs: /usr/X11R6/include
+ extra-lib-dirs: /usr/local/lib/inotify
+ ld-options: -Wl,-rpath=/usr/local/lib/inotify
+
+package hinotify
+ extra-include-dirs: /usr/local/include/inotify
+ extra-lib-dirs: /usr/local/lib/inotify
diff --git a/x11/xmobar/patches/patch-samples_xmobar_config
b/x11/xmobar/patches/patch-examples_xmobar_config
similarity index 93%
rename from x11/xmobar/patches/patch-samples_xmobar_config
rename to x11/xmobar/patches/patch-examples_xmobar_config
index 884181c7afd..5b025555f6f 100644
--- a/x11/xmobar/patches/patch-samples_xmobar_config
+++ b/x11/xmobar/patches/patch-examples_xmobar_config
@@ -1,6 +1,6 @@
$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
+--- examples/xmobar.config.orig Mon Aug 8 23:40:59 2016
++++ examples/xmobar.config Wed Aug 10 09:45:35 2016
@@ -1,4 +1,4 @@
-Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
+Config { font = "fixed"
diff --git a/x11/xmobar/patches/patch-src_Plugins_Monitors_hs
b/x11/xmobar/patches/patch-src_Plugins_Monitors_hs
deleted file mode 100644
index b6151737743..00000000000
--- a/x11/xmobar/patches/patch-src_Plugins_Monitors_hs
+++ /dev/null
@@ -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
diff --git a/x11/xmobar/patches/patch-src_Window_hs
b/x11/xmobar/patches/patch-src_Window_hs
deleted file mode 100644
index f53601def86..00000000000
--- a/x11/xmobar/patches/patch-src_Window_hs
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_Window_hs,v 1.3 2016/11/23 13:24:05 dcoppa Exp $
-
-commit fd10cff3c73cb6fc99c3c34473685bf8b95dccdb
-Author: jao <j...@gnu.org>
-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
diff --git a/x11/xmobar/patches/patch-src_Xmobar_Plugins_Monitors_hs
b/x11/xmobar/patches/patch-src_Xmobar_Plugins_Monitors_hs
new file mode 100644
index 00000000000..5abe8e423bf
--- /dev/null
+++ b/x11/xmobar/patches/patch-src_Xmobar_Plugins_Monitors_hs
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: src/Xmobar/Plugins/Monitors.hs
+--- src/Xmobar/Plugins/Monitors.hs.orig
++++ src/Xmobar/Plugins/Monitors.hs
+@@ -59,8 +59,6 @@ import Xmobar.Plugins.Monitors.Mpris
+
+ data Monitors = 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
+@@ -127,8 +125,6 @@ instance Exec Monitors where
+ 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"
+@@ -173,8 +169,6 @@ instance Exec Monitors where
+ 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
diff --git a/x11/xmobar/patches/patch-src_Xmobar_hs
b/x11/xmobar/patches/patch-src_Xmobar_hs
deleted file mode 100644
index d647a96178d..00000000000
--- a/x11/xmobar/patches/patch-src_Xmobar_hs
+++ /dev/null
@@ -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 <cleverc...@gmail.com>
-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
diff --git a/x11/xmobar/patches/patch-xmobar_cabal
b/x11/xmobar/patches/patch-xmobar_cabal
index bcc4db2b840..a660cc435bb 100644
--- a/x11/xmobar/patches/patch-xmobar_cabal
+++ b/x11/xmobar/patches/patch-xmobar_cabal
@@ -1,62 +1,23 @@
-$OpenBSD: patch-xmobar_cabal,v 1.19 2019/09/30 12:54:32 kili Exp $
+$OpenBSD$
-commit dfb5dbd6cc5342348fbb46bd117c226d5e8127e4
-Author: jao <j...@gnu.org>
-Date: Thu Feb 23 00:54:19 2017 +0100
-
-Compiling with --with-rtsopts=-V0 to reduce wakeups (issue #89)
+Hook in APM bindings
Index: xmobar.cabal
--- xmobar.cabal.orig
+++ xmobar.cabal
-@@ -74,6 +74,10 @@ flag with_threaded
- description: Use threaded runtime.
- default: False
-
-+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
+@@ -142,6 +142,7 @@ library
+ Xmobar.Plugins.Locks,
+ Xmobar.Plugins.Monitors,
+ Xmobar.Plugins.Monitors.Batt,
++ Xmobar.Plugins.Monitors.Batt.Binding,
+ Xmobar.Plugins.Monitors.Common,
+ Xmobar.Plugins.Monitors.Common.Output,
+ Xmobar.Plugins.Monitors.Common.Parsers,
+@@ -162,6 +163,7 @@ library
+ Xmobar.Plugins.Monitors.CatInt
- 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
+ ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind
- if flag(with_iwlib) || flag(all_extensions)
- extra-libraries: iw
diff --git a/x11/xmobar/pkg/DESCR b/x11/xmobar/pkg/DESCR
index 3c43d6be036..8dd438b9648 100644
--- a/x11/xmobar/pkg/DESCR
+++ b/x11/xmobar/pkg/DESCR
@@ -1,4 +1,4 @@
-xmobar is a minimalistic, text based, status bar. It was designed
-to work with the xmonad Window Manager. It was inspired by the Ion3
-status bar, and supports similar features, like dynamic color
+xmobar is a minimalistic, text based, status bar. It was designed
+to work with the xmonad Window Manager. It was inspired by the Ion3
+status bar, and supports similar features, like dynamic color
management, output templates, and extensibility through plugins.
diff --git a/x11/xmobar/pkg/PLIST b/x11/xmobar/pkg/PLIST
index ac1466f5b1a..f4c4c913c34 100644
--- a/x11/xmobar/pkg/PLIST
+++ b/x11/xmobar/pkg/PLIST
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2018/05/15 11:35:22 espie Exp $
-@bin bin/xmobar
-@comment share/doc/${DISTNAME}/
-@comment share/doc/${DISTNAME}/license
-share/examples/xmobar/
-share/examples/xmobar/xmobarrc
+@comment share/doc/${PKGNAME}/
+@comment share/doc/${PKGNAME}/license
+@bin bin/${MODCABAL_STEM}
+share/examples/${MODCABAL_STEM}/
+share/examples/${MODCABAL_STEM}/${MODCABAL_STEM}rc
--
2.30.1
