Mon Mar 17 15:59:05 2008 UTC ()
Update darcs to version 1.0.9.

Changes in this release consists mostly of minor bug fixes.


(kristerw)
diff -r1.19 -r1.20 pkgsrc/devel/darcs/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/darcs/PLIST
diff -r1.8 -r1.9 pkgsrc/devel/darcs/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/darcs/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/devel/darcs/patches/patch-ac
diff -r0 -r1.1 pkgsrc/devel/darcs/patches/patch-ad
cvs diff -r1.19 -r1.20 pkgsrc/devel/darcs/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/darcs/Makefile 2008/01/18 05:14:32 1.19
+++ pkgsrc/devel/darcs/Makefile 2008/03/17 15:59:05 1.20
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.19 2008/01/18 05:14:32 tnn Exp $ 1# $NetBSD: Makefile,v 1.20 2008/03/17 15:59:05 kristerw Exp $
2 2
3DISTNAME= darcs-1.0.8 3DISTNAME= darcs-1.0.9
4PKGREVISION= 3 
5CATEGORIES= devel scm 4CATEGORIES= devel scm
6MASTER_SITES= http://www.darcs.net/ 5MASTER_SITES= http://www.darcs.net/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.darcs.net/ 8HOMEPAGE= http://www.darcs.net/
10COMMENT= Distributed revision control system 9COMMENT= Distributed revision control system
11 10
12BUILD_DEPENDS+= latex2html>=2002.2.1nb3:../../textproc/latex2html 11BUILD_DEPENDS+= latex2html>=2002.2.1nb3:../../textproc/latex2html
13 12
14TEX_DEPMETHOD= build 13TEX_DEPMETHOD= build
15USE_TOOLS+= gmake 14USE_TOOLS+= gmake
16MAKE_FILE= GNUmakefile 15MAKE_FILE= GNUmakefile
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
cvs diff -r1.4 -r1.5 pkgsrc/devel/darcs/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/darcs/PLIST 2005/05/28 09:14:39 1.4
+++ pkgsrc/devel/darcs/PLIST 2008/03/17 15:59:05 1.5
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1@comment $NetBSD: PLIST,v 1.4 2005/05/28 09:14:39 augustss Exp $ 1@comment $NetBSD: PLIST,v 1.5 2008/03/17 15:59:05 kristerw Exp $
2bin/darcs 2bin/darcs
3man/man1/darcs.1 3man/man1/darcs.1
4share/doc/darcs/darcs.ps 
5share/doc/darcs/examples/darcs_completion 4share/doc/darcs/examples/darcs_completion
6share/doc/darcs/examples/zsh_completion_new 5share/doc/darcs/examples/zsh_completion_new
7share/doc/darcs/examples/zsh_completion_old 6share/doc/darcs/examples/zsh_completion_old
8share/doc/darcs/manual/WARNINGS 7share/doc/darcs/manual/WARNINGS
9share/doc/darcs/manual/contents.png 8share/doc/darcs/manual/contents.png
10share/doc/darcs/manual/darcs.css 9share/doc/darcs/manual/darcs.css
11share/doc/darcs/manual/darcs.html 10share/doc/darcs/manual/darcs.html
 11share/doc/darcs/manual/darcs.ps
