2 files changed, 10 insertions, 70 deletions

diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index 7fd2dec97ba5..d92ffc1264e7 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -8,69 +8,9 @@ PORTNAME=	dlist
 PORTVERSION=	0.5
 PORTREVISION=	1
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ \
-		http://carte.kerneled.org/mirror/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A list-like type supporting O(1) append for Haskell
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-
-GHC_VERSION=	6.10.4
-DLIST_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-DLIST_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		DLIST_VERSION=${DLIST_VERSION} \
-		DLIST_LIBDIR_REL=${DLIST_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}/${DLIST_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/devel/hs-dlist/pkg-plist b/devel/hs-dlist/pkg-plist
index 53c530aa32cd..75122018eab7 100644
--- a/devel/hs-dlist/pkg-plist
+++ b/devel/hs-dlist/pkg-plist
@@ -1,14 +1,14 @@
 @comment $FreeBSD$
-%%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/DList.hi
-%%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSdlist-%%DLIST_VERSION%%.o
-%%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSdlist-%%DLIST_VERSION%%.a
-%%DLIST_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/DList.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 %%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data
-@dirrm %%DLIST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%DLIST_LIBDIR_REL%%
-@exec /bin/sh %D/%%DLIST_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 dlist
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old