[Midnightbsd-cvs] mports [19681] trunk/lang/ghc: ghc 7.8.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 7 20:51:12 EDT 2015


Revision: 19681
          http://svnweb.midnightbsd.org/mports/?rev=19681
Author:   laffer1
Date:     2015-08-07 20:51:11 -0400 (Fri, 07 Aug 2015)
Log Message:
-----------
ghc 7.8.3

Modified Paths:
--------------
    trunk/lang/ghc/Makefile
    trunk/lang/ghc/bsd.cabal.mk
    trunk/lang/ghc/bsd.cabal.options.mk
    trunk/lang/ghc/bsd.hackage.mk
    trunk/lang/ghc/distinfo
    trunk/lang/ghc/files/patch-aclocal.m4
    trunk/lang/ghc/files/patch-configure.ac
    trunk/lang/ghc/files/patch-ghc.mk
    trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
    trunk/lang/ghc/pkg-plist

Removed Paths:
-------------
    trunk/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in
    trunk/lang/ghc/files/patch-compiler-main-Dynflags.hs
    trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs
    trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs
    trunk/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc
    trunk/lang/ghc/files/patch-mk-config.mk.in
    trunk/lang/ghc/files/patch-rts-ghc.mk
    trunk/lang/ghc/files/patch-rts_package.conf.in

Property Changed:
----------------
    trunk/lang/ghc/bsd.cabal.mk
    trunk/lang/ghc/bsd.cabal.options.mk
    trunk/lang/ghc/bsd.hackage.mk
    trunk/lang/ghc/files/patch-aclocal.m4
    trunk/lang/ghc/files/patch-configure.ac
    trunk/lang/ghc/files/patch-ghc.mk
    trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs

Modified: trunk/lang/ghc/Makefile
===================================================================
--- trunk/lang/ghc/Makefile	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/Makefile	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,33 +1,34 @@
 # $MidnightBSD$
 
 PORTNAME=	ghc
-PORTVERSION=	7.6.3
+PORTVERSION=	7.8.3
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
-		${MASTER_SITE_LOCAL:S/$/:boot/}
-MASTER_SITE_SUBDIR=	pgj/:boot
+		LOCAL/pgj/:boot
 DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Compiler for the functional language Haskell
+
 LICENSE=	bsd3
 
+MAKE_JOBS_NUMBER_LIMIT=		4
+
 GHC_VERSION=		${PORTVERSION}
-BOOT_GHC_VERSION=	7.4.1
-HSCOLOUR_VERSION=	1.20.2
+HSCOLOUR_VERSION=	1.20.3
 
 DATADIR=	${PREFIX}/share/ghc-${GHC_VERSION}
 EXAMPLESDIR=	${PREFIX}/share/examples/ghc-${GHC_VERSION}
 
-CONFLICTS=	ghc-6.8.* ghc-6.10.* ghc-6.12.* ghc-7.0.* ghc-7.2.* ghc-7.4.*
+CONFLICTS=	ghc-6.* ghc-7.0.* ghc-7.2.* ghc-7.4.* ghc-7.6.* ghc-7.7.*
 
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 
 USE_AUTOTOOLS=		autoconf autoheader
-USE_PERL5_BUILD=	yes
-USES=			iconv ncurses gmake tar:bzip2
+USE_PERL5=		build
+USES=			gmake iconv:translit perl5 ncurses tar:bzip2
 USE_BINUTILS=		yes
-USE_GCC=		4.6+
+USE_GCC=		yes
 
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
@@ -40,7 +41,7 @@
 # You can view below.
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=		PROFILE DYNAMIC DOCS
+OPTIONS_DEFINE=		PROFILE DYNAMIC LLVM DOCS
 OPTIONS_DEFAULT=	PROFILE DYNAMIC DOCS
 
 BOOT_DESC=		Use installed GHC for bootstrapping
@@ -47,6 +48,7 @@
 BOOTH_DESC=		Use installed HsColour for bootstrapping
 PROFILE_DESC=		Add support for performance profiling
 DYNAMIC_DESC=		Add support for dynamic linking
+LLVM_DESC=		Add support for generating code via LLVM
 DOCS_DESC=		Install HTML documentation
 
 LOCALBASE?=	/usr/local
@@ -62,35 +64,28 @@
 .include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MDYNAMIC}
-LIB_DEPENDS+=	ffi.6:${PORTSDIR}/devel/libffi
+# The version number is needed as lang/gcc installs a different version
+LIB_DEPENDS+=	libffi.so.6:${PORTSDIR}/devel/libffi
 .endif
 
 .if empty(PORT_OPTIONS:MBOOT)
 
-EXTRA_PATCHES=		${PATCHDIR}/nopatch-.._ghc-${BOOT_GHC_VERSION}-boot_rts_package.conf.in
+BOOT_GHC_VERSION=	7.6.3
 
 .if ${ARCH} == "i386"
 
-.if ${OSVERSION} >= 4016
+.if ${OSVERSION} >= 4015
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-i386-freebsd9-boot${EXTRACT_SUFX}:boot
-.elif ${OSVERSION} >= 800000
+.else
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot
-.elif ${OSVERSION} >= 700000
-DISTFILES+=	ghc-${BOOT_GHC_VERSION}-i386-freebsd7-boot${EXTRACT_SUFX}:boot
-.else
-IGNORE=		unsupported
 .endif
 
 .elif ${ARCH} == "amd64"
 
-.if ${OSVERSION} >= 900000
+.if ${OSVERSION} >= 4015
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-amd64-freebsd9-boot${EXTRACT_SUFX}:boot
-.elif ${OSVERSION} >= 800000
+.else
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot
-.elif ${OSVERSION} >= 700000
-DISTFILES+=	ghc-${BOOT_GHC_VERSION}-amd64-freebsd7-boot${EXTRACT_SUFX}:boot
-.else
-IGNORE=		unsupported
 .endif
 
 .endif
@@ -98,19 +93,19 @@
 .endif # MBOOT
 
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-GHC_LIBDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}
+GHC_LIBDIR=	${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}
 GHC_LIBDIR_REL=	lib/ghc-${GHC_VERSION}
 
 PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
 
-HACKAGE_SITE?=		http://hackage.haskell.org/
-HACKAGE_ARCH?=		packages/archive/
+HACKAGE_SITE?=		http://hackage.haskell.org/package/
 
 CONFIGURE_ARGS=		--with-gcc=${CC} \
 			--with-ld=${LD} \
 			--with-gmp-includes=${LOCALBASE}/include \
-			--with-gmp-libraries=${LOCALBASE}/lib \
-			--with-iconv-includes=${LOCALBASE}/include \
+			--with-gmp-libraries=${LOCALBASE}/lib
+
+CONFIGURE_ARGS+=	--with-iconv-includes=${LOCALBASE}/include \
 			--with-iconv-libraries=${LOCALBASE}/lib
 
 .if ${PORT_OPTIONS:MDYNAMIC}
@@ -119,6 +114,14 @@
 			--with-ffi-libraries=${LOCALBASE}/lib
 .endif
 