12share/doc/darcs/manual/footnode.html 12share/doc/darcs/manual/footnode.html
13share/doc/darcs/manual/images.aux 13share/doc/darcs/manual/images.aux
14share/doc/darcs/manual/images.log 14share/doc/darcs/manual/images.log
15share/doc/darcs/manual/images.pl 15share/doc/darcs/manual/images.pl
16share/doc/darcs/manual/images.tex 16share/doc/darcs/manual/images.tex
17share/doc/darcs/manual/img1.png 17share/doc/darcs/manual/img1.png
18share/doc/darcs/manual/img10.png 18share/doc/darcs/manual/img10.png
19share/doc/darcs/manual/img11.png 19share/doc/darcs/manual/img11.png
20share/doc/darcs/manual/img12.png 20share/doc/darcs/manual/img12.png
21share/doc/darcs/manual/img13.png 21share/doc/darcs/manual/img13.png
22share/doc/darcs/manual/img14.png 22share/doc/darcs/manual/img14.png
23share/doc/darcs/manual/img15.png 23share/doc/darcs/manual/img15.png
24share/doc/darcs/manual/img16.png 24share/doc/darcs/manual/img16.png
cvs diff -r1.8 -r1.9 pkgsrc/devel/darcs/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/darcs/distinfo 2007/03/24 17:58:04 1.8
+++ pkgsrc/devel/darcs/distinfo 2008/03/17 15:59:05 1.9
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.8 2007/03/24 17:58:04 kristerw Exp $ 1$NetBSD: distinfo,v 1.9 2008/03/17 15:59:05 kristerw Exp $
2 2
3SHA1 (darcs-1.0.8.tar.gz) = f69fb2f5deb3c5281b2eaed9fcb8aa3fe55829dd 3SHA1 (darcs-1.0.9.tar.gz) = e085b73b0c82d7465f54709c91ef1d14147c63e5
4RMD160 (darcs-1.0.8.tar.gz) = a95309f7dc79b29d7e4f237627aa300a84aa5331 4RMD160 (darcs-1.0.9.tar.gz) = 459c9f8415979888dafee021e368efef06a685a2
5Size (darcs-1.0.8.tar.gz) = 1010010 bytes 5Size (darcs-1.0.9.tar.gz) = 1080280 bytes
6SHA1 (patch-aa) = dc0d9e08eb8397a6252aa49c0457ec2e948e1ff7 6SHA1 (patch-aa) = dc0d9e08eb8397a6252aa49c0457ec2e948e1ff7
7SHA1 (patch-ab) = 7057e2d8cd53cd5f6114569559fa83d0e85ce23e 7SHA1 (patch-ab) = ff0c47f0ed42ed6853db00c80ff0d965199e57b6
8SHA1 (patch-ac) = 53606a8e342a12f79d880b600a3d30cb9ce7fde7 8SHA1 (patch-ac) = dde83524390b90fb18cb50b831acadeb3b4f9970
 9SHA1 (patch-ad) = ed3f8c5a1f7611cc991686d40332cac04c9f415d
