2 files changed, 39 insertions, 110 deletions

diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index f162ee938f4b..19f45b47e07c 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -8,89 +8,18 @@
 PORTNAME=	hint
 PORTVERSION=	0.3.2.1
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Runtime Haskell interpreter (GHC API wrapper)
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths \
-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
-		hs-MonadCatchIO-mtl>=0.2:${PORTSDIR}/devel/hs-MonadCatchIO-mtl \
-		hs-ghc-mtl>=1.0.1.0:${PORTSDIR}/devel/hs-ghc-mtl
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths \
-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
-		hs-MonadCatchIO-mtl>=0.2:${PORTSDIR}/devel/hs-MonadCatchIO-mtl \
-		hs-ghc-mtl>=1.0.1.0:${PORTSDIR}/devel/hs-ghc-mtl
+USE_HACKAGE=	ghc-mtl>=1.0.1.0 ghc-paths MonadCatchIO-mtl>=0.2 utf8-string
 
-GHC_VERSION=	6.10.4
-HINT_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-EXAMPLESDIR=		${PREFIX}/share/examples/${DISTNAME}
-PORTEXAMPLES=	*
-
-DATADIR=		${PREFIX}/share/${DISTNAME}
-PORTDATA=	*
-
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-HINT_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		HINT_VERSION=${HINT_VERSION} \
-		HINT_LIBDIR_REL=${HINT_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}/${HINT_LIBDIR_REL}/register.sh
-.if !defined(NOPORTDATA)
-	@${MKDIR} ${DATADIR} && ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DATADIR} \
-			     && ${INSTALL_DATA} ${WRKSRC}/Changes ${DATADIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR} && cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
-.endif
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+PORTEXAMPLES=		*
+INSTALL_PORTEXAMPLES=	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
+	
+PORTDATA=		*
+INSTALL_PORTDATA=	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DATADIR} \
+			  && ${INSTALL_DATA} ${WRKSRC}/Changes ${DATADIR}
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-hint/pkg-plist b/devel/hs-hint/pkg-plist
index 3c524569ddb6..5ece040f43c9 100644
--- a/devel/hs-hint/pkg-plist
+++ b/devel/hs-hint/pkg-plist
@@ -1,36 +1,36 @@
 @comment $FreeBSD$
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShint-%%HINT_VERSION%%.o
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Base.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Compat.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Configuration.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Context.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Conversions.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Eval.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Extension.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/GHC.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/InterpreterT.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Parsers.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Reflection.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Sandbox.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Typecheck.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Util.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/Extension.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/GHC.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/GHC/Unsafe.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/Unsafe.hi
-%%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShint-%%HINT_VERSION%%.a
-%%HINT_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Base.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Compat.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Configuration.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Context.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Conversions.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Eval.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Extension.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/GHC.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/InterpreterT.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Parsers.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Reflection.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Sandbox.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Typecheck.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint/Util.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/Extension.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/GHC.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/GHC/Unsafe.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/Unsafe.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/GHC
-@dirrm %%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter
-@dirrm %%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
-@dirrm %%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
-@dirrm %%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint
-@dirrm %%HINT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%HINT_LIBDIR_REL%%
-@exec /bin/sh %D/%%HINT_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter/GHC
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/Interpreter
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Hint
+@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 hint
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old