Index: /trunk/dports/devel/haskell-platform/Portfile
===================================================================
--- /trunk/dports/devel/haskell-platform/Portfile	(revision 98943)
+++ /trunk/dports/devel/haskell-platform/Portfile	(revision 98944)
@@ -1,61 +1,70 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem      1.0
 
-name		haskell-platform
-version		2009.2.0.2
-revision	1
-categories	devel haskell
-maintainers	gwright
-description	Meta port for the haskell platform
-long_description	\
-	This is the the Haskell Platform: a single, standard Haskell	\
-	distribution for every system.					\
-									\
-	The Haskell Platform is a blessed library and tool suite for	\
-	Haskell distilled from Hackage.
+name            haskell-platform
+version         2012.2.0.0
+categories      devel haskell
+maintainers     cal openmaintainer
+description     \
+    The Haskell Platform is the easiest way to get started with programming \
+    Haskell. It comes with all you need to get up and running. Think of it as \
+    \"Haskell: batteries included\".
+long_description \
+    The Haskell Platform is a comprehensive, robust development environment for \
+    programming in Haskell. For new users the platform makes it trivial to get \
+    up and running with a full Haskell development environment. For experienced \
+    developers, the platform provides a comprehensive, standard base for \
+    commercial and open source Haskell development that maximises \
+    interoperability and stability of your code.
 
-platforms	darwin
-homepage	http://hackage.haskell.org/platform/
-master_sites	${homepage}
+platforms       darwin
+homepage        http://hackage.haskell.org/platform/
+master_sites    ${homepage}
+license         Permissive
 
-depends_run \
-    port:hs-platform-ghc		\
-    port:hs-platform-cgi		\
-    port:hs-platform-fgl		\
-    port:hs-platform-editline		\
-    port:hs-platform-GLUT		\
-    port:hs-platform-haskell-src	\
-    port:hs-platform-html		\
-    port:hs-platform-HUnit		\
-    port:hs-platform-mtl		\
-    port:hs-platform-network		\
-    port:hs-platform-OpenGL		\
-    port:hs-platform-parallel		\
-    port:hs-platform-parsec		\
-    port:hs-platform-QuickCheck		\
-    port:hs-platform-regex-base		\
-    port:hs-platform-regex-compat	\
-    port:hs-platform-regex-posix	\
-    port:hs-platform-stm		\
-    port:hs-platform-time		\
-    port:hs-platform-xhtml		\
-    port:hs-platform-zlib		\
-    port:hs-platform-HTTP		\
-    port:hs-platform-alex		\
-    port:hs-platform-happy		\
-    port:hs-platform-cabal
+depends_run     port:hs-platform-alex \
+                port:hs-platform-cabal \
+                port:hs-platform-cgi \
+                port:hs-platform-fgl \
+                port:hs-platform-ghc \
+                port:hs-platform-glut \
+                port:hs-platform-happy \
+                port:hs-platform-haskell-src \
+                port:hs-platform-html \
+                port:hs-platform-http \
+                port:hs-platform-hunit \
+                port:hs-platform-mtl \
+                port:hs-platform-network \
+                port:hs-platform-opengl \
+                port:hs-platform-parallel \
+                port:hs-platform-parsec \
+                port:hs-platform-quickcheck \
+                port:hs-platform-random \
+                port:hs-platform-regex-base \
+                port:hs-platform-regex-compat \
+                port:hs-platform-regex-posix \
+                port:hs-platform-stm \
+                port:hs-platform-syb \
+                port:hs-platform-text \
+                port:hs-platform-transformers \
+                port:hs-platform-xhtml \
+                port:hs-platform-zlib
 
