diff options
-rw-r--r-- | devel/darcs/Makefile | 5 | ||||
-rw-r--r-- | devel/darcs/PLIST | 4 | ||||
-rw-r--r-- | devel/darcs/distinfo | 13 | ||||
-rw-r--r-- | devel/darcs/patches/patch-ab | 79 | ||||
-rw-r--r-- | devel/darcs/patches/patch-ac | 161 | ||||
-rw-r--r-- | devel/darcs/patches/patch-ad | 140 |
6 files changed, 189 insertions, 213 deletions
diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile index ce74a66377f..de2c4161b3f 100644 --- a/devel/darcs/Makefile +++ b/devel/darcs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2008/01/18 05:14:32 tnn Exp $ +# $NetBSD: Makefile,v 1.20 2008/03/17 15:59:05 kristerw Exp $ -DISTNAME= darcs-1.0.8 -PKGREVISION= 3 +DISTNAME= darcs-1.0.9 CATEGORIES= devel scm MASTER_SITES= http://www.darcs.net/ diff --git a/devel/darcs/PLIST b/devel/darcs/PLIST index 58b703bc544..725a7893045 100644 --- a/devel/darcs/PLIST +++ b/devel/darcs/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.4 2005/05/28 09:14:39 augustss Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/03/17 15:59:05 kristerw Exp $ bin/darcs man/man1/darcs.1 -share/doc/darcs/darcs.ps share/doc/darcs/examples/darcs_completion share/doc/darcs/examples/zsh_completion_new share/doc/darcs/examples/zsh_completion_old @@ -9,6 +8,7 @@ share/doc/darcs/manual/WARNINGS share/doc/darcs/manual/contents.png share/doc/darcs/manual/darcs.css share/doc/darcs/manual/darcs.html +share/doc/darcs/manual/darcs.ps share/doc/darcs/manual/footnode.html share/doc/darcs/manual/images.aux share/doc/darcs/manual/images.log diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo index 668f0768afd..be960988210 100644 --- a/devel/darcs/distinfo +++ b/devel/darcs/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.8 2007/03/24 17:58:04 kristerw Exp $ +$NetBSD: distinfo,v 1.9 2008/03/17 15:59:05 kristerw Exp $ -SHA1 (darcs-1.0.8.tar.gz) = f69fb2f5deb3c5281b2eaed9fcb8aa3fe55829dd -RMD160 (darcs-1.0.8.tar.gz) = a95309f7dc79b29d7e4f237627aa300a84aa5331 -Size (darcs-1.0.8.tar.gz) = 1010010 bytes +SHA1 (darcs-1.0.9.tar.gz) = e085b73b0c82d7465f54709c91ef1d14147c63e5 +RMD160 (darcs-1.0.9.tar.gz) = 459c9f8415979888dafee021e368efef06a685a2 +Size (darcs-1.0.9.tar.gz) = 1080280 bytes SHA1 (patch-aa) = dc0d9e08eb8397a6252aa49c0457ec2e948e1ff7 -SHA1 (patch-ab) = 7057e2d8cd53cd5f6114569559fa83d0e85ce23e -SHA1 (patch-ac) = 53606a8e342a12f79d880b600a3d30cb9ce7fde7 +SHA1 (patch-ab) = ff0c47f0ed42ed6853db00c80ff0d965199e57b6 +SHA1 (patch-ac) = dde83524390b90fb18cb50b831acadeb3b4f9970 +SHA1 (patch-ad) = ed3f8c5a1f7611cc991686d40332cac04c9f415d diff --git a/devel/darcs/patches/patch-ab b/devel/darcs/patches/patch-ab index 47c17832bcf..b7e1efe76b4 100644 --- a/devel/darcs/patches/patch-ab +++ b/devel/darcs/patches/patch-ab @@ -1,56 +1,27 @@ -$NetBSD: patch-ab,v 1.1 2007/03/24 17:58:04 kristerw Exp $ +$NetBSD: patch-ab,v 1.2 2008/03/17 15:59:05 kristerw Exp $ -Patch needed for GHC 6.6. +Patch needed for GHC 6.8. From FreeBSD ports. ---- Lcs.lhs.orig 2006-06-16 20:59:28.000000000 +0200 -+++ Lcs.lhs 2007-02-25 22:12:31.000000000 +0100 -@@ -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} +--- aclocal.m4.orig 2007-06-16 19:12:11.000000000 +0200 ++++ aclocal.m4 2008-01-04 19:37:37.000000000 +0100 +@@ -447,6 +447,20 @@ + openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle + openFd fd x y z a b = GHC.Handle.openFd fd x b y z a + ]]), ++AC_MSG_RESULT([okay]) ++IMPORT_WORKAROUND([ ++import qualified GHC.Handle ( fdToHandle' ) ++import System.IO ( Handle, IOMode ) ++import System.Posix.Internals ( FDType ) ++import qualified GHC.IOBase ( FD ) ++]) ++CODE_WORKAROUND([[ ++ {- ++ 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 ++]]), + AC_MSG_RESULT([failed]) + AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!]) + ) diff --git a/devel/darcs/patches/patch-ac b/devel/darcs/patches/patch-ac index 0a1a5780edc..46fcc791f08 100644 --- a/devel/darcs/patches/patch-ac +++ b/devel/darcs/patches/patch-ac @@ -1,150 +1,15 @@ -$NetBSD: patch-ac,v 1.1 2007/03/24 17:58:04 kristerw Exp $ +$NetBSD: patch-ac,v 1.2 2008/03/17 15:59:05 kristerw Exp $ -Patch needed for GHC 6.6. +Patch needed for GHC 6.8. From FreeBSD ports. ---- configure.orig 2006-06-16 20:59:33.000000000 +0200 -+++ configure 2007-03-24 18:37:35.000000000 +0100 -@@ -3188,7 +3188,7 @@ - rm -f Main.hi Main.o - - check_module_save_GHCFLAGS=$GHCFLAGS -- GHCFLAGS="$GHCFLAGS -package text" -+ GHCFLAGS="$GHCFLAGS -package regex-compat" - - - cat << \EOF > conftest.hs -@@ -3205,8 +3205,8 @@ - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && test -s conftest - then -- echo "$as_me:$LINENO: result: in package text" >&5 --echo "${ECHO_T}in package text" >&6 -+ echo "$as_me:$LINENO: result: in package regex-compat" >&5 -+echo "${ECHO_T}in package regex-compat" >&6 - - else - echo "configure: failed program was:" >&5 -@@ -3215,8 +3215,8 @@ - rm -f Main.hi Main.o - - GHCFLAGS=$check_module_save_GHCFLAGS -- echo "$as_me:$LINENO: result: no; and neither in package text" >&5 --echo "${ECHO_T}no; and neither in package text" >&6 -+ echo "$as_me:$LINENO: result: no; and neither in package regex-compat" >&5 -+echo "${ECHO_T}no; and neither in package regex-compat" >&6 - - fi - -@@ -3305,7 +3305,7 @@ - cat << \EOF > conftest.hs - -- #line 3306 "configure" - import Control.Monad.Error --main = seq (putStr undefined) (putStr "Hello world.\n") -+main = seq (strMsg "foo" :: String) (putStr "Hello world.\n") - - EOF - rm -f Main.hi Main.o -@@ -3332,7 +3332,7 @@ - cat << \EOF > conftest.hs - -- #line 3333 "configure" - import Control.Monad.Error --main = seq (putStr undefined) (putStr "Hello world.\n") -+main = seq (strMsg "foo" :: String) (putStr "Hello world.\n") - - EOF - rm -f Main.hi Main.o -@@ -3372,7 +3372,7 @@ - cat << \EOF > conftest.hs - -- #line 3373 "configure" - import Control.Monad.Error --main = seq (putStr undefined) (putStr "Hello world.\n") -+main = seq (strMsg "foo" :: String) (putStr "Hello world.\n") - - EOF - rm -f Main.hi Main.o -@@ -3399,7 +3399,7 @@ - cat << \EOF > conftest.hs - -- #line 3400 "configure" - import Control.Monad.Error --main = seq (putStr undefined) (putStr "Hello world.\n") -+main = seq (strMsg "foo" :: String) (putStr "Hello world.\n") - - EOF - rm -f Main.hi Main.o -@@ -3504,6 +3504,76 @@ - - - -+echo "$as_me:$LINENO: checking for module Text.Html" >&5 -+echo $ECHO_N "checking for module Text.Html... $ECHO_C" >&6 -+ -+ -+cat << \EOF > conftest.hs -+-- #line 3516 "configure" -+import Text.Html -+main = seq (text "foo") (putStr "Hello world.\n") -+ -+EOF -+rm -f Main.hi Main.o -+if { ac_try='$GHC $GHCFLAGS -o conftest conftest.hs' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && test -s conftest -+then -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.hs >&5 -+ echo "end of failed program." >&5 -+ rm -f Main.hi Main.o -+ -+ check_module_save_GHCFLAGS=$GHCFLAGS -+ GHCFLAGS="$GHCFLAGS -package html" -+ -+ -+cat << \EOF > conftest.hs -+-- #line 3543 "configure" -+import Text.Html -+main = seq (text "foo") (putStr "Hello world.\n") -+ -+EOF -+rm -f Main.hi Main.o -+if { ac_try='$GHC $GHCFLAGS -o conftest conftest.hs' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && test -s conftest -+then -+ echo "$as_me:$LINENO: result: in package html" >&5 -+echo "${ECHO_T}in package html" >&6 -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.hs >&5 -+ echo "end of failed program." >&5 -+ rm -f Main.hi Main.o -+ -+ GHCFLAGS=$check_module_save_GHCFLAGS -+ echo "$as_me:$LINENO: result: no; and neither in package html" >&5 -+echo "${ECHO_T}no; and neither in package html" >&6 -+ -+fi -+ -+ -+ -+fi -+ -+ -+ -+ -+ -+ -+ - cat << \EOF >> Workaround.hs.prefix - getCurrentDirectory, - EOF +--- autoconf.mk.in.orig 2007-06-16 19:12:11.000000000 +0200 ++++ autoconf.mk.in 2008-01-04 19:37:47.000000000 +0100 +@@ -19,7 +19,7 @@ + OPTCCFLAGS := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS)) + LDFLAGS := @LDFLAGS@ @LIBS@ + OPTLLDFLAGS := $(addprefix -optl,$(LDFLAGS)) +-GHCFLAGS := -cpp @GHCFLAGS@ ++GHCFLAGS := -package containers -cpp @GHCFLAGS@ + HAVE_CURSES := @HAVE_CURSES@ + HAVE_LIBCURL := @HAVE_LIBCURL@ + HAVE_MAPI := @HAVE_MAPI@ diff --git a/devel/darcs/patches/patch-ad b/devel/darcs/patches/patch-ad new file mode 100644 index 00000000000..57f8cbbd7c7 --- /dev/null +++ b/devel/darcs/patches/patch-ad @@ -0,0 +1,140 @@ +$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 + |