9 files changed, 36 insertions, 27 deletions

diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile
index a0e31191266f..c7a2901a63ab 100644
--- a/www/hs-shakespeare-i18n/Makefile
+++ b/www/hs-shakespeare-i18n/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	shakespeare-i18n
-PORTVERSION=	0.0.0
+PORTVERSION=	1.0.0.2
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A type-based approach to internationalization
 
-LICENSE=	BSD
+LICENSE=	MIT
 
-USE_CABAL=	parsec shakespeare text>=0.7
+USE_CABAL=	parsec shakespeare>=1.0 text>=0.7
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/www/hs-shakespeare-i18n/distinfo b/www/hs-shakespeare-i18n/distinfo
index f0f4f776b946..5fb70aebdd4c 100644
--- a/www/hs-shakespeare-i18n/distinfo
+++ b/www/hs-shakespeare-i18n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-i18n-0.0.0.tar.gz) = 3e3d1ad8c5d282785c319b6df94693a3887b30254e03e814184ca4c6ec30d9ff
-SIZE (cabal/shakespeare-i18n-0.0.0.tar.gz) = 4439
+SHA256 (cabal/shakespeare-i18n-1.0.0.2.tar.gz) = bfb8fad2ef9916cd528479e41a694bbb9d9bd2250e3ba4104e6787b10d9dcd87
+SIZE (cabal/shakespeare-i18n-1.0.0.2.tar.gz) = 5869
diff --git a/www/hs-shakespeare-i18n/pkg-descr b/www/hs-shakespeare-i18n/pkg-descr
index 8f684874a626..077f42d4e7e1 100644
--- a/www/hs-shakespeare-i18n/pkg-descr
+++ b/www/hs-shakespeare-i18n/pkg-descr
@@ -1,5 +1,5 @@
 This package uses the same approach of type-safe URLs to create
 translated content.  It has a simple syntax for translators, while
-allowing the ful power of Haskell for applying complex grammar rules.
+allowing the full power of Haskell for applying complex grammar rules.
 
-WWW:  http://www.yesodweb.com/book/i18n
+WWW:	http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile
index 22d64b3c5208..50d41b8ced37 100644
--- a/www/hs-shakespeare-text/Makefile
+++ b/www/hs-shakespeare-text/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	shakespeare-text
-PORTVERSION=	0.10.3
+PORTVERSION=	1.0.0.2
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Interpolation with quasi-quotation: put variables strings
 
-LICENSE=	BSD
+LICENSE=	MIT
 
-USE_CABAL=	shakespeare>=0.10 text>=0.7
+USE_CABAL=	shakespeare>=1.0 text>=0.7
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/www/hs-shakespeare-text/distinfo b/www/hs-shakespeare-text/distinfo
index 8ec93da1e491..ca80d7c9caa9 100644
--- a/www/hs-shakespeare-text/distinfo
+++ b/www/hs-shakespeare-text/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-text-0.10.3.tar.gz) = da00f8b9a9b31710d5ec08ad68aca4d62ec85ffb8982cb648f25b6e93f707870
-SIZE (cabal/shakespeare-text-0.10.3.tar.gz) = 4342
+SHA256 (cabal/shakespeare-text-1.0.0.2.tar.gz) = ccfd085ea86a2c417b68bf0ee4c374f3642876e7b9e82d066a0c997ea332dcb6
+SIZE (cabal/shakespeare-text-1.0.0.2.tar.gz) = 4606
diff --git a/www/hs-shakespeare-text/pkg-descr b/www/hs-shakespeare-text/pkg-descr
index 0ec79f111427..5966bc523b33 100644
--- a/www/hs-shakespeare-text/pkg-descr
+++ b/www/hs-shakespeare-text/pkg-descr
@@ -1,7 +1,11 @@
-Shakespeare is a template family for type-safe, efficient templates with
-simple variable interpolation.  Shakespeare templates can be used inline
-with a quasi-quoter or in an external file.  Shakespeare interpolates
-variables according to the type being inserted.  In this case, the
-variable type needs a ToText instance.
+interpolation with quasi-quotation: stick haskell variables into haskell
+strings Note there is no dependency on haskell-src-extras. If you don't
+mind that dependency, you may want to look at using these packages:
+Interpolation, interpolatedstring-perl6, interpolatedstring-qq. This
+package has 1 other general feature that those others may not (but would
+be easy to duplicate): instead of using quasi-quoting you can also use an
+external file. It also has url/embeding interpolation, with @ and ^,
+which are used in Yesod. This package also uses blaze-builder for efficiently
+constructing strings.
 
-WWW:	http://www.yesodweb.com/book/templates
+WWW:	http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index fcfaedb1362b..107406465922 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	shakespeare
-PORTVERSION=	0.10.2
+PORTVERSION=	1.0.0.2
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A toolkit for making compile-time interpolated templates
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 USE_CABAL=	parsec>=2 text>=0.7
 
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index c31bc4ab3000..31febdc1e42e 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-0.10.2.tar.gz) = 8c63e160932ac004624ee9dfb02a13a5049e3434b08751f7783df0646a63779c
-SIZE (cabal/shakespeare-0.10.2.tar.gz) = 6202
+SHA256 (cabal/shakespeare-1.0.0.2.tar.gz) = 2e31213807639b98ca540d569d3f3f4aef0f8656459f32e7ca63f2c20e4dd312
+SIZE (cabal/shakespeare-1.0.0.2.tar.gz) = 7785
diff --git a/www/hs-shakespeare/pkg-descr b/www/hs-shakespeare/pkg-descr
index 93ffd238640b..2c0d9f78b95a 100644
--- a/www/hs-shakespeare/pkg-descr
+++ b/www/hs-shakespeare/pkg-descr
@@ -1,6 +1,11 @@
-Shakespeare is a template family for type-safe, efficient templates with
-simple variable interpolation.  Shakespeare templates can be used inline
-with a quasi-quoter or in an external file.  Shakespeare interpolates
-variables according to the type being inserted.
+Shakespeare is a family of type-safe, efficient template languages.
+Shakespeare templates are expanded at compile-time, ensuring that all
+interpolated variables are in scope. Variables are interpolated
+according to their type through a typeclass. Shakespeare templates can
+be used inline with a quasi-quoter or in an external file. Note there is
+no dependency on haskell-src-extras. Instead Shakespeare believes logic
+should stay out of templates and has its own minimal Haskell parser.
+Packages that use this: shakespeare-js, shakespeare-css,
+shakespeare-text, hamlet, and xml-hamlet.
 
-WWW:	http://www.yesodweb.com/book/templates
+WWW:	http://www.yesodweb.com/book/shakespearean-templates