* Upgrade to 0.9.15.

* Use lang/ghc6 instead of lang/ghc by default.

6 files changed, 74 insertions, 6 deletions

diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index e77245372a25..3d815b6c4a8d 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	darcs
-PORTVERSION=	0.9.13
+PORTVERSION=	0.9.15
 CATEGORIES=	devel
 MASTER_SITES=	http://www.abridgegame.org/darcs/
 
 MAINTAINER=	obraun@FreeBSD.org
 COMMENT=	Yet another replacement for CVS, written in Haskell
 
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc6
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USE_REINPLACE=	yes
diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo
index cac083097f6d..07f5e445e891 100644
--- a/devel/darcs/distinfo
+++ b/devel/darcs/distinfo
@@ -1 +1 @@
-MD5 (darcs-0.9.13.tar.gz) = a133c103c0e9bcc6e1c6dcee50d12f9a
+MD5 (darcs-0.9.15.tar.gz) = baf34dc8f29557a6b3f1090891d9bbb2
diff --git a/devel/darcs/pkg-plist b/devel/darcs/pkg-plist
index 29639fa80261..0078ba14ca8a 100644
--- a/devel/darcs/pkg-plist
+++ b/devel/darcs/pkg-plist
@@ -1,11 +1,43 @@
 bin/darcs
+bin/convert-repo
 %%SERVER%%%%CGIDIR%%/darcs
 %%SERVER%%sbin/darcs-createrepo
 %%SERVER%%etc/darcs/cgi.conf.sample
 etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
 %%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimages.aux
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimages.log
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimages.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimages.tex
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg1.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg10.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg11.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg12.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg13.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg14.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg15.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg16.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg17.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg18.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg19.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg2.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg20.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg21.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg22.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg3.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg4.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg5.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg6.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg7.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg8.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg9.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/biginternals.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/biglabels.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigpage.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigpage.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/contents.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/crossref.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/footnode.html
@@ -42,6 +74,7 @@ etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/next_g.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node11.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node2.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node3.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node4.html
@@ -50,6 +83,7 @@ etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/node7.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node8.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/nx_grp_g.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/prev.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/up.png
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index e77245372a25..3d815b6c4a8d 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	darcs
-PORTVERSION=	0.9.13
+PORTVERSION=	0.9.15
 CATEGORIES=	devel
 MASTER_SITES=	http://www.abridgegame.org/darcs/
 
 MAINTAINER=	obraun@FreeBSD.org
 COMMENT=	Yet another replacement for CVS, written in Haskell
 
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc6
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 USE_REINPLACE=	yes
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index cac083097f6d..07f5e445e891 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1 +1 @@
-MD5 (darcs-0.9.13.tar.gz) = a133c103c0e9bcc6e1c6dcee50d12f9a
+MD5 (darcs-0.9.15.tar.gz) = baf34dc8f29557a6b3f1090891d9bbb2
diff --git a/devel/hs-darcs/pkg-plist b/devel/hs-darcs/pkg-plist
index 29639fa80261..0078ba14ca8a 100644
--- a/devel/hs-darcs/pkg-plist
+++ b/devel/hs-darcs/pkg-plist
@@ -1,11 +1,43 @@
 bin/darcs
+bin/convert-repo
 %%SERVER%%%%CGIDIR%%/darcs
 %%SERVER%%sbin/darcs-createrepo
 %%SERVER%%etc/darcs/cgi.conf.sample
 etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_new
 %%PORTDOCS%%%%DOCSDIR%%/examples/zsh_completion_old
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimages.aux
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimages.log
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimages.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimages.tex
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg1.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg10.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg11.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg12.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg13.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg14.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg15.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg16.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg17.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg18.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg19.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg2.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg20.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg21.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg22.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg3.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg4.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg5.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg6.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg7.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg8.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigimg9.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/biginternals.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/biglabels.pl
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigpage.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/bigpage.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/contents.png
+%%PORTDOCS%%%%DOCSDIR%%/manual/crossref.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/footnode.html
@@ -42,6 +74,7 @@ etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/next_g.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/node11.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node2.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node3.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node4.html
@@ -50,6 +83,7 @@ etc/darcs/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/node7.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node8.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/nx_grp_g.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/prev.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/prev_g.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/up.png