Hi, [cc'd jasper because he's the maintainer of hs-enumerator, for which an update is included here, too]
When trying to play with hs-snap-*, I noticed two things:
- It's slightly broken, because a new project created with "snap init"
doesn't work out of the box; it depends on a version of hs-text we
don't have in our tree, which was probably my fault.
- It's outdated.
So I worked on an update to the latest version (0.5.3.1) which now
consists of three ports (hs-snap-core, hs-snap-server and the new
hs-snap project initializer). This also needs some other hs-* ports
to be updated, some new to be added, and some bumps. Diffs for
updates and bumps (relative to /usr/ports) below, new ports attached.
Updated ports:
devel/hs-directory-tree (0.10.0
devel/hs-enumerator (0.4.14)
devel/hs-vector-algorithms (0.4)
textproc/hs-heist (0.5.3)
www/hs-snap-core (0.5.3.1)
www/hs-snap-server (0.5.3.1)
Bumped ports (because the over-agressive inline optimizations of
ghc caused library `signature' changes creeping in through the
updated hs-enumerator):
security/hs-asn1-data
security/hs-certificate
textproc/hs-attoparsec-enumerator
New ports:
devel/hs-blaze-builder-enumerator
devel/hs-case-insensitive
textproc/hs-attoparsec-text
textproc/hs-blaze-html
textproc/hs-xmlhtml
www/hs-snap
Ok? Comments?
Ciao,
Kili
Index: devel/hs-directory-tree/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-directory-tree/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/hs-directory-tree/Makefile 11 Apr 2011 14:45:15 -0000 1.4
+++ devel/hs-directory-tree/Makefile 11 Sep 2011 11:57:31 -0000
@@ -2,8 +2,7 @@
COMMENT = directory-like tree datatype
-DISTNAME = directory-tree-0.2.0
-REVISION = 2
+DISTNAME = directory-tree-0.10.0
CATEGORIES = devel
MAINTAINER = Jim Razmus II <j...@openbsd.org>
Index: devel/hs-directory-tree/distinfo
===================================================================
RCS file: /cvs/ports/devel/hs-directory-tree/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/hs-directory-tree/distinfo 23 Apr 2011 20:22:59 -0000 1.2
+++ devel/hs-directory-tree/distinfo 11 Sep 2011 11:57:31 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/directory-tree-0.2.0.tar.gz) = GXuC6yGJqyB1FEqDRHdeXA==
-RMD160 (ghc/directory-tree-0.2.0.tar.gz) = 3okjVzqv1ex/v2LLn0SBq06J3PA=
-SHA1 (ghc/directory-tree-0.2.0.tar.gz) = AS1Y7zP6n4Rt79qBv6UPrkE3J/U=
-SHA256 (ghc/directory-tree-0.2.0.tar.gz) =
LAUbg7lC4eE+4siHZsBxBjBf30pyvuxWjm1kZ6i01Uc=
-SIZE (ghc/directory-tree-0.2.0.tar.gz) = 5641
+MD5 (ghc/directory-tree-0.10.0.tar.gz) = /PKL17iJEhw787NKXkXIMQ==
+RMD160 (ghc/directory-tree-0.10.0.tar.gz) = kg9RZ4HGAh5ODDy5ECXOFy5ZS8g=
+SHA1 (ghc/directory-tree-0.10.0.tar.gz) = WHn6dvhIj7qzdqvzoo/ExPZPDpg=
+SHA256 (ghc/directory-tree-0.10.0.tar.gz) =
pB7vRz5eTumnbcvHStaFNhJhCdrbn5ivAcz0UmTiYCE=
+SIZE (ghc/directory-tree-0.10.0.tar.gz) = 9461
Index: devel/hs-enumerator/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-enumerator/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/hs-enumerator/Makefile 12 Apr 2011 10:40:12 -0000 1.5
+++ devel/hs-enumerator/Makefile 11 Sep 2011 11:57:31 -0000
@@ -2,7 +2,7 @@
COMMENT= implementation of Oleg Kiselyov's left-fold enumerators
-DISTNAME= enumerator-0.4.9.1
+DISTNAME= enumerator-0.4.14
CATEGORIES= devel
MAINTAINER= Jasper Lievisse Adriaanse <jas...@openbsd.org>
Index: devel/hs-enumerator/distinfo
===================================================================
RCS file: /cvs/ports/devel/hs-enumerator/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/hs-enumerator/distinfo 23 Apr 2011 20:22:59 -0000 1.4
+++ devel/hs-enumerator/distinfo 11 Sep 2011 11:57:31 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/enumerator-0.4.9.1.tar.gz) = KYN2VzQOXEpAit9CwhiPLA==
-RMD160 (ghc/enumerator-0.4.9.1.tar.gz) = aRC4AOgRSMxbbKf1whUev6uXNvs=
-SHA1 (ghc/enumerator-0.4.9.1.tar.gz) = DuLLnpHMkZebSjoaRG4YdSw3OBM=
-SHA256 (ghc/enumerator-0.4.9.1.tar.gz) =
KXHPGii0F4AATMMri4KG/s54IINzCefa2DlUVeRV0OY=
-SIZE (ghc/enumerator-0.4.9.1.tar.gz) = 49861
+MD5 (ghc/enumerator-0.4.14.tar.gz) = ++IQG2FX7OceZlVmZBLLrA==
+RMD160 (ghc/enumerator-0.4.14.tar.gz) = YQZJUst0GyEe2Hh4REfTLRZx0ug=
+SHA1 (ghc/enumerator-0.4.14.tar.gz) = X0x7ww8e5CdPMyuwJdPi1cwgkSU=
+SHA256 (ghc/enumerator-0.4.14.tar.gz) =
LWSG9RzkRP84QHfBb5GtrJodmENJh9hDHFkEb07Oexk=
+SIZE (ghc/enumerator-0.4.14.tar.gz) = 29715
Index: devel/hs-vector-algorithms/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-vector-algorithms/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/hs-vector-algorithms/Makefile 11 Apr 2011 14:45:15 -0000 1.2
+++ devel/hs-vector-algorithms/Makefile 11 Sep 2011 11:57:31 -0000
@@ -2,8 +2,7 @@
COMMENT = Efficient algorithms for vector arrays
-DISTNAME = vector-algorithms-0.3.4
-REVISION = 0
+DISTNAME = vector-algorithms-0.4
CATEGORIES = devel
MAINTAINER = Matthias Kilian <k...@openbsd.org>
Index: devel/hs-vector-algorithms/distinfo
===================================================================
RCS file: /cvs/ports/devel/hs-vector-algorithms/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/hs-vector-algorithms/distinfo 23 Apr 2011 20:23:53 -0000 1.2
+++ devel/hs-vector-algorithms/distinfo 11 Sep 2011 11:57:31 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/vector-algorithms-0.3.4.tar.gz) = FFeAKi4Lq/I5wxtF0J1rQA==
-RMD160 (ghc/vector-algorithms-0.3.4.tar.gz) = S6mN1CasGwyLS2T+kbecfMDpMgo=
-SHA1 (ghc/vector-algorithms-0.3.4.tar.gz) = 4xDeO0samMV/JWWrX9gASTmG3QI=
-SHA256 (ghc/vector-algorithms-0.3.4.tar.gz) =
O94nV/jEC7ZqPgnEhHoKgY8nzp9UqkdBAA5S8H0tYqU=
-SIZE (ghc/vector-algorithms-0.3.4.tar.gz) = 19363
+MD5 (ghc/vector-algorithms-0.4.tar.gz) = PF0KmubVC5Jl2r8dsIGsgA==
+RMD160 (ghc/vector-algorithms-0.4.tar.gz) = 6nRRdssYJZRB14Im34iR2ksymFY=
+SHA1 (ghc/vector-algorithms-0.4.tar.gz) = R2+CtQTX/2AWeShFspFsFaVb2N4=
+SHA256 (ghc/vector-algorithms-0.4.tar.gz) =
CApBDGCOHG+7m4CkyjMMbQyv053Ils8gr4LUN/oSLxI=
+SIZE (ghc/vector-algorithms-0.4.tar.gz) = 19882
Index:
devel/hs-vector-algorithms/patches/patch-Data_Vector_Algorithms_Combinators_hs
===================================================================
RCS file:
devel/hs-vector-algorithms/patches/patch-Data_Vector_Algorithms_Combinators_hs
diff -N
devel/hs-vector-algorithms/patches/patch-Data_Vector_Algorithms_Combinators_hs
---
devel/hs-vector-algorithms/patches/patch-Data_Vector_Algorithms_Combinators_hs
11 Apr 2011 14:45:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-Data_Vector_Algorithms_Combinators_hs,v 1.1 2011/04/11
14:45:15 kili Exp $
-
-Doesn't compile with ghc-7, but vector-algorithm-0.4 (which also
-deletes this function) breaks snap-server, which I can't (yet)
-update because it needs mtl-2.0, which conflicts with mtl-1 bundled
-with ghc. And I really want to avoid different versions of a Haskell
-library.
-
---- Data/Vector/Algorithms/Combinators.hs.orig Sun Sep 26 21:23:23 2010
-+++ Data/Vector/Algorithms/Combinators.hs Sat Apr 9 17:21:14 2011
-@@ -15,7 +15,7 @@
- -- applying the algorithms on mutable arrays to immutable arrays.
-
- module Data.Vector.Algorithms.Combinators
-- ( apply
-+ (
- -- , usingKeys
- -- , usingIxKeys
- ) where
-@@ -30,11 +30,6 @@ import Data.Vector.Generic
-
- import qualified Data.Vector.Generic.Mutable as M
- import qualified Data.Vector.Generic.New as N
--
---- | Safely applies a mutable array algorithm to an immutable array.
--apply :: (Vector v e) => (forall s mv. M.MVector mv e => mv s e -> ST s ())
-> v e -> v e
--apply algo v = (new . N.New)
-- (M.unstream (stream v) >>= \arr -> algo arr >> return arr)
-
- {-
- -- | Uses a function to compute a key for each element which the
Index: devel/hs-vector-algorithms/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/hs-vector-algorithms/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- devel/hs-vector-algorithms/pkg/PLIST 11 Apr 2011 14:45:15 -0000
1.2
+++ devel/hs-vector-algorithms/pkg/PLIST 11 Sep 2011 11:57:31 -0000
@@ -3,7 +3,6 @@ lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/Data/
lib/ghc/${DISTNAME}/Data/Vector/
lib/ghc/${DISTNAME}/Data/Vector/Algorithms/
-lib/ghc/${DISTNAME}/Data/Vector/Algorithms/Combinators.hi
lib/ghc/${DISTNAME}/Data/Vector/Algorithms/Common.hi
lib/ghc/${DISTNAME}/Data/Vector/Algorithms/Insertion.hi
lib/ghc/${DISTNAME}/Data/Vector/Algorithms/Intro.hi
@@ -23,7 +22,6 @@ 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-Vector-Algorithms-Combinators.html
share/doc/hs-${DISTNAME}/html/Data-Vector-Algorithms-Insertion.html
share/doc/hs-${DISTNAME}/html/Data-Vector-Algorithms-Intro.html
share/doc/hs-${DISTNAME}/html/Data-Vector-Algorithms-Merge.html
@@ -37,7 +35,6 @@ share/doc/hs-${DISTNAME}/html/haddock-ut
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
-share/doc/hs-${DISTNAME}/html/mini_Data-Vector-Algorithms-Combinators.html
share/doc/hs-${DISTNAME}/html/mini_Data-Vector-Algorithms-Insertion.html
share/doc/hs-${DISTNAME}/html/mini_Data-Vector-Algorithms-Intro.html
share/doc/hs-${DISTNAME}/html/mini_Data-Vector-Algorithms-Merge.html
Index: textproc/hs-heist/Makefile
===================================================================
RCS file: /cvs/ports/textproc/hs-heist/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- textproc/hs-heist/Makefile 11 Apr 2011 14:54:34 -0000 1.8
+++ textproc/hs-heist/Makefile 11 Sep 2011 11:57:31 -0000
@@ -2,8 +2,7 @@
COMMENT = xhtml templating system
-DISTNAME = heist-0.2.4
-REVISION = 1
+DISTNAME = heist-0.5.3
CATEGORIES = textproc
MAINTAINER = Jim Razmus II <j...@openbsd.org>
@@ -19,11 +18,14 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
RUN_DEPENDS += devel/hs-MonadCatchIO-transformers \
+ devel/hs-blaze-builder \
devel/hs-directory-tree \
- devel/hs-monads-fd \
+ devel/hs-mtl \
+ devel/hs-text \
devel/hs-transformers \
textproc/hs-attoparsec \
- textproc/hs-hexpat
+ textproc/hs-attoparsec-text \
+ textproc/hs-xmlhtml
BUILD_DEPENDS += ${RUN_DEPENDS}
.include <bsd.port.mk>
Index: textproc/hs-heist/distinfo
===================================================================
RCS file: /cvs/ports/textproc/hs-heist/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- textproc/hs-heist/distinfo 23 Apr 2011 20:24:14 -0000 1.3
+++ textproc/hs-heist/distinfo 11 Sep 2011 11:57:31 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/heist-0.2.4.tar.gz) = TdMl4BIFyFgyIHQ2fsFdIA==
-RMD160 (ghc/heist-0.2.4.tar.gz) = BCG1iY20ZgaocYOnt3Gh6nd9NW4=
-SHA1 (ghc/heist-0.2.4.tar.gz) = /LtcVTT30gTUYkapRy2Mo3uemyM=
-SHA256 (ghc/heist-0.2.4.tar.gz) = tXjQPlQbApKnTzLYqqmfaoG/9KkRWrPxq4JPF0WVXYM=
-SIZE (ghc/heist-0.2.4.tar.gz) = 476911
+MD5 (ghc/heist-0.5.3.tar.gz) = F13rqsc61ihAkUB1ij1kDw==
+RMD160 (ghc/heist-0.5.3.tar.gz) = CRAFIZkUHAi132102Qv3iDFOqAg=
+SHA1 (ghc/heist-0.5.3.tar.gz) = tdXruVY//9WUtA05xYPzy2ARYOg=
+SHA256 (ghc/heist-0.5.3.tar.gz) = YeAPSJ3nfVUrl70Nl6YO1QVkGMGCrAaELylIERGBBNc=
+SIZE (ghc/heist-0.5.3.tar.gz) = 34737
Index: textproc/hs-heist/pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/hs-heist/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- textproc/hs-heist/pkg/PLIST 11 Apr 2011 14:54:34 -0000 1.3
+++ textproc/hs-heist/pkg/PLIST 11 Sep 2011 11:57:31 -0000
@@ -5,12 +5,14 @@ lib/ghc/${DISTNAME}/Text/
lib/ghc/${DISTNAME}/Text/Templating/
lib/ghc/${DISTNAME}/Text/Templating/Heist/
lib/ghc/${DISTNAME}/Text/Templating/Heist.hi
-lib/ghc/${DISTNAME}/Text/Templating/Heist/Constants.hi
lib/ghc/${DISTNAME}/Text/Templating/Heist/Internal.hi
lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices/
lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices.hi
lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices/Apply.hi
lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices/Bind.hi
+lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices/BindStrict.hi
+lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices/Cache.hi
+lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices/Html.hi
lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices/Ignore.hi
lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices/Markdown.hi
lib/ghc/${DISTNAME}/Text/Templating/Heist/Splices/Static.hi
@@ -26,6 +28,9 @@ share/doc/hs-${DISTNAME}/LICENSE
share/doc/hs-${DISTNAME}/html/
share/doc/hs-${DISTNAME}/html/Text-Templating-Heist-Splices-Apply.html
share/doc/hs-${DISTNAME}/html/Text-Templating-Heist-Splices-Bind.html
+share/doc/hs-${DISTNAME}/html/Text-Templating-Heist-Splices-BindStrict.html
+share/doc/hs-${DISTNAME}/html/Text-Templating-Heist-Splices-Cache.html
+share/doc/hs-${DISTNAME}/html/Text-Templating-Heist-Splices-Html.html
share/doc/hs-${DISTNAME}/html/Text-Templating-Heist-Splices-Ignore.html
share/doc/hs-${DISTNAME}/html/Text-Templating-Heist-Splices-Markdown.html
share/doc/hs-${DISTNAME}/html/Text-Templating-Heist-Splices-Static.html
@@ -41,6 +46,9 @@ share/doc/hs-${DISTNAME}/html/index-fram
share/doc/hs-${DISTNAME}/html/index.html
share/doc/hs-${DISTNAME}/html/mini_Text-Templating-Heist-Splices-Apply.html
share/doc/hs-${DISTNAME}/html/mini_Text-Templating-Heist-Splices-Bind.html
+share/doc/hs-${DISTNAME}/html/mini_Text-Templating-Heist-Splices-BindStrict.html
+share/doc/hs-${DISTNAME}/html/mini_Text-Templating-Heist-Splices-Cache.html
+share/doc/hs-${DISTNAME}/html/mini_Text-Templating-Heist-Splices-Html.html
share/doc/hs-${DISTNAME}/html/mini_Text-Templating-Heist-Splices-Ignore.html
share/doc/hs-${DISTNAME}/html/mini_Text-Templating-Heist-Splices-Markdown.html
share/doc/hs-${DISTNAME}/html/mini_Text-Templating-Heist-Splices-Static.html
Index: www/hs-snap-core/Makefile
===================================================================
RCS file: /cvs/ports/www/hs-snap-core/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- www/hs-snap-core/Makefile 23 Apr 2011 14:32:51 -0000 1.11
+++ www/hs-snap-core/Makefile 11 Sep 2011 11:57:31 -0000
@@ -2,8 +2,7 @@
COMMENT = Snap Haskell Web Framework
-DISTNAME = snap-core-0.2.16
-REVISION = 4
+DISTNAME = snap-core-0.5.3.1
CATEGORIES = www
HOMEPAGE = http://snapframework.com/
@@ -15,25 +14,24 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-MODULES = converters/libiconv \
- lang/ghc
+MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-WANTLIB += c gmp m pthread util z
-
RUN_DEPENDS += archivers/hs-zlib \
- devel/hs-cereal \
+ devel/hs-blaze-builder \
+ devel/hs-case-insensitive \
devel/hs-directory-tree \
devel/hs-dlist \
- devel/hs-iteratee \
+ devel/hs-enumerator \
devel/hs-MonadCatchIO-transformers \
- devel/hs-monads-fd \
devel/hs-mtl \
- devel/hs-transformers \
devel/hs-text \
+ devel/hs-transformers \
devel/hs-unix-compat \
+ devel/hs-vector \
textproc/hs-attoparsec \
+ textproc/hs-attoparsec-enumerator \
textproc/hs-bytestring-nums \
textproc/hs-bytestring-show
BUILD_DEPENDS += ${RUN_DEPENDS}
Index: www/hs-snap-core/distinfo
===================================================================
RCS file: /cvs/ports/www/hs-snap-core/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/hs-snap-core/distinfo 23 Apr 2011 20:24:27 -0000 1.4
+++ www/hs-snap-core/distinfo 11 Sep 2011 11:57:31 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/snap-core-0.2.16.tar.gz) = szAYBhO5c9zRGMqJfDuVOQ==
-RMD160 (ghc/snap-core-0.2.16.tar.gz) = dWepiDAj8116e220Y0PFiIJjYN4=
-SHA1 (ghc/snap-core-0.2.16.tar.gz) = +6FbHuZecW188KzeDLUUs/I1e48=
-SHA256 (ghc/snap-core-0.2.16.tar.gz) =
Hg4Z5sa0550+Re6Rb0m96sgi26qYiK6bTH6fobjqn/M=
-SIZE (ghc/snap-core-0.2.16.tar.gz) = 495947
+MD5 (ghc/snap-core-0.5.3.1.tar.gz) = s3bxjr9IIeHqpcmTf2Wc9A==
+RMD160 (ghc/snap-core-0.5.3.1.tar.gz) = O+yZ+SCU/A/syUPXtRoKN1xsxkk=
+SHA1 (ghc/snap-core-0.5.3.1.tar.gz) = bnQ2LgoIR5Cil8od8hWcR97waGE=
+SHA256 (ghc/snap-core-0.5.3.1.tar.gz) =
1VB+gVpmfa8VrcCpaxARPAP8icP46Gmhx4xEGKZilGM=
+SIZE (ghc/snap-core-0.5.3.1.tar.gz) = 74437
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
--- www/hs-snap-core/patches/patch-snap-core_cabal 5 Apr 2011 11:42:42
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-snap-core_cabal,v 1.1 2011/04/05 11:42:42 kili Exp $
---- 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-core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/hs-snap-core/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- www/hs-snap-core/pkg/PLIST 11 Apr 2011 14:55:41 -0000 1.5
+++ www/hs-snap-core/pkg/PLIST 11 Sep 2011 11:57:31 -0000
@@ -1,15 +1,14 @@
@comment $OpenBSD: PLIST,v 1.5 2011/04/11 14:55:41 kili Exp $
-@bin bin/snap
lib/ghc/${DISTNAME}/
-lib/ghc/${DISTNAME}/Data/
-lib/ghc/${DISTNAME}/Data/CIByteString.hi
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
lib/ghc/${DISTNAME}/Snap/
lib/ghc/${DISTNAME}/Snap/Internal/
lib/ghc/${DISTNAME}/Snap/Internal/Debug.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/
lib/ghc/${DISTNAME}/Snap/Internal/Http/Types.hi
+lib/ghc/${DISTNAME}/Snap/Internal/Instances.hi
lib/ghc/${DISTNAME}/Snap/Internal/Iteratee/
+lib/ghc/${DISTNAME}/Snap/Internal/Iteratee/BoyerMooreHorspool.hi
lib/ghc/${DISTNAME}/Snap/Internal/Iteratee/Debug.hi
lib/ghc/${DISTNAME}/Snap/Internal/Parsing.hi
lib/ghc/${DISTNAME}/Snap/Internal/Routing.hi
@@ -18,7 +17,9 @@ lib/ghc/${DISTNAME}/Snap/Iteratee.hi
lib/ghc/${DISTNAME}/Snap/Types.hi
lib/ghc/${DISTNAME}/Snap/Util/
lib/ghc/${DISTNAME}/Snap/Util/FileServe.hi
+lib/ghc/${DISTNAME}/Snap/Util/FileUploads.hi
lib/ghc/${DISTNAME}/Snap/Util/GZip.hi
+lib/ghc/${DISTNAME}/Snap/Util/Readable.hi
lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
lib/ghc/${DISTNAME}/register.sh
@exec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/register.sh -v0
@@ -27,16 +28,20 @@ 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-CIByteString.html
share/doc/hs-${DISTNAME}/html/Snap-Internal-Debug.html
share/doc/hs-${DISTNAME}/html/Snap-Internal-Http-Types.html
share/doc/hs-${DISTNAME}/html/Snap-Internal-Iteratee-Debug.html
+share/doc/hs-${DISTNAME}/html/Snap-Internal-Parsing.html
share/doc/hs-${DISTNAME}/html/Snap-Iteratee.html
share/doc/hs-${DISTNAME}/html/Snap-Types.html
share/doc/hs-${DISTNAME}/html/Snap-Util-FileServe.html
+share/doc/hs-${DISTNAME}/html/Snap-Util-FileUploads.html
share/doc/hs-${DISTNAME}/html/Snap-Util-GZip.html
+share/doc/hs-${DISTNAME}/html/Snap-Util-Readable.html
+share/doc/hs-${DISTNAME}/html/doc-index-36.html
+share/doc/hs-${DISTNAME}/html/doc-index-60.html
+share/doc/hs-${DISTNAME}/html/doc-index-61.html
share/doc/hs-${DISTNAME}/html/doc-index-62.html
-share/doc/hs-${DISTNAME}/html/doc-index-95.html
share/doc/hs-${DISTNAME}/html/doc-index-A.html
share/doc/hs-${DISTNAME}/html/doc-index-All.html
share/doc/hs-${DISTNAME}/html/doc-index-B.html
@@ -48,6 +53,7 @@ share/doc/hs-${DISTNAME}/html/doc-index-
share/doc/hs-${DISTNAME}/html/doc-index-H.html
share/doc/hs-${DISTNAME}/html/doc-index-I.html
share/doc/hs-${DISTNAME}/html/doc-index-J.html
+share/doc/hs-${DISTNAME}/html/doc-index-K.html
share/doc/hs-${DISTNAME}/html/doc-index-L.html
share/doc/hs-${DISTNAME}/html/doc-index-M.html
share/doc/hs-${DISTNAME}/html/doc-index-N.html
@@ -58,20 +64,23 @@ share/doc/hs-${DISTNAME}/html/doc-index-
share/doc/hs-${DISTNAME}/html/doc-index-T.html
share/doc/hs-${DISTNAME}/html/doc-index-U.html
share/doc/hs-${DISTNAME}/html/doc-index-W.html
+share/doc/hs-${DISTNAME}/html/doc-index-Y.html
share/doc/hs-${DISTNAME}/html/doc-index.html
share/doc/hs-${DISTNAME}/html/frames.html
share/doc/hs-${DISTNAME}/html/haddock-util.js
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
-share/doc/hs-${DISTNAME}/html/mini_Data-CIByteString.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Internal-Debug.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Internal-Http-Types.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Internal-Iteratee-Debug.html
+share/doc/hs-${DISTNAME}/html/mini_Snap-Internal-Parsing.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Iteratee.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Types.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Util-FileServe.html
+share/doc/hs-${DISTNAME}/html/mini_Snap-Util-FileUploads.html
share/doc/hs-${DISTNAME}/html/mini_Snap-Util-GZip.html
+share/doc/hs-${DISTNAME}/html/mini_Snap-Util-Readable.html
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
share/doc/hs-${DISTNAME}/html/plus.gif
Index: www/hs-snap-server/Makefile
===================================================================
RCS file: /cvs/ports/www/hs-snap-server/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- www/hs-snap-server/Makefile 23 Apr 2011 14:32:51 -0000 1.9
+++ www/hs-snap-server/Makefile 11 Sep 2011 11:57:31 -0000
@@ -2,8 +2,7 @@
COMMENT = Snap Haskell Web Framework Server
-DISTNAME = snap-server-0.2.16.2
-REVISION = 2
+DISTNAME = snap-server-0.5.3.1
CATEGORIES = www
HOMEPAGE = http://snapframework.com/
@@ -20,12 +19,13 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
RUN_DEPENDS += devel/hs-binary \
- devel/hs-cereal \
+ devel/hs-blaze-builder \
+ devel/hs-blaze-builder-enumerator \
+ devel/hs-case-insensitive \
devel/hs-directory-tree \
- devel/hs-dlist \
- devel/hs-iteratee \
+ devel/hs-enumerator \
+ devel/hs-MonadCatchIO-transformers \
devel/hs-murmur-hash \
- devel/hs-monads-fd \
devel/hs-mtl \
devel/hs-network \
devel/hs-PSQueue \
@@ -35,9 +35,8 @@ RUN_DEPENDS += devel/hs-binary \
devel/hs-unix-compat \
devel/hs-vector \
devel/hs-vector-algorithms \
- textproc/hs-attoparsec-iteratee \
+ textproc/hs-attoparsec-enumerator \
textproc/hs-bytestring-nums \
- textproc/hs-bytestring-show \
www/hs-snap-core
BUILD_DEPENDS += ${RUN_DEPENDS}
Index: www/hs-snap-server/distinfo
===================================================================
RCS file: /cvs/ports/www/hs-snap-server/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/hs-snap-server/distinfo 23 Apr 2011 20:24:27 -0000 1.4
+++ www/hs-snap-server/distinfo 11 Sep 2011 11:57:31 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/snap-server-0.2.16.2.tar.gz) = BXSe8VWoxD6pSjUvW58y6w==
-RMD160 (ghc/snap-server-0.2.16.2.tar.gz) = FXsj44715S8NVBmWakQ/bhCju0Y=
-SHA1 (ghc/snap-server-0.2.16.2.tar.gz) = oCvtKIHKYBxokYnx6OGt7mRUS24=
-SHA256 (ghc/snap-server-0.2.16.2.tar.gz) =
8OFirqaGeK5jegJbgOhonTS5eFwGcsgqa5hDmAPrz74=
-SIZE (ghc/snap-server-0.2.16.2.tar.gz) = 493374
+MD5 (ghc/snap-server-0.5.3.1.tar.gz) = ktnWhgmZbKNAbcjquDxfBg==
+RMD160 (ghc/snap-server-0.5.3.1.tar.gz) = B2BGl1Tr7w3/lq1Wz9eRwQOZslA=
+SHA1 (ghc/snap-server-0.5.3.1.tar.gz) = bCc2uex0Roqz4psrKdsLPjC3a5o=
+SHA256 (ghc/snap-server-0.5.3.1.tar.gz) =
f/enljmakugAp6i0rtf49sJku6vK1/meEvfmZx+dbmU=
+SIZE (ghc/snap-server-0.5.3.1.tar.gz) = 57358
Index: www/hs-snap-server/patches/patch-snap-server_cabal
===================================================================
RCS file: www/hs-snap-server/patches/patch-snap-server_cabal
diff -N www/hs-snap-server/patches/patch-snap-server_cabal
--- www/hs-snap-server/patches/patch-snap-server_cabal 11 Apr 2011 14:55:58
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-snap-server_cabal,v 1.1 2011/04/11 14:55:58 kili Exp $
-
-Build with newer network package; network-bytestring has been
-integrated into network.
-
---- snap-server.cabal.orig Wed Nov 10 22:09:47 2010
-+++ snap-server.cabal Sat Apr 9 17:31:06 2011
-@@ -121,7 +121,7 @@ Library
- iteratee >= 0.3.1 && <0.4,
- monads-fd < 0.1.0.3,
- murmur-hash >= 0.1 && < 0.2,
-- network == 2.2.1.*,
-+ network >= 2.2.1 && < 2.4,
- old-locale,
- snap-core == 0.2.16.*,
- template-haskell,
-@@ -142,8 +142,7 @@ Library
- cpp-options: -DLIBEV
- else
- other-modules: Snap.Internal.Http.Server.TimeoutTable
-- build-depends: network-bytestring >= 0.1.2 && < 0.2,
-- PSQueue >= 1.1 && <1.2
-+ build-depends: PSQueue >= 1.1 && <1.2
-
- other-modules: Snap.Internal.Http.Server.SimpleBackend
-
Index: www/hs-snap-server/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/hs-snap-server/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- www/hs-snap-server/pkg/PLIST 11 Apr 2011 14:55:58 -0000 1.4
+++ www/hs-snap-server/pkg/PLIST 11 Sep 2011 11:57:31 -0000
@@ -17,9 +17,14 @@ lib/ghc/${DISTNAME}/Snap/Internal/Http/
lib/ghc/${DISTNAME}/Snap/Internal/Http/Parser.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server.hi
+lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/Backend.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/Date.hi
+lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/HttpPort.hi
+lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/LibevBackend.hi
+lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/ListenHelpers.hi
lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/SimpleBackend.hi
-lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/TimeoutTable.hi
+lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/TLS.hi
+lib/ghc/${DISTNAME}/Snap/Internal/Http/Server/TimeoutManager.hi
lib/ghc/${DISTNAME}/System/
lib/ghc/${DISTNAME}/System/FastLogger.hi
lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
Index: security/hs-asn1-data/Makefile
===================================================================
RCS file: /cvs/ports/security/hs-asn1-data/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- security/hs-asn1-data/Makefile 19 Apr 2011 19:45:40 -0000 1.4
+++ security/hs-asn1-data/Makefile 11 Sep 2011 11:57:47 -0000
@@ -3,7 +3,7 @@
COMMENT= ASN1 data reader and writer for various forms
DISTNAME= asn1-data-0.4.6
-REVISION= 0
+REVISION= 1
CATEGORIES= security converters
MAINTAINER= Jasper Lievisse Adriaanse <jas...@openbsd.org>
Index: security/hs-certificate/Makefile
===================================================================
RCS file: /cvs/ports/security/hs-certificate/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- security/hs-certificate/Makefile 23 Apr 2011 14:32:51 -0000 1.4
+++ security/hs-certificate/Makefile 11 Sep 2011 11:57:47 -0000
@@ -3,7 +3,7 @@
COMMENT= certificates and Key Reader/Writer
DISTNAME= certificate-0.7.0
-REVISION = 0
+REVISION = 1
CATEGORIES= security
MAINTAINER= Jasper Lievisse Adriaanse <jas...@openbsd.org>
Index: textproc/hs-attoparsec-enumerator/Makefile
===================================================================
RCS file: /cvs/ports/textproc/hs-attoparsec-enumerator/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- textproc/hs-attoparsec-enumerator/Makefile 11 Apr 2011 14:54:34 -0000
1.3
+++ textproc/hs-attoparsec-enumerator/Makefile 11 Sep 2011 11:57:47 -0000
@@ -3,7 +3,7 @@
COMMENT= convert an Attoparsec parser into an iteratee
DISTNAME= attoparsec-enumerator-0.2.0.3
-REVISION= 1
+REVISION= 2
CATEGORIES= textproc
MAINTAINER= Jasper Lievisse Adriaanse <jas...@openbsd.org>
hs-attoparsec-text.tgz
Description: application/tar-gz
hs-blaze-builder-enumerator.tgz
Description: application/tar-gz
hs-blaze-html.tgz
Description: application/tar-gz
hs-case-insensitive.tgz
Description: application/tar-gz
hs-snap.tgz
Description: application/tar-gz
hs-xmlhtml.tgz
Description: application/tar-gz
