kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Chase GHC 7.6 update

Browse source 
- Fix COMMENT

Obtained from:	FreeBSD Haskell
This commit is contained in:
Gabor Pali 2013-06-04 23:27:19 +00:00
parent 80efa63201
commit 1cc358c531
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=319939
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deskutils/checkrdf/Makefile
View file

@ -8,7 +8,7 @@ CATEGORIES= deskutils
MASTER_SITES= SF
MAINTAINER= haskell@FreeBSD.org
COMMENT= A tool for RDF site summaries based news-check
COMMENT= Tool for RDF site summaries based news-check
LICENSE= BSD

22
deskutils/checkrdf/files/patch-CheckRDF.hs
View file

@ -1,6 +1,6 @@
--- ./CheckRDF.hs.orig 2007-03-02 19:13:07.000000000 +0100
+++ ./CheckRDF.hs 2012-05-13 13:10:24.395459549 +0200
@@ -18,15 +18,20 @@
+++ ./CheckRDF.hs 2013-05-01 00:09:20.000000000 +0200
@@ -18,15 +18,21 @@
import RDFConfig
@ -14,6 +14,7 @@
-import Directory ( doesFileExist, getPermissions, readable, removeFile )
-import List ( partition, intersperse, groupBy, sortBy)
-import Time (getClockTime,toCalendarTime,calendarTimeToString)
+import System.IO.Error ( catchIOError )
+import System.Directory ( doesFileExist, getPermissions, readable, removeFile )
+import Data.List ( partition, intersperse, groupBy, sortBy)
+import System.Time (getClockTime,toCalendarTime,calendarTimeToString)
@ -26,7 +27,7 @@
import Text.XML.HaXml.Xtract.Parse (parseXtract)
import Text.PrettyPrint.HughesPJ (render, vcat)
import Text.XML.HaXml.Pretty (content)
@@ -52,15 +57,15 @@
@@ -52,15 +58,15 @@
mkNewRDF :: RDFConfig -> FilePath -> String -> RDF
mkNewRDF config filename contents =
let elem = getElem $ xmlParse filename contents
@ -48,7 +49,7 @@
)
$ map show [0..len1-1])
else []
@@ -69,7 +74,7 @@
@@ -69,7 +75,7 @@
,clink = cl
,citems = rdfitems
}
@ -57,3 +58,16 @@
dfilter f = \ x -> f x x
mkRDFItem (t,l) = RDFItem {title = substituteChar '\n' ' ' $ rmCDATA t
,link = filter (/='\n') $ rmCDATA l
@@ -109,9 +115,9 @@
if iseof
then return []
else do line <- hGetLine h
- mrdf <- catch (do rdf <- (readIO line :: IO RDF)
- return $ Just rdf)
- (const $ return Nothing)
+ mrdf <- catchIOError (do rdf <- (readIO line :: IO RDF)
+ return $ Just rdf)
+ (const $ return Nothing)
maybe (return [])
(\rdf -> do rdfs <- readRDFs h
return $! rdf : rdfs)