CVS commit: pkgsrc/textproc/hs-cgrep

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Aug 24 15:31:13 UTC 2020

Modified Files:
        pkgsrc/textproc/hs-cgrep: Makefile PLIST

Log Message:
Fix build with the upcoming GHC 8.8.4


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/hs-cgrep/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/hs-cgrep/PLIST

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

Modified files:

Index: pkgsrc/textproc/hs-cgrep/Makefile
diff -u pkgsrc/textproc/hs-cgrep/Makefile:1.19 pkgsrc/textproc/hs-cgrep/Makefile:1.20
--- pkgsrc/textproc/hs-cgrep/Makefile:1.19      Sat Jan 11 13:10:10 2020
+++ pkgsrc/textproc/hs-cgrep/Makefile   Mon Aug 24 15:31:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/01/11 13:10:10 pho Exp $
+# $NetBSD: Makefile,v 1.20 2020/08/24 15:31:12 pho Exp $
 
 DISTNAME=      cgrep-6.6.30
 #PKGNAME=      ${DISTNAME} # This package should probably be renamed to textproc/cgrep
@@ -8,6 +8,12 @@ MAINTAINER=    szptvlfn%NetBSD.org@localhost
 COMMENT=       Context-aware grep for source codes
 LICENSE=       gnu-gpl-v2
 
+# Do not install the LICENCE file because ../../mk/haskell.mk can not
+# correctly substitute the path to doc files when the package installs
+# no libraries.
+post-install:
+       ${RM} -rf ${DESTDIR}${PREFIX}/share/doc
+
 .include "../../mk/haskell.mk"
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../devel/hs-ansi-terminal/buildlink3.mk"

Index: pkgsrc/textproc/hs-cgrep/PLIST
diff -u pkgsrc/textproc/hs-cgrep/PLIST:1.4 pkgsrc/textproc/hs-cgrep/PLIST:1.5
--- pkgsrc/textproc/hs-cgrep/PLIST:1.4  Sun Jun 21 22:21:03 2020
+++ pkgsrc/textproc/hs-cgrep/PLIST      Mon Aug 24 15:31:12 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2020/06/21 22:21:03 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/08/24 15:31:12 pho Exp $
 bin/cgrep
-share/doc/x86_64-netbsd-ghc-8.8.1/cgrep-${PKGVERSION}/LICENSE
-@pkgdir lib/cgrep-${PKGVERSION}/ghc-8.8.1
+@pkgdir share
+@pkgdir lib/cgrep-${PKGVERSION}/ghc-8.8.4