author: Gabor Pali <pgj@FreeBSD.org> 2012-12-20 02:23:04 +0000
committer: Gabor Pali <pgj@FreeBSD.org> 2012-12-20 02:23:04 +0000
commit: f6f83c9efc2c46d2970746758e2c682bb8a518ec (patch)
tree: 290f2ea61305744bf0f477895c56b92acaeb361f /lang/ghc
parent: af071cfdc1f8578bd1523b823e683074a3139a34 (diff)
download: ports-f6f83c9efc2c46d2970746758e2c682bb8a518ec.tar.gz
ports-f6f83c9efc2c46d2970746758e2c682bb8a518ec.zip
16 files changed, 317 insertions, 263 deletions
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index c27f5c1a4e02..de27c2f9c771 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,11 +1,8 @@
-# New ports collection makefile for:	ghc
-# Date created:				28 August 1999
-# Whom:					Simon Marlow <simonmar@microsoft.com>
-#
+# Created by: Simon Marlow <simonmar@microsoft.com>
 # $FreeBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	7.4.1
+PORTVERSION=	7.4.2
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		${MASTER_SITE_LOCAL:S/$/:boot/}
@@ -17,9 +14,9 @@ COMMENT=	A Compiler for the functional language Haskell
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-GHC_VERSION=	${PORTVERSION}
+GHC_VERSION=		${PORTVERSION}
 BOOT_GHC_VERSION=	7.4.1
-HSCOLOUR_VERSION=	1.19
+HSCOLOUR_VERSION=	1.20.2
 
 DATADIR=	${PREFIX}/share/ghc-${GHC_VERSION}
 EXAMPLESDIR=	${PREFIX}/share/examples/ghc-${GHC_VERSION}
@@ -27,12 +24,13 @@ EXAMPLESDIR=	${PREFIX}/share/examples/ghc-${GHC_VERSION}
 CONFLICTS=	ghc-6.8.* ghc-6.10.* ghc-6.12.* ghc-7.0.* ghc-7.2.*
 
 USE_BZIP2=	yes
-USE_GCC=	any
 LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 
 USE_PERL5_BUILD=	yes
-USE_GMAKE=	yes
-USE_ICONV=	yes
+USE_GMAKE=		yes
+USE_ICONV=		yes
+USE_BINUTILS=		yes
+USE_GCC=		4.6
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -49,12 +47,28 @@ GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=		PROFILE DYNAMIC DOCS
 OPTIONS_DEFAULT=	PROFILE DYNAMIC DOCS
 
+BOOT_DESC=		Use installed GHC for bootstrapping
+BOOTH_DESC=		Use installed HsColour for bootstrapping
 PROFILE_DESC=		Add support for performance profiling
 DYNAMIC_DESC=		Add support for dynamic linking
 DOCS_DESC=		Install HTML documentation
 
+LOCALBASE?=	/usr/local
+
+.if exists(${LOCALBASE}/bin/ghc)
+OPTIONS_DEFINE+=	BOOT
+.endif
+
+.if exists(${LOCALBASE}/bin/HsColour)
+OPTIONS_DEFINE+=	BOOTH
+.endif
+
 .include <bsd.port.options.mk>
 
+.if empty(PORT_OPTIONS:MBOOT)
+
+EXTRA_PATCHES=		${PATCHDIR}/nopatch-.._ghc-${BOOT_GHC_VERSION}-boot_rts_package.conf.in
+
 .if ${ARCH} == "i386"
 
 .if ${OSVERSION} >= 900000
@@ -81,28 +95,43 @@ IGNORE=		unsupported
 
 .endif
 
+.endif # MBOOT
+
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
 GHC_LIBDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}
 GHC_LIBDIR_REL=	lib/ghc-${GHC_VERSION}
 
 PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
 