-fetch           { }
-checksum        { }
-build           { }
-destroot        {
+fetch {}
+checksum {}
+extract {}
+configure {}
+build {}
+destroot {
     xinstall -d ${destroot}${prefix}/share/doc/${name}
     system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt"
 }
 
-use_configure no
-universal_variant no
+use_configure       no
+universal_variant   no
 
-livecheck.type  none
-
+livecheck.type      regex
+livecheck.url       ${homepage}
+livecheck.regex     "Current release: <a href=\"changelog.html\">(\\d+\\.\\d\\.\\d\\.\\d)</a>"
Index: /trunk/dports/devel/hs-platform-alex/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-alex/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-alex/Portfile	(revision 98944)
@@ -1,50 +1,21 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-name		hs-platform-alex
-set canonicalname	alex
-version		2.3.1
-categories	devel haskell
-license		BSD
-maintainers	gwright
-platforms	darwin
-description	A Lexical Analyzer Generator for Haskell (platform version)
-long_description	\
-		Alex is a tool for generating lexical analysers		\
-		in Haskell, given a description of the tokens to be	\
-		recognised in the form of regular expressions.		\
-		It is similar to the tools lex or flex for C/C++.
+haskellplatform.setup   alex 3.0.1 no
+checksums               rmd160  fdfd935281800678605573db8025583b40459894 \
+                        sha256  727235cee46396537c2b53b4a0fae0ec25cffb9e982ce899816e92fcfe4cfaf0
 
-homepage	http://www.haskell.org/${canonicalname}/
-master_sites	http://hackage.haskell.org/packages/archive/${canonicalname}/${version}
-distname	${canonicalname}-${version}
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums       md5     a8c26af3370388297cee4b8c767d72d9 \
-                sha1    0dbd9d34849602f9b59d30122b27727d6f79fc4f \
-                rmd160  cee02283325638fc9929ca6ae40c153b626d4b69
+depends_lib-append      port:hs-platform-quickcheck
 
-depends_build	port:ghc
-
-universal_variant	no
-
-patchfiles	patch-alex.cabal.diff
-
-# Since alex is an application I can't use the conveniences of the
-# haskell PortGroup.  Just need to do everything by hand:
-
-configure       {
-                  system "cd ${worksrcpath} && runhaskell Setup configure -v --ghc --with-gcc=${configure.cc} --prefix=${prefix}"
-                }
-
-build           {
-                  system "cd ${worksrcpath} && runhaskell Setup build -v"
-                }
-
-destroot        {
-                  system "cd ${worksrcpath} && runhaskell Setup copy --copy-prefix=${destroot}${prefix}"
-                }
-
-# Haskell Platform components should not be livecheck'ed.
-livecheck.type	none
-
+description             \
+    Alex is a tool for generating lexical analysers in Haskell, given \
+    a description of the tokens to be recognised in the form of regular \
+    expressions. It is similar to the tool lex or flex for C/C++.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-cabal/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-cabal/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-cabal/Portfile	(revision 98944)
@@ -1,48 +1,26 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-name		hs-platform-cabal
-set canonicalname	cabal-install
-version		0.6.2
-categories	devel haskell
-maintainers	gwright
-platforms	darwin
+haskellplatform.setup   cabal-install 0.14.0 no
+name                    hs-platform-cabal
+checksums               rmd160  a0e1e0f0d189abbb984d968f8650280632027769 \
+                        sha256  f4f2b50269ff59d67b5f3d82d50f7706b6bad1117295a7c81f32bbe72add5bd8
 
-description	User interface to the Cabal build system (platform version).
-long_description	\
-		Cabal is a system for building and packaging Haskell	\
-		libraries and programs It defines a common interface	\
-		for package authors and distributors to easily build	\
-		their applications in a portable way. Cabal is part of	\
-		a larger infrastructure for distributing, organizing,	\
-		and cataloging Haskell libraries and programs.
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-homepage	http://www.haskell.org/cabal
-master_sites	http://hackage.haskell.org/packages/archive/${canonicalname}/${version}
-distname	${canonicalname}-${version}
+depends_lib-append      port:hs-platform-http \
+                        port:hs-platform-mtl \
+                        port:hs-platform-network \
+                        port:hs-platform-random \
+                        port:hs-platform-zlib
 
-checksums	md5     8cb1c19233a9a114faf0eea7c46cb23e		\
-		sha1    415bdf6ae7029b488b99c2da288af10634024ac7	\
-		rmd160  f7ae2a8155b28ee1b736e9abf00c32fe55e7c80f
-
-# Since cabal is an application, and the Haskell libraries are statically
-# linked, the following are build dependencies and not lib dependencies:
-depends_build	port:ghc			\
-		port:hs-platform-zlib		\
-		port:hs-platform-HTTP
-
-universal_variant	no
-
-configure	{ system "cd ${worksrcpath} && runhaskell Setup configure -v --ghc --prefix=${prefix} --with-gcc=${configure.cc}"
-		}
-
-build		{ system "cd ${worksrcpath} && runhaskell Setup build -v"
-		}
-
-destroot	{ system "cd ${worksrcpath} && runhaskell Setup copy --copy-prefix=${destroot}${prefix}"
-                }
-
-# platform components should not be livecheck'ed.
-livecheck.type	none
-
+description             \
+    The 'cabal' command-line program simplifies the process of managing Haskell \
+    software by automating the fetching, configuration, compilation and \
+    installation of Haskell libraries and programs.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-cgi/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-cgi/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-cgi/Portfile	(revision 98944)
@@ -1,33 +1,21 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	cgi 3001.1.7.1
-name		hs-platform-cgi
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   cgi 3001.1.7.4
+checksums               rmd160  a3df4f40c3e7cad6f1a22b7bd090e39968ffc241 \
+                        sha256  6de5da8be4bb8323a864761bbb604ca8c1cdc9048bf33990f91e7ed948a331ba
 
-description	A library for writing CGI programs (platform version)
-long_description	\
-	This is a Haskell library for writing CGI programs.
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     02b1d2fe6f271a17c1eb8b897fbd1d7f \
-		sha1    1999b968cfff8a67f4b997cdc114682b4d75b5e4 \
-		rmd160  3009dde5eb2936b7016717daf621264382f887bd
+depends_lib-append      port:hs-platform-mtl \
+                        port:hs-platform-parsec \
+                        port:hs-platform-network \
+                        port:hs-platform-xhtml
 
-depends_lib	port:ghc			\
-		port:hs-platform-network	\
-		port:hs-platform-parsec		\
-		port:hs-platform-mtl		\
-		port:hs-platform-xhtml
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             This is a Haskell library for writing CGI programs.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-fgl/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-fgl/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-fgl/Portfile	(revision 98944)
@@ -1,30 +1,18 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	fgl 5.4.2.2
-name		hs-platform-fgl
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   fgl 5.4.2.4
+checksums               rmd160  e2b9e0d1d43e69b250719a34c6de9344b38264bf \
+                        sha256  ce98ccb83e2d271a7b3266426a0762a0e902252f07ec09b7bef50c67d0110266
 
-description	Martin Erwig's Functional Graph Library
-long_description	\
-	${description}
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     ad49ce31af04c0fd9c6dbfa52801ff83 \
-		sha1    3d8cf5a75f39282fa18e23aea4eeb6098f81ddee \
-		rmd160  50068af699aa5c5cf0e5bb72bc61b90380f0ba72
+depends_lib-append      port:hs-platform-mtl
 
-depends_lib	port:ghc			\
-		port:hs-platform-mtl
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description
+long_description
Index: /trunk/dports/devel/hs-platform-ghc/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-ghc/Portfile	(revision 98944)
@@ -1,583 +1,115 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem	1.0
+PortSystem              1.0
 
-name		hs-platform-ghc
-conflicts	ghc
-set canonicalname	ghc
-version		6.10.4
-categories	devel lang haskell
-maintainers	nomaintainer
-license		BSD
-platforms	darwin
-description	The Glorious Glasgow Haskell Compilation System
-long_description	\
-		The Glasgow Haskell Compiler is a robust,		\
-		fully-featured, optimising compiler and interactive	\
-		environment for Haskell 98, GHC compiles Haskell to	\
-		either native code or C.  It implements numerous	\
-		experimental language extensions to Haskell 98,		\
-		for example: concurrency, a foreign language interface,	\
-		multi-parameter type classes, scoped type variables,	\
-		existential and universal quantification, unboxed	\
-		types, exceptions, weak pointers, and so on.		\
-		GHC comes with a generational garbage collector,	\
-		and a space and time profiler.
+name                    hs-platform-ghc
+set canonicalname       ghc
+version                 7.4.1
+conflicts               ghc
+categories              lang haskell
+maintainers             cal openmaintainer
+license                 BSD
+platforms               darwin
 
-homepage	http://haskell.org/${canonicalname}
-master_sites	${homepage}/dist/${version}/
+description             The Glorious Glasgow Haskell Compilation System
+long_description        \
+    The Glasgow Haskell Compiler is a robust, fully-featured, optimising \
+    compiler and interactive environment for Haskell 98, GHC compiles Haskell \
+    to either native code or C. It implements numerous experimental language \
+    extensions to Haskell 98, for example: concurrency, a foreign language \
+    interface, multi-parameter type classes, scoped type variables, \
+    existential and universal quantification, unboxed types, exceptions, weak \
+    pointers, and so on. GHC comes with a generational garbage collector, and \
+    a space and time profiler.
 
-use_bzip2	yes
+homepage                http://haskell.org/${canonicalname}
+master_sites            ${homepage}/dist/${version}/
+distname                ${canonicalname}-${version}-src
+worksrcdir              ${canonicalname}-${version}
 
-distfiles	${canonicalname}-${version}-src.tar.bz2			\
-		${canonicalname}-${version}-src-extralibs.tar.bz2	\
-		testsuite-${version}.tar.bz2
+use_bzip2               yes
 
-checksums       ${canonicalname}-${version}-src.tar.bz2 \
-                    md5     167687fa582ef6702aaac24e139ec982 \
-                    sha1    0566858b409066d98da70de5adb9a7030d0df5dc \
-                    rmd160  5f83baf2549f1f4bea140c6a80728c2a76f60ab6 \
-                ${canonicalname}-${version}-src-extralibs.tar.bz2 \
-                    md5     37ce285617d7cebabc3cf6805bdbca25 \
-                    sha1    b08b26070f2965122662d035c602536ae9aafbb8 \
-                    rmd160  78e6dba88a253095c79f94c5356918402810bd01 \
-                testsuite-${version}.tar.bz2 \
-                    md5     1973d7c1a24afbc58cebc7c574ebb56f \
-                    sha1    cfb327686398fba2c12a5cd1fdad56faa4fbf3c6 \
-                    rmd160  8952dda913a6363f60d3c4ad2d18ec6abcf33425
+distfiles               ${canonicalname}-${version}-src${extract.suffix} \
+                        ${canonicalname}-${version}-testsuite${extract.suffix}
 
-# ghc does not support a universal build:
-universal_variant	no
+checksums               ghc-7.4.1-src.tar.bz2 \
+                        rmd160  00c6a4df54e55559812b0e289dbc6fe8523d18da \
+                        sha256  721c09a49e519b7459b67b451b5103252ba3833906a7a24c3a3679ff94669a79 \
+                        ghc-7.4.1-testsuite.tar.bz2 \
+                        rmd160  001edff72071e8dcab319a13510c913869f11e0c \
+                        sha256  eea89fb679fd199c75358e6bebd754f6ef89c1e3cdb33c6a66dd919de6e3687c
 
-patchfiles	patch-configure.ac.diff			\
-		patch-aclocal.m4.diff			\
-		patch-compiler-ghc.cabal.in.diff	\
-		patch-compiler-Makefile.diff		\
-		patch-compiler-Makefile.local.diff	\
-		patch-ghc-Makefile.diff			\
-		patch-libraries-Makefile.diff		\
-		patch-libraries-cabal-bin.hs.diff	\
-		patch-libraries-terminfo-configure.ac.diff	\
-		patch-mk-cabal.mk.diff			\
-		patch-mk-target.mk.diff			\
-		patch-utils-genapply-Makefile.diff	\
-		patch-utils-genprimopcode-Makefile.diff
+depends_build           port:ghc-bootstrap \
+                        port:libxslt
 
-depends_build	port:autoconf263
-depends_lib	port:gmp	\
-		port:ncurses	\
-		port:libiconv
+depends_lib             port:gmp \
+                        port:ncurses \
+                        port:libiconv
 
-variant maintainer_debug requires cabal_configure_debug description {Verbose logging and save all temporary files} { }
+patchfiles              patch-configure-disable-docbook-ps-and-pdf.diff
 
-variant cabal_configure_debug description {Add verbose debugging to cabal configure commands} {
+use_parallel_build      no
+test.run                yes
 
-		patchfiles-delete	patch-compiler-Makefile.diff	\
-					patch-ghc-Makefile.diff		\
-					patch-libraries-Makefile.diff	\
-					patch-mk-cabal.mk.diff
+# -- BEGIN gcc variants
 
-		if { ${configure.build_arch} == "i386" && ${os.platform} == "darwin" && ${os.major} == 10 } {
-			patchfiles-append	patch-snowleopard-i386-compiler-Makefile-debug.diff	\
-						patch-snowleopard-i386-ghc-Makefile-debug.diff		\
-						patch-snowleopard-i386-libraries-Makefile-debug.diff	\
-						patch-snowleopard-i386-mk-cabal.mk-debug.diff
-		} else {
-			patchfiles-append	patch-compiler-Makefile-debug.diff	\
-						patch-ghc-Makefile-debug.diff		\
-						patch-libraries-Makefile-debug.diff	\
-						patch-mk-cabal.mk-debug.diff
-		}
+variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 description {Compile with gcc 4.4} {
+    configure.compiler macports-gcc-4.4
+    depends_lib-append port:gcc44
 }
 
-# Yes, it some situations (-fvia-C) we really need perl
-# to _run_ ghc, since the mangler (an assembly to assembly transformation)
-# is a perl script. That's why it called the "Evil Mangler".
-#
-# Not only that, but since correctly handling whitespace is critical,
-# only perl 5.8 is known to work reliably.
-#
-depends_lib-append	port:perl5.8
-configure.env-append	PerlCmd=${prefix}/bin/perl5.8
-
-worksrcdir	${canonicalname}-${version}
-
-platform darwin 8 powerpc {
-		global ghc_bootversion
-		set ghc_bootversion	6.10.1
-
-		master_sites-append	${homepage}/dist/${ghc_bootversion}/:bootstrap
-
-		distfiles-append	${canonicalname}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2:bootstrap
-
-                checksums-append	${canonicalname}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2 \
-					md5     511f4bec375b51aaa82de999529916ae		\
-                      			sha1    cb6974a680168246c6e13a92818b39c559d7a2b4	\
-                      			rmd160  be60cfffc0ed223fb39ce2fe40ad501486564f0e
-
-		extract.only		${canonicalname}-${version}-src.tar.bz2 \
-					${canonicalname}-${version}-src-extralibs.tar.bz2 \
-					${canonicalname}-${ghc_bootversion}-darwin-ppc-tiger-bootstrap.tar.bz2
-
-		pre-fetch {
-			set minimum_xcodeversion 2.5
-        		set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
-        		if {[vercmp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-            			ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
-            			return -code error "incompatible Xcode version"
-        		}
-		}
+variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 description {Compile with gcc 4.5} {
+    configure.compiler macports-gcc-4.5
+    depends_lib-append port:gcc45
+    configure.args-append --with-gcc=${configure.cc}
 }
 
-
-platform darwin 8 i386 {
-		global ghc_bootversion
-		set ghc_bootversion	6.6
-
-		master_sites-append	${homepage}/dist/${ghc_bootversion}/:bootstrap
-
-		distfiles-append	${canonicalname}-${ghc_bootversion}-darwin-i386-tiger-bootstrap-rev1.tar.bz2:bootstrap
-
-		checksums-append	${canonicalname}-${ghc_bootversion}-darwin-i386-tiger-bootstrap-rev1.tar.bz2 \
-					md5 f01663cecefd50b5f1e1f524f49cd6df
-
-		extract.only		${canonicalname}-${version}-src.tar.bz2 \
-					${canonicalname}-${version}-src-extralibs.tar.bz2 \
-					${canonicalname}-${ghc_bootversion}-darwin-i386-tiger-bootstrap-rev1.tar.bz2
-
-		pre-fetch {
-			set minimum_xcodeversion 2.5
-        		set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
-        		if {[vercmp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-            			ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
-            			return -code error "incompatible Xcode version"
-        		}
-		}
+variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 description {Compile with gcc 4.6} {
+    configure.compiler macports-gcc-4.6
+    depends_lib-append port:gcc46
 }
 
-
-platform darwin 9 powerpc {
-		global ghc_bootversion
-		set ghc_bootversion	6.10.1
-
-		master_sites-append	${homepage}/dist/${ghc_bootversion}/:bootstrap
-
-		distfiles-append	${canonicalname}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2:bootstrap
-
-                checksums-append	${canonicalname}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2 \
-					md5     511f4bec375b51aaa82de999529916ae	\
-                        		sha1    cb6974a680168246c6e13a92818b39c559d7a2b4\
-                        		rmd160  be60cfffc0ed223fb39ce2fe40ad501486564f0e
-
-		extract.only		${canonicalname}-${version}-src.tar.bz2 \
-					${canonicalname}-${version}-src-extralibs.tar.bz2 \
-					${canonicalname}-${ghc_bootversion}-darwin-ppc-leopard-bootstrap.tar.bz2
-
-		pre-fetch {
-			set minimum_xcodeversion 3.1.2
-        		set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
-        		if {[vercmp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-            			ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
-            			return -code error "incompatible Xcode version"
-        		}
-		}
+variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46  description {Compile with gcc 4.7} {
+    configure.compiler macports-gcc-4.7
+    depends_lib-append port:gcc47
 }
 
-
-platform darwin 9 i386 {
-		global ghc_bootversion
-		set ghc_bootversion	6.8.2
-
-		master_sites-append	${homepage}/dist/${ghc_bootversion}/:bootstrap
-
-		distfiles-append	${canonicalname}-${ghc_bootversion}-darwin-i386-leopard-bootstrap.tar.bz2:bootstrap
-
-		checksums-append	${canonicalname}-${ghc_bootversion}-darwin-i386-leopard-bootstrap.tar.bz2 \
-					md5 f263cedef8bcbaa7e9014b3e06923583
-
-		extract.only		${canonicalname}-${version}-src.tar.bz2 \
-					${canonicalname}-${version}-src-extralibs.tar.bz2 \
-					${canonicalname}-${ghc_bootversion}-darwin-i386-leopard-bootstrap.tar.bz2
-
-		pre-fetch {
-			set minimum_xcodeversion 3.1
-        		set current_xcodeversion [exec defaults read /Developer/Applications/Xcode.app/Contents/Info CFBundleShortVersionString]
-        		if {[vercmp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-            			ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} but you have Xcode ${current_xcodeversion}."
-            			return -code error "incompatible Xcode version"
-        		}
-		}
+if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
+    default_variants +gcc47
 }
 
+# -- END gcc variants
 
-platform darwin 10 {
-		global ghc_bootversion
-		set ghc_bootversion	6.10.4
+set bootstraproot ${prefix}/share/ghc-bootstrap
+configure.args          --with-ghc=${bootstraproot}/bin/ghc \
+                        --with-iconv-includes=${prefix}/include \
+                        --with-iconv-libraries=${prefix}/lib \
+                        --with-gmp-includes=${prefix}/include \
+                        --with-gmp-libraries=${prefix}/lib
 
-		master_sites-append	${homepage}/dist/${ghc_bootversion}/:bootstrap
+# OK so because the bootstrap binary has been prebuilt for libraries
+# in /usr/lib we search these before macports stuff to prevent
+# link errors, ghc _should_ actually compile itself in stage2
+# using paths from the command line arguments
+compiler.cpath          /usr/include
+compiler.library_path   /usr/lib
 
-		if { ${configure.build_arch} == "x86_64" } {
-			distfiles-append	${canonicalname}-${ghc_bootversion}-darwin-x86_64-snowleopard-macports-bootstrap.tar.bz2:bootstrap
+post-destroot {
+    set prefixlib       ${prefix}/lib/${worksrcdir}
+    set destlib         ${destroot}/${prefixlib}
+    set libver          ${canonicalname}${version}
 
-			checksums-append	${canonicalname}-${ghc_bootversion}-darwin-x86_64-snowleopard-macports-bootstrap.tar.bz2 \
-						md5     70c8743dc4d606904426146e0e6d7cdf \
-						sha1    bd6830318c522527b2c35a84724832d983054416 \
-						rmd160  bc67c499417e009428fe6bf90b86fda4f1ec3e9e
+    variable libs [list \
+                    libHSrts-${libver}.dylib \
+                    libHSrts_debug-${libver}.dylib \
+                    libHSrts_thr-${libver}.dylib \
+                    libHSrts_thr_debug-${libver}.dylib ]
 
-			extract.only		${canonicalname}-${version}-src.tar.bz2 \
-						${canonicalname}-${version}-src-extralibs.tar.bz2 \
-						${canonicalname}-${ghc_bootversion}-darwin-x86_64-snowleopard-macports-bootstrap.tar.bz2
+    system "install_name_tool -id ${prefixlib}/libffi.dylib ${destlib}/libffi.dylib"
 
-		} elseif { ${configure.build_arch} == "i386" } {
-			distfiles-append	${canonicalname}-${ghc_bootversion}-darwin-i386-snowleopard-bootstrap.tar.bz2:bootstrap
-
-			checksums-append	${canonicalname}-${ghc_bootversion}-darwin-i386-snowleopard-bootstrap.tar.bz2 \
-						md5     fba9493ef1a1cb3f54274ab59f007725 \
-						sha1    cd30029d0c32b8e97ef31c81f0a9613586628c0f \
-						rmd160  d32bc2006ff9d56da1dfecce0eb8be780e81b8b9
-
-			patchfiles-delete	patch-compiler-Makefile.local.diff		\
-						patch-libraries-cabal-bin.hs.diff		\
-						patch-mk-target.mk.diff
-
-			patchfiles-append	patch-snowleopard-i386-includes-Makefile.diff           	\
-						patch-snowleopard-i386-compiler-Makefile.local.diff             \
-						patch-snowleopard-i386-compiler-main-DriverPipeline.hs.diff     \
-						patch-snowleopard-i386-ghc-ghc.wrapper.diff                     \
-						patch-snowleopard-i386-libraries-cabal-bin.hs.diff              \
-						patch-snowleopard-i386-libraries-haskeline-haskeline.cabal.diff \
-						patch-snowleopard-i386-libffi-Makefile.diff                     \
-						patch-snowleopard-i386-mk-target.mk.diff                        \
-						patch-snowleopard-i386-utils-genapply-Makefile.diff             \
-						patch-snowleopard-i386-utils-genprimopcode-Makefile.diff        \
-						patch-snowleopard-i386-utils-hsc2hs-hsc2hs.wrapper.diff
-
-			if { !([variant_isset maintainer_debug] || [variant_isset cabal_configure_debug]) } {
-				patchfiles-delete	patch-compiler-Makefile.diff	\
-							patch-ghc-Makefile.diff		\
-							patch-libraries-Makefile.diff	\
-							patch-mk-cabal.mk.diff
-
-				patchfiles-append	patch-snowleopard-i386-compiler-Makefile.diff	\
-							patch-snowleopard-i386-ghc-Makefile.diff	\
-							patch-snowleopard-i386-libraries-Makefile.diff	\
-							patch-snowleopard-i386-mk-cabal.mk.diff
-			}
-
-			extract.only		${canonicalname}-${version}-src.tar.bz2 \
-						${canonicalname}-${version}-src-extralibs.tar.bz2 \
-						${canonicalname}-${ghc_bootversion}-darwin-i386-snowleopard-bootstrap.tar.bz2
-
-		} else {
-		        pre-fetch {
-			        # belt and braces approach:
-			        return -code error "Unrecognized build architecture on Snow Leopard"
-			}
-		}
-
-		patchfiles-append	patch-snowleopard-compiler-cmm-CLabel.hs.diff		\
-					patch-snowleopard-compiler-main-DynFlags.hs.diff	\
-					patch-snowleopard-ghc-ghc-bin.cabal.in.diff		\
-					patch-snowleopard-rts-Linker.c.diff			\
-					patch-snowleopard-rts-Makefile.diff			\
-					patch-snowleopard-rts-package.conf.in.diff
-
-}
-
-platform darwin 11 {
-		global ghc_bootversion
-		set ghc_bootversion	6.10.4
-
-		master_sites-append	${homepage}/dist/${ghc_bootversion}/:bootstrap
-
-		if { ${configure.build_arch} == "x86_64" } {
-			distfiles-append	${canonicalname}-${ghc_bootversion}-darwin-x86_64-snowleopard-macports-bootstrap.tar.bz2:bootstrap
-
-			checksums-append	${canonicalname}-${ghc_bootversion}-darwin-x86_64-snowleopard-macports-bootstrap.tar.bz2 \
-						md5     70c8743dc4d606904426146e0e6d7cdf \
-						sha1    bd6830318c522527b2c35a84724832d983054416 \
-						rmd160  bc67c499417e009428fe6bf90b86fda4f1ec3e9e
-
-			extract.only		${canonicalname}-${version}-src.tar.bz2 \
-						${canonicalname}-${version}-src-extralibs.tar.bz2 \
-						${canonicalname}-${ghc_bootversion}-darwin-x86_64-snowleopard-macports-bootstrap.tar.bz2
-
-		} elseif { ${configure.build_arch} == "i386" } {
-			distfiles-append	${canonicalname}-${ghc_bootversion}-darwin-i386-snowleopard-bootstrap.tar.bz2:bootstrap
-
-			checksums-append	${canonicalname}-${ghc_bootversion}-darwin-i386-snowleopard-bootstrap.tar.bz2 \
-						md5     fba9493ef1a1cb3f54274ab59f007725 \
-						sha1    cd30029d0c32b8e97ef31c81f0a9613586628c0f \
-						rmd160  d32bc2006ff9d56da1dfecce0eb8be780e81b8b9
-
-			patchfiles-delete	patch-compiler-Makefile.local.diff		\
-						patch-libraries-cabal-bin.hs.diff		\
-						patch-mk-target.mk.diff
-
-			patchfiles-append	patch-snowleopard-i386-includes-Makefile.diff           	\
-						patch-snowleopard-i386-compiler-Makefile.local.diff             \
-						patch-snowleopard-i386-compiler-main-DriverPipeline.hs.diff     \
-						patch-snowleopard-i386-ghc-ghc.wrapper.diff                     \
-						patch-snowleopard-i386-libraries-cabal-bin.hs.diff              \
-						patch-snowleopard-i386-libraries-haskeline-haskeline.cabal.diff \
-						patch-snowleopard-i386-libffi-Makefile.diff                     \
-						patch-snowleopard-i386-mk-target.mk.diff                        \
-						patch-snowleopard-i386-utils-genapply-Makefile.diff             \
-						patch-snowleopard-i386-utils-genprimopcode-Makefile.diff        \
-						patch-snowleopard-i386-utils-hsc2hs-hsc2hs.wrapper.diff
-
-			if { !([variant_isset maintainer_debug] || [variant_isset cabal_configure_debug]) } {
-				patchfiles-delete	patch-compiler-Makefile.diff	\
-							patch-ghc-Makefile.diff		\
-							patch-libraries-Makefile.diff	\
-							patch-mk-cabal.mk.diff
-
-				patchfiles-append	patch-snowleopard-i386-compiler-Makefile.diff	\
-							patch-snowleopard-i386-ghc-Makefile.diff	\
-							patch-snowleopard-i386-libraries-Makefile.diff	\
-							patch-snowleopard-i386-mk-cabal.mk.diff
-			}
-
-			extract.only		${canonicalname}-${version}-src.tar.bz2 \
-						${canonicalname}-${version}-src-extralibs.tar.bz2 \
-						${canonicalname}-${ghc_bootversion}-darwin-i386-snowleopard-bootstrap.tar.bz2
-
-		} else {
-		        pre-fetch {
-			        # belt and braces approach:
-			        return -code error "Unrecognized build architecture on Snow Leopard"
-			}
-		}
-
-		patchfiles-append	patch-snowleopard-compiler-cmm-CLabel.hs.diff		\
-					patch-snowleopard-compiler-main-DynFlags.hs.diff	\
-					patch-snowleopard-ghc-ghc-bin.cabal.in.diff		\
-					patch-snowleopard-rts-Linker.c.diff			\
-					patch-snowleopard-rts-Makefile.diff			\
-					patch-snowleopard-rts-package.conf.in.diff
-
-}
-
-
-if {${configure.compiler} == "llvm-gcc-4.2"} {
-    configure.compiler gcc-4.2
-} elseif {${configure.compiler} == "clang"} {
-    depends_build-append port:apple-gcc42
-    configure.compiler apple-gcc-4.2
-    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
-    configure.cxx ${prefix}/bin/g++-apple-4.2
-}
-
-
-post-extract {
-     system "tar jxf ${distpath}/testsuite-${version}.tar.bz2 -C ${worksrcpath}" 
-}
-
-
-post-patch	{
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/ghc/Makefile
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/compiler/Makefile
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/compiler/Makefile.local
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/libraries/Makefile
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/libraries/cabal-bin.hs
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/aclocal.m4
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/mk/cabal.mk
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/mk/target.mk
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/utils/genapply/Makefile
-		reinplace "s|XXPATH_TO_GCCXX|${configure.cc}|g" ${worksrcpath}/utils/genprimopcode/Makefile
-
-		reinplace "s|XXPATH_TO_HSC2HSXX|${workpath}/ghc-bootstrap/bin/hsc2hs|" ${worksrcpath}/libraries/Makefile
-
-		reinplace "s|XXMACPORTS_PREFIXXX|${prefix}|" ${worksrcpath}/compiler/ghc.cabal.in
-
-		reinplace "s|/opt/local/lib/ghc-${ghc_bootversion}|${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}|g" ${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/package.conf
-
-		reinplace "s|GHCBIN=/opt/local|GHCBIN=${workpath}/${canonicalname}-bootstrap|" ${workpath}/${canonicalname}-bootstrap/bin/ghc
-
-		reinplace "s|TOPDIROPT=-B/opt/local|TOPDIROPT=-B${workpath}/${canonicalname}-bootstrap|" ${workpath}/${canonicalname}-bootstrap/bin/ghc
-
-		if {"/opt/local" != ${prefix}} {
-			reinplace "s|-L/opt/local|-L${prefix}|" ${workpath}/${canonicalname}-bootstrap/bin/ghc
-			reinplace "s|-I/opt/local|-I${prefix}|" ${workpath}/${canonicalname}-bootstrap/bin/ghc
-			reinplace "s|/opt/local|${prefix}|g" \
-				${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/ghc-asm \
-				${workpath}/${canonicalname}-bootstrap/lib/ghc-${ghc_bootversion}/ghc-split \
-		}
-}
-
-
-pre-configure	{
-		system "${prefix}/bin/autoreconf263 ${worksrcpath}"
-
-		set cfg [open "${workpath}/ghc-bootstrap/bin/ghc-pkg" w]
-		puts $cfg "#!/bin/sh"
-		if {${ghc_bootversion} eq "6.10.4"} {
-			puts $cfg "GHCPKGBIN=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/ghc-pkg"
-		} else {
-			puts $cfg "GHCPKGBIN=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/ghc-pkg.bin"
-		}
-		puts $cfg "PKGCONF=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/package.conf"
-		puts $cfg "exec \$GHCPKGBIN --global-conf \$PKGCONF \${1+\"\$@\"}"
-		close $cfg
-
-		system "chmod +x ${workpath}/ghc-bootstrap/bin/ghc-pkg"
-
-		set cfg [open "${workpath}/ghc-bootstrap/bin/hsc2hs" w]
-		puts $cfg "#!/bin/sh"
-		if {${ghc_bootversion} eq "6.10.4"} {
-			puts $cfg "HSC2HSBIN=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/hsc2hs"
-		} else {
-			puts $cfg "HSC2HSBIN=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/hsc2hs-bin"
-		}
-		if {${ghc_bootversion} eq "6.10.1" || ${ghc_bootversion} eq "6.10.4"} {
-			puts $cfg "tflag=\"--template=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/hsc2hs-0.67/template-hsc.h\""
-		} else {
-			puts $cfg "tflag=\"--template=${workpath}/ghc-bootstrap/lib/ghc-${ghc_bootversion}/template-hsc.h\""
-		}
-		puts $cfg "for arg do"
-		puts $cfg "    case \"\$arg\" in"
-		puts $cfg "        -c*)	         HSC2HS_EXTRA=;;"
-		puts $cfg "        --cc=*)       HSC2HS_EXTRA=;;"
-		puts $cfg "	   -t*)	         tflag=;;"
-		puts $cfg "        --template=*) tflag=;;"
-		puts $cfg "        --)           break;;"
-		puts $cfg "    esac"
-		puts $cfg "done"
-		if { ${configure.build_arch} == "i386" && ${os.platform} == "darwin" && ${os.major} == 10 } {
-			puts $cfg "exec \$HSC2HSBIN --cflag=\"-m32\" --lflag=\"-m32\" \$tflag \$HSC2HS_EXTRA -I${prefix}/include --lflag=\"-L${prefix}/lib\" \${1+\"\$@\"}"
-		} else {
-			puts $cfg "exec \$HSC2HSBIN \$tflag \$HSC2HS_EXTRA -I${prefix}/include --lflag=\"-L${prefix}/lib\" \${1+\"\$@\"}"
-		}
-		close $cfg
-
-		system "chmod +x ${workpath}/ghc-bootstrap/bin/hsc2hs"
-
-		set cfg [open "${worksrcpath}/mk/build.mk" w]
-	  	puts $cfg "#"
-	  	puts $cfg "# Local configuration overrides for MacPorts"
-	  	puts $cfg "#"
-	  	puts $cfg "SRC_HC_OPTS += -L${worksrcpath}/libffi"
-	  	puts $cfg "SRC_HC_OPTS += -I${prefix}/include -L${prefix}/lib"
-
-		if {[variant_isset maintainer_debug]} {
-			puts $cfg "SRC_HC_OPTS += -v -keep-tmp-files"
-		}
-
-	  	puts $cfg "EXTRA_HSC2HS_OPTS += -I${prefix}/include --lflag=\"-L${prefix}/lib\""
-	  	puts $cfg "EXTRA_LD_OPTS += -L${worksrcpath}/libffi"
-	  	puts $cfg "EXTRA_LD_OPTS += -L${prefix}/lib"
-		puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=${prefix}/include"
-		puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${prefix}/lib"
-
-		if {[variant_isset cabal_configure_debug]} then {
-			puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --verbose=3"
-		}
-
-		if { ${configure.build_arch} == "i386" && ${os.platform} == "darwin" && ${os.major} == 10 } {
-			puts $cfg "SRC_HC_OPTS += -optP-m32 -optc-m32 -opta-m32 -optl-m32"
-			puts $cfg "GHC_CC_OPTS += -optP-m32 -optc-m32 -opta-m32 -optl-m32"
-
-			puts $cfg "EXTRA_HSC2HC_OPTS += -optc-m32 -opta-m32 -optl-m32"
-
-			puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --ghc-option=-optP-m32"
-			puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --ghc-option=-optc-m32"
-			puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --ghc-option=-opta-m32"
-			puts $cfg "EXTRA_CABAL_CONFIGURE_FLAGS += --ghc-option=-optl-m32"
-		}
-
-	  	close $cfg
-}
-
-#bugs		GHC does not support DESTDIR. Instead, we install	\
-#		everything into ${destroot}${prefix}, and then fix up	\
-#		the five scripts which actually have the installation	\
-#		path hard coded.					\
-#									\
-#		The odd "ac_cv_lib_elf_nlist" environment variable	\
-#		is required to avoid including the wrong nlist.h	\
-#		header if libelf is installed on the system.
-
-configure.ldflags-append	"-L/usr/lib"
-configure.cflags-append		"-I${prefix}/include"
-configure.env-append	DYLD_FALLBACK_LIBRARY_PATH=${prefix}/lib	\
-			ac_cv_lib_elf_nlist=no
-
-configure.pre_args	--prefix=${destroot}${prefix}
-configure.args  --datadir=${destroot}${prefix}/share/${canonicalname}-${version}	\
-		--with-gmp-includes=${prefix}/include					\
-		--with-gmp-libraries=${prefix}/lib					\
-		--with-ghc='${workpath}/${canonicalname}-bootstrap/bin/ghc' 		\
-		--with-gcc=${configure.cc}
-
-# The configure script needs to be told the platform explicitly if we're on x86_64:
-if { ${configure.build_arch} == "x86_64" } {
-	configure.args-append	--build=x86_64-apple-darwin	\
-				--host=x86_64-apple-darwin	\
-				--target=x86_64-apple-darwin
-}
-
-build.env DYLD_FALLBACK_LIBRARY_PATH=${prefix}/lib
-
-destroot.destdir
-
-# Note that we catch the results of the tests, since usually at least
-# one of the tests unexpectedly fails.
-
-set testlog ${canonicalname}-${version}-tests.log
-
-test {
-     set testpath    ${worksrcpath}/testsuite-${version}
-     catch {system "cd ${testpath} && make stage=2 2>&1 | tee ${workpath}/${testlog}"}
-}
-
-
-post-destroot	{
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghc
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghc-${version}
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghci
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghci-${version}
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghc-pkg
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/ghc-pkg-${version}
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/haddock
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/hsc2hs
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/bin/runghc
-
-	reinplace "s|\\\$@\"\}|\\\$@\"\} -L${prefix}/lib -I${prefix}/include |" ${destroot}${prefix}/bin/ghc
-	reinplace s|${destroot}${prefix}|${prefix}|g ${destroot}${prefix}/lib/${canonicalname}-${version}/package.conf
-
-	file rename ${destroot}${prefix}/lib/${canonicalname}-${version}/libffi.a ${destroot}${prefix}/lib/${canonicalname}-${version}/libHsLocalFfi.a
-	reinplace s|"ffi"|"HsLocalFfi"| ${destroot}${prefix}/lib/${canonicalname}-${version}/package.conf
-
-        system "ranlib ${destroot}${prefix}/lib/ghc-${version}/*.a"
-
-	if {[file exists ${workpath}/${testlog}]} {
-		set testsavepath ${prefix}/share/${canonicalname}-${version}/tests
-		file mkdir  ${destroot}${testsavepath}
-		file rename ${workpath}/${testlog} ${destroot}${testsavepath}/${testlog}
-		ui_msg "Test results are saved in ${testsavepath}"
-	}
-}
-
-pre-activate {
-    # Previously, the ghc port was used to specify the dependency of
-    # haskell-platform. To provide an upgrade path to this port providing
-    # ghc (which conflicts with the ghc port), we need to deactivate the
-    # ghc port.
-
-    # Taken from the isl port, added 2012-08-20
-    if {![catch {set ghc_installed [lindex [registry_active ghc] 0]}]} {
-        # ghc is installed and active
-        set ghc_version [lindex ${ghc_installed} 1]
-        set ghc_epoch [lindex ${ghc_installed} 5]
-
-        if {${ghc_epoch} == 0 && [vercmp ${ghc_version} 7.4.2] < 0} {
-            # the ghc port was probably installed as dependency of
-            # haskell-platform, deactivate it
-            registry_deactivate_composite ghc "" [list ports_nodepscheck 1]
-        }
+    foreach lib $libs {
+        regexp -line {[^[:space:]]*/libffi.*\.dylib} [exec otool -L ${destlib}/${lib}] oldlib
+        system "install_name_tool -change ${oldlib} ${prefixlib}/libffi.dylib ${destlib}/$lib"
     }
 }
-
-livecheck.type	none
-
Index: unk/dports/devel/hs-platform-ghc/files/patch-aclocal.m4.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-aclocal.m4.diff	(revision 98943)
+++ 	(revision )
@@ -1,152 +1,0 @@
---- aclocal.m4.sav	2009-08-29 16:29:02.000000000 -0400
-+++ aclocal.m4	2009-08-29 16:29:51.000000000 -0400
-@@ -194,29 +194,6 @@
- AS_IF([test "$fp_num1" $2 "$fp_num2"], [$4], [$5])[]dnl
- ])# FP_COMPARE_VERSIONS
- 
--
--dnl
--dnl Check for GreenCard and version.
--dnl
--AC_DEFUN([FPTOOLS_GREENCARD],
--[
--AC_PATH_PROG(GreenCardCmd,greencard)
--AC_CACHE_CHECK([for version of greencard], fptools_cv_greencard_version,
--changequote(, )dnl
--[if test x"$GreenCardCmd" != x; then
--   fptools_cv_greencard_version="`$GreenCardCmd --version |
--			  grep 'version' | sed -e 's/greencard. version \([^ ]*\).*/\1/g'`"
--else
--   fptools_cv_greencard_version=""
--fi
--changequote([, ])dnl
--])
--FP_COMPARE_VERSIONS([$fptools_cv_greencard_version],[-lt],[$1],
--  [AC_MSG_ERROR([greencard version $1 or later is required (found '$fptools_cv_greencard_version')])])[]dnl
--GreenCardVersion=$fptools_cv_greencard_version
--AC_SUBST(GreenCardVersion)
--])
--
- dnl
- dnl Check for Happy and version.  If we're building GHC, then we need
- dnl at least Happy version 1.14.  If there's no installed Happy, we look
-@@ -237,8 +214,8 @@
- AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
- changequote(, )dnl
- [if test x"$HappyCmd" != x; then
--   fptools_cv_happy_version="`$HappyCmd -v |
--			  grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'`" ;
-+   fptools_cv_happy_version=`"$HappyCmd" -v |
-+			  grep 'Happy Version' | sed -e 's/Happy Version \([^ ]*\).*/\1/g'` ;
- else
-    fptools_cv_happy_version="";
- fi;
-@@ -247,7 +224,7 @@
- if test ! -f compiler/parser/Parser.hs || test ! -f compiler/main/ParsePkgConf.hs || test ! -f compiler/cmm/CmmParse.hs || test ! -f compiler/parser/ParserCore.hs
- then
-     FP_COMPARE_VERSIONS([$fptools_cv_happy_version],[-lt],[1.15],
--      [AC_MSG_ERROR([Happy version 1.15 or later is required to compile GHC.])])[]dnl
-+      [AC_MSG_ERROR([Happy version 1.15 or later is required to compile GHC.])])[]
- fi
- HappyVersion=$fptools_cv_happy_version;
- AC_SUBST(HappyVersion)
-@@ -272,8 +249,8 @@
- AC_CACHE_CHECK([for version of alex], fptools_cv_alex_version,
- changequote(, )dnl
- [if test x"$AlexCmd" != x; then
--   fptools_cv_alex_version="`$AlexCmd -v |
--			  grep 'Alex [Vv]ersion' | sed -e 's/Alex [Vv]ersion \([0-9\.]*\).*/\1/g'`" ;
-+   fptools_cv_alex_version=`"$AlexCmd" -v |
-+			  grep 'Alex [Vv]ersion' | sed -e 's/Alex [Vv]ersion \([0-9\.]*\).*/\1/g'` ;
- else
-    fptools_cv_alex_version="";
- fi;
-@@ -282,7 +259,7 @@
- if test ! -f compiler/cmm/CmmLex.hs || test ! -f compiler/parser/Lexer.hs
- then
-     FP_COMPARE_VERSIONS([$fptools_cv_alex_version],[-lt],[2.1.0],
--      [AC_MSG_ERROR([Alex version 2.1.0 or later is required to compile GHC.])])[]dnl
-+      [AC_MSG_ERROR([Alex version 2.1.0 or later is required to compile GHC.])])[]
- fi
- AlexVersion=$fptools_cv_alex_version;
- AC_SUBST(AlexVersion)
-@@ -518,17 +495,17 @@
- if test "$fp_have_gcc" = "NO" -a -d $srcdir/ghc; then
-   AC_MSG_ERROR([gcc is required])
- fi
--AC_CACHE_CHECK([version of gcc], [fp_gcc_version],
-+AC_CACHE_CHECK([version of gcc], [fp_cv_gcc_version],
- [if test "$fp_have_gcc" = "YES"; then
--   fp_gcc_version="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9.]]*\).*/\1/g'`"
--   FP_COMPARE_VERSIONS([$fp_gcc_version], [-lt], [2.0],
--     [AC_MSG_ERROR([Need at least gcc version 2.0 (3.4+ recommended)])])
-+   fp_cv_gcc_version="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9.]]*\).*/\1/g'`"
-+   FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [3.0],
-+     [AC_MSG_ERROR([Need at least gcc version 3.0 (3.4+ recommended)])])
-  else
--   fp_gcc_version="not-installed"
-+   fp_cv_gcc_version="not-installed"
-  fi
- ])
- AC_SUBST([HaveGcc], [$fp_have_gcc])
--AC_SUBST([GccVersion], [$fp_gcc_version])
-+AC_SUBST([GccVersion], [$fp_cv_gcc_version])
- ])# FP_HAVE_GCC
- 
- AC_DEFUN([FP_MINGW_GCC],
-@@ -785,7 +762,7 @@
- if test -n "$XmllintCmd"; then
-   AC_MSG_CHECKING([for DocBook DTD])
-   FP_GEN_DOCBOOK_XML
--  if $XmllintCmd --valid --noout conftest.xml > /dev/null 2>&1; then
-+  if $XmllintCmd --nonet --valid --noout conftest.xml ; then
-     AC_MSG_RESULT([ok])
-   else
-     AC_MSG_RESULT([failed])
-@@ -805,7 +782,7 @@
- AC_DEFUN([FP_PROG_GHC_PKG],
- [AC_CACHE_CHECK([for ghc-pkg matching $WithGhc], fp_cv_matching_ghc_pkg,
- [fp_ghc_pkg_guess=`echo $WithGhc | sed 's,ghc\(@<:@^/\\@:>@*\)$,ghc-pkg\1,'`
--if "$fp_ghc_pkg_guess" -l > /dev/null 2>&1; then
-+if "$fp_ghc_pkg_guess" -l > /dev/null 2>&1 || "$fp_ghc_pkg_guess" list > /dev/null 2>&1; then
-   fp_cv_matching_ghc_pkg=$fp_ghc_pkg_guess
- elif "$fp_ghc_pkg_guess" list > /dev/null 2>&1; then
-   # from 6.10, ghc-pkg doesn't support the old -l syntax any more
-@@ -841,23 +818,23 @@
- [AC_REQUIRE([FP_HAVE_GCC])
- AC_CACHE_CHECK([for extra options to pass gcc when compiling via C], [fp_cv_gcc_extra_opts],
- [fp_cv_gcc_extra_opts=
-- FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.4],
-+ FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.4],
-   [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fwrapv"],
-   [])
-  case $TargetPlatform in
-   i386-*|x86_64-*) 
--     FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.2],
-+     FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.2],
-       [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -mno-omit-leaf-frame-pointer"],
-       [])
--    FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [3.4],
--     [FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [4.2],
-+    FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [3.4],
-+     [FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [4.2],
-        [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fno-toplevel-reorder"],
-        [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fno-unit-at-a-time"]
-      )],
-      [])
-   ;;
-   sparc-*-solaris2) 
--    FP_COMPARE_VERSIONS([$fp_gcc_version], [-ge], [4.2],
-+    FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-ge], [4.2],
-       [fp_cv_gcc_extra_opts="$fp_cv_gcc_extra_opts -fno-toplevel-reorder"],
-       [])
-   ;;
-@@ -1128,7 +1105,7 @@
-   rm -f *.hi
-   rm -f pwd
-   rm -f pwd.exe
--  $WithGhc -v0 --make pwd -o pwd
-+  $WithGhc -v0 -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX --make pwd -o pwd
-   cd ../..
- fi
- 
Index: unk/dports/devel/hs-platform-ghc/files/patch-compiler-Makefile-debug.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-compiler-Makefile-debug.diff	(revision 98943)
+++ 	(revision )
@@ -1,18 +1,0 @@
---- compiler/Makefile.sav	2009-08-27 08:09:21.000000000 -0400
-+++ compiler/Makefile	2009-08-27 08:16:20.000000000 -0400
-@@ -186,10 +186,14 @@
- 
- boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) $(PARSER_Y)
- 	test -f $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
--	$(CABAL) configure --distpref dist-stage$* \
-+	$(CABAL) configure --verbose=3 --distpref dist-stage$* \
- 	                   $(CONFIGURE_FLAGS_STAGE$*) \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(COMMON_CONFIGURE_FLAGS) \
-+			   --ghc-option='-pgmP "XXPATH_TO_GCCXX -E -undef -traditional"' \
-+			   --ghc-option='-pgmc XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgml XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgma XXPATH_TO_GCCXX' \
- 	                   --ghc-option=-DSTAGE=$*
- 	$(RM) -f Makefile-stage$*
- 	$(CABAL) makefile  --distpref dist-stage$* -f Makefile-stage$*
Index: unk/dports/devel/hs-platform-ghc/files/patch-compiler-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-compiler-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,13 +1,0 @@
---- compiler/Makefile.sav	2009-08-27 08:09:21.000000000 -0400
-+++ compiler/Makefile	2009-08-27 08:17:36.000000000 -0400
-@@ -190,6 +190,10 @@
- 	                   $(CONFIGURE_FLAGS_STAGE$*) \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(COMMON_CONFIGURE_FLAGS) \
-+			   --ghc-option='-pgmP "XXPATH_TO_GCCXX -E -undef -traditional"' \
-+			   --ghc-option='-pgmc XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgml XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgma XXPATH_TO_GCCXX' \
- 	                   --ghc-option=-DSTAGE=$*
- 	$(RM) -f Makefile-stage$*
- 	$(CABAL) makefile  --distpref dist-stage$* -f Makefile-stage$*
Index: unk/dports/devel/hs-platform-ghc/files/patch-compiler-Makefile.local.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-compiler-Makefile.local.diff	(revision 98943)
+++ 	(revision )
@@ -1,13 +1,0 @@
---- compiler/Makefile.local.sav	2009-08-25 10:58:22.000000000 -0400
-+++ compiler/Makefile.local	2009-08-25 11:42:30.000000000 -0400
-@@ -19,6 +19,10 @@
- GHC_CC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
- GHC_OPTS    += $(SRC_HC_OPTS)
- GHC_OPTS    += $(GhcHcOpts)
-+GHC_CC_OPTS += -pgmP "XXPATH_TO_GCCXX -E -undef -traditional"
-+GHC_CC_OPTS += -pgma XXPATH_TO_GCCXX
-+GHC_CC_OPTS += -pgmc XXPATH_TO_GCCXX
-+GHC_CC_OPTS += -pgml XXPATH_TO_GCCXX
- GHC_OPTS    += $(GhcStage$(stage)HcOpts)
- GHC_OPTS    += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
- LIB_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
Index: unk/dports/devel/hs-platform-ghc/files/patch-compiler-ghc.cabal.in.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-compiler-ghc.cabal.in.diff	(revision 98943)
+++ 	(revision )
@@ -1,10 +1,0 @@
---- compiler/ghc.cabal.in.sav	2009-07-01 11:56:08.000000000 -0400
-+++ compiler/ghc.cabal.in	2009-07-01 11:57:34.000000000 -0400
-@@ -67,6 +67,7 @@
-         Build-Depends: unix
- 
-     GHC-Options: -Wall -fno-warn-name-shadowing -fno-warn-orphans
-+    extra-lib-dirs: XXMACPORTS_PREFIXXX/lib
- 
-     if flag(ghci)
-         Build-Depends: template-haskell
Index: /trunk/dports/devel/hs-platform-ghc/files/patch-configure-disable-docbook-ps-and-pdf.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-configure-disable-docbook-ps-and-pdf.diff	(revision 98944)
+++ /trunk/dports/devel/hs-platform-ghc/files/patch-configure-disable-docbook-ps-and-pdf.diff	(revision 98944)
@@ -0,0 +1,11 @@
+--- configure.orig	2012-06-30 00:18:22.000000000 +0200
++++ configure	2012-06-30 00:19:19.000000000 +0200
+@@ -10401,6 +10401,8 @@
+     BUILD_DOCBOOK_PS=YES
+     BUILD_DOCBOOK_PDF=YES
+ fi
++BUILD_DOCBOOK_PS=NO
++BUILD_DOCBOOK_PDF=NO
+ 
+ 
+ 
Index: unk/dports/devel/hs-platform-ghc/files/patch-configure.ac.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-configure.ac.diff	(revision 98943)
+++ 	(revision )
@@ -1,60 +1,0 @@
---- configure.ac.sav	2009-08-29 16:28:58.000000000 -0400
-+++ configure.ac	2009-08-29 16:30:11.000000000 -0400
-@@ -795,7 +795,7 @@
-      AC_MSG_ERROR([GHC is required unless bootstrapping from .hc files.])
-   fi
-   FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[6.4],
--    [AC_MSG_ERROR([GHC version 6.4 or later is required to compile GHC.])])dnl
-+    [AC_MSG_ERROR([GHC version 6.4 or later is required to compile GHC.])])
- fi;
- 
- # This uses GHC, so put it after the "GHC is required" check above:
-@@ -987,15 +987,6 @@
- dnl ** check for ghc-pkg command
- FP_PROG_GHC_PKG
- 
--AC_ARG_WITH(greencard,
--[AC_HELP_STRING([--with-greencard=ARG],
--        [Use ARG as the path to greencard  [default=autodetct]])],
--[
--GreenCardCmd=$withval;
--FPTOOLS_GREENCARD(3.00)
--]
--)
--
- dnl ** check for installed happy binary + version
- dnl    (don't do it if we're booting from .hc files though.)
- if test "$BootingFromHc" = "NO"; then
-@@ -1138,19 +1129,19 @@
- 
- dnl ** (Mac OS X only: check for GMP.framework)
- HaveFrameworkGMP=NO
--case $HostPlatform in
--*-apple-darwin)
--    AC_MSG_CHECKING([for GMP.framework])
--    save_libs="$LIBS"
--    LIBS="-framework GMP"
--    AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
--    if test $HaveFrameworkGMP = YES; then
--      AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
--    fi;
--    LIBS="$save_libs"
--    AC_MSG_RESULT([$HaveFrameworkGMP])
--    ;;
--esac
-+dnl case $HostPlatform in
-+dnl *-apple-darwin)
-+dnl    AC_MSG_CHECKING([for GMP.framework])
-+dnl    save_libs="$LIBS"
-+dnl    LIBS="-framework GMP"
-+dnl    AC_TRY_LINK_FUNC(__gmpz_fdiv_qr, HaveFrameworkGMP=YES,)
-+dnl    if test $HaveFrameworkGMP = YES; then
-+dnl      AC_DEFINE([HAVE_FRAMEWORK_GMP], [1], [Define to 1 if GMP.framework is installed (Mac OS X only).])
-+dnl    fi;
-+dnl    LIBS="$save_libs"
-+dnl    AC_MSG_RESULT([$HaveFrameworkGMP])
-+dnl    ;;
-+dnl esac
- AC_SUBST(HaveFrameworkGMP)
- 
- dnl ** check for mingwex library
Index: unk/dports/devel/hs-platform-ghc/files/patch-ghc-Makefile-debug.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-ghc-Makefile-debug.diff	(revision 98943)
+++ 	(revision )
@@ -1,18 +1,0 @@
---- ghc/Makefile.sav	2009-08-27 08:20:43.000000000 -0400
-+++ ghc/Makefile	2009-08-27 08:21:06.000000000 -0400
-@@ -108,10 +108,14 @@
- dist-stage1 dist-stage2 dist-stage3: dist-stage%: boot.stage.%
- 
- boot.stage.%:
--	$(CABAL) configure --distpref dist-stage$*         \
-+	$(CABAL) configure --verbose=3 --distpref dist-stage$*         \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(CONFIGURE_FLAGS_STAGE$*)      \
- 	                   $(COMMON_CONFIGURE_FLAGS)       \
-+			   --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' \
-+			   --ghc-option='-pgmc XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgml XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgma XXPATH_TO_GCCXX' \
- 	                   --libsubdir=.                   \
- 	                   --datadir='$$libdir'            \
- 	                   --datasubdir=.
Index: unk/dports/devel/hs-platform-ghc/files/patch-ghc-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-ghc-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,13 +1,0 @@
---- ghc/Makefile.sav	2009-08-27 08:20:43.000000000 -0400
-+++ ghc/Makefile	2009-08-27 08:23:28.000000000 -0400
-@@ -112,6 +112,10 @@
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(CONFIGURE_FLAGS_STAGE$*)      \
- 	                   $(COMMON_CONFIGURE_FLAGS)       \
-+			   --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' \
-+			   --ghc-option='-pgmc XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgml XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgma XXPATH_TO_GCCXX' \
- 	                   --libsubdir=.                   \
- 	                   --datadir='$$libdir'            \
- 	                   --datasubdir=.
Index: unk/dports/devel/hs-platform-ghc/files/patch-libraries-Makefile-debug.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-libraries-Makefile-debug.diff	(revision 98943)
+++ 	(revision )
@@ -1,44 +1,0 @@
---- libraries/Makefile.sav	2009-08-27 08:24:39.000000000 -0400
-+++ libraries/Makefile	2009-08-27 08:25:20.000000000 -0400
-@@ -123,7 +123,7 @@
- 
- HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
- 
--CABAL_GHC_FLAGS = -Wall
-+CABAL_GHC_FLAGS = -v3 -Wall -pgmP "XXPATH_TO_GCCXX -E -undef -traditional" -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX
- ifeq "$(ghc_ge_605)" "NO"
- CABAL_GHC_FLAGS += -cpp
- endif
-@@ -141,19 +141,19 @@
- bootstrapping.conf: cabal-bin
- 	echo "[]" > $@.tmp
- 	-cd extensible-exceptions && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd extensible-exceptions && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd extensible-exceptions && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd extensible-exceptions && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd filepath && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd filepath && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd Cabal    && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd Cabal    && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd hpc    && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd hpc    && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --with-hsc2hs=XXPATH_TO_HSC2HSXX --package-db=$(HERE_ABS)/$@.tmp
- 	cd hpc    && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	mv $@.tmp $@
-@@ -165,7 +165,7 @@
- ifeq "$(stage)" "2"
- 	cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
- else
--	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
-+	cd ifBuildable && $(GHC) -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX -Wall --make ifBuildable -o ifBuildable
- endif
- 
- .PHONY: all build configure
Index: unk/dports/devel/hs-platform-ghc/files/patch-libraries-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-libraries-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,44 +1,0 @@
---- libraries/Makefile.sav	2009-08-27 08:24:39.000000000 -0400
-+++ libraries/Makefile	2009-08-27 08:29:44.000000000 -0400
-@@ -123,7 +123,7 @@
- 
- HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
- 
--CABAL_GHC_FLAGS = -Wall
-+CABAL_GHC_FLAGS = -Wall -pgmP "XXPATH_TO_GCCXX -E -undef -traditional" -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX
- ifeq "$(ghc_ge_605)" "NO"
- CABAL_GHC_FLAGS += -cpp
- endif
-@@ -141,19 +141,19 @@
- bootstrapping.conf: cabal-bin
- 	echo "[]" > $@.tmp
- 	-cd extensible-exceptions && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd extensible-exceptions && $(CABAL) configure  --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd extensible-exceptions && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd extensible-exceptions && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd filepath && $(CABAL) configure  --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd filepath && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd Cabal    && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd Cabal    && $(CABAL) configure  --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd hpc    && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd hpc    && $(CABAL) configure  --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --with-hsc2hs=XXPATH_TO_HSC2HSXX --package-db=$(HERE_ABS)/$@.tmp
- 	cd hpc    && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	mv $@.tmp $@
-@@ -165,7 +165,7 @@
- ifeq "$(stage)" "2"
- 	cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
- else
--	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
-+	cd ifBuildable && $(GHC) -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX -Wall --make ifBuildable -o ifBuildable
- endif
- 
- .PHONY: all build configure
Index: unk/dports/devel/hs-platform-ghc/files/patch-libraries-cabal-bin.hs.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-libraries-cabal-bin.hs.diff	(revision 98943)
+++ 	(revision )
@@ -1,13 +1,0 @@
---- libraries/cabal-bin.hs.sav	2009-08-26 15:29:20.000000000 -0400
-+++ libraries/cabal-bin.hs	2009-08-26 15:30:51.000000000 -0400
-@@ -53,6 +53,10 @@
-     unless cleaning $
-         rawSystemExit verbosity ghc ["-package-conf", packageConf,
-                                      "--make", "Setup",
-+				     "-pgmP", "XXPATH_TO_GCCXX -E -undef -traditional",
-+				     "-pgmc", "XXPATH_TO_GCCXX",
-+				     "-pgml", "XXPATH_TO_GCCXX",
-+				     "-pgma", "XXPATH_TO_GCCXX",
-                                      "-package", "Cabal-" ++ useCabalVersion,
-                                      "-o", "Setup"]
-     rawSystemExit verbosity "./Setup" args
Index: unk/dports/devel/hs-platform-ghc/files/patch-libraries-terminfo-configure.ac.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-libraries-terminfo-configure.ac.diff	(revision 98943)
+++ 	(revision )
@@ -1,15 +1,0 @@
---- libraries/terminfo/configure.ac.sav	2009-08-28 08:46:45.000000000 -0400
-+++ libraries/terminfo/configure.ac	2009-08-28 08:47:27.000000000 -0400
-@@ -40,9 +40,9 @@
- fi
- 
- AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
--  AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
--    AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
--      HaveLibCurses=NO; LibCurses=not-installed)))
-+  [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
-+    [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
-+      HaveLibCurses=NO; LibCurses=not-installed)])])
- 
- if test "x$HaveLibCurses" = "xNO" ; then
-     AC_MSG_FAILURE([curses library not found, so this package cannot be built])
Index: unk/dports/devel/hs-platform-ghc/files/patch-mk-cabal.mk-debug.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-mk-cabal.mk-debug.diff	(revision 98943)
+++ 	(revision )
@@ -1,27 +1,0 @@
---- mk/cabal.mk.sav	2009-12-04 14:45:24.000000000 -0500
-+++ mk/cabal.mk	2009-12-04 14:51:29.000000000 -0500
-@@ -25,17 +25,21 @@
- 
- default all: with-bootstrapping-compiler
- 
-+CABAL_GHC_MACPORTS_FLAGS = --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' --ghc-option='-pgmc XXPATH_TO_GCCXX' --ghc-option='-pgml XXPATH_TO_GCCXX' --ghc-option='-pgma XXPATH_TO_GCCXX'
-+
- with-bootstrapping-compiler:
--	$(CABAL) configure --distpref dist-inplace          \
-+	$(CABAL) configure --verbose=3 --distpref dist-inplace          \
- 	                   $(INPLACE_DIRS_CONFIGURE_FLAGS)  \
- 	                   $(USE_BOOT_CONFIGURE_FLAGS)      \
- 	                   $(COMMON_CONFIGURE_FLAGS)        \
-+			   $(CABAL_GHC_MACPORTS_FLAGS)      \
- 	                   $(EXTRA_INPLACE_CONFIGURE_FLAGS)
--	$(CABAL) build     --distpref dist-inplace $(BUILD_FLAGS)
-+	$(CABAL) build     --verbose=3 --distpref dist-inplace \
-+			   $(BUILD_FLAGS)
- 	$(CABAL) install   --distpref dist-inplace $(INSTALL_FLAGS)
- 
- with-stage-2:
--	$(CABAL) configure --distpref dist-install         \
-+	$(CABAL) configure --verbose=3 --distpref dist-install         \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(USE_STAGE2_CONFIGURE_FLAGS)   \
- 	                   $(COMMON_CONFIGURE_FLAGS)       \
Index: unk/dports/devel/hs-platform-ghc/files/patch-mk-cabal.mk.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-mk-cabal.mk.diff	(revision 98943)
+++ 	(revision )
@@ -1,27 +1,0 @@
---- mk/cabal.mk.sav	2009-08-27 08:31:02.000000000 -0400
-+++ mk/cabal.mk	2009-08-27 08:33:16.000000000 -0400
-@@ -25,17 +25,21 @@
- 
- default all: with-bootstrapping-compiler
- 
-+CABAL_GHC_MACPORTS_FLAGS = --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' --ghc-option='-pgmc XXPATH_TO_GCCXX' --ghc-option='-pgml XXPATH_TO_GCCXX' --ghc-option='-pgma XXPATH_TO_GCCXX'
-+
- with-bootstrapping-compiler:
--	$(CABAL) configure --distpref dist-inplace          \
-+	$(CABAL) configure  --distpref dist-inplace          \
- 	                   $(INPLACE_DIRS_CONFIGURE_FLAGS)  \
- 	                   $(USE_BOOT_CONFIGURE_FLAGS)      \
- 	                   $(COMMON_CONFIGURE_FLAGS)        \
-+			   $(CABAL_GHC_MACPORTS_FLAGS)      \
- 	                   $(EXTRA_INPLACE_CONFIGURE_FLAGS)
--	$(CABAL) build     --distpref dist-inplace $(BUILD_FLAGS)
-+	$(CABAL) build      --distpref dist-inplace \
-+			   $(BUILD_FLAGS)
- 	$(CABAL) install   --distpref dist-inplace $(INSTALL_FLAGS)
- 
- with-stage-2:
--	$(CABAL) configure --distpref dist-install         \
-+	$(CABAL) configure  --distpref dist-install         \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(USE_STAGE2_CONFIGURE_FLAGS)   \
- 	                   $(COMMON_CONFIGURE_FLAGS)       \
Index: unk/dports/devel/hs-platform-ghc/files/patch-mk-target.mk.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-mk-target.mk.diff	(revision 98943)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- mk/target.mk.sav	2009-07-20 01:55:01.000000000 -0400
-+++ mk/target.mk	2009-07-20 01:56:42.000000000 -0400
-@@ -86,7 +86,7 @@
- ifeq "$(USE_NEW_MKDEPEND_FLAGS)" "YES"
- MKDEPENDHS_FLAGS = -dep-makefile .depend $(foreach way,$(WAYS),-dep-suffix $(way))
- else
--MKDEPENDHS_FLAGS = -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way))
-+MKDEPENDHS_FLAGS = -optdep-f -optdep.depend -pgmP "XXPATH_TO_GCCXX -E -undef -traditional" -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX $(foreach way,$(WAYS),-optdep-s -optdep$(way))
- endif
- 
- depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(PKGCONF_DEP)
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-compiler-cmm-CLabel.hs.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-compiler-cmm-CLabel.hs.diff	(revision 98943)
+++ 	(revision )
@@ -1,13 +1,0 @@
---- compiler/cmm/CLabel.hs.sav	2010-03-09 16:45:23.000000000 -0500
-+++ compiler/cmm/CLabel.hs	2010-03-09 16:53:31.000000000 -0500
-@@ -918,6 +918,10 @@
- pprDynamicLinkerAsmLabel :: DynamicLinkerLabelInfo -> CLabel -> SDoc
- 
- #if x86_64_TARGET_ARCH && darwin_TARGET_OS
-+pprDynamicLinkerAsmLabel CodeStub lbl
-+  = char 'L' <> pprCLabel lbl <> text "$stub"
-+pprDynamicLinkerAsmLabel SymbolPtr lbl
-+  = char 'L' <> pprCLabel lbl <> text "$non_lazy_ptr"
- pprDynamicLinkerAsmLabel GotSymbolPtr lbl
-   = pprCLabel lbl <> text "@GOTPCREL"
- pprDynamicLinkerAsmLabel GotSymbolOffset lbl
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-compiler-main-DynFlags.hs.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-compiler-main-DynFlags.hs.diff	(revision 98943)
+++ 	(revision )
@@ -1,22 +1,0 @@
---- compiler/main/DynFlags.hs.sav	2010-03-09 16:45:42.000000000 -0500
-+++ compiler/main/DynFlags.hs	2010-03-09 16:47:38.000000000 -0500
-@@ -577,9 +577,7 @@
-         hpcDir                  = ".hpc",
- 
-         opt_L                   = [],
--        opt_P                   = (if opt_PIC
--                                   then ["-D__PIC__"]
--                                   else []),
-+        opt_P                   = [],
-         opt_F                   = [],
-         opt_c                   = [],
-         opt_a                   = [],
-@@ -2172,7 +2170,7 @@
-       --     in dynamic libraries.
- 
-     | opt_PIC
--        = ["-fno-common", "-D__PIC__"]
-+        = ["-fno-common"]
-     | otherwise
-         = ["-mdynamic-no-pic"]
- #elif mingw32_TARGET_OS
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-ghc-ghc-bin.cabal.in.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-ghc-ghc-bin.cabal.in.diff	(revision 98943)
+++ 	(revision )
@@ -1,8 +1,0 @@
---- ghc/ghc-bin.cabal.in.sav	2010-03-09 17:01:04.000000000 -0500
-+++ ghc/ghc-bin.cabal.in	2010-03-09 17:02:23.000000000 -0500
-@@ -60,3 +60,5 @@
- 
-     Extensions: CPP, PatternGuards, MagicHash
- 
-+    ld-options: -pagezero_size 0x1000
-+
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-compiler-Makefile-debug.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-compiler-Makefile-debug.diff	(revision 98943)
+++ 	(revision )
@@ -1,21 +1,0 @@
---- compiler/Makefile.sav	2009-12-04 14:44:53.000000000 -0500
-+++ compiler/Makefile	2009-12-04 14:47:31.000000000 -0500
-@@ -186,10 +186,17 @@
- 
- boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) $(PARSER_Y)
- 	test -f $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
--	$(CABAL) configure --distpref dist-stage$* \
-+	$(CABAL) configure --verbose=3 --distpref dist-stage$* \
- 	                   $(CONFIGURE_FLAGS_STAGE$*) \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(COMMON_CONFIGURE_FLAGS) \
-+			   --ghc-option='-pgmP "XXPATH_TO_GCCXX -E -undef -traditional"' \
-+			   --ghc-option='-pgmc XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgml XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgma XXPATH_TO_GCCXX' \
-+			   --ghc-option=-optc-m32		\
-+			   --ghc-option=-opta-m32		\
-+			   --ghc-option=-optl-m32		\
- 	                   --ghc-option=-DSTAGE=$*
- 	$(RM) -f Makefile-stage$*
- 	$(CABAL) makefile  --distpref dist-stage$* -f Makefile-stage$*
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-compiler-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-compiler-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,16 +1,0 @@
---- compiler/Makefile.sav	2009-12-04 13:56:13.000000000 -0500
-+++ compiler/Makefile	2009-12-04 14:05:52.000000000 -0500
-@@ -190,6 +190,13 @@
- 	                   $(CONFIGURE_FLAGS_STAGE$*) \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(COMMON_CONFIGURE_FLAGS) \
-+			   --ghc-option='-pgmP "XXPATH_TO_GCCXX -E -undef -traditional"' \
-+			   --ghc-option='-pgmc XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgml XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgma XXPATH_TO_GCCXX' \
-+			   --ghc-option=-optc-m32		\
-+			   --ghc-option=-optl-m32		\
-+			   --ghc-option=-opta-m32		\
- 	                   --ghc-option=-DSTAGE=$*
- 	$(RM) -f Makefile-stage$*
- 	$(CABAL) makefile  --distpref dist-stage$* -f Makefile-stage$*
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-compiler-Makefile.local.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-compiler-Makefile.local.diff	(revision 98943)
+++ 	(revision )
@@ -1,16 +1,0 @@
---- compiler/Makefile.local.sav	2009-12-04 13:56:21.000000000 -0500
-+++ compiler/Makefile.local	2009-12-04 14:06:35.000000000 -0500
-@@ -19,6 +19,13 @@
- GHC_CC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
- GHC_OPTS    += $(SRC_HC_OPTS)
- GHC_OPTS    += $(GhcHcOpts)
-+GHC_CC_OPTS += -pgmP "XXPATH_TO_GCCXX -E -undef -traditional"
-+GHC_CC_OPTS += -pgma XXPATH_TO_GCCXX
-+GHC_CC_OPTS += -pgmc XXPATH_TO_GCCXX
-+GHC_CC_OPTS += -pgml XXPATH_TO_GCCXX
-+GHC_CC_OPTS += -optc-m32
-+GHC_CC_OPTS += -opta-m32
-+GHC_CC_OPTS += -optl-m32
- GHC_OPTS    += $(GhcStage$(stage)HcOpts)
- GHC_OPTS    += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
- LIB_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-compiler-main-DriverPipeline.hs.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-compiler-main-DriverPipeline.hs.diff	(revision 98943)
+++ 	(revision )
@@ -1,10 +1,0 @@
---- compiler/main/DriverPipeline.hs.sav	2010-01-31 17:02:21.000000000 -0500
-+++ compiler/main/DriverPipeline.hs	2010-01-31 17:02:54.000000000 -0500
-@@ -1167,6 +1167,7 @@
-                             SysTools.Option "-nodefaultlibs",
-                             SysTools.Option "-Wl,-r",
-                             SysTools.Option ld_x_flag,
-+                            SysTools.Option "-m32",
-                             SysTools.Option "-o",
-                             SysTools.FileOption "" output_fn ] ++ args)
-             ld_x_flag | null cLD_X = ""
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-ghc-Makefile-debug.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-ghc-Makefile-debug.diff	(revision 98943)
+++ 	(revision )
@@ -1,21 +1,0 @@
---- ghc/Makefile.sav	2009-12-04 14:45:02.000000000 -0500
-+++ ghc/Makefile	2009-12-04 14:49:04.000000000 -0500
-@@ -108,10 +108,17 @@
- dist-stage1 dist-stage2 dist-stage3: dist-stage%: boot.stage.%
- 
- boot.stage.%:
--	$(CABAL) configure --distpref dist-stage$*         \
-+	$(CABAL) configure --verbose=3 --distpref dist-stage$*         \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(CONFIGURE_FLAGS_STAGE$*)      \
- 	                   $(COMMON_CONFIGURE_FLAGS)       \
-+			   --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' \
-+			   --ghc-option='-pgmc XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgml XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgma XXPATH_TO_GCCXX' \
-+			   --ghc-option=-optc-m32		\
-+			   --ghc-option=-opta-m32		\
-+			   --ghc-option=-optl-m32		\
- 	                   --libsubdir=.                   \
- 	                   --datadir='$$libdir'            \
- 	                   --datasubdir=.
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-ghc-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-ghc-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,16 +1,0 @@
---- ghc/Makefile.sav	2009-12-04 13:57:21.000000000 -0500
-+++ ghc/Makefile	2009-12-04 14:08:06.000000000 -0500
-@@ -112,6 +112,13 @@
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(CONFIGURE_FLAGS_STAGE$*)      \
- 	                   $(COMMON_CONFIGURE_FLAGS)       \
-+			   --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' \
-+			   --ghc-option='-pgmc XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgml XXPATH_TO_GCCXX' \
-+			   --ghc-option='-pgma XXPATH_TO_GCCXX' \
-+			   --ghc-option=-optc-m32		\
-+			   --ghc-option=-opta-m32		\
-+			   --ghc-option=-optl-m32		\
- 	                   --libsubdir=.                   \
- 	                   --datadir='$$libdir'            \
- 	                   --datasubdir=.
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-ghc-ghc.wrapper.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-ghc-ghc.wrapper.diff	(revision 98943)
+++ 	(revision )
@@ -1,7 +1,0 @@
---- ghc/ghc.wrapper.sav	2010-01-11 19:08:00.000000000 -0500
-+++ ghc/ghc.wrapper	2010-01-11 19:09:34.000000000 -0500
-@@ -1,3 +1,3 @@
- #!/bin/sh
- 
--exec $executablename -B$datadir -dynload wrapped ${1+"$@"}
-+exec $executablename -B$datadir -optc-m32 -opta-m32 -optl-m32 -dynload wrapped ${1+"$@"}
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-includes-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-includes-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,28 +1,0 @@
---- includes/Makefile.sav	2009-12-05 12:53:11.000000000 -0500
-+++ includes/Makefile	2009-12-05 12:58:11.000000000 -0500
-@@ -127,8 +127,11 @@
- 
- mkDerivedConstants.c : $(H_CONFIG) $(H_PLATFORM)
- 
-+mkDerivedConstants.o : mkDerivedConstants.c
-+	$(CC) -o $@ -m32 $(CC_OPTS) -c $<
-+
- mkDerivedConstantsHdr : mkDerivedConstants.o
--	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkDerivedConstants.o
-+	$(CC) -o $@ -m32 $(CC_OPTS) $(LD_OPTS) mkDerivedConstants.o
- 
- DerivedConstants.h : mkDerivedConstantsHdr
- 	./mkDerivedConstantsHdr >$@
-@@ -151,10 +154,10 @@
- else
- 
- mkGHCConstants : mkGHCConstants.o
--	$(CC) -o $@ $(CC_OPTS) $(LD_OPTS) mkGHCConstants.o
-+	$(CC) -o $@ -m32 $(CC_OPTS) $(LD_OPTS) mkGHCConstants.o
- 
- mkGHCConstants.o : mkDerivedConstants.c
--	$(CC) -o $@ $(CC_OPTS) -c $<  -DGEN_HASKELL
-+	$(CC) -o $@ -m32 $(CC_OPTS) -c $<  -DGEN_HASKELL
- 
- GHCConstants.h : mkGHCConstants
- 	./mkGHCConstants >$@
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libffi-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libffi-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- libffi/Makefile.sav	2010-02-07 12:17:10.000000000 -0500
-+++ libffi/Makefile	2010-02-07 12:17:33.000000000 -0500
-@@ -84,7 +84,7 @@
- 	    PATH=`pwd`:$$PATH; \
- 	    export PATH; \
- 	    cd build && \
--	    CC=$(WhatGccIsCalled) $(SHELL) configure \
-+	    CC=$(WhatGccIsCalled) CFLAGS="-O2 -m32" $(SHELL) configure \
- 		  --enable-static=yes \
- 	          --enable-shared=$(EnableShared) \
- 		  --host=$(PLATFORM) --build=$(PLATFORM)
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libraries-Makefile-debug.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libraries-Makefile-debug.diff	(revision 98943)
+++ 	(revision )
@@ -1,44 +1,0 @@
---- libraries/Makefile.sav	2009-12-04 14:45:11.000000000 -0500
-+++ libraries/Makefile	2009-12-04 14:50:12.000000000 -0500
-@@ -123,7 +123,7 @@
- 
- HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
- 
--CABAL_GHC_FLAGS = -Wall
-+CABAL_GHC_FLAGS = -v3 -Wall -pgmP "XXPATH_TO_GCCXX -E -undef -traditional" -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX -optP-m32 -optc-m32 -opta-m32 -optl-m32
- ifeq "$(ghc_ge_605)" "NO"
- CABAL_GHC_FLAGS += -cpp
- endif
-@@ -141,19 +141,19 @@
- bootstrapping.conf: cabal-bin
- 	echo "[]" > $@.tmp
- 	-cd extensible-exceptions && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd extensible-exceptions && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd extensible-exceptions && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd extensible-exceptions && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd filepath && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd filepath && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd Cabal    && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd Cabal    && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd hpc    && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd hpc    && $(CABAL) configure --verbose=3 --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --with-hsc2hs=XXPATH_TO_HSC2HSXX --package-db=$(HERE_ABS)/$@.tmp
- 	cd hpc    && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	mv $@.tmp $@
-@@ -165,7 +165,7 @@
- ifeq "$(stage)" "2"
- 	cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
- else
--	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
-+	cd ifBuildable && $(GHC) -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX -optc-m32 -opta-m32 -optl-m32 -Wall --make ifBuildable -o ifBuildable
- endif
- 
- .PHONY: all build configure
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libraries-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libraries-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,44 +1,0 @@
---- libraries/Makefile.sav	2009-12-04 13:57:40.000000000 -0500
-+++ libraries/Makefile	2009-12-04 14:10:52.000000000 -0500
-@@ -123,7 +123,7 @@
- 
- HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
- 
--CABAL_GHC_FLAGS = -Wall
-+CABAL_GHC_FLAGS = -Wall -pgmP "XXPATH_TO_GCCXX -E -undef -traditional" -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX -optP-m32 -optc-m32 -opta-m32 -optl-m32
- ifeq "$(ghc_ge_605)" "NO"
- CABAL_GHC_FLAGS += -cpp
- endif
-@@ -141,19 +141,19 @@
- bootstrapping.conf: cabal-bin
- 	echo "[]" > $@.tmp
- 	-cd extensible-exceptions && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd extensible-exceptions && $(CABAL) configure  --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd extensible-exceptions && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd extensible-exceptions && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd filepath && $(CABAL) configure  --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd filepath && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd Cabal    && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd Cabal    && $(CABAL) configure  --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
- 	cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	-cd hpc    && $(CABAL) clean     --distpref=dist-bootstrapping
--	cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
-+	cd hpc    && $(CABAL) configure  --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-gcc=XXPATH_TO_GCCXX --ghc-options='$(CABAL_GHC_FLAGS)' --with-hc-pkg=$(GHC_PKG) --with-hsc2hs=XXPATH_TO_HSC2HSXX --package-db=$(HERE_ABS)/$@.tmp
- 	cd hpc    && $(CABAL) build     --distpref=dist-bootstrapping
- 	cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
- 	mv $@.tmp $@
-@@ -165,7 +165,7 @@
- ifeq "$(stage)" "2"
- 	cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
- else
--	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
-+	cd ifBuildable && $(GHC) -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX -optc-m32 -opta-m32 -optl-m32 -Wall --make ifBuildable -o ifBuildable
- endif
- 
- .PHONY: all build configure
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libraries-cabal-bin.hs.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libraries-cabal-bin.hs.diff	(revision 98943)
+++ 	(revision )
@@ -1,17 +1,0 @@
---- libraries/cabal-bin.hs.sav	2010-03-05 15:14:33.000000000 -0500
-+++ libraries/cabal-bin.hs	2010-03-05 15:15:14.000000000 -0500
-@@ -53,6 +53,14 @@
-     unless cleaning $
-         rawSystemExit verbosity ghc ["-package-conf", packageConf,
-                                      "--make", "Setup",
-+				     "-optP-m32",
-+				     "-optc-m32",
-+				     "-opta-m32",
-+				     "-optl-m32",
-+				     "-pgmP", "XXPATH_TO_GCCXX -E -undef -traditional",
-+				     "-pgmc", "XXPATH_TO_GCCXX",
-+				     "-pgml", "XXPATH_TO_GCCXX",
-+				     "-pgma", "XXPATH_TO_GCCXX",
-                                      "-package", "Cabal-" ++ useCabalVersion,
-                                      "-o", "Setup"]
-     rawSystemExit verbosity "./Setup" args
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libraries-haskeline-haskeline.cabal.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-libraries-haskeline-haskeline.cabal.diff	(revision 98943)
+++ 	(revision )
@@ -1,8 +1,0 @@
---- libraries/haskeline/haskeline.cabal.sav	2010-02-18 12:46:13.000000000 -0500
-+++ libraries/haskeline/haskeline.cabal	2010-02-18 12:46:51.000000000 -0500
-@@ -100,3 +100,5 @@
-         }
-     }
-     ghc-options: -Wall
-+    cc-options: -m32
-+
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-mk-cabal.mk-debug.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-mk-cabal.mk-debug.diff	(revision 98943)
+++ 	(revision )
@@ -1,27 +1,0 @@
---- mk/cabal.mk.sav	2009-12-04 14:45:24.000000000 -0500
-+++ mk/cabal.mk	2009-12-04 14:51:29.000000000 -0500
-@@ -25,17 +25,21 @@
- 
- default all: with-bootstrapping-compiler
- 
-+CABAL_GHC_MACPORTS_FLAGS = --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' --ghc-option='-pgmc XXPATH_TO_GCCXX' --ghc-option='-pgml XXPATH_TO_GCCXX' --ghc-option='-pgma XXPATH_TO_GCCXX' --ghc-option='-optc-m32' --ghc-option='-opta-m32' --ghc-option='-optl-m32'
-+
- with-bootstrapping-compiler:
--	$(CABAL) configure --distpref dist-inplace          \
-+	$(CABAL) configure --verbose=3 --distpref dist-inplace          \
- 	                   $(INPLACE_DIRS_CONFIGURE_FLAGS)  \
- 	                   $(USE_BOOT_CONFIGURE_FLAGS)      \
- 	                   $(COMMON_CONFIGURE_FLAGS)        \
-+			   $(CABAL_GHC_MACPORTS_FLAGS)      \
- 	                   $(EXTRA_INPLACE_CONFIGURE_FLAGS)
--	$(CABAL) build     --distpref dist-inplace $(BUILD_FLAGS)
-+	$(CABAL) build     --verbose=3 --distpref dist-inplace \
-+			   $(BUILD_FLAGS)
- 	$(CABAL) install   --distpref dist-inplace $(INSTALL_FLAGS)
- 
- with-stage-2:
--	$(CABAL) configure --distpref dist-install         \
-+	$(CABAL) configure --verbose=3 --distpref dist-install         \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(USE_STAGE2_CONFIGURE_FLAGS)   \
- 	                   $(COMMON_CONFIGURE_FLAGS)       \
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-mk-cabal.mk.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-mk-cabal.mk.diff	(revision 98943)
+++ 	(revision )
@@ -1,27 +1,0 @@
---- mk/cabal.mk.sav	2009-12-04 13:59:14.000000000 -0500
-+++ mk/cabal.mk	2009-12-04 14:13:13.000000000 -0500
-@@ -25,17 +25,21 @@
- 
- default all: with-bootstrapping-compiler
- 
-+CABAL_GHC_MACPORTS_FLAGS = --ghc-option='-pgmP XXPATH_TO_GCCXX -E -undef -traditional' --ghc-option='-pgmc XXPATH_TO_GCCXX' --ghc-option='-pgml XXPATH_TO_GCCXX' --ghc-option='-pgma XXPATH_TO_GCCXX' --ghc-option='-optc-m32' --ghc-option='-opta-m32' --ghc-option='-optl-m32'
-+
- with-bootstrapping-compiler:
--	$(CABAL) configure --distpref dist-inplace          \
-+	$(CABAL) configure  --distpref dist-inplace          \
- 	                   $(INPLACE_DIRS_CONFIGURE_FLAGS)  \
- 	                   $(USE_BOOT_CONFIGURE_FLAGS)      \
- 	                   $(COMMON_CONFIGURE_FLAGS)        \
-+			   $(CABAL_GHC_MACPORTS_FLAGS)      \
- 	                   $(EXTRA_INPLACE_CONFIGURE_FLAGS)
--	$(CABAL) build     --distpref dist-inplace $(BUILD_FLAGS)
-+	$(CABAL) build      --distpref dist-inplace \
-+			   $(BUILD_FLAGS)
- 	$(CABAL) install   --distpref dist-inplace $(INSTALL_FLAGS)
- 
- with-stage-2:
--	$(CABAL) configure --distpref dist-install         \
-+	$(CABAL) configure  --distpref dist-install         \
- 	                   $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- 	                   $(USE_STAGE2_CONFIGURE_FLAGS)   \
- 	                   $(COMMON_CONFIGURE_FLAGS)       \
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-mk-target.mk.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-mk-target.mk.diff	(revision 98943)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- mk/target.mk.sav	2009-12-04 13:59:21.000000000 -0500
-+++ mk/target.mk	2009-12-04 14:14:29.000000000 -0500
-@@ -86,7 +86,7 @@
- ifeq "$(USE_NEW_MKDEPEND_FLAGS)" "YES"
- MKDEPENDHS_FLAGS = -dep-makefile .depend $(foreach way,$(WAYS),-dep-suffix $(way))
- else
--MKDEPENDHS_FLAGS = -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way))
-+MKDEPENDHS_FLAGS = -optdep-f -optdep.depend -pgmP "XXPATH_TO_GCCXX -E -undef -traditional" -pgmc XXPATH_TO_GCCXX -pgml XXPATH_TO_GCCXX -pgma XXPATH_TO_GCCXX -optc-m32 -opta-m32 -optl-m32 $(foreach way,$(WAYS),-optdep-s -optdep$(way))
- endif
- 
- depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(PKGCONF_DEP)
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-utils-genapply-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-utils-genapply-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,17 +1,0 @@
---- utils/genapply/Makefile.sav	2009-12-04 13:59:47.000000000 -0500
-+++ utils/genapply/Makefile	2009-12-04 14:15:17.000000000 -0500
-@@ -23,6 +23,14 @@
- SRC_HC_OPTS += -no-recomp
- endif
- 
-+SRC_HC_OPTS += -pgmP "XXPATH_TO_GCCXX -E -undef -traditional"
-+SRC_HC_OPTS += -pgma XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -pgmc XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -pgml XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -optc-m32
-+SRC_HC_OPTS += -opta-m32
-+SRC_HC_OPTS += -optl-m32
-+
- GenApply.o : $(GHC_INCLUDE_DIR)/ghcconfig.h
- GenApply.o : $(GHC_INCLUDE_DIR)/MachRegs.h
- GenApply.o : $(GHC_INCLUDE_DIR)/Constants.h
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-utils-genprimopcode-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-utils-genprimopcode-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,17 +1,0 @@
---- utils/genprimopcode/Makefile.sav	2009-12-04 14:00:05.000000000 -0500
-+++ utils/genprimopcode/Makefile	2009-12-04 14:15:53.000000000 -0500
-@@ -3,6 +3,14 @@
- 
- HS_PROG = genprimopcode
- 
-+SRC_HC_OPTS += -pgmP "XXPATH_TO_GCCXX -E -undef -traditional"
-+SRC_HC_OPTS += -pgma XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -pgmc XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -pgml XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -optc-m32
-+SRC_HC_OPTS += -opta-m32
-+SRC_HC_OPTS += -optl-m32
-+
- binary-dist:
- 	@:
- 
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-utils-hsc2hs-hsc2hs.wrapper.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-i386-utils-hsc2hs-hsc2hs.wrapper.diff	(revision 98943)
+++ 	(revision )
@@ -1,8 +1,0 @@
---- utils/hsc2hs/hsc2hs.wrapper.sav	2009-12-04 16:59:15.000000000 -0500
-+++ utils/hsc2hs/hsc2hs.wrapper	2009-12-04 16:59:48.000000000 -0500
-@@ -12,4 +12,4 @@
-     esac
- done
- 
--exec $executablename $tflag $HSC2HS_EXTRA ${1+"$@"} "$Iflag"
-+exec $executablename --cflag="-m32" --lflag="-m32" $tflag $HSC2HS_EXTRA ${1+"$@"} "$Iflag"
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-rts-Linker.c.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-rts-Linker.c.diff	(revision 98943)
+++ 	(revision )
@@ -1,41 +1,0 @@
---- rts/Linker.c.sav	2010-03-09 16:43:35.000000000 -0500
-+++ rts/Linker.c	2010-03-09 17:00:36.000000000 -0500
-@@ -61,7 +61,7 @@
- #include <sys/wait.h>
- #endif
- 
--#if defined(ia64_HOST_ARCH) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
-+#if defined(ia64_HOST_ARCH) || defined(linux_HOST_OS) || defined(freebsd_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS) || defined(darwin_HOST_OS)
- #define USE_MMAP
- #include <fcntl.h>
- #include <sys/mman.h>
-@@ -4159,6 +4159,9 @@
-                 thing += value;
-                 break;
-             case X86_64_RELOC_SIGNED:
-+            case X86_64_RELOC_SIGNED_1:
-+            case X86_64_RELOC_SIGNED_2:
-+            case X86_64_RELOC_SIGNED_4:
-                 ASSERT(reloc->r_pcrel);
-                 thing += value - baseValue;
-                 break;
-@@ -4224,7 +4227,8 @@
- 		        || scat->r_type == PPC_RELOC_HI16_SECTDIFF
- 		        || scat->r_type == PPC_RELOC_HA16_SECTDIFF)
- #else
--                    else if(scat->r_type == GENERIC_RELOC_SECTDIFF)
-+                    else if(scat->r_type == GENERIC_RELOC_SECTDIFF
-+			|| scat->r_type == GENERIC_RELOC_LOCAL_SECTDIFF)
- #endif
- 		    {
- 		        struct scattered_relocation_info *pair =
-@@ -4287,7 +4291,8 @@
-                         || scat->r_type == PPC_RELOC_SECTDIFF)
- #else
-                     if(scat->r_type == GENERIC_RELOC_VANILLA
--                        || scat->r_type == GENERIC_RELOC_SECTDIFF)
-+                        || scat->r_type == GENERIC_RELOC_SECTDIFF
-+			|| scat->r_type == GENERIC_RELOC_LOCAL_SECTDIFF)
- #endif
-                     {
-                         *wordPtr = word;
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-rts-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-rts-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- rts/Makefile.sav	2010-03-08 17:14:26.000000000 -0500
-+++ rts/Makefile	2010-03-08 17:14:49.000000000 -0500
-@@ -409,7 +409,7 @@
- SRC_HC_OPTS += -I.
- 
- # Otherwise the stack-smash handler gets triggered.
--ifeq "$(TargetOS_CPP)" "openbsd"
-+ifneq "$(findstring $(TargetOS_CPP), darwin openbsd)" ""
- SRC_HC_OPTS += -optc-fno-stack-protector
- endif
- 
Index: unk/dports/devel/hs-platform-ghc/files/patch-snowleopard-rts-package.conf.in.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-snowleopard-rts-package.conf.in.diff	(revision 98943)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- rts/package.conf.in.sav	2010-03-09 16:44:05.000000000 -0500
-+++ rts/package.conf.in	2010-03-09 16:56:46.000000000 -0500
-@@ -164,7 +164,7 @@
- 	 , "-Wl,-search_paths_first"
- #endif
- 
--#ifdef darwin_HOST_OS
-+#if defined(darwin_HOST_OS) && !defined(X86_64_HOST_ARCH)
-          , "-read_only_relocs", "warning"
- #endif
- 
Index: unk/dports/devel/hs-platform-ghc/files/patch-utils-genapply-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-utils-genapply-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,14 +1,0 @@
---- utils/genapply/Makefile.sav	2009-07-27 08:37:49.000000000 -0400
-+++ utils/genapply/Makefile	2009-07-27 08:39:01.000000000 -0400
-@@ -23,6 +23,11 @@
- SRC_HC_OPTS += -no-recomp
- endif
- 
-+SRC_HC_OPTS += -pgmP "XXPATH_TO_GCCXX -E -undef -traditional"
-+SRC_HC_OPTS += -pgma XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -pgmc XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -pgml XXPATH_TO_GCCXX
-+
- GenApply.o : $(GHC_INCLUDE_DIR)/ghcconfig.h
- GenApply.o : $(GHC_INCLUDE_DIR)/MachRegs.h
- GenApply.o : $(GHC_INCLUDE_DIR)/Constants.h
Index: unk/dports/devel/hs-platform-ghc/files/patch-utils-genprimopcode-Makefile.diff
===================================================================
--- /trunk/dports/devel/hs-platform-ghc/files/patch-utils-genprimopcode-Makefile.diff	(revision 98943)
+++ 	(revision )
@@ -1,14 +1,0 @@
---- utils/genprimopcode/Makefile.sav	2009-07-27 09:00:59.000000000 -0400
-+++ utils/genprimopcode/Makefile	2009-07-27 09:01:55.000000000 -0400
-@@ -3,6 +3,11 @@
- 
- HS_PROG = genprimopcode
- 
-+SRC_HC_OPTS += -pgmP "XXPATH_TO_GCCXX -E -undef -traditional"
-+SRC_HC_OPTS += -pgma XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -pgmc XXPATH_TO_GCCXX
-+SRC_HC_OPTS += -pgml XXPATH_TO_GCCXX
-+
- binary-dist:
- 	@:
- 
Index: /trunk/dports/devel/hs-platform-glut/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-glut/Portfile	(revision 98944)
+++ /trunk/dports/devel/hs-platform-glut/Portfile	(revision 98944)
@@ -0,0 +1,18 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
+
+haskellplatform.setup   GLUT 2.1.2.1
+checksums               rmd160  f9d207c21bd7c6971efc53c0f9dd01f8426752c1 \
+                        sha256  0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264
+
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
+
+depends_lib-append      port:hs-platform-opengl
+
+description             A Haskell binding for the OpenGL Utility Toolkit, a window system independent toolkit for writing OpenGL programs.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-happy/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-happy/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-happy/Portfile	(revision 98944)
@@ -1,54 +1,27 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-name		hs-platform-happy
-set canonicalname	happy
-version		1.18.4
-categories	devel
-license		BSD
-maintainers	gwright
-platforms	darwin
-description	The Parser Generator for Haskell (platform version)
-long_description	\
-		Happy is a parser generator system for Haskell,		\
-		similar to the tool `yacc' for C. Like `yacc', it	\
-		takes a file containing an annotated BNF specification	\
-		of a grammar and produces a Haskell module containing	\
-		a parser for the grammar.				\
-									\
-		Happy is flexible: you can have several Happy parsers	\
-		in the same program, and several entry points to a	\
-		single grammar. Happy can work in conjunction with a	\
-		lexical analyser supplied by the user (either		\
-		hand-written or generated by another program), or it	\
-		can parse a stream of characters directly (but this	\
-		isn't practical in most cases).
+haskellplatform.setup   happy 1.18.9 no
+checksums               rmd160  adfe119ffd485953fe7f8a81575191cdfea5a7f5 \
+                        sha256  7d34c512b8aecbc135f6b4c43bc18044ff50ae6d5afdd0d2570228dccecb618a
 
