2 files changed, 45 insertions, 107 deletions

diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index cc749120cfca..56dacff9c3d2 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -8,89 +8,27 @@ PORTNAME=	x11
 PORTVERSION=	1.5.0.0
 PORTREVISION=	1
 CATEGORIES=	x11 haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 PKGNAMESUFFIX=	-ghc
-DISTNAME=	X11-${PORTVERSION}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	X11 bindings for Haskell programs
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-
+CABAL_SETUP=	Setup.hs
 USE_XORG=	x11 xext sm
 
-GHC_VERSION=	6.10.4
-HSX11_VERSION=	${PORTVERSION}
-
-GHC_CMD=	${LOCALBASE}/bin/ghc
-SETUP_CMD=	./setup
-
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-HSX11_LIBDIR_REL=	lib/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		HSX11_VERSION=${HSX11_VERSION} \
-		HSX11_LIBDIR_REL=${HSX11_LIBDIR_REL}
+MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
+DISTNAME=	X11-${PORTVERSION}
 
 OPTIONS=	XINERAMA "Build with Xinerama support" off
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_XINERAMA)
-USE_XORG+=	xinerama
+USE_XORG+=		xinerama
 CONFIGURE_ARGS+=	--configure-option=--with-xinerama
 .else
 CONFIGURE_ARGS+=	--configure-option=--without-xinerama
 .endif
 
-.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:
-
-post-patch:
-	@${REINPLACE_CMD} 's|/usr/local/include|${LOCALBASE}/include|g' \
-		${WRKSRC}/configure
-
-do-configure:
-	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
-		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} \
-			 ${CONFIGURE_ARGS}
-
-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}/${HSX11_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.post.mk>
diff --git a/x11/hs-X11/pkg-plist b/x11/hs-X11/pkg-plist
index 912608805b8a..c1867ac3519b 100644
--- a/x11/hs-X11/pkg-plist
+++ b/x11/hs-X11/pkg-plist
@@ -1,45 +1,45 @@
 @comment $FreeBSD$
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/AP.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/DEC.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/HP.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/Sun.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XF86.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XorgDefault.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Types.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xinerama.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Atom.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Color.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Context.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Cursor.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Display.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Event.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Extras.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Font.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Image.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Misc.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Region.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Screen.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Types.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Window.hi
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-%%HSX11_VERSION%%.o
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsAllKeysyms.h
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsXlib.h
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/XlibExtras.h
-%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-%%HSX11_VERSION%%.a
-%%HSX11_LIBDIR_REL%%/register.sh
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/AP.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/DEC.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/HP.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/Sun.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XF86.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XorgDefault.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Types.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xinerama.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Atom.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Color.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Context.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Cursor.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Display.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Event.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Extras.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Font.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Image.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Misc.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Region.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Screen.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Types.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Window.hi
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-%%PORTVERSION%%.o
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsAllKeysyms.h
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsXlib.h
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/XlibExtras.h
+%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-%%PORTVERSION%%.a
+%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
-@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib
-@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes
-@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
-@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
-@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%HSX11_LIBDIR_REL%%
-@exec /bin/sh %D/%%HSX11_LIBDIR_REL%%/register.sh
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
+@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
+@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 X11
+@unexec %D/bin/ghc-pkg unregister X11-%%PORTVERSION%%
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old