+.if ${PORT_OPTIONS:MLLVM}
+BUILD_DEPENDS+=		${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
+RUN_DEPENDS+=		${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
+
+CONFIGURE_ARGS+=	--with-opt=${LOCALBASE}/bin/opt34 \
+			--with-llc=${LOCALBASE}/bin/llc34
+.endif
+
 .if empty(PORT_OPTIONS:MBOOT)
 
 BOOT_DIR=	${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
@@ -128,7 +131,7 @@
 
 SLAVE_CMD=	${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
 
-CONFIGURE_ARGS_BOOT=	--prefix=${BOOT_DIR} --with-gcc=${CC}
+CONFIGURE_ARGS_BOOT=	--prefix=${BOOT_DIR} --with-gcc=${CC} --with-ld=${LD}
 CONFIGURE_ARGS+=	--with-ghc=${BOOT_GHC}
 
 .else # MBOOT
@@ -158,7 +161,7 @@
 
 .if empty(PORT_OPTIONS:MBOOTH)
 
-MASTER_SITES+=	${HACKAGE_SITE}${HACKAGE_ARCH}hscolour/${HSCOLOUR_VERSION}/:docs
+MASTER_SITES+=	${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs
 DISTFILES+=	hscolour-${HSCOLOUR_VERSION}.tar.gz:docs
 
 EXTRACT_ONLY=	${_DISTFILES:C/hscolour.*$//g}
@@ -165,8 +168,6 @@
 
 .endif # MBOOTH
 
-MAN1=		ghc.1
-
 .if empty(PORT_OPTIONS:MBOOTH)
 
 SLAVES_PREFIX=		${WRKDIR}/slaves_prefix
@@ -178,7 +179,7 @@
 
 .endif # MBOOTH
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
+BUILD_DEPENDS+=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 .endif
 
@@ -215,18 +216,17 @@
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-include-dirs=${LOCALBASE}/include"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${LOCALBASE}/lib"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=${NCURSESINC} --configure-option=--with-curses-libraries=${NCURSESLIB}"
-#	@${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_NAME = ghc-\$$(ProjectVersion)-boot"
-#	@${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_TAR  = ghc-\$$(ProjectVersion)-amd64-ash0-freebsd8-boot.tar"
+	@${ECHO} >> ${WRKSRC}/mk/build.mk "V = 0"
 
 post-install-script:
 	@${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E -e \
 		'/^${GHC_LIBDIR:C/\//\\\//g}\/package.conf.d\/package\.cache/d' -e \
-		's,^${PREFIX}/?,,' >> ${TMPPLIST}
-	@${FIND} -ds ${DOCSDIR} -type f -print | ${SED} -E -e \
-		'/^${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/d' -e \
-		'/^${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/d' -e \
-		'/^${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/d' -e \
-		's,^${PREFIX}/?,,' >> ${TMPPLIST}
+		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
+	@${FIND} -ds ${STAGEDIR}${DOCSDIR} -type f -print | ${SED} -E -e \
+		'/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/d' -e \
+		'/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/d' -e \
+		'/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/d' -e \
+		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	# Cleanup the indexen created by gen_contents_index
 	@${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST}
@@ -233,46 +233,24 @@
 	@${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST}
 	@${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST}
 .endif
+	@${ECHO} '@unexec ${RM} -f %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST}
 	@${ECHO} "@exec %D/bin/ghc-pkg recache" >>${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO} '@exec ${SH} -c "cd %D/${DOCSDIR_REL}/html/libraries && ./gen_contents_index"' >> ${TMPPLIST}
 .endif
-	@${ECHO} '@unexec ${RM} -f %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST}
-	@${FIND} -ds ${DOCSDIR} -type d -print | ${SED} -E -e \
-		's,^${PREFIX}/?, at dirrm ,' >> ${TMPPLIST}
-	@${FIND} -ds ${GHC_LIBDIR} -type d -print | ${SED} -E -e \
-		's,^${PREFIX}/?, at dirrm ,' >> ${TMPPLIST}
 
-#post-build:
-#	@(cd ${WRKSRC} && ${GMAKE} binary-dist)
-#
-#do-install:
-#	@${NONE}
-
 post-patch:
-# Hack don't to install the internal haddock.
-	@${REINPLACE_CMD} -e 's+\(DO_NOT_INSTALL =\)+\1 haddock+' \
-		${WRKSRC}/utils/Makefile
+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
+		s|%%AR%%|${AR}|; \
+		s|%%RANLIB%%|${RANLIB}|; \
+		s|%%LD%%|${LD}|' \
+		${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
 
-.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)
+	@(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install)
 .endif
 
 # Defining with documentation:
@@ -295,23 +273,18 @@
 		${TAR} xvf ${DISTDIR}/hscolour-${HSCOLOUR_VERSION}.tar.gz && \
 		cd hscolour-${HSCOLOUR_VERSION} && \
 		${SLAVE_CMD} ghc --make -o Setup Setup.hs -package Cabal && \
-		${SLAVE_CMD} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} && \
+		${SLAVE_CMD} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} --with-gcc=${CC} --with-ld=${LD} && \
 		${SLAVE_CMD} ./Setup build && \
 		${SLAVE_CMD} ./Setup install)
 .endif
 
 post-install:
-	# cabalised hs-foo-ghc ports
-	@${MKDIR} ${PREFIX}/lib/cabal/ghc-${GHC_VERSION}
-	@${MKDIR} ${PREFIX}/share/cabal/ghc-${GHC_VERSION}
-	@${MKDIR} ${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION}
-	@${MKDIR} ${PREFIX}/share/examples/cabal/ghc-${GHC_VERSION}
+	@${RM} -f ${STAGEDIR}${PREFIX}/bin/haddock
 .if ${PORT_OPTIONS:MDOCS}
-	cd ${DOCSDIR}/html/libraries && ./gen_contents_index
+	@${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock
 .endif
-	@${RM} -f ${PREFIX}/bin/haddock
-.if ${PORT_OPTIONS:MDOCS}
-	@${LN} -sf ${PREFIX}/bin/haddock-ghc-${GHC_VERSION} ${PREFIX}/bin/haddock
-.endif
+	@(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit ${GHC_LIBDIR}/mkGmpDerivedConstants \
+	    $$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so'); do \
+	    ${STRIP_CMD} $$f; done)
 
 .include <bsd.port.mk>

Modified: trunk/lang/ghc/bsd.cabal.mk
===================================================================
--- trunk/lang/ghc/bsd.cabal.mk	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/bsd.cabal.mk	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,5 +1,6 @@
 .if !defined(METAPORT)
-MASTER_SITES?=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES?=	http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/
+DIST_SUBDIR?=	cabal
 .else
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -6,13 +7,13 @@
 EXTRACT_ONLY=	# empty
 NO_FETCH=	yes
 NO_BUILD=	yes
+NO_INSTALL=	yes
+NO_MTREE=	yes
 .endif # !METAPORT
 
-DIST_SUBDIR?=	cabal
+MAKE_ENV+=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} \
+		TMPDIR=${TMPDIR}
 
-FILE_LICENSE?=	LICENSE
-
-CABAL_SETUP?=	Setup.lhs
 SETUP_CMD?=	./setup
 
 ALEX_CMD?=	${LOCALBASE}/bin/alex
@@ -19,20 +20,21 @@
 HAPPY_CMD?=	${LOCALBASE}/bin/happy
 C2HS_CMD?=	${LOCALBASE}/bin/c2hs
 
-CABAL_DIRS+=	${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}
+CABAL_DIRS+=	${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} \
+		${DOCSDIR}
 
 GHC_HADDOCK_CMD=${LOCALBASE}/bin/haddock-ghc-${GHC_VERSION}
 
-CABAL_DOCSDIR=		${PREFIX}/share/doc/ghc-${GHC_VERSION}/cabal
+CABAL_DOCSDIR=		${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION}
 CABAL_DOCSDIR_REL=	${CABAL_DOCSDIR:S,^${PREFIX}/,,}
 
-DATADIR=	${PREFIX}/share/ghc-${GHC_VERSION}/cabal/${DISTNAME}
+DATADIR=	${PREFIX}/share/cabal/ghc-${GHC_VERSION}/${DISTNAME}
 DOCSDIR=	${CABAL_DOCSDIR}/${DISTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/ghc-${GHC_VERSION}/cabal/${DISTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/cabal/ghc-${GHC_VERSION}/${DISTNAME}
 
 GHC_LIB_DOCSDIR_REL=	share/doc/ghc-${GHC_VERSION}/html/libraries
 
-CABAL_LIBDIR=		${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
+CABAL_LIBDIR=		${PREFIX}/lib/cabal/ghc-${GHC_VERSION}
 CABAL_LIBSUBDIR=	${DISTNAME}
 CABAL_LIBDIR_REL=	${CABAL_LIBDIR:S,^${PREFIX}/,,}
 
@@ -51,6 +53,7 @@
 INSTALL_PORTEXAMPLES?=
 
 LOCALBASE?=	/usr/local
+TMPDIR?=	${WRKDIR}/tmp
 
 .if !defined(CABALOPTIONSMKINCLUDED)
 .include "bsd.cabal.options.mk"
@@ -67,11 +70,19 @@
 .endif
 
 USE_BINUTILS=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 
 CONFIGURE_ARGS+=	--with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} \
 			--with-ranlib=${RANLIB}
 
+.if ${PORT_OPTIONS:MLLVM}
+CONFIGURE_ARGS+=	--ghc-option=-fllvm \
+			--ghc-option=-pgmlo --ghc-option=${LOCALBASE}/bin/opt34 \
+			--ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc34
+
+BUILD_DEPENDS+=		${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
+.endif
+
 .if defined(USE_ALEX)
 BUILD_DEPENDS+=	${ALEX_CMD}:${PORTSDIR}/devel/hs-alex
 CONFIGURE_ARGS+=	 --with-alex=${ALEX_CMD}
@@ -88,8 +99,10 @@
 .endif
 
 .if defined(EXECUTABLE)
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
-USE_ICONV=	yes
+LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+USES+=		iconv
+
+CONFIGURE_ARGS+=	--enable-executable-stripping
 .endif
 
 .if defined(USE_CABAL)
@@ -123,12 +136,14 @@
 .endif
 
 .if defined(USE_GHC_NATIVE)
-USE_PERL5_BUILD=	5.8+
+USES+=		perl5
+USE_PERL5=	build
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 .if !defined(XMLDOCS)
 
+.if defined(HADDOCK_AVAILABLE)
 HADDOCK_OPTS=	# empty
 
 .if ${PORT_OPTIONS:MHSCOLOUR}
@@ -135,34 +150,32 @@
 BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
 
 HSCOLOUR_VERSION=	1.20.3
-HSCOLOUR_DATADIR=	${LOCALBASE}/share/ghc-${GHC_VERSION}/cabal/hscolour-${HSCOLOUR_VERSION}
+HSCOLOUR_DATADIR=	${LOCALBASE}/share/cabal/ghc-${GHC_VERSION}/hscolour-${HSCOLOUR_VERSION}
 HADDOCK_OPTS+=		--hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif # HSCOLOUR
+.endif # HADDOCK_AVAILABLE
 
 .endif
 
 .if defined(XMLDOCS)
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
+BUILD_DEPENDS+=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 
-USE_GMAKE=	yes
+USES+=		gmake
 
 .endif # !XMLDOCS
 
-.if !defined(METAPORT)
-PORTDOCS=	*
-.endif # !METAPORT
-
 .endif # DOCS
 
 __handle_datadir__=	--datadir='${DATADIR}' --datasubdir='' --docdir='${DOCSDIR}'
 
-.if !defined(XMLDOCS) && ${PORT_OPTIONS:MDOCS}
+.if defined(HADDOCK_AVAILABLE) && !defined(XMLDOCS) && ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--haddock-options=-w --with-haddock=${HADDOCK_CMD}
 .endif
 
 .if ${PORT_OPTIONS:MDYNAMIC}
 CONFIGURE_ARGS+=	--enable-shared --enable-executable-dynamic
+CONFIGURE_ARGS+=	"--ghc-option=-optl -rpath" "--ghc-option=-optl ${CABAL_LIBDIR}/${DISTNAME}"
 .else
 CONFIGURE_ARGS+=	--disable-shared --disable-executable-dynamic
 .endif
@@ -181,28 +194,25 @@
 		${WRKSRC}/doc/configure.ac
 .endif
 
-# Purge Haskell 98 (required for GHC 7.2 or later)
-.if defined(HASKELL98)
-	@${REINPLACE_CMD} -E 's|haskell98[,]?||' \
-		${WRKSRC}/${PORTNAME}.cabal
+_BUILD_SETUP=	${GHC_CMD} -o ${SETUP_CMD} -package Cabal --make
 
-	@${REINPLACE_CMD} 's|import List|import Data.List| ; \
-		s|import Char|import Data.Char| ; \
-		s|import Ratio|import Data.Ratio| ; \
-		s|import Monad|import Control.Monad| ; \
-		s|import IO|import System.IO.Error| ; \
-		s|import Directory|import System.Directory| ; \
-		s|import Maybe|import Data.Maybe| ; \
-		s|import Array|import Data.Array|' \
-		`${FIND} ${WRKSRC} -name '*.hs'`
-.endif
-
+.if !defined(METAPORT)
 .if !target(do-configure)
 do-configure:
-.if !defined(METAPORT)
-	cd ${WRKSRC} && ${GHC_CMD} --make ${CABAL_SETUP} -o setup -package Cabal
-	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}
+	@${MKDIR} ${TMPDIR}
+	@if [ -f ${WRKSRC}/Setup.hs ]; then \
+	    cd ${WRKSRC} && ${_BUILD_SETUP} Setup.hs; fi
+	@if [ -f ${WRKSRC}/Setup.lhs ]; then \
+	    cd ${WRKSRC} && ${_BUILD_SETUP} Setup.lhs; fi
+	@if [ -f ${WRKSRC}/${SETUP_CMD} ]; then \
+	    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}; \
+	else \
+	    ${ECHO_MSG} "===>  ${PKGNAME} configure fails: no setup program could be created."; \
+	    exit 1; \
+	fi
 
 .if ${PORT_OPTIONS:MDOCS}
 .if defined(XMLDOCS) && defined(USE_AUTOTOOLS)
@@ -209,14 +219,12 @@
 	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure --prefix=${PREFIX}
 .endif
 .endif # DOCS
-.else
-	${DO_NADA}
+.endif # target(do-configure)
 .endif # !METAPORT
-.endif # target(do-configure)
 
+.if !defined(METAPORT)
 .if !target(do-build)
 do-build:
-.if !defined(METAPORT)
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} build
 .if !defined(STANDALONE)
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} register --gen-script
@@ -223,113 +231,94 @@
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-.if !defined(XMLDOCS) && !defined(STANDALONE) && ${PORT_OPTIONS:MDOCS}
+.if defined(HADDOCK_AVAILABLE) && !defined(XMLDOCS) && !defined(STANDALONE) && ${PORT_OPTIONS:MDOCS}
 	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)
+	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
 .endif # XMLDOCS
 .endif # DOCS
-.else
-	${DO_NADA}
+.endif # target(do-build)
 .endif # !METAPORT
-.endif # target(do-build)
 
+.for sect in 1 2 3 4 5 6 7 8 9
+.if defined(MAN${sect}PAGES)
+.for man in ${MAN${sect}PAGES}
+PLIST_FILES+=	man/man${sect}/${man}.gz
+.endfor
+.endif
+.endfor
+
+.if !defined(METAPORT)
 .if !target(do-install)
 do-install:
-.if !defined(METAPORT)
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} install
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} copy --destdir=${STAGEDIR}
 
 .if !defined(STANDALONE)
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh
+	cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh
 .endif
 
 .if !empty(INSTALL_PORTDATA)
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PORTDATA}
 .endif
 
 .if !empty(INSTALL_PORTEXAMPLES) && ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PORTEXAMPLES}
 .endif
 
-.if defined(MAN1SRC)
-.for man in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${MAN1SRC}/${man} ${PREFIX}/man/man1
+.for sect in 1 2 3 4 5 6 7 8 9
+.if defined(MAN${sect}SRC)
+.for man in ${MAN${sect}PAGES}
+	@${INSTALL_MAN} ${WRKSRC}/${MAN${sect}SRC}/${man} ${STAGEDIR}${MANPREFIX}/man/man${sect}
 .endfor
-.endif # MAN1SRC
+.endif # MAN${sect}SRC
+.endfor
 
 .if ${PORT_OPTIONS:MDOCS}
 .if !empty(XMLDOCS)
 .for xmldoc in ${XMLDOCS}
