15 files changed, 473 insertions, 971 deletions

diff --git a/math/hs-Agda-executable/Makefile b/math/hs-Agda-executable/Makefile
index 8e01b170e05e..673255fbdbda 100644
--- a/math/hs-Agda-executable/Makefile
+++ b/math/hs-Agda-executable/Makefile
@@ -9,68 +9,17 @@ PORTNAME=	Agda-executable
 PORTVERSION=	2.2.6
 PORTREVISION=	1
 CATEGORIES=	math haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Command-line program for type-checking and compiling Agda programs
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-Agda>=2.2.6:${PORTSDIR}/math/hs-Agda
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-Agda>=2.2.6:${PORTSDIR}/math/hs-Agda
-
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+CABAL_SETUP=	Setup.hs
+USE_HACKAGE=	Agda>=2.2.6
 
 USE_ICONV=	yes
 
-GHC_VERSION=		6.10.4
-AGDAEXECUTABLE_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DOCSDIR=			${PREFIX}/share/doc/${DISTNAME}
-AGDAEXECUTABLE_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		AGDAEXECUTABLE_VERSION=${AGDAEXECUTABLE_VERSION} \
-		AGDAEXECUTABLE_LIBDIR_REL=${AGDAEXECUTABLE_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+=		NOPORTDOCS=""
-.else
-PLIST_SUB+=		NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS=	*
-.endif
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
-		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${SETUP_CMD} build
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source --executables \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install
+EXECUTABLE=	agda
+STANDALONE=	yes
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index d8b6ce158423..8e9c5747ad19 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -9,102 +9,25 @@ PORTNAME=	Agda
 PORTVERSION=	2.2.6
 PORTREVISION=	1
 CATEGORIES=	math haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	A functional programming language and proof assistant
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-QuickCheck>=2.1.0.2:${PORTSDIR}/devel/hs-QuickCheck \
-		hs-binary-ghc>=0.4.4:${PORTSDIR}/devel/hs-binary-ghc \
-		hs-zlib>=0.4.0.1:${PORTSDIR}/archivers/hs-zlib \
-		hs-haskeline>=0.3:${PORTSDIR}/devel/hs-haskeline \
-		hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc \
-		hs-happy>=1.15:${PORTSDIR}/devel/hs-happy \
-		hs-alex>=2.0.1:${PORTSDIR}/devel/hs-alex
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-QuickCheck>=2.1.0.2:${PORTSDIR}/devel/hs-QuickCheck \
-		hs-binary-ghc>=0.4.4:${PORTSDIR}/devel/hs-binary-ghc \
-		hs-zlib>=0.4.0.1:${PORTSDIR}/archivers/hs-zlib \
-		hs-haskeline>=0.3:${PORTSDIR}/devel/hs-haskeline \
-		hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
-
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
+CABAL_SETUP=	Setup.hs
+USE_HACKAGE=	binary>=0.4.4 haskeline>=0.3 QuickCheck>=2.1.0.2 \
+		zlib>=0.4.0.1
 
+USE_ALEX=	yes
+USE_HAPPY=	yes
 USE_ICONV=	yes
 
-GHC_VERSION=	6.10.4
-AGDA_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DATADIR=		${PREFIX}/share/${DISTNAME}
-PORTDATA=	*
-
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-AGDA_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		AGDA_VERSION=${AGDA_VERSION} \
-		AGDA_LIBDIR_REL=${AGDA_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+=		NOPORTDOCS=""
-.else
-PLIST_SUB+=		NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS=	*
-.endif
-
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal
-.if !defined(NOPORTDATA)
-	cd ${WRKSRC} && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-.else
-	cd ${WRKSRC} && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} \
-	    --datadir='' --datasubdir='' --docdir='${DOCSDIR}'
-.endif
-
-do-build:
-	cd ${WRKSRC} && ${SETUP_CMD} build \
-		     && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source --executables \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
+EXECUTABLE=	agda-mode
 
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${AGDA_LIBDIR_REL}/register.sh
-.if !defined(NOPORTDATA)
-	cd ${WRKSRC} && ${INSTALL_DATA} README ${DATADIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DATADIR}
-.endif
+PORTDATA=		*
+INSTALL_PORTDATA=	(cd ${WRKSRC} && ${INSTALL_DATA} README ${DATADIR}; \
+			 cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DATADIR})
 
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-	@${ECHO_MSG} -e "\a"
-	@${ECHO_MSG} "================================================================="
-	@${CAT}      "${PKGMESSAGE}"
-	@${ECHO_MSG} "================================================================="
-	@${ECHO_MSG}
+SHOW_PKGMSG=	yes
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/math/hs-Agda/pkg-plist b/math/hs-Agda/pkg-plist
index bed90d759d2b..7cca7f4ea380 100644
--- a/math/hs-Agda/pkg-plist
+++ b/math/hs-Agda/pkg-plist
@@ -1,217 +1,217 @@
 @comment $FreeBSD$
 bin/agda-mode
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Auto.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Convert.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/NarrowingSearch.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Print.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/SearchControl.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Syntax.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Typecheck.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/Classify.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/Common.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/Main.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/OptimizedPrinter.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/TranslateName.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/UntypedPrinter.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo/Haskell.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo/Main.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo/Names.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo/PatternMonad.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/HaskellTypes.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Compiler.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Encode.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Misc.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Pretty.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Primitives.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/BasicOps.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/CommandLine/CommandLine.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Exceptions.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/FindFile.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/GhciTop.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Emacs.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Generate.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/HTML.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Precise.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Range.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Vim.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Imports.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/MakeCase.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Monad.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Options.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Main.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract/Name.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract/Pretty.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract/Views.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Common.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Definitions.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Name.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Operators.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Operators/Parser.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Pretty.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Fixity.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Info.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Internal.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Internal/Generic.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Internal/Pattern.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Literal.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Alex.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Comments.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Layout.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/LexActions.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Lexer.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/LookAhead.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Monad.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Parser.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/StringLiterals.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Tokens.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Position.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Scope/Base.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Scope/Monad.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Strict.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Translation/AbstractToConcrete.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Translation/ConcreteToAbstract.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Translation/InternalToAbstract.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/CallGraph.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/Lexicographic.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/Matrix.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/Semiring.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/TermCheck.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/Termination.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Tests.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecker.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Abstract.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Constraints.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Conversion.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Coverage.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Coverage/Match.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/DisplayForm.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Empty.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Errors.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/EtaContract.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Free.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Implicit.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Injectivity.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Level.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/MetaVars.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/MetaVars/Occurs.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Base.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Builtin.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Closure.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Constraints.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Context.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Debug.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Env.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Exception.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Imports.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/MetaVars.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Mutual.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Open.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Options.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Signature.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/SizedTypes.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/State.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Statistics.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Trace.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Patterns/Match.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Polarity.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Positivity.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Pretty.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Primitive.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rebind.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Records.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Reduce.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Builtin.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Data.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Decl.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Def.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Implicit.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Instantiate.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Problem.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Split.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Unify.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Record.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Term.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Serialise.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/SizedTypes.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Substitute.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Telescope.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Test/Generators.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Tests.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/With.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Char.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Either.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/FileName.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Fresh.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Function.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Generics.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Graph.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Hash.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/IO/Binary.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/IO/Locale.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/IO/UTF8.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Impossible.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/List.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Map.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Maybe.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Monad.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Permutation.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Pointer.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Pretty.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/QuickCheck.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/ReadP.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/SemiRing.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Size.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/String.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Suffix.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/TestHelpers.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Trace.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Trie.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Tuple.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Unicode.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Warshall.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Version.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSAgda-%%AGDA_VERSION%%.o
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_Agda.hi
-%%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSAgda-%%AGDA_VERSION%%.a
-%%AGDA_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Auto.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Convert.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/NarrowingSearch.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Print.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/SearchControl.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Syntax.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto/Typecheck.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/Classify.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/Common.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/Main.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/OptimizedPrinter.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/TranslateName.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate/UntypedPrinter.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo/Haskell.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo/Main.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo/Names.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo/PatternMonad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/HaskellTypes.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Compiler.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Encode.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Misc.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Pretty.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo/Primitives.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/BasicOps.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/CommandLine/CommandLine.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Exceptions.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/FindFile.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/GhciTop.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Emacs.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Generate.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/HTML.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Precise.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Range.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting/Vim.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Imports.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/MakeCase.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Monad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Options.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Main.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract/Name.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract/Pretty.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract/Views.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Common.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Definitions.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Name.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Operators.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Operators/Parser.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Pretty.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Fixity.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Info.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Internal.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Internal/Generic.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Internal/Pattern.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Literal.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Alex.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Comments.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Layout.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/LexActions.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Lexer.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/LookAhead.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Monad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Parser.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/StringLiterals.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser/Tokens.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Position.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Scope/Base.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Scope/Monad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Strict.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Translation/AbstractToConcrete.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Translation/ConcreteToAbstract.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Translation/InternalToAbstract.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/CallGraph.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/Lexicographic.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/Matrix.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/Semiring.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/TermCheck.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination/Termination.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Tests.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecker.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Abstract.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Constraints.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Conversion.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Coverage.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Coverage/Match.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/DisplayForm.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Empty.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Errors.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/EtaContract.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Free.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Implicit.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Injectivity.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Level.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/MetaVars.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/MetaVars/Occurs.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Base.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Builtin.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Closure.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Constraints.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Context.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Debug.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Env.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Exception.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Imports.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/MetaVars.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Mutual.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Open.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Options.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Signature.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/SizedTypes.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/State.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Statistics.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad/Trace.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Patterns/Match.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Polarity.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Positivity.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Pretty.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Primitive.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rebind.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Records.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Reduce.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Builtin.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Data.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Decl.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Def.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Implicit.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Instantiate.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Problem.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Split.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS/Unify.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Record.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/Term.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Serialise.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/SizedTypes.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Substitute.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Telescope.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Test/Generators.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Tests.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/With.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Char.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Either.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/FileName.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Fresh.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Function.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Generics.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Graph.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Hash.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/IO/Binary.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/IO/Locale.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/IO/UTF8.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Impossible.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/List.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Map.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Maybe.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Monad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Permutation.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Pointer.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Pretty.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/QuickCheck.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/ReadP.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/SemiRing.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Size.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/String.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Suffix.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/TestHelpers.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Trace.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Trie.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Tuple.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Unicode.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/Warshall.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Version.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_Agda.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/IO
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Test
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Patterns
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/MetaVars
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Coverage
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Translation
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Scope
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Internal
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Operators
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/CommandLine
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda
-@dirrm %%AGDA_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%AGDA_LIBDIR_REL%%
-@exec /bin/sh %D/%%AGDA_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils/IO
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Utils
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Test
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules/LHS
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Rules
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Patterns
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Monad
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/MetaVars
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking/Coverage
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/TypeChecking
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Termination
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Translation
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Scope
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Parser
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Internal
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete/Operators
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Concrete
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax/Abstract
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Syntax
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/Highlighting
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction/CommandLine
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Interaction
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/MAlonzo
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Alonzo
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler/Agate
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Compiler
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda/Auto
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Agda
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister Agda
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/math/hs-category-extras/Makefile b/math/hs-category-extras/Makefile
index 658eadddbebb..95f6f97b6c27 100644
--- a/math/hs-category-extras/Makefile
+++ b/math/hs-category-extras/Makefile
@@ -8,68 +8,9 @@
 PORTNAME=	category-extras
 PORTVERSION=	0.53.5
 CATEGORIES=	math haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Various Haskell modules and constructs inspired by category theory
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-
-GHC_VERSION=		6.10.4
-CATEGORYEXTRAS_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DOCSDIR=			${PREFIX}/share/doc/${DISTNAME}
-CATEGORYEXTRAS_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		CATEGORYEXTRAS_VERSION=${CATEGORYEXTRAS_VERSION} \
-		CATEGORYEXTRAS_LIBDIR_REL=${CATEGORYEXTRAS_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+=		NOPORTDOCS=""
-.else
-PLIST_SUB+=		NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS=	*
-.endif
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
-		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${SETUP_CMD} build \
-		     && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${CATEGORYEXTRAS_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/math/hs-category-extras/pkg-plist b/math/hs-category-extras/pkg-plist
index 24926fa8a247..c7e44289c793 100644
--- a/math/hs-category-extras/pkg-plist
+++ b/math/hs-category-extras/pkg-plist
@@ -1,130 +1,130 @@
 @comment $FreeBSD$
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Allegory.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Applicative/Parameterized.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/BiKleisli.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/CoKleisli.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Associative.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Braided.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Cartesian.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Cartesian/Closed.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Discrete.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Distributive.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Dual.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Hask.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Monoidal.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Object.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Cofree.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Coideal.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Context.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Density.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Exponent.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Fix.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/HigherOrder.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Indexed.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Parameterized.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Pointer.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Reader.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Stream.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Supply.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Trans.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Dyad.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Adjunction.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Adjunction/HigherOrder.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Algebra.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Algebra/Elgot.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Categorical.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Biff.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Const.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Flip.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Join.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Lift.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Of.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Composition.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Cone.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Contra.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Exponential.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Extras.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Fix.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Full.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/HigherOrder.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/HigherOrder/Composition.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Indexed.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Internal/Adjunction.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Internal/Ideal.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/KanExtension.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/KanExtension/Interpreter.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Lambek.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Limit.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Pointed.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Pointed/Composition.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Representable.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Strong.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Yoneda.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Zap.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Zip.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Categorical.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Codensity.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Either.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Free.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/HigherOrder.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Hyper.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Ideal.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed/Cont.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed/Fix.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed/State.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed/Trans.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Parameterized.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Ana.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Apo.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Build.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Cata.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Chrono.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Destroy.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Dyna.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Exo.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Futu.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Histo.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Hylo.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Meta/Erwig.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Meta/Gibbons.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Para.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Postpro.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Prepro.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Span.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Synchro.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Universal.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Zygo.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Void.hi
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HScategory-extras-%%CATEGORYEXTRAS_VERSION%%.o
-%%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHScategory-extras-%%CATEGORYEXTRAS_VERSION%%.a
-%%CATEGORYEXTRAS_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Allegory.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Applicative/Parameterized.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/BiKleisli.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow/CoKleisli.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Associative.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Braided.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Cartesian.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Cartesian/Closed.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Discrete.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Distributive.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Dual.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Hask.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Monoidal.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Object.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Cofree.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Coideal.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Context.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Density.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Exponent.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Fix.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/HigherOrder.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Indexed.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Parameterized.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Pointer.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Reader.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Stream.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Supply.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad/Trans.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Dyad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Adjunction.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Adjunction/HigherOrder.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Algebra.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Algebra/Elgot.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Categorical.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Biff.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Const.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Flip.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Join.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Lift.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators/Of.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Composition.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Cone.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Contra.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Exponential.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Extras.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Fix.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Full.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/HigherOrder.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/HigherOrder/Composition.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Indexed.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Internal/Adjunction.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Internal/Ideal.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/KanExtension.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/KanExtension/Interpreter.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Lambek.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Limit.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Pointed.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Pointed/Composition.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Representable.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Strong.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Yoneda.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Zap.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Zip.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Categorical.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Codensity.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Either.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Free.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/HigherOrder.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Hyper.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Ideal.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed/Cont.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed/Fix.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed/State.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed/Trans.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Parameterized.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Ana.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Apo.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Build.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Cata.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Chrono.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Destroy.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Dyna.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Exo.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Futu.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Histo.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Hylo.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Meta/Erwig.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Meta/Gibbons.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Para.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Postpro.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Prepro.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Span.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Synchro.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Universal.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Zygo.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Void.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Meta
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Pointed
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/KanExtension
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Internal
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/HigherOrder
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Algebra
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Adjunction
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Cartesian
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Applicative
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%CATEGORYEXTRAS_LIBDIR_REL%%
-@exec /bin/sh %D/%%CATEGORYEXTRAS_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism/Meta
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Morphism
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad/Indexed
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Monad
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Pointed
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/KanExtension
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Internal
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/HigherOrder
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Combinators
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Algebra
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor/Adjunction
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Functor
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Comonad
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category/Cartesian
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Category
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Arrow
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control/Applicative
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Control
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister category-extras
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index 30817074a6a6..8f200b4e250f 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -8,68 +8,11 @@
 PORTNAME=	erf
 PORTVERSION=	1.0.0.0
 CATEGORIES=	math haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	The error function, erf, and friends for Haskell
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-
-GHC_VERSION=	6.10.4
-ERF_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-ERF_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		ERF_VERSION=${ERF_VERSION} \
-		ERF_LIBDIR_REL=${ERF_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	NOPORTDOCS=""
-.else
-PLIST_SUB+=	NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS=	*
-.endif
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
-		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${SETUP_CMD} build \
-		     && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${ERF_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+CABAL_SETUP=	Setup.hs
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/math/hs-erf/pkg-plist b/math/hs-erf/pkg-plist
index cfae21a69489..bc5c04362fff 100644
--- a/math/hs-erf/pkg-plist
+++ b/math/hs-erf/pkg-plist
@@ -1,14 +1,14 @@
 @comment $FreeBSD$
-%%ERF_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Number/Erf.hi
-%%ERF_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSerf-%%ERF_VERSION%%.o
-%%ERF_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSerf-%%ERF_VERSION%%.a
-%%ERF_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Number/Erf.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%ERF_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Number
-@dirrm %%ERF_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%ERF_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%ERF_LIBDIR_REL%%
-@exec /bin/sh %D/%%ERF_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Number
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister erf
+@unexec %D/bin/ghc-pkg unregister %%%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index ea414a5e9dec..b2e764ff56ad 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -8,76 +8,14 @@
 PORTNAME=	mwc-random
 PORTVERSION=	0.4.1.1
 CATEGORIES=	math haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Fast, high quality pseudo random number generation in Haskell
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-uvector>=0.1.0.4:${PORTSDIR}/devel/hs-uvector
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-uvector>=0.1.0.4:${PORTSDIR}/devel/hs-uvector
+USE_HACKAGE=	uvector>=0.1.0.4
 
-GHC_VERSION=		6.10.4
-MWCRANDOM_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DATADIR=		${PREFIX}/share/${DISTNAME}
-PORTDATA=	*
-
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-MWCRANDOM_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		MWCRANDOM_VERSION=${MWCRANDOM_VERSION} \
-		MWCRANDOM_LIBDIR_REL=${MWCRANDOM_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	NOPORTDOCS=""
-.else
-PLIST_SUB+=	NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS=	*
-.endif
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
-		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${SETUP_CMD} build \
-		     && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${MWCRANDOM_LIBDIR_REL}/register.sh
-.if !defined(NOPORTDATA)
-	${MKDIR} ${DATADIR} && ${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}
-.endif
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+PORTDATA=		*
+INSTALL_PORTDATA=	${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/math/hs-mwc-random/pkg-plist b/math/hs-mwc-random/pkg-plist
index 7cc8ed45ae35..2d8fb72c4cd9 100644
--- a/math/hs-mwc-random/pkg-plist
+++ b/math/hs-mwc-random/pkg-plist
@@ -1,15 +1,15 @@
 @comment $FreeBSD$
-%%MWCRANDOM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSmwc-random-%%MWCRANDOM_VERSION%%.o
-%%MWCRANDOM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Random/MWC.hi
-%%MWCRANDOM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSmwc-random-%%MWCRANDOM_VERSION%%.a
-%%MWCRANDOM_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Random/MWC.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%MWCRANDOM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Random
-@dirrm %%MWCRANDOM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
-@dirrm %%MWCRANDOM_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%MWCRANDOM_LIBDIR_REL%%
-@exec /bin/sh %D/%%MWCRANDOM_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System/Random
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/System
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister mwc-random
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index d10cc8f4fd02..a4ef5035c025 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -8,78 +8,13 @@
 PORTNAME=	probability
 PORTVERSION=	0.2.2
 CATEGORIES=	math haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Probabilistic Functional Programming in Haskell
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-transformers>=0.0.1:${PORTSDIR}/devel/hs-transformers
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-transformers>=0.0.1:${PORTSDIR}/devel/hs-transformers
+USE_HACKAGE=	transformers>=0.0.1
 
-GHC_VERSION=		6.10.4
-PROBABILITY_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DATADIR=		${PREFIX}/share/${DISTNAME}
 PORTDATA=	*
 
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-PROBABILITY_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		PROBABILITY_VERSION=${PROBABILITY_VERSION} \
-		PROBABILITY_LIBDIR_REL=${PROBABILITY_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	NOPORTDOCS=""
-.else
-PLIST_SUB+=	NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS=	*
-.endif
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal
-.if !defined(NOPORTDATA)
-	cd ${WRKSRC} && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-.else
-	cd ${WRKSRC} && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} \
-	    --datadir='' --datasubdir='' --docdir='${DOCSDIR}'
-.endif
-
-do-build:
-	cd ${WRKSRC} && ${SETUP_CMD} build \
-		     && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PROBABILITY_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/math/hs-probability/pkg-plist b/math/hs-probability/pkg-plist
index 2939a0e0ecac..5d2ccf03d968 100644
--- a/math/hs-probability/pkg-plist
+++ b/math/hs-probability/pkg-plist
@@ -1,42 +1,42 @@
 @comment $FreeBSD$
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSprobability-%%PROBABILITY_VERSION%%.o
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Distribution.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Alarm.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Barber.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Bayesian.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Boys.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Collection.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Diagnosis.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Dice.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/DiceAccum.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/MontyHall.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/NBoys.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Predator.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Profession.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Queuing.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/TreeGrowth.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Expectation.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Monad.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Object.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Percentage.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/PrintList.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Random.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Shape.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Show.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Simulation.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Trace.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Transition.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Visualize.hi
-%%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSprobability-%%PROBABILITY_VERSION%%.a
-%%PROBABILITY_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Distribution.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Alarm.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Barber.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Bayesian.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Boys.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Collection.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Diagnosis.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Dice.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/DiceAccum.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/MontyHall.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/NBoys.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Predator.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Profession.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/Queuing.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example/TreeGrowth.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Expectation.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Monad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Object.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Percentage.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/PrintList.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Random.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Shape.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Show.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Simulation.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Trace.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Transition.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Visualize.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example
-@dirrm %%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability
-@dirrm %%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric
-@dirrm %%PROBABILITY_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%PROBABILITY_LIBDIR_REL%%
-@exec /bin/sh %D/%%PROBABILITY_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability/Example
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric/Probability
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Numeric
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister probability
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index 6da31865a082..190d26982f3b 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -8,82 +8,14 @@
 PORTNAME=	statistics
 PORTVERSION=	0.4.1
 CATEGORIES=	math haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	A Haskell library of statistical types, data, and functions
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-uvector>=0.1.0.4:${PORTSDIR}/devel/hs-uvector \
-		hs-uvector-algorithms>=0.2:${PORTSDIR}/devel/hs-uvector-algorithms \
-		hs-erf>=1.0.0.0:${PORTSDIR}/math/hs-erf \
-		hs-mwc-random>=0.4.1.1:${PORTSDIR}/math/hs-mwc-random
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-uvector>=0.1.0.4:${PORTSDIR}/devel/hs-uvector \
-		hs-uvector-algorithms>=0.2:${PORTSDIR}/devel/hs-uvector-algorithms \
-		hs-erf>=1.0.0.0:${PORTSDIR}/math/hs-erf \
-		hs-mwc-random>=0.4.1.1:${PORTSDIR}/math/hs-mwc-random
+USE_HACKAGE=	erf mwc-random uvector>=0.1.0.4 uvector-algorithms>=0.2
 
-GHC_VERSION=		6.10.4
-STATISTICS_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DATADIR=		${PREFIX}/share/${DISTNAME}
-PORTDATA=	*
-
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-STATISTICS_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		STATISTICS_VERSION=${STATISTICS_VERSION} \
-		STATISTICS_LIBDIR_REL=${STATISTICS_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	NOPORTDOCS=""
-.else
-PLIST_SUB+=	NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS=	*
-.endif
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
-		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${SETUP_CMD} build \
-		     && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${STATISTICS_LIBDIR_REL}/register.sh
-.if !defined(NOPORTDATA)
-	${MKDIR} ${DATADIR} && ${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}
-.endif
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+PORTDATA=		*
+INSTALL_PORTDATA=	${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/math/hs-statistics/pkg-plist b/math/hs-statistics/pkg-plist
index b51d210c0639..eeadf7da9a8b 100644
--- a/math/hs-statistics/pkg-plist
+++ b/math/hs-statistics/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSstatistics-%%STATISTICS_VERSION%%.o
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Autocorrelation.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Constants.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Binomial.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Exponential.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Gamma.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Geometric.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Hypergeometric.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Normal.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Poisson.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Function.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Internal.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/KernelDensity.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Math.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Quantile.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/RandomVariate.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Resampling.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Resampling/Bootstrap.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Sample.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Sample/Powers.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Types.hi
-%%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSstatistics-%%STATISTICS_VERSION%%.a
-%%STATISTICS_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Autocorrelation.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Constants.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Binomial.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Exponential.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Gamma.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Geometric.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Hypergeometric.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Normal.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution/Poisson.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Function.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Internal.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/KernelDensity.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Math.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Quantile.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/RandomVariate.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Resampling.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Resampling/Bootstrap.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Sample.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Sample/Powers.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Types.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Sample
-@dirrm %%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Resampling
-@dirrm %%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution
-@dirrm %%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics
-@dirrm %%STATISTICS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%STATISTICS_LIBDIR_REL%%
-@exec /bin/sh %D/%%STATISTICS_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Sample
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Resampling
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics/Distribution
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Statistics
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister statistics
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 3e4171e5e5d9..659aa63454cf 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -8,70 +8,11 @@
 PORTNAME=	vector-space
 PORTVERSION=	0.5.7
 CATEGORIES=	math haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Vector & affine spaces, linear maps, and derivatives in Haskell
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-MemoTrie>=0.4.2:${PORTSDIR}/devel/hs-MemoTrie
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-MemoTrie>=0.4.2:${PORTSDIR}/devel/hs-MemoTrie
-
-GHC_VERSION=		6.10.4
-VECTORSPACE_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-VECTORSPACE_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		VECTORSPACE_VERSION=${VECTORSPACE_VERSION} \
-		VECTORSPACE_LIBDIR_REL=${VECTORSPACE_LIBDIR_REL}
-
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	NOPORTDOCS=""
-.else
-PLIST_SUB+=	NOPORTDOCS="@comment "
-.endif
-
-.if !defined(NOPORTDOCS)
-
-PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
-.if !empty(PORT_HADDOCK:M?0)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.endif
-BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
-
-HSCOLOUR_VERSION=	1.15
-HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
-
-PORTDOCS=	*
-.endif
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
-		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${SETUP_CMD} build \
-		     && ${SETUP_CMD} register --gen-script
-
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${VECTORSPACE_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+USE_HACKAGE=	MemoTrie>=0.4.2
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/math/hs-vector-space/pkg-plist b/math/hs-vector-space/pkg-plist
index 820165d2e1f6..022de4c9d03e 100644
--- a/math/hs-vector-space/pkg-plist
+++ b/math/hs-vector-space/pkg-plist
@@ -1,21 +1,21 @@
 @comment $FreeBSD$
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/AdditiveGroup.hi
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/AffineSpace.hi
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Basis.hi
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Cross.hi
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Derivative.hi
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/LinearMap.hi
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Maclaurin.hi
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/NumInstances.hi
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/VectorSpace.hi
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSvector-space-%%VECTORSPACE_VERSION%%.o
-%%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSvector-space-%%VECTORSPACE_VERSION%%.a
-%%VECTORSPACE_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/AdditiveGroup.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/AffineSpace.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Basis.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Cross.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Derivative.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/LinearMap.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Maclaurin.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/NumInstances.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/VectorSpace.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%VECTORSPACE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%VECTORSPACE_LIBDIR_REL%%
-@exec /bin/sh %D/%%VECTORSPACE_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%LIBDIR_REL%%
+@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister vector-space
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old