-# This port builds by downloading a minimal binary distribution of GHC and
-# using that to bootstrap.
-BOOT_DIR=	${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
-BOOT_GHC=	${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
-BOOT_GHC-PKG=	${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION}
-BOOT_HSC2HS=	${BOOT_DIR}/bin/hsc2hs
 HACKAGE_SITE?=		http://hackage.haskell.org/
 HACKAGE_ARCH?=		packages/archive/
 
-CONFIGURE_ARGS_BOOT=	--prefix=${BOOT_DIR} CC=${CC}
-CONFIGURE_ARGS+=	--with-ghc=${BOOT_GHC} --with-gcc=${CC} \
+CONFIGURE_ARGS=		--with-gcc=${CC} \
 			--with-gmp-includes=${LOCALBASE}/include \
 			--with-gmp-libraries=${LOCALBASE}/lib \
 			--with-iconv-includes=${LOCALBASE}/include \
 			--with-iconv-libraries=${LOCALBASE}/lib
 
+.if empty(PORT_OPTIONS:MBOOT)
+
+BOOT_DIR=	${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
+BOOT_GHC=	${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
+BOOT_GHC-PKG=	${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION}
+BOOT_HSC2HS=	${BOOT_DIR}/bin/hsc2hs
+
+SLAVE_CMD=	${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
+
+CONFIGURE_ARGS_BOOT=	--prefix=${BOOT_DIR} CC=${CC}
+CONFIGURE_ARGS+=	--with-ghc=${BOOT_GHC}
+
+.else # MBOOT
+
+SLAVE_CMD=	# empty
+
+CONFIGURE_ARGS+=	--with-ghc=${LOCALBASE}/bin/ghc
+
+.endif # MBOOT
+
 # libgmp:
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
@@ -117,23 +146,31 @@ MAKE_ENV+=	TMPDIR=${TMPDIR}
 # activated. In this way it's possible to use it directly into
 # the build tree, without needing to install it. At the end
 # you could view the output of: ${BOOT_GHC} describe hscolour
+
 .if ${PORT_OPTIONS:MDOCS}
 
+.if empty(PORT_OPTIONS:MBOOTH)
+
 MASTER_SITES+=	${HACKAGE_SITE}${HACKAGE_ARCH}hscolour/${HSCOLOUR_VERSION}/:docs
 DISTFILES+=	hscolour-${HSCOLOUR_VERSION}.tar.gz:docs
 
 EXTRACT_ONLY=	${_DISTFILES:C/hscolour.*$//g}
 
+.endif # MBOOTH
+
 MAN1=		ghc.1
 
+.if empty(PORT_OPTIONS:MBOOTH)
+
 SLAVES_PREFIX=		${WRKDIR}/slaves_prefix
 SLAVES_WRKDIRPREFIX=	${WRKDIR}/slaves_wrkdirprefix
-SLAVE_CMD=	${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
 
 MAKE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
 MAKE_ENV+=	LC_ALL=en_US.UTF-8
 CONFIGURE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
 
+.endif # MBOOTH
+
 BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 .endif
@@ -159,7 +196,11 @@ post-extract:
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "HADDOCK_DOCS ="
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "HSCOLOUR_SRCS ="
 .endif
+.if ${PORT_OPTIONS:MBOOT}
+	@${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${LOCALBASE}/bin/hsc2hs"
+.else
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}"
+.endif
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_CC_OPTS += ${CFLAGS}"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_HSC2HS_OPTS += -I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib"
@@ -205,23 +246,31 @@ post-patch:
 	@${REINPLACE_CMD} -e 's+\(DO_NOT_INSTALL =\)+\1 haddock+' \
 		${WRKSRC}/utils/Makefile
 
+.if ${PORT_OPTIONS:MBOOT}
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/rts/package.conf.in \
+		${WRKSRC}/libraries/Makefile
+.else
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/../ghc-${BOOT_GHC_VERSION}-boot/rts/package.conf.in \
 		${WRKSRC}/rts/package.conf.in \
 		${WRKSRC}/libraries/Makefile
+.endif
 
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/configure
 
 pre-configure:
 	@${MKDIR} ${TMPDIR}
+.if empty(PORT_OPTIONS:MBOOT)
 	@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT})
 	@(cd ${BOOT_DIR} && PACKAGES='' ${GMAKE} install)
+.endif
 
 # Defining with documentation:
 # Defining "SLAVE" in devel/hs-haddock and print/hs-hscolour flips the building process
 # functionally to this port.
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MBOOTH)
 	@${ECHO_MSG} -e "\a"
 	@${ECHO_MSG} "======================================================================"
 	@${ECHO_MSG} "  WARNING: Now HsColour will be built, the respective port will not   "
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index ecd693ccdb14..7bfaddead2c0 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -26,26 +26,11 @@ DIST_SUBDIR?=	cabal
 
 FILE_LICENSE?=	LICENSE
 
-.if !defined(STANDALONE)
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
-.elif defined(STANDALONE)
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
-.endif
-
-GHC_VERSION?=	7.4.1
-GHC_VERSION_N=	${GHC_VERSION:S/./0/g}
-
-GHC_CMD?=	${LOCALBASE}/bin/ghc
 CABAL_SETUP?=	Setup.lhs
 SETUP_CMD?=	./setup
 
 ALEX_CMD?=	${LOCALBASE}/bin/alex
 HAPPY_CMD?=	${LOCALBASE}/bin/happy
-HADDOCK_CMD?=	${LOCALBASE}/bin/haddock
 C2HS_CMD?=	${LOCALBASE}/bin/c2hs
 
 CABAL_DIRS+=	${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}
@@ -79,25 +64,32 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 INSTALL_PORTDATA?=
 INSTALL_PORTEXAMPLES?=
 
-HSCOLOUR_DESC?=	Colorize generated documentation by HsColour
-DYNAMIC_DESC?=	Add support for dynamic linking
-PROFILE_DESC?=	Add support for profiling
-
-.include <bsd.port.options.mk>
+LOCALBASE?=	/usr/local
 
-.if exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.dyn_hi)
-OPTIONS_DEFINE+=	DYNAMIC
+.if !defined(CABALOPTIONSMKINCLUDED)
+.include "bsd.cabal.options.mk"
 .endif
 
-.if exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.p_hi)
-OPTIONS_DEFINE+=	PROFILE
+.if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
+BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
+RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+RUN_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
+.else
+BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
 .endif
 
-.if exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)
-OPTIONS_DEFINE+=	DOCS HSCOLOUR
-OPTIONS_DEFAULT+=	DOCS
+USE_BINUTILS=	yes
+USE_GCC=	4.6
+
+.if ${PORT_OPTIONS:MDYNAMIC}
+LIB_DEPENDS+=	ffi.5:${PORTSDIR}/devel/libffi
 .endif
 
+CONFIGURE_ARGS+=	--with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} \
+			--with-ranlib=${RANLIB}
+
 .if defined(USE_ALEX)
 BUILD_DEPENDS+=	${ALEX_CMD}:${PORTSDIR}/devel/hs-alex
 CONFIGURE_ARGS+=	 --with-alex=${ALEX_CMD}
@@ -118,10 +110,6 @@ LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 USE_ICONV=	yes
 .endif
 
-.if defined(EXECUTABLE) && ${PORT_OPTIONS:MDOCS}
-HADDOCK_EXE?=	--executables
-.endif
-
 .if defined(USE_CABAL)
 .include "bsd.hackage.mk"
 
@@ -146,7 +134,7 @@ ${HSPREFIX}${__u_h_r_package}${__u_h_r_version}:${PORTSDIR}/${__u_h_r_port}
 
 BUILD_DEPENDS+=	${dependencies}
 
-.if !defined(STANDALONE)
+.if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
 RUN_DEPENDS+=	${dependencies}
 .endif
 
@@ -159,12 +147,12 @@ USE_PERL5_BUILD=	5.8+
 .if ${PORT_OPTIONS:MDOCS}
 .if !defined(XMLDOCS)
 
-HADDOCK_OPTS=	${HADDOCK_EXE}
+HADDOCK_OPTS=	# empty
 
 .if ${PORT_OPTIONS:MHSCOLOUR}
 BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
 
-HSCOLOUR_VERSION=	1.20.2
+HSCOLOUR_VERSION=	1.20.3
 HSCOLOUR_DATADIR=	${LOCALBASE}/share/ghc-${GHC_VERSION}/cabal/hscolour-${HSCOLOUR_VERSION}
 HADDOCK_OPTS+=		--hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif # HSCOLOUR
