Fix build on 5.x

Submitted by: girgen

3 files changed, 37 insertions, 0 deletions

diff --git a/devel/hs-haddock/files/patch-src::HaddockUtil.hs b/devel/hs-haddock/files/patch-src::HaddockUtil.hs
new file mode 100644
index 000000000000..36f465dc242b
--- /dev/null
+++ b/devel/hs-haddock/files/patch-src::HaddockUtil.hs
@@ -0,0 +1,16 @@
+--- haddock/src/HaddockUtil.hs.orig	Tue Feb  1 22:15:52 2005
++++ haddock/src/HaddockUtil.hs	Tue Feb  1 22:35:29 2005
+@@ -188,12 +188,7 @@
+ 
+ moduleHeaderRE :: Regex
+ moduleHeaderRE = mkRegexWithOpts
+-			 "^([ \t\n]*Module[ \t]*:.*\n)?\ 
+-			  \([ \t\n]*Copyright[ \t]*:.*\n)?\ 
+-			  \([ \t\n]*License[ \t]*:.*\n)?\ 
+-			  \[ \t\n]*Maintainer[ \t]*:(.*)\n\ 
+-			  \[ \t\n]*Stability[ \t]*:(.*)\n\ 
+-			  \[ \t\n]*Portability[ \t]*:([^\n]*)\n"
++			 "^([ \t\n]*Module[ \t]*:.*\n)?([ \t\n]*Copyright[ \t]*:.*\n)?([ \t\n]*License[ \t]*:.*\n)?[ \t\n]*Maintainer[ \t]*:(.*)\n[ \t\n]*Stability[ \t]*:(.*)\n[ \t\n]*Portability[ \t]*:([^\n]*)\n"
+ 		True -- match "\n" with "."
+ 		False -- not case sensitive
+ 	-- All fields except the last (Portability) may be multi-line.
diff --git a/devel/hs-haddock/files/patch-src::HaddockVersion.hs b/devel/hs-haddock/files/patch-src::HaddockVersion.hs
new file mode 100644
index 000000000000..af35a261848f
--- /dev/null
+++ b/devel/hs-haddock/files/patch-src::HaddockVersion.hs
@@ -0,0 +1,9 @@
+--- haddock/src/HaddockVersion.hs.orig	Tue Feb  1 22:39:03 2005
++++ haddock/src/HaddockVersion.hs	Tue Feb  1 22:39:27 2005
+@@ -14,5 +14,4 @@
+ 
+ -- The version comes in via CPP from mk/version.mk
+ projectVersion :: String
+-projectVersion = tail "\ 
+-  \ HADDOCK_VERSION"
++projectVersion = tail "HADDOCK_VERSION"
diff --git a/devel/hs-haddock/files/patch-src::Main.hs b/devel/hs-haddock/files/patch-src::Main.hs
new file mode 100644
index 000000000000..90df1ca4fadd
--- /dev/null
+++ b/devel/hs-haddock/files/patch-src::Main.hs
@@ -0,0 +1,12 @@
+--- haddock/src/Main.hs.orig	Tue Feb  1 22:42:31 2005
++++ haddock/src/Main.hs	Tue Feb  1 22:42:50 2005
+@@ -460,8 +460,7 @@
+ 
+   when (not (null name_strings)) $
+ 	  tell ["Warning: " ++ show mdl ++ 
+-		": the following names could not be resolved:\n\ 
+-		\   " ++ concat (map (' ':) name_strings)
++		": the following names could not be resolved:\n" ++ concat (map (' ':) name_strings)
+ 		]
+ 
+   return (mdl, Interface {