[21065] trunk/dports/devel/happy

[source_changes at macosforge.org]

Revision: 21065
          http://trac.macosforge.org/projects/macports/changeset/21065
Author:   gwright at macports.org
Date:     2006-12-28 20:11:47 -0800 (Thu, 28 Dec 2006)

Log Message:
-----------
Patches to fix the build with ghc 6.6 and make all of the tests work.

Modified Paths:
--------------
    trunk/dports/devel/happy/Portfile

Added Paths:
-----------
    trunk/dports/devel/happy/files/patch-LALR.lhs
    trunk/dports/devel/happy/files/patch-ProduceCode.lhs
    trunk/dports/devel/happy/files/patch-bogus-token.y
    trunk/dports/devel/happy/files/patch-precedence001.ly
    trunk/dports/devel/happy/files/patch-precedence002.y

Modified: trunk/dports/devel/happy/Portfile
===================================================================
--- trunk/dports/devel/happy/Portfile	2006-12-28 22:07:54 UTC (rev 21064)
+++ trunk/dports/devel/happy/Portfile	2006-12-29 04:11:47 UTC (rev 21065)
@@ -3,9 +3,9 @@
 PortSystem 1.0
 name		happy
 version		1.15
-revision	2
+revision	3
 categories	devel
-maintainers	gwright at opendarwin.org
+maintainers	gwright at macports.org
 platforms	darwin
 description	The Parser Generator for Haskell
 long_description	\
@@ -30,7 +30,12 @@
 
 checksums	md5 02ceb122b904fa4a4290e6ea1072d59e
 
-patchfiles	patch-configure
+patchfiles	patch-configure		\
+		patch-LALR.lhs		\
+		patch-ProduceCode.lhs	\
+		patch-bogus-token.y	\
+		patch-precedence001.ly	\
+		patch-precedence002.y
 
 depends_build	port:ghc
 

Added: trunk/dports/devel/happy/files/patch-LALR.lhs
===================================================================
--- trunk/dports/devel/happy/files/patch-LALR.lhs	                        (rev 0)
+++ trunk/dports/devel/happy/files/patch-LALR.lhs	2006-12-29 04:11:47 UTC (rev 21065)
@@ -0,0 +1,11 @@
+--- happy/src/LALR.lhs.sav	2006-12-28 21:26:32.000000000 -0500
++++ happy/src/LALR.lhs	2006-12-28 21:27:36.000000000 -0500
+@@ -21,7 +21,7 @@
+ 
+ > import Control.Monad.ST
+ > import Data.Array.ST
+-> import Data.Array hiding (bounds)
++> import Data.Array
+ > import Data.List (nub)
+ 
+ #elif defined(__GLASGOW_HASKELL__)

Added: trunk/dports/devel/happy/files/patch-ProduceCode.lhs
===================================================================
--- trunk/dports/devel/happy/files/patch-ProduceCode.lhs	                        (rev 0)
+++ trunk/dports/devel/happy/files/patch-ProduceCode.lhs	2006-12-29 04:11:47 UTC (rev 21065)
@@ -0,0 +1,11 @@
+--- happy/src/ProduceCode.lhs.sav	2006-12-28 21:31:41.000000000 -0500
++++ happy/src/ProduceCode.lhs	2006-12-28 21:36:53.000000000 -0500
+@@ -28,7 +28,7 @@
+ > import Data.Array.MArray
+ > import Data.Array.IArray 
+ > 
+-> marray_indices a = Data.Array.MArray.indices a
++> --marray_indices a = Data.Array.MArray.indices a
+ 
+ #elif __GLASGOW_HASKELL__ > 408
+ 

Added: trunk/dports/devel/happy/files/patch-bogus-token.y
===================================================================
--- trunk/dports/devel/happy/files/patch-bogus-token.y	                        (rev 0)
+++ trunk/dports/devel/happy/files/patch-bogus-token.y	2006-12-29 04:11:47 UTC (rev 21065)
@@ -0,0 +1,19 @@
+--- happy/tests/bogus-token.y.sav	2006-12-28 23:02:09.000000000 -0500
++++ happy/tests/bogus-token.y	2006-12-28 23:02:40.000000000 -0500
+@@ -1,6 +1,6 @@
+ {
+ module Main where
+-import Exception
++import Control.Exception
+ }
+ 
+ %tokentype { Token }
+@@ -16,7 +16,7 @@
+ data Token = A | B
+ 
+ test1 = parse [B]
+-main =  do Exception.tryJust errorCalls (print test1 >> fail "Test failed.")
++main =  do Control.Exception.tryJust errorCalls (print test1 >> fail "Test failed.")
+            putStrLn "Test worked"
+ 
+ happyError = error "parse error"

Added: trunk/dports/devel/happy/files/patch-precedence001.ly
===================================================================
--- trunk/dports/devel/happy/files/patch-precedence001.ly	                        (rev 0)
+++ trunk/dports/devel/happy/files/patch-precedence001.ly	2006-12-29 04:11:47 UTC (rev 21065)
@@ -0,0 +1,23 @@
+--- happy/tests/precedence001.ly.sav	2006-12-28 22:48:09.000000000 -0500
++++ happy/tests/precedence001.ly	2006-12-28 22:55:34.000000000 -0500
+@@ -3,7 +3,7 @@
+ > {
+ > module Main where
+ > import IO
+-> import Exception
++> import Control.Exception
+ > }
+ > 
+ > %name parse
+@@ -54,8 +54,8 @@
+ generated with GHC extensions, -gac.)
+ 
+ > main = do
+->   Exception.tryJust errorCalls (print test1 >> fail "Test failed.") 
+->   Exception.tryJust errorCalls (print test2 >> fail "Test failed.") 
+->   Exception.tryJust errorCalls (print test3 >> fail "Test failed.")
++>   Control.Exception.tryJust errorCalls (print test1 >> fail "Test failed.") 
++>   Control.Exception.tryJust errorCalls (print test2 >> fail "Test failed.") 
++>   Control.Exception.tryJust errorCalls (print test3 >> fail "Test failed.")
+ 
+ > }

Added: trunk/dports/devel/happy/files/patch-precedence002.y
===================================================================
--- trunk/dports/devel/happy/files/patch-precedence002.y	                        (rev 0)
+++ trunk/dports/devel/happy/files/patch-precedence002.y	2006-12-29 04:11:47 UTC (rev 21065)
@@ -0,0 +1,11 @@
+--- happy/tests/precedence002.y.sav	2006-12-28 22:59:03.000000000 -0500
++++ happy/tests/precedence002.y	2006-12-28 22:59:29.000000000 -0500
+@@ -3,7 +3,7 @@
+ {
+ module Main where
+ import IO
+-import Exception
++import Control.Exception
+ }
+ 
+ %name parse

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061228/fdfe7bde/attachment.html