diff options
Diffstat (limited to 'www/hs-snap-server')
| -rw-r--r-- | www/hs-snap-server/Makefile | 22 | ||||
| -rw-r--r-- | www/hs-snap-server/distinfo | 4 | ||||
| -rw-r--r-- | www/hs-snap-server/files/patch-snap-server.cabal | 20 |
3 files changed, 13 insertions, 33 deletions
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile index a20ec653b15c..9d2b585ecfcf 100644 --- a/www/hs-snap-server/Makefile +++ b/www/hs-snap-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME= snap-server -PORTVERSION= 0.5.2 +PORTVERSION= 0.7.0.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -15,16 +15,16 @@ COMMENT= A fast, iteratee-based, epoll-enabled web server for the Snap Framework LICENSE= BSD CABAL_SETUP= Setup.hs -USE_CABAL= attoparsec>=0.8.1 attoparsec-enumerator>=0.2.0.1 binary>=0.5 \ +USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 binary>=0.5 \ blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2 \ - bytestring-nums case-insensitive>=0.2 directory-tree \ + bytestring-nums case-insensitive>=0.3 directory-tree>=0.10 \ enumerator>=0.4.13.1 MonadCatchIO-transformers>=0.2.1 mtl>=2 \ - murmur-hash>=0.1 network>=2.3 PSQueue>=1.1 snap-core>=0.5.2 \ - text>=0.11 transformers unix-compat>=0.2 utf8-string \ - vector>=0.7 vector-algorithms>=0.4 + murmur-hash>=0.1 network>=2.3 PSQueue>=1.1 snap-core>=0.7 \ + text>=0.11 transformers>=0.2 unix-compat>=0.2 vector>=0.7 \ + vector-algorithms>=0.4 OPTIONS= LIBEV "Use libev" off \ - GNUTLS "Enable https support using the libgnutls library" off + OPENSSL "Enable HTTPS support using the HsOpenSSL library" off .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .include <bsd.port.options.mk> @@ -36,11 +36,11 @@ USE_CABAL+= hlibev CONFIGURE_ARGS+= --flags="-libev" .endif -.if defined(WITH_GNUTLS) -CONFIGURE_ARGS+= --flags="gnutls" -LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls +.if defined(WITH_OPENSSL) +CONFIGURE_ARGS+= --flags="openssl" +USE_CABAL+= HsOpenSSL .else -CONFIGURE_ARGS+= --flags="-gnutls" +CONFIGURE_ARGS+= --flags="-openssl" .endif .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo index e7ba0d892bd0..0016bbaeea6b 100644 --- a/www/hs-snap-server/distinfo +++ b/www/hs-snap-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/snap-server-0.5.2.tar.gz) = 2e06bfdf6d0d19f18f4f0666feb691c003ee1faa52cb72a73e055728571ab142 -SIZE (cabal/snap-server-0.5.2.tar.gz) = 59328 +SHA256 (cabal/snap-server-0.7.0.1.tar.gz) = e398abb4579512bef4d064622b6f7421aae88f07028402984ebc5956537b3291 +SIZE (cabal/snap-server-0.7.0.1.tar.gz) = 60559 diff --git a/www/hs-snap-server/files/patch-snap-server.cabal b/www/hs-snap-server/files/patch-snap-server.cabal deleted file mode 100644 index a88d07a1c6cb..000000000000 --- a/www/hs-snap-server/files/patch-snap-server.cabal +++ /dev/null @@ -1,20 +0,0 @@ ---- ./snap-server.cabal.orig 2011-07-20 22:05:26.000000000 +0200 -+++ ./snap-server.cabal 2011-08-13 10:58:29.000000000 +0200 -@@ -108,7 +108,7 @@ - blaze-builder-enumerator >= 0.2.0 && <0.3, - bytestring, - bytestring-nums, -- case-insensitive >= 0.2 && < 0.3, -+ case-insensitive >= 0.2, - containers, - directory-tree, - enumerator >= 0.4.13.1 && <0.5, -@@ -125,7 +125,7 @@ - transformers, - unix-compat == 0.2.*, - vector >= 0.7 && <0.8, -- vector-algorithms >= 0.4 && <0.5, -+ vector-algorithms >= 0.4, - PSQueue >= 1.1 && <1.2 - - if flag(portable) || os(windows) |