lang/ghc: Update to 9.2.3

4 files changed, 253 insertions, 268 deletions

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 28305205b2f5..0dc55b732f91 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -13,20 +13,21 @@ COMMENT=	Compiler for the functional language Haskell
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	amd64 i386 aarch64 armv6 armv7
+ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386
 
 USES=			autoreconf compiler:c11 gmake iconv:patch,translit \
-			localbase:ldflags ncurses perl5 tar:xz
+			localbase:ldflags ncurses perl5 python:build shebangfix \
+			tar:xz
 
-USE_LOCALE=		en_US.UTF-8
-USE_PERL5=		build
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--docdir=${DOCSDIR}
+INSTALL_TARGET=		install-strip
+USE_LOCALE=		en_US.UTF-8
+USE_PERL5=		build
 NO_CCACHE=		yes
-
-SUB_FILES=		build.mk
-SUB_LIST=		NCURSESINC="${NCURSESBASE}/include" NCURSESLIB="${NCURSESLIB}" \
-			CFLAGS="${CFLAGS}"
+OPTIONS_SUB=		yes
+SHEBANG_FILES=		boot
+PORTDOCS=		*
 
 OPTIONS_DEFINE=		DYNAMIC GMP PROFILE DOCS
 OPTIONS_DEFAULT=	DYNAMIC PROFILE GMP
@@ -41,85 +42,71 @@ DYNAMIC_DESC=		Add support for dynamic linking
 GMP_DESC=		Use GNU Multi-precision Library from Ports
 PROFILE_DESC=		Add support for performance profiling
 
+BOOT_CONFIGURE_ENV=	GHC=${LOCALBASE}/bin/ghc
+BOOT_CONFIGURE_ENV_OFF=	GHC=${BOOT_GHC}
+
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+DOCS_VARS=		enable_docs=YES
+DOCS_VARS_OFF=		enable_docs=NO
 
 DYNAMIC_CONFIGURE_WITH=	system-libffi \
 			ffi-includes=${LOCALBASE}/include \
 			ffi-libraries=${LOCALBASE}/lib
 DYNAMIC_LIB_DEPENDS=	libffi.so:devel/libffi
-DYNAMIC_SUB_LIST=	WITH_DYNAMIC="YES"
-DYNAMIC_SUB_LIST_OFF=	WITH_DYNAMIC="NO"
-DYNAMIC_PLIST_SUB=	NODYNAMIC="@comment "
-DYNAMIC_PLIST_SUB_OFF=	NODYNAMIC=""
+DYNAMIC_VARS=		enable_dynamic=YES
+DYNAMIC_VARS_OFF=	enable_dynamic=NO
 
 GMP_CONFIGURE_WITH=	gmp-includes=${LOCALBASE}/include \
 			gmp-libraries=${LOCALBASE}/lib
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 
-# Append substitutions for build.mk
-BOOT_SUB_LIST=		HSC2HS=${LOCALBASE}/bin/hsc2hs
-BOOT_SUB_LIST_OFF=	HSC2HS=${BOOT_HSC2HS}
-
-PROFILE_SUB_LIST=	WITH_PROFILE="YES"
-PROFILE_SUB_LIST_OFF=	WITH_PROFILE="NO"
+PROFILE_VARS=		enable_profile=YES
+PROFILE_VARS_OFF=	enable_profile=NO
 
-GHC_VERSION=		9.2.2
+GHC_VERSION=		9.2.3
 LLVM_VERSION=		12
 BOOT_GHC_VERSION=	8.10.7
 # LLVM version that bootstrap compiler uses
 BOOT_LLVM_VERSION=	10
 
