Index: head/lang/ghc/Makefile
===================================================================
--- head/lang/ghc/Makefile	(revision 372424)
+++ head/lang/ghc/Makefile	(revision 372425)
@@ -1,330 +1,326 @@
 # Created by: Simon Marlow <simonmar@microsoft.com>
 # $FreeBSD$
 
 PORTNAME=	ghc
 PORTVERSION=	7.8.3
 PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		${MASTER_SITE_LOCAL:S/$/:boot/}
 MASTER_SITE_SUBDIR=	pgj/:boot
 DISTFILES=	ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Compiler for the functional language Haskell
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 MAKE_JOBS_NUMBER_LIMIT=		4
 
 GHC_VERSION=		${PORTVERSION}
 HSCOLOUR_VERSION=	1.20.3
 
 DATADIR=	${PREFIX}/share/ghc-${GHC_VERSION}
 EXAMPLESDIR=	${PREFIX}/share/examples/ghc-${GHC_VERSION}
 
 CONFLICTS=	ghc-6.* ghc-7.0.* ghc-7.2.* ghc-7.4.* ghc-7.6.* ghc-7.7.*
 
 LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 
 USE_AUTOTOOLS=		autoconf autoheader
 USE_PERL5=		build
 USES=			gmake iconv:translit perl5 ncurses tar:bzip2
 USE_BINUTILS=		yes
 USE_GCC=		yes
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 MAKE_ENV=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
 
 # The configure process accepts,filters and canonicalises
 # the CONFIGURE_TARGET variable. You can read the files
 # ${WRKSRC}/configure and ${WRKSRC}/config.sub.
 # This is better fixed in the ${WRKSRC}/mk/build.mk.
 # You can view below.
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=		PROFILE DYNAMIC LLVM DOCS
 OPTIONS_DEFAULT=	PROFILE DYNAMIC DOCS
 
 BOOT_DESC=		Use installed GHC for bootstrapping
 BOOTH_DESC=		Use installed HsColour for bootstrapping
 PROFILE_DESC=		Add support for performance profiling
 DYNAMIC_DESC=		Add support for dynamic linking
 LLVM_DESC=		Add support for generating code via LLVM
 DOCS_DESC=		Install HTML documentation
 
 LOCALBASE?=	/usr/local
 
 .if exists(${LOCALBASE}/bin/ghc)
 OPTIONS_DEFINE+=	BOOT
 .endif
 
 .if exists(${LOCALBASE}/bin/HsColour)
 OPTIONS_DEFINE+=	BOOTH
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDYNAMIC}
 # The version number is needed as lang/gcc installs a different version
 LIB_DEPENDS+=	libffi.so.6:${PORTSDIR}/devel/libffi
 .endif
 
 # Earlier versions of FreeBSD 9 cannot do proper resolution for $ORIGIN (due
 # to a bug in rtld(1)), so disable it by default there.  This shall go away
 # once 9.2 becomes the latest supported release in that branch.
 .if ${OSVERSION} >= 900000 && ${OSVERSION} < 902001
 EXTRA_PATCHES+=		${PATCHDIR}/nopatch-rules__distdir-way-opts.mk
 
 BUILD_DEPENDS+=		chrpath:${PORTSDIR}/devel/chrpath
 .endif
 
 .if empty(PORT_OPTIONS:MBOOT)
 
 BOOT_GHC_VERSION=	7.6.3
 
 .if ${ARCH} == "i386"
 
 .if ${OSVERSION} >= 1000043
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-i386-freebsd10-boot${EXTRACT_SUFX}:boot
 .elif ${OSVERSION} >= 900000
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-i386-freebsd9-boot${EXTRACT_SUFX}:boot
 .elif ${OSVERSION} >= 800000
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot
 .else
 IGNORE=		unsupported
 .endif
 
 .elif ${ARCH} == "amd64"
 
 .if ${OSVERSION} >= 1000043
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-amd64-freebsd10-boot${EXTRACT_SUFX}:boot
 .elif ${OSVERSION} >= 900000
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-amd64-freebsd9-boot${EXTRACT_SUFX}:boot
 .elif ${OSVERSION} >= 800000
 DISTFILES+=	ghc-${BOOT_GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot
 .else
 IGNORE=		unsupported
 .endif
 
 .endif
 
 .endif # MBOOT
 
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
 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/package/
 
 CONFIGURE_ARGS=		--with-gcc=${CC} \
 			--with-ld=${LD} \
 			--with-gmp-includes=${LOCALBASE}/include \
 			--with-gmp-libraries=${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--with-iconv-includes=${LOCALBASE}/include \
 			--with-iconv-libraries=${LOCALBASE}/lib
 
 .if ${PORT_OPTIONS:MDYNAMIC}
 CONFIGURE_ARGS+=	--with-system-libffi \
 			--with-ffi-includes=${LOCALBASE}/include \
 			--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
 BOOT_GHC=	${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION}
 BOOT_GHC-PKG=	${BOOT_DIR}/bin/ghc-pkg-${BOOT_GHC_VERSION}
 BOOT_HSC2HS=	${BOOT_DIR}/bin/hsc2hs
 
 SLAVE_CMD=	${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
 
 CONFIGURE_ARGS_BOOT=	--prefix=${BOOT_DIR} --with-gcc=${CC} --with-ld=${LD}
 CONFIGURE_ARGS+=	--with-ghc=${BOOT_GHC}
 
 .else # MBOOT
 
 SLAVE_CMD=	# empty
 
 CONFIGURE_ARGS+=	--with-ghc=${LOCALBASE}/bin/ghc
 
 .endif # MBOOT
 
 # libgmp:
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
 # override TMPDIR because /tmp often doesn't have enough space
 # to build some of the larger libraries.
 TMPDIR=		${WRKSRC}/tmp
 MAKE_ENV+=	TMPDIR=${TMPDIR}
 
 # Defining with documentation:
 # An in place installation and registration of hscolour will be
 # activated. In this way it's possible to use it directly into
 # the build tree, without needing to install it. At the end
 # you could view the output of: ${BOOT_GHC} describe hscolour
 
 .if ${PORT_OPTIONS:MDOCS}
 
 .if empty(PORT_OPTIONS:MBOOTH)
 
 MASTER_SITES+=	${HACKAGE_SITE}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}
 MAKE_ENV+=	LC_ALL=en_US.UTF-8
 CONFIGURE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
 
 .endif # MBOOTH
 
 BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 .endif
 
 post-extract:
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "docdir = ${PREFIX}/share/doc/ghc-${GHC_VERSION}"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "htmldir = ${PREFIX}/share/doc/ghc-${GHC_VERSION}"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "mandir = ${PREFIX}/man"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "infodir = ${PREFIX}/info"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays = v"
 .if ${PORT_OPTIONS:MPROFILE}
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays += p"
 .endif
 .if ${PORT_OPTIONS:MDYNAMIC}
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "GhcLibWays += dyn"
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "XMLDocWays = html"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "HADDOCK_DOCS = YES"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "HSCOLOUR_SRCS = YES"
 .else
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "XMLDocWays ="
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "HADDOCK_DOCS ="
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "HSCOLOUR_SRCS ="
 .endif
 .if ${PORT_OPTIONS:MBOOT}
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${LOCALBASE}/bin/hsc2hs"
 .else
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}"
 .endif
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${NCURSESINC} -L${NCURSESLIB} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_CC_OPTS += ${CFLAGS}"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_HSC2HS_OPTS += -I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib"
 	@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_LD_OPTS += -L${LOCALBASE}/lib"
 	@${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 "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,^${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}
 	@${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
-	@${FIND} -ds ${STAGEDIR}${DOCSDIR} -type d -print | ${SED} -E -e \
-		's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
-	@${FIND} -ds ${GHC_LIBDIR} -type d -print | ${SED} -E -e \
-		's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
 		s|%%AR%%|${AR}|; \
 		s|%%RANLIB%%|${RANLIB}|; \
 		s|%%LD%%|${LD}|' \
 		${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
 # FreeBSD 9.{0,1} oddity workaround, part 2 (see above)
 .if ${OSVERSION} >= 900000 && ${OSVERSION} < 902001
 	@${REINPLACE_CMD} -e 's|%%GHC_LIBDIR%%|${GHC_LIBDIR}|g' \
 		${WRKSRC}/rules/distdir-way-opts.mk
 .endif
 
 pre-configure:
 	@${MKDIR} ${TMPDIR}
 .if empty(PORT_OPTIONS:MBOOT)
 	@(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT})
 	@(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install)
 .endif
 
 # Defining with documentation:
 # Defining "SLAVE" in devel/hs-haddock and print/hs-hscolour flips the building process
 # functionally to this port.
 .if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MBOOTH)
 	@${ECHO_MSG} -e "\a"
 	@${ECHO_MSG} "======================================================================"
 	@${ECHO_MSG} "  WARNING: Now HsColour will be built, the respective port will not   "
 	@${ECHO_MSG} "           be installed, but an in-place installation and             "
 	@${ECHO_MSG} "           registration of both takes place.                          "
 	@${ECHO_MSG} "======================================================================"
 	@${ECHO_MSG} ""
 	@sleep 3
 
 	@${MKDIR} ${SLAVES_PREFIX}
 	@${MKDIR} ${SLAVES_WRKDIRPREFIX}
 
 	@(cd ${SLAVES_WRKDIRPREFIX} && \
 		${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} --with-gcc=${CC} --with-ld=${LD} && \
 		${SLAVE_CMD} ./Setup build && \
 		${SLAVE_CMD} ./Setup install)
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/cabal/ghc-${GHC_VERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/cabal/ghc-${GHC_VERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/cabal/ghc-${GHC_VERSION}
 	@${RM} -f ${STAGEDIR}${PREFIX}/bin/haddock
 .if ${PORT_OPTIONS:MDOCS}
 	@${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock
 .endif
 # FreeBSD 9.{0,1} oddity workaround, part 3 (see above)
 .if ${OSVERSION} >= 900000 && ${OSVERSION} < 902001
 	@(for f in $$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so' | ${GREP} -v libHSrts); do \
 	    chrpath -r $$(chrpath $$f | ${CUT} -d '=' -f2 | ${SED} 's|${GHC_LIBDIR}|${PREFIX}/${GHC_LIBDIR_REL}|g') $$f; \
 	    done)
 .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>
Index: head/lang/ghc/bsd.cabal.mk
===================================================================
--- head/lang/ghc/bsd.cabal.mk	(revision 372424)
+++ head/lang/ghc/bsd.cabal.mk	(revision 372425)
@@ -1,344 +1,335 @@
 #
 # $FreeBSD$
 #
 # bsd.cabal.mk -- Support for ports based on Haskell Cabal.
 #
 # Created by: Gabor Pali <pgj@FreeBSD.org>,
 # Based on works of Giuseppe Pilichi and Ashish Shukla.
 #
 # Maintained by: haskell@FreeBSD.org
 #
 
 .if !defined(METAPORT)
 MASTER_SITES?=	http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/
 DIST_SUBDIR?=	cabal
 .else
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 NO_FETCH=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes
 NO_MTREE=	yes
 .endif # !METAPORT
 
 MAKE_ENV+=	LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} \
 		TMPDIR=${TMPDIR}
 
 SETUP_CMD?=	./setup
 
 ALEX_CMD?=	${LOCALBASE}/bin/alex
 HAPPY_CMD?=	${LOCALBASE}/bin/happy
 C2HS_CMD?=	${LOCALBASE}/bin/c2hs
 
 CABAL_DIRS+=	${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} \
 		${DOCSDIR}
 
 GHC_HADDOCK_CMD=${LOCALBASE}/bin/haddock-ghc-${GHC_VERSION}
 
 CABAL_DOCSDIR=		${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION}
 CABAL_DOCSDIR_REL=	${CABAL_DOCSDIR:S,^${PREFIX}/,,}
 
 DATADIR=	${PREFIX}/share/cabal/ghc-${GHC_VERSION}/${DISTNAME}
 DOCSDIR=	${CABAL_DOCSDIR}/${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/cabal/ghc-${GHC_VERSION}
 CABAL_LIBSUBDIR=	${DISTNAME}
 CABAL_LIBDIR_REL=	${CABAL_LIBDIR:S,^${PREFIX}/,,}
 
 CONFIGURE_ARGS+=	--libdir=${CABAL_LIBDIR} --libsubdir=${CABAL_LIBSUBDIR}
 
 PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
 		PORTNAME=${PORTNAME} \
 		PORTVERSION=${PORTVERSION} \
 		LIBDIR_REL=${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 INSTALL_PORTDATA?=
 INSTALL_PORTEXAMPLES?=
 
 LOCALBASE?=	/usr/local
 TMPDIR?=	${WRKDIR}/tmp
 
 .if !defined(CABALOPTIONSMKINCLUDED)
 .include "bsd.cabal.options.mk"
 .endif
 
 .if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 RUN_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
 .else
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
 .endif
 
 USE_BINUTILS=	yes
 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}
 .endif
 
 .if defined(USE_HAPPY)
 BUILD_DEPENDS+=	${HAPPY_CMD}:${PORTSDIR}/devel/hs-happy
 CONFIGURE_ARGS+=	 --with-happy=${HAPPY_CMD}
 .endif
 
 .if defined(USE_C2HS)
 BUILD_DEPENDS+=	${C2HS_CMD}:${PORTSDIR}/devel/hs-c2hs
 CONFIGURE_ARGS+=	--with-c2hs=${C2HS_CMD}
 .endif
 
 .if defined(EXECUTABLE)
 LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
 USES+=		iconv
 
 CONFIGURE_ARGS+=	--enable-executable-stripping
 .endif
 
 .if defined(USE_CABAL)
 .include "bsd.hackage.mk"
 
 .for cabal_package in ${USE_CABAL}
 __u_h_r_package=	${cabal_package:C/[<=>].*$//g}
 __u_h_r_port=		${${__u_h_r_package}_port}
 __u_h_r_name=		${__u_h_r_port:C/.*\///g}
 
 .if empty(__u_h_r_port)
 IGNORE?=	dependency fails: ${cabal_package:C/[<=>].*$//g} is not known as a port
 .endif
 
 .if ${__u_h_r_package} == ${cabal_package}
 __u_h_r_version:=	>=0
 .else
 __u_h_r_version:=	${cabal_package:C/^[^<=>]*//g}
 .endif
 
 dependencies:=	${dependencies} \
 ${HSPREFIX}${__u_h_r_package}${__u_h_r_version}:${PORTSDIR}/${__u_h_r_port}
 .endfor
 
 BUILD_DEPENDS+=	${dependencies}
 
 .if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
 RUN_DEPENDS+=	${dependencies}
 .endif
 
 .endif
 
 .if defined(USE_GHC_NATIVE)
 USES+=		perl5
 USE_PERL5=	build
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 .if !defined(XMLDOCS)
 
 .if defined(HADDOCK_AVAILABLE)
 HADDOCK_OPTS=	# empty
 
 .if ${PORT_OPTIONS:MHSCOLOUR}
 BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
 
 HSCOLOUR_VERSION=	1.20.3
 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 \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 
 USES+=		gmake
 
 .endif # !XMLDOCS
 
 .endif # DOCS
 
 __handle_datadir__=	--datadir='${DATADIR}' --datasubdir='' --docdir='${DOCSDIR}'
 
 .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
 
 .if ${PORT_OPTIONS:MPROFILE}
 CONFIGURE_ARGS+=	--enable-executable-profiling --enable-library-profiling
 .else
 CONFIGURE_ARGS+=	--disable-executable-profiling --disable-library-profiling
 .endif
 
 .SILENT:
 
 post-patch::
 .if defined(XMLDOCS) && defined(USE_AUTOTOOLS)
 	@${REINPLACE_CMD} -e 's|/usr/local/share/xsl/docbook|${LOCALBASE}/share/xsl/docbook|' \
 		${WRKSRC}/doc/configure.ac
 .endif
 
 _BUILD_SETUP=	${GHC_CMD} -o ${SETUP_CMD} -package Cabal --make
 
 .if !defined(METAPORT)
 .if !target(do-configure)
 do-configure:
 	@${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)
 	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure --prefix=${PREFIX}
 .endif
 .endif # DOCS
 .endif # target(do-configure)
 .endif # !METAPORT
 
 .if !defined(METAPORT)
 .if !target(do-build)
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} build
 .if !defined(STANDALONE)
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} register --gen-script
 .endif
 
 .if ${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} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
 .endif # XMLDOCS
 .endif # DOCS
 .endif # target(do-build)
 .endif # !METAPORT
 
 .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:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} copy --destdir=${STAGEDIR}
 
 .if !defined(STANDALONE)
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh
 .endif
 
 .if !empty(INSTALL_PORTDATA)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PORTDATA}
 .endif
 
 .if !empty(INSTALL_PORTEXAMPLES) && ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PORTEXAMPLES}
 .endif
 
 .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 # MAN${sect}SRC
 .endfor
 
 .if ${PORT_OPTIONS:MDOCS}
 .if !empty(XMLDOCS)
 .for xmldoc in ${XMLDOCS}
 	@(cd ${WRKSRC}/${xmldoc:C/:.*$//g} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/${xmldoc:C/^.*://g})
 .endfor
 .endif # XMLDOCS
 .endif # DOCS
 .endif # target(do-install)
 .endif # !METAPORT
 
 .if !target(post-install-script)
 post-install-script:
 .if defined(EXECUTABLE)
 .for exe in ${EXECUTABLE}
 	@${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST}
 .endfor
-.if defined(STANDALONE) && !${PORT_OPTIONS:MDYNAMIC}
-	@for dir in lib share share/doc share/examples; do \
-		if [ -d ${STAGEDIR}${PREFIX}/$${dir}/cabal/ghc-${GHC_VERSION} ]; then \
-		echo "@dirrmtry $${dir}/cabal/ghc-${GHC_VERSION}" >> ${TMPPLIST}; fi ; \
-		if [ -d ${STAGEDIR}${PREFIX}/$${dir}/cabal ]; then \
-		echo "@dirrmtry $${dir}/cabal" >> ${TMPPLIST}; fi ; done
-.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 ; \
-		if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \
-		-type d -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}; fi ; done
+		-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(STANDALONE)
 	@${ECHO_CMD} '@unexec ${LOCALBASE}/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}' >> ${TMPPLIST}
 .endif
 
 .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(STANDALONE)
 	@${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh > /dev/null' >> ${TMPPLIST}
 .endif
 
 .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
Index: head/lang/ghc/pkg-plist
===================================================================
--- head/lang/ghc/pkg-plist	(revision 372424)
+++ head/lang/ghc/pkg-plist	(revision 372425)
@@ -1,28 +1,20 @@
 bin/ghc
 bin/ghci
 bin/ghc-pkg
 bin/runhaskell
 bin/runghc
 bin/hp2ps
 bin/hpc
 bin/hsc2hs
 bin/ghc-%%GHC_VERSION%%
 bin/ghci-%%GHC_VERSION%%
 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
 @exec /bin/mkdir -p %D/share/cabal/ghc-%%GHC_VERSION%%           || return true
 @exec /bin/mkdir -p %D/share/doc/cabal/ghc-%%GHC_VERSION%%       || return true
 @exec /bin/mkdir -p %D/share/examples/cabal/ghc-%%GHC_VERSION%%  || return true
-@dirrmtry lib/cabal/ghc-%%GHC_VERSION%%
-@dirrmtry lib/cabal
-@dirrmtry share/cabal/ghc-%%GHC_VERSION%%
-@dirrmtry share/cabal
-@dirrmtry share/doc/cabal/ghc-%%GHC_VERSION%%
-@dirrmtry share/doc/cabal
-@dirrmtry share/examples/cabal/ghc-%%GHC_VERSION%%
-@dirrmtry share/examples/cabal