- Update The Glorious Glasgow Haskell Compiler to version 7.4.2

- Update Haskell Platform to version 2012.4.0.0
- Update Gtk2Hs to 0.12.4
- Transfer maintainership of math/hs-math-functions to haskell@ [1]

Please note that port revisions for all the Haskell ports without version
changes are bumped.

Some further highlights of the update:
- Trim Makefile headers
- Enable dynamic libraries and dynamic linking by default
- Enable bootstrapping by versions of GHC and HsColour already installed
- Use GCC and binutils from ports

New ports (32):

devel/hs-List                            0.5.1
devel/hs-ReadArgs                        1.2.1
devel/hs-SafeSemaphore                   0.9.0
devel/hs-activehs-base                   0.3.0.2
devel/hs-async                           2.0.1.3
devel/hs-basic-prelude                   0.3.1.0
devel/hs-classy-prelude                  0.4.1
devel/hs-classy-prelude-conduit          0.4.1
devel/hs-data-pprint                     0.2.1.4
devel/hs-date-cache                      0.3.0
devel/hs-fsnotify                        0.0.4
devel/hs-hinotify                        0.3.5
devel/hs-hspec-expectations              0.3.0.3
devel/hs-kqueue                          0.1.2.4
devel/hs-monad-logger                    0.2.3
devel/hs-optparse-applicative            0.4.2
devel/hs-project-template                0.1.0.1
devel/hs-setenv                          0.1.0
devel/hs-simple-reflect                  0.2
devel/hs-threads                         0.5.0.1
devel/hs-time-compat                     0.1.0.2
devel/hs-unix-time                       0.1.4
devel/hs-word8                           0.0.2
graphics/hs-dia-base                     0.1.1.2
graphics/hs-dia-functions                0.2.1.3
mail/hs-mime-types                       0.1.0.0
net/hs-network-info                      0.2.0.3
net/hs-network-multicast                 0.0.7
security/hs-cipher-aes                   0.1.5
textproc/hs-hexpat                       0.20.3
www/hs-activehs                          0.3.0.1
www/hs-http-reverse-proxy                0.1.0.6

Updated ports (211):

