[25884] trunk/dports/devel/darcs

Mon Jun 4 08:33:12 PDT 2007

Revision: 25884
          http://trac.macosforge.org/projects/macports/changeset/25884
Author:   gwright at macports.org
Date:     2007-06-04 08:33:12 -0700 (Mon, 04 Jun 2007)

Log Message:
-----------
Version bump to 1.0.9.

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

Removed Paths:
-------------
    trunk/dports/devel/darcs/files/patch-GNUmakefile
    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	2007-06-04 15:16:17 UTC (rev 25883)
+++ trunk/dports/devel/darcs/Portfile	2007-06-04 15:33:12 UTC (rev 25884)
@@ -2,8 +2,7 @@
 
 PortSystem 1.0
 name            darcs
-version         1.0.8
-revision        1
+version         1.0.9
 categories      devel
 maintainers     gwright at macports.org
 description     David's Advanced Revision Control System
@@ -18,19 +17,13 @@
 platforms       darwin
 master_sites    ${homepage}
 
-checksums       md5 a7a26d1a98c5675dcab4c2cc30eba59d
+checksums       md5 077420eec437ecdd45d8dc6682ee61fa
 
-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" \

Deleted: trunk/dports/devel/darcs/files/patch-GNUmakefile
===================================================================
--- trunk/dports/devel/darcs/files/patch-GNUmakefile	2007-06-04 15:16:17 UTC (rev 25883)
+++ trunk/dports/devel/darcs/files/patch-GNUmakefile	2007-06-04 15:33:12 UTC (rev 25884)
@@ -1,11 +0,0 @@
---- GNUmakefile.orig	Wed Feb  2 06:47:52 2005
-+++ GNUmakefile	Fri Feb  4 17:56:09 2005
-@@ -43,6 +43,8 @@
- 
- C_OBJS := compat.o fpstring.o zlib_helper.o c_context.o
- 
-+GHCFLAGS += -I${PREFIX}/include -package mtl
-+
- ifeq ($(SYS), windows)
- GHCFLAGS += -iwin32 -Iwin32 -threaded -DOVERRIDE_RENAMEFILE -DWIN32
- DARCS_FILES += win32/System/Posix.hs win32/CtrlC.hs

Deleted: trunk/dports/devel/darcs/files/patch-Lcs.lhs
===================================================================
--- trunk/dports/devel/darcs/files/patch-Lcs.lhs	2007-06-04 15:16:17 UTC (rev 25883)
+++ trunk/dports/devel/darcs/files/patch-Lcs.lhs	2007-06-04 15:33:12 UTC (rev 25884)
@@ -1,55 +0,0 @@
-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}

Deleted: trunk/dports/devel/darcs/files/patch-configure.ac
===================================================================
--- trunk/dports/devel/darcs/files/patch-configure.ac	2007-06-04 15:16:17 UTC (rev 25883)
+++ trunk/dports/devel/darcs/files/patch-configure.ac	2007-06-04 15:33:12 UTC (rev 25884)
@@ -1,21 +0,0 @@
---- 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/20070604/8fe73f76/attachment.html
