[45741] trunk/dports/lang/Omega

[blb at macports.org]

Revision: 45741
          http://trac.macports.org/changeset/45741
Author:   blb at macports.org
Date:     2009-01-20 19:45:10 -0800 (Tue, 20 Jan 2009)
Log Message:
-----------
lang/Omega - fix build with ghc 6.10.1, ticket #18039

Modified Paths:
--------------
    trunk/dports/lang/Omega/Portfile

Added Paths:
-----------
    trunk/dports/lang/Omega/files/patch-Infer2.hs.diff
    trunk/dports/lang/Omega/files/patch-Toplevel.hs.diff

Modified: trunk/dports/lang/Omega/Portfile
===================================================================
--- trunk/dports/lang/Omega/Portfile	2009-01-21 03:32:43 UTC (rev 45740)
+++ trunk/dports/lang/Omega/Portfile	2009-01-21 03:45:10 UTC (rev 45741)
@@ -2,7 +2,7 @@
 PortSystem 1.0
 name                    Omega
 version                 1.4.2
-revision                1
+revision                2
 categories              lang
 platforms               darwin freebsd
 maintainers             gmail.com:ggreif
@@ -22,13 +22,14 @@
 use_zip                 yes
 
 worksrcdir              ${name}
-patchfiles              patch-Makefile.diff patch-Bind.hs.diff
+patchfiles              patch-Makefile.diff patch-Bind.hs.diff \
+                        patch-Infer2.hs.diff patch-Toplevel.hs.diff
 
 use_configure           no
 
 build.target            strip
 depends_build           port:ghc
-depends_lib             port:readline
+depends_lib             port:libedit
 
 destroot.destdir        DESTDIR=${destroot}${prefix}
 

Added: trunk/dports/lang/Omega/files/patch-Infer2.hs.diff
===================================================================
--- trunk/dports/lang/Omega/files/patch-Infer2.hs.diff	                        (rev 0)
+++ trunk/dports/lang/Omega/files/patch-Infer2.hs.diff	2009-01-21 03:45:10 UTC (rev 45741)
@@ -0,0 +1,11 @@
+--- Infer2.hs.orig	2007-06-12 16:20:14.000000000 -0600
++++ Infer2.hs	2009-01-20 18:12:51.000000000 -0700
+@@ -67,7 +67,7 @@
+ import SCC(topSortR)
+ import Cooper(Formula(TrueF,FalseF),Fol,Term,toFormula,integer_qelim,Formula)
+ 
+-import qualified System.Console.Readline as Readline
++import qualified System.Console.Editline.Readline as Readline
+ 
+ import qualified Data.Map as Map
+    -- (Map,empty,member,insertWith,union  ,fromList,toList,lookup)

Added: trunk/dports/lang/Omega/files/patch-Toplevel.hs.diff
===================================================================
--- trunk/dports/lang/Omega/files/patch-Toplevel.hs.diff	                        (rev 0)
+++ trunk/dports/lang/Omega/files/patch-Toplevel.hs.diff	2009-01-21 03:45:10 UTC (rev 45741)
@@ -0,0 +1,12 @@
+--- Toplevel.hs.orig	2007-06-12 16:20:14.000000000 -0600
++++ Toplevel.hs	2009-01-20 18:13:45.000000000 -0700
+@@ -37,9 +37,6 @@
+ import Commands
+ import SyntaxExt(synName,synKey)
+ 
+-import System.Console.Readline(setCompletionEntryFunction)
+--- setCompletionEntryFunction :: Maybe (String -> IO [String]) -> IO ()
+-
+ -------------------------------------------------------------
+ -- The programmer interface: the top level loop.
+ -- it performs the read-eval-typecheck-print loop.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090120/8b90d4b6/attachment-0001.html>