Unbreak build with HaXml>=1.22

net/hpodder/Makefile

@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2012/09/02 18:12:56 kili Exp $
-
-BROKEN =		Does not build with new ghc and HaXml
+# $OpenBSD: Makefile,v 1.23 2012/09/18 17:12:56 dcoppa Exp $
 
 COMMENT =		command line podcast aggregator
 
 DISTNAME =		hpodder-1.1.6
-REVISION =		2
+REVISION =		3
 CATEGORIES =		net
 HOMEPAGE =		http://wiki.github.com/jgoerzen/hpodder/
 
@@ -25,7 +23,7 @@ MODGHC_BUILD =		cabal hackage nort
 
 BUILD_DEPENDS =		devel/hs-ConfigFile \
 			devel/hs-mtl \
-			textproc/hs-HaXml>=1.20,<1.21 \
+			textproc/hs-HaXml>=1.22,<1.24 \
 			databases/hs-HDBC-sqlite3>=1.1.0
 LIB_DEPENDS =		devel/gmp
 RUN_DEPENDS =		net/curl>=7.15.5 \

net/hpodder/distinfo

@@ -1,5 +1,2 @@
-MD5 (ghc/hpodder-1.1.6.tar.gz) = x1Fh0bCZ1JXNJhL/pYck6Q==
-RMD160 (ghc/hpodder-1.1.6.tar.gz) = s3X9fp2DrohVyF0uoDULszHYP5I=
-SHA1 (ghc/hpodder-1.1.6.tar.gz) = gjBr06U+U1xNk8lTQXFDqjoupO0=
 SHA256 (ghc/hpodder-1.1.6.tar.gz) = qnEo24XLlr+1hIRiaf5ODP5hKxtUFayH6851POElKT4=
 SIZE (ghc/hpodder-1.1.6.tar.gz) = 57920

net/hpodder/patches/patch-Commands_Ls_hs

@@ -0,0 +1,16 @@
+$OpenBSD: patch-Commands_Ls_hs,v 1.1 2012/09/18 17:12:56 dcoppa Exp $
+
+Unbreak build with HaXml>=1.22
+
+--- Commands/Ls.hs.orig	Tue Sep 18 17:20:08 2012
++++ Commands/Ls.hs	Tue Sep 18 17:21:20 2012
+@@ -83,7 +83,8 @@ lsepisodes_worker gi (opts, casts) =
+        when (islong) (printf "            Episode URL\n")
+        eps <- mapM (getEpisodes (gdbh gi)) pc
+        mapM_ printep (concat eps)
+-    where printep ep =
++    where printep :: Episode -> IO ()
++          printep ep =
+               do printf "%-5d %-5d %-4s %-60.60s\n" 
+                             (castid (podcast ep)) (epid ep) 
+                             (take 4 . show $ epstatus ep) (eptitle ep)

net/hpodder/patches/patch-FeedParser_hs

@@ -1,11 +1,13 @@
-$OpenBSD: patch-FeedParser_hs,v 1.4 2012/03/20 13:33:54 dcoppa Exp $
+$OpenBSD: patch-FeedParser_hs,v 1.5 2012/09/18 17:12:56 dcoppa Exp $
 
 Fix the "Invalid or incomplete multibyte or wide character" error
 caused by some feeds: set binary mode on the handle before hGetContents
 (upstream git commit bd08d07cc29893177efe8ef0e8be368657d56bbf)
 
+Unbreak build with HaXml>=1.22
+
 --- FeedParser.hs.orig	Tue Nov  8 16:49:38 2011
-+++ FeedParser.hs	Tue Mar 20 14:08:25 2012
++++ FeedParser.hs	Tue Sep 18 17:22:05 2012
 @@ -39,6 +39,7 @@ import Data.Maybe.Utils
  import Data.Char
  import Data.Either.Utils
@@ -24,3 +26,12 @@ caused by some feeds: set binary mode on the handle before hGetContents
         case xmlParse' name (unifrob c) of
           Left x -> return (Left x)
           Right y ->
+@@ -125,7 +127,7 @@ channel =
+ attrofelem :: String -> Content Posn -> Maybe AttValue
+ attrofelem attrname (CElem inelem _) =
+     case unesc inelem of
+-      Elem name al _ -> lookup attrname al
++      Elem name al _ -> lookup (N attrname) al
+ attrofelem _ _ =
+     error "attrofelem: called on something other than a CElem"
+ stratt :: String -> Content Posn -> Maybe [String]

net/hpodder/patches/patch-hpodder_cabal

@@ -0,0 +1,15 @@
+$OpenBSD: patch-hpodder_cabal,v 1.5 2012/09/18 17:12:56 dcoppa Exp $
+
+Unbreak build with HaXml>=1.22
+
+--- hpodder.cabal.orig	Tue Sep 18 17:18:22 2012
++++ hpodder.cabal	Tue Sep 18 17:18:49 2012
+@@ -69,7 +69,7 @@ Description:  Podcasting is a method of publishing rad
+  beginning.  It should be exceedingly difficult to lose a podcast
+  episode, even in the event of a power failure.
+ Build-Depends: network, unix, parsec, MissingH>=1.0.0,
+- HDBC>=1.1.0, HDBC-sqlite3>=1.1.0, mtl, base>=3 && < 5, HaXml >= 1.20 && < 1.21, hslogger,
++ HDBC>=1.1.0, HDBC-sqlite3>=1.1.0, mtl, base>=3 && < 5, HaXml >= 1.22 && < 1.24, hslogger,
+  ConfigFile, filepath, old-time, directory, process
+ 
+ Executable: hpodder