2 files changed, 14 insertions, 47 deletions

diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 93dc86eac76b..cc837e0253fb 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -6,50 +6,17 @@
 
 PORTNAME=	ghc-paths
 PORTVERSION=	0.1.0.5
+PORTREVISION=	1
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Utility looking for GHC installation directories
 
-.if !defined(SLAVE)
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
-.else
-NO_PKG_REGISTER=
-.endif
-
-GHC_VERSION=		6.10.4
-GHC-PATHS_VERSION=	${PORTVERSION}
-
-CABAL_CMD=	runghc Setup.hs
-
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-GHC-PATHS_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		GHC-PATHS_VERSION=${GHC-PATHS_VERSION} \
-		GHC-PATHS_LIBDIR_REL=${GHC-PATHS_LIBDIR_REL}
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
-
-do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} build
-.if !defined(SLAVE)
-	cd ${WRKSRC} && ${CABAL_CMD} register --gen-script
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${CABAL_CMD} install
+CABAL_SETUP=	Setup.hs
 
-post-install:
-.if !defined(SLAVE)
-	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${GHC-PATHS_LIBDIR_REL}/register.sh
+.if defined(SLAVE)
+GHC_CMD=	ghc
 .endif
-	${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-ghc-paths/pkg-plist b/devel/hs-ghc-paths/pkg-plist
index 7068c570320c..74d42dd9d1ab 100644
--- a/devel/hs-ghc-paths/pkg-plist
+++ b/devel/hs-ghc-paths/pkg-plist
@@ -1,14 +1,14 @@
 @comment $FreeBSD$
-%%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/GHC/Paths.hi
-%%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSghc-paths-%%GHC-PATHS_VERSION%%.o
-%%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSghc-paths-%%GHC-PATHS_VERSION%%.a
-%%GHC-PATHS_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/GHC/Paths.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%DOCSDIR%%/LICENSE
 @dirrmtry %%DOCSDIR%%
-@dirrm %%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/GHC
-@dirrm %%GHC-PATHS_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%GHC-PATHS_LIBDIR_REL%%
-@exec /bin/sh %D/%%GHC-PATHS_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/GHC
+@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 ghc-paths
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old