- Update to 1.4.5

- Add optional support for Xinerama
- Fix PORTDOCS

Approved by:	tabthorpe

3 files changed, 26 insertions, 34 deletions

diff --git a/x11/hs-x11-ghc/Makefile b/x11/hs-x11-ghc/Makefile
index 8cde9de08f70..60085657bcd1 100644
--- a/x11/hs-x11-ghc/Makefile
+++ b/x11/hs-x11-ghc/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	x11
-PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTVERSION=	1.4.5
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -25,6 +24,8 @@ PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
 		PORTNAME=${PORTNAME} \
 		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
 
+OPTIONS=	XINERAMA "Build with Xinerama support" off
+
 .include <bsd.port.pre.mk>
 
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
@@ -33,14 +34,22 @@ RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
 USE_XORG=	x11 xext sm
 
+.if defined(WITH_XINERAMA)
+USE_XORG+=	xinerama
+.endif
+
 # 'owned' by lang/ghc:
 CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
 DOCSDIR=	${PREFIX}/share/doc/X11-${PORTVERSION}
+PORTDOCS=	LICENSE html
 SUBDIR=		${PORTNAME}${PKGNAMESUFFIX}
 
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+PLIST_SUB+=	RMLIC="@comment "
+.else
+PLIST_SUB+=	RMLIC=""
 .endif
 
 do-configure:
diff --git a/x11/hs-x11-ghc/distinfo b/x11/hs-x11-ghc/distinfo
index 733af2e2b122..1470f6d0b719 100644
--- a/x11/hs-x11-ghc/distinfo
+++ b/x11/hs-x11-ghc/distinfo
@@ -1,3 +1,3 @@
-MD5 (X11-1.4.1.tar.gz) = 59735171e7ea270e64afe69f782abc1f
-SHA256 (X11-1.4.1.tar.gz) = e51038541415686f0e278ccdbc0b2373cd11f212de99023b7b8f8e776aa09f79
-SIZE (X11-1.4.1.tar.gz) = 88934
+MD5 (X11-1.4.5.tar.gz) = 73a4ba56b8cef69ce3659ab452e4530b
+SHA256 (X11-1.4.5.tar.gz) = 6665056b9fe5801ca27bf960a90215c940ae70b549753efed0303d5ed8d89ddb
+SIZE (X11-1.4.5.tar.gz) = 174412
diff --git a/x11/hs-x11-ghc/pkg-plist b/x11/hs-x11-ghc/pkg-plist
index b0679cfa666b..1a35c3b3b685 100644
--- a/x11/hs-x11-ghc/pkg-plist
+++ b/x11/hs-x11-ghc/pkg-plist
@@ -1,4 +1,11 @@
 %%SUBDIR%%/Graphics/X11.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/AP.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/DEC.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/HP.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/Sun.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/XF86.hi
+%%SUBDIR%%/Graphics/X11/ExtraTypes/XorgDefault.hi
 %%SUBDIR%%/Graphics/X11/Types.hi
 %%SUBDIR%%/Graphics/X11/Xinerama.hi
 %%SUBDIR%%/Graphics/X11/Xlib.hi
@@ -16,43 +23,19 @@
 %%SUBDIR%%/Graphics/X11/Xlib/Types.hi
 %%SUBDIR%%/Graphics/X11/Xlib/Window.hi
 %%SUBDIR%%/HSX11-%%PORTVERSION%%.o
+%%SUBDIR%%/include/HsAllKeysyms.h
 %%SUBDIR%%/include/HsXlib.h
 %%SUBDIR%%/include/XlibExtras.h
 %%SUBDIR%%/libHSX11-%%PORTVERSION%%.a
 %%SUBDIR%%/%%PORTNAME%%-register.sh
-%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Types.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xinerama.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Atom.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Color.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Context.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Display.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Event.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Extras.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Font.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Image.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Misc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Region.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Screen.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Types.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Window.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/X11.haddock
-%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
+%%RMLIC%%%%DOCSDIR%%/LICENSE
+%%RMLIC%%@dirrm %%DOCSDIR%%
 @dirrmtry %%SUBDIR%%/include
+@dirrm %%SUBDIR%%/Graphics/X11/ExtraTypes
 @dirrm %%SUBDIR%%/Graphics/X11/Xlib
 @dirrm %%SUBDIR%%/Graphics/X11
 @dirrmtry %%SUBDIR%%/Graphics
 @exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister X11
+@unexec ghc-pkg unregister X11
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old