-	@(cd ${WRKSRC}/${xmldoc:C/:.*$//g} && ${COPYTREE_SHARE} \* ${DOCSDIR}/${xmldoc:C/^.*://g})
+	@(cd ${WRKSRC}/${xmldoc:C/:.*$//g} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/${xmldoc:C/^.*://g})
 .endfor
 .endif # XMLDOCS
-.endif
-.else
-	${DO_NADA}
+.endif # DOCS
+.endif # target(do-install)
 .endif # !METAPORT
-.endif # target(do-install)
 
 .if !target(post-install-script)
 post-install-script:
-	@for dir in ${CABAL_DIRS}; do if [ -d $${dir} ]; then ${FIND} -ds $${dir} \
-		-type f -print | ${SED} -E -e 's,^${PREFIX}/?,,' >> ${TMPPLIST}; fi ; \
-		if [ -d $${dir} ]; then ${FIND} -ds $${dir} \
-		-type d -print | ${SED} -E -e 's,^${PREFIX}/?, at dirrm ,' >> ${TMPPLIST}; fi ; done
 .if defined(EXECUTABLE)
 .for exe in ${EXECUTABLE}
 	@${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST}
 .endfor
-.endif
-
+.endif # EXECUTABLE
+	@for dir in ${CABAL_DIRS}; do if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \
+		-type f -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}; fi ; done
 .endif # target(post-install-script)
 
+.if !defined(METAPORT)
 add-plist-post: add-plist-cabal
 add-plist-cabal:
-.if !defined(METAPORT)
-	@if [ -f ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh ]; then \
-		(${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh'; \
-		 ${ECHO_CMD} '@unexec %D/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}') >> ${TMPPLIST}; fi
-.if empty(PORT_OPTIONS:MDOCS)
-	@if [ -f ${DOCSDIR}/${FILE_LICENSE} ]; then \
-		(${ECHO_CMD} '${DOCSDIR_REL}/${FILE_LICENSE}'; \
-		 ${ECHO_CMD} '@unexec ${RMDIR} "%D/${DOCSDIR_REL}" 2>/dev/null || true') >>${TMPPLIST}; fi
-.else
-	@(${ECHO_CMD} '@exec if [ -f %D/${GHC_LIB_DOCSDIR_REL}/gen_contents_index ]; then ${LN} -s ${DOCSDIR}/html %D/${GHC_LIB_DOCSDIR_REL}/${DISTNAME} && \
-		cd %D/${GHC_LIB_DOCSDIR_REL} && ${RM} -f doc-index*.html && ./gen_contents_index; fi' ; \
-	  ${ECHO_CMD} '@unexec ${RM} -f %D/${GHC_LIB_DOCSDIR_REL}/${DISTNAME}' ; \
-	  ${ECHO_CMD} '@unexec if [ -f %D/${GHC_LIB_DOCSDIR_REL}/gen_contents_index ]; then cd %D/${GHC_LIB_DOCSDIR_REL} && ${RM} -f doc-index*.html && ./gen_contents_index; fi') >>${TMPPLIST};
+
+.if !defined(STANDALONE)
+	@${ECHO_CMD} '@unexec ${LOCALBASE}/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}' >> ${TMPPLIST}
 .endif
-.else
-	${DO_NADA}
-.endif # !METAPORT
 
-post-install::
-.if !defined(METAPORT)
-.if ${PORT_OPTIONS:MDOCS}
-	@if [ -f ${PREFIX}/${GHC_LIB_DOCSDIR_REL}/gen_contents_index ]; then \
-		${LN} -s ${DOCSDIR}/html ${PREFIX}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME} && \
-		cd ${PREFIX}/${GHC_LIB_DOCSDIR_REL} && \
-		${RM} -f doc-index*.html && ./gen_contents_index; \
-	fi
+.if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS}
+	@(${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME}' ; \
+	  ${ECHO_CMD} '@unexec cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \
+	    ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST}
 .endif
 
-.if defined(EXECUTABLE)
-.for exe in ${EXECUTABLE}
-	@${STRIP_CMD} ${PREFIX}/bin/${exe}
-	@${CHMOD} ${BINMODE} ${PREFIX}/bin/${exe}
-.endfor
-.endif # EXECUTABLE
+.if !defined(STANDALONE)
+	@${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh > /dev/null' >> ${TMPPLIST}
+.endif
 
-.if defined(SHOW_PKGMSG)
-	@${ECHO_MSG} -e "\a"
-	@${ECHO_MSG} "================================================================="
-	@${CAT}      "${PKGMESSAGE}"
-	@${ECHO_MSG} "================================================================="
-	@${ECHO_MSG}
-.endif # SHOW_PKGMSG
-.else
-	${DO_NADA}
+.if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS}
+	@(${ECHO_CMD} '@exec ${LN} -s ${DOCSDIR}/html ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME} && \
+	  cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \
+	  ${RM} doc-index*.html && ./gen_contents_index') >> ${TMPPLIST}
+.endif
+
 .endif # !METAPORT


Property changes on: trunk/lang/ghc/bsd.cabal.mk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/ghc/bsd.cabal.options.mk
===================================================================
--- trunk/lang/ghc/bsd.cabal.options.mk	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/bsd.cabal.options.mk	2015-08-08 00:51:11 UTC (rev 19681)
@@ -10,24 +10,31 @@
 GHC_CMD?=	${LOCALBASE}/bin/ghc
 HADDOCK_CMD?=	${LOCALBASE}/bin/haddock
 HSCOLOUR_CMD?=	${LOCALBASE}/bin/HsColour
-GHC_VERSION=	7.4.2
 
+GHC_VERSION?=	7.8.3
+
 HSCOLOUR_DESC?=	Colorize generated documentation by HsColour
 DYNAMIC_DESC?=	Add support for dynamic linking
 PROFILE_DESC?=	Add support for profiling
+LLVM_DESC?=	Use the LLVM backend for code generation
 
-.if !exists(${GHC_CMD}) || (exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.dyn_hi) && !defined(IGNORE_DYNAMIC))
+.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))
+.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))
+.if !defined(IGNORE_LLVM)
+OPTIONS_DEFINE+=	LLVM
+.endif
+
+.if ((!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/html)) || exists(${HADDOCK_CMD})) && !defined(IGNORE_DOCS)
 OPTIONS_DEFINE+=	DOCS
 OPTIONS_DEFAULT+=	DOCS
+HADDOCK_AVAILABLE=	yes
 
 .if (${PORTNAME} != hscolour || exists(${HSCOLOUR_CMD})) && !defined(IGNORE_HSCOLOUR)
 OPTIONS_DEFINE+=	HSCOLOUR
@@ -38,4 +45,76 @@
 IGNORE?=	options fail: bsd.cabal.mk already includes bsd.options.mk
 .endif
 
+OPTIONS_DEFINE+=	${FLAGS_DEFINE}
+OPTIONS_SINGLE+=	${FLAGS_SINGLE}
+OPTIONS_MULTI+=		${FLAGS_MULTI}
+OPTIONS_DEFAULT+=	${FLAGS_DEFAULT}
+
+_ALL_FLAGS:=		${FLAGS_DEFINE} ${FLAGS_SINGLE} ${FLAGS_MULTI}
+_COMPLETE_FLAGS=	${_ALL_FLAGS}
+
+.for f in ${_ALL_FLAGS}
+.  if defined(FLAGS_SINGLE_${f})
+_COMPLETE_FLAGS+=	${FLAGS_SINGLE_${f}}
+OPTIONS_SINGLE_${f}=	${FLAGS_SINGLE_${f}}
+.  endif
+.  if defined(FLAGS_MULTI_${f})
+_COMPLETE_FLAGS+=	${FLAGS_MULTI_${f}}
+OPTIONS_MULTI_${f}=	${FLAGS_MULTI_${f}}
+.  endif
+.endfor
+
 .include <bsd.port.options.mk>
+
+.for f in ${_COMPLETE_FLAGS}
+.  if defined(${f}_FLAG_DEPENDS)
+.    for r in ${${f}_FLAG_DEPENDS}
+.      if !${PORT_OPTIONS:M${r}}
+_${f}_DEPENDS_FAIL=	yes
+.      endif
+.    endfor
+.  endif
+.  if ${PORT_OPTIONS:M${f}} && !defined(_${f}_DEPENDS_FAIL)
+.    if defined(${f}_FLAG_ENABLE)
+CONFIGURE_ARGS+=	--flags="${${f}_FLAG_ENABLE}"
+.    endif
+.    if defined(${f}_FLAG_CONFIGURE_ON)
+CONFIGURE_ARGS+=	${${f}_FLAG_CONFIGURE_ON}
+.    endif
+.    if defined(${f}_FLAG_CABAL)
+USE_CABAL+=		${${f}_FLAG_CABAL}
+.    endif
+.    if defined(${f}_FLAG_EXECUTABLE)
+EXECUTABLE+=		${${f}_FLAG_EXECUTABLE}
+.    endif
+.    if defined(${f}_FLAG_LIB)
+LIB_DEPENDS+=		${${f}_FLAG_LIB}
+.    endif
+.    if defined(${f}_FLAG_XORG)
+USE_XORG+=		${${f}_FLAG_XORG}
+.    endif
+.    if defined(${f}_BROKEN)
+BROKEN=			${${f}_BROKEN} with the ${f} flag enabled
+.    endif
+.    if defined(${f}_DYNAMIC_BROKEN) && ${PORT_OPTIONS:MDYNAMIC}
+BROKEN=			${${f}_DYNAMIC_BROKEN}
+.    endif
+.  else
+.    if defined(${f}_FLAG_ENABLE)
+CONFIGURE_ARGS+=	--flags="-${${f}_FLAG_ENABLE}"
+.    endif
+.    if defined(${f}_FLAG_CONFIGURE_OFF)
+CONFIGURE_ARGS+=	${${f}_FLAG_CONFIGURE_OFF}
+.    endif
+.  endif
+.endfor
+
+.if defined(FLAGS_ENABLE)
+CONFIGURE_ARGS+=	--flags="${FLAGS_ENABLE}"
+.endif
+
+.if defined(FLAGS_DISABLE)
+.  for f in ${FLAGS_DISABLE}
+CONFIGURE_ARGS+=	--flags="-${f}"
+.  endfor
+.endif


Property changes on: trunk/lang/ghc/bsd.cabal.options.mk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/ghc/bsd.hackage.mk
===================================================================
--- trunk/lang/ghc/bsd.hackage.mk	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/bsd.hackage.mk	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,404 +1,453 @@
 # KEEP THE LIST ALPHABETICALLY SORTED!
 
