2 files changed, 12 insertions, 71 deletions

diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index 5f43a58e30e6..428e53d92a5a 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -8,71 +8,12 @@
 PORTNAME=	url
 PORTVERSION=	2.1
 CATEGORIES=	www haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	A Haskell library for working with URLs
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-utf8-string-ghc>=0.3.4:${PORTSDIR}/devel/hs-utf8-string-ghc
-
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-utf8-string-ghc>=0.3.4:${PORTSDIR}/devel/hs-utf8-string-ghc
-
-GHC_VERSION=	6.10.4
-HSURL_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-HSURL_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		HSURL_VERSION=${HSURL_VERSION} \
-		HSURL_LIBDIR_REL=${HSURL_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}/${HSURL_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+CABAL_SETUP=	Setup.hs
+USE_HACKAGE=	utf8-string>=0.3.4
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/www/hs-url/pkg-plist b/www/hs-url/pkg-plist
index a0b02ef6d782..3c88b703fa94 100644
--- a/www/hs-url/pkg-plist
+++ b/www/hs-url/pkg-plist
@@ -1,14 +1,14 @@
 @comment $FreeBSD$
-%%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSurl-%%HSURL_VERSION%%.o
-%%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/URL.hi
-%%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSurl-%%HSURL_VERSION%%.a
-%%HSURL_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/URL.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
-@dirrm %%HSURL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%HSURL_LIBDIR_REL%%
-@exec /bin/sh %D/%%HSURL_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
+@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 url
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old