CVS commit: pkgsrc/textproc/hs-cgrep

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Jan  3 08:22:09 UTC 2020

Modified Files:
        pkgsrc/textproc/hs-cgrep: Makefile distinfo
Added Files:
        pkgsrc/textproc/hs-cgrep/patches: patch-src_Config.hs
Removed Files:
        pkgsrc/textproc/hs-cgrep: PLIST

Log Message:
Update to cgrep-6.6.30

No changelogs are provided by the upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/hs-cgrep/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/textproc/hs-cgrep/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/hs-cgrep/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/hs-cgrep/patches/patch-src_Config.hs

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.16 pkgsrc/textproc/hs-cgrep/Makefile:1.17
--- pkgsrc/textproc/hs-cgrep/Makefile:1.16      Sun Jan 10 11:49:11 2016
+++ pkgsrc/textproc/hs-cgrep/Makefile   Fri Jan  3 08:22:08 2020
@@ -1,21 +1,32 @@
-# $NetBSD: Makefile,v 1.16 2016/01/10 11:49:11 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.17 2020/01/03 08:22:08 pho Exp $
 
-DISTNAME=      cgrep-6.4.5
-PKGREVISION=   15
+DISTNAME=      cgrep-6.6.30
+#PKGNAME=      ${DISTNAME} # This package should probably be renamed to textproc/cgrep
 CATEGORIES=    textproc
 
 MAINTAINER=    szptvlfn%NetBSD.org@localhost
-COMMENT=       Command line tool
+COMMENT=       Context-aware grep for source codes
 LICENSE=       gnu-gpl-v2
 
 .include "../../mk/haskell.mk"
+.include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../devel/hs-ansi-terminal/buildlink3.mk"
+.include "../../devel/hs-async/buildlink3.mk"
 .include "../../devel/hs-cmdargs/buildlink3.mk"
 .include "../../devel/hs-dlist/buildlink3.mk"
+.include "../../devel/hs-either/buildlink3.mk"
+.include "../../devel/hs-exceptions/buildlink3.mk"
+.include "../../misc/hs-extra/buildlink3.mk"
+.include "../../devel/hs-mtl/buildlink3.mk"
+.include "../../textproc/hs-regex-base/buildlink3.mk"
+.include "../../textproc/hs-regex-pcre/buildlink3.mk"
 .include "../../textproc/hs-regex-posix/buildlink3.mk"
 .include "../../devel/hs-safe/buildlink3.mk"
 .include "../../devel/hs-split/buildlink3.mk"
 .include "../../devel/hs-stm/buildlink3.mk"
 .include "../../textproc/hs-stringsearch/buildlink3.mk"
+.include "../../textproc/hs-unicode-show/buildlink3.mk"
+.include "../../devel/hs-unix-compat/buildlink3.mk"
 .include "../../devel/hs-unordered-containers/buildlink3.mk"
+.include "../../devel/hs-utf8-string/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/hs-cgrep/distinfo
diff -u pkgsrc/textproc/hs-cgrep/distinfo:1.2 pkgsrc/textproc/hs-cgrep/distinfo:1.3
--- pkgsrc/textproc/hs-cgrep/distinfo:1.2       Wed Nov  4 01:59:31 2015
+++ pkgsrc/textproc/hs-cgrep/distinfo   Fri Jan  3 08:22:08 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:59:31 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/01/03 08:22:08 pho Exp $
 
-SHA1 (cgrep-6.4.5.tar.gz) = 48600323a3b5cb970c2463b55294d488c64b7342
-RMD160 (cgrep-6.4.5.tar.gz) = 4d864f320d841638b3aaf6a020fb0f3d2ba3d9b9
-SHA512 (cgrep-6.4.5.tar.gz) = bc66380f0986de022d2e4d2f107f509c8dffb7c9152e103458a7414992c9baa57e6f3139059d494b46cd335ca2d448bae0fe1c67985cbedfca47c32c2ef97888
-Size (cgrep-6.4.5.tar.gz) = 30823 bytes
+SHA1 (cgrep-6.6.30.tar.gz) = 2a7ca412d483539fd21eb30176b4ffd668ed3d08
+RMD160 (cgrep-6.6.30.tar.gz) = 97c76c30efb16b072c749517aa616fc45c2dfb1d
+SHA512 (cgrep-6.6.30.tar.gz) = 72480faf6bbbcf018992be5cb92cb5f23ac0f7b219092e419eedc0007fb142873b6b97a2df42bf43c0d75f00f2c1813d6f8eb5eaf5d070391443f8550111f660
+Size (cgrep-6.6.30.tar.gz) = 35481 bytes
+SHA1 (patch-src_Config.hs) = 76b679d89384209395480669a71bcf165e7d89be

Added files:

Index: pkgsrc/textproc/hs-cgrep/patches/patch-src_Config.hs
diff -u /dev/null pkgsrc/textproc/hs-cgrep/patches/patch-src_Config.hs:1.1
--- /dev/null   Fri Jan  3 08:22:09 2020
+++ pkgsrc/textproc/hs-cgrep/patches/patch-src_Config.hs        Fri Jan  3 08:22:09 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_Config.hs,v 1.1 2020/01/03 08:22:09 pho Exp $
+
+Compatibility with GHC < 8
+
+--- src/Config.hs.orig 2001-09-09 01:46:40.000000000 +0000
++++ src/Config.hs
+@@ -19,6 +19,11 @@
+ {-# LANGUAGE DeriveGeneric #-}
+ {-# LANGUAGE RecordWildCards #-}
+ {-# LANGUAGE OverloadedStrings #-}
++{-# LANGUAGE CPP #-}
++
++#if !MIN_VERSION_base(4,9,0)
++#  define errorWithoutStackTrace error
++#endif
+ 
+ module Config where
+