@@ -192,9 +180,9 @@ CONFIGURE_ARGS+=	--haddock-options=-w --with-haddock=${HADDOCK_CMD}
 .endif
 
 .if ${PORT_OPTIONS:MDYNAMIC}
-CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-shared --enable-executable-dynamic
 .else
-CONFIGURE_ARGS+=	--disable-shared
+CONFIGURE_ARGS+=	--disable-shared --disable-executable-dynamic
 .endif
 
 .if ${PORT_OPTIONS:MPROFILE}
@@ -231,7 +219,7 @@ post-patch::
 do-configure:
 .if !defined(METAPORT)
 	cd ${WRKSRC} && ${GHC_CMD} --make ${CABAL_SETUP} -o setup -package Cabal
-	cd ${WRKSRC} && ${SETENV} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 			${SETUP_CMD} configure --ghc --prefix=${PREFIX} --extra-include-dirs="${LOCALBASE}/include" --extra-lib-dirs="${LOCALBASE}/lib" ${__handle_datadir__} ${CONFIGURE_ARGS}
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -247,14 +235,14 @@ do-configure:
 .if !target(do-build)
 do-build:
 .if !defined(METAPORT)
-	cd ${WRKSRC} && ${SETUP_CMD} build
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} build
 .if !defined(STANDALONE)
-	cd ${WRKSRC} && ${SETUP_CMD} register --gen-script
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} register --gen-script
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 .if !defined(XMLDOCS) && !defined(STANDALONE) && ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC} && ${SETUP_CMD} haddock ${HADDOCK_OPTS}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} haddock ${HADDOCK_OPTS}
 .endif # STANDALONE
 .if defined(XMLDOCS)
 	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
@@ -268,7 +256,7 @@ do-build:
 .if !target(do-install)
 do-install:
 .if !defined(METAPORT)
-	cd ${WRKSRC} && ${SETUP_CMD} install
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} install
 
 .if !defined(STANDALONE)
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
new file mode 100644
index 000000000000..28d4a490c636
--- /dev/null
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -0,0 +1,40 @@
+#
+# $FreeBSD$
+#
+# bsd.cabal.options.mk -- Support options for ports based on Haskell Cabal.
+#
+# Created by: Gabor Pali <pgj@FreeBSD.org>
+#
+# Maintained by: haskell@FreeBSD.org
+#
+
+CABALOPTIONSMKINCLUDED=	yes
+
+LOCALBASE?=	/usr/local
+GHC_CMD?=	${LOCALBASE}/bin/ghc
+HADDOCK_CMD?=	${LOCALBASE}/bin/haddock
+GHC_VERSION=	7.4.2
+
+HSCOLOUR_DESC?=	Colorize generated documentation by HsColour
+DYNAMIC_DESC?=	Add support for dynamic linking
+PROFILE_DESC?=	Add support for profiling
+
+.if !exists(${GHC_CMD}) || (exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.dyn_hi) && !defined(IGNORE_DYNAMIC))
+OPTIONS_DEFINE+=	DYNAMIC
+OPTIONS_DEFAULT+=	DYNAMIC
+.endif
+
+.if !exists(${GHC_CMD}) || (exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.p_hi) && !defined(IGNORE_PROFILE))
+OPTIONS_DEFINE+=	PROFILE
+.endif
+
+.if !exists(${GHC_CMD}) || ((exists(${HADDOCK_CMD}) && exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) && !defined(NOPORTDOCS))
+OPTIONS_DEFINE+=	DOCS HSCOLOUR
+OPTIONS_DEFAULT+=	DOCS
+.endif
+
+.if defined(OPTIONSMKINCLUDED)
+IGNORE?=	options fail: bsd.cabal.mk already includes bsd.options.mk
+.endif
+
+.include <bsd.port.options.mk>
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 9a1852cb8d45..4e5a4ab72fee 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -13,6 +13,8 @@
 
 abstract-deque_port=		devel/hs-abstract-deque
 abstract-par_port=		devel/hs-abstract-par
+activehs_port=			www/hs-activehs
+activehs-base_port=		devel/hs-activehs-base
 aeson_port=			converters/hs-aeson
 Agda_port=			math/hs-Agda		# executable
 Agda-executable_port=		math/hs-Agda-executable	# executable
@@ -23,6 +25,7 @@ ansi-terminal_port=		devel/hs-ansi-terminal
 ansi-wl-pprint_port=		devel/hs-ansi-wl-pprint
 arrows_port=			devel/hs-arrows
 asn1-data_port=			devel/hs-asn1-data
+async_port=			devel/hs-async
 attempt_port=			devel/hs-attempt
 attoparsec_port=		textproc/hs-attoparsec
 attoparsec-conduit_port=	textproc/hs-attoparsec-conduit
@@ -31,6 +34,7 @@ authenticate_port=		www/hs-authenticate
 base-unicode-symbols_port=	devel/hs-base-unicode-symbols
 base16-bytestring_port=		devel/hs-base16-bytestring
 base64-bytestring_port=		devel/hs-base64-bytestring
+basic-prelude_port=		devel/hs-basic-prelude
 bio_port=			science/hs-bio
 bits-atomic_port=		devel/hs-bits-atomic
 blaze-builder_port=		devel/hs-blaze-builder
@@ -56,7 +60,10 @@ categories_port=		math/hs-categories
 certificate_port=		security/hs-certificate
 cgi_port=			www/hs-cgi
 checkers_port=			devel/hs-checkers
+cipher-aes_port=		security/hs-cipher-aes
 citeproc-hs_port=		textproc/hs-citeproc-hs
+classy-prelude_port=		devel/hs-classy-prelude
+classy-prelude-conduit_port=	devel/hs-classy-prelude-conduit
 clientsession_port=		security/hs-clientsession
 cmdargs_port=			devel/hs-cmdargs
 comonad_port=			math/hs-comonad
@@ -84,9 +91,13 @@ darcs_port=			devel/hs-darcs		# executable
 data-default_port=		devel/hs-data-default
 data-lens_port=			math/hs-data-lens
 data-lens-template_port=	math/hs-data-lens-template
