3 files changed, 18 insertions, 89 deletions

diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 6b2a9f2b714d..1891dca1c6ac 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -9,86 +9,17 @@ PORTNAME=	mueval
 PORTVERSION=	0.7.1
 PORTREVISION=	1
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Safely evaluate Haskell expressions
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
-		hs-show>=0.3:${PORTSDIR}/devel/hs-show \
-		hs-hint>=0.3.1:${PORTSDIR}/devel/hs-hint
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
-		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
-		hs-show>=0.3:${PORTSDIR}/devel/hs-show \
-		hs-hint>=0.3.1:${PORTSDIR}/devel/hs-hint
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
+CABAL_SETUP=	Setup.hs
+USE_HACKAGE=	hint>=0.3.1 show>=0.3 utf8-string
 
-GHC_VERSION=	6.10.4
-MUEVAL_VERSION=	${PORTVERSION}
+EXECUTABLE=	mueval mueval-core
 
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DATADIR=		${PREFIX}/share/${DISTNAME}
 PORTDATA=	*
+SHOW_PKGMSG=	yes
 
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-MUEVAL_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		MUEVAL_VERSION=${MUEVAL_VERSION} \
-		MUEVAL_LIBDIR_REL=${MUEVAL_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 --executables --hyperlink-source \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${MUEVAL_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-	${ECHO_MSG} -e "\a"
-	${CAT} "${PKGMESSAGE}"
-	${ECHO_MSG} ""
-
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-mueval/pkg-message b/devel/hs-mueval/pkg-message
index 6fbb11db5505..29860ec7ca18 100644
--- a/devel/hs-mueval/pkg-message
+++ b/devel/hs-mueval/pkg-message
@@ -1,8 +1,6 @@
-=======================================================================
  WARNING: If you installed devel/hs-transformers, then before starting
           "mueval" you have to:
 
              - hide it with the command: 'ghc-pkg hide transformers'
           or
              - pass to "mueval" the option: '-n transformers'.
-=======================================================================
diff --git a/devel/hs-mueval/pkg-plist b/devel/hs-mueval/pkg-plist
index 3aaf55a1a25a..0a41778dc54c 100644
--- a/devel/hs-mueval/pkg-plist
+++ b/devel/hs-mueval/pkg-plist
@@ -1,20 +1,20 @@
 @comment $FreeBSD$
 bin/mueval
 bin/mueval-core
-%%MUEVAL_LIBDIR_REL%%/ghc-6.10.4/HSmueval-%%MUEVAL_VERSION%%.o
-%%MUEVAL_LIBDIR_REL%%/ghc-6.10.4/Mueval/ArgsParse.hi
-%%MUEVAL_LIBDIR_REL%%/ghc-6.10.4/Mueval/Context.hi
-%%MUEVAL_LIBDIR_REL%%/ghc-6.10.4/Mueval/Interpreter.hi
-%%MUEVAL_LIBDIR_REL%%/ghc-6.10.4/Mueval/Parallel.hi
-%%MUEVAL_LIBDIR_REL%%/ghc-6.10.4/Mueval/Resources.hi
-%%MUEVAL_LIBDIR_REL%%/ghc-6.10.4/libHSmueval-%%MUEVAL_VERSION%%.a
-%%MUEVAL_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/ArgsParse.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Context.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Interpreter.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Parallel.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Resources.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%MUEVAL_LIBDIR_REL%%/ghc-6.10.4/Mueval
-@dirrm %%MUEVAL_LIBDIR_REL%%/ghc-6.10.4
-@dirrm %%MUEVAL_LIBDIR_REL%%
-@exec /bin/sh %D/%%MUEVAL_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval
+@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 mueval
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old