CVS commit: pkgsrc/wm/xmonad-contrib

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 11 14:29:29 UTC 2020

Modified Files:
        pkgsrc/wm/xmonad-contrib: Makefile distinfo options.mk

Log Message:
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/changelog


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/wm/xmonad-contrib/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/xmonad-contrib/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/xmonad-contrib/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/xmonad-contrib/Makefile
diff -u pkgsrc/wm/xmonad-contrib/Makefile:1.9 pkgsrc/wm/xmonad-contrib/Makefile:1.10
--- pkgsrc/wm/xmonad-contrib/Makefile:1.9       Thu Jan  2 17:29:55 2020
+++ pkgsrc/wm/xmonad-contrib/Makefile   Sat Jan 11 14:29:29 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/01/02 17:29:55 pho Exp $
+# $NetBSD: Makefile,v 1.10 2020/01/11 14:29:29 pho Exp $
 
-DISTNAME=      xmonad-contrib-0.14
+DISTNAME=      xmonad-contrib-0.16
 PKGNAME=       ${DISTNAME}
 CATEGORIES=    wm
 
@@ -8,16 +8,9 @@ MAINTAINER=    degroote%NetBSD.org@localhost
 COMMENT=       Third party extensions for xmonad
 LICENSE=       modified-bsd
 
-# 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
-
 .include "options.mk"
 
-.include "../../mk/haskell.mk"
 .include "../../devel/hs-extensible-exceptions/buildlink3.mk"
-.include "../../devel/hs-mtl/buildlink3.mk"
 .include "../../devel/hs-old-locale/buildlink3.mk"
 .include "../../time/hs-old-time/buildlink3.mk"
 .include "../../devel/hs-random/buildlink3.mk"
@@ -25,7 +18,5 @@ HASKELL_ENABLE_SHARED_LIBRARY= no
 .include "../../devel/hs-utf8-string/buildlink3.mk"
 .include "../../x11/hs-X11/buildlink3.mk"
 .include "../../wm/xmonad/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/wm/xmonad-contrib/distinfo
diff -u pkgsrc/wm/xmonad-contrib/distinfo:1.4 pkgsrc/wm/xmonad-contrib/distinfo:1.5
--- pkgsrc/wm/xmonad-contrib/distinfo:1.4       Thu Jan  2 17:29:55 2020
+++ pkgsrc/wm/xmonad-contrib/distinfo   Sat Jan 11 14:29:29 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2020/01/02 17:29:55 pho Exp $
+$NetBSD: distinfo,v 1.5 2020/01/11 14:29:29 pho Exp $
 
-SHA1 (xmonad-contrib-0.14.tar.gz) = 92c00a998d028c07cfa314684e7868fde34c8582
-RMD160 (xmonad-contrib-0.14.tar.gz) = 8541b80053eda58b19e50345bb878a064686d606
-SHA512 (xmonad-contrib-0.14.tar.gz) = 795bd3f60153c4c3fe0102fe7f951ffaf98b77a89728817ca6435d6c0d4c579ad96255f04fd6929222fd5790a442b8b802f0d1d720f4f2c3cc79df1986e69ca0
-Size (xmonad-contrib-0.14.tar.gz) = 523437 bytes
+SHA1 (xmonad-contrib-0.16.tar.gz) = 54e7ab28b23773e2c904bd9fe8532c84529f14a9
+RMD160 (xmonad-contrib-0.16.tar.gz) = 1618b5a57ff99c2b53cc0f934d8950adf8874a09
+SHA512 (xmonad-contrib-0.16.tar.gz) = 22a18b4045cbfca0229cbf6c0bf1dfa595cbffbe6b82fd58b1fcf941cbfd306642160995b55859cead3cf574df696d2a3cea6507cac4d5c7c58cf09b3a86bc25
+Size (xmonad-contrib-0.16.tar.gz) = 540237 bytes

Index: pkgsrc/wm/xmonad-contrib/options.mk
diff -u pkgsrc/wm/xmonad-contrib/options.mk:1.3 pkgsrc/wm/xmonad-contrib/options.mk:1.4
--- pkgsrc/wm/xmonad-contrib/options.mk:1.3     Mon Nov  4 21:50:16 2019
+++ pkgsrc/wm/xmonad-contrib/options.mk Sat Jan 11 14:29:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/04 21:50:16 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2020/01/11 14:29:29 pho Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xmonad-contrib
 PKG_SUPPORTED_OPTIONS= xft2
@@ -8,14 +8,7 @@ PKG_SUGGESTED_OPTIONS= xft2
 
 .if !empty(PKG_OPTIONS:Mxft2)
 .include "../../x11/hs-X11-xft/buildlink3.mk"
+CONFIGURE_ARGS+=       -fuse_xft
 .else
-SUBST_CLASSES+=        1
-SUBST_STAGE.1= pre-patch
-SUBST_FILES.1= xmonad-contrib.cabal
-SUBST_SED.1=   -e "s|render text|render text+  default: False|"
-
-SUBST_CLASSES+=                2
-SUBST_STAGE.2=         pre-configure
-SUBST_FILES.2=         xmonad-contrib.cabal
-SUBST_FILTER_CMD.2=    ${TR} '+' \\n
+CONFIGURE_ARGS+=       -f-use_xft
 .endif