+data-pprint_port=		devel/hs-data-pprint
 dataenc_port=			converters/hs-dataenc
+date-cache_port=		devel/hs-date-cache
 datetime_port=			devel/hs-datetime
 DeepArrow_port=			devel/hs-DeepArrow
+dia-base_port=			graphics/hs-dia-base
+dia-functions_port=		graphics/hs-dia-functions
 Diff_port=			textproc/hs-Diff
 digest_port=			security/hs-digest
 directory-tree_port=		devel/hs-directory-tree
@@ -108,6 +119,7 @@ file-embed_port=		devel/hs-file-embed
 filemanip_port=			devel/hs-filemanip
 filestore_port=			devel/hs-filestore
 filesystem-conduit_port=	devel/hs-filesystem-conduit
+fsnotify_port=			devel/hs-fsnotify
 gconf_port=			devel/hs-gconf
 ghc-events_port=		devel/hs-ghc-events	# executable
 ghc-mtl_port=			devel/hs-ghc-mtl
@@ -137,12 +149,14 @@ haskell-src-exts_port=		devel/hs-haskell-src-exts
 hastache_port=			devel/hs-hastache
 HaXml_port=			textproc/hs-HaXml	# executable
 heist_port=			www/hs-heist
+hexpat_port=			textproc/hs-hexpat
 HGL_port=			graphics/hs-HGL
 highlighting-kate_port=		textproc/hs-highlighting-kate
+hinotify_port=			devel/hs-hinotify
 hint_port=			devel/hs-hint
+hlint_port=			devel/hs-hlint		# executable
 hjsmin_port=			www/hs-hjsmin
 hlibev_port=			devel/hs-hlibev		# lib_depends
-hlint_port=			devel/hs-hlint		# executable
 hoogle_port=			devel/hs-hoogle		# executable
 hostname_port=			net/hs-hostname
 hs-bibutils_port=		textproc/hs-hs-bibutils
@@ -151,12 +165,14 @@ hscolour_port=			print/hs-hscolour	# executable
 hslogger_port=			devel/hs-hslogger
 HsOpenSSL_port=			security/hs-HsOpenSSL
 hspec_port=			devel/hs-hspec
+hspec-expectations_port=	devel/hs-hspec-expectations
 HStringTemplate_port=		textproc/hs-HStringTemplate
 html_port=			textproc/hs-html
 html-conduit_port=		textproc/hs-html-conduit
 HTTP_port=			www/hs-HTTP
 http-conduit_port=		www/hs-http-conduit
 http-date_port=			www/hs-http-date
+http-reverse-proxy_port=	www/hs-http-reverse-proxy
 http-server_port=		www/hs-http-server
 http-types_port=		www/hs-http-types
 HUnit_port=			devel/hs-HUnit
@@ -168,6 +184,7 @@ ieee754_port=			math/hs-ieee754
 IfElse_port=			devel/hs-IfElse
 IORefCAS_port=			devel/hs-IORefCAS
 json_port=			converters/hs-json
+kqueue_port=			devel/hs-kqueue
 language-c_port=		devel/hs-language-c
 language-javascript_port=	devel/hs-language-javascript
 largeword_port=			devel/hs-largeword
@@ -176,15 +193,18 @@ lhs2tex_port=			textproc/hs-lhs2tex
 libmpd_port=			audio/hs-libmpd
 libxml_port=			textproc/hs-libxml
 lifted-base_port=		devel/hs-lifted-base
+List_port=			devel/hs-List
 logict_port=			devel/hs-logict
 math-functions_port=		math/hs-math-functions
 MaybeT_port=			devel/hs-MaybeT
 MemoTrie_port=			devel/hs-MemoTrie
 mime_port=			mail/hs-mime
 mime-mail_port=			mail/hs-mime-mail
+mime-types_port=		mail/hs-mime-types
 MissingH_port=			devel/hs-MissingH
 mmap_port=			devel/hs-mmap
 monad-control_port=		devel/hs-monad-control
+monad-logger_port=		devel/hs-monad-logger
 monad-par_port=			devel/hs-monad-par
 monad-par-extras_port=		devel/hs-monad-par-extras
 MonadCatchIO-mtl_port=		devel/hs-MonadCatchIO-mtl
@@ -197,11 +217,14 @@ mwc-random_port=		math/hs-mwc-random
 mysql_port=			databases/hs-mysql
 network_port=			net/hs-network
 network-conduit_port=		net/hs-network-conduit
+network-info_port=		net/hs-network-info
+network-multicast_port=		net/hs-network-multicast
 NumInstances_port=		math/hs-NumInstances
 ObjectName_port=		devel/hs-ObjectName
 oeis_port=			www/hs-oeis
 OpenAL_port=			audio/hs-OpenAL
 OpenGL_port=			x11-toolkits/hs-OpenGL
+optparse-applicative_port=	devel/hs-optparse-applicative
 pandoc_port=			textproc/hs-pandoc	# executable
 pandoc-types_port=		textproc/hs-pandoc-types
 pango_port=			x11-toolkits/hs-pango
@@ -220,6 +243,7 @@ pool-conduit_port=		devel/hs-pool-conduit
 porte_port=			ports-mgmt/hs-porte	# executable
 primitive_port=			devel/hs-primitive
 probability_port=		math/hs-probability
+project-template_port=		devel/hs-project-template
 PSQueue_port=			devel/hs-PSQueue
 pureMD5_port=			security/hs-pureMD5
 pwstore-fast_port=		security/hs-pwstore-fast
@@ -227,6 +251,7 @@ QuickCheck_port=		devel/hs-QuickCheck
 random_port=			devel/hs-random
 ranges_port=			devel/hs-ranges
 reactive_port=			devel/hs-reactive
+ReadArgs_port=			devel/hs-ReadArgs
 readline_port=			devel/hs-readline
 recaptcha_port=			www/hs-recaptcha
 regex-base_port=		textproc/hs-regex-base