cvs diff -r1.1 -r1.2 pkgsrc/devel/darcs/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/darcs/patches/Attic/patch-ab 2007/03/24 17:58:04 1.1
+++ pkgsrc/devel/darcs/patches/Attic/patch-ab 2008/03/17 15:59:05 1.2
@@ -1,56 +1,27 @@ @@ -1,56 +1,27 @@
1$NetBSD: patch-ab,v 1.1 2007/03/24 17:58:04 kristerw Exp $ 1$NetBSD: patch-ab,v 1.2 2008/03/17 15:59:05 kristerw Exp $
2 2
3Patch needed for GHC 6.6. 3Patch needed for GHC 6.8. From FreeBSD ports.
4 4
5--- Lcs.lhs.orig 2006-06-16 20:59:28.000000000 +0200 5--- aclocal.m4.orig 2007-06-16 19:12:11.000000000 +0200
6+++ Lcs.lhs 2007-02-25 22:12:31.000000000 +0100 6+++ aclocal.m4 2008-01-04 19:37:37.000000000 +0100
7@@ -358,7 +358,8 @@ 7@@ -447,6 +447,20 @@
8 -- | goto next unchanged line, return the given line if unchanged 8 openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
9 nextUnchanged :: BSTArray s -> Int -> ST s Int 9 openFd fd x y z a b = GHC.Handle.openFd fd x b y z a
10 nextUnchanged c i = do 10 ]]),
11- if i == (aLen c) + 1 then return i 11+AC_MSG_RESULT([okay])
12+ len <- aLenM c 12+IMPORT_WORKAROUND([
13+ if i == len + 1 then return i 13+import qualified GHC.Handle ( fdToHandle' )
14 else do b <- readArray c i 14+import System.IO ( Handle, IOMode )
15 if b then nextUnchanged c (i+1) 15+import System.Posix.Internals ( FDType )
16 else return i 16+import qualified GHC.IOBase ( FD )
17@@ -367,7 +368,8 @@ 17+])
18 -- behind the last line 18+CODE_WORKAROUND([[
19 skipOneUnChanged :: BSTArray s -> Int -> ST s Int 19+ {-
20 skipOneUnChanged c i = do 20+ Work around change in the GHC.Handle.fdToHandle' API.
21- if i == (aLen c) + 1 then return i 21+ -}
22+ len <- aLenM c 22+openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
23+ if i == len + 1 then return i 23+openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
24 else do b <- readArray c i 24+]]),
25 if not b then return (i+1) 25 AC_MSG_RESULT([failed])
26 else skipOneUnChanged c (i+1) 26 AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
27@@ -381,8 +383,9 @@ 27 )
28  
29 -- | goto next changed line, return the given line if changed 
30 nextChanged :: BSTArray s -> Int -> ST s (Maybe Int) 
31-nextChanged c i = 
32- if i <= aLen c 
33+nextChanged c i = do 
34+ len <- aLenM c 
35+ if i <= len 
36 then do b <- readArray c i 
37 if not b then nextChanged c (i+1) 
38 else return $ Just i 
39@@ -430,8 +433,17 @@ 
40 initP :: [PackedString] -> PArray 
41 initP a = listArray (0, length a) (nilPS:a) 
42  
43+#if __GLASGOW_HASKELL__ > 604 
44+aLen :: (IArray a e) => a Int e -> Int 
45+aLen a = snd $ bounds a 
46+aLenM :: (MArray a e m) => a Int e -> m Int 
47+aLenM a = getBounds a >>= return . snd 
48+#else 
49 aLen :: HasBounds a => a Int e -> Int 
50 aLen a = snd $ bounds a 
51+aLenM :: (HasBounds a, Monad m) => a Int e -> m Int 
52+aLenM = return . snd . bounds 
53+#endif 
54 \end{code} 
55  
56 \begin{code} 
cvs diff -r1.1 -r1.2 pkgsrc/devel/darcs/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/darcs/patches/Attic/patch-ac 2007/03/24 17:58:04 1.1
+++ pkgsrc/devel/darcs/patches/Attic/patch-ac 2008/03/17 15:59:05 1.2
@@ -1,150 +1,15 @@ @@ -1,150 +1,15 @@
1$NetBSD: patch-ac,v 1.1 2007/03/24 17:58:04 kristerw Exp $ 1$NetBSD: patch-ac,v 1.2 2008/03/17 15:59:05 kristerw Exp $
2 2
3Patch needed for GHC 6.6. 3Patch needed for GHC 6.8. From FreeBSD ports.
4 4
5--- configure.orig 2006-06-16 20:59:33.000000000 +0200 5--- autoconf.mk.in.orig 2007-06-16 19:12:11.000000000 +0200
6+++ configure 2007-03-24 18:37:35.000000000 +0100 6+++ autoconf.mk.in 2008-01-04 19:37:47.000000000 +0100
7@@ -3188,7 +3188,7 @@ 7@@ -19,7 +19,7 @@
8 rm -f Main.hi Main.o 8 OPTCCFLAGS := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS))
9  9 LDFLAGS := @LDFLAGS@ @LIBS@
10 check_module_save_GHCFLAGS=$GHCFLAGS 10 OPTLLDFLAGS := $(addprefix -optl,$(LDFLAGS))
11- GHCFLAGS="$GHCFLAGS -package text" 11-GHCFLAGS := -cpp @GHCFLAGS@
12+ GHCFLAGS="$GHCFLAGS -package regex-compat" 12+GHCFLAGS := -package containers -cpp @GHCFLAGS@
13  13 HAVE_CURSES := @HAVE_CURSES@
14  14 HAVE_LIBCURL := @HAVE_LIBCURL@
15 cat << \EOF > conftest.hs 15 HAVE_MAPI := @HAVE_MAPI@
16@@ -3205,8 +3205,8 @@ 
17 echo "$as_me:$LINENO: \$? = $ac_status" >&5 
18 (exit $ac_status); }; } && test -s conftest 
19 then 
20- echo "$as_me:$LINENO: result: in package text" >&5 
21-echo "${ECHO_T}in package text" >&6 
22+ echo "$as_me:$LINENO: result: in package regex-compat" >&5 
23+echo "${ECHO_T}in package regex-compat" >&6 
24  
25 else 
26 echo "configure: failed program was:" >&5 
27@@ -3215,8 +3215,8 @@ 
28 rm -f Main.hi Main.o 
29  
30 GHCFLAGS=$check_module_save_GHCFLAGS 
31- echo "$as_me:$LINENO: result: no; and neither in package text" >&5 
32-echo "${ECHO_T}no; and neither in package text" >&6 
33+ echo "$as_me:$LINENO: result: no; and neither in package regex-compat" >&5 
34+echo "${ECHO_T}no; and neither in package regex-compat" >&6 
35  
36 fi 
37  
38@@ -3305,7 +3305,7 @@ 
39 cat << \EOF > conftest.hs 
40 -- #line 3306 "configure" 
41 import Control.Monad.Error 
42-main = seq (putStr undefined) (putStr "Hello world.\n") 
43+main = seq (strMsg "foo" :: String) (putStr "Hello world.\n") 
44  
45 EOF 
46 rm -f Main.hi Main.o 
47@@ -3332,7 +3332,7 @@ 
48 cat << \EOF > conftest.hs 
49 -- #line 3333 "configure" 
50 import Control.Monad.Error 
51-main = seq (putStr undefined) (putStr "Hello world.\n") 
52+main = seq (strMsg "foo" :: String) (putStr "Hello world.\n") 
53  
54 EOF 
55 rm -f Main.hi Main.o 
56@@ -3372,7 +3372,7 @@ 
57 cat << \EOF > conftest.hs 
58 -- #line 3373 "configure" 
59 import Control.Monad.Error 
60-main = seq (putStr undefined) (putStr "Hello world.\n") 
61+main = seq (strMsg "foo" :: String) (putStr "Hello world.\n") 
62  
63 EOF 
64 rm -f Main.hi Main.o 
65@@ -3399,7 +3399,7 @@ 
66 cat << \EOF > conftest.hs 
67 -- #line 3400 "configure" 
68 import Control.Monad.Error 
69-main = seq (putStr undefined) (putStr "Hello world.\n") 
70+main = seq (strMsg "foo" :: String) (putStr "Hello world.\n") 
71  
72 EOF 
73 rm -f Main.hi Main.o 
74@@ -3504,6 +3504,76 @@ 
75  
76  
77  
78+echo "$as_me:$LINENO: checking for module Text.Html" >&5 
79+echo $ECHO_N "checking for module Text.Html... $ECHO_C" >&6 
80+ 
81+ 
82+cat << \EOF > conftest.hs 
83+-- #line 3516 "configure" 
84+import Text.Html 
85+main = seq (text "foo") (putStr "Hello world.\n") 
86+ 
87+EOF 
88+rm -f Main.hi Main.o 
89+if { ac_try='$GHC $GHCFLAGS -o conftest conftest.hs' 
90+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 
91+ (eval $ac_try) 2>&5 
92+ ac_status=$? 
93+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 
94+ (exit $ac_status); }; } && test -s conftest 
95+then 
96+ echo "$as_me:$LINENO: result: yes" >&5 
97+echo "${ECHO_T}yes" >&6 
98+ 
99+else 
100+ echo "configure: failed program was:" >&5 
101+ cat conftest.hs >&5 
102+ echo "end of failed program." >&5 
103+ rm -f Main.hi Main.o 
104+ 
105+ check_module_save_GHCFLAGS=$GHCFLAGS 
106+ GHCFLAGS="$GHCFLAGS -package html" 
107+ 
108+ 
109+cat << \EOF > conftest.hs 
110+-- #line 3543 "configure" 
111+import Text.Html 
112+main = seq (text "foo") (putStr "Hello world.\n") 
113+ 
114+EOF 
115+rm -f Main.hi Main.o 
116+if { ac_try='$GHC $GHCFLAGS -o conftest conftest.hs' 
117+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 
118+ (eval $ac_try) 2>&5 
119+ ac_status=$? 
120+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 
121+ (exit $ac_status); }; } && test -s conftest 
122+then 
123+ echo "$as_me:$LINENO: result: in package html" >&5 
124+echo "${ECHO_T}in package html" >&6 
125+ 
126+else 
127+ echo "configure: failed program was:" >&5 
128+ cat conftest.hs >&5 
129+ echo "end of failed program." >&5 
130+ rm -f Main.hi Main.o 
131+ 
132+ GHCFLAGS=$check_module_save_GHCFLAGS 
133+ echo "$as_me:$LINENO: result: no; and neither in package html" >&5 
134+echo "${ECHO_T}no; and neither in package html" >&6 
135+ 
136+fi 
137+ 
138+ 
139+ 
140+fi 
141+ 
142+ 
143+ 
144+ 
145+ 
146+ 
147+ 
148 cat << \EOF >> Workaround.hs.prefix 
149 getCurrentDirectory, 
150 EOF 
File Added: pkgsrc/devel/darcs/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.1 2008/03/17 15:59:05 kristerw Exp $

