diff --git a/wm/xmonad/Makefile b/wm/xmonad/Makefile index 89130f60eed8..68d04da61864 100644 --- a/wm/xmonad/Makefile +++ b/wm/xmonad/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2019/11/04 21:50:16 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2020/01/02 17:11:37 pho Exp $ -DISTNAME= xmonad-0.12 +DISTNAME= xmonad-0.14 PKGNAME= ${DISTNAME} CATEGORIES= wm @@ -19,6 +19,11 @@ SUBST_STAGE.2= pre-configure SUBST_FILES.2= xmonad.cabal SUBST_FILTER_CMD.2= ${TR} '+' \\n +# Work around a Cabal bug. It ignores "ld-options" in +# {package}.buildinfo while linking shared libraries: +# https://github.com/haskell/cabal/issues/4925 +HASKELL_ENABLE_SHARED_LIBRARY= no + INSTALLATION_DIRS+= ${PKGMANDIR}/man1 post-install: @@ -27,6 +32,7 @@ post-install: .include "../../devel/hs-data-default/buildlink3.mk" .include "../../devel/hs-extensible-exceptions/buildlink3.mk" .include "../../devel/hs-mtl/buildlink3.mk" +.include "../../math/hs-semigroups/buildlink3.mk" .include "../../devel/hs-setlocale/buildlink3.mk" .include "../../devel/hs-utf8-string/buildlink3.mk" .include "../../mk/haskell.mk" diff --git a/wm/xmonad/PLIST b/wm/xmonad/PLIST deleted file mode 100644 index 7bf90a2d65e8..000000000000 --- a/wm/xmonad/PLIST +++ /dev/null @@ -1,77 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2016/01/04 12:45:36 szptvlfn Exp $ -lib/${PKGNAME}/${HASKELL_VERSION}/HS${PKGNAME}.o -lib/${PKGNAME}/${HASKELL_VERSION}/Paths_xmonad.hi -lib/${PKGNAME}/${HASKELL_VERSION}/XMonad.hi -lib/${PKGNAME}/${HASKELL_VERSION}/XMonad/Config.hi -lib/${PKGNAME}/${HASKELL_VERSION}/XMonad/Core.hi -lib/${PKGNAME}/${HASKELL_VERSION}/XMonad/Layout.hi -lib/${PKGNAME}/${HASKELL_VERSION}/XMonad/Main.hi -lib/${PKGNAME}/${HASKELL_VERSION}/XMonad/ManageHook.hi -lib/${PKGNAME}/${HASKELL_VERSION}/XMonad/Operations.hi -lib/${PKGNAME}/${HASKELL_VERSION}/XMonad/StackSet.hi -lib/${PKGNAME}/${HASKELL_VERSION}/libHS${PKGNAME}.a -lib/${PKGNAME}/${HASKELL_VERSION}/package-description -man/man1/xmonad.1 -share/doc/${PKGNAME}/LICENSE -${PLIST.doc}share/doc/${PKGNAME}/html/XMonad-Config.html -${PLIST.doc}share/doc/${PKGNAME}/html/XMonad-Core.html -${PLIST.doc}share/doc/${PKGNAME}/html/XMonad-Layout.html -${PLIST.doc}share/doc/${PKGNAME}/html/XMonad-Main.html -${PLIST.doc}share/doc/${PKGNAME}/html/XMonad-ManageHook.html -${PLIST.doc}share/doc/${PKGNAME}/html/XMonad-Operations.html -${PLIST.doc}share/doc/${PKGNAME}/html/XMonad-StackSet.html -${PLIST.doc}share/doc/${PKGNAME}/html/XMonad.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-124.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-45.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-46.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-60.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-61.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-95.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-A.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-All.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-B.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-C.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-D.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-E.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-F.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-G.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-H.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-I.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-J.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-K.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-L.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-M.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-N.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-O.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-P.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-Q.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-R.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-S.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-T.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-U.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-V.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-W.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-X.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index-Z.html -${PLIST.doc}share/doc/${PKGNAME}/html/doc-index.html -${PLIST.doc}share/doc/${PKGNAME}/html/frames.html -${PLIST.doc}share/doc/${PKGNAME}/html/haddock-util.js -${PLIST.doc}share/doc/${PKGNAME}/html/hslogo-16.png -${PLIST.doc}share/doc/${PKGNAME}/html/index-frames.html -${PLIST.doc}share/doc/${PKGNAME}/html/index.html -${PLIST.doc}share/doc/${PKGNAME}/html/mini_XMonad-Config.html -${PLIST.doc}share/doc/${PKGNAME}/html/mini_XMonad-Core.html -${PLIST.doc}share/doc/${PKGNAME}/html/mini_XMonad-Layout.html -${PLIST.doc}share/doc/${PKGNAME}/html/mini_XMonad-Main.html -${PLIST.doc}share/doc/${PKGNAME}/html/mini_XMonad-ManageHook.html -${PLIST.doc}share/doc/${PKGNAME}/html/mini_XMonad-Operations.html -${PLIST.doc}share/doc/${PKGNAME}/html/mini_XMonad-StackSet.html -${PLIST.doc}share/doc/${PKGNAME}/html/mini_XMonad.html -${PLIST.doc}share/doc/${PKGNAME}/html/minus.gif -${PLIST.doc}share/doc/${PKGNAME}/html/ocean.css -${PLIST.doc}share/doc/${PKGNAME}/html/plus.gif -${PLIST.doc}share/doc/${PKGNAME}/html/synopsis.png -${PLIST.doc}share/doc/${PKGNAME}/html/xmonad.haddock -share/${PKGNAME}/man/xmonad.1 -share/${PKGNAME}/man/xmonad.1.html -share/${PKGNAME}/man/xmonad.hs diff --git a/wm/xmonad/buildlink3.mk b/wm/xmonad/buildlink3.mk index 520c36e58fc6..31133ab39f68 100644 --- a/wm/xmonad/buildlink3.mk +++ b/wm/xmonad/buildlink3.mk @@ -1,18 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.5 2016/01/04 12:45:36 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2020/01/02 17:11:37 pho Exp $ BUILDLINK_TREE+= xmonad .if !defined(XMONAD_BUILDLINK3_MK) XMONAD_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xmonad+= xmonad>=0.12 -BUILDLINK_ABI_DEPENDS.xmonad+= xmonad>=0.12 +BUILDLINK_API_DEPENDS.xmonad+= xmonad>=0.14 +BUILDLINK_ABI_DEPENDS.xmonad+= xmonad>=0.14 BUILDLINK_PKGSRCDIR.xmonad?= ../../wm/xmonad .include "../../x11/libX11/buildlink3.mk" .include "../../devel/hs-data-default/buildlink3.mk" .include "../../devel/hs-extensible-exceptions/buildlink3.mk" .include "../../devel/hs-mtl/buildlink3.mk" +.include "../../math/hs-semigroups/buildlink3.mk" .include "../../devel/hs-setlocale/buildlink3.mk" .include "../../devel/hs-utf8-string/buildlink3.mk" .include "../../x11/hs-X11/buildlink3.mk" diff --git a/wm/xmonad/distinfo b/wm/xmonad/distinfo index c1d85d96bab3..2ca32c195dba 100644 --- a/wm/xmonad/distinfo +++ b/wm/xmonad/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2016/01/04 12:45:36 szptvlfn Exp $ +$NetBSD: distinfo,v 1.4 2020/01/02 17:11:37 pho Exp $ -SHA1 (xmonad-0.12.tar.gz) = e7719e9b3db9994190f4da831dadce51a265a374 -RMD160 (xmonad-0.12.tar.gz) = 957e891dc3976e5dbeb0007a4835e5d07c75a89d -SHA512 (xmonad-0.12.tar.gz) = e519c038d90db037bc81e7baf7b07cfa53922509e98ffddacfc4a6cc2c7376383be1e721f613057a5febbfcc661807b6382124eb673ac7a7cda23c738d3539ab -Size (xmonad-0.12.tar.gz) = 61436 bytes +SHA1 (xmonad-0.14.tar.gz) = ca54790a9bd74ad7ef952df95db5445f113a7f39 +RMD160 (xmonad-0.14.tar.gz) = 15df267061e46754a690f7aa72419910080696c5 +SHA512 (xmonad-0.14.tar.gz) = 6b9c83ba5a524a2b2c2d0087a95fdabd477995bcf7751dff116df4eb1bfaee5df87a7070963c05bc2509463cf386c8c5946620731eac70c30ea450911952c57d +Size (xmonad-0.14.tar.gz) = 65744 bytes