Hi,
The diff below (relative to /usr/ports) updates devel/hs-text to
0.11.0.6, which is needed for a darcs update, which is needed for
updating ghc.
It also bumps the ports depending on devel/hs-text and patches the
cabal file of www/hs-snap-core to accept the newer hs-text.
Everything still compiles, for hs-snap-core at least a dummy `hello
world' project (created with just `snap init') at least seems to
work.
I'd like to commit this very soon to proceed with the ghc update
(in case I don't see any mind-boggling regressions in ghc itself,
like the famous POM problem we had during the last update).
Any objections? oks?
Ciao,
Kili
Index: devel/hs-blaze-builder/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-blaze-builder/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/hs-blaze-builder/Makefile 19 Dec 2010 17:43:30 -0000 1.3
+++ devel/hs-blaze-builder/Makefile 4 Apr 2011 12:41:38 -0000
@@ -3,6 +3,7 @@
COMMENT= efficient construction of bytestrings
DISTNAME= blaze-builder-0.2.1.3
+REVISION= 0
CATEGORIES= devel
MAINTAINER= Jasper Lievisse Adriaanse <jas...@openbsd.org>
Index: devel/hs-enumerator/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-enumerator/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/hs-enumerator/Makefile 13 Dec 2010 19:50:38 -0000 1.2
+++ devel/hs-enumerator/Makefile 4 Apr 2011 12:41:38 -0000
@@ -3,6 +3,7 @@
COMMENT= implementation of Oleg Kiselyov's left-fold enumerators
DISTNAME= enumerator-0.4.4
+REVISION= 0
CATEGORIES= devel
MAINTAINER= Jasper Lievisse Adriaanse <jas...@openbsd.org>
Index: devel/hs-text/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-text/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- devel/hs-text/Makefile 12 Dec 2010 16:24:03 -0000 1.6
+++ devel/hs-text/Makefile 4 Apr 2011 12:41:38 -0000
@@ -2,7 +2,7 @@
COMMENT = efficient packed Unicode text type
-DISTNAME = text-0.10.0.2
+DISTNAME = text-0.11.0.6
CATEGORIES = devel
MAINTAINER = Matthias Kilian <k...@openbsd.org>
Index: devel/hs-text/distinfo
===================================================================
RCS file: /cvs/ports/devel/hs-text/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/hs-text/distinfo 12 Dec 2010 16:24:03 -0000 1.2
+++ devel/hs-text/distinfo 4 Apr 2011 12:41:38 -0000
@@ -1,5 +1,5 @@
-MD5 (text-0.10.0.2.tar.gz) = Ygp1R4z/cc5/jxebOSH69A==
-RMD160 (text-0.10.0.2.tar.gz) = yyrUirRxG7upXd+5S54xvWrriF4=
-SHA1 (text-0.10.0.2.tar.gz) = w45lM5TjAs202bLZlwqZ1B6U8qY=
-SHA256 (text-0.10.0.2.tar.gz) = fBh0HT6qhGSHhzhVCk8/8dWlK3ZU8eUpgLsStsn0WuY=
-SIZE (text-0.10.0.2.tar.gz) = 102920
+MD5 (text-0.11.0.6.tar.gz) = mvyUkKj4mKghfhwAhqy3mA==
+RMD160 (text-0.11.0.6.tar.gz) = oNxF28ACtJR9dcqZCK3PjImq3oM=
+SHA1 (text-0.11.0.6.tar.gz) = 5k+54rBvv4R4bWCer3j5C2vIMoY=
+SHA256 (text-0.11.0.6.tar.gz) = d+4P9MnbiZ0vlg93+0NXyKudEMQySf6xbu1yJxELdIA=
+SIZE (text-0.11.0.6.tar.gz) = 106830
Index: devel/hs-text/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/hs-text/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/hs-text/pkg/PLIST 12 Dec 2010 16:24:03 -0000 1.3
+++ devel/hs-text/pkg/PLIST 4 Apr 2011 12:41:38 -0000
@@ -50,13 +50,16 @@ lib/ghc/${DISTNAME}/unregister.sh
share/doc/hs-${DISTNAME}/
share/doc/hs-${DISTNAME}/LICENSE
share/doc/hs-${DISTNAME}/html/
+share/doc/hs-${DISTNAME}/html/Data-Text-Array.html
share/doc/hs-${DISTNAME}/html/Data-Text-Encoding-Error.html
share/doc/hs-${DISTNAME}/html/Data-Text-Encoding.html
share/doc/hs-${DISTNAME}/html/Data-Text-Foreign.html
share/doc/hs-${DISTNAME}/html/Data-Text-IO.html
+share/doc/hs-${DISTNAME}/html/Data-Text-Internal.html
share/doc/hs-${DISTNAME}/html/Data-Text-Lazy-Builder.html
share/doc/hs-${DISTNAME}/html/Data-Text-Lazy-Encoding.html
share/doc/hs-${DISTNAME}/html/Data-Text-Lazy-IO.html
+share/doc/hs-${DISTNAME}/html/Data-Text-Lazy-Internal.html
share/doc/hs-${DISTNAME}/html/Data-Text-Lazy-Read.html
share/doc/hs-${DISTNAME}/html/Data-Text-Lazy.html
share/doc/hs-${DISTNAME}/html/Data-Text-Read.html
@@ -89,13 +92,16 @@ share/doc/hs-${DISTNAME}/html/haddock.cs
share/doc/hs-${DISTNAME}/html/haskell_icon.gif
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
+share/doc/hs-${DISTNAME}/html/mini_Data-Text-Array.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Encoding-Error.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Encoding.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Foreign.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-IO.html
+share/doc/hs-${DISTNAME}/html/mini_Data-Text-Internal.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Lazy-Builder.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Lazy-Encoding.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Lazy-IO.html
+share/doc/hs-${DISTNAME}/html/mini_Data-Text-Lazy-Internal.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Lazy-Read.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Lazy.html
share/doc/hs-${DISTNAME}/html/mini_Data-Text-Read.html
Index: textproc/hs-attoparsec-enumerator/Makefile
===================================================================
RCS file: /cvs/ports/textproc/hs-attoparsec-enumerator/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- textproc/hs-attoparsec-enumerator/Makefile 8 Dec 2010 16:22:56 -0000
1.1.1.1
+++ textproc/hs-attoparsec-enumerator/Makefile 4 Apr 2011 12:41:38 -0000
@@ -3,6 +3,7 @@
COMMENT= convert an Attoparsec parser into an iteratee
DISTNAME= attoparsec-enumerator-0.2.0.3
+REVISION= 0
CATEGORIES= textproc
MAINTAINER= Jasper Lievisse Adriaanse <jas...@openbsd.org>
Index: textproc/hs-heist/Makefile
===================================================================
RCS file: /cvs/ports/textproc/hs-heist/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- textproc/hs-heist/Makefile 12 Dec 2010 16:29:51 -0000 1.6
+++ textproc/hs-heist/Makefile 4 Apr 2011 12:41:38 -0000
@@ -3,6 +3,7 @@
COMMENT = xhtml templating system
DISTNAME = heist-0.2.4
+REVISION = 0
CATEGORIES = textproc
MAINTAINER = Jim Razmus II <j...@openbsd.org>
Index: textproc/hs-hexpat/Makefile
===================================================================
RCS file: /cvs/ports/textproc/hs-hexpat/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- textproc/hs-hexpat/Makefile 12 Dec 2010 16:30:16 -0000 1.6
+++ textproc/hs-hexpat/Makefile 4 Apr 2011 12:41:38 -0000
@@ -3,6 +3,7 @@
COMMENT = XML parser/formatter based on expat
DISTNAME = hexpat-0.19.5
+REVISION = 0
CATEGORIES = textproc
MAINTAINER = Jim Razmus II <j...@openbsd.org>
Index: www/hs-snap-core/Makefile
===================================================================
RCS file: /cvs/ports/www/hs-snap-core/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- www/hs-snap-core/Makefile 22 Dec 2010 23:59:49 -0000 1.8
+++ www/hs-snap-core/Makefile 4 Apr 2011 12:41:38 -0000
@@ -3,7 +3,7 @@
COMMENT = Snap Haskell Web Framework
DISTNAME = snap-core-0.2.16
-REVISION = 1
+REVISION = 2
CATEGORIES = www
HOMEPAGE = http://snapframework.com/
Index: www/hs-snap-core/patches/patch-snap-core_cabal
===================================================================
RCS file: www/hs-snap-core/patches/patch-snap-core_cabal
diff -N www/hs-snap-core/patches/patch-snap-core_cabal
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/hs-snap-core/patches/patch-snap-core_cabal 4 Apr 2011 12:41:38
-0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- snap-core.cabal.orig Wed Nov 10 21:11:04 2010
++++ snap-core.cabal Mon Apr 4 14:02:25 2011
+@@ -162,7 +162,7 @@ Library
+ monads-fd < 0.1.0.3,
+ old-locale,
+ old-time,
+- text >= 0.10 && <0.11,
++ text >= 0.10 && <0.12,
+ time,
+ transformers,
+ unix-compat,
+@@ -205,7 +205,7 @@ Executable snap
+ old-locale,
+ old-time,
+ template-haskell,
+- text >= 0.10 && <0.11,
++ text >= 0.10 && <0.12,
+ time,
+ transformers,
+ unix-compat,
Index: www/hs-snap-server/Makefile
===================================================================
RCS file: /cvs/ports/www/hs-snap-server/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/hs-snap-server/Makefile 12 Dec 2010 16:32:59 -0000 1.6
+++ www/hs-snap-server/Makefile 4 Apr 2011 12:41:38 -0000
@@ -3,6 +3,7 @@
COMMENT = Snap Haskell Web Framework Server
DISTNAME = snap-server-0.2.16.2
+REVISION = 0
CATEGORIES = www
HOMEPAGE = http://snapframework.com/
Index: www/hs-xhtml-combinators/Makefile
===================================================================
RCS file: /cvs/ports/www/hs-xhtml-combinators/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- www/hs-xhtml-combinators/Makefile 22 Nov 2010 08:36:49 -0000 1.5
+++ www/hs-xhtml-combinators/Makefile 4 Apr 2011 12:41:38 -0000
@@ -3,7 +3,7 @@
COMMENT = fast and easy to use XHTML 1.0 Strict combinators
DISTNAME = xhtml-combinators-0.2.2
-REVISION = 2
+REVISION = 3
CATEGORIES = www
MAINTAINER = Jim Razmus II <j...@openbsd.org>