-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
-alex_port=			devel/hs-alex		# executable
-ALUT_port=			audio/hs-ALUT
-angel_port=			sysutils/hs-angel
-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
-asn1-types_port=		devel/hs-asn1-types
-async_port=			devel/hs-async
-attempt_port=			devel/hs-attempt
-attoparsec_port=		textproc/hs-attoparsec
-attoparsec-conduit_port=	textproc/hs-attoparsec-conduit
-attoparsec-enumerator_port=	textproc/hs-attoparsec-enumerator
-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
-base64-conduit_port=		devel/hs-base64-conduit
-basic-prelude_port=		devel/hs-basic-prelude
-bifunctors_port=		devel/hs-bifunctors
-bio_port=			science/hs-bio
-bits-atomic_port=		devel/hs-bits-atomic
-blaze-builder_port=		devel/hs-blaze-builder
-blaze-builder-conduit_port=	devel/hs-blaze-builder-conduit
-blaze-builder-enumerator_port=	devel/hs-blaze-builder-enumerator
-blaze-html_port=		textproc/hs-blaze-html
-blaze-markup_port=		textproc/hs-blaze-markup
-blaze-textual_port=		devel/hs-blaze-textual
-bloomfilter_port=		devel/hs-bloomfilter
-BNFC_port=			devel/hs-BNFC		# executable
-Boolean_port=			devel/hs-Boolean
-brainfuck_port=			lang/hs-brainfuck	# executable
-bsd-sysctl_port=		devel/hs-bsd-sysctl
-byteorder_port=			devel/hs-byteorder
-bytestring-csv_port=		textproc/hs-bytestring-csv
-bytestring-nums_port=		devel/hs-bytestring-nums	# executable
-c2hs_port=			devel/hs-c2hs		# executable
-cabal-install_port=		devel/hs-cabal-install	# executable
-cereal_port=			devel/hs-cereal
-cairo_port=			graphics/hs-cairo
-case-insensitive_port=		textproc/hs-case-insensitive
-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
-cipher-rc4_port=		security/hs-cipher-rc4
-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
-comonad-transformers_port=	math/hs-comonad-transformers
-comonads-fd_port=		math/hs-comonads-fd
-conduit_port=			devel/hs-conduit
-ConfigFile_port=		devel/hs-ConfigFile
-configurator_port=		devel/hs-configurator
-contravariant_port=		math/hs-contravariant
-convertible_port=		devel/hs-convertible
-cookie_port=			www/hs-cookie
-cpphs_port=			devel/hs-cpphs		# executable
-cprng-aes_port=			security/hs-cprng-aes
-cpu_port=			sysutils/hs-cpu
-criterion_port=			benchmarks/hs-criterion
-Crypto_port=			security/hs-Crypto
-crypto-api_port=		security/hs-crypto-api
-crypto-conduit_port=		security/hs-crypto-conduit
-crypto-numbers_port=		security/hs-crypto-numbers
-crypto-pubkey_port=		security/hs-crypto-pubkey
-crypto-pubkey-types_port=	security/hs-crypto-pubkey-types
-crypto-random-api_port=		security/hs-crypto-random-api
-cryptocipher_port=		security/hs-cryptocipher
-cryptohash_port=		security/hs-cryptohash
-css-text_port=			www/hs-css-text
-csv_port=			textproc/hs-csv
-curl_port=			ftp/hs-curl
-darcs_port=			devel/hs-darcs		# executable
-data-default_port=		devel/hs-data-default
-data-default-class_port=	devel/hs-data-default-class
-data-default-instances-base_port=	devel/hs-data-default-instances-base
-data-default-instances-containers_port=		devel/hs-data-default-instances-containers
-data-default-instances-dlist_port=	devel/hs-data-default-instances-dlist
-data-default-instances-old-locale_port=	devel/hs-data-default-instances-old-locale
-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
-distributive_port=		math/hs-distributive
-dlist_port=			devel/hs-dlist
-double-conversion_port=		textproc/hs-double-conversion
-edit-distance_port=		devel/hs-edit-distance
-either_port=			devel/hs-either
-email-validate_port=		mail/hs-email-validate
-entropy_port=			security/hs-entropy
-enumerator_port=		devel/hs-enumerator
-epic_port=			lang/hs-epic		# executable
-erf_port=			math/hs-erf
-errors_port=			devel/hs-errors
-extensible-exceptions_port=	devel/hs-extensible-exceptions
-failure_port=			devel/hs-failure
-fast-logger_port=		devel/hs-fast-logger
-fastcgi_port=			www/hs-fastcgi		# lib_depends
-feed_port=			textproc/hs-feed
-fgl_port=			devel/hs-fgl
-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
-generic-deriving_port=		devel/hs-generic-deriving
-geniplate_port=			devel/hs-geniplate
-ghc-events_port=		devel/hs-ghc-events	# executable
-ghc-mtl_port=			devel/hs-ghc-mtl
-ghc-paths_port=			devel/hs-ghc-paths
-gio_port=			devel/hs-gio
-git-annex_port=			devel/hs-git-annex	# executable
-gitit_port=			www/hs-gitit		# executable
-glade_port=			devel/hs-glade
-glib_port=			devel/hs-glib
-GLURaw_port=			x11-toolkits/hs-GLURaw
-GLUT_port=			x11-toolkits/hs-GLUT
-groupoids_port=			math/hs-groupoids
-gstreamer_port=			multimedia/hs-gstreamer
-gtk_port=			x11-toolkits/hs-gtk
-gtk2hs-buildtools_port=		devel/hs-gtk2hs-buildtools # executable
-gtkglext_port=			x11-toolkits/hs-gtkglext
-gtksourceview2_port=		x11-toolkits/hs-gtksourceview2
-haddock_port=			devel/hs-haddock	# executable
-hamlet_port=			www/hs-hamlet
-happstack_port=			www/hs-happstack	# executable
-happstack-server_port=		www/hs-happstack-server
-happy_port=			devel/hs-happy		# executable
-hashable_port=			devel/hs-hashable
-hashed-storage_port=		devel/hs-hashed-storage
-hashtables_port=		devel/hs-hashtables
-haskeline_port=			devel/hs-haskeline
-haskell-src_port=		devel/hs-haskell-src
-haskell-src-exts_port=		devel/hs-haskell-src-exts
-hasktags_port=			devel/hs-hasktags	# executable
-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
-hoogle_port=			devel/hs-hoogle		# executable
-hostname_port=			net/hs-hostname
-hs-bibutils_port=		textproc/hs-hs-bibutils
-hS3_port=			www/hs-hS3		# executable
-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
-hxt_port=			textproc/hs-hxt
-hxt-charproperties_port=	textproc/hs-hxt-charproperties
-hxt-regex-xmlschema_port=	textproc/hs-hxt-regex-xmlschema
-hxt-unicode_port=		textproc/hs-hxt-unicode
-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
-lazysmallcheck_port=		devel/hs-lazysmallcheck
-lens_port=			devel/hs-lens
-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
-maccatcher_port=		net/hs-maccatcher
-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
-mmorph_port=			devel/hs-mmorph
-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
-MonadCatchIO-transformers_port=	devel/hs-MonadCatchIO-transformers
-monadcryptorandom_port=		security/hs-monadcryptorandom
-MonadRandom_port=		devel/hs-MonadRandom
-mtl_port=			devel/hs-mtl
-mueval_port=			devel/hs-mueval		# executable
-murmur-hash_port=		devel/hs-murmur-hash
-mwc-random_port=		math/hs-mwc-random
-mysql_port=			databases/hs-mysql
-nats_port=			math/hs-nats
-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
-OpenGLRaw_port=			x11-toolkits/hs-OpenGLRaw
-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
-parallel_port=			devel/hs-parallel
-parsec_port=			textproc/hs-parsec
-path-pieces_port=		www/hs-path-pieces
-pcap_port=			net/hs-pcap
-pcre-light_port=		devel/hs-pcre-light	# lib_depends
-pem_port=			security/hs-pem
-persistent_port=		databases/hs-persistent
-persistent-sqlite_port=		databases/hs-persistent-sqlite
-persistent-template_port=	databases/hs-persistent-template
-polyparse_port=			textproc/hs-polyparse
-pointed_port=			math/hs-pointed
-pool-conduit_port=		devel/hs-pool-conduit
-porte_port=			ports-mgmt/hs-porte	# executable
-primitive_port=			devel/hs-primitive
-probability_port=		math/hs-probability
-profunctor-extras_port=		devel/hs-profunctor-extras
-profunctors_port=		devel/hs-profunctors
-project-template_port=		devel/hs-project-template
-PSQueue_port=			devel/hs-PSQueue
-publicsuffixlist_port=		net/hs-publicsuffixlist
-pureMD5_port=			security/hs-pureMD5
-pwstore-fast_port=		security/hs-pwstore-fast
-QuickCheck_port=		devel/hs-QuickCheck
-quickcheck-io_port=		devel/hs-quickcheck-io
-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
-reflection_port=		devel/hs-reflection
-regex-base_port=		textproc/hs-regex-base
-regex-compat_port=		textproc/hs-regex-compat
-regex-pcre-builtin_port=	textproc/hs-regex-pcre-builtin
-regex-posix_port=		textproc/hs-regex-posix
-regex-tdfa_port=		textproc/hs-regex-tdfa
-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
-semigroupoid-extras_port=	math/hs-semigroupoid-extras
-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
-shakespeare-i18n_port=		www/hs-shakespeare-i18n
-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
-snap_port=			www/hs-snap
-snap-core_port=			www/hs-snap-core
-snap-server_port=		www/hs-snap-server	# lib_depends
-socks_port=			net/hs-socks
-soegtk_port=			graphics/hs-soegtk
-split_port=			devel/hs-split
-StateVar_port=			devel/hs-StateVar
-statistics_port=		math/hs-statistics
-stm_port=			devel/hs-stm
-Stream_port=			devel/hs-Stream
-strict_port=			devel/hs-strict
-stringsearch_port=		textproc/hs-stringsearch
-svgcairo_port=			graphics/hs-svgcairo
-syb_port=			devel/hs-syb
-syb-with-class_port=		devel/hs-syb-with-class
-syb-with-class-instances-text_port=	devel/hs-syb-with-class-instances-text
-system-fileio_port=		devel/hs-system-fileio
-system-filepath_port=		devel/hs-system-filepath
-tagged_port=			devel/hs-tagged
-tagsoup_port=			textproc/hs-tagsoup	# executable
-tagstream-conduit_port=		textproc/hs-tagstream-conduit
-tar_port=			archivers/hs-tar
-temporary_port=			devel/hs-temporary
-Tensor_port=			devel/hs-Tensor
-terminfo_port=			devel/hs-terminfo
-test-framework_port=		devel/hs-test-framework
-test-framework-hunit_port=	devel/hs-test-framework-hunit
-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
-timezone-olson_port=		devel/hs-timezone-olson
-timezone-series_port=		devel/hs-timezone-series
-tls_port=			security/hs-tls
-tls-extra_port=			security/hs-tls-extra
-transformers_port=		devel/hs-transformers
-transformers-base_port=		devel/hs-transformers-base
-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
-utf8-light_port=		devel/hs-utf8-light
-utf8-string_port=		devel/hs-utf8-string
-utility-ht_port=		devel/hs-utility-ht
-uuagc_port=			devel/hs-uuagc		# executable
-uuagc-bootstrap_port=		devel/hs-uuagc-bootstrap # executable
-uuagc-cabal_port=		devel/hs-uuagc-cabal
-uuid_port=			devel/hs-uuid
-uulib_port=			devel/hs-uulib
-vault_port=			devel/hs-vault
-vector_port=			devel/hs-vector
-vector-algorithms_port=		devel/hs-vector-algorithms
-vector-space_port=		math/hs-vector-space
-void_port=			devel/hs-void
-vte_port=			x11-toolkits/hs-vte
-wai_port=			www/hs-wai
-wai-app-static_port=		www/hs-wai-app-static
-wai-extra_port=			www/hs-wai-extra
-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
-wxdirect_port=			x11-toolkits/hs-wxdirect	# executable
-X11_port=			x11/hs-X11		# lib_depends
-X11-xft_port=			x11/hs-X11-xft
-xhtml_port=			textproc/hs-xhtml
-xml_port=			textproc/hs-xml
-xml-conduit_port=		textproc/hs-xml-conduit
-xml-types_port=			textproc/hs-xml-types
-xmlhtml_port=			textproc/hs-xmlhtml
-xmobar_port=			x11/hs-xmobar		# executable
-xmonad_port=			x11-wm/hs-xmonad	# executable
-xmonad-contrib_port=		x11-wm/hs-xmonad-contrib
-xss-sanitize_port=		www/hs-xss-sanitize
-yaml_port=			textproc/hs-yaml
-yesod_port=			www/hs-yesod
-yesod-auth_port=		www/hs-yesod-auth
-yesod-core_port=		www/hs-yesod-core
-yesod-form_port=		www/hs-yesod-form
-yesod-persistent_port=		www/hs-yesod-persistent
-yesod-platform_port=		www/hs-yesod-platform
-yesod-routes_port=		www/hs-yesod-routes
-yesod-static_port=		www/hs-yesod-static
-yesod-test_port=		www/hs-yesod-test
-zip-archive_port=		archivers/hs-zip-archive
-zlib_port=			archivers/hs-zlib
-zlib-bindings_port=		archivers/hs-zlib-bindings
-zlib-conduit_port=		archivers/hs-zlib-conduit
-zlib-enum_port=			archivers/hs-zlib-enum
+abstract-deque_port=                            devel/hs-abstract-deque
+abstract-par_port=                              devel/hs-abstract-par
+activehs_port=                                  www/hs-activehs                                 # executable
+activehs-base_port=                             devel/hs-activehs-base
+aeson_port=                                     converters/hs-aeson
+Agda_port=                                      math/hs-Agda                                    # executable
+alex_port=                                      devel/hs-alex                                   # executable
+ALUT_port=                                      audio/hs-ALUT
+angel_port=                                     sysutils/hs-angel                               # executable
+ansi-terminal_port=                             devel/hs-ansi-terminal
+ansi-wl-pprint_port=                            devel/hs-ansi-wl-pprint
+appar_port=                                     textproc/hs-appar
+arrows_port=                                    devel/hs-arrows
+asn1-data_port=                                 devel/hs-asn1-data
+asn1-encoding_port=                             devel/hs-asn1-encoding
+asn1-parse_port=                                devel/hs-asn1-parse
+asn1-types_port=                                devel/hs-asn1-types
+async_port=                                     devel/hs-async
+atomic-primops_port=                            devel/hs-atomic-primops
+attoparsec_port=                                textproc/hs-attoparsec
+attoparsec-enumerator_port=                     textproc/hs-attoparsec-enumerator
+authenticate_port=                              www/hs-authenticate
+auto-update_port=                               devel/hs-auto-update
+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
+bifunctors_port=                                devel/hs-bifunctors
+bio_port=                                       science/hs-bio                                  # executable
+bits-atomic_port=                               devel/hs-bits-atomic
+blaze-builder_port=                             devel/hs-blaze-builder
+blaze-builder-enumerator_port=                  devel/hs-blaze-builder-enumerator
+blaze-html_port=                                textproc/hs-blaze-html
+blaze-markup_port=                              textproc/hs-blaze-markup
+blaze-textual_port=                             devel/hs-blaze-textual
+bloomfilter_port=                               devel/hs-bloomfilter
+BNFC_port=                                      devel/hs-BNFC                                   # executable
+Boolean_port=                                   devel/hs-Boolean
+BoundedChan_port=                               devel/hs-BoundedChan
+boxes_port=                                     devel/hs-boxes
+brainfuck_port=                                 lang/hs-brainfuck                               # executable
+bsd-sysctl_port=                                devel/hs-bsd-sysctl
+byteable_port=                                  devel/hs-byteable
+byteorder_port=                                 devel/hs-byteorder
+bytestring-csv_port=                            textproc/hs-bytestring-csv
+bytestring-lexing_port=                         devel/hs-bytestring-lexing
+bytestring-nums_port=                           devel/hs-bytestring-nums                        # executable
+bytestring-show_port=                           devel/hs-bytestring-show
+c2hs_port=                                      devel/hs-c2hs                                   # executable
+cabal-install_port=                             devel/hs-cabal-install                          # executable
+cairo_port=                                     graphics/hs-cairo
+case-insensitive_port=                          textproc/hs-case-insensitive
+categories_port=                                math/hs-categories
+cereal_port=                                    devel/hs-cereal
+certificate_port=                               security/hs-certificate
+cgi_port=                                       www/hs-cgi
+checkers_port=                                  devel/hs-checkers
+chunked-data_port=                              devel/hs-chunked-data
+cipher-aes_port=                                security/hs-cipher-aes
+cipher-aes128_port=                             security/hs-cipher-aes128
+cipher-blowfish_port=                           security/hs-cipher-blowfish
+cipher-camellia_port=                           security/hs-cipher-camellia
+cipher-des_port=                                security/hs-cipher-des
+cipher-rc4_port=                                security/hs-cipher-rc4
+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
+conduit_port=                                   devel/hs-conduit
+conduit-combinators_port=                       devel/hs-conduit-combinators
+conduit-extra_port=                             devel/hs-conduit-extra
+ConfigFile_port=                                devel/hs-ConfigFile
+configurator_port=                              devel/hs-configurator
+connection_port=                                net/hs-connection
+contravariant_port=                             math/hs-contravariant
+convertible_port=                               devel/hs-convertible
+cookie_port=                                    www/hs-cookie
+cpphs_port=                                     devel/hs-cpphs                                  # executable
+cprng-aes_port=                                 security/hs-cprng-aes
+cpu_port=                                       sysutils/hs-cpu
+criterion_port=                                 benchmarks/hs-criterion
+Crypto_port=                                    security/hs-Crypto
+crypto-api_port=                                security/hs-crypto-api
+crypto-cipher-types_port=                       security/hs-crypto-cipher-types
+crypto-conduit_port=                            security/hs-crypto-conduit
+crypto-numbers_port=                            security/hs-crypto-numbers
+crypto-pubkey_port=                             security/hs-crypto-pubkey
+crypto-pubkey-types_port=                       security/hs-crypto-pubkey-types
+crypto-random_port=                             security/hs-crypto-random
+crypto-random-api_port=                         security/hs-crypto-random-api
+cryptocipher_port=                              security/hs-cryptocipher
+cryptohash_port=                                security/hs-cryptohash
+cryptohash-conduit_port=                        security/hs-cryptohash-conduit
+cryptohash-cryptoapi_port=                      security/hs-cryptohash-cryptoapi
+css-text_port=                                  www/hs-css-text
+csv_port=                                       textproc/hs-csv
+curl_port=                                      ftp/hs-curl                                     # lib_depends
+darcs_port=                                     devel/hs-darcs                                  # executable
+data-default_port=                              devel/hs-data-default
+data-default-class_port=                        devel/hs-data-default-class
+data-default-instances-base_port=               devel/hs-data-default-instances-base
+data-default-instances-containers_port=         devel/hs-data-default-instances-containers
+data-default-instances-dlist_port=              devel/hs-data-default-instances-dlist
+data-default-instances-old-locale_port=         devel/hs-data-default-instances-old-locale
+data-hash_port=                                 devel/hs-data-hash
+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
+DAV_port=                                       www/hs-DAV                                      # executable
+deepseq-generics_port=                          devel/hs-deepseq-generics
+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
+distributive_port=                              math/hs-distributive
+dlist_port=                                     devel/hs-dlist
+dlist-instances_port=                           devel/hs-dlist-instances
+dns_port=                                       dns/hs-dns
+double-conversion_port=                         textproc/hs-double-conversion
+DRBG_port=                                      security/hs-DRBG
+edit-distance_port=                             devel/hs-edit-distance
+either_port=                                    devel/hs-either
+ekg_port=                                       sysutils/hs-ekg
+ekg-core_port=                                  sysutils/hs-ekg-core
+email-validate_port=                            mail/hs-email-validate
+enclosed-exceptions_port=                       devel/hs-enclosed-exceptions
+entropy_port=                                   security/hs-entropy
+enumerator_port=                                devel/hs-enumerator
+epic_port=                                      lang/hs-epic                                    # executable
+equivalence_port=                               devel/hs-equivalence
+erf_port=                                       math/hs-erf
+errors_port=                                    devel/hs-errors
+esqueleto_port=                                 databases/hs-esqueleto
+exceptions_port=                                devel/hs-exceptions
+extensible-exceptions_port=                     devel/hs-extensible-exceptions
+fast-logger_port=                               devel/hs-fast-logger
+fastcgi_port=                                   www/hs-fastcgi                                  # lib_depends
+feed_port=                                      textproc/hs-feed
+fgl_port=                                       devel/hs-fgl
+file-embed_port=                                devel/hs-file-embed
+filemanip_port=                                 devel/hs-filemanip
+filestore_port=                                 devel/hs-filestore
+free_port=                                      devel/hs-free
+fsnotify_port=                                  devel/hs-fsnotify
+gconf_port=                                     devel/hs-gconf
+generic-deriving_port=                          devel/hs-generic-deriving
+geniplate_port=                                 devel/hs-geniplate
+ghc-events_port=                                devel/hs-ghc-events                             # executable
+ghc-mtl_port=                                   devel/hs-ghc-mtl
+ghc-paths_port=                                 devel/hs-ghc-paths
+gio_port=                                       devel/hs-gio
+git-annex_port=                                 devel/hs-git-annex                              # executable
+gitit_port=                                     www/hs-gitit                                    # executable
+glade_port=                                     devel/hs-glade
+glib_port=                                      devel/hs-glib
+Glob_port=                                      devel/hs-Glob
+GLURaw_port=                                    x11-toolkits/hs-GLURaw
+GLUT_port=                                      x11-toolkits/hs-GLUT
+gnuidn_port=                                    dns/hs-gnuidn                                   # lib_depends
+gnutls_port=                                    security/hs-gnutls                              # lib_depends
+gsasl_port=                                     net/hs-gsasl                                    # lib_depends
+gstreamer_port=                                 multimedia/hs-gstreamer                         # lib_depends
+gtk_port=                                       x11-toolkits/hs-gtk
+gtk2hs_port=                                    x11-toolkits/hs-gtk2hs                          # metaport
+gtk2hs-buildtools_port=                         devel/hs-gtk2hs-buildtools                      # executable
+gtkglext_port=                                  x11-toolkits/hs-gtkglext                        # lib_depends
+gtksourceview2_port=                            x11-toolkits/hs-gtksourceview2
+haddock_port=                                   devel/hs-haddock                                # executable
+haddock-library_port=                           devel/hs-haddock-library
+happstack_port=                                 www/hs-happstack                                # executable
+happstack-server_port=                          www/hs-happstack-server
+happy_port=                                     devel/hs-happy                                  # executable
+hashable_port=                                  devel/hs-hashable
+hashed-storage_port=                            devel/hs-hashed-storage
+hashtables_port=                                devel/hs-hashtables
+haskell-platform_port=                          devel/hs-haskell-platform                       # metaport
+haskell-src_port=                               devel/hs-haskell-src
+haskell-src-exts_port=                          devel/hs-haskell-src-exts
+hasktags_port=                                  devel/hs-hasktags                               # executable
+hastache_port=                                  devel/hs-hastache
+HaXml_port=                                     textproc/hs-HaXml                               # executable
+hedis_port=                                     databases/hs-hedis
+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                               # lib_depends
+hint_port=                                      devel/hs-hint
+hjsmin_port=                                    www/hs-hjsmin                                   # executable
+hlibev_port=                                    devel/hs-hlibev                                 # lib_depends
+hlint_port=                                     devel/hs-hlint                                  # executable
+hoauth2_port=                                   net/hs-hoauth2
+hoogle_port=                                    devel/hs-hoogle                                 # executable
+hostname_port=                                  net/hs-hostname
+hs-bibutils_port=                               textproc/hs-hs-bibutils
+hS3_port=                                       www/hs-hS3                                      # executable
+hscolour_port=                                  print/hs-hscolour                               # executable
+hslogger_port=                                  devel/hs-hslogger
+hslua_port=                                     devel/hs-hslua
+HsOpenSSL_port=                                 security/hs-HsOpenSSL
+hspec_port=                                     devel/hs-hspec                                  # executable
+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-client_port=                               www/hs-http-client
+http-client-tls_port=                           www/hs-http-client-tls
+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
+hxt_port=                                       textproc/hs-hxt
+hxt-charproperties_port=                        textproc/hs-hxt-charproperties
+hxt-regex-xmlschema_port=                       textproc/hs-hxt-regex-xmlschema
+hxt-unicode_port=                               textproc/hs-hxt-unicode
+ieee754_port=                                   math/hs-ieee754
+IfElse_port=                                    devel/hs-IfElse
+iproute_port=                                   net/hs-iproute
+json_port=                                      converters/hs-json
+JuicyPixels_port=                               graphics/hs-JuicyPixels
+keys_port=                                      devel/hs-keys
+kqueue_port=                                    devel/hs-kqueue
+language-c_port=                                devel/hs-language-c
+language-javascript_port=                       devel/hs-language-javascript
+largeword_port=                                 devel/hs-largeword
+lazysmallcheck_port=                            devel/hs-lazysmallcheck
+lens_port=                                      devel/hs-lens
+lhs2tex_port=                                   textproc/hs-lhs2tex                             # executable
+libmpd_port=                                    audio/hs-libmpd
+libxml_port=                                    textproc/hs-libxml
+libxml-sax_port=                                textproc/hs-libxml-sax                          # lib_depends
+lifted-base_port=                               devel/hs-lifted-base
+List_port=                                      devel/hs-List
+logict_port=                                    devel/hs-logict
+maccatcher_port=                                net/hs-maccatcher
+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
+mmorph_port=                                    devel/hs-mmorph
+monad-control_port=                             devel/hs-monad-control
+monad-logger_port=                              devel/hs-monad-logger
+monad-loops_port=                               devel/hs-monad-loops
+monad-par_port=                                 devel/hs-monad-par
+monad-par-extras_port=                          devel/hs-monad-par-extras
+MonadCatchIO-mtl_port=                          devel/hs-MonadCatchIO-mtl
+MonadCatchIO-transformers_port=                 devel/hs-MonadCatchIO-transformers
+monadcryptorandom_port=                         security/hs-monadcryptorandom
+MonadRandom_port=                               devel/hs-MonadRandom
+monads-tf_port=                                 devel/hs-monads-tf
+mono-traversable_port=                          devel/hs-mono-traversable
+mtl_port=                                       devel/hs-mtl
+mueval_port=                                    devel/hs-mueval                                 # executable
+murmur-hash_port=                               devel/hs-murmur-hash
+mwc-random_port=                                math/hs-mwc-random
+mysql_port=                                     databases/hs-mysql
+nats_port=                                      math/hs-nats
+network_port=                                   net/hs-network
+network-info_port=                              net/hs-network-info
+network-multicast_port=                         net/hs-network-multicast
+network-protocol-xmpp_port=                     net/hs-network-protocol-xmpp
+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
+OpenGLRaw_port=                                 x11-toolkits/hs-OpenGLRaw
+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
+parallel_port=                                  devel/hs-parallel
+parsec_port=                                    textproc/hs-parsec
+path-pieces_port=                               www/hs-path-pieces
+pcap_port=                                      net/hs-pcap
+pcre-light_port=                                devel/hs-pcre-light                             # lib_depends
+pem_port=                                       security/hs-pem
+persistent_port=                                databases/hs-persistent
+persistent-sqlite_port=                         databases/hs-persistent-sqlite
+persistent-template_port=                       databases/hs-persistent-template
+pointed_port=                                   math/hs-pointed
+polyparse_port=                                 textproc/hs-polyparse
+porte_port=                                     ports-mgmt/hs-porte                             # executable
+prelude-extras_port=                            devel/hs-prelude-extras
+prettyclass_port=                               devel/hs-prettyclass
+primitive_port=                                 devel/hs-primitive
+probability_port=                               math/hs-probability
+profunctors_port=                               devel/hs-profunctors
+project-template_port=                          devel/hs-project-template
+PSQueue_port=                                   devel/hs-PSQueue
+publicsuffixlist_port=                          net/hs-publicsuffixlist
+pureMD5_port=                                   security/hs-pureMD5
+pwstore-fast_port=                              security/hs-pwstore-fast
+QuickCheck_port=                                devel/hs-QuickCheck
+quickcheck-io_port=                             devel/hs-quickcheck-io
+random_port=                                    devel/hs-random
+ranges_port=                                    devel/hs-ranges
+ReadArgs_port=                                  devel/hs-ReadArgs                               # executable
+readline_port=                                  devel/hs-readline
+recaptcha_port=                                 www/hs-recaptcha
+reflection_port=                                devel/hs-reflection
+regex-base_port=                                textproc/hs-regex-base
+regex-compat_port=                              textproc/hs-regex-compat
+regex-pcre-builtin_port=                        textproc/hs-regex-pcre-builtin                  # lib_depends
+regex-posix_port=                               textproc/hs-regex-posix
+regex-tdfa_port=                                textproc/hs-regex-tdfa
+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
+scientific_port=                                devel/hs-scientific
+securemem_port=                                 devel/hs-securemem
+semigroupoids_port=                             math/hs-semigroupoids
+semigroups_port=                                math/hs-semigroups
+sendfile_port=                                  net/hs-sendfile
+setenv_port=                                    devel/hs-setenv
+SHA_port=                                       security/hs-SHA                                 # executable
+shake_port=                                     devel/hs-shake                                  # executable
+shakespeare_port=                               www/hs-shakespeare
+ShellCheck_port=                                devel/hs-ShellCheck                             # executable
+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
+snap_port=                                      www/hs-snap                                     # executable
+snap-core_port=                                 www/hs-snap-core
+snap-server_port=                               www/hs-snap-server                              # lib_depends
+socks_port=                                     net/hs-socks
+soegtk_port=                                    graphics/hs-soegtk
+split_port=                                     devel/hs-split
+statistics_port=                                math/hs-statistics
+stm_port=                                       devel/hs-stm
+stm-chans_port=                                 devel/hs-stm-chans
+STMonadTrans_port=                              devel/hs-STMonadTrans
+Stream_port=                                    devel/hs-Stream
+streaming-commons_port=                         devel/hs-streaming-commons
+strict_port=                                    devel/hs-strict
+stringsearch_port=                              textproc/hs-stringsearch
+svgcairo_port=                                  graphics/hs-svgcairo
+syb_port=                                       devel/hs-syb
+syb-with-class_port=                            devel/hs-syb-with-class
+syb-with-class-instances-text_port=             devel/hs-syb-with-class-instances-text
+system-fileio_port=                             devel/hs-system-fileio
+system-filepath_port=                           devel/hs-system-filepath
+tagged_port=                                    devel/hs-tagged
+tagsoup_port=                                   textproc/hs-tagsoup                             # executable
+tagstream-conduit_port=                         textproc/hs-tagstream-conduit
+tar_port=                                       archivers/hs-tar
+temporary_port=                                 devel/hs-temporary
+test-framework_port=                            devel/hs-test-framework
+test-framework-hunit_port=                      devel/hs-test-framework-hunit
+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
+text-icu_port=                                  devel/hs-text-icu                               # lib_depends
+tf-random_port=                                 devel/hs-tf-random
+threads_port=                                   devel/hs-threads
+threadscope_port=                               devel/hs-threadscope                            # executable
+time-compat_port=                               devel/hs-time-compat
+timezone-olson_port=                            devel/hs-timezone-olson
+timezone-series_port=                           devel/hs-timezone-series
+tls_port=                                       security/hs-tls
+transformers-base_port=                         devel/hs-transformers-base
+transformers-compat_port=                       devel/hs-transformers-compat
+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
+uri_port=                                       textproc/hs-uri
+url_port=                                       www/hs-url
+utf8-light_port=                                devel/hs-utf8-light
+utf8-string_port=                               devel/hs-utf8-string
+utility-ht_port=                                devel/hs-utility-ht
+uuagc_port=                                     devel/hs-uuagc                                  # executable
+uuagc-bootstrap_port=                           devel/hs-uuagc-bootstrap                        # executable
+uuagc-cabal_port=                               devel/hs-uuagc-cabal
+uuid_port=                                      devel/hs-uuid
+uulib_port=                                     devel/hs-uulib
+vault_port=                                     devel/hs-vault
+vector_port=                                    devel/hs-vector
+vector-algorithms_port=                         devel/hs-vector-algorithms
+vector-binary-instances_port=                   devel/hs-vector-binary-instances
+vector-instances_port=                          devel/hs-vector-instances
+vector-space_port=                              math/hs-vector-space
+vector-th-unbox_port=                           devel/hs-vector-th-unbox
+void_port=                                      devel/hs-void
+vte_port=                                       x11-toolkits/hs-vte
+wai_port=                                       www/hs-wai
+wai-app-static_port=                            www/hs-wai-app-static                           # executable
+wai-extra_port=                                 www/hs-wai-extra
+wai-logger_port=                                www/hs-wai-logger
+warp_port=                                      www/hs-warp
+warp-tls_port=                                  www/hs-warp-tls
+webkit_port=                                    www/hs-webkit                                   # lib_depends
+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
+wxdirect_port=                                  x11-toolkits/hs-wxdirect                        # executable
+X11_port=                                       x11/hs-X11                                      # lib_depends
+X11-xft_port=                                   x11/hs-X11-xft
+x509_port=                                      security/hs-x509
+x509-store_port=                                security/hs-x509-store
+x509-system_port=                               security/hs-x509-system
+x509-validation_port=                           security/hs-x509-validation
+xml_port=                                       textproc/hs-xml
+xml-conduit_port=                               textproc/hs-xml-conduit
+xml-hamlet_port=                                textproc/hs-xml-hamlet
+xml-types_port=                                 textproc/hs-xml-types
+xmlhtml_port=                                   textproc/hs-xmlhtml
+xmobar_port=                                    x11/hs-xmobar                                   # executable
+xmonad_port=                                    x11-wm/hs-xmonad                                # executable
+xmonad-contrib_port=                            x11-wm/hs-xmonad-contrib
+xss-sanitize_port=                              www/hs-xss-sanitize
+yaml_port=                                      textproc/hs-yaml                                # executable
+yesod_port=                                     www/hs-yesod
+yesod-auth_port=                                www/hs-yesod-auth
+yesod-auth-hashdb_port=                         www/hs-yesod-auth-hashdb
+yesod-bin_port=                                 www/hs-yesod-bin                                # executable
+yesod-core_port=                                www/hs-yesod-core
+yesod-form_port=                                www/hs-yesod-form
+yesod-persistent_port=                          www/hs-yesod-persistent
+yesod-platform_port=                            www/hs-yesod-platform
+yesod-routes_port=                              www/hs-yesod-routes
+yesod-static_port=                              www/hs-yesod-static
+yesod-test_port=                                www/hs-yesod-test
+zip-archive_port=                               archivers/hs-zip-archive
+zlib_port=                                      archivers/hs-zlib
+zlib-bindings_port=                             archivers/hs-zlib-bindings
+zlib-enum_port=                                 archivers/hs-zlib-enum


