Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25073/10.4/unstable/main/finkinfo/devel
Modified Files:
darcs.info darcs.patch
Log Message:
Package 1.0.9rc2. 1.0.8 doesn't build under ghc6.6, and disentangling
the patches relating to ghc-6.6 from the rest of the new stuff in the
darcs history is non-trivial.
Index: darcs.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/darcs.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- darcs.info 20 Jun 2006 17:59:13 -0000 1.5
+++ darcs.info 8 Dec 2006 00:57:12 -0000 1.6
@@ -1,5 +1,5 @@
Package: darcs
-Version: 1.0.8
+Version: 1.0.8+9rc2
Revision: 1001
Architecture: powerpc
DescPackaging: <<
@@ -24,9 +24,10 @@
Conflicts: darcs-bash-completion
Recommends: bash-completion
-Source: http://abridgegame.org/%n/%n-%v.tar.gz
-Source-MD5: a7a26d1a98c5675dcab4c2cc30eba59d
+Source: http://abridgegame.org/%n/%n-1.0.9rc2.tar.gz
+Source-MD5: dcdab3d51ab33ebf9f44e1ca521347af
+#Patch: %n.patch
ConfigureParams: --mandir=%p/share/man --sysconfdir=%p/etc
InstallScript: make install DESTDIR=%d
Index: darcs.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/darcs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- darcs.patch 20 Jan 2006 20:23:12 -0000 1.1
+++ darcs.patch 8 Dec 2006 00:57:12 -0000 1.2
@@ -1,14 +1,75 @@
-diff -Naur darcs.orig/GNUmakefile darcs/GNUmakefile
---- darcs.orig/GNUmakefile 2004-07-26 05:22:34.000000000 -0700
-+++ darcs/GNUmakefile 2004-07-27 10:28:10.000000000 -0700
-@@ -91,8 +91,8 @@
- $(INSTALL) -d $(DESTDIR)/$(bindir)
- $(INSTALL) darcs $(DESTDIR)/$(bindir)
+diff -ru darcs-1.0.8/Lcs.lhs darcs-1.0.8-patched/Lcs.lhs
+--- darcs-1.0.8/Lcs.lhs 2006-06-16 13:59:28.000000000 -0500
++++ darcs-1.0.8-patched/Lcs.lhs 2006-12-07 17:12:55.000000000 -0600
+@@ -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 @@
-- $(INSTALL) -d $(DESTDIR)/$(sysconfdir)/bash_completion.d/
-- $(INSTALL) -m 0644 darcs_completion
$(DESTDIR)/$(sysconfdir)/bash_completion.d/darcs
-+# $(INSTALL) -d $(DESTDIR)/$(sysconfdir)/bash_completion.d/
-+# $(INSTALL) -m 0644 darcs_completion
$(DESTDIR)/$(sysconfdir)/bash_completion.d/darcs
+ -- | 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)
- $(INSTALL) -d $(DESTDIR)/$(mandir)/man1
- $(INSTALL) -m 0644 darcs.1 $(DESTDIR)/$(mandir)/man1/
++#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}
+diff -ru darcs-1.0.8/configure.ac darcs-1.0.8-patched/configure.ac
+--- darcs-1.0.8/configure.ac 2006-06-16 13:59:29.000000000 -0500
++++ darcs-1.0.8-patched/configure.ac 2006-12-07 17:12:39.000000000 -0600
+@@ -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
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
