diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index 00c8dff2a0f..bbfa92d109b 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.44 2011/12/31 22:30:49 kili Exp $
+# $OpenBSD: Makefile,v 1.45 2012/05/09 21:00:20 kili Exp $
 
 COMMENT =		advanced revision control system written in Haskell
 
-DISTNAME =		darcs-2.5.2
-REVISION =		5
+DISTNAME =		darcs-2.8.0
 
 CATEGORIES =		devel
 HOMEPAGE =		http://www.darcs.net/
@@ -11,30 +10,45 @@ HOMEPAGE =		http://www.darcs.net/
 WANTLIB =		c curl>=2 gmp m ncursesw pthread util z
 MODULES =		lang/ghc converters/libiconv
 MODGHC_BUILD =		cabal hackage nort
-MODGHC_SETUP_CONF_ARGS =-f '-library -threaded'
+MODGHC_SETUP_CONF_ARGS =-f '-library test'
 LIB_DEPENDS =		devel/gmp \
 			net/curl
 
 # Yes, build dependencies, because GHC libs are still static and we
 # don't want to pull in all of ghc.
-BUILD_DEPENDS =		hs-tar->=0.3,<0.4:devel/hs-tar \
-			hs-zlib->=0.5.0,<0.6.0:archivers/hs-zlib \
-			hs-hashed-storage->=0.5.2,<0.6:devel/hs-hashed-storage \
-			hs-haskeline->=0.6.2.2,<0.7:devel/hs-haskeline \
-			hs-mtl->=1.0,<2.1:devel/hs-mtl \
-			hs-parsec->=2.0,<3.2:devel/hs-parsec \
-			hs-regex-compat->=0.71,<0.96:devel/hs-regex-compat \
-			hs-text->=0.3:devel/hs-text \
-			hs-html->=1.0,<1.1:www/hs-html \
-			${RUN_DEPENDS} \
-			textproc/latex2html
+BUILD_DEPENDS =		archivers/hs-zlib>=0.5.1.0,<0.6.0.0 \
+			devel/hs-tar>=0.3,<0.4 \
+			devel/hs-hashed-storage>=0.5.6,<0.6 \
+			devel/hs-haskeline>=0.6.3,<0.7 \
+			devel/hs-mmap>=0.5,<0.6 \
+			devel/hs-mtl>=1.0,<2.1 \
+			devel/hs-network>=2.2,<2.4 \
+			devel/hs-parsec>=2.0,<3.2 \
+			devel/hs-regex-compat=0.95.1 \
+			devel/hs-terminfo>=0.3,<0.4 \
+			devel/hs-text>=0.11.0.6,<0.12.0.0 \
+			devel/hs-vector>=0.7 \
+			www/hs-html>=1.0,<1.1 \
+ 			textproc/latex2html \
+			${RUN_DEPENDS}
+
+# Used for building the test suite (which is done during normal
+# build time, not during regress time).
+BUILD_DEPENDS +=	devel/hs-QuickCheck>=2.3 \
+			devel/hs-HUnit>=1.0 \
+			devel/hs-cmdlib>=0.2.1,<0.4 \
+			devel/hs-shellish>=0.1.3,<0.2 \
+			devel/hs-test-framework>=0.4.0 \
+			devel/hs-test-framework-hunit>=0.2.2 \
+			devel/hs-test-framework-quickcheck2>=0.2.8
 
 REGRESS_DEPENDS =	devel/hs-hlint \
-			shells/bash
+			shells/bash \
+			sysutils/coreutils \
+			textproc/gsed
 
 # For the documentation
 USE_GMAKE =		Yes
-USE_GROFF =		Yes
 PORTHOME =		${WRKDIR}
 
 post-build:
@@ -48,6 +62,11 @@ post-install:
 	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKBUILD}/dist/build/darcs/darcs.1 ${PREFIX}/man/man1
 