-OPTIONS_SUB=		yes
-
-BASE_PACKAGES=		Cabal:3.6.3.0 array:0.5.4.0 base:4.16.1.0 binary:0.8.9.0 \
-			bytestring:0.11.3.0 containers:0.6.5.1 deepseq:1.4.6.1 \
-			directory:1.3.6.2 exceptions:0.10.4 filepath:1.4.2.2 \
-			ghc:${GHC_VERSION} ghc-bignum:1.2 ghc-boot:${GHC_VERSION} \
-			ghc-boot-th:${GHC_VERSION} ghc-compact:0.1.0.0 \
-			ghc-heap:${GHC_VERSION} ghc-prim:0.8.0 \
-			ghci:${GHC_VERSION} haskeline:0.8.2 hpc:0.6.1.0 \
-			integer-gmp:1.1 libiserv:${GHC_VERSION} mtl:2.2.2 \
-			parsec:3.1.15.0 pretty:1.3.3.6 process:1.6.13.2 \
-			stm:2.5.0.2 template-haskell:2.18.0.0 terminfo:0.4.1.5 \
-			text:1.2.5.0 time:1.11.1.1 transformers:0.5.6.2 \
-			unix:2.7.2.2 xhtml:3000.2.2.1
+BASE_PACKAGES=		Cabal-3.6.3.0 array-0.5.4.0 base-4.16.2.0 binary-0.8.9.0 \
+			bytestring-0.11.3.1 containers-0.6.5.1 deepseq-1.4.6.1 \
+			directory-1.3.6.2 exceptions-0.10.4 filepath-1.4.2.2 \
+			ghc-${GHC_VERSION} ghc-bignum-1.2 ghc-compact-0.1.0.0 \
+			ghc-prim-0.8.0 haskeline-0.8.2 hpc-0.6.1.0 \
+			integer-gmp-1.1 mtl-2.2.2 parsec-3.1.15.0 pretty-1.3.3.6 \
+			process-1.6.13.2 stm-2.5.0.2 template-haskell-2.18.0.0 \
+			terminfo-0.4.1.5 text-1.2.5.0 time-1.11.1.1 \
+			transformers-0.5.6.2 unix-2.7.2.2 xhtml-3000.2.2.1
 
 .for pkg in ${BASE_PACKAGES}
