- Update Haskell ports from the development repository

- Avoid self-dependency for print/hs-hscolour (when HSCOLOUR is set)
  Contributed by: ashish

New ports (5):

devel/hs-geniplate                       0.6.0.3
devel/hs-uuid                            1.2.9
net/hs-maccatcher                        2.1.5
net/hs-publicsuffixlist                  0.0.3
textproc/hs-regex-tdfa                   1.1.8

Removed ports (1):

math/hs-Agda-executable                  2.3.0.1_3

Updated ports (115):

archivers/hs-zip-archive                 0.1.3.3          --> 0.1.3.4
archivers/hs-zlib-conduit                0.5.0.3_1        --> 1.0.0
audio/hs-OpenAL                          1.4.0.1_3        --> 1.4.0.2
databases/hs-persistent                  1.1.4            --> 1.1.5.1
databases/hs-persistent-sqlite           1.1.2            --> 1.1.5
databases/hs-persistent-template         1.1.2.1          --> 1.1.2.4
devel/hs-Boolean                         0.1.2            --> 0.2
devel/hs-ansi-terminal                   0.5.5.1          --> 0.6
devel/hs-base64-bytestring               1.0.0.0_1        --> 1.0.0.1
devel/hs-base64-conduit                  0.5.1            --> 1.0.0
devel/hs-basic-prelude                   0.3.2.0          --> 0.3.4.0
devel/hs-bifunctors                      3.2              --> 3.2.0.1
devel/hs-blaze-builder-conduit           0.5.0.3_1        --> 1.0.0
devel/hs-classy-prelude                  0.4.3            --> 0.5.3
devel/hs-classy-prelude-conduit          0.4.3            --> 0.5.3
devel/hs-cmdargs                         0.10.1_1         --> 0.10.2
devel/hs-conduit                         0.5.6            --> 1.0.2
devel/hs-darcs                           2.8.3_1          --> 2.8.4
devel/hs-either                          3.1              --> 3.4
devel/hs-errors                          1.3.1            --> 1.4.1
devel/hs-filestore                       0.6              --> 0.6.0.1
devel/hs-filesystem-conduit              0.5.0.2_1        --> 1.0.0
devel/hs-git-annex                       3.20130124       --> 4.20130323
devel/hs-hashtables                      1.0.1.8_1        --> 1.1.0.2
devel/hs-haskeline                       0.6.4.7_3        --> 0.7.0.3
devel/hs-hint                            0.3.3.5_1        --> 0.3.3.6
devel/hs-hoogle                          4.2.15           --> 4.2.16
devel/hs-hspec                           1.4.3            --> 1.4.4
devel/hs-lens                            3.8.5            --> 3.8.7.3
devel/hs-logict                          0.5.0.2_1        --> 0.6
devel/hs-monad-logger                    0.2.3.2          --> 0.3.0.1
devel/hs-monad-par                       0.3_3            --> 0.3.4.1
devel/hs-mueval                          0.8.2_3          --> 0.9
devel/hs-profunctors                     3.2              --> 3.3
devel/hs-project-template                0.1.1            --> 0.1.3
devel/hs-readline                        1.0.1.0_8        --> 1.0.3.0
devel/hs-reflection                      1.1.6            --> 1.1.7
devel/hs-resourcet                       0.4.4_1          --> 0.4.5
devel/hs-show                            0.4.1.2_4        --> 0.5
devel/hs-simple-reflect                  0.2_1            --> 0.3.1
devel/hs-smallcheck                      0.6.2            --> 1.0.2
devel/hs-testpack                        2.1.2_3          --> 2.1.2.1
devel/hs-threads                         0.5.0.1_1        --> 0.5.0.2
devel/hs-time-compat                     0.1.0.2_1        --> 0.1.0.3
devel/hs-unix-time                       0.1.4_1          --> 0.1.5
devel/hs-uulib                           0.9.14_4         --> 0.9.15
mail/hs-email-validate                   0.3.2_1          --> 1.0.0
mail/hs-mime-types                       0.1.0.2          --> 0.1.0.3
math/hs-Agda                             2.3.0.1_3        --> 2.3.2
math/hs-NumInstances                     1.0_4            --> 1.2
math/hs-comonad                          3.0.1.1          --> 3.0.2
math/hs-contravariant                    0.2.0.2_3        --> 0.4
math/hs-distributive                     0.3              --> 0.3.1
math/hs-math-functions                   0.1.1.2_1        --> 0.1.3.0
net/hs-network-conduit                   0.6.2.2          --> 1.0.0
net/hs-sendfile                          0.7.8_1          --> 0.7.9
net/hs-simple-sendfile                   0.2.10           --> 0.2.11
net/hs-socks                             0.4.2_1          --> 0.5.0
security/hs-crypto-api                   0.10.2_3         --> 0.11
security/hs-crypto-conduit               0.4.3            --> 0.5.0
security/hs-monadcryptorandom            0.5_1            --> 0.5.1
security/hs-skein                        0.1.0.11         --> 0.1.0.12
security/hs-tls                          1.1.1            --> 1.1.2
textproc/hs-HStringTemplate              0.6.12_1         --> 0.7.1
textproc/hs-attoparsec                   0.10.3.0         --> 0.10.4.0
textproc/hs-attoparsec-conduit           0.5.0.3_1        --> 1.0.0
textproc/hs-blaze-html                   0.5.1.3          --> 0.6.0.0
textproc/hs-case-insensitive             0.4.0.4          --> 1.0
textproc/hs-citeproc-hs                  0.3.7            --> 0.3.8
textproc/hs-highlighting-kate            0.5.3.5          --> 0.5.3.8
textproc/hs-hs-bibutils                  4.16             --> 4.17
textproc/hs-html-conduit                 0.1.0.4_1        --> 1.1.0
textproc/hs-hxt-regex-xmlschema          9.0.4_4          --> 9.1.0
textproc/hs-pandoc                       1.9.4.5_1        --> 1.11.1
textproc/hs-pandoc-types                 1.9.1_3          --> 1.10
textproc/hs-tagstream-conduit            0.5.3_1          --> 0.5.4
textproc/hs-xml-conduit                  1.0.3.3_1        --> 1.1.0.3
textproc/hs-xmlhtml                      0.2.0.3_1        --> 0.2.1
textproc/hs-yaml                         0.8.2            --> 0.8.2.3
www/hs-activehs                          0.3.0.1_1        --> 0.3.1
www/hs-authenticate                      1.3.2_1          --> 1.3.2.6
www/hs-fastcgi                           3001.0.2.3_7     --> 3001.0.2.4
www/hs-gitit                             0.10.1.2         --> 0.10.3.1
www/hs-hS3                               0.5.6_5          --> 0.5.7
www/hs-hamlet                            1.1.3.1          --> 1.1.6.3
www/hs-happstack-server                  7.1.1_1          --> 7.1.7
www/hs-heist                             0.11.0           --> 0.11.1
www/hs-hjsmin                            0.1.4            --> 0.1.4.1
www/hs-http-conduit                      1.8.7            --> 1.9.0
www/hs-http-reverse-proxy                0.1.1.1          --> 0.1.1.3
www/hs-http-server                       1.0.1_1          --> 1.0.2
www/hs-http-types                        0.7.3.0.1_1      --> 0.8.0
www/hs-shakespeare                       1.0.2_1          --> 1.0.3.1
www/hs-shakespeare-css                   1.0.2_1          --> 1.0.3
www/hs-shakespeare-js                    1.1.1            --> 1.1.2.1
www/hs-snap                              0.11.0           --> 0.11.2
www/hs-snap-core                         0.9.2.2_1        --> 0.9.3.1
www/hs-snap-server                       0.9.2.4_1        --> 0.9.3.3
www/hs-wai                               1.3.0.1_1        --> 1.4.0
www/hs-wai-app-static                    1.3.1_1          --> 1.3.1.2
www/hs-wai-extra                         1.3.2            --> 1.3.2.4
www/hs-wai-test                          1.3.0_1          --> 1.3.0.4
www/hs-warp                              1.3.7.1          --> 1.3.7.4
www/hs-yesod                             1.1.7.2          --> 1.1.9.2
www/hs-yesod-auth                        1.1.3            --> 1.1.5.3
www/hs-yesod-core                        1.1.7.1          --> 1.1.8.2
www/hs-yesod-default                     1.1.3            --> 1.1.3.2
www/hs-yesod-form                        1.2.0.2          --> 1.2.1.3
www/hs-yesod-json                        1.1.2_1          --> 1.1.2.1
www/hs-yesod-platform                    1.1.7.2          --> 1.1.8
www/hs-yesod-routes                      1.1.1.1_1        --> 1.1.2
www/hs-yesod-static                      1.1.1.2          --> 1.1.2.2
www/hs-yesod-test                        0.3.3            --> 0.3.5
x11-wm/hs-xmonad-contrib                 0.11             --> 0.11.1
x11/hs-X11                               1.6.0.2          --> 1.6.1.1

