Fix build and adjust wantlib after threading has been disabled in
ghc. While here, rename the `log' matcher to `comment' and add a
little bit of documentation as discussed upstream.
This may limit the pain for those who want to test the ghc diff
with some real stuff.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 25 Apr 2010 21:20:45 -0000 1.27
+++ Makefile 2 May 2010 12:48:24 -0000
@@ -3,14 +3,15 @@
COMMENT = advanced revision control system written in Haskell
DISTNAME = darcs-2.4.1
-PKGNAME = ${DISTNAME}p0
+PKGNAME = ${DISTNAME}p1
CATEGORIES = devel
HOMEPAGE = http://www.darcs.net/
-WANTLIB = c m ncurses pthread util z
+WANTLIB = c m ncurses util z
MODULES = lang/ghc converters/libiconv
MODGHC_BUILD = cabal hackage nort
+MODGHC_SETUP_CONF_ARGS =-f '-threaded'
LIB_DEPENDS = curl.>=2::net/curl
# Yes, build dependencies, because GHC libs are still static and we
Index: patches/patch-src_Darcs_Patch_Match_lhs
===================================================================
RCS file: /cvs/ports/devel/darcs/patches/patch-src_Darcs_Patch_Match_lhs,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_Darcs_Patch_Match_lhs
--- patches/patch-src_Darcs_Patch_Match_lhs 25 Apr 2010 21:20:45 -0000
1.1
+++ patches/patch-src_Darcs_Patch_Match_lhs 2 May 2010 12:48:24 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_Darcs_Patch_Match_lhs,v 1.1 2010/04/25 21:20:45 kili Exp $
--- src/Darcs/Patch/Match.lhs.orig Mon Apr 12 21:42:42 2010
-+++ src/Darcs/Patch/Match.lhs Sun Apr 25 22:55:57 2010
++++ src/Darcs/Patch/Match.lhs Sun May 2 14:47:07 2010
@@ -36,7 +36,7 @@ import System.IO.Unsafe ( unsafePerformIO )
import Darcs.Hopefully ( PatchInfoAnd, hopefully, info )
@@ -10,17 +10,49 @@ $OpenBSD: patch-src_Darcs_Patch_Match_lh
pi_date )
import Darcs.Witnesses.Sealed ( Sealed2(..), seal2 )
import DateMatcher ( parseDateMatcher )
-@@ -308,6 +308,9 @@ primitiveMatchers =
+@@ -81,7 +81,7 @@ trivial = const True
+
+ \subsection{Match}
+
+-Currently \verb!--match! accepts six primitive match types, although
++Currently \verb!--match! accepts eight primitive match types, although
+ there are plans to expand it to match more patterns. Also, note that the
+ syntax is still preliminary and subject to change.
+
+@@ -199,6 +199,19 @@ file paths that the patch touches. The syntax is
+ darcs annotate --summary --match 'touch foo/bar.c'
+ \end{verbatim}
+
++The seventh match type accepts a regular expression which is checked
++against every chunk. The syntax is
++\begin{verbatim}
++darcs annotate --summary --match 'hunk "^instance .* Foo where$"'
++\end{verbatim}
++
++The eight match type accepts a regular expression wich is checked
++against the long comment. The syntax
++is
++\begin{verbatim}
++darcs annotate --summary --match 'comment "remote repository"'
++\end{verbatim}
++
+ The \verb!--match! pattern can include the logical operators \verb!&&!,
+ \verb!||! and \verb!not!, as well as grouping of patterns with parentheses.
+ For example
+@@ -306,8 +319,11 @@ primitiveMatchers =
+ , ["\"David Roundy\"", "droundy", "[email protected]"]
+ , authormatch )
, ("hunk", "check a regular expression against the contents of a hunk patch"
- , ["foo = 2", "^instance .* Foo where$"]
+- , ["foo = 2", "^instance .* Foo where$"]
++ , ["\"foo = 2\"", "\"^instance .* Foo where$\""]
, hunkmatch )
-+ , ("log", "check a regular expression against the log message"
-+ , []
++ , ("comment", "check a regular expression against the log message"
++ , ["\"prevent deadlocks\""]
+ , logmatch )
, ("hash", "match the darcs hash for a patch"
, ["20040403105958-53a90-c719567e92c3b0ab9eddd5290b705712b8b918ef"]
, hashmatch )
-@@ -339,6 +342,7 @@ exactmatch r (Sealed2 hp) = r == (just_name (info hp))
+@@ -339,6 +355,7 @@ exactmatch r (Sealed2 hp) = r == (just_name (info hp))
authormatch a (Sealed2 hp) = isJust $ matchRegex (mkRegex a) $ just_author
(info hp)
