Index: lang/ghc/Makefile
===================================================================
--- lang/ghc/Makefile
+++ lang/ghc/Makefile
@@ -6,8 +6,12 @@
 PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
-		LOCAL/arrowd/:boot
-DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source
+		LOCAL/arrowd/:boot \
+		${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs
+
+EXTRACT_ONLY=	${_DISTFILES:C/hscolour.*$//g}
+DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source \
+		hscolour-${HSCOLOUR_VERSION}.tar.gz:docs
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Compiler for the functional language Haskell
@@ -51,7 +55,7 @@
 
 OPTIONS_GROUP=		BOOTSTRAP
 BOOTSTRAP_DESC=		Bootsrap using installed ghc
-OPTIONS_GROUP_BOOTSTRAP=BOOT BOOTH
+OPTIONS_GROUP_BOOTSTRAP=BOOT
 OPTIONS_DEFINE=		DYNAMIC PROFILE DOCS
 OPTIONS_SUB=		yes
 
@@ -62,7 +66,6 @@
 OPTIONS_EXCLUDE_aarch64=	DYNAMIC
 
 BOOT_DESC=		Use installed GHC for bootstrapping
-BOOTH_DESC=		Use installed HsColour for bootstrapping
 PROFILE_DESC=		Add support for performance profiling
 DYNAMIC_DESC=		Add support for dynamic linking
 DOCS_DESC=		Install HTML documentation
@@ -159,29 +162,12 @@
 # the build tree, without needing to install it. At the end
 # you could view the output of: ${BOOT_GHC} describe hscolour
 
-.if ${PORT_OPTIONS:MDOCS}
-
-.  if empty(PORT_OPTIONS:MBOOTH)
-
-MASTER_SITES+=	${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs
-DISTFILES+=	hscolour-${HSCOLOUR_VERSION}.tar.gz:docs
-
-EXTRACT_ONLY=	${_DISTFILES:C/hscolour.*$//g}
-
-.  endif # MBOOTH
-
-.  if empty(PORT_OPTIONS:MBOOTH)
-
 SLAVES_PREFIX=		${WRKDIR}/slaves_prefix
 SLAVES_WRKDIRPREFIX=	${WRKDIR}/slaves_wrkdirprefix
 
 MAKE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
 
-.  endif # MBOOTH
-
-.endif # MDOCS
-
 post-extract:
 # don't use the "wrap" trick on arches that use post-ino64 bootstrap binaries (arm*)
 .if empty(PORT_OPTIONS:MBOOT) && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200031 && \
@@ -250,7 +236,7 @@
 	@(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install)
 .endif
 
-.if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MBOOTH)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -e "\a"
 	@${ECHO_MSG} "======================================================================"
 	@${ECHO_MSG} "  WARNING: Now HsColour will be built, the respective port will not   "