+# Some of the tests rely on GNU functionality.
+pre-regress:
+	ln -fs ${LOCALBASE}/bin/gdate ${WRKDIR}/bin/date
+	ln -fs ${LOCALBASE}/bin/gsed ${WRKDIR}/bin/sed
+
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo
index 5e426011121..669b5b845fb 100644
--- a/devel/darcs/distinfo
+++ b/devel/darcs/distinfo
@@ -1,5 +1,5 @@
-MD5 (ghc/darcs-2.5.2.tar.gz) = SRtsoB3sJFoWESrSx+B9wQ==
-RMD160 (ghc/darcs-2.5.2.tar.gz) = U+NX+4AqcvS3h78cpKbpXhGLCK8=
-SHA1 (ghc/darcs-2.5.2.tar.gz) = 2kPr9kyk9BtFbVsf0gOK4OxaNto=
-SHA256 (ghc/darcs-2.5.2.tar.gz) = iVP51k+AE4dkZritVHSiEu5OFk9Bm6QBK13MnlkPs4Y=
-SIZE (ghc/darcs-2.5.2.tar.gz) = 1231903
+MD5 (ghc/darcs-2.8.0.tar.gz) = IFQwxnE8ETqJqQs5P1hXaQ==
+RMD160 (ghc/darcs-2.8.0.tar.gz) = XLcRbPJ34hKJW45ERhX5Z8yZGa0=
+SHA1 (ghc/darcs-2.8.0.tar.gz) = T89GlD6fxyrx1OKZxnzYGulVL2Q=
+SHA256 (ghc/darcs-2.8.0.tar.gz) = FBXCoamduM921fMfajSQoqnT4T8qv8xn/BCIhc9SzoM=
+SIZE (ghc/darcs-2.8.0.tar.gz) = 1297733
diff --git a/devel/darcs/patches/patch-GNUmakefile b/devel/darcs/patches/patch-GNUmakefile
index d7c8d847fc4..2c50d8b7fc0 100644
--- a/devel/darcs/patches/patch-GNUmakefile
+++ b/devel/darcs/patches/patch-GNUmakefile
@@ -1,15 +1,15 @@
-$OpenBSD: patch-GNUmakefile,v 1.14 2010/05/09 17:00:39 kili Exp $
---- GNUmakefile.orig	Sat May  8 10:47:47 2010
-+++ GNUmakefile	Sat May  8 13:46:37 2010
-@@ -29,12 +29,12 @@ website: ps pdf html doc/manual/bigpage.html
+$OpenBSD: patch-GNUmakefile,v 1.15 2012/05/09 21:00:20 kili Exp $
+--- GNUmakefile.orig	Sun Apr 22 17:14:14 2012
++++ GNUmakefile	Wed Apr 25 23:22:03 2012
+@@ -24,12 +24,12 @@ website: pdf html doc/manual/bigpage.html
  ### TODO use latex2html since bigpage seems to needslatex2html anyway;
  ###      we can restore hevea/tex4ht support when we move this to Setup.lhs
- doc/manual/index.html: doc/manual/darcs.tex src/gpl.tex doc/darcs.css
--	latex2html -split +1 -dir doc/manual doc/manual/darcs.tex
-+	latex2html -noaddress -split +1 -dir doc/manual doc/manual/darcs.tex
+ doc/manual/index.html: doc/manual/darcs.tex doc/src/gpl.tex doc/darcs.css
+-	latex2html -long_titles 2 -split +1 -dir doc/manual doc/manual/darcs.tex
++	latex2html -noaddress -long_titles 2 -split +1 -dir doc/manual doc/manual/darcs.tex
  	cp -f doc/darcs.css doc/manual/darcs.css
  
- doc/manual/bigpage.html: doc/manual/darcs.tex src/gpl.tex doc/darcs.css
+ doc/manual/bigpage.html: doc/manual/darcs.tex doc/src/gpl.tex doc/darcs.css
  	ln -sf darcs.tex doc/manual/bigpage.tex
 -	latex2html -split 0 -external_file darcs -prefix big \
 +	latex2html -noaddress -split 0 -external_file darcs -prefix big \
