[Frugalware-darcs] frugalware-current: darcs-1.0.9-1-i686

VMiklos vmiklos at frugalware.org
Tue Jun 5 01:21:36 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070604232016-e2957-32ef623e2402072c3454728e50e9ffe168583b18.gz;

[darcs-1.0.9-1-i686
VMiklos <vmiklos at frugalware.org>**20070604232016
 version bump
 added options=3D('scriptlet')
 -ghc6.6.patch is in upstream
] {
hunk ./source/devel/darcs/FrugalBuild 5
-pkgver=3D1.0.8
-pkgrel=3D3
+pkgver=3D1.0.9
+pkgrel=3D1
hunk ./source/devel/darcs/FrugalBuild 14
-source=3D(http://abridgegame.org/$pkgname/$pkgname-$pkgver.tar.gz darcs-1.=
0.8-ghc6.6.patch)
-sha1sums=3D('f69fb2f5deb3c5281b2eaed9fcb8aa3fe55829dd'\
-          '7276f69e6217bc7babceb8c497c2c4a1e05660f6')
+source=3D(http://abridgegame.org/$pkgname/$pkgname-$pkgver.tar.gz)
+sha1sums=3D('b2d2238c01d530796c29db4b46fd4fd9c21be9b6')
+options=3D('scriptlet')
hunk ./source/devel/darcs/FrugalBuild 22
-	Fautoreconf
hunk ./source/devel/darcs/darcs-1.0.8-ghc6.6.patch 1
-diff -Naur darcs-1.0.8/configure.ac darcs-1.0.8-p/configure.ac
---- darcs-1.0.8/configure.ac	2006-06-16 20:59:29.000000000 +0200
-+++ darcs-1.0.8-p/configure.ac	2007-05-03 17:35:12.000000000 +0200
-@@ -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
- =

-@@ -117,13 +118,17 @@
- =

- dnl See if we need the util or mtl packages for Control.Monad
- =

--GHC_CHECK_MODULE(Control.Monad.Error, util, putStr undefined)
--GHC_CHECK_MODULE(Control.Monad.Error, mtl, putStr undefined)
-+GHC_CHECK_MODULE(Control.Monad.Error, util, strMsg "foo" :: String)
-+GHC_CHECK_MODULE(Control.Monad.Error, mtl, strMsg "foo" :: String)
- =

- dnl See if we need a package for parsec...
- =

- GHC_CHECK_MODULE(Text.ParserCombinators.Parsec, parsec, errorPos undefine=
d)
- =

-+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
-diff -Naur darcs-1.0.8/Lcs.lhs darcs-1.0.8-p/Lcs.lhs
---- darcs-1.0.8/Lcs.lhs	2006-06-16 20:59:28.000000000 +0200
-+++ darcs-1.0.8-p/Lcs.lhs	2007-05-03 17:35:12.000000000 +0200
-@@ -358,7 +358,8 @@
- -- | goto next unchanged line, return the given line if unchanged
- nextUnchanged :: BSTArray s -> Int -> ST s Int
- nextUnchanged c i =3D do
--  if i =3D=3D (aLen c) + 1 then return i
-+  len <- aLenM c
-+  if i =3D=3D 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 =3D do
--  if i =3D=3D (aLen c) + 1 then return i
-+  len <- aLenM c
-+  if i =3D=3D 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 =3D
--  if i <=3D aLen c
-+nextChanged c i =3D do
-+  len <- aLenM c
-+  if i <=3D 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 =3D listArray (0, length a) (nilPS:a)
- =

-+#if __GLASGOW_HASKELL__ > 604
-+aLen :: (IArray a e) =3D> a Int e -> Int
-+aLen a =3D snd $ bounds a
-+aLenM :: (MArray a e m) =3D> a Int e -> m Int
-+aLenM a =3D getBounds a >>=3D return . snd
-+#else
- aLen :: HasBounds a =3D> a Int e -> Int
- aLen a =3D snd $ bounds a
-+aLenM :: (HasBounds a, Monad m) =3D> a Int e -> m Int
-+aLenM =3D return . snd . bounds
-+#endif
- \end{code}
- =

- \begin{code}
rmfile ./source/devel/darcs/darcs-1.0.8-ghc6.6.patch
}


More information about the Frugalware-darcs mailing list