Property changes on: trunk/lang/ghc/bsd.hackage.mk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/ghc/distinfo
===================================================================
--- trunk/lang/ghc/distinfo	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/distinfo	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,12 +1,16 @@
-SHA256 (ghc-7.6.3-src.tar.bz2) = bd43823d31f6b5d0b2ca7b74151a8f98336ab0800be85f45bb591c9c26aac998
-SIZE (ghc-7.6.3-src.tar.bz2) = 110763823
-SHA256 (hscolour-1.20.2.tar.gz) = a52910f4c4c5576bed80e23aa914c71c3975d4cd9cd79a9c85e2617d97a8824a
-SIZE (hscolour-1.20.2.tar.gz) = 25722
-SHA256 (ghc-7.4.1-i386-freebsd8-boot.tar.bz2) = b58f5b346c2b261f6357f5f72a0bf2c3c766e914cffbe6f2aefb1abf67b9a797
-SIZE (ghc-7.4.1-i386-freebsd8-boot.tar.bz2) = 45447162
-SHA256 (ghc-7.4.1-amd64-freebsd8-boot.tar.bz2) = 536da87dc9e32e98f9258e29b3a44846db6ac786f26b426da4808c33fcc92914
-SIZE (ghc-7.4.1-amd64-freebsd8-boot.tar.bz2) = 45322403
-SHA256 (ghc-7.4.1-i386-freebsd9-boot.tar.bz2) = 2af7912a14e6e31c81d2ef4505c0354ea28c3e263761f1f0282a836fe58bc8e7
-SIZE (ghc-7.4.1-i386-freebsd9-boot.tar.bz2) = 46254818
-SHA256 (ghc-7.4.1-amd64-freebsd9-boot.tar.bz2) = 8dc43c1ed2f026837947d938736ee6084f151fa5617998fca55420418f4ea28f
-SIZE (ghc-7.4.1-amd64-freebsd9-boot.tar.bz2) = 46427727
+SHA256 (ghc-7.8.3-src.tar.bz2) = 2358826f8424bf571dcc313bd882422fe108a340d6e37db4339ff6d5d6ac3f37
+SIZE (ghc-7.8.3-src.tar.bz2) = 10696541
+SHA256 (hscolour-1.20.3.tar.gz) = 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96
+SIZE (hscolour-1.20.3.tar.gz) = 25810
+SHA256 (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = efdb68255cdcdeabbec1031a44f631cf8d0a619f9687b09d5a00230d3b871148
+SIZE (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = 55495926
+SHA256 (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 15ab9262d0f7ba213431b73e1a21318d5a420fb298b3f7cb28da1c8562241dcd
+SIZE (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 55410502
+SHA256 (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 2a10cc8aa24282612c1ba9a8dd2234192bef2f307fd70fa209b32bb97a1d73a2
+SIZE (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 55500650
+SHA256 (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = a0e21b166c94994a22005d0bb15822d16c10e79856f57b500466e23d8f5c13a6
+SIZE (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = 55418614
+SHA256 (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 4ab59ac9642641d612fdb636e544248ee2e74834bafe1d29ef556215ea097409
+SIZE (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 55512004
+SHA256 (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 8ce856cbd5b9fa230d17bc3d28b96206d84dce4aa3c1c9c7016262ff132271ad
+SIZE (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 55418435

Deleted: trunk/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in
===================================================================
--- trunk/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/nopatch-.._ghc-7.4.1-boot_rts_package.conf.in	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,11 +0,0 @@
---- ../ghc-7.4.1-boot/rts/package.conf.in.orig	2009-07-14 19:10:52.000000000 +0200
-+++ ../ghc-7.4.1-boot/rts/package.conf.in	2009-08-13 22:09:35.000000000 +0200
-@@ -156,6 +156,8 @@
- 	 , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure"
- #endif
- 
-+	 , "-L%%LOCALBASE%%/lib"
-+
- /*  Pick up static libraries in preference over dynamic if in earlier search
-  *  path.  This is important to use the static gmp in preference on Mac OS.
-  *  The used option is specific to the Darwin linker.

Modified: trunk/lang/ghc/files/patch-aclocal.m4
===================================================================
--- trunk/lang/ghc/files/patch-aclocal.m4	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-aclocal.m4	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,6 +1,6 @@
---- aclocal.m4.orig	2013-04-18 23:22:46.000000000 +0200
-+++ aclocal.m4	2013-04-29 20:32:30.000000000 +0200
-@@ -19,6 +19,8 @@
+--- ./aclocal.m4.orig	2014-07-10 06:27:16.000000000 +0200
++++ ./aclocal.m4	2014-07-11 11:23:41.000000000 +0200
+@@ -47,6 +47,8 @@
      # In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET}
      # so this justs uses $bootstrap_target.
  
@@ -9,30 +9,12 @@
      if test "$build_alias" = ""
      then
          if test "$bootstrap_target" != ""
-@@ -157,7 +159,7 @@
-         i386)
-             test -z "[$]2" || eval "[$]2=ArchX86"
-             ;;
--        x86_64)
-+        x86_64|amd64)
-             test -z "[$]2" || eval "[$]2=ArchX86_64"
-             ;;
-         powerpc)
-@@ -185,7 +187,7 @@
- 
-     checkVendor() {
-         case [$]1 in
--        dec|unknown|hp|apple|next|sun|sgi|ibm)
-+        dec|unknown|hp|apple|next|sun|sgi|ibm|portbld)
-             ;;
-         *)
-             echo "Unknown vendor [$]1"
-@@ -1889,7 +1891,7 @@
-   vax)
-     $2="vax"
-     ;;
--  x86_64)
-+  x86_64|amd64)
-     $2="x86_64"
-     ;;
-   *)
+@@ -1817,7 +1819,7 @@
+     dnl If special linker flags are needed to build things, then allow
+     dnl the user to pass them in via LDFLAGS.
+     changequote(, )dnl
+-    GHC_LDFLAGS=`echo $LDFLAGS | sed 's/\(^\| \)\([^ ]\)/\1-optl\2/g'`
++    GHC_LDFLAGS=`echo $LDFLAGS | sed -r 's/(^| )([^ ])/\1-optl\2/g'`
+     changequote([, ])dnl
+     if ! "$WithGhc" $GHC_LDFLAGS -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
+     then


Property changes on: trunk/lang/ghc/files/patch-aclocal.m4
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: trunk/lang/ghc/files/patch-compiler-main-Dynflags.hs
===================================================================
--- trunk/lang/ghc/files/patch-compiler-main-Dynflags.hs	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-compiler-main-Dynflags.hs	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,11 +0,0 @@
---- compiler/main/DynFlags.hs.orig	2012-06-06 19:10:25.000000000 +0200
-+++ compiler/main/DynFlags.hs	2013-02-08 15:23:36.000000000 +0100
-@@ -2390,7 +2390,7 @@
-                          flag)
-                 return dflags
-          HscLlvm
--          | not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin)) &&
-+          | not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin || os == OSFreeBSD)) &&
-             (not opt_Static || opt_PIC)
-             ->
-              do addWarn ("Ignoring " ++ flag ++ " as it is incompatible with -fPIC and -dynamic on this platform")

Modified: trunk/lang/ghc/files/patch-configure.ac
===================================================================
--- trunk/lang/ghc/files/patch-configure.ac	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-configure.ac	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,80 +1,20 @@
---- ./configure.ac.orig	2013-04-19 00:31:00.000000000 +0200
-+++ ./configure.ac	2013-04-30 19:30:40.381161098 +0200
-@@ -89,6 +89,59 @@
-   fi
-   WithGhc="$GHC"])
- 
-+# system libffi
-+
-+AC_ARG_WITH([system-libffi],
-+[AC_HELP_STRING([--with-system-libffi],
-+  [Use system provided libffi for RTS [default=no]])
-+])
-+
-+AS_IF([test "x$with_system_libffi" = "xyes"],
-+  [UseSystemLibFFI="YES"], [UseSystemLibFFI="NO"]
-+)
-+
-+AC_SUBST(UseSystemLibFFI)
-+
-+AC_ARG_WITH([ffi-includes],
-+[AC_HELP_STRING([--with-ffi-includes=ARG]
-+  [Find includes for libffi in ARG [default=system default]])
-+],
-+[
-+ if test "x$UseSystemLibFFI" != "xYES"; then
-+    AC_MSG_WARN([--with-ffi-includes will be ignored, --with-system-libffi not set])
-+ else
-+    FFIIncludeDir="$withval" LIBFFI_CFLAGS="-I $withval"
-+ fi
-+])
-+
-+AC_SUBST(FFIIncludeDir)
-+
-+AC_ARG_WITH([ffi-libraries],
-+[AC_HELP_STRING([--with-ffi-libraries=ARG]
-+  [Find libffi in ARG [default=system default]])
-+],
-+[
-+ if test "x$UseSystemLibFFI" != "xYES"; then
-+    AC_MSG_WARN([--with-ffi-libraries will be ignored, --with-system-libffi not set])
-+ else
-+    FFILibDir="$withval" LIBFFI_LDFLAGS="-L$withval"
-+ fi
-+])
-+
-+AC_SUBST(FFILibDir)
-+
-+AS_IF([test "$UseSystemLibFFI" = "YES"], [
-+ CFLAGS2="$CFLAGS"
-+ CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
-+ LDFLAGS2="$LDFLAGS"
-+ LDFLAGS="$LIBFFI_LDFLAGS $LDFLAGS"
-+ AC_CHECK_LIB(ffi, ffi_call,
-+  [AC_CHECK_HEADERS([ffi.h], [break], [])
-+   AC_DEFINE([HAVE_LIBFFI], [1], [Define to 1 if you have libffi.])],
-+  [UseSystemLibFFI="NO"])
-+ CFLAGS="$CFLAGS2"
-+ LDFLAGS="$LDFLAGS2"
-+])
- 
- dnl ** Tell the make system which OS we are using
- dnl $OSTYPE is set by the operating system to "msys" or "cygwin" or something 
-@@ -379,6 +432,9 @@
- BuildingCrossCompiler=NO
- PortingCompiler=NO
+--- ./configure.ac.orig	2014-07-10 07:04:42.000000000 +0200
++++ ./configure.ac	2014-07-11 10:27:40.000000000 +0200
+@@ -435,6 +435,9 @@
+ dnl ** Building a cross compiler?
+ dnl --------------------------------------------------------------
  CrossCompiling=NO
 +
 +build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/-freebsd.*$/-freebsd/g'`
 +
  # If 'host' and 'target' differ, then this means we are building a cross-compiler.
- if test "$host" != "$target" ; then
-     BuildingCrossCompiler=YES
-@@ -839,7 +895,6 @@
+ if test "$target" != "$host" ; then
+     CrossCompiling=YES
+@@ -914,7 +917,6 @@
  FP_VISIBILITY_HIDDEN
  
  dnl ** check for librt
 -AC_CHECK_LIB(rt, clock_gettime)
- AC_CHECK_FUNCS(clock_gettime timer_create timer_settime)
+ AC_CHECK_FUNCS(clock_gettime timer_settime)
  FP_CHECK_TIMER_CREATE
  


Property changes on: trunk/lang/ghc/files/patch-configure.ac
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/ghc/files/patch-ghc.mk
===================================================================
--- trunk/lang/ghc/files/patch-ghc.mk	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-ghc.mk	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,38 +1,10 @@
---- ghc.mk.orig	2013-04-18 23:22:46.000000000 +0200
-+++ ghc.mk	2013-04-29 20:42:16.000000000 +0200
-@@ -80,6 +80,7 @@
+--- ./ghc.mk.orig	2014-07-10 06:27:16.000000000 +0200
++++ ./ghc.mk	2014-07-11 10:28:11.000000000 +0200
+@@ -96,6 +96,7 @@
  # Catch make if it runs away into an infinite loop
  ifeq      "$(MAKE_RESTARTS)" ""
  else ifeq "$(MAKE_RESTARTS)" "1"
 +else ifeq "$(MAKE_RESTARTS)" "2"
  else
- $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?)
+ $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug? See http://ghc.haskell.org/trac/ghc/wiki/Building/Troubleshooting#Makehasrestarteditself3timesisthereamakefilebug for details)
  endif
-@@ -595,12 +596,18 @@
- MAYBE_GHCI=driver/ghci
- endif
- 
-+ifeq "$(UseSystemLibFFI)" "YES"
-+MAYBE_LIBFFI=
-+else
-+MAYBE_LIBFFI=libffi
-+endif
-+
- BUILD_DIRS += \
-    driver \
-    $(MAYBE_GHCI) \
-    driver/ghc \
-    driver/haddock \
--   libffi \
-+   $(MAYBE_LIBFFI) \
-    includes \
-    rts
- 
-@@ -1005,6 +1012,7 @@
- 	echo "BUILD_DOCBOOK_PDF  = $(BUILD_DOCBOOK_PDF)"  >> $(BIN_DIST_MK)
- 	echo "BUILD_MAN          = $(BUILD_MAN)"          >> $(BIN_DIST_MK)
- 	echo "GHC_CABAL_INPLACE  = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(BIN_DIST_MK)
-+	echo "UseSystemLibFFI    = $(UseSystemLibFFI)"    >> $(BIN_DIST_MK)
- 	cd $(BIN_DIST_PREP_DIR) && autoreconf
- 	$(call removeFiles,$(BIN_DIST_PREP_TAR))
- # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source


Property changes on: trunk/lang/ghc/files/patch-ghc.mk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
===================================================================
--- trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,46 +1,34 @@
---- ./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 @@
-   }
- 
+--- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig	2014-07-10 06:34:21.000000000 +0200
++++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs	2014-07-26 23:57:20.869626927 +0200
+@@ -198,13 +198,18 @@
  gccProgram :: Program
--gccProgram = (simpleProgram "gcc") {
-+gccProgram = (simpleProgramFromEnvironment "gcc" "CC") {
+ gccProgram = (simpleProgram "gcc") {
      programFindVersion = findProgramVersion "-dumpversion" id
++  , programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
    }
  
  ranlibProgram :: Program
 -ranlibProgram = simpleProgram "ranlib"
-+ranlibProgram = simpleProgramFromEnvironment "ranlib" "RANLIB"
++ranlibProgram = (simpleProgram "ranlib") {
++    programFindLocation = \_v _p -> return (Just "%%RANLIB%%")
++  }
  
  arProgram :: Program
 -arProgram = simpleProgram "ar"
-+arProgram = simpleProgramFromEnvironment "ar" "AR"
++arProgram = (simpleProgram "ar") {
++    programFindLocation = \_v _p -> return (Just "%%AR%%")
++  }
  
  stripProgram :: Program
  stripProgram = simpleProgram "strip"
-@@ -255,13 +255,13 @@
+@@ -257,7 +262,9 @@
  greencardProgram = simpleProgram "greencard"
  
  ldProgram :: Program
 -ldProgram = simpleProgram "ld"
-+ldProgram = simpleProgramFromEnvironment "ld" "LD"
++ldProgram = (simpleProgram "ld") {
++    programFindLocation = \_v _p -> return (Just "%%LD%%")
++  }
  
  tarProgram :: Program
  tarProgram = simpleProgram "tar"
- 
- cppProgram :: Program
--cppProgram = simpleProgram "cpp"
-+cppProgram = simpleProgramFromEnvironment "cpp" "CPP"
- 
- pkgConfigProgram :: Program
- pkgConfigProgram = (simpleProgram "pkg-config") {


Property changes on: trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs
===================================================================
--- trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Types.hs	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,38 +0,0 @@
---- ./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)

Deleted: trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs
===================================================================
--- trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Utils.hs	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,39 +0,0 @@
---- ./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
- 

Deleted: trunk/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc
===================================================================
--- trunk/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,18 +0,0 @@
---- ./libraries/base/GHC/Event/KQueue.hsc.orig	2013-04-18 23:30:14.000000000 +0200
-+++ ./libraries/base/GHC/Event/KQueue.hsc	2013-04-30 13:34:11.549185351 +0200
-@@ -235,10 +235,11 @@
- #endif
-     deriving (Bits, Eq, Num, Show, Storable)
- 
--#{enum Filter, Filter
-- , filterRead   = EVFILT_READ
-- , filterWrite  = EVFILT_WRITE
-- }
-+filterRead :: Filter
-+filterRead = Filter (#const EVFILT_READ)
-+
-+filterWrite :: Filter
-+filterWrite  = Filter (#const EVFILT_WRITE)
- 
- data TimeSpec = TimeSpec {
-       tv_sec  :: {-# UNPACK #-} !CTime

Deleted: trunk/lang/ghc/files/patch-mk-config.mk.in
===================================================================
--- trunk/lang/ghc/files/patch-mk-config.mk.in	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-mk-config.mk.in	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,15 +0,0 @@
---- ./mk/config.mk.in.orig	2012-06-06 19:10:25.000000000 +0200
-+++ ./mk/config.mk.in		2013-01-30 16:24:53.000000000 +0100
-@@ -363,6 +363,12 @@
- PapiLibDir=
- PapiIncludeDir=
- 
-+# Configuration for libffi
-+UseSystemLibFFI=@UseSystemLibFFI@
-+# Flags to go into package.conf for rts
-+FFILibDir=@FFILibDir@
-+FFIIncludeDir=@FFIIncludeDir@
-+
- ################################################################################
- #
- #		Paths (see paths.mk)

Deleted: trunk/lang/ghc/files/patch-rts-ghc.mk
===================================================================
--- trunk/lang/ghc/files/patch-rts-ghc.mk	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-rts-ghc.mk	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,104 +0,0 @@
---- ./rts/ghc.mk.orig		2012-06-06 19:10:25.000000000 +0200
-+++ ./rts/ghc.mk		2013-01-30 16:40:21.000000000 +0100
-@@ -105,8 +105,10 @@
- endif
- 
- ifneq "$(BINDIST)" "YES"
-+ifneq "$(UseSystemLibFFI)" "YES"
- rts_ffi_objs_stamp = rts/dist/ffi/stamp
- rts_ffi_objs       = rts/dist/ffi/*.o
-+
- $(rts_ffi_objs_stamp): $(libffi_STATIC_LIB) $(TOUCH_DEP) | $$(dir $$@)/.
- 	cd rts/dist/ffi && $(AR) x ../../../$(libffi_STATIC_LIB)
- 	"$(TOUCH_CMD)" $@
-@@ -119,6 +121,7 @@
- rts/dist/build/libffi-5.dll: libffi/build/inst/bin/libffi-5.dll
- 	cp $< $@
- endif
-+endif
- 
- #-----------------------------------------------------------------------------
- # Building one way
-@@ -169,6 +172,12 @@
- 
- rts_dist_$1_CC_OPTS += -DRtsWay=\"rts_$1\"
- 
-+ifneq "$(UseSystemLibFFI)" "YES"
-+rts_dist_FFI_SO = rts/dist/build/libffi$(soext)
-+else
-+rts_dist_FFI_SO =
-+endif
-+
- # Making a shared library for the RTS.
- ifneq "$$(findstring dyn, $1)" ""
- ifeq "$$(HOSTPLATFORM)" "i386-unknown-mingw32"
-@@ -177,10 +186,15 @@
- 	"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
- 	  -no-auto-link-packages -Lrts/dist/build -lffi-5 `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@
- else
--$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend rts/dist/build/libffi$$(soext)
-+ifneq "$(UseSystemLibFFI)" "YES"
-+ LIBFFI_LIBS= -Lrts/dist/build -lffi
-+else
-+ LIBFFI_LIBS= -L$(FFILibDir)
-+endif
-+$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(rts_$1_DTRACE_OBJS) rts/libs.depend $$(rts_dist_FFI_SO)
- 	"$$(RM)" $$(RM_OPTS) $$@
- 	"$$(rts_dist_HC)" -package-name rts -shared -dynamic -dynload deploy \
--	  -no-auto-link-packages -Lrts/dist/build -lffi `cat rts/libs.depend` $$(rts_$1_OBJS) \
-+	  -no-auto-link-packages $$(LIBFFI_LIBS) `cat rts/libs.depend` $$(rts_$1_OBJS) \
- 	  $$(rts_$1_DTRACE_OBJS) -o $$@
- ifeq "$$(darwin_HOST_OS)" "1"
- 	# Ensure library's install name is correct before anyone links with it.
-@@ -370,9 +384,14 @@
- endif
- 
- # ffi.h triggers prototype warnings, so disable them here:
--rts/Interpreter_CC_OPTS += -Wno-strict-prototypes
--rts/Adjustor_CC_OPTS    += -Wno-strict-prototypes
--rts/sm/Storage_CC_OPTS  += -Wno-strict-prototypes
-+ifeq "$(UseSystemLibFFI)" "YES"
-+LIBFFI_CFLAGS = $(addprefix -I,$(FFIIncludeDir))
-+else
-+LIBFFI_CFLAGS =
-+endif
-+rts/Interpreter_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
-+rts/Adjustor_CC_OPTS    += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
-+rts/sm/Storage_CC_OPTS  += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
- 
- # inlining warnings happen in Compact
- rts/sm/Compact_CC_OPTS += -Wno-inline
-@@ -430,6 +449,21 @@
- 
- endif
- 
-+#-----------------------------------------------------------------------------
-+# Use system provided libffi
-+
-+ifeq "$(UseSystemLibFFI)" "YES"
-+
-+rts_PACKAGE_CPP_OPTS    += -DFFI_INCLUDE_DIR=$(FFIIncludeDir)
-+rts_PACKAGE_CPP_OPTS    += -DFFI_LIB_DIR=$(FFILibDir)
-+
-+else # UseSystemLibFFI==YES
-+
-+rts_PACKAGE_CPP_OPTS += -DFFI_INCLUDE_DIR=""
-+rts_PACKAGE_CPP_OPTS += -DFFI_LIB_DIR=""
-+
-+endif
-+
- # -----------------------------------------------------------------------------
- # dependencies
- 
-@@ -507,7 +541,11 @@
- INSTALL_LIBS += $(wildcard rts/dist/build/libffi$(soext)*)
- INSTALL_LIBS += $(wildcard rts/dist/build/libffi-5.dll)
- 
-+ifneq "$(UseSystemLibFFI)" "YES"
- install: install_libffi_headers
-+else
-+install:
-+endif
- 
- .PHONY: install_libffi_headers
- install_libffi_headers :

Deleted: trunk/lang/ghc/files/patch-rts_package.conf.in
===================================================================
--- trunk/lang/ghc/files/patch-rts_package.conf.in	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/files/patch-rts_package.conf.in	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,20 +0,0 @@
---- ./rts/package.conf.in.orig		2012-06-06 19:10:25.000000000 +0200
-+++ ./rts/package.conf.in		2013-01-30 19:04:28.000000000 +0100
-@@ -33,6 +33,9 @@
- #ifdef HAVE_LIBDL
- 			      , "dl"
- #endif
-+#ifdef HAVE_LIBFFI
-+                              , "ffi"
-+#endif
- #ifdef mingw32_HOST_OS
- 			      ,"wsock32"	/* for the linker */
- #endif
-@@ -138,6 +141,7 @@
- 	 , "-u", "base_GHCziConcziSync_runSparks_closure"
- 	 , "-u", "base_GHCziConcziSignal_runHandlers_closure"
- #endif
-+        , "-L%%LOCALBASE%%/lib"
- 
- /*  Pick up static libraries in preference over dynamic if in earlier search
-  *  path.  This is important to use the static gmp in preference on Mac OS.

Modified: trunk/lang/ghc/pkg-plist
===================================================================
--- trunk/lang/ghc/pkg-plist	2015-08-08 00:32:59 UTC (rev 19680)
+++ trunk/lang/ghc/pkg-plist	2015-08-08 00:51:11 UTC (rev 19681)
@@ -1,4 +1,3 @@
- at comment $FreeBSD$
 bin/ghc
 bin/ghci
 bin/ghc-pkg
@@ -12,6 +11,7 @@
 bin/ghc-pkg-%%GHC_VERSION%%
 bin/haddock-ghc-%%GHC_VERSION%%
 bin/runghc-%%GHC_VERSION%%
+%%PORTDOCS%%man/man1/ghc.1.gz
 @exec /bin/ln -sf %D/bin/haddock-ghc-%%GHC_VERSION%% %D/bin/haddock || return true
 @unexec /bin/rm -f %D/bin/haddock || return true
 @exec /bin/mkdir -p %D/lib/cabal/ghc-%%GHC_VERSION%%             || return true



More information about the Midnightbsd-cvs mailing list