[20549] trunk/dports/devel/darcs

[source_changes at macosforge.org]

Revision: 20549
          http://trac.macosforge.org/projects/macports/changeset/20549
Author:   gwright at macports.org
Date:     2006-11-06 10:20:22 -0800 (Mon, 06 Nov 2006)

Log Message:
-----------
Fix build with ghc-6.6 and bump revision.

Modified Paths:
--------------
    trunk/dports/devel/darcs/Portfile
    trunk/dports/devel/darcs/files/patch-GNUmakefile

Added Paths:
-----------
    trunk/dports/devel/darcs/files/patch-Lcs.lhs
    trunk/dports/devel/darcs/files/patch-configure.ac

Modified: trunk/dports/devel/darcs/Portfile
===================================================================
--- trunk/dports/devel/darcs/Portfile	2006-11-06 15:10:12 UTC (rev 20548)
+++ trunk/dports/devel/darcs/Portfile	2006-11-06 18:20:22 UTC (rev 20549)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name		darcs
 version		1.0.8
+revision	1
 categories	devel
 maintainers	gwright at opendarwin.org
 description	David's Advanced Revision Control System
@@ -17,13 +18,17 @@
 
 checksums	md5 a7a26d1a98c5675dcab4c2cc30eba59d
 
-patchfiles	patch-GNUmakefile
+patchfiles	patch-GNUmakefile	\
+		patch-Lcs.lhs		\
+		patch-configure.ac
 
 depends_build	port:ghc
 depends_lib	port:readline	\
 		port:curl	\
 		port:gmp
 
+use_autoconf	yes
+
 configure.args	--mandir=${prefix}/share/man	\
 		--without-docs
 configure.env	CPPFLAGS="-I${prefix}/include"	\

Modified: trunk/dports/devel/darcs/files/patch-GNUmakefile
===================================================================
--- trunk/dports/devel/darcs/files/patch-GNUmakefile	2006-11-06 15:10:12 UTC (rev 20548)
+++ trunk/dports/devel/darcs/files/patch-GNUmakefile	2006-11-06 18:20:22 UTC (rev 20549)
@@ -4,7 +4,7 @@
  
  C_OBJS := compat.o fpstring.o zlib_helper.o c_context.o
  
-+GHCFLAGS += -I${PREFIX}/include
++GHCFLAGS += -I${PREFIX}/include -package mtl
 +
  ifeq ($(SYS), windows)
  GHCFLAGS += -iwin32 -Iwin32 -threaded -DOVERRIDE_RENAMEFILE -DWIN32

Added: trunk/dports/devel/darcs/files/patch-Lcs.lhs
===================================================================
--- trunk/dports/devel/darcs/files/patch-Lcs.lhs	                        (rev 0)
+++ trunk/dports/devel/darcs/files/patch-Lcs.lhs	2006-11-06 18:20:22 UTC (rev 20549)
@@ -0,0 +1,55 @@
+Tue Aug 15 19:41:27 EDT 2006  Esa Ilari Vuokko <ei at vuokko.info>
+  * Workaround for HasBounds that was removed in base-2.0 (GHC 6.6)
+diff -rN -u old-hsdarcs-2/Lcs.lhs new-hsdarcs-2/Lcs.lhs
+--- Lcs.lhs   2006-11-02 09:05:05.000000000 -0500
++++ Lcs.lhs   2006-11-02 09:05:05.000000000 -0500
+@@ -358,7 +358,8 @@
+ -- | goto next unchanged line, return the given line if unchanged
+ nextUnchanged :: BSTArray s -> Int -> ST s Int
+ nextUnchanged c i = do
+-  if i == (aLen c) + 1 then return i
++  len <- aLenM c
++  if i == len + 1 then return i
+      else do b <- readArray c i
+              if b then nextUnchanged c (i+1)
+                 else return i
+@@ -367,7 +368,8 @@
+ --   behind the last line
+ skipOneUnChanged :: BSTArray s -> Int -> ST s Int
+ skipOneUnChanged c i = do
+-  if i == (aLen c) + 1 then return i
++  len <- aLenM c
++  if i == len + 1 then return i
+      else do b <- readArray c i
+              if not b then return (i+1)
+                 else skipOneUnChanged c (i+1)
+@@ -381,8 +383,9 @@
+ 
+ -- | goto next changed line, return the given line if changed
+ nextChanged :: BSTArray s -> Int -> ST s (Maybe Int)
+-nextChanged c i =
+-  if i <= aLen c
++nextChanged c i = do
++  len <- aLenM c
++  if i <= len
+     then do b <- readArray c i
+             if not b then nextChanged c (i+1)
+                else return $ Just i
+@@ -430,8 +433,17 @@
+ initP :: [PackedString] -> PArray
+ initP a = listArray (0, length a) (nilPS:a)
+ 
++#if __GLASGOW_HASKELL__ > 604
++aLen :: (IArray a e) => a Int e -> Int
++aLen a = snd $ bounds a
++aLenM :: (MArray a e m) => a Int e -> m Int
++aLenM a = getBounds a >>= return . snd
++#else
+ aLen :: HasBounds a => a Int e -> Int
+ aLen a = snd $ bounds a
++aLenM :: (HasBounds a, Monad m) => a Int e -> m Int
++aLenM = return . snd . bounds
++#endif
+ \end{code}
+ 
+ \begin{code}

Added: trunk/dports/devel/darcs/files/patch-configure.ac
===================================================================
--- trunk/dports/devel/darcs/files/patch-configure.ac	                        (rev 0)
+++ trunk/dports/devel/darcs/files/patch-configure.ac	2006-11-06 18:20:22 UTC (rev 20549)
@@ -0,0 +1,21 @@
+--- configure.ac	2006-06-16 20:59:29.000000000 +0200
++++ configure.ac	2006-11-02 15:33:40.000000000 +0100
+@@ -110,6 +110,7 @@
+ dnl Look for Text.Regex
+ 
+ GHC_CHECK_MODULE(Text.Regex( mkRegex, matchRegex, Regex ), text, mkRegex undefined)
++GHC_CHECK_MODULE(Text.Regex( mkRegex, matchRegex, Regex ), regex-compat, mkRegex undefined)
+ 
+ dnl See if we need a package for QuickCheck
+ 
+@@ -124,6 +125,10 @@
+ 
+ GHC_CHECK_MODULE(Text.ParserCombinators.Parsec, parsec, errorPos undefined)
+ 
++dnl Check if we need package html
++
++GHC_CHECK_MODULE(Text.Html, html, text "foo")
++
+ dnl Deal with systems on which getCurrentDirectory uses '\\' rather than '/':
+ 
+ WORKAROUND_getCurrentDirectory

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