Index: head/x11/hs-xmobar/Makefile =================================================================== --- head/x11/hs-xmobar/Makefile (revision 494508) +++ head/x11/hs-xmobar/Makefile (revision 494509) @@ -1,61 +1,61 @@ # Created by: Samy Al Bahra # $FreeBSD$ PORTNAME= xmobar PORTVERSION= 0.29.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Minimalistic text-based status bar LICENSE= BSD3CLAUSE USE_CABAL= HTTP>=4000.2.4 async extensible-exceptions mtl>=2.1 regex-compat\ X11>=1.6.1 parsec-numbers USE_XORG= xpm EXECUTABLE= xmobar STANDALONE= yes OPTIONS_DEFINE= EXAMPLES INSTALL_PORTEXAMPLES= ${INSTALL_DATA} ${WRKSRC}/examples/xmobar.config \ ${STAGEDIR}${EXAMPLESDIR} FLAGS_DEFINE= XFT UTF8 MPD INOTIFY DATEZONE THREADED FLAGS_DEFAULT= XFT UTF8 XFT_DESC= Use Xft to render text (UTF-8 support included) XFT_FLAG_ENABLE= with_xft XFT_FLAG_CABAL= utf8-string X11-xft>=0.2 UTF8_DESC= UTF-8 support UTF8_FLAG_ENABLE= with_utf8 UTF8_FLAG_CABAL= utf8-string MPD_DESC= mpd support MPD_FLAG_ENABLE= with_mpd MPD_FLAG_CABAL= libmpd INOTIFY_DESC= inotify support INOTIFY_FLAG_ENABLE= with_inotify INOTIFY_FLAG_CABAL= hinotify>=0.3 DATEZONE_DESC= Localized date support DATEZONE_FLAG_ENABLE= with_datezone DATEZONE_FLAG_CABAL= timezone-olson>=0.1 timezone-series>=0.1 THREADED_DESC= Use threaded runtime THREADED_FLAG_ENABLE= with_threaded # Disable unsupported options FLAGS_DISABLE= with_mpris with_dbus with_iwlib with_alsa post-extract: ${ECHO} "import Distribution.Simple" > ${WRKSRC}/Setup.hs ${ECHO} "main = defaultMain" >> ${WRKSRC}/Setup.hs .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: head/x11/hs-xmobar/files/patch-fix_bug378.diff =================================================================== --- head/x11/hs-xmobar/files/patch-fix_bug378.diff (nonexistent) +++ head/x11/hs-xmobar/files/patch-fix_bug378.diff (revision 494509) @@ -0,0 +1,104 @@ +Index: src/Xmobar/Plugins/Monitors/Weather.hs +============================================================================== +--- src/Xmobar/Plugins/Monitors/Weather.hs.orig 2018-11-21 23:52:35 UTC ++++ src/Xmobar/Plugins/Monitors/Weather.hs +@@ -19,14 +19,10 @@ import Xmobar.Plugins.Monitors.Common + + import qualified Control.Exception as CE + +-#ifdef HTTP_CONDUIT + import Network.HTTP.Conduit + import Network.HTTP.Types.Status + import Network.HTTP.Types.Method + import qualified Data.ByteString.Lazy.Char8 as B +-#else +-import Network.HTTP +-#endif + + import Text.ParserCombinators.Parsec + +@@ -190,7 +186,6 @@ stationUrl :: String -> String + stationUrl station = defUrl ++ station ++ ".TXT" + + getData :: String -> IO String +-#ifdef HTTP_CONDUIT + getData station = CE.catch (do + manager <- newManager tlsManagerSettings + request <- parseUrl $ stationUrl station +@@ -199,13 +194,6 @@ getData station = CE.catch (do + ) errHandler + where errHandler :: CE.SomeException -> IO String + errHandler _ = return "" +-#else +-getData station = do +- let request = getRequest (stationUrl station) +- CE.catch (simpleHTTP request >>= getResponseBody) errHandler +- where errHandler :: CE.IOException -> IO String +- errHandler _ = return "" +-#endif + + formatWeather :: [WeatherInfo] -> Monitor String + formatWeather [WI st ss y m d h (WindInfo wc wa wm wk wkh wms) v sk tC tF dC dF r p] = +@@ -221,7 +209,6 @@ runWeather str = + formatWeather i + + weatherReady :: [String] -> Monitor Bool +-#ifdef HTTP_CONDUIT + weatherReady str = do + initRequest <- parseUrl $ stationUrl $ head str + let request = initRequest{method = methodHead} +@@ -235,21 +222,3 @@ weatherReady str = do + | statusIsServerError status = False + | statusIsClientError status = False + | otherwise = True +-#else +-weatherReady str = do +- let station = head str +- request = headRequest (stationUrl station) +- io $ CE.catch (simpleHTTP request >>= checkResult) errHandler +- where errHandler :: CE.IOException -> IO Bool +- errHandler _ = return False +- checkResult result = +- case result of +- Left _ -> return False +- Right response -> +- case rspCode response of +- -- Permission or network errors are failures; anything +- -- else is recoverable. +- (4, _, _) -> return False +- (5, _, _) -> return False +- (_, _, _) -> return True +-#endif +Index: xmobar.cabal +============================================================================== +--- xmobar.cabal.orig 2018-12-24 02:06:23 UTC ++++ xmobar.cabal +@@ -87,10 +87,6 @@ flag with_weather + description: Enable weather plugin. + default: True + +-flag with_conduit +- description: Use http-conduits for weather data, used only if with_weather. +- default: False +- + library + hs-source-dirs: src + +@@ -251,15 +247,11 @@ library + cpp-options: -DXPM + + if flag(with_weather) || flag(all_extensions) +- build-depends: HTTP >= 4000.2.4 + exposed-modules: Xmobar.Plugins.Monitors.Weather + cpp-options: -DWEATHER +- if flag(with_conduit) +- -- use http-conduit instead of simple-http +- build-depends: http-conduit, http-types +- cpp-options: -DHTTP_CONDUIT ++ build-depends: http-conduit, http-types + +- if flag(with_uvmeter) && flag(with_conduit) ++ if flag(with_uvmeter) + exposed-modules: Xmobar.Plugins.Monitors.UVMeter + build-depends: http-conduit, http-types + cpp-options: -DUVMETER Property changes on: head/x11/hs-xmobar/files/patch-fix_bug378.diff ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property