Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/hs-cgrep Fix build with the upcoming GHC 8.8.4



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f93bd5812d5
branches:  trunk
changeset: 437495:4f93bd5812d5
user:      pho <pho%pkgsrc.org@localhost>
date:      Mon Aug 24 15:31:12 2020 +0000

description:
Fix build with the upcoming GHC 8.8.4

diffstat:

 textproc/hs-cgrep/Makefile |  8 +++++++-
 textproc/hs-cgrep/PLIST    |  6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 5cfb362390fb -r 4f93bd5812d5 textproc/hs-cgrep/Makefile
--- a/textproc/hs-cgrep/Makefile        Mon Aug 24 15:10:29 2020 +0000
+++ b/textproc/hs-cgrep/Makefile        Mon Aug 24 15:31:12 2020 +0000
@@ -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 @@
 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"
diff -r 5cfb362390fb -r 4f93bd5812d5 textproc/hs-cgrep/PLIST
--- a/textproc/hs-cgrep/PLIST   Mon Aug 24 15:10:29 2020 +0000
+++ b/textproc/hs-cgrep/PLIST   Mon Aug 24 15:31:12 2020 +0000
@@ -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



Home | Main Index | Thread Index | Old Index