@@ -237,10 +262,12 @@ resource-pool_port=		devel/hs-resource-pool
 resourcet_port=			devel/hs-resourcet
 RSA_port=			security/hs-RSA
 safe_port=			devel/hs-safe
+SafeSemaphore_port=		devel/hs-SafeSemaphore
 scgi_port=			www/hs-scgi
 sendfile_port=			net/hs-sendfile
 semigroupoids_port=		math/hs-semigroupoids
 semigroups_port=		math/hs-semigroups
+setenv_port=			devel/hs-setenv
 SHA_port=			security/hs-SHA
 shakespeare_port=		www/hs-shakespeare
 shakespeare-css_port=		www/hs-shakespeare-css
@@ -249,6 +276,7 @@ shakespeare-js_port=		www/hs-shakespeare-js
 shakespeare-text_port=		www/hs-shakespeare-text
 show_port=			devel/hs-show
 silently_port=			devel/hs-silently
+simple-reflect_port=		devel/hs-simple-reflect
 simple-sendfile_port=		net/hs-simple-sendfile
 skein_port=			security/hs-skein
 smallcheck_port=		devel/hs-smallcheck
@@ -283,7 +311,9 @@ test-framework-quickcheck2_port=	devel/hs-test-framework-quickcheck2
 testpack_port=			devel/hs-testpack
 texmath_port=			textproc/hs-texmath	# executable
 text_port=			devel/hs-text
+threads_port=			devel/hs-threads
 threadscope_port=		devel/hs-threadscope	# executable
+time-compat_port=		devel/hs-time-compat
 tls_port=			security/hs-tls
 tls-extra_port=			security/hs-tls-extra
 transformers_port=		devel/hs-transformers
@@ -292,6 +322,7 @@ TypeCompose_port=		devel/hs-TypeCompose
 unamb_port=			devel/hs-unamb
 uniplate_port=			devel/hs-uniplate
 unix-compat_port=		devel/hs-unix-compat
+unix-time_port=			devel/hs-unix-time
 unlambda_port=			lang/hs-unlambda	# executable
 unordered-containers_port=	devel/hs-unordered-containers
 url_port=			www/hs-url
@@ -315,6 +346,7 @@ wai-logger_port=		www/hs-wai-logger
 wai-test_port=			www/hs-wai-test
 warp_port=			www/hs-warp
 webkit_port=			www/hs-webkit
+word8_port=			devel/hs-word8
 wx_port=			x11-toolkits/hs-wx
 wxc_port=			x11-toolkits/hs-wxc		# lib_depends
 wxcore_port=			x11-toolkits/hs-wxcore		# lib_depends
@@ -325,7 +357,6 @@ xhtml_port=			textproc/hs-xhtml
 xml_port=			textproc/hs-xml
 xml-conduit_port=		textproc/hs-xml-conduit
 xml-types_port=			textproc/hs-xml-types
-xml2html_port=			textproc/hs-xml2html
 xmlhtml_port=			textproc/hs-xmlhtml
 xmobar_port=			x11/hs-xmobar		# executable
 xmonad_port=			x11-wm/hs-xmonad	# executable
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 2a469dbefc02..aaeaf1a5e791 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,7 +1,7 @@
-SHA256 (ghc-7.4.1-src.tar.bz2) = 721c09a49e519b7459b67b451b5103252ba3833906a7a24c3a3679ff94669a79
-SIZE (ghc-7.4.1-src.tar.bz2) = 25272609
-SHA256 (hscolour-1.19.tar.gz) = 7f9d2cfafbd300793686fd4e9f4ddb3f6463f300a22129db898db47956689f9f
-SIZE (hscolour-1.19.tar.gz) = 25466
+SHA256 (ghc-7.4.2-src.tar.bz2) = f2ee1289a33cc70539287129841acc7eaf16112bb60c59b5a6ee91887bfd836d
+SIZE (ghc-7.4.2-src.tar.bz2) = 25836446
+SHA256 (hscolour-1.20.2.tar.gz) = a52910f4c4c5576bed80e23aa914c71c3975d4cd9cd79a9c85e2617d97a8824a
+SIZE (hscolour-1.20.2.tar.gz) = 25722
 SHA256 (ghc-7.4.1-i386-freebsd7-boot.tar.bz2) = e5cfc6c098179f8657d5cbf1a0fe70e8e9bfdde5a280c095e1dfc51d6e43731f
 SIZE (ghc-7.4.1-i386-freebsd7-boot.tar.bz2) = 45438870
 SHA256 (ghc-7.4.1-amd64-freebsd7-boot.tar.bz2) = 836e48e2a250a43b1230eac7f04821de86d915a51d0a36d6040b48cdd25ecedb
