4 files changed, 32 insertions, 144 deletions

diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index 84f6ff7834bd..771295fafc8f 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -8,71 +8,15 @@ PORTNAME=	porte
 PORTVERSION=	0.0.3
 PORTREVISION=	4
 CATEGORIES=	ports-mgmt haskell
-MASTER_SITES=	http://carte.repnop.org/releases/
+PKGNAMEPREFIX=
 
 MAINTAINER=	sbahra@kerneled.org
 COMMENT=	FreeBSD ports index search and statistical analysis tool
 
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-		hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-		hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
+CABAL_SETUP=	Setup.hs
+USE_HACKAGE=	stringsearch
 
-GHC_VERSION=	6.10.4
-PORTE_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DATADIR=	${PREFIX}/share/${DISTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-PORTE_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		PORTE_VERSION=${PORTE_VERSION} \
-		PORTE_LIBDIR_REL=${PORTE_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 --executables \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PORTE_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+EXECUTABLE=	porte
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/ports-mgmt/hs-porte/pkg-plist b/ports-mgmt/hs-porte/pkg-plist
index f66d5c9d185f..97b48bca44b0 100644
--- a/ports-mgmt/hs-porte/pkg-plist
+++ b/ports-mgmt/hs-porte/pkg-plist
@@ -1,17 +1,17 @@
 @comment $FreeBSD$
 bin/porte
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTE_VERSION%%.o
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTE_VERSION%%.a
-%%PORTE_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte
-@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%PORTE_LIBDIR_REL%%
-@exec /bin/sh %D/%%PORTE_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte
+@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 porte
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/ports-mgmt/porte/Makefile b/ports-mgmt/porte/Makefile
index 84f6ff7834bd..771295fafc8f 100644
--- a/ports-mgmt/porte/Makefile
+++ b/ports-mgmt/porte/Makefile
@@ -8,71 +8,15 @@ PORTNAME=	porte
 PORTVERSION=	0.0.3
 PORTREVISION=	4
 CATEGORIES=	ports-mgmt haskell
-MASTER_SITES=	http://carte.repnop.org/releases/
+PKGNAMEPREFIX=
 
 MAINTAINER=	sbahra@kerneled.org
 COMMENT=	FreeBSD ports index search and statistical analysis tool
 
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-		hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-		hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
+CABAL_SETUP=	Setup.hs
+USE_HACKAGE=	stringsearch
 
-GHC_VERSION=	6.10.4
-PORTE_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DATADIR=	${PREFIX}/share/${DISTNAME}
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-PORTE_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		PORTE_VERSION=${PORTE_VERSION} \
-		PORTE_LIBDIR_REL=${PORTE_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 --executables \
-					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${SETUP_CMD} install \
-		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PORTE_LIBDIR_REL}/register.sh
-
-post-install:
-	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+EXECUTABLE=	porte
 
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/ports-mgmt/porte/pkg-plist b/ports-mgmt/porte/pkg-plist
index f66d5c9d185f..97b48bca44b0 100644
--- a/ports-mgmt/porte/pkg-plist
+++ b/ports-mgmt/porte/pkg-plist
@@ -1,17 +1,17 @@
 @comment $FreeBSD$
 bin/porte
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTE_VERSION%%.o
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi
-%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTE_VERSION%%.a
-%%PORTE_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte
-@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%PORTE_LIBDIR_REL%%
-@exec /bin/sh %D/%%PORTE_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte
+@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 porte
+@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old