2 files changed, 59 insertions, 125 deletions

diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile
index 5544cfabd58f..bab8f9f710f5 100644
--- a/science/hs-bio/Makefile
+++ b/science/hs-bio/Makefile
@@ -8,80 +8,14 @@
 PORTNAME=	bio
 PORTVERSION=	0.4
 CATEGORIES=	science haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	A Haskell bioinformatics library
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-tagsoup>=0.4:${PORTSDIR}/textproc/hs-tagsoup \
-		hs-binary-ghc>=0.5.0.2:${PORTSDIR}/devel/hs-binary-ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-tagsoup>=0.4:${PORTSDIR}/textproc/hs-tagsoup \
-		hs-binary-ghc>=0.5.0.2:${PORTSDIR}/devel/hs-binary-ghc
+CABAL_SETUP=	Setup.hs
+USE_HACKAGE=	binary tagsoup>=0.4
 
-GHC_VERSION=	6.10.4
-BIO_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DATADIR=	${PREFIX}/share/${DISTNAME}
 PORTDATA=	*
 
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-BIO_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		BIO_VERSION=${BIO_VERSION} \
-		BIO_LIBDIR_REL=${BIO_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 \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${BIO_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/science/hs-bio/pkg-plist b/science/hs-bio/pkg-plist
index 135a5026dde4..3e810e6286e0 100644
--- a/science/hs-bio/pkg-plist
+++ b/science/hs-bio/pkg-plist
@@ -1,61 +1,61 @@
 @comment $FreeBSD$
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/AAlign.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/ACE.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/AlignData.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Blast.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/BlastData.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/BlastFlat.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/BlastXML.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Bowtie.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Matrices.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Multiple.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/QAlign.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/SAlign.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Soap.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Clustering.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/Escape.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/Feature.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/FeatureHier.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/FeatureHierSequences.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/SGD.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/ContigLocation.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/LocMap.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/Location.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/OnSeq.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/Position.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/SeqLocMap.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/SeqLocation.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/Strand.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/Entropy.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/FastQ.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/Fasta.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/GOA.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/GeneOntology.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/HashWord.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/KEGG.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/Phd.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/SFF.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/SFF_name.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/SeqData.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/TwoBit.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Util.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Util/Parsex.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Util/TestBase.hi
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSbio-%%BIO_VERSION%%.o
-%%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSbio-%%BIO_VERSION%%.a
-%%BIO_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/AAlign.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/ACE.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/AlignData.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Blast.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/BlastData.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/BlastFlat.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/BlastXML.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Bowtie.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Matrices.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Multiple.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/QAlign.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/SAlign.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment/Soap.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Clustering.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/Escape.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/Feature.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/FeatureHier.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/FeatureHierSequences.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3/SGD.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/ContigLocation.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/LocMap.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/Location.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/OnSeq.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/Position.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/SeqLocMap.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/SeqLocation.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location/Strand.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/Entropy.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/FastQ.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/Fasta.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/GOA.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/GeneOntology.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/HashWord.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/KEGG.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/Phd.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/SFF.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/SFF_name.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/SeqData.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence/TwoBit.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Util.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Util/Parsex.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Util/TestBase.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 %%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Util
-@dirrm %%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence
-@dirrm %%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location
-@dirrm %%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3
-@dirrm %%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment
-@dirrm %%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio
-@dirrm %%BIO_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%BIO_LIBDIR_REL%%
-@exec /bin/sh %D/%%BIO_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Util
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Sequence
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Location
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/GFF3
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio/Alignment
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Bio
+@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 bio
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old