2 files changed, 36 insertions, 94 deletions

diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index c097b2aea99e..3eba31ceb14a 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -8,71 +8,13 @@
 PORTNAME=	haskell-src-exts
 PORTVERSION=	1.5.3
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Manipulating Haskell source
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-happy>=1.17:${PORTSDIR}/devel/hs-happy \
-		hs-cpphs>=1.3:${PORTSDIR}/devel/hs-cpphs
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-cpphs>=1.3:${PORTSDIR}/devel/hs-cpphs
-
-GHC_VERSION=	6.10.4
-HASKELLSRCEXTS_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-HASKELLSRCEXTS_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		HASKELLSRCEXTS_VERSION=${HASKELLSRCEXTS_VERSION} \
-		HASKELLSRCEXTS_LIBDIR_REL=${HASKELLSRCEXTS_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}/${HASKELLSRCEXTS_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+CABAL_SETUP=	Setup.hs
+USE_HAPPY=	yes
+USE_HACKAGE=	cpphs>=1.3
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-haskell-src-exts/pkg-plist b/devel/hs-haskell-src-exts/pkg-plist
index c85f12cadb7c..8e4fa943a64b 100644
--- a/devel/hs-haskell-src-exts/pkg-plist
+++ b/devel/hs-haskell-src-exts/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShaskell-src-exts-%%HASKELLSRCEXTS_VERSION%%.o
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Build.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/ExactPrint.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Fixity.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Simplify.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Syntax.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Build.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Comments.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ExtScheme.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Extension.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Fixity.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/InternalParser.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Lexer.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ParseMonad.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ParseSyntax.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ParseUtils.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Parser.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Pretty.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/SrcLoc.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Syntax.hi
-%%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShaskell-src-exts-%%HASKELLSRCEXTS_VERSION%%.a
-%%HASKELLSRCEXTS_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Build.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/ExactPrint.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Fixity.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Simplify.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated/Syntax.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Build.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Comments.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ExtScheme.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Extension.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Fixity.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/InternalParser.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Lexer.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ParseMonad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ParseSyntax.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/ParseUtils.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Parser.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Pretty.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/SrcLoc.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Syntax.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated
-@dirrm %%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts
-@dirrm %%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
-@dirrm %%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
-@dirrm %%HASKELLSRCEXTS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%HASKELLSRCEXTS_LIBDIR_REL%%
-@exec /bin/sh %D/%%HASKELLSRCEXTS_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts/Annotated
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Exts
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
+@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 haskell-src-exts
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old