- Update to 1.0.5

- Use the new options framework

Obtained from:	FreeBSD Haskell

3 files changed, 60 insertions, 58 deletions

diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile
index c1888a4573d1..703d389a92ee 100644
--- a/www/hs-yesod-platform/Makefile
+++ b/www/hs-yesod-platform/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yesod-platform
-PORTVERSION=	1.0.4.2
+PORTVERSION=	1.0.5
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -14,50 +14,50 @@ COMMENT=	Meta package for Yesod
 
 LICENSE=	MIT
 
-USE_CABAL=	aeson==0.6.0.2 ansi-terminal==0.5.5_3 asn1-data==0.6.1.3 \
-		attoparsec==0.10.2.0 attoparsec-conduit==0.4.0.1 \
-		attoparsec-enumerator==0.3_1 authenticate==1.2.1.1 \
-		base-unicode-symbols==0.2.2.3_1 base64-bytestring==0.1.1.1 \
-		blaze-builder==0.3.1.0_1 blaze-builder-conduit==0.4.0.2 \
-		blaze-html==0.4.3.4 blaze-markup==0.5.1.0 byteorder==1.0.3_1 \
-		case-insensitive==0.4.0.1_1 cereal==0.3.5.1_1 certificate==1.2.3 \
-		clientsession==0.7.5 conduit==0.4.2 cookie==0.4.0 \
-		cprng-aes==0.2.3_1 cpu==0.1.0 crypto-api==0.10.2 \
-		crypto-conduit==0.3.2 crypto-pubkey-types==0.1.1 \
-		cryptocipher==0.3.4 cryptohash==0.7.5 css-text==0.1.1_1 \
-		data-default==0.4.0 dlist==0.5_5 email-validate==0.2.8 \
-		entropy==0.2.1_1 enumerator==0.4.19 failure==0.2.0.1 \
-		fast-logger==0.0.2_1 file-embed==0.0.4.4 filesystem-conduit==0.4.0 \
-		hamlet==1.0.1.3 hashable==1.1.2.3 hjsmin==0.1.2 hspec==1.1.1 \
-		html-conduit==0.0.1 http-conduit==1.4.1.7 http-date==0.0.2 \
-		http-types==0.6.11 HUnit==1.2.4.2_1 hxt==9.2.2 \
-		hxt-charproperties==9.1.1_1 hxt-regex-xmlschema==9.0.4_1 \
-		hxt-unicode==9.0.2_1 language-javascript==0.5.4 largeword==1.0.1_1 \
-		lifted-base==0.1.1 mime-mail==0.4.1.1_1 monad-control==0.3.1.3 \
-		network-conduit==0.4.0.1 path-pieces==0.1.1 pem==0.1.1 \
-		persistent==0.9.0.4 persistent-template==0.9.0.2 \
-		pool-conduit==0.1.0.2 primitive==0.4.1_1 pureMD5==2.1.0.3_1 \
-		pwstore-fast==2.2_1 QuickCheck==2.4.2 ranges==0.2.4_1 \
-		regex-compat==0.95.1_1 resource-pool==0.2.1.0 resourcet==0.3.2.1 \
-		safe==0.3.3_1 semigroups==0.8.3.2 SHA==1.5.0.1 \
-		shakespeare==1.0.0.2 shakespeare-css==1.0.1.2 \
-		shakespeare-i18n==1.0.0.2 shakespeare-js==1.0.0.3 \
-		shakespeare-text==1.0.0.2 silently==1.1.5 simple-sendfile==0.2.3 \
-		skein==0.1.0.7 socks==0.4.1 stm==2.3 system-fileio==0.3.7 \
-		system-filepath==0.4.6 tagged==0.4.2.1 tagsoup==0.12.6_1 \
-		tagstream-conduit==0.3.2 tls==0.9.5 tls-extra==0.4.6 \
-		transformers-base==0.4.1_1 unix-compat==0.3.0.1 \
-		unordered-containers==0.2.1.0 utf8-light==0.4.0.1 \
-		utf8-string==0.3.7_1 vault==0.2.0.0 vector==0.9.1_1 \
-		void==0.5.5.1 wai==1.2.0.2 wai-app-static==1.2.0.3 \
-		wai-extra==1.2.0.4 wai-logger==0.1.4 wai-test==1.2.0.2 \
-		warp==1.2.1.1 xml-conduit==0.7.0.3 xml-types==0.3.1_1 \
-		xml2html==0.1.2.3 xss-sanitize==0.3.2 yaml==0.7.0.2 \
-		yesod==1.0.1.6 yesod-auth==1.0.2.1 yesod-core==1.0.1.2 \
-		yesod-default==1.0.1.1 yesod-form==1.0.0.4 yesod-json==1.0.0.1 \
-		yesod-persistent==1.0.0.1 yesod-routes==1.0.1.2 \
-		yesod-static==1.0.0.3 yesod-test==0.2.0.6 zlib==0.5.3.3 \
-		zlib-bindings==0.1.0.1 zlib-conduit==0.4.0.1
+USE_CABAL=	aeson==0.6.0.2_1 ansi-terminal==0.5.5_4 asn1-data==0.6.1.3_1 \
+		attoparsec==0.10.2.0_1 attoparsec-conduit==0.4.0.1_1 \
+		attoparsec-enumerator==0.3_2 authenticate==1.2.1.1_1 \
+		base-unicode-symbols==0.2.2.3_2 base64-bytestring==0.1.2.0 \
+		blaze-builder==0.3.1.0_2 blaze-builder-conduit==0.4.0.2_1 \
+		blaze-html==0.5.0.0 blaze-markup==0.5.1.0_1 byteorder==1.0.3_2 \
+		case-insensitive==0.4.0.1_2 cereal==0.3.5.2 certificate==1.2.3_1 \
+		clientsession==0.7.5_1 conduit==0.4.2_1 cookie==0.4.0_1 \
+		cprng-aes==0.2.3_2 cpu==0.1.1 crypto-api==0.10.2_1 \
+		crypto-conduit==0.3.2_1 crypto-pubkey-types==0.1.1_1 \
+		cryptocipher==0.3.5 cryptohash==0.7.5_1 css-text==0.1.1_2 \
+		data-default==0.4.0_1 dlist==0.5_6 email-validate==0.2.8_1 \
+		entropy==0.2.1_2 enumerator==0.4.19_1 failure==0.2.0.1_1 \
+		fast-logger==0.0.2_2 file-embed==0.0.4.4_1 filesystem-conduit==0.4.0_1 \
+		hamlet==1.0.1.4 hashable==1.1.2.3_1 hjsmin==0.1.2_1 hspec==1.2.0.1 \
+		html-conduit==0.0.1_1 http-conduit==1.4.1.10 http-date==0.0.2_1 \
+		http-types==0.6.11_1 HUnit==1.2.4.2_2 hxt==9.2.2_1 \
+		hxt-charproperties==9.1.1_2 hxt-regex-xmlschema==9.0.4_2 \
+		hxt-unicode==9.0.2_2 language-javascript==0.5.4_1 largeword==1.0.1_2 \
+		lifted-base==0.1.1_1 mime-mail==0.4.1.1_2 monad-control==0.3.1.3_1 \
+		network-conduit==0.4.0.1_1 path-pieces==0.1.1_1 pem==0.1.1_1 \
+		persistent==0.9.0.4_1 persistent-template==0.9.0.2_1 \
+		pool-conduit==0.1.0.2_1 primitive==0.4.1_2 pureMD5==2.1.0.3_2 \
+		pwstore-fast==2.2_2 QuickCheck==2.4.2_1 ranges==0.2.4_2 \
+		regex-compat==0.95.1_2 resource-pool==0.2.1.0_1 resourcet==0.3.3.1 \
+		safe==0.3.3_2 semigroups==0.8.3.2_1 SHA==1.5.0.1_1 \
+		shakespeare==1.0.0.2_1 shakespeare-css==1.0.1.2_1 \
+		shakespeare-i18n==1.0.0.2_1 shakespeare-js==1.0.0.3_1 \
+		shakespeare-text==1.0.0.2_1 silently==1.2.0.2 \
+		simple-sendfile==0.2.4 skein==0.1.0.7_1 socks==0.4.1_1 \
+		stm==2.3_1 stringsearch==0.3.6.3_2 system-fileio==0.3.8 \
+		system-filepath==0.4.6_1 tagged==0.4.2.1_1 tagsoup==0.12.6_2 \
+		tagstream-conduit==0.3.2_1 tls==0.9.5_1 tls-extra==0.4.6_1 \
+		transformers-base==0.4.1_2 unix-compat==0.3.0.1_1 \
+		unordered-containers==0.2.1.0_1 utf8-light==0.4.0.1_1 \
+		utf8-string==0.3.7_2 vault==0.2.0.0_1 vector==0.9.1_2 void==0.5.6 \
+		wai==1.2.0.3 wai-app-static==1.2.0.4 wai-extra==1.2.0.5 \
+		wai-logger==0.1.4_1 wai-test==1.2.0.2_1 warp==1.2.2 \
+		xml-conduit==0.7.0.3_1 xml-types==0.3.2 xml2html==0.1.2.3_1 \
+		xss-sanitize==0.3.2_1 yaml==0.7.0.3 yesod==1.0.1.6_1 \
+		yesod-auth==1.0.2.1_1 yesod-core==1.0.1.2_1 yesod-default==1.0.1.1_1 \
+		yesod-form==1.0.0.4_1 yesod-json==1.0.0.1_1 yesod-persistent==1.0.0.1_1 \
+		yesod-routes==1.0.1.2_1 yesod-static==1.0.0.3_1 yesod-test==0.2.1 \
+		zlib==0.5.3.3_1 zlib-bindings==0.1.0.1_1 zlib-conduit==0.4.0.2
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/www/hs-yesod-platform/distinfo b/www/hs-yesod-platform/distinfo
index b2729e1b7005..062ca63a94df 100644
--- a/www/hs-yesod-platform/distinfo
+++ b/www/hs-yesod-platform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-platform-1.0.4.2.tar.gz) = cbd5dea872d3b88d257ee4801b65c86980cbc8d3f25a33893226fc519a0d6c9f
-SIZE (cabal/yesod-platform-1.0.4.2.tar.gz) = 2563
+SHA256 (cabal/yesod-platform-1.0.5.tar.gz) = 76f4c602a59e3a8b78cd4848428ca58043b10a91a9f2910fe7f6fd3ddd793f88
+SIZE (cabal/yesod-platform-1.0.5.tar.gz) = 2577
diff --git a/www/hs-yesod-platform/files/patch-yesod-platform.cabal b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
index 6741f29d012a..61aad211719a 100644
--- a/www/hs-yesod-platform/files/patch-yesod-platform.cabal
+++ b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
@@ -1,11 +1,13 @@
---- ./yesod-platform.cabal.orig	2012-06-01 05:50:37.000000000 +0200
-+++ ./yesod-platform.cabal	2012-06-11 02:38:12.000000000 +0200
-@@ -29,7 +29,7 @@
-                  , binary == 0.5.1.0
-                  , blaze-builder == 0.3.1.0
-                  , blaze-builder-conduit == 0.4.0.2
--                 , blaze-html == 0.5.0.0
-+                 , blaze-html == 0.4.3.4
-                  , blaze-markup == 0.5.1.0
-                  , byteorder == 1.0.3
-                  , case-insensitive == 0.4.0.1
+--- ./yesod-platform.cabal.orig	2012-06-30 21:34:35.000000000 +0200
++++ ./yesod-platform.cabal	2012-07-01 02:04:57.000000000 +0200
+@@ -14,8 +14,8 @@
+ 
+ library
+     build-depends: base >= 4 && < 5
+-                 , HUnit == 1.2.4.3
+-                 , QuickCheck == 2.5
++                 , HUnit == 1.2.4.2
++                 , QuickCheck == 2.4.2
+                  , SHA == 1.5.0.1
+                  , aeson == 0.6.0.2
+                  , ansi-terminal == 0.5.5