2 files changed, 29 insertions, 97 deletions

diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 48b2d0a890ba..2bc4b0eb868b 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -8,88 +8,20 @@
 PORTNAME=	criterion
 PORTVERSION=	0.4.1.0
 CATEGORIES=	benchmarks haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Robust, reliable performance measurement and analysis for Haskell
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-deepseq>=1.1.0.0:${PORTSDIR}/devel/hs-deepseq \
-		hs-statistics>=0.3.5:${PORTSDIR}/math/hs-statistics \
-		hs-uvector>=0.1.0.5:${PORTSDIR}/devel/hs-uvector \
-		hs-uvector-algorithms>=0.2:${PORTSDIR}/devel/hs-uvector-algorithms
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-deepseq>=1.1.0.0:${PORTSDIR}/devel/hs-deepseq \
-		hs-statistics>=0.3.5:${PORTSDIR}/math/hs-statistics \
-		hs-uvector>=0.1.0.5:${PORTSDIR}/devel/hs-uvector \
-		hs-uvector-algorithms>=0.2:${PORTSDIR}/devel/hs-uvector-algorithms
+CABAL_SETUP=	Setup.hs
+USE_HACKAGE=	deepseq>=1.1.0.0 statistics>=0.3.5 uvector>=0.1.0.5 \
+		uvector-algorithms>=0.2
 
-GHC_VERSION=		6.10.4
-CRITERION_VERSION=	${PORTVERSION}
+PORTEXAMPLES=		*
+INSTALL_PORTEXAMPLES=	\
+	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
+PORTDATA=		*
+INSTALL_PORTDATA= 	${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}
 
-EXAMPLESDIR=	${PREFIX}/share/examples/${DISTNAME}
-PORTEXAMPLES=	*
-
-DATADIR=	${PREFIX}/share/${DISTNAME}
-PORTDATA=	*
-
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-CRITERION_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		CRITERION_VERSION=${CRITERION_VERSION} \
-		CRITERION_LIBDIR_REL=${CRITERION_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}/${CRITERION_LIBDIR_REL}/register.sh
-.if !defined(NOPORTDATA)
-	${MKDIR} ${DATADIR} && ${INSTALL_DATA} ${WRKSRC}/README ${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
-
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
\ No newline at end of file
diff --git a/benchmarks/hs-criterion/pkg-plist b/benchmarks/hs-criterion/pkg-plist
index da96dde591c5..5c13f5b4bb36 100644
--- a/benchmarks/hs-criterion/pkg-plist
+++ b/benchmarks/hs-criterion/pkg-plist
@@ -1,24 +1,24 @@
 @comment $FreeBSD$
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Analysis.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Config.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Environment.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/IO.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Main.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Measurement.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Monad.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/MultiMap.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Plot.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Types.hi
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HScriterion-%%CRITERION_VERSION%%.o
-%%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHScriterion-%%CRITERION_VERSION%%.a
-%%CRITERION_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Analysis.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Config.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Environment.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/IO.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Main.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Measurement.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Monad.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/MultiMap.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Plot.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Types.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 %%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion
-@dirrm %%CRITERION_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%CRITERION_LIBDIR_REL%%
-@exec /bin/sh %D/%%CRITERION_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion
+@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 criterion
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old