Please note that port revisions for dependent ports are bumped.

Obtained from:	FreeBSD Haskell

4 files changed, 6 insertions, 4 deletions

diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index e507ea8a36e1..dc156b27a9e1 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	X11-xft
 PORTVERSION=	0.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index b872356b9b8e..129a426c8a30 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	X11
-PORTVERSION=	1.6.0.2
+PORTVERSION=	1.6.1.1
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -12,6 +12,7 @@ LICENSE=	BSD
 
 CABAL_SETUP=	Setup.hs
 
+USE_CABAL=	data-default
 USE_XORG=	x11 xrandr xext
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11/hs-X11/distinfo b/x11/hs-X11/distinfo
index 5cf7b74e564b..a4ea495f9539 100644
--- a/x11/hs-X11/distinfo
+++ b/x11/hs-X11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/X11-1.6.0.2.tar.gz) = 1c6a7823155bf251c4676981a1370b61af112e77d7f82f744c6bae2fe6482f7c
-SIZE (cabal/X11-1.6.0.2.tar.gz) = 179112
+SHA256 (cabal/X11-1.6.1.1.tar.gz) = 7ce575c613786c73efb20d5680a9e572aa1f1c91c3963e285011235759b76eae
+SIZE (cabal/X11-1.6.1.1.tar.gz) = 188628
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 4985ab32b452..5edae089d5be 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xmobar
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell@FreeBSD.org