diff --git a/lang/ghc/files/patch-.._ghc-7.4.1-boot_rts_package.conf.in b/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in
index 7976302419f1..7976302419f1 100644
--- a/lang/ghc/files/patch-.._ghc-7.4.1-boot_rts_package.conf.in
+++ b/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in
diff --git a/lang/ghc/files/patch-compiler_ghc.mk b/lang/ghc/files/patch-compiler_ghc.mk
deleted file mode 100644
index ebd1dda64453..000000000000
--- a/lang/ghc/files/patch-compiler_ghc.mk
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./compiler/ghc.mk.orig	2012-02-01 19:10:32.000000000 +0100
-+++ ./compiler/ghc.mk	2012-05-17 11:32:41.868463028 +0200
-@@ -107,6 +107,10 @@
- 	@echo 'cRAWCPP_FLAGS         = "$(RAWCPP_FLAGS)"'                   >> $@
- 	@echo 'cLdHasNoCompactUnwind :: String'                             >> $@
- 	@echo 'cLdHasNoCompactUnwind = "$(LdHasNoCompactUnwind)"'           >> $@
-+	@echo 'cLdHashSize31 :: String'                                     >> $@
-+	@echo 'cLdHashSize31 = "$(LdHashSize31)"'                           >> $@
-+	@echo 'cLdReduceMemoryOverheads :: String'                          >> $@
-+	@echo 'cLdReduceMemoryOverheads = "$(LdReduceMemoryOverheads)"'     >> $@
- 	@echo 'cLdIsGNULd            :: String'                             >> $@
- 	@echo 'cLdIsGNULd            = "$(LdIsGNULd)"'                      >> $@
- 	@echo 'cLdHasBuildId         :: String'                             >> $@
diff --git a/lang/ghc/files/patch-compiler_main_DriverPipeline.hs b/lang/ghc/files/patch-compiler_main_DriverPipeline.hs
deleted file mode 100644
index e6740df077ae..000000000000
--- a/lang/ghc/files/patch-compiler_main_DriverPipeline.hs
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./compiler/main/DriverPipeline.hs.orig	2012-05-17 11:27:22.763461303 +0200
-+++ ./compiler/main/DriverPipeline.hs	2012-05-17 11:27:00.427463463 +0200
-@@ -1753,6 +1753,14 @@
-                           then ["-Wl,-no_compact_unwind"]
-                           else [])
- 
-+                      ++ (if cLdHashSize31 == "YES"
-+                          then ["-Wl,--hash-size=31"]
-+                          else [])
-+
-+                      ++ (if cLdReduceMemoryOverheads == "YES"
-+                          then ["-Wl,--reduce-memory-overheads"]
-+                          else [])
-+
-                       -- '-Wl,-read_only_relocs,suppress'
-                       -- ld gives loads of warnings like:
-                       --     ld: warning: text reloc in _base_GHCziArr_unsafeArray_info to _base_GHCziArr_unsafeArray_closure
diff --git a/lang/ghc/files/patch-configure b/lang/ghc/files/patch-configure
index 038cefa7a9c9..3383b16e1a76 100644
--- a/lang/ghc/files/patch-configure
+++ b/lang/ghc/files/patch-configure
@@ -1,15 +1,6 @@
---- ./configure.orig	2012-02-01 19:11:45.000000000 +0100
-+++ ./configure	2012-05-18 12:40:29.000000000 +0200
-@@ -608,6 +608,8 @@
- HavePapiLib
- GTK_CONFIG
- LdHasNoCompactUnwind
-+LdHashSize31
-+LdReduceMemoryOverheads
- LdHasBuildId
- LdIsGNULd
- LdXFlag
-@@ -3372,8 +3374,8 @@
+--- configure.orig	2012-06-06 18:11:19.000000000 +0100
++++ configure	2012-08-25 06:03:00.000000000 +0100
+@@ -3372,8 +3372,8 @@
    vax)
      BuildArch="vax"
      ;;
@@ -20,7 +11,7 @@
      ;;
    *)
      echo "Unknown CPU $build_cpu"
-@@ -3404,7 +3406,7 @@
+@@ -3404,7 +3404,7 @@
    freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
      BuildOS="$build_os"
      ;;
@@ -29,7 +20,7 @@
      BuildOS="freebsd"
      ;;
    *)
-@@ -3486,8 +3488,8 @@
+@@ -3486,8 +3486,8 @@
    vax)
      HostArch="vax"
      ;;
@@ -40,7 +31,7 @@
      ;;
    *)
      echo "Unknown CPU $host_cpu"
-@@ -3600,8 +3602,8 @@
+@@ -3600,8 +3600,8 @@
    vax)
      TargetArch="vax"
      ;;
@@ -51,123 +42,16 @@
      ;;
    *)
      echo "Unknown CPU $target_cpu"
-@@ -3712,6 +3714,9 @@
+@@ -3711,6 +3711,8 @@
  
  
  
 +bootstrap_target=`echo "$bootstrap_target" |sed -e 's/-unknown-/-portbld-/g' -e 's/x86_64/amd64/g'`
 +build=`echo "$build" |sed -e 's/\(freebsd\)[[:digit:].]*$/\1/g'`
-+
+ 
  # Verify that the installed (bootstrap) GHC is capable of generating
  # code for the requested build platform.
- if test "$BootingFromHc" = "NO"
-@@ -5313,9 +5318,9 @@
-   echo 'foo() {}' > conftest.c
- ${CC-cc} -c conftest.c
- if ${LdCmd} -r --hash-size=31 -o conftest2.o conftest.o > /dev/null 2>&1; then
--   fp_cv_LdHashSize31=--hash-size=31
-+   fp_cv_LdHashSize31=YES
- else
--   fp_cv_LdHashSize31=
-+   fp_cv_LdHashSize31=NO
- fi
- rm -rf conftest*
- fi
-@@ -5334,9 +5339,9 @@
-   echo 'foo() {}' > conftest.c
- ${CC-cc} -c conftest.c
- if ${LdCmd} -r --reduce-memory-overheads -o conftest2.o conftest.o > /dev/null 2>&1; then
--   fp_cv_LdReduceMemoryOverheads=--reduce-memory-overheads
-+   fp_cv_LdReduceMemoryOverheads=YES
- else
--   fp_cv_LdReduceMemoryOverheads=
-+   fp_cv_LdReduceMemoryOverheads=NO
- fi
- rm -rf conftest*
- fi
-@@ -5387,18 +5392,6 @@
-         CFLAGS="$CFLAGS -fno-stack-protector"
-     fi
- 
--    # Reduce memory usage when linking. See trac #5240.
--    if test -n "$LdHashSize31"
--    then
--        LDFLAGS="$LDFLAGS -Wl,$LdHashSize31"
--        IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS     $LdHashSize31"
--    fi
--    if test -n "$LdReduceMemoryOverheads"
--    then
--        LDFLAGS="$LDFLAGS -Wl,$LdReduceMemoryOverheads"
--        IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS     $LdReduceMemoryOverheads"
--    fi
--
-     rm -f conftest.c conftest.o
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
- $as_echo "done" >&6; }
-@@ -5445,15 +5438,15 @@
-     fi
- 
-     # Reduce memory usage when linking. See trac #5240.
--    if test -n "$LdHashSize31"
-+    if [ "$LdHashSize31" = "YES" ]
-     then
--        CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,$LdHashSize31"
--        CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0     $LdHashSize31"
-+        CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,--hash-size=31"
-+        CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0     --hash-size=31"
-     fi
--    if test -n "$LdReduceMemoryOverheads"
-+    if [ "$LdReduceMemoryOverheads" = "YES" ]
-     then
--        CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,$LdReduceMemoryOverheads"
--        CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0     $LdReduceMemoryOverheads"
-+        CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,--reduce-memory-overheads"
-+        CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0     --reduce-memory-overheads"
-     fi
- 
-     rm -f conftest.c conftest.o
-@@ -5502,15 +5495,15 @@
-     fi
- 
-     # Reduce memory usage when linking. See trac #5240.
--    if test -n "$LdHashSize31"
-+    if [ "$LdHashSize31" = "YES" ]
-     then
--        CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,$LdHashSize31"
--        CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1     $LdHashSize31"
-+        CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,--hash-size=31"
-+        CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1     --hash-size=31"
-     fi
--    if test -n "$LdReduceMemoryOverheads"
-+    if [ "$LdReduceMemoryOverheads" = "YES" ]
-     then
--        CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,$LdReduceMemoryOverheads"
--        CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1     $LdReduceMemoryOverheads"
-+        CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,--reduce-memory-overheads"
-+        CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1     --reduce-memory-overheads"
-     fi
- 
-     rm -f conftest.c conftest.o
-@@ -5559,18 +5552,6 @@
-         CONF_CC_OPTS_STAGE2="$CONF_CC_OPTS_STAGE2 -fno-stack-protector"
-     fi
- 
--    # Reduce memory usage when linking. See trac #5240.
--    if test -n "$LdHashSize31"
--    then
--        CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 -Wl,$LdHashSize31"
--        CONF_LD_LINKER_OPTS_STAGE2="$CONF_LD_LINKER_OPTS_STAGE2     $LdHashSize31"
--    fi
--    if test -n "$LdReduceMemoryOverheads"
--    then
--        CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 -Wl,$LdReduceMemoryOverheads"
--        CONF_LD_LINKER_OPTS_STAGE2="$CONF_LD_LINKER_OPTS_STAGE2     $LdReduceMemoryOverheads"
--    fi
--
-     rm -f conftest.c conftest.o
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
- $as_echo "done" >&6; }
-@@ -5772,7 +5753,7 @@
+@@ -5772,7 +5774,7 @@
          i386)
              test -z "$2" || eval "$2=ArchX86"
              ;;