archivers/hs-tar                         0.4.0.0_1        --> 0.4.0.1
archivers/hs-zip-archive                 0.1.1.8_1        --> 0.1.2.1
archivers/hs-zlib                        0.5.3.3_1        --> 0.5.4.0
archivers/hs-zlib-bindings               0.1.0.1_1        --> 0.1.1.2
archivers/hs-zlib-conduit                0.4.0.2          --> 0.5.0.3
archivers/hs-zlib-enum                   0.2.2.1_1        --> 0.2.3
audio/hs-libmpd                          0.8.0_1          --> 0.8.0.1
benchmarks/hs-criterion                  0.6.0.1_2        --> 0.6.2.0
converters/hs-dataenc                    0.14.0.3_2       --> 0.14.0.4
converters/hs-json                       0.5_1            --> 0.7
databases/hs-persistent                  0.9.0.4_1        --> 1.0.2.2
databases/hs-persistent-sqlite           0.9.0.2_1        --> 1.0.1
databases/hs-persistent-template         0.9.0.2_1        --> 1.0.0.2
devel/hs-Boolean                         0.0.1_5          --> 0.1.1
devel/hs-DeepArrow                       0.3.5_2          --> 0.3.7
devel/hs-HUnit                           1.2.4.2_2        --> 1.2.5.1
devel/hs-MemoTrie                        0.5_1            --> 0.6.1
devel/hs-MissingH                        1.1.1.0_2        --> 1.2.0.0
devel/hs-MonadCatchIO-mtl                0.3.0.4_3        --> 0.3.0.5
devel/hs-QuickCheck                      2.4.2_1          --> 2.5.1.1
devel/hs-Stream                          0.4.6_2          --> 0.4.6.1
devel/hs-TypeCompose                     0.9.1_2          --> 0.9.7
devel/hs-abstract-deque                  0.1.5_1          --> 0.1.6
devel/hs-alex                            3.0.1_1          --> 3.0.2
devel/hs-arrows                          0.4.4.0_4        --> 0.4.4.1
devel/hs-asn1-data                       0.6.1.3_1        --> 0.7.1
devel/hs-base-unicode-symbols            0.2.2.3_2        --> 0.2.2.4
devel/hs-base64-bytestring               0.1.2.0          --> 1.0.0.0
devel/hs-blaze-builder-conduit           0.4.0.2_1        --> 0.5.0.3
devel/hs-blaze-builder-enumerator        0.2.0.4_1        --> 0.2.0.5
devel/hs-blaze-textual                   0.2.0.6_2        --> 0.2.0.8
devel/hs-bytestring-nums                 0.3.5_2          --> 0.3.6
devel/hs-c2hs                            0.16.3_3         --> 0.16.4
devel/hs-cmdargs                         0.9.5_1          --> 0.10.1
devel/hs-conduit                         0.4.2_1          --> 0.5.5
devel/hs-configurator                    0.2.0.0_2        --> 0.2.0.1
devel/hs-cpphs                           1.14             --> 1.15
devel/hs-darcs                           2.8.1_1          --> 2.8.3
devel/hs-data-default                    0.4.0_1          --> 0.5.0
devel/hs-directory-tree                  0.10.1           --> 0.11.0
devel/hs-edit-distance                   0.2.1_1          --> 0.2.1.1
devel/hs-fast-logger                     0.0.2_2          --> 0.3.1
devel/hs-file-embed                      0.0.4.4_1        --> 0.0.4.6
devel/hs-filemanip                       0.3.5.2_6        --> 0.3.6.2
devel/hs-filestore                       0.5_1            --> 0.5.0.1
devel/hs-filesystem-conduit              0.4.0_1          --> 0.5.0.2
devel/hs-gconf                           0.12.1_3         --> 0.12.1.1
devel/hs-ghc-events                      0.4.0.0_2        --> 0.4.2.0
devel/hs-ghc-mtl                         1.0.1.1_2        --> 1.0.1.2
devel/hs-gio                             0.12.3_1         --> 0.12.4
devel/hs-git-annex                       3.20120807       --> 3.20121211
devel/hs-glib                            0.12.3.1_1       --> 0.12.4
devel/hs-gtk2hs-buildtools               0.12.3.1_1       --> 0.12.4
devel/hs-haddock                         2.10.0_1         --> 2.11.0
devel/hs-happy                           1.18.9_1         --> 1.18.10
devel/hs-hashable                        1.1.2.3_1        --> 1.1.2.5
devel/hs-hashed-storage                  0.5.9_2          --> 0.5.10
devel/hs-hashtables                      1.0.1.6_1        --> 1.0.1.8
devel/hs-haskell-src-exts                1.13.3_1         --> 1.13.5
devel/hs-hastache                        0.4.1            --> 0.4.2
devel/hs-hint                            0.3.3.4_1        --> 0.3.3.5
devel/hs-hlint                           1.8.30           --> 1.8.39
devel/hs-hoogle                          4.2.11_1         --> 4.2.14
devel/hs-hslogger                        1.1.5_2          --> 1.2.1
devel/hs-hspec                           1.2.0.1          --> 1.4.2
devel/hs-language-javascript             0.5.4_1          --> 0.5.7
devel/hs-largeword                       1.0.1_2          --> 1.0.3
devel/hs-lifted-base                     0.1.1_1          --> 0.2
devel/hs-logict                          0.5.0.1_1        --> 0.5.0.2
devel/hs-monad-control                   0.3.1.3_1        --> 0.3.1.4
devel/hs-mtl                             2.1.1_1          --> 2.1.2
devel/hs-murmur-hash                     0.1.0.5_2        --> 0.1.0.6
devel/hs-parallel                        3.2.0.2_1        --> 3.2.0.3
devel/hs-pool-conduit                    0.1.0.2_1        --> 0.1.0.3
devel/hs-primitive                       0.4.1_2          --> 0.5.0.1
devel/hs-resource-pool                   0.2.1.0_1        --> 0.2.1.1
devel/hs-resourcet                       0.3.3.1          --> 0.4.4
devel/hs-silently                        1.2.0.2          --> 1.2.4
devel/hs-split                           0.1.4.3          --> 0.2.1.1
devel/hs-stm                             2.3_1            --> 2.4
devel/hs-syb                             0.3.6.1_1        --> 0.3.7
devel/hs-syb-with-class                  0.6.1.3_2        --> 0.6.1.4
devel/hs-system-fileio                   0.3.8            --> 0.3.10
devel/hs-system-filepath                 0.4.6_1          --> 0.4.7
devel/hs-tagged                          0.4.2.1_1        --> 0.4.4
devel/hs-temporary                       1.1.2.3_1        --> 1.1.2.4
devel/hs-terminfo                        0.3.2.4          --> 0.3.2.5
devel/hs-test-framework                  0.6_1            --> 0.8
devel/hs-test-framework-hunit            0.2.7_2          --> 0.3.0
devel/hs-test-framework-quickcheck2      0.2.12.2_1       --> 0.3.0.1
devel/hs-text                            0.11.2.0_1       --> 0.11.2.3
devel/hs-threadscope                     0.2.1_3          --> 0.2.2
devel/hs-uniplate                        1.6.7_1          --> 1.6.10
devel/hs-unix-compat                     0.3.0.1_1        --> 0.4.0.0
devel/hs-unordered-containers            0.2.1.0_1        --> 0.2.2.1
devel/hs-uuagc                           0.9.40.3_1       --> 0.9.42.2
devel/hs-uuagc-cabal                     1.0.2.0_2        --> 1.0.4.0
devel/hs-vault                           0.2.0.0_1        --> 0.2.0.1
devel/hs-vector                          0.9.1_2          --> 0.10.0.1
devel/hs-vector-algorithms               0.5.4_1          --> 0.5.4.2
devel/hs-void                            0.5.6            --> 0.5.8
ftp/hs-curl                              1.3.7_3          --> 1.3.8
graphics/hs-cairo                        0.12.3.1_1       --> 0.12.4
lang/hs-unlambda                         0.1_6            --> 0.1.3
mail/hs-email-validate                   0.2.8_1          --> 0.3.2
mail/hs-mime                             0.3.3.2          --> 0.3.4
mail/hs-mime-mail                        0.4.1.1_2        --> 0.4.1.2
math/hs-categories                       1.0.3_1          --> 1.0.4
math/hs-comonad                          1.1.1.6_1        --> 3.0.0.2
math/hs-comonad-transformers             2.1.2            --> 3.0
math/hs-data-lens                        2.10.0_1         --> 2.10.2
math/hs-data-lens-template               2.1.5_1          --> 2.1.7
math/hs-math-functions                   0.1.1.1_2        --> 0.1.1.2 [1]
math/hs-mwc-random                       0.12.0.0_1       --> 0.12.0.1
math/hs-pointed                          2.1.0.2_1        --> 3.0.1
math/hs-semigroupoids                    1.3.4            --> 3.0.0.1
math/hs-semigroups                       0.8.3.2_1        --> 0.8.4.1
math/hs-statistics                       0.10.1.0_1       --> 0.10.2.0
math/hs-vector-space                     0.8.2            --> 0.8.6
multimedia/hs-gstreamer                  0.12.1.1_1       --> 0.12.1.2
net/hs-network                           2.3.0.13_1       --> 2.3.1.0
net/hs-network-conduit                   0.4.0.1_1        --> 0.6.1.1
net/hs-pcap                              0.4.5.1_4        --> 0.4.5.2
net/hs-sendfile                          0.7.6_1          --> 0.7.8
net/hs-simple-sendfile                   0.2.4            --> 0.2.8
net/hs-socks                             0.4.1_1          --> 0.4.2
print/hs-hscolour                        1.20.2,1         --> 1.20.3,1
security/hs-Crypto                       4.2.5_1          --> 4.2.5.1
security/hs-HsOpenSSL                    0.10.3.2         --> 0.10.3.3
security/hs-RSA                          1.2.1.0_1        --> 1.2.2.0
security/hs-SHA                          1.5.0.1_1        --> 1.6.1
security/hs-certificate                  1.2.3_1          --> 1.3.3
security/hs-clientsession                0.7.5_1          --> 0.8.0.1
security/hs-cprng-aes                    0.2.3_2          --> 0.2.4
security/hs-crypto-conduit               0.3.2_1          --> 0.4.1
security/hs-crypto-pubkey-types          0.1.1_1          --> 0.2.0
security/hs-cryptocipher                 0.3.5            --> 0.3.6
security/hs-cryptohash                   0.7.5_1          --> 0.7.9
security/hs-digest                       0.0.1.1_1        --> 0.0.1.2
security/hs-monadcryptorandom            0.4.1_1          --> 0.5
security/hs-pureMD5                      2.1.0.3_2        --> 2.1.2.1
security/hs-pwstore-fast                 2.2_2            --> 2.3
security/hs-skein                        0.1.0.7_1        --> 0.1.0.10
security/hs-tls                          0.9.5_1          --> 1.0.2
security/hs-tls-extra                    0.4.6_1          --> 0.5.0
sysutils/hs-angel                        0.3.2_1          --> 0.3.3
textproc/hs-HStringTemplate              0.6.8_2          --> 0.6.12
textproc/hs-attoparsec-conduit           0.4.0.1_1        --> 0.5.0.3
textproc/hs-attoparsec-enumerator        0.3_2            --> 0.3.1
textproc/hs-blaze-html                   0.5.0.0          --> 0.5.1.1
textproc/hs-blaze-markup                 0.5.1.0_1        --> 0.5.1.2
textproc/hs-case-insensitive             0.4.0.1_2        --> 0.4.0.3
textproc/hs-citeproc-hs                  0.3.4_1          --> 0.3.6
textproc/hs-double-conversion            0.2.0.4_2        --> 0.2.0.5
textproc/hs-highlighting-kate            0.5.1_1          --> 0.5.3.3
textproc/hs-hs-bibutils                  4.12_4           --> 4.15
textproc/hs-html-conduit                 0.0.1_1          --> 0.1.0.4
textproc/hs-hxt                          9.2.2_1          --> 9.3.1.1
textproc/hs-lhs2tex                      1.17_4           --> 1.18.1
textproc/hs-pandoc                       1.9.4.2          --> 1.9.4.5
textproc/hs-parsec                       3.1.2_1          --> 3.1.3
textproc/hs-regex-pcre-builtin           0.94.2.1.7.7_4   --> 0.94.4.3.8.31
textproc/hs-regex-posix                  0.95.1_2         --> 0.95.2
textproc/hs-stringsearch                 0.3.6.3_2        --> 0.3.6.4
textproc/hs-tagsoup                      0.12.6_2         --> 0.12.8
textproc/hs-tagstream-conduit            0.3.2_1          --> 0.5.3
textproc/hs-texmath                      0.6.0.6_1        --> 0.6.1.1
textproc/hs-xml-conduit                  0.7.0.3_1        --> 1.0.3.3
textproc/hs-xml-types                    0.3.2            --> 0.3.3
textproc/hs-xmlhtml                      0.2.0.2          --> 0.2.0.3
textproc/hs-yaml                         0.7.0.3          --> 0.8.1.1
www/hs-HTTP                              4000.2.3_1       --> 4000.2.5
www/hs-authenticate                      1.2.1.1_1        --> 1.3.2
www/hs-cookie                            0.4.0_1          --> 0.4.0.1
www/hs-gitit                             0.10.0.1         --> 0.10.0.2
www/hs-hamlet                            1.0.1.4          --> 1.1.1.1
www/hs-happstack                         7.0.0_1          --> 7.0.1
www/hs-happstack-server                  7.0.3            --> 7.1.1
www/hs-heist                             0.8.1.1          --> 0.8.2
www/hs-hjsmin                            0.1.2_1          --> 0.1.3
www/hs-http-conduit                      1.4.1.10         --> 1.8.4.3
www/hs-http-date                         0.0.2_1          --> 0.0.3
www/hs-http-server                       1_5              --> 1.0.1
www/hs-http-types                        0.6.11_1         --> 0.7.3.0.1
www/hs-path-pieces                       0.1.1_1          --> 0.1.2
www/hs-shakespeare                       1.0.0.2_1        --> 1.0.2
www/hs-shakespeare-css                   1.0.1.2_1        --> 1.0.2
www/hs-shakespeare-js                    1.0.0.3_1        --> 1.1.0
www/hs-shakespeare-text                  1.0.0.2_1        --> 1.0.0.5
www/hs-snap                              0.9.0.1          --> 0.9.2.2
www/hs-snap-core                         0.9.0            --> 0.9.2.2
www/hs-snap-server                       0.9.0            --> 0.9.2.4
www/hs-wai                               1.2.0.3          --> 1.3.0.1
www/hs-wai-app-static                    1.2.0.4          --> 1.3.0.4
www/hs-wai-extra                         1.2.0.5          --> 1.3.0.4
www/hs-wai-logger                        0.1.4_1          --> 0.3.0
www/hs-wai-test                          1.2.0.2_1        --> 1.3.0
www/hs-warp                              1.2.2            --> 1.3.5
www/hs-yesod                             1.0.1.6_1        --> 1.1.4.1
www/hs-yesod-auth                        1.0.2.1_1        --> 1.1.2
www/hs-yesod-core                        1.0.1.2_1        --> 1.1.6.1
www/hs-yesod-default                     1.0.1.1_1        --> 1.1.2
www/hs-yesod-form                        1.0.0.4_1        --> 1.2.0.1
www/hs-yesod-json                        1.0.0.1_1        --> 1.1.2
www/hs-yesod-persistent                  1.0.0.1_1        --> 1.1.0
www/hs-yesod-platform                    1.0.5            --> 1.1.5
www/hs-yesod-routes                      1.0.1.2_1        --> 1.1.1.1
www/hs-yesod-static                      1.0.0.3_1        --> 1.1.1.1
www/hs-yesod-test                        0.2.1            --> 0.3.1.1
x11-toolkits/hs-gtk                      0.12.3.1         --> 0.12.4
x11-toolkits/hs-pango                    0.12.3_1         --> 0.12.4

