From 44c03a44cb3f60f3baa96d84d7611ab2f102097e Mon Sep 17 00:00:00 2001 From: kristerw Date: Sun, 20 Jul 2008 00:38:44 +0000 Subject: Update darcs to 2.0.2. Changes since 1.0.9 includes * New Feature: Include patch count in darcs --version, for example, 2.0.1 (+ 32 patches) (David Roundy) * New Feature: darcs put --no-set-default and --set-default (Nicolas Pouillard) * UI changes: --extended-help is now called --overview, no more --verify-hash, no more send --unified (David Roundy, Eric Kow) * New Feature: Check for and repair patches which remove non-empty files (issue815, David Roundy) * New Feature: darcs trackdown --set-scripts-executable (Reinier Lamers) * User Experience: Make darcs changes --interactive behave more like other interactive commands (Eric Kow) * New Feature: Colorize added and removed lines, if the environment variable DARCS_DO_COLOR_LINES=True (Nicolas Pouillard) * New Feature: --remote-repodir flag to allow separate default repositories for push, pull and send (issue792, Eric Kow) * New Feature: darcs changes --count (David Roundy) * New Feature: Add a 'show authors' command (Eric Kow) * New Feature: New DARCS_PATCHES, DARCS_FILES and DARCS_PATCHES_XML environment variables are made available for the posthook system, allowing for more easier options to to integrate darcs with other systems. (David Roundy, Mark Stosberg) * New Feature: Automatically create the the global cache if we define we want to use it. (David Roundy, Trent Buck) and numerous performance improvements and bugfixes. --- devel/darcs/Makefile | 6 +- devel/darcs/PLIST | 17 +++++- devel/darcs/distinfo | 14 ++--- devel/darcs/patches/patch-aa | 31 +++++----- devel/darcs/patches/patch-ab | 47 +++++++-------- devel/darcs/patches/patch-ac | 15 ----- devel/darcs/patches/patch-ad | 140 ------------------------------------------- 7 files changed, 61 insertions(+), 209 deletions(-) delete mode 100644 devel/darcs/patches/patch-ac delete mode 100644 devel/darcs/patches/patch-ad (limited to 'devel/darcs') diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile index de2c4161b3f..31127afb051 100644 --- a/devel/darcs/Makefile +++ b/devel/darcs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2008/03/17 15:59:05 kristerw Exp $ +# $NetBSD: Makefile,v 1.21 2008/07/20 00:38:44 kristerw Exp $ -DISTNAME= darcs-1.0.9 +DISTNAME= darcs-2.0.2 CATEGORIES= devel scm MASTER_SITES= http://www.darcs.net/ @@ -11,7 +11,7 @@ COMMENT= Distributed revision control system BUILD_DEPENDS+= latex2html>=2002.2.1nb3:../../textproc/latex2html TEX_DEPMETHOD= build -USE_TOOLS+= gmake +USE_TOOLS+= gmake perl MAKE_FILE= GNUmakefile GNU_CONFIGURE= yes diff --git a/devel/darcs/PLIST b/devel/darcs/PLIST index 725a7893045..b7e2163257f 100644 --- a/devel/darcs/PLIST +++ b/devel/darcs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2008/03/17 15:59:05 kristerw Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/07/20 00:38:44 kristerw Exp $ bin/darcs man/man1/darcs.1 share/doc/darcs/examples/darcs_completion @@ -6,8 +6,10 @@ share/doc/darcs/examples/zsh_completion_new share/doc/darcs/examples/zsh_completion_old share/doc/darcs/manual/WARNINGS share/doc/darcs/manual/contents.png +share/doc/darcs/manual/crossref.png share/doc/darcs/manual/darcs.css share/doc/darcs/manual/darcs.html +share/doc/darcs/manual/darcs.pdf share/doc/darcs/manual/darcs.ps share/doc/darcs/manual/footnode.html share/doc/darcs/manual/images.aux @@ -32,7 +34,18 @@ share/doc/darcs/manual/img22.png share/doc/darcs/manual/img23.png share/doc/darcs/manual/img24.png share/doc/darcs/manual/img25.png +share/doc/darcs/manual/img26.png +share/doc/darcs/manual/img27.png +share/doc/darcs/manual/img28.png +share/doc/darcs/manual/img29.png share/doc/darcs/manual/img3.png +share/doc/darcs/manual/img30.png +share/doc/darcs/manual/img31.png +share/doc/darcs/manual/img32.png +share/doc/darcs/manual/img33.png +share/doc/darcs/manual/img34.png +share/doc/darcs/manual/img35.png +share/doc/darcs/manual/img36.png share/doc/darcs/manual/img4.png share/doc/darcs/manual/img5.png share/doc/darcs/manual/img6.png @@ -55,6 +68,8 @@ share/doc/darcs/manual/node6.html share/doc/darcs/manual/node7.html share/doc/darcs/manual/node8.html share/doc/darcs/manual/node9.html +share/doc/darcs/manual/nx_grp_g.png +share/doc/darcs/manual/patch-theory.pdf share/doc/darcs/manual/prev.png share/doc/darcs/manual/prev_g.png share/doc/darcs/manual/up.png diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo index be960988210..22eece75994 100644 --- a/devel/darcs/distinfo +++ b/devel/darcs/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.9 2008/03/17 15:59:05 kristerw Exp $ +$NetBSD: distinfo,v 1.10 2008/07/20 00:38:44 kristerw Exp $ -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) = ff0c47f0ed42ed6853db00c80ff0d965199e57b6 -SHA1 (patch-ac) = dde83524390b90fb18cb50b831acadeb3b4f9970 -SHA1 (patch-ad) = ed3f8c5a1f7611cc991686d40332cac04c9f415d +SHA1 (darcs-2.0.2.tar.gz) = 75a186b906ac8bbc1144c5124c215e4c57c06222 +RMD160 (darcs-2.0.2.tar.gz) = e401bd2ab64e2df4c654bdc03355ce215a053195 +Size (darcs-2.0.2.tar.gz) = 1800653 bytes +SHA1 (patch-aa) = 387f237bfbe1f3d909081c20c5e2ec739d6d6e3c +SHA1 (patch-ab) = bb6eeaee47de233aa8403772e7d165b3447a0e6f diff --git a/devel/darcs/patches/patch-aa b/devel/darcs/patches/patch-aa index 9e9e44b0fd1..4d2513dbccc 100644 --- a/devel/darcs/patches/patch-aa +++ b/devel/darcs/patches/patch-aa @@ -1,30 +1,29 @@ -$NetBSD: patch-aa,v 1.5 2006/10/17 21:43:38 agc Exp $ +$NetBSD: patch-aa,v 1.6 2008/07/20 00:38:44 kristerw Exp $ ---- GNUmakefile.orig 2006-06-16 19:59:28.000000000 +0100 -+++ GNUmakefile 2006-10-17 08:45:18.000000000 +0100 -@@ -107,15 +107,12 @@ - - config: configure autoconf.mk +--- GNUmakefile.orig 2008-07-19 18:35:38.000000000 +0200 ++++ GNUmakefile 2008-07-19 18:37:09.000000000 +0200 +@@ -170,14 +170,12 @@ + datadir=$(destdir)/$(datadir) \ + libexecdir=$(destdir)/$(libexecdir) +install: installbin installdocs + installbin: all test -d $(DESTDIR)$(bindir) || $(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) darcs $(DESTDIR)$(bindir) - $(REZ_CMD) $(REZ_FLAGS) -o $(DESTDIR)$(bindir)/darcs -- + - test -d $(DESTDIR)$(sysconfdir)/bash_completion.d || \ - $(INSTALL) -d $(DESTDIR)$(sysconfdir)/bash_completion.d -- $(INSTALL_DATA) darcs_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/darcs +- $(INSTALL_DATA) tools/darcs_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/darcs - test -d $(DESTDIR)$(mandir)/man1 || \ $(INSTALL) -d $(DESTDIR)$(mandir)/man1 - $(INSTALL_DATA) darcs.1 $(DESTDIR)$(mandir)/man1/ -@@ -130,6 +127,7 @@ - $(INSTALL) -d $(DESTDIR)$(datadir)/doc/darcs/examples - $(INSTALL_DATA) zsh_completion_new $(DESTDIR)$(datadir)/doc/darcs/examples/ - $(INSTALL_DATA) zsh_completion_old $(DESTDIR)$(datadir)/doc/darcs/examples/ -+ $(INSTALL_DATA) darcs_completion $(DESTDIR)/$(datadir)/doc/darcs/examples/ + $(INSTALL_DATA) doc/darcs.1 $(DESTDIR)$(mandir)/man1/ +@@ -191,6 +189,7 @@ + $(INSTALL) -d $(DESTDIR)$(docdir)/examples + $(INSTALL_DATA) tools/zsh_completion_new $(DESTDIR)$(docdir)/examples/ + $(INSTALL_DATA) tools/zsh_completion_old $(DESTDIR)$(docdir)/examples/ ++ $(INSTALL_DATA) tools/darcs_completion $(DESTDIR)/$(datadir)/doc/darcs/examples/ - installserver: cgi/darcs.cgi + installserver: tools/cgi/darcs.cgi test -d $(DESTDIR)$(libexecdir)/cgi-bin || \ diff --git a/devel/darcs/patches/patch-ab b/devel/darcs/patches/patch-ab index b7e1efe76b4..76a2e03d3e5 100644 --- a/devel/darcs/patches/patch-ab +++ b/devel/darcs/patches/patch-ab @@ -1,27 +1,22 @@ -$NetBSD: patch-ab,v 1.2 2008/03/17 15:59:05 kristerw Exp $ +$NetBSD: patch-ab,v 1.3 2008/07/20 00:38:44 kristerw Exp $ -Patch needed for GHC 6.8. From FreeBSD ports. - ---- 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!]) - ) +--- configure.orig 2008-07-19 18:07:30.000000000 +0200 ++++ configure 2008-07-19 18:07:59.000000000 +0200 +@@ -7355,7 +7355,7 @@ + fi + + +- if test "$with_curl_pipelining" == "yes"; then ++ if test "$with_curl_pipelining" = "yes"; then + { echo "$as_me:$LINENO: checking for libcurl pipelining" >&5 + echo $ECHO_N "checking for libcurl pipelining... $ECHO_C" >&6; } + let vernum=0x0`$CURL_CONFIG --vernum` +@@ -7398,7 +7398,7 @@ + fi + + +-if test "$with_libwww" == "yes"; then ++if test "$with_libwww" = "yes"; then + { echo "$as_me:$LINENO: checking for libwww" >&5 + echo $ECHO_N "checking for libwww... $ECHO_C" >&6; } + if eval libwww-config --version 2>/dev/null >/dev/null; then diff --git a/devel/darcs/patches/patch-ac b/devel/darcs/patches/patch-ac deleted file mode 100644 index 46fcc791f08..00000000000 --- a/devel/darcs/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2008/03/17 15:59:05 kristerw Exp $ - -Patch needed for GHC 6.8. From FreeBSD ports. - ---- 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 deleted file mode 100644 index 57f8cbbd7c7..00000000000 --- a/devel/darcs/patches/patch-ad +++ /dev/null @@ -1,140 +0,0 @@ -$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 - -- cgit v1.2.3