Update to xmonad-contrib-0.16 The list of changes is too long to paste here. See http://hackage.haskell.org/package/xmonad-contrib-0.16/changelogdiff -r1.9 -r1.10 pkgsrc/wm/xmonad-contrib/Makefile
(pho)
@@ -1,31 +1,22 @@ | @@ -1,31 +1,22 @@ | |||
1 | # $NetBSD: Makefile,v 1.9 2020/01/02 17:29:55 pho Exp $ | 1 | # $NetBSD: Makefile,v 1.10 2020/01/11 14:29:29 pho Exp $ | |
2 | 2 | |||
3 | DISTNAME= xmonad-contrib-0.14 | 3 | DISTNAME= xmonad-contrib-0.16 | |
4 | PKGNAME= ${DISTNAME} | 4 | PKGNAME= ${DISTNAME} | |
5 | CATEGORIES= wm | 5 | CATEGORIES= wm | |
6 | 6 | |||
7 | MAINTAINER= degroote@NetBSD.org | 7 | MAINTAINER= degroote@NetBSD.org | |
8 | COMMENT= Third party extensions for xmonad | 8 | COMMENT= Third party extensions for xmonad | |
9 | LICENSE= modified-bsd | 9 | LICENSE= modified-bsd | |
10 | 10 | |||
11 | # Work around a Cabal bug. It ignores "ld-options" in | |||
12 | # {package}.buildinfo while linking shared libraries: | |||
13 | # https://github.com/haskell/cabal/issues/4925 | |||
14 | HASKELL_ENABLE_SHARED_LIBRARY= no | |||
15 | ||||
16 | .include "options.mk" | 11 | .include "options.mk" | |
17 | 12 | |||
18 | .include "../../mk/haskell.mk" | |||
19 | .include "../../devel/hs-extensible-exceptions/buildlink3.mk" | 13 | .include "../../devel/hs-extensible-exceptions/buildlink3.mk" | |
20 | .include "../../devel/hs-mtl/buildlink3.mk" | |||
21 | .include "../../devel/hs-old-locale/buildlink3.mk" | 14 | .include "../../devel/hs-old-locale/buildlink3.mk" | |
22 | .include "../../time/hs-old-time/buildlink3.mk" | 15 | .include "../../time/hs-old-time/buildlink3.mk" | |
23 | .include "../../devel/hs-random/buildlink3.mk" | 16 | .include "../../devel/hs-random/buildlink3.mk" | |
24 | .include "../../math/hs-semigroups/buildlink3.mk" | 17 | .include "../../math/hs-semigroups/buildlink3.mk" | |
25 | .include "../../devel/hs-utf8-string/buildlink3.mk" | 18 | .include "../../devel/hs-utf8-string/buildlink3.mk" | |
26 | .include "../../x11/hs-X11/buildlink3.mk" | 19 | .include "../../x11/hs-X11/buildlink3.mk" | |
27 | .include "../../wm/xmonad/buildlink3.mk" | 20 | .include "../../wm/xmonad/buildlink3.mk" | |
28 | .include "../../x11/libXScrnSaver/buildlink3.mk" | 21 | .include "../../mk/haskell.mk" | |
29 | .include "../../x11/libXinerama/buildlink3.mk" | |||
30 | .include "../../x11/libXrandr/buildlink3.mk" | |||
31 | .include "../../mk/bsd.pkg.mk" | 22 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.4 2020/01/02 17:29:55 pho Exp $ | 1 | $NetBSD: distinfo,v 1.5 2020/01/11 14:29:29 pho Exp $ | |
2 | 2 | |||
3 | SHA1 (xmonad-contrib-0.14.tar.gz) = 92c00a998d028c07cfa314684e7868fde34c8582 | 3 | SHA1 (xmonad-contrib-0.16.tar.gz) = 54e7ab28b23773e2c904bd9fe8532c84529f14a9 | |
4 | RMD160 (xmonad-contrib-0.14.tar.gz) = 8541b80053eda58b19e50345bb878a064686d606 | 4 | RMD160 (xmonad-contrib-0.16.tar.gz) = 1618b5a57ff99c2b53cc0f934d8950adf8874a09 | |
5 | SHA512 (xmonad-contrib-0.14.tar.gz) = 795bd3f60153c4c3fe0102fe7f951ffaf98b77a89728817ca6435d6c0d4c579ad96255f04fd6929222fd5790a442b8b802f0d1d720f4f2c3cc79df1986e69ca0 | 5 | SHA512 (xmonad-contrib-0.16.tar.gz) = 22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25 | |
6 | Size (xmonad-contrib-0.14.tar.gz) = 523437 bytes | 6 | Size (xmonad-contrib-0.16.tar.gz) = 540237 bytes |
@@ -1,21 +1,14 @@ | @@ -1,21 +1,14 @@ | |||
1 | # $NetBSD: options.mk,v 1.3 2019/11/04 21:50:16 rillig Exp $ | 1 | # $NetBSD: options.mk,v 1.4 2020/01/11 14:29:29 pho Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.xmonad-contrib | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.xmonad-contrib | |
4 | PKG_SUPPORTED_OPTIONS= xft2 | 4 | PKG_SUPPORTED_OPTIONS= xft2 | |
5 | PKG_SUGGESTED_OPTIONS= xft2 | 5 | PKG_SUGGESTED_OPTIONS= xft2 | |
6 | 6 | |||
7 | .include "../../mk/bsd.options.mk" | 7 | .include "../../mk/bsd.options.mk" | |
8 | 8 | |||
9 | .if !empty(PKG_OPTIONS:Mxft2) | 9 | .if !empty(PKG_OPTIONS:Mxft2) | |
10 | .include "../../x11/hs-X11-xft/buildlink3.mk" | 10 | .include "../../x11/hs-X11-xft/buildlink3.mk" | |
11 | CONFIGURE_ARGS+= -fuse_xft | |||
11 | .else | 12 | .else | |
12 | SUBST_CLASSES+= 1 | 13 | CONFIGURE_ARGS+= -f-use_xft | |
13 | SUBST_STAGE.1= pre-patch | |||
14 | SUBST_FILES.1= xmonad-contrib.cabal | |||
15 | SUBST_SED.1= -e "s|render text|render text+ default: False|" | |||
16 | ||||
17 | SUBST_CLASSES+= 2 | |||
18 | SUBST_STAGE.2= pre-configure | |||
19 | SUBST_FILES.2= xmonad-contrib.cabal | |||
20 | SUBST_FILTER_CMD.2= ${TR} '+' \\n | |||
21 | .endif | 14 | .endif |