@@ -176,7 +60,7 @@
  
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -5953,7 +5934,7 @@
+@@ -5953,7 +5955,7 @@
  
      checkVendor() {
          case $1 in
@@ -185,7 +69,7 @@
              ;;
          *)
              echo "Unknown vendor $1"
-@@ -5976,7 +5957,7 @@
+@@ -5976,7 +5978,7 @@
          mingw32)
              test -z "$2" || eval "$2=OSMinGW32"
              ;;
@@ -194,7 +78,7 @@
              test -z "$2" || eval "$2=OSFreeBSD"
              ;;
          kfreebsdgnu)
-@@ -9987,7 +9968,7 @@
+@@ -9990,7 +9992,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -203,7 +87,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -10018,11 +9999,7 @@
+@@ -10021,12 +10023,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
  $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
  if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
@@ -212,7 +96,8 @@
 -_ACEOF
 -
 -  LIBS="-lrt $LIBS"
-+    LIBS="$LIBS"
- 
+-
++  LIBS="$LIBS"
  fi
  
+ for ac_func in clock_gettime timer_create timer_settime
diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk
index 8844713ad7f5..00eeed367856 100644
--- a/lang/ghc/files/patch-ghc.mk
+++ b/lang/ghc/files/patch-ghc.mk
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- ghc.mk.orig	2012-02-01 19:10:32.000000000 +0100
-+++ ghc.mk	2012-06-08 17:39:40.000000000 +0200
+--- ghc.mk.orig	2012-06-06 18:10:25.000000000 +0100
++++ ghc.mk	2012-08-25 12:57:51.000000000 +0100
 @@ -81,6 +81,7 @@
  # Catch make if it runs away into an infinite loop
  ifeq      "$(MAKE_RESTARTS)" ""
@@ -11,12 +8,3 @@ $FreeBSD$
  else
  $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?)
  endif