-homepage	http://haskell.org/${canonicalname}/
-master_sites	http://hackage.haskell.org/packages/archive/${canonicalname}/${version}/
-distname	${canonicalname}-${version}
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     614e3ef9623dbeefc4c8ca699912efb4 \
-		sha1    86c6a61ed8b3909c476c27343f41cb12971d52bd \
-		rmd160  846d90e2962c6053acae03ace90de3656ce271b5
+depends_lib-append      port:hs-platform-mtl
 
-depends_build	port:ghc
-
-universal_variant	no
-
-configure       {
-                  system "cd ${worksrcpath} && runhaskell Setup configure -v --ghc --with-gcc=${configure.cc} --prefix=${prefix}"
-                }
-
-build           {
-                  system "cd ${worksrcpath} && runhaskell Setup build -v"
-                }
-
-destroot        {
-                  system "cd ${worksrcpath} && runhaskell Setup copy --copy-prefix=${destroot}${prefix}"
-                }
-
-# Haskell Platform components should not be livecheck'ed.
-livecheck.type	none
-
+description             \
+    Happy is a parser generator system for Haskell, similar to the tool `yacc' \
+    for C. Like `yacc', it takes a file containing an annotated BNF \
+    specification of a grammar and produces a Haskell module containing \
+    a parser for the grammar.
+long_description        ${description} \
+    Happy is flexible: you can have several Happy parsers in the same program, \
+    and several entry points to a single grammar. Happy can work in conjunction \
+    with a lexical analyser supplied by the user (either hand-written or \
+    generated by another program), or it can parse a stream of characters \
+    directly (but this isn't practical in most cases).
Index: /trunk/dports/devel/hs-platform-haskell-src/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-haskell-src/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-haskell-src/Portfile	(revision 98944)
@@ -1,30 +1,22 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	haskell-src 1.0.1.3
-name		hs-platform-haskell-src
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   haskell-src 1.0.1.5
+checksums               rmd160  32a53bab9f1e150565cbed0c926816e4089dd966 \
+                        sha256  9f3726902247cc955d085997254bb58c16cc337ee83de5ccfb17dcbcb488c3ab
 
-description	Manipulating Haskell source code
-long_description	\
-	Facilities for manipulating Haskell source code:	\
-	an abstract syntax, lexer, parser and pretty-printer.
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     27ec8f55eca844852815f916935f192d \
-		sha1    21b14d8b885e9a2ca6b4226d7619b7ca966097fe \
-		rmd160  5c9320e39b3ad0160ce4aa7fefa31218bb1b3a4f
+depends_lib-append      port:hs-platform-syb
 
-depends_lib	port:ghc
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             \
+    The haskell-src package provides support for manipulating Haskell source \
+    code. The package provides a lexer, parser and pretty-printer, and \
+    a definition of a Haskell abstract syntax tree (AST). Common uses of this \
+    package are to parse or generate Haskell 98 code.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-html/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-html/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-html/Portfile	(revision 98944)
@@ -1,30 +1,17 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	html 1.0.1.2
-name		hs-platform-html
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   html 1.0.1.2
+checksums               rmd160  55d95a42c297c9c4b0b0c3bbd077a5ed59e48878 \
+                        sha256  0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061
 
-description	HTML combinator library
-long_description	\
-        This package contains a combinator library for constructing	\
-        HTML documents.
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     2a7de5a2af9a2f80d39825d6a95ee445 \
-		sha1    3075f689b29d28229e09a3d2aefa2bfbb008d1da \
-		rmd160  55d95a42c297c9c4b0b0c3bbd077a5ed59e48878
-
-depends_lib	port:ghc
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             \
+    This package contains a combinator library for constructing HTML documents.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-http/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-http/Portfile	(revision 98944)
+++ /trunk/dports/devel/hs-platform-http/Portfile	(revision 98944)
@@ -0,0 +1,35 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
+
+haskellplatform.setup   http 4000.2.3
+checksums               rmd160  70bb2e353a63eeb896664dadf1b3313a0867439b \
+                        sha256  00f59f751a53a0cd766d59cffb3a97fc001189797861ce4aa28d4bea672efafc
+
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
+
+depends_lib-append      port:hs-platform-network \
+                        port:hs-platform-mtl \
+                        port:hs-platform-parsec
+
+description             \
+    The HTTP package supports client-side web programming in Haskell. It lets \
+    you set up HTTP connections, transmitting requests and processing the \
+    responses coming back, all from within the comforts of Haskell. It's \
+    dependent on the network package to operate, but other than that, the \
+    implementation is all written in Haskell.
+long_description        ${description} \
+    A basic API for issuing single HTTP requests + receiving responses is \
+    provided. On top of that, a session-level abstraction is also on offer (the \
+    BrowserAction monad): it taking care of handling the management of \
+    persistent connections, proxies, state (cookies) and authentication \
+    credentials required to handle multi-step interactions with a web server. \
+    \
+    The representation of the bytes flowing across is extensible via the use of \
+    a type class, letting you pick the representation of requests and responses \
+    that best fits your use. Some pre-packaged, common instances are provided \
+    for you (ByteString, String.)
Index: /trunk/dports/devel/hs-platform-hunit/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-hunit/Portfile	(revision 98944)
+++ /trunk/dports/devel/hs-platform-hunit/Portfile	(revision 98944)
@@ -0,0 +1,18 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
+
+haskellplatform.setup   HUnit 1.2.4.2
+checksums               rmd160  a8a8dca99fc5f6fd37a35e7e71305d195e2a52e2 \
+                        sha256  fdbcbc28196d616b449bf3e46c30dcd5577dc92f290458e2dbdbfc5a65de327a
+
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
+
+description             \
+    HUnit is a unit testing framework for Haskell, inspired by the JUnit tool \
+    for Java, see: http://www.junit.org.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-mtl/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-mtl/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-mtl/Portfile	(revision 98944)
@@ -1,28 +1,22 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	mtl 1.1.0.2
-name		hs-platform-mtl
-license		BSD
-maintainers	nomaintainer
-description	A monad transformer library (platform version)
-long_description    ${description}
+haskellplatform.setup   mtl 2.1.1
+checksums               rmd160  fe0479fa638235cdd3e660492ed7de269116ecb1 \
+                        sha256  9250831796b1678380d915d2953ce94fa466af8d5c92d0c569963f0f0b037a90
 
-platforms	darwin
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     1e933bb7abb38b7bb423929ba37219db \
-		sha1    883deca3cdf8052173c995b741bdedccc3c91440 \
-		rmd160  e7032fc069c8b24b97725b259d2e6fb05ace208b
+depends_lib-append      port:hs-platform-transformers
 
-depends_lib	port:ghc
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling	\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             \
+    Monad classes using functional dependencies, with instances for various \
+    monad transformers, inspired by the paper Functional Programming with \
+    Overloading and Higher-Order Polymorphism, by Mark P Jones, in Advanced \
+    School of Functional Programming, 1995
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-network/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-network/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-network/Portfile	(revision 98944)
@@ -1,30 +1,18 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	network 2.2.1.4
-name		hs-platform-network
-maintainers	nomaintainer
-license		BSD
-platforms	darwin
+haskellplatform.setup   network 2.3.0.13
+checksums               rmd160  0868efbc6fa8096a5979bd551a30c9f36c45e275 \
+                        sha256  0747e9091dd5ba220c31f77116c9edfe9ac6726090d58e55221371b63f1b8577
 
-description	Networking related facilities
-long_description	\
-	${description}
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     639baaeeb9ccc2f2013bbfa3b376f14b \
-		sha1    1c4a6856d51336df34fc6e33a1d683b22d18ba25 \
-		rmd160  b59a8d5467d10eba7065106efb4994ee77a72b91
+depends_lib-append      port:hs-platform-parsec
 
-depends_lib	port:ghc			\
-		port:hs-platform-parsec
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             Low-level networking interface
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-opengl/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-opengl/Portfile	(revision 98944)
+++ /trunk/dports/devel/hs-platform-opengl/Portfile	(revision 98944)
@@ -0,0 +1,22 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
+
+haskellplatform.setup   OpenGL 2.2.3.1
+checksums               rmd160  659311f405866b77b0ff74aa3708e71431a3372c \
+                        sha256  9f8425e36994f6602b66059490d00f5f7d7d59dbb97185c2054c5673688885ee
+
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
+
+description             \
+    A Haskell binding for the OpenGL graphics system (GL, version 3.2) and its \
+    accompanying utility library (GLU, version 1.3).
+long_description        ${description} \
+    OpenGL is the industry's most widely used and supported 2D and 3D graphics \
+    application programming interface (API), incorporating a broad set of \
+    rendering, texture mapping, special effects, and other powerful \
+    visualization functions.
Index: /trunk/dports/devel/hs-platform-parallel/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-parallel/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-parallel/Portfile	(revision 98944)
@@ -1,29 +1,16 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	parallel 1.1.0.1
-name		hs-platform-parallel
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   parallel 3.2.0.2
+checksums               rmd160  87c7144c8349b7e05533b58826e872050b8abe83 \
+                        sha256  82569faa2ca3245c61cc71731abd7d3595372d4cf09c659ee52740be1a3bc66b
 
-description	parallel programmming library
-long_description	\
-	This package provides a library for parallel programming.
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     70fda9f7721f9a3dc8aaf2e24d1846e0 \
-		sha1    39bcd5c8a896914c7ddc853049005a71a4eaabb6 \
-		rmd160  326fb117d411065eec3acf89ddceb7e44d5aee7c
-
-depends_lib	port:ghc
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             This package provides a library for parallel programming.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-parsec/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-parsec/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-parsec/Portfile	(revision 98944)
@@ -1,34 +1,24 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	parsec 2.1.0.1
-name		hs-platform-parsec
-license		BSD
-maintainers	nomaintainer
-description	Monadic parser combinators for Haskell (platform version)
-long_description	\
-	Parsec is designed from scratch as an industrial-strength \
-	parser library. It is simple, safe, well documented, has \
-	extensive libraries and good error messages, and is also \
-	fast. It is defined as a monad transformer that can be \
-	stacked on arbitrary monads, and it is also parametric \
-	in the input stream type.
+haskellplatform.setup   parsec 3.1.2
+checksums               rmd160  f360e4b209a56f193eca65b71bb13b95948b7042 \
+                        sha256  90f124b91f5e4ff04ddd4dc7f43aeda1273b8caec6a58ec13b90ca22854c1652
 
-platforms	darwin
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     557d935019ec4d966f2103fdf1a8c559 \
-		sha1    f09c7fcbf66c39cc4de2a50dbb1374ba82168b52 \
-		rmd160  95ddc9199f1da5e0773db2f653d394dbe07974ee
+depends_lib-append      port:hs-platform-mtl \
+                        port:hs-platform-text
 
-depends_lib	port:ghc
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling	\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             \
+    Parsec is designed from scratch as an industrial-strength parser library. \
+    It is simple, safe, well documented (on the package homepage), has \
+    extensive libraries and good error messages, and is also fast. It is \
+    defined as a monad transformer that can be stacked on arbitrary monads, \
+    and it is also parametric in the input stream type.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-quickcheck/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-quickcheck/Portfile	(revision 98944)
+++ /trunk/dports/devel/hs-platform-quickcheck/Portfile	(revision 98944)
@@ -0,0 +1,26 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
+
+haskellplatform.setup   QuickCheck 2.4.2
+checksums               rmd160  e87ece5bab2f3582265160734b3be50a596ec19e \
+                        sha256  6f05c399ae7b70c09ab21337caf1211f43fd76d6ad9b3814a4009ddbf438179f
+
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
+
+depends_lib-append      port:hs-platform-random
+
+description             \
+    QuickCheck is a library for random testing of program properties.
+long_description        ${description} \
+    The programmer provides a specification of the program, in the form of \
+    properties which functions should satisfy, and QuickCheck then tests that \
+    the properties hold in a large number of randomly generated cases. \
+    \
+    Specifications are expressed in Haskell, using combinators defined in the \
+    QuickCheck library. QuickCheck provides combinators to define properties, \
+    observe the distribution of test data, and define test data generators.
Index: /trunk/dports/devel/hs-platform-random/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-random/Portfile	(revision 98944)
+++ /trunk/dports/devel/hs-platform-random/Portfile	(revision 98944)
@@ -0,0 +1,18 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
+
+haskellplatform.setup   random 1.0.1.1
+checksums               rmd160  a13a4d7fefd15611cf863f11caf212efede320c3 \
+                        sha256  df7c3b405de0ac27a2ee8fdc8dad87cb42e8eac01fef53861e43bc47c8111559
+
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
+
+description             \
+    This package provides a basic random number generation library, including \
+    the ability to split random number generators.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-regex-base/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-regex-base/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-regex-base/Portfile	(revision 98944)
@@ -1,29 +1,18 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	regex-base 0.72.0.2
-name		hs-platform-regex-base
-maintainers	nomaintainer
-license		BSD
-platforms	darwin
+haskellplatform.setup   regex-base 0.93.2
+checksums               rmd160  c009e193dd453666c7c3b585a25f3a8add7ec6b6 \
+                        sha256  20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278
 
-description	A replacement for Haskell's Text.Regex
-long_description	\
-	Interface API for regex-posix, pcre, parsec, dfa
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-homepage	http://sourceforge.net/projects/lazy-regex
+depends_lib-append      port:hs-platform-mtl
 
-checksums	md5     f2eeb11fecaafaf903fc6211e19258ce \
-		sha1    6e113b980462938a9821b0fe23a9f40b70c05cea \
-		rmd160  d26b3fcb95bac459c9e52c0dbb0810ac002509c7
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             Interface API for regex-posix,pcre,parsec,tdfa,dfa
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-regex-compat/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-regex-compat/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-regex-compat/Portfile	(revision 98944)
@@ -1,33 +1,19 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	regex-compat 0.71.0.1
-name		hs-platform-regex-compat
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   regex-compat 0.95.1
+checksums               rmd160  b2fe02ca3c4e9027b2d433c8a265b19a85c8bd17 \
+                        sha256  d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b
 
-description	A replacement for Haskell's Text.Regex
-long_description	\
-	One module layer over regex-posix to replace Text.Regex
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-homepage	http://sourceforge.net/projects/lazy-regex
+depends_lib-append      port:hs-platform-regex-base \
+                        port:hs-platform-regex-posix
 
-checksums	md5     c939571633f1245982ae20d09b07cc00 \
-		sha1    dd953c99d20c2e0e7d69dd6b7c82eaa51488e695 \
-		rmd160  1f017c1fa1ca9dfcccf3da4760bcc8f999fb56e9
-
-depends_lib	port:ghc			\
-		port:hs-platform-regex-base	\
-		port:hs-platform-regex-posix
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             One module layer over regex-posix to replace Text.Regex
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-regex-posix/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-regex-posix/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-regex-posix/Portfile	(revision 98944)
@@ -1,32 +1,18 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	regex-posix 0.72.0.3
-name		hs-platform-regex-posix
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   regex-posix 0.95.1
+checksums               rmd160  eee72b352cc887d919d179969b3d9535805d235d \
+                        sha256  74ed145b1a5b3c766a2694a58661f1d5e03a8dee283c5ddb9d689cff16efef0a
 
-description	A replacement for Haskell's Text.Regex
-long_description	\
-	The posix backend for regex-base
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-homepage	http://sourceforge.net/projects/lazy-regex
+depends_lib-append      port:hs-platform-regex-base
 
-checksums	md5     94eaac0d07a5ad18276d86f9a65a4e25 \
-		sha1    b75f5bc6957dcb7a6dddc024ccb282d36fae28a7 \
-		rmd160  f2da6d572e89a81632d8e5e71b45a3bafd967db1
-
-depends_lib	port:ghc	\
-		port:hs-platform-regex-base
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             The posix regex backend for regex-base
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-stm/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-stm/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-stm/Portfile	(revision 98944)
@@ -1,29 +1,16 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	stm 2.1.1.2
-name		hs-platform-stm
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   stm 2.3
+checksums               rmd160  676eafbe7043a44317aa25e922518d1fc41e5852 \
+                        sha256  557f5ad39292ee862b1ce22ed96be03130b404b43288380e6fd8ee3a71a0418c
 
-description	Software transactional memory
-long_description	\
-	A modular composable concurrency abstraction
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     159eaa40d86e48f4169c25ab91d69b6d \
-		sha1    f0b8264a0fa3a04163ccda0c7250a8c87edcf06e \
-		rmd160  52b0bd58cfd1f3d737dcc1a96b0c0da83d9ee821
-
-depends_lib	port:ghc
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             A modular composable concurrency abstraction.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-syb/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-syb/Portfile	(revision 98944)
+++ /trunk/dports/devel/hs-platform-syb/Portfile	(revision 98944)
@@ -0,0 +1,21 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
+
+haskellplatform.setup   syb 0.3.6.1
+checksums               rmd160  85fb7017cc478b74d860c99250f1a5b0382683c9 \
+                        sha256  646cfc8feaa2625bbac94675ee51256de69ebfcf35d760cbfa39aaeda132dff7
+
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
+
+description             \
+    This package contains the generics system described in the Scrap Your \
+    Boilerplate papers (see http://www.cs.uu.nl/wiki/GenericProgramming/SYB). \
+    It defines the Data class of types permitting folding and unfolding of \
+    constructor applications, instances of this class for primitive types, and \
+    a variety of traversals.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-text/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-text/Portfile	(revision 98944)
+++ /trunk/dports/devel/hs-platform-text/Portfile	(revision 98944)
@@ -0,0 +1,18 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
+
+haskellplatform.setup   text 0.11.2.0
+checksums               rmd160  dc6719e9301183f8a4b08047580682d1eb2ebd01 \
+                        sha256  178d12eb0dad50f3ef5135c443b31993e91ed91b1d04a2ebfa5c05520518a5bb
+
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
+
+description             \
+    An efficient packed, immutable Unicode text type (both strict and lazy), \
+    with a powerful loop fusion optimization framework.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-transformers/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-transformers/Portfile	(revision 98944)
+++ /trunk/dports/devel/hs-platform-transformers/Portfile	(revision 98944)
@@ -0,0 +1,26 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
+
+haskellplatform.setup   transformers 0.3.0.0
+checksums               rmd160  110bd7eb44609d8db44d85f8367db323576545dc \
+                        sha256  e5aa0c1ec97ad98c389e78f59aca25ab028980a7068a3e585e39564662739591
+
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
+
+description             \
+    A portable library of functor and monad transformers, inspired by the paper \
+    Functional Programming with Overloading and Higher-Order Polymorphism, by \
+    Mark P Jones, in Advanced School of Functional Programming, 1995
+long_description        ${description} \
+    This package contains:\n\
+     - the monad transformer class (in Control.Monad.Trans.Class)\n\
+     - concrete functor and monad transformers, each with associated operations \
+       and functions to lift operations associated with other transformers.\n\
+    It can be used on its own in portable Haskell code, or with the monad \
+    classes in the mtl or monads-tf packages, which automatically lift \
+    operations introduced by monad transformers through other transformers.
Index: /trunk/dports/devel/hs-platform-xhtml/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-xhtml/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-xhtml/Portfile	(revision 98944)
@@ -1,32 +1,18 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	xhtml 3000.2.0.1
-name		hs-platform-xhtml
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   xhtml 3000.2.1
+checksums               rmd160  72e1095df0a8111ea696749d219df4ea78da1b4f \
+                        sha256  33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8
 
-description	An XHTML combinator library
-long_description	\
-	This package provides combinators for producing		\
-	XHTML 1.0, including the Strict, Transitional and Frameset variants.
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-homepage	http://semantic.org/TimeLib/
-
-checksums	md5     9e3e7d9c66618c5e29716f90e54363c9 \
-		sha1    2dc5765491a12bed90a147221a626c7840e19944 \
-		rmd160  96afa674a6049ee460257623308ff5fe1299b271
-
-depends_lib	port:ghc
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             \
+    This package provides combinators for producing XHTML 1.0, including the \
+    Strict, Transitional and Frameset variants.
+long_description        ${description}
Index: /trunk/dports/devel/hs-platform-zlib/Portfile
===================================================================
--- /trunk/dports/devel/hs-platform-zlib/Portfile	(revision 98943)
+++ /trunk/dports/devel/hs-platform-zlib/Portfile	(revision 98944)
@@ -1,32 +1,25 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
-PortGroup	haskell 1.0
+PortSystem              1.0
+PortGroup               haskellplatform 1.0
 
-haskell.setup	zlib 0.5.0.0
-name		hs-platform-zlib
-license		BSD
-maintainers	nomaintainer
-platforms	darwin
+haskellplatform.setup   zlib 0.5.3.3
+checksums               rmd160  fe83bf126867ab71afcc6ac8eb9afc0dddb44896 \
+                        sha256  e2adb6c55f5bc69eb1e931edcb2ef392ac96139cf6b6bca1b2a7229f381938c3
 
-description	The Haskell Zlib Binding
-long_description	\
-		Haskell bindings to the Zlib library for compression \
-                and decompression in gzip and zlib format.  The library \
-		acts directly on ByteString values.
+license                 BSD
+maintainers             cal openmaintainer
+platforms               darwin
 
-checksums	md5     22fa6d394c42c8584b234799b923f860 \
-		sha1    4a93e727a408754baf6ede0ed721863eb4ea0df2 \
-		rmd160  0ba0769d78b83b05726b15be55b10168db7d59bb
+depends_lib-append      port:zlib
 
-depends_lib	port:ghc	\
-		port:zlib
-
-universal_variant	no
-
-configure.args-append	-v --enable-library-profiling		\
-			--with-gcc=${configure.cc}
-
-build.args-append	-v
-
-livecheck.type	none
+description             \
+    This package provides a pure interface for compressing and decompressing \
+    streams of data represented as lazy ByteStrings. It uses the zlib C library \
+    so it has high performance. It supports the \"zlib\", \"gzip\" and \"raw\" \
+    compression formats.
+long_description        ${description} \
+    It provides a convenient high level API suitable for most tasks and for the \
+    few cases where more control is needed it provides access to the full zlib \
+    feature set.