diff --git a/devel/darcs/patches/patch-darcs_cabal b/devel/darcs/patches/patch-darcs_cabal
deleted file mode 100644
index e8af1964ccf..00000000000
--- a/devel/darcs/patches/patch-darcs_cabal
+++ /dev/null
@@ -1,39 +0,0 @@
-$OpenBSD: patch-darcs_cabal,v 1.1 2011/12/31 22:30:49 kili Exp $
---- darcs.cabal.orig	Sun Mar 13 23:40:47 2011
-+++ darcs.cabal	Wed Dec 28 10:30:55 2011
-@@ -170,7 +170,7 @@ Executable          witnesses
- 
-     build-depends:   base          < 5,
-                      extensible-exceptions >= 0.1 && < 0.2,
--                     regex-compat >= 0.71 && < 0.94,
-+                     regex-compat >= 0.71 && < 0.96,
-                      mtl          >= 1.0 && < 2.1,
-                      parsec       >= 2.0 && < 3.2,
-                      html         == 1.0.*,
-@@ -375,7 +375,7 @@ Library
- 
-     build-depends:   base          < 5,
-                      extensible-exceptions >= 0.1 && < 0.2,
--                     regex-compat >= 0.71 && < 0.94,
-+                     regex-compat >= 0.71 && < 0.96,
-                      mtl          >= 1.0 && < 2.1,
-                      parsec       >= 2.0 && < 3.2,
-                      html         == 1.0.*,
-@@ -523,7 +523,7 @@ Executable          darcs
- 
-   build-depends:   base          < 5,
-                    extensible-exceptions >= 0.1 && < 0.2,
--                   regex-compat >= 0.71 && < 0.94,
-+                   regex-compat >= 0.71 && < 0.96,
-                    mtl          >= 1.0 && < 2.1,
-                    parsec       >= 2.0 && < 3.2,
-                    html         == 1.0.*,
-@@ -619,7 +619,7 @@ Executable          unit
- 
-     build-depends:   base          < 5,
-                      extensible-exceptions >= 0.1 && < 0.2,
--                     regex-compat >= 0.71 && < 0.94,
-+                     regex-compat >= 0.71 && < 0.96,
-                      mtl          >= 1.0 && < 2.1,
-                      parsec       >= 2.0 && < 3.2,
-                      html         == 1.0.*,
diff --git a/devel/darcs/patches/patch-tests_issue1857-pristine-conversion_sh b/devel/darcs/patches/patch-tests_issue1857-pristine-conversion_sh
new file mode 100644
index 00000000000..4322bb5ca57
--- /dev/null
+++ b/devel/darcs/patches/patch-tests_issue1857-pristine-conversion_sh
@@ -0,0 +1,12 @@
+$OpenBSD: patch-tests_issue1857-pristine-conversion_sh,v 1.1 2012/05/09 21:00:20 kili Exp $
+--- tests/issue1857-pristine-conversion.sh.orig	Sun Apr 22 17:14:14 2012
++++ tests/issue1857-pristine-conversion.sh	Wed May  2 14:10:49 2012
+@@ -26,7 +26,7 @@
+ 
+ . lib                           # Load some portability helpers.
+ rm -rf minimal-darcs-2.4
+-tar zx < $TESTDATA/minimal-darcs-2_4.tgz
++tar zxf - < $TESTDATA/minimal-darcs-2_4.tgz
+ 
+ cd minimal-darcs-2.4
+ darcs check
diff --git a/devel/darcs/pkg/PLIST b/devel/darcs/pkg/PLIST
index d5b93ab08d6..2da7c92ee78 100644
--- a/devel/darcs/pkg/PLIST
+++ b/devel/darcs/pkg/PLIST
@@ -1,9 +1,19 @@
-@comment $OpenBSD: PLIST,v 1.13 2010/11/02 20:22:35 kili Exp $
+@comment $OpenBSD: PLIST,v 1.14 2012/05/09 21:00:20 kili Exp $
 @bin bin/darcs
+@comment bin/darcs-test
 @man man/man1/darcs.1
 share/doc/darcs/
 @comment share/doc/${DISTNAME}/
 @comment share/doc/${DISTNAME}/COPYING
+share/doc/darcs/About_this.html
+share/doc/darcs/Best_practices.html
+share/doc/darcs/Building_darcs.html
+share/doc/darcs/Configuring_darcs.html
+share/doc/darcs/Contents.html
+share/doc/darcs/Darcs_commands.html
+share/doc/darcs/Getting_started.html
+share/doc/darcs/Introduction.html
+share/doc/darcs/License.html
 @comment share/doc/darcs/WARNINGS
 share/doc/darcs/darcs.css
 share/doc/darcs/darcs.html
@@ -15,55 +25,8 @@ share/doc/darcs/footnode.html
 @comment share/doc/darcs/images.pl
 @comment share/doc/darcs/images.tex
 share/doc/darcs/img1.png
-share/doc/darcs/img10.png
-share/doc/darcs/img11.png
-share/doc/darcs/img12.png
-share/doc/darcs/img13.png
-share/doc/darcs/img14.png
-share/doc/darcs/img15.png
-share/doc/darcs/img16.png
-share/doc/darcs/img17.png
-share/doc/darcs/img18.png
-share/doc/darcs/img19.png
 share/doc/darcs/img2.png
-share/doc/darcs/img20.png
-share/doc/darcs/img21.png
-share/doc/darcs/img22.png
-share/doc/darcs/img23.png
-share/doc/darcs/img24.png
-share/doc/darcs/img25.png
-share/doc/darcs/img26.png
-share/doc/darcs/img27.png
-share/doc/darcs/img28.png
-share/doc/darcs/img29.png
 share/doc/darcs/img3.png
-share/doc/darcs/img30.png
-share/doc/darcs/img31.png
-share/doc/darcs/img32.png
-share/doc/darcs/img33.png
-share/doc/darcs/img34.png
-share/doc/darcs/img35.png
-share/doc/darcs/img36.png
-share/doc/darcs/img37.png
-share/doc/darcs/img38.png
-share/doc/darcs/img4.png
-share/doc/darcs/img5.png
-share/doc/darcs/img6.png
-share/doc/darcs/img7.png
-share/doc/darcs/img8.png
-share/doc/darcs/img9.png
 share/doc/darcs/index.html
 @comment share/doc/darcs/internals.pl
 @comment share/doc/darcs/labels.pl
-share/doc/darcs/node1.html
-share/doc/darcs/node10.html
-share/doc/darcs/node11.html
-share/doc/darcs/node12.html
-share/doc/darcs/node2.html
-share/doc/darcs/node3.html
-share/doc/darcs/node4.html
-share/doc/darcs/node5.html
-share/doc/darcs/node6.html
-share/doc/darcs/node7.html
-share/doc/darcs/node8.html
-share/doc/darcs/node9.html