Removed ports (1):

textproc/hs-xml2html                     0.1.2.3_1

Approved by:	wen (maintainer) [1]
Obtained from:	FreeBSD Haskell

2 files changed, 4 insertions, 7 deletions

diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index a3cb9ad3dbbf..a658438b67a2 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	xmobar
-# Date created:				November 7, 2008
-# Whom:					Samy Al Bahra <sbahra@kerneled.org>
-#
+# Created by: Samy Al Bahra <sbahra@kerneled.org>
 # $FreeBSD$
 
 PORTNAME=	xmobar
 PORTVERSION=	0.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -29,7 +26,7 @@ XFT_DESC=		Use Xft to render text (UTF-8 support included)
 UTF8_DESC=		UTF-8 support
 MPD_DESC=		mpd support
 
-.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
 
 # Disable Linux-only options
 CONFIGURE_ARGS+=	--flags="-with_inotify -with_iwlib"
diff --git a/x11/hs-xmobar/pkg-descr b/x11/hs-xmobar/pkg-descr
index e202314d2fc0..e6fd56693605 100644
--- a/x11/hs-xmobar/pkg-descr
+++ b/x11/hs-xmobar/pkg-descr
@@ -2,4 +2,4 @@ Xmobar is a minimalistic text based status bar. Inspired by the Ion3 status
 bar, it supports similar features, like dynamic color management, output
 templates, and extensibility through plugins.
 
-WWW:	http://projects.haskell.org/xmobar/
+WWW: http://projects.haskell.org/xmobar/