-PLIST_SUB+=	${pkg:C/\:.*//:tu}_VERSION=${pkg:C/^[^\:]*(\:|\$)//}
+PLIST_SUB+=	${pkg:C/-([0-9.])+//:tu}_VERSION=${pkg:C/^([^\.]*-)+//}
 .endfor
 
-PORTDOCS=		*
+BUILD_MK=		DYNAMIC_GHC_PROGRAMS=${ENABLE_DYNAMIC} \
+			BUILD_PROF_LIBS=${ENABLE_PROFILE} \
+			HADDOCK_DOCS=YES \
+			BUILD_SPHINX_HTML=${ENABLE_DOCS} \
+			BUILD_SPHINX_PDF=NO \
+			SRC_HC_OPTS+="-I${NCURSESINC} -L${NCURSESLIB} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
+			SRC_CC_OPTS+="${CFLAGS}" \
+			EXTRA_HSC2HS_OPTS+="-I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib" \
+			EXTRA_LD_OPTS+="-L${LOCALBASE}/lib" \
+			libraries/terminfo_CONFIGURE_OPTS+="--configure-option=--with-curses-libraries=${NCURSESLIB}" \
+			V=0
 
 .include <bsd.port.pre.mk>
 
+GHC_ARCH=		${ARCH:S/amd64/x86_64/:C/armv.*/arm/}
 CONFIGURE_TARGET=	${GHC_ARCH}-portbld-${OPSYS:tl}
+BOOT_DIR=		${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
+BOOT_GHC=		${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
 
 # This version of ncurses is needed by bootstrap compiler
 .if ${OSVERSION} > 1300078 && empty(PORT_OPTIONS:MBOOT)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/compat/libncursesw.so.8:misc/compat12x
 .endif
 
-GHC_ARCH=		${ARCH:S/amd64/x86_64/:C/armv.*/arm/}
-GHC_LIBDIR=		${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}
-GHC_LIBDIR_REL=		lib/ghc-${GHC_VERSION}
-
-_EXECUTABLES=	${GHC_LIBDIR}/bin/unlit \
-		${GHC_LIBDIR}/bin/hpc \
-		${GHC_LIBDIR}/bin/ghc-iserv \
-		${GHC_LIBDIR}/bin/ghc-pkg \
-		${GHC_LIBDIR}/bin/hsc2hs \
-		${GHC_LIBDIR}/bin/runghc \
-		${GHC_LIBDIR}/bin/ghc \
-		${GHC_LIBDIR}/bin/haddock \
-		${GHC_LIBDIR}/bin/hp2ps
-
-.if ${PORT_OPTIONS:MPROFILE}
-_EXECUTABLES+=	${GHC_LIBDIR}/bin/ghc-iserv-prof
-.endif
-.if ${PORT_OPTIONS:MDYNAMIC}
-_EXECUTABLES+=	${GHC_LIBDIR}/bin/ghc-iserv-dyn
-.endif
-
 .if empty(PORT_OPTIONS:MBOOT)
 DISTFILES+=		ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot
 .endif # MBOOT
@@ -139,28 +126,23 @@ BUILD_DEPENDS+=		llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION}
 .  endif
 .endif
 
-.if empty(PORT_OPTIONS:MBOOT)
-BOOT_DIR=	${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot
-BOOT_GHC=	${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
-
-CONFIGURE_ENV+=		GHC=${BOOT_GHC}
-.else # MBOOT
-CONFIGURE_ENV+=		GHC=${LOCALBASE}/bin/ghc
-.endif # MBOOT
+post-patch:
+#	Generate the build.mk file
+	${RM} -f ${WRKSRC}/mk/build.mk
+.for line in ${BUILD_MK}
+	${ECHO_CMD} ${line} >> ${WRKSRC}/mk/build.mk
+.endfor
 
 # TODO: remove this after rerolling all bootstraps
-post-patch:
-.if empty(PORT_OPTIONS:MBOOT)
+post-patch-BOOT-off:
 	@${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk
 	@${REINPLACE_CMD} -e '/^infodir/d' ${BOOT_DIR}/mk/build.mk
 	@${REINPLACE_CMD} -e '/^docdir/d' ${BOOT_DIR}/mk/build.mk
 	@${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk
-.endif
 
 pre-configure:
-	# Copy the subbed build.mk to the proper position
-	${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk
-
+	# Call the bootstrap script
+	cd ${WRKSRC}/ && ./boot
 # If we are using bootstrap compiler, configure and install it into ${BOOT_DIR}
 .if empty(PORT_OPTIONS:MBOOT)
 	cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} --prefix=${BOOT_DIR}
@@ -168,11 +150,21 @@ pre-configure:
 .endif
 
 post-install:
-	(for f in ${_EXECUTABLES} $$(${FIND} ${GHC_LIBDIR} -name '*.so*'); do \
-		${STRIP_CMD} $$f; done)
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -name .buildinfo -delete
+# For some reason, INSTALL_TARGET=install-strip doesn't cause libraries to be stripped
+# Run strip on them manually
+	${FIND} ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION} -name '*.so' -exec ${STRIP_CMD} {} +
 	${RM} ${STAGEDIR}${PREFIX}/bin/haddock
 
+post-install-DOCS-off:
+# Docs for Haskell libraries are generated by Haddock, not sphinx, so we have
+# to pass WITH_HADDOCK=no to the build.mk to skip their generation.
+# However, we don't want to do that because this would cause Haddock itself not
+# to be built.
+.if empty(PORT_OPTIONS:MDOCS)
+	${RM} -r ${STAGEDIR}${DOCSDIR}/html
+.endif
+
 .if exists(${BOOT_DIR}/bin/runhaskell)
 RUNHASKELL?=	${BOOT_DIR}/bin/runhaskell
 .else
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index a28b13e343eb..2bde051de9f3 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1646895563
-SHA256 (ghc-9.2.2-src.tar.xz) = 902463a4cc6ee479af9358b9f8b2ee3237b03e934a1ea65b6d1fcf3e0d749ea6
-SIZE (ghc-9.2.2-src.tar.xz) = 23461244
+TIMESTAMP = 1653682073
+SHA256 (ghc-9.2.3-src.tar.xz) = 50ecdc2bef013e518f9a62a15245d7db0e4409d737c43b1cea7306fd82e1669e
+SIZE (ghc-9.2.3-src.tar.xz) = 27525456
 SHA256 (ghc-8.10.7-boot-amd64-freebsd.tar.xz) = 5adfeceee2c3aa1208da174390cbb8e8c1d0a333b7c4a3a676a63f93beaf3126
 SIZE (ghc-8.10.7-boot-amd64-freebsd.tar.xz) = 70607916
 SHA256 (ghc-8.10.7-boot-i386-freebsd.tar.xz) = d841a6abf2b97e34feb9c71a85520a78dd667bfb6d6a7f401fa8a92b558928dc
diff --git a/lang/ghc/files/patch-m4_fp__cc__supports__target.m4 b/lang/ghc/files/patch-m4_fp__cc__supports__target.m4
deleted file mode 100644
index 673274444112..000000000000
--- a/lang/ghc/files/patch-m4_fp__cc__supports__target.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/fp_cc_supports_target.m4.orig	2022-03-05 07:25:06 UTC
-+++ m4/fp_cc_supports_target.m4
-@@ -12,7 +12,7 @@ AC_DEFUN([FP_CC_SUPPORTS_TARGET],
-    AC_REQUIRE([FPTOOLS_SET_PLATFORM_VARS])
-    AC_MSG_CHECKING([whether $1 CC supports --target])
-    echo 'int main() { return 0; }' > conftest.c
--   if $CC --target=$LlvmTarget -Werror conftest.c >& /dev/null ; then
-+   if $CC --target=$LlvmTarget -Werror conftest.c 2>&1 /dev/null ; then
-        CONF_CC_SUPPORTS_TARGET=YES
-        AC_MSG_RESULT([yes])
-    else
diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist
index b355e1f512db..5b8195104765 100644
--- a/lang/ghc/pkg-plist
+++ b/lang/ghc/pkg-plist
@@ -3659,67 +3659,67 @@ lib/ghc-%%GHC_VERSION%%/ghc-bignum-%%GHC-BIGNUM_VERSION%%/include/ghc-gmp.h
 %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-bignum-%%GHC-BIGNUM_VERSION%%/libHSghc-bignum-%%GHC-BIGNUM_VERSION%%-ghc%%GHC_VERSION%%.so
 lib/ghc-%%GHC_VERSION%%/ghc-bignum-%%GHC-BIGNUM_VERSION%%/libHSghc-bignum-%%GHC-BIGNUM_VERSION%%.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-bignum-%%GHC-BIGNUM_VERSION%%/libHSghc-bignum-%%GHC-BIGNUM_VERSION%%_p.a
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/BaseDir.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/BaseDir.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/BaseDir.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Data/ShortText.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Data/ShortText.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Data/ShortText.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Data/SizedSeq.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Data/SizedSeq.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Data/SizedSeq.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/ForeignSrcLang.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/ForeignSrcLang.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/ForeignSrcLang.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/HandleEncoding.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/HandleEncoding.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/HandleEncoding.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/LanguageExtensions.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/LanguageExtensions.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/LanguageExtensions.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Platform/ArchOS.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Platform/ArchOS.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Platform/ArchOS.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Platform/Host.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Platform/Host.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Platform/Host.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Serialized.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Serialized.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Serialized.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Settings/Utils.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Settings/Utils.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Settings/Utils.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/UniqueSubdir.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/UniqueSubdir.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/UniqueSubdir.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Unit/Database.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Unit/Database.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Unit/Database.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Utils/Encoding.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Utils/Encoding.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Utils/Encoding.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Version.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Version.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/GHC/Version.p_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/HSghc-boot-%%GHC-BOOT_VERSION%%.o
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/HSghc-boot-%%GHC-BOOT_VERSION%%.p_o
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/libHSghc-boot-%%GHC-BOOT_VERSION%%-ghc%%GHC_VERSION%%.so
-lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/libHSghc-boot-%%GHC-BOOT_VERSION%%.a
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC-BOOT_VERSION%%/libHSghc-boot-%%GHC-BOOT_VERSION%%_p.a
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/GHC/ForeignSrcLang/Type.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/GHC/ForeignSrcLang/Type.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/GHC/ForeignSrcLang/Type.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/GHC/LanguageExtensions/Type.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/GHC/LanguageExtensions/Type.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/GHC/LanguageExtensions/Type.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/GHC/Lexeme.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/GHC/Lexeme.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/GHC/Lexeme.p_hi
-lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/HSghc-boot-th-%%GHC-BOOT-TH_VERSION%%.o
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/HSghc-boot-th-%%GHC-BOOT-TH_VERSION%%.p_o
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/libHSghc-boot-th-%%GHC-BOOT-TH_VERSION%%-ghc%%GHC_VERSION%%.so
-lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/libHSghc-boot-th-%%GHC-BOOT-TH_VERSION%%.a
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%/libHSghc-boot-th-%%GHC-BOOT-TH_VERSION%%_p.a
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/BaseDir.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/BaseDir.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/BaseDir.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Data/ShortText.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Data/ShortText.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Data/ShortText.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Data/SizedSeq.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Data/SizedSeq.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Data/SizedSeq.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/ForeignSrcLang.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/ForeignSrcLang.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/ForeignSrcLang.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/HandleEncoding.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/HandleEncoding.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/HandleEncoding.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/LanguageExtensions.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/LanguageExtensions.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/LanguageExtensions.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Platform/ArchOS.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Platform/ArchOS.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Platform/ArchOS.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Platform/Host.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Platform/Host.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Platform/Host.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Serialized.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Serialized.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Serialized.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Settings/Utils.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Settings/Utils.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Settings/Utils.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/UniqueSubdir.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/UniqueSubdir.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/UniqueSubdir.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Unit/Database.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Unit/Database.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Unit/Database.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Utils/Encoding.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Utils/Encoding.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Utils/Encoding.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Version.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Version.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/GHC/Version.p_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/HSghc-boot-%%GHC_VERSION%%.o
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/HSghc-boot-%%GHC_VERSION%%.p_o
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/libHSghc-boot-%%GHC_VERSION%%-ghc%%GHC_VERSION%%.so
+lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/libHSghc-boot-%%GHC_VERSION%%.a
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-%%GHC_VERSION%%/libHSghc-boot-%%GHC_VERSION%%_p.a
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/GHC/ForeignSrcLang/Type.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/GHC/ForeignSrcLang/Type.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/GHC/ForeignSrcLang/Type.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/GHC/LanguageExtensions/Type.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/GHC/LanguageExtensions/Type.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/GHC/LanguageExtensions/Type.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/GHC/Lexeme.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/GHC/Lexeme.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/GHC/Lexeme.p_hi
+lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/HSghc-boot-th-%%GHC_VERSION%%.o
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/HSghc-boot-th-%%GHC_VERSION%%.p_o
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/libHSghc-boot-th-%%GHC_VERSION%%-ghc%%GHC_VERSION%%.so
+lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/libHSghc-boot-th-%%GHC_VERSION%%.a
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-boot-th-%%GHC_VERSION%%/libHSghc-boot-th-%%GHC_VERSION%%_p.a
 %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-compact-%%GHC-COMPACT_VERSION%%/GHC/Compact.dyn_hi
 lib/ghc-%%GHC_VERSION%%/ghc-compact-%%GHC-COMPACT_VERSION%%/GHC/Compact.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-compact-%%GHC-COMPACT_VERSION%%/GHC/Compact.p_hi
@@ -3731,56 +3731,56 @@ lib/ghc-%%GHC_VERSION%%/ghc-compact-%%GHC-COMPACT_VERSION%%/HSghc-compact-%%GHC-
 %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-compact-%%GHC-COMPACT_VERSION%%/libHSghc-compact-%%GHC-COMPACT_VERSION%%-ghc%%GHC_VERSION%%.so
 lib/ghc-%%GHC_VERSION%%/ghc-compact-%%GHC-COMPACT_VERSION%%/libHSghc-compact-%%GHC-COMPACT_VERSION%%.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-compact-%%GHC-COMPACT_VERSION%%/libHSghc-compact-%%GHC-COMPACT_VERSION%%_p.a
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ClosureTypes.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ClosureTypes.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ClosureTypes.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/Closures.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/Closures.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/Closures.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/Constants.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/Constants.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/Constants.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/FFIClosures.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/FFIClosures.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/FFIClosures.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingDisabled.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingDisabled.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingDisabled.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingEnabled.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingEnabled.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingEnabled.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/InfoTable.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/InfoTable.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/InfoTable.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/InfoTable/Types.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/InfoTable/Types.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/InfoTable/Types.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/InfoTableProf.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/InfoTableProf.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/InfoTableProf.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingDisabled.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingDisabled.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingDisabled.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingEnabled.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingEnabled.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingEnabled.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/Types.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/Types.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/ProfInfo/Types.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/Utils.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/Utils.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/GHC/Exts/Heap/Utils.p_hi
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/HSghc-heap-%%GHC-HEAP_VERSION%%.o
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/HSghc-heap-%%GHC-HEAP_VERSION%%.p_o
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/libHSghc-heap-%%GHC-HEAP_VERSION%%-ghc%%GHC_VERSION%%.so
-lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/libHSghc-heap-%%GHC-HEAP_VERSION%%.a
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC-HEAP_VERSION%%/libHSghc-heap-%%GHC-HEAP_VERSION%%_p.a
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ClosureTypes.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ClosureTypes.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ClosureTypes.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/Closures.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/Closures.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/Closures.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/Constants.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/Constants.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/Constants.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/FFIClosures.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/FFIClosures.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/FFIClosures.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingDisabled.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingDisabled.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingDisabled.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingEnabled.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingEnabled.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/FFIClosures_ProfilingEnabled.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/InfoTable.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/InfoTable.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/InfoTable.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/InfoTable/Types.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/InfoTable/Types.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/InfoTable/Types.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/InfoTableProf.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/InfoTableProf.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/InfoTableProf.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingDisabled.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingDisabled.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingDisabled.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingEnabled.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingEnabled.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/PeekProfInfo_ProfilingEnabled.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/Types.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/Types.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/ProfInfo/Types.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/Utils.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/Utils.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/GHC/Exts/Heap/Utils.p_hi
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/HSghc-heap-%%GHC_VERSION%%.o
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/HSghc-heap-%%GHC_VERSION%%.p_o
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/libHSghc-heap-%%GHC_VERSION%%-ghc%%GHC_VERSION%%.so
+lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/libHSghc-heap-%%GHC_VERSION%%.a
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-heap-%%GHC_VERSION%%/libHSghc-heap-%%GHC_VERSION%%_p.a
 %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghc-prim-%%GHC-PRIM_VERSION%%/GHC/CString.dyn_hi
 lib/ghc-%%GHC_VERSION%%/ghc-prim-%%GHC-PRIM_VERSION%%/GHC/CString.hi
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-prim-%%GHC-PRIM_VERSION%%/GHC/CString.p_hi
@@ -3817,53 +3817,53 @@ lib/ghc-%%GHC_VERSION%%/ghc-prim-%%GHC-PRIM_VERSION%%/HSghc-prim-%%GHC-PRIM_VERS
 lib/ghc-%%GHC_VERSION%%/ghc-prim-%%GHC-PRIM_VERSION%%/libHSghc-prim-%%GHC-PRIM_VERSION%%.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghc-prim-%%GHC-PRIM_VERSION%%/libHSghc-prim-%%GHC-PRIM_VERSION%%_p.a
 lib/ghc-%%GHC_VERSION%%/ghc-usage.txt
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/BinaryArray.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/BinaryArray.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/BinaryArray.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/BreakArray.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/BreakArray.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/BreakArray.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/CreateBCO.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/CreateBCO.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/CreateBCO.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/FFI.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/FFI.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/FFI.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/InfoTable.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/InfoTable.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/InfoTable.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/Message.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/Message.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/Message.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/ObjLink.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/ObjLink.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/ObjLink.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/RemoteTypes.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/RemoteTypes.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/RemoteTypes.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/ResolvedBCO.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/ResolvedBCO.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/ResolvedBCO.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/Run.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/Run.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/Run.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/Signals.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/Signals.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/Signals.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/StaticPtrTable.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/StaticPtrTable.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/StaticPtrTable.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/TH.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/TH.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/TH.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/TH/Binary.dyn_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/TH/Binary.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/GHCi/TH/Binary.p_hi
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/HSghci-%%GHCI_VERSION%%.o
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/HSghci-%%GHCI_VERSION%%.p_o
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/libHSghci-%%GHCI_VERSION%%-ghc%%GHC_VERSION%%.so
-lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/libHSghci-%%GHCI_VERSION%%.a
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHCI_VERSION%%/libHSghci-%%GHCI_VERSION%%_p.a
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/BinaryArray.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/BinaryArray.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/BinaryArray.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/BreakArray.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/BreakArray.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/BreakArray.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/CreateBCO.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/CreateBCO.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/CreateBCO.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/FFI.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/FFI.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/FFI.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/InfoTable.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/InfoTable.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/InfoTable.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/Message.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/Message.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/Message.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/ObjLink.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/ObjLink.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/ObjLink.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/RemoteTypes.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/RemoteTypes.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/RemoteTypes.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/ResolvedBCO.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/ResolvedBCO.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/ResolvedBCO.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/Run.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/Run.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/Run.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/Signals.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/Signals.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/Signals.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/StaticPtrTable.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/StaticPtrTable.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/StaticPtrTable.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/TH.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/TH.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/TH.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/TH/Binary.dyn_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/TH/Binary.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/GHCi/TH/Binary.p_hi
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/HSghci-%%GHC_VERSION%%.o
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/HSghci-%%GHC_VERSION%%.p_o
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/libHSghci-%%GHC_VERSION%%-ghc%%GHC_VERSION%%.so
+lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/libHSghci-%%GHC_VERSION%%.a
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/ghci-%%GHC_VERSION%%/libHSghci-%%GHC_VERSION%%_p.a
 lib/ghc-%%GHC_VERSION%%/ghci-usage.txt
 lib/ghc-%%GHC_VERSION%%/haskeline-%%HASKELINE_VERSION%%/HShaskeline-%%HASKELINE_VERSION%%.o
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/haskeline-%%HASKELINE_VERSION%%/HShaskeline-%%HASKELINE_VERSION%%.p_o
@@ -3991,8 +3991,8 @@ lib/ghc-%%GHC_VERSION%%/include/MachDeps.h
 lib/ghc-%%GHC_VERSION%%/include/Rts.h
 lib/ghc-%%GHC_VERSION%%/include/RtsAPI.h
 lib/ghc-%%GHC_VERSION%%/include/Stg.h
-%%NODYNAMIC%%lib/ghc-%%GHC_VERSION%%/include/ffi.h
-%%NODYNAMIC%%lib/ghc-%%GHC_VERSION%%/include/ffitarget.h
+%%NO_DYNAMIC%%lib/ghc-%%GHC_VERSION%%/include/ffi.h
+%%NO_DYNAMIC%%lib/ghc-%%GHC_VERSION%%/include/ffitarget.h
 lib/ghc-%%GHC_VERSION%%/include/ghcautoconf.h
 lib/ghc-%%GHC_VERSION%%/include/ghcconfig.h
 lib/ghc-%%GHC_VERSION%%/include/ghcplatform.h
@@ -4067,17 +4067,17 @@ lib/ghc-%%GHC_VERSION%%/integer-gmp-%%INTEGER-GMP_VERSION%%/HSinteger-gmp-%%INTE
 lib/ghc-%%GHC_VERSION%%/integer-gmp-%%INTEGER-GMP_VERSION%%/libHSinteger-gmp-%%INTEGER-GMP_VERSION%%.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/integer-gmp-%%INTEGER-GMP_VERSION%%/libHSinteger-gmp-%%INTEGER-GMP_VERSION%%_p.a
 lib/ghc-%%GHC_VERSION%%/latex/haddock.sty
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/GHCi/Utils.dyn_hi
-lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/GHCi/Utils.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/GHCi/Utils.p_hi
-lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/HSlibiserv-%%LIBISERV_VERSION%%.o
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/HSlibiserv-%%LIBISERV_VERSION%%.p_o
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/Lib.dyn_hi
-lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/Lib.hi
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/Lib.p_hi
-%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/libHSlibiserv-%%LIBISERV_VERSION%%-ghc%%GHC_VERSION%%.so
-lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/libHSlibiserv-%%LIBISERV_VERSION%%.a
-%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libiserv-%%LIBISERV_VERSION%%/libHSlibiserv-%%LIBISERV_VERSION%%_p.a
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/GHCi/Utils.dyn_hi
+lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/GHCi/Utils.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/GHCi/Utils.p_hi
+lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/HSlibiserv-%%GHC_VERSION%%.o
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/HSlibiserv-%%GHC_VERSION%%.p_o
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/Lib.dyn_hi
+lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/Lib.hi
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/Lib.p_hi
+%%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/libHSlibiserv-%%GHC_VERSION%%-ghc%%GHC_VERSION%%.so
+lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/libHSlibiserv-%%GHC_VERSION%%.a
+%%PROFILE%%lib/ghc-%%GHC_VERSION%%/libiserv-%%GHC_VERSION%%/libHSlibiserv-%%GHC_VERSION%%_p.a
 lib/ghc-%%GHC_VERSION%%/llvm-passes
 lib/ghc-%%GHC_VERSION%%/llvm-targets
 %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/mtl-%%MTL_VERSION%%/Control/Monad/Cont.dyn_hi
@@ -4163,16 +4163,16 @@ lib/ghc-%%GHC_VERSION%%/package.conf.d/exceptions-%%EXCEPTIONS_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/filepath-%%FILEPATH_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-%%GHC_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-bignum-%%GHC-BIGNUM_VERSION%%.conf
-lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-boot-%%GHC-BOOT_VERSION%%.conf
-lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-boot-th-%%GHC-BOOT-TH_VERSION%%.conf
+lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-boot-%%GHC_VERSION%%.conf
+lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-boot-th-%%GHC_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-compact-%%GHC-COMPACT_VERSION%%.conf
-lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-heap-%%GHC-HEAP_VERSION%%.conf
+lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-heap-%%GHC_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/ghc-prim-%%GHC-PRIM_VERSION%%.conf
-lib/ghc-%%GHC_VERSION%%/package.conf.d/ghci-%%GHCI_VERSION%%.conf
+lib/ghc-%%GHC_VERSION%%/package.conf.d/ghci-%%GHC_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/haskeline-%%HASKELINE_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/hpc-%%HPC_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/integer-gmp-%%INTEGER-GMP_VERSION%%.conf
-lib/ghc-%%GHC_VERSION%%/package.conf.d/libiserv-%%LIBISERV_VERSION%%.conf
+lib/ghc-%%GHC_VERSION%%/package.conf.d/libiserv-%%GHC_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/mtl-%%MTL_VERSION%%.conf
 lib/ghc-%%GHC_VERSION%%/package.conf.d/package.cache
 lib/ghc-%%GHC_VERSION%%/package.conf.d/package.cache.lock
@@ -4313,12 +4313,16 @@ lib/ghc-%%GHC_VERSION%%/process-%%PROCESS_VERSION%%/include/runProcess.h
 %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/process-%%PROCESS_VERSION%%/libHSprocess-%%PROCESS_VERSION%%-ghc%%GHC_VERSION%%.so
 lib/ghc-%%GHC_VERSION%%/process-%%PROCESS_VERSION%%/libHSprocess-%%PROCESS_VERSION%%.a
 %%PROFILE%%lib/ghc-%%GHC_VERSION%%/process-%%PROCESS_VERSION%%/libHSprocess-%%PROCESS_VERSION%%_p.a
-%%NODYNAMIC%%lib/ghc-%%LIBISERV_VERSION%%/rts/libCffi.a
-%%NODYNAMIC%%lib/ghc-%%LIBISERV_VERSION%%/rts/libCffi_debug.a
-%%NODYNAMIC%%lib/ghc-%%LIBISERV_VERSION%%/rts/libCffi_l.a
-%%NODYNAMIC%%lib/ghc-%%LIBISERV_VERSION%%/rts/libCffi_thr.a
-%%NODYNAMIC%%lib/ghc-%%LIBISERV_VERSION%%/rts/libCffi_thr_debug.a
-%%NODYNAMIC%%lib/ghc-%%LIBISERV_VERSION%%/rts/libCffi_thr_l.a
+%%NO_DYNAMIC%%lib/ghc-%%GHC_VERSION%%/rts/libCffi.a
+%%NO_DYNAMIC%%lib/ghc-%%GHC_VERSION%%/rts/libCffi_debug.a
+%%NO_DYNAMIC%%%%PROFILE%%lib/ghc-%%GHC_VERSION%%/rts/libCffi_debug_p.a
+%%NO_DYNAMIC%%lib/ghc-%%GHC_VERSION%%/rts/libCffi_l.a
+%%NO_DYNAMIC%%%%PROFILE%%lib/ghc-%%GHC_VERSION%%/rts/libCffi_p.a
+%%NO_DYNAMIC%%lib/ghc-%%GHC_VERSION%%/rts/libCffi_thr.a
+%%NO_DYNAMIC%%lib/ghc-%%GHC_VERSION%%/rts/libCffi_thr_debug.a
+%%NO_DYNAMIC%%%%PROFILE%%lib/ghc-%%GHC_VERSION%%/rts/libCffi_thr_debug_p.a
+%%NO_DYNAMIC%%lib/ghc-%%GHC_VERSION%%/rts/libCffi_thr_l.a
+%%NO_DYNAMIC%%%%PROFILE%%lib/ghc-%%GHC_VERSION%%/rts/libCffi_thr_p.a
 %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/rts/libHSrts-ghc%%GHC_VERSION%%.so
 lib/ghc-%%GHC_VERSION%%/rts/libHSrts.a
 %%DYNAMIC%%lib/ghc-%%GHC_VERSION%%/rts/libHSrts_debug-ghc%%GHC_VERSION%%.so