--- configure.orig	2008-03-16 23:52:02.000000000 +0000
+++ configure	2008-03-16 23:52:07.000000000 +0000
@@ -3273,11 +3273,28 @@
 EOF
 
 else
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-       { { echo "$as_me:$LINENO: error: Couldnt figure out how to call GHC.Handle.openFd!" >&5
-echo "$as_me: error: Couldnt figure out how to call GHC.Handle.openFd!" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "$as_me:$LINENO: result: okay" >&5
+echo "${ECHO_T}okay" >&6; }
+
+cat << \EOF >> Workaround.hs.beginning
+
+import qualified GHC.Handle ( fdToHandle' )
+import System.IO ( Handle, IOMode )
+import System.Posix.Internals ( FDType )
+import qualified GHC.IOBase ( FD )
+
+EOF
+
+
+cat << \EOF >> Workaround.hs.ending
+
+  {-
+   Work around change in the GHC.Handle.fdToHandle' API.
+  -}
+openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
+
+EOF
 
 fi
 
@@ -3286,11 +3303,28 @@
   cat conftest.hs >&5
   echo "end of failed program." >&5
  rm -f Main.hi Main.o
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-       { { echo "$as_me:$LINENO: error: Couldnt figure out how to call GHC.Handle.openFd!" >&5
-echo "$as_me: error: Couldnt figure out how to call GHC.Handle.openFd!" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "$as_me:$LINENO: result: okay" >&5
+echo "${ECHO_T}okay" >&6; }
+
+cat << \EOF >> Workaround.hs.beginning
+
+import qualified GHC.Handle ( fdToHandle' )
+import System.IO ( Handle, IOMode )
+import System.Posix.Internals ( FDType )
+import qualified GHC.IOBase ( FD )
+
+EOF
+
+
+cat << \EOF >> Workaround.hs.ending
+
+  {-
+   Work around change in the GHC.Handle.fdToHandle' API.
+  -}
+openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
+
+EOF
 
 fi
 
@@ -3353,11 +3387,28 @@
 EOF
 
 else
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-       { { echo "$as_me:$LINENO: error: Couldnt figure out how to call GHC.Handle.openFd!" >&5
-echo "$as_me: error: Couldnt figure out how to call GHC.Handle.openFd!" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "$as_me:$LINENO: result: okay" >&5
+echo "${ECHO_T}okay" >&6; }
+
+cat << \EOF >> Workaround.hs.beginning
+
+import qualified GHC.Handle ( fdToHandle' )
+import System.IO ( Handle, IOMode )
+import System.Posix.Internals ( FDType )
+import qualified GHC.IOBase ( FD )
+
+EOF
+
+
+cat << \EOF >> Workaround.hs.ending
+
+  {-
+   Work around change in the GHC.Handle.fdToHandle' API.
+  -}
+openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
+
+EOF
 
 fi
 
@@ -3366,11 +3417,28 @@
   cat conftest.hs >&5
   echo "end of failed program." >&5
  rm -f Main.hi Main.o
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-       { { echo "$as_me:$LINENO: error: Couldnt figure out how to call GHC.Handle.openFd!" >&5
-echo "$as_me: error: Couldnt figure out how to call GHC.Handle.openFd!" >&2;}
-   { (exit 1); exit 1; }; }
+  { echo "$as_me:$LINENO: result: okay" >&5
+echo "${ECHO_T}okay" >&6; }
+
+cat << \EOF >> Workaround.hs.beginning
+
+import qualified GHC.Handle ( fdToHandle' )
+import System.IO ( Handle, IOMode )
+import System.Posix.Internals ( FDType )
+import qualified GHC.IOBase ( FD )
+
+EOF
+
+
+cat << \EOF >> Workaround.hs.ending
+
+  {-
+   Work around change in the GHC.Handle.fdToHandle' API.
+  -}
+openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
+
+EOF
 
 fi