Update to X11-1.9.1

No changelogs are provided by the upstream.

4 files changed, 15 insertions, 139 deletions

diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 4670562c385..2b0fa2be15b 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2016/01/04 12:24:25 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.5 2020/01/02 16:48:30 pho Exp $
 
-DISTNAME=	X11-1.6.1.2
-PKGREVISION=	3
+DISTNAME=	X11-1.9.1
 CATEGORIES=	x11 graphics
 
 MAINTAINER=	esg@sdf.lonestar.org
 COMMENT=	Haskell binding to the X11 graphics library
 LICENSE=	modified-bsd
 
+# Work around a Cabal bug. It ignores "ld-options" in X11.buildinfo
+# while linking shared libraries:
+# https://github.com/haskell/cabal/issues/4925
+HASKELL_ENABLE_SHARED_LIBRARY= no
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
diff --git a/x11/hs-X11/PLIST b/x11/hs-X11/PLIST
deleted file mode 100644
index 86caef6036a..00000000000
--- a/x11/hs-X11/PLIST
+++ /dev/null
@@ -1,128 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/21 20:55:51 szptvlfn Exp $
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/ExtraTypes.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/ExtraTypes/AP.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/ExtraTypes/DEC.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/ExtraTypes/HP.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/ExtraTypes/Sun.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/ExtraTypes/XF86.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/ExtraTypes/XorgDefault.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Types.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/XScreenSaver.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xinerama.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Atom.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Color.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Context.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Cursor.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Display.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Event.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Extras.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Font.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Image.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Internal.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Misc.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Region.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Screen.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Types.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xlib/Window.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xrandr.hi
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/HSX11-${PKGVERSION}.o
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/include/HsAllKeysyms.h
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/include/HsXlib.h
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/include/XlibExtras.h
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/libHSX11-${PKGVERSION}.a
-lib/X11-${PKGVERSION}/${HASKELL_VERSION}/package-description
-share/doc/X11-${PKGVERSION}/LICENSE
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-ExtraTypes-AP.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-ExtraTypes-DEC.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-ExtraTypes-HP.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-ExtraTypes-Sun.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-ExtraTypes-XF86.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-ExtraTypes-XorgDefault.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-ExtraTypes.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Types.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-XScreenSaver.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xinerama.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Atom.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Color.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Context.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Cursor.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Display.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Event.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Extras.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Font.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Image.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Misc.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Region.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Screen.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Types.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib-Window.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xlib.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11-Xrandr.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/Graphics-X11.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/X11.haddock
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-95.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-A.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-All.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-B.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-C.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-D.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-E.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-F.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-G.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-H.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-I.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-J.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-K.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-L.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-M.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-N.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-O.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-P.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-Q.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-R.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-S.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-T.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-U.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-V.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-W.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-X.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index-Z.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/frames.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/haddock-util.js
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/hslogo-16.png
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/index-frames.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/index.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-ExtraTypes-AP.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-ExtraTypes-DEC.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-ExtraTypes-HP.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-ExtraTypes-Sun.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-ExtraTypes-XF86.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-ExtraTypes-XorgDefault.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-ExtraTypes.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Types.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-XScreenSaver.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xinerama.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Atom.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Color.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Context.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Cursor.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Display.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Event.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Extras.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Font.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Image.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Misc.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Region.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Screen.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Types.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib-Window.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xlib.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11-Xrandr.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/mini_Graphics-X11.html
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/minus.gif
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/ocean.css
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/plus.gif
-${PLIST.doc}share/doc/X11-${PKGVERSION}/html/synopsis.png
diff --git a/x11/hs-X11/buildlink3.mk b/x11/hs-X11/buildlink3.mk
index 468775462ff..e64025f0ebe 100644
--- a/x11/hs-X11/buildlink3.mk
+++ b/x11/hs-X11/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2016/01/04 12:24:25 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/01/02 16:48:30 pho Exp $
 
 BUILDLINK_TREE+=	hs-X11
 
 .if !defined(HS_X11_BUILDLINK3_MK)
 HS_X11_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-X11+=	hs-X11>=1.6.1
-BUILDLINK_ABI_DEPENDS.hs-X11+=	hs-X11>=1.6.1.2nb3
+BUILDLINK_API_DEPENDS.hs-X11+=	hs-X11>=1.9.1
+BUILDLINK_ABI_DEPENDS.hs-X11+=	hs-X11>=1.9.1
 BUILDLINK_PKGSRCDIR.hs-X11?=	../../x11/hs-X11
 
 .include "../../devel/hs-data-default/buildlink3.mk"
diff --git a/x11/hs-X11/distinfo b/x11/hs-X11/distinfo
index 4ad5f2879df..7150cd4659d 100644
--- a/x11/hs-X11/distinfo
+++ b/x11/hs-X11/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 03:28:33 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/01/02 16:48:30 pho Exp $
 
-SHA1 (X11-1.6.1.2.tar.gz) = a20014d9d7f21ce08cb0d957f6054e3763fdafc9
-RMD160 (X11-1.6.1.2.tar.gz) = bd4f2654e56653aed8c074f7c76d354c2671fa14
-SHA512 (X11-1.6.1.2.tar.gz) = f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b
-Size (X11-1.6.1.2.tar.gz) = 188612 bytes
+SHA1 (X11-1.9.1.tar.gz) = 1df01b08c55a3cb697eec03002eaa59a8fdea92c
+RMD160 (X11-1.9.1.tar.gz) = 37bc99faaae7a1f5d2acfa55125eea4a613ed40a
+SHA512 (X11-1.9.1.tar.gz) = 6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7
+Size (X11-1.9.1.tar.gz) = 190698 bytes