-@@ -377,6 +378,8 @@
-     endif
- endef
- 
-+PACKAGES =
-+
- define addPackage # args: $1 = package, $2 = condition
- ifneq "$(filter $1,$(PKGS_THAT_USE_TH)) $(GhcProfiled)" "$1 YES"
- ifeq "$(filter $1,$(PKGS_THAT_BUILD_WITH_STAGE2))" "$1"
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
new file mode 100644
index 000000000000..96945336bbc0
--- /dev/null
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -0,0 +1,46 @@
+--- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig	2012-11-23 17:07:58.000000000 +0100
++++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs	2012-11-23 19:17:52.000000000 +0100
+@@ -46,7 +46,7 @@
+   ) where
+ 
+ import Distribution.Simple.Program.Types
+-         ( Program(..), simpleProgram )
++         ( Program(..), simpleProgram, simpleProgramFromEnvironment )
+ import Distribution.Simple.Utils
+          ( findProgramLocation, findProgramVersion )
+ 
+@@ -194,15 +194,15 @@
+   }
+ 
+ gccProgram :: Program
+-gccProgram = (simpleProgram "gcc") {
++gccProgram = (simpleProgramFromEnvironment "gcc" "CC") {
+     programFindVersion = findProgramVersion "-dumpversion" id
+   }
+ 
+ ranlibProgram :: Program
+-ranlibProgram = simpleProgram "ranlib"
++ranlibProgram = simpleProgramFromEnvironment "ranlib" "RANLIB"
+ 
+ arProgram :: Program
+-arProgram = simpleProgram "ar"
++arProgram = simpleProgramFromEnvironment "ar" "AR"
+ 
+ stripProgram :: Program
+ stripProgram = simpleProgram "strip"
+@@ -255,13 +255,13 @@
+ greencardProgram = simpleProgram "greencard"
+ 
+ ldProgram :: Program
+-ldProgram = simpleProgram "ld"
++ldProgram = simpleProgramFromEnvironment "ld" "LD"
+ 
+ tarProgram :: Program
+ tarProgram = simpleProgram "tar"
+ 
+ cppProgram :: Program
+-cppProgram = simpleProgram "cpp"
++cppProgram = simpleProgramFromEnvironment "cpp" "CPP"
+ 
+ pkgConfigProgram :: Program
+ pkgConfigProgram = (simpleProgram "pkg-config") {
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs
new file mode 100644
index 000000000000..98b11338b455
--- /dev/null
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs
@@ -0,0 +1,38 @@
+--- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Types.hs.orig	2012-11-23 17:07:58.000000000 +0100
++++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Types.hs	2012-11-23 19:19:04.000000000 +0100
+@@ -18,6 +18,7 @@
+     -- * Program and functions for constructing them
+     Program(..),
+     simpleProgram,
++    simpleProgramFromEnvironment,
+ 
+     -- * Configured program and related functions
+     ConfiguredProgram(..),
+@@ -28,7 +29,7 @@
+   ) where
+ 
+ import Distribution.Simple.Utils
+-         ( findProgramLocation )
++         ( findProgramLocation, getProgramFromEnvironment )
+ import Distribution.Version
+          ( Version )
+ import Distribution.Verbosity
+@@ -116,6 +117,18 @@
+     programPostConf     = \_ _ -> return []
+   }
+ 
++-- | Make a simple named program from an environment variable.
++--
++-- > simpleProgramFromEnvironment "foo" "FOO"
++--
++simpleProgramFromEnvironment :: String -> String -> Program
++simpleProgramFromEnvironment name var = Program {
++    programName         = name,
++    programFindLocation = \v   -> getProgramFromEnvironment v name var,
++    programFindVersion  = \_ _ -> return Nothing,
++    programPostConf     = \_ _ -> return []
++  }
++
+ -- | Make a simple 'ConfiguredProgram'.
+ --
+ -- > simpleConfiguredProgram "foo" (FoundOnSystem path)
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs
new file mode 100644
index 000000000000..d9be9167a45e
--- /dev/null
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs
@@ -0,0 +1,39 @@
+--- ./libraries/Cabal/Cabal/Distribution/Simple/Utils.hs.orig	2012-11-23 17:07:58.000000000 +0100
++++ ./libraries/Cabal/Cabal/Distribution/Simple/Utils.hs	2012-11-23 19:38:03.000000000 +0100
+@@ -95,6 +95,7 @@
+         findModuleFile,
+         findModuleFiles,
+         getDirectoryContentsRecursive,
++        getProgramFromEnvironment,
+ 
+         -- * simple file globbing
+         matchFileGlob,
+@@ -152,7 +153,7 @@
+     ( getDirectoryContents, doesDirectoryExist, doesFileExist, removeFile
+     , findExecutable )
+ import System.Environment
+-    ( getProgName )
++    ( getProgName, getEnvironment )
+ import System.Cmd
+     ( rawSystem )
+ import System.Exit
+@@ -670,6 +671,19 @@
+         ignore ['.', '.'] = True
+         ignore _          = False
+ 
++getProgramFromEnvironment :: Verbosity -> String -> String -> IO (Maybe FilePath)
++getProgramFromEnvironment verbosity prog name = do
++  debug verbosity $
++    "searching for " ++ prog ++ " in the environment (as " ++ name ++ ")."
++  res <- lookup name `fmap` getEnvironment
++  case res of
++    Nothing -> do
++      debug verbosity $ "falling back to searching in the path."
++      findExecutable prog
++    v@(Just val) -> do
++      debug verbosity $ "found as " ++ val ++ "."
++      return v
++
+ ----------------
+ -- File globbing
+ 
diff --git a/lang/ghc/files/patch-libraries_bin-package-db_LICENSE b/lang/ghc/files/patch-libraries_bin-package-db_LICENSE
deleted file mode 100644
index 698da4c221ea..000000000000
--- a/lang/ghc/files/patch-libraries_bin-package-db_LICENSE
+++ /dev/null
@@ -1,8 +0,0 @@
-
-$FreeBSD$
-
---- /dev/null
-+++ libraries/bin-package-db/LICENSE
-@@ -0,0 +1,2 @@
-+
-+
diff --git a/lang/ghc/files/patch-mk_config.mk.in b/lang/ghc/files/patch-mk_config.mk.in
deleted file mode 100644
index 091c2aadddb3..000000000000
--- a/lang/ghc/files/patch-mk_config.mk.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./mk/config.mk.in.orig	2012-02-01 19:10:32.000000000 +0100
-+++ ./mk/config.mk.in	2012-05-17 11:30:15.271461640 +0200
-@@ -699,6 +699,9 @@
- # and compiler/main/DriverPipeline.hs.
- LdHasNoCompactUnwind	= @LdHasNoCompactUnwind@
- 
-+LdHashSize31		= @LdHashSize31@
-+LdReduceMemoryOverheads	= @LdReduceMemoryOverheads@
-+
- # On MSYS, building with SplitObjs=YES fails with 
- #   ar: Bad file number
- # see #3201.  We need to specify a smaller max command-line size
diff --git a/lang/ghc/pkg-descr b/lang/ghc/pkg-descr
index 28181522ac05..f6962bd4d3aa 100644
--- a/lang/ghc/pkg-descr
+++ b/lang/ghc/pkg-descr
@@ -13,4 +13,4 @@ generational garbage collector, a space and time profiler, comprehensive
 set of libraries and an interactive system for convenient, quick
 development.
 
-WWW:	http://www.haskell.org/ghc/
+WWW: http://www.haskell.org/ghc/
author	Gabor Pali <pgj@FreeBSD.org>	2012-12-20 02:23:04 +0000
committer	Gabor Pali <pgj@FreeBSD.org>	2012-12-20 02:23:04 +0000
commit	f6f83c9efc2c46d2970746758e2c682bb8a518ec (patch)
tree	290f2ea61305744bf0f477895c56b92acaeb361f /lang/ghc
parent	af071cfdc1f8578bd1523b823e683074a3139a34 (diff)
download	ports-f6f83c9efc2c46d2970746758e2c682bb8a518ec.tar.gz ports-f6f83c9efc2c46d2970746758e2c682bb8a518ec.zip