git: 648ed0149fc3 - main - devel/hs-hasktags: Fix build after GHC update.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 07 Jul 2022 10:25:18 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=648ed0149fc3493f22341d7b610e591a495eceb8
commit 648ed0149fc3493f22341d7b610e591a495eceb8
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-05-09 16:06:01 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-07-07 10:24:32 +0000
devel/hs-hasktags: Fix build after GHC update.
---
devel/hs-hasktags/Makefile | 34 ++---
devel/hs-hasktags/distinfo | 80 +++++-----
devel/hs-hasktags/files/patch-hasktags.cabal | 216 +++++++++++++++++++++++++++
3 files changed, 270 insertions(+), 60 deletions(-)
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index 4120c4bcc541..2904f7233fda 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -1,6 +1,6 @@
PORTNAME= hasktags
PORTVERSION= 0.72.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,23 +10,23 @@ LICENSE= BSD3CLAUSE
USES= cabal
-USE_CABAL= ansi-terminal-0.10.3 \
- ansi-wl-pprint-0.6.9_2 \
- colour-2.3.5 \
- hashable-1.3.0.0_2 \
+USE_CABAL= ansi-terminal-0.11.3 \
+ ansi-wl-pprint-0.6.9_3 \
+ colour-2.3.6 \
+ hashable-1.4.0.2 \
json-0.10_1 \
- microlens-0.4.11.2 \
- microlens-ghc-0.4.12 \
+ microlens-0.4.12.0 \
+ microlens-ghc-0.4.13.1 \
microlens-mtl-0.2.0.1 \
- microlens-platform-0.4.1 \
- microlens-th-0.4.3.5 \
- optparse-applicative-0.15.1.0_1 \
- primitive-0.7.0.1 \
- syb-0.7.1_1 \
- th-abstraction-0.3.2.0 \
- transformers-compat-0.6.5 \
- unordered-containers-0.2.10.0_1 \
- utf8-string-1.0.1.1_3 \
- vector-0.12.1.2
+ microlens-platform-0.4.2.1 \
+ microlens-th-0.4.3.10 \
+ optparse-applicative-0.17.0.0 \
+ primitive-0.7.3.0 \
+ syb-0.7.2.1 \
+ th-abstraction-0.4.3.0 \
+ transformers-compat-0.7.1_1 \
+ unordered-containers-0.2.19.1 \
+ utf8-string-1.0.2 \
+ vector-0.12.3.1_1
.include <bsd.port.mk>
diff --git a/devel/hs-hasktags/distinfo b/devel/hs-hasktags/distinfo
index cfb78c3af512..69c21042a1f3 100644
--- a/devel/hs-hasktags/distinfo
+++ b/devel/hs-hasktags/distinfo
@@ -1,53 +1,47 @@
-TIMESTAMP = 1630745196
+TIMESTAMP = 1652112036
SHA256 (cabal/hasktags-0.72.0.tar.gz) = adadb5800ab2996f0198a6fc6af959dee6d69339c204cc9789f83e67024fe726
SIZE (cabal/hasktags-0.72.0.tar.gz) = 59000
-SHA256 (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = fa2e2e32dfad29835aa7fd442bbe233e07d97e933223a001fe5efa562535b57c
-SIZE (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = 35863
+SHA256 (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = f4d563ecf71fb1d304bcdcad478d97efd9f61f6d9d4797a5d56e7722a92a9e6b
+SIZE (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = 37868
SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac
SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723
-SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/2.cabal) = 20d30674f137d43aa0279c2c2cc5e45a5f1c3c57e301852494906158b6313bf7
-SIZE (cabal/ansi-wl-pprint-0.6.9/revision/2.cabal) = 2388
-SHA256 (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 3b8d471979617dce7c193523743c9782df63433d8e87e3ef6d97922e0da104e7
-SIZE (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 20485
-SHA256 (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4
-SIZE (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 29835
-SHA256 (cabal/hashable-1.3.0.0/revision/2.cabal) = d60cad00223d46172020c136e68acef0481a47d0302b2e74b1805b4f3a446a9b
-SIZE (cabal/hashable-1.3.0.0/revision/2.cabal) = 5389
+SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce
+SIZE (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 2425
+SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871
+SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675
+SHA256 (cabal/hashable-1.4.0.2/hashable-1.4.0.2.tar.gz) = 83606edd356d914c075ecd44f6d5fe91a3b186aa0683c8dd8c9a7e8e22a47600
+SIZE (cabal/hashable-1.4.0.2/hashable-1.4.0.2.tar.gz) = 25528
SHA256 (cabal/json-0.10/json-0.10.tar.gz) = 0c046a3c03c9332816d3c9e50319b1d1eb3c2c1baba1123a7650d047b26856ba
SIZE (cabal/json-0.10/json-0.10.tar.gz) = 22622
SHA256 (cabal/json-0.10/revision/1.cabal) = d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799
SIZE (cabal/json-0.10/revision/1.cabal) = 3210
-SHA256 (cabal/microlens-0.4.11.2/microlens-0.4.11.2.tar.gz) = 4e484d4a73c7c5176ccfdacc29aec7399352cac1c7e8924d5123857cf36ddffc
-SIZE (cabal/microlens-0.4.11.2/microlens-0.4.11.2.tar.gz) = 26549
-SHA256 (cabal/microlens-ghc-0.4.12/microlens-ghc-0.4.12.tar.gz) = 2b441b12ce1108e59593a5cfc2cc98da549f1faa13203e28f912804d9531101f
-SIZE (cabal/microlens-ghc-0.4.12/microlens-ghc-0.4.12.tar.gz) = 6616
+SHA256 (cabal/microlens-0.4.12.0/microlens-0.4.12.0.tar.gz) = b5427383c3fe24de378b07b50b0bee3d02e70e8cbfb7ae51b1946de5137d0783
+SIZE (cabal/microlens-0.4.12.0/microlens-0.4.12.0.tar.gz) = 26692
+SHA256 (cabal/microlens-ghc-0.4.13.1/microlens-ghc-0.4.13.1.tar.gz) = 46239835df4e5fe62028cf447c808a5e85c5434c3c504a495e164185e54c0760
+SIZE (cabal/microlens-ghc-0.4.13.1/microlens-ghc-0.4.13.1.tar.gz) = 6637
SHA256 (cabal/microlens-mtl-0.2.0.1/microlens-mtl-0.2.0.1.tar.gz) = d79de8b228631525da3c17999d3b936eb8f919f2303348151b6cd1d27c3f5e46
SIZE (cabal/microlens-mtl-0.2.0.1/microlens-mtl-0.2.0.1.tar.gz) = 9019
-SHA256 (cabal/microlens-platform-0.4.1/microlens-platform-0.4.1.tar.gz) = 03d8bed7d54b64eaa6453c89065cd38626b9a9341f83726c09eea7150d97917e
-SIZE (cabal/microlens-platform-0.4.1/microlens-platform-0.4.1.tar.gz) = 4949
-SHA256 (cabal/microlens-th-0.4.3.5/microlens-th-0.4.3.5.tar.gz) = d03d99d51e9730350ac400edc44e96f90f7e4ad58975dd203b1ac2cc51e4657e
-SIZE (cabal/microlens-th-0.4.3.5/microlens-th-0.4.3.5.tar.gz) = 21857
-SHA256 (cabal/optparse-applicative-0.15.1.0/optparse-applicative-0.15.1.0.tar.gz) = 4db3675fd1e0594afdf079db46f4cd412d483835d703e7c07e1a1a37d6f046f3
-SIZE (cabal/optparse-applicative-0.15.1.0/optparse-applicative-0.15.1.0.tar.gz) = 56203
-SHA256 (cabal/optparse-applicative-0.15.1.0/revision/1.cabal) = 29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e
-SIZE (cabal/optparse-applicative-0.15.1.0/revision/1.cabal) = 4810
-SHA256 (cabal/primitive-0.7.0.1/primitive-0.7.0.1.tar.gz) = dd8bb7d829f492d6200fca4a839a7563b80571c5f76b4d0fa76700ebe897f7dd
-SIZE (cabal/primitive-0.7.0.1/primitive-0.7.0.1.tar.gz) = 66023
-SHA256 (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = e04a9c7ae48d9fe25e9b7a064f7122d39c710753544511e15df7a6e87fdfe700
-SIZE (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = 39594
-SHA256 (cabal/syb-0.7.1/revision/1.cabal) = 809b4587757c9358db125577fb7e4e11031b8a26075fabe346912bbe2cfffd65
-SIZE (cabal/syb-0.7.1/revision/1.cabal) = 2544
-SHA256 (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 36fef33ad0f34b9b8fb5552fe6187579a00d5f90d938e9bc24d382a9919feb79
-SIZE (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 35111
-SHA256 (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = da67cf11515da751b32a8ce6e96549f7268f7c435769ad19dc9766b69774620b
-SIZE (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = 40421
-SHA256 (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 65f117bdbdea9efc75fb9fd539873de7687e005d8898bb21821020a4b383c573
-SIZE (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 44733
-SHA256 (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
-SIZE (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5199
-SHA256 (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140
-SIZE (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = 8667
-SHA256 (cabal/utf8-string-1.0.1.1/revision/3.cabal) = 68cc6cf665e7212334a51b63d6936daeaca023b2cfe8637d130acfe95f91700b
-SIZE (cabal/utf8-string-1.0.1.1/revision/3.cabal) = 1151
-SHA256 (cabal/vector-0.12.1.2/vector-0.12.1.2.tar.gz) = 3b6e27683f6f20b37b8a35d0fab9e34b57dad72ac64cb16f428726780d4011bd
-SIZE (cabal/vector-0.12.1.2/vector-0.12.1.2.tar.gz) = 131049
+SHA256 (cabal/microlens-platform-0.4.2.1/microlens-platform-0.4.2.1.tar.gz) = e6cd07f45d5b0abad322724e09bee0e665c9f4fb35a1e5c49078a2e0bfb71a7d
+SIZE (cabal/microlens-platform-0.4.2.1/microlens-platform-0.4.2.1.tar.gz) = 4960
+SHA256 (cabal/microlens-th-0.4.3.10/microlens-th-0.4.3.10.tar.gz) = 2c50100235949c00defcdb8c01d8eb5e2e45e524a9b552d3c0c8bb8224ece2b5
+SIZE (cabal/microlens-th-0.4.3.10/microlens-th-0.4.3.10.tar.gz) = 24189
+SHA256 (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724
+SIZE (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 59409
+SHA256 (cabal/primitive-0.7.3.0/primitive-0.7.3.0.tar.gz) = 3c0cfda67f1ee6f7f65108ad6f973b5bbb35ddba34b3c87746a7448f787501dc
+SIZE (cabal/primitive-0.7.3.0/primitive-0.7.3.0.tar.gz) = 55161
+SHA256 (cabal/syb-0.7.2.1/syb-0.7.2.1.tar.gz) = 1807c66f77e66786739387f0ae9f16d150d1cfa9d626afcb729f0e9b442a8d96
+SIZE (cabal/syb-0.7.2.1/syb-0.7.2.1.tar.gz) = 39768
+SHA256 (cabal/th-abstraction-0.4.3.0/th-abstraction-0.4.3.0.tar.gz) = c8bb13e31d1d22a99168536a35c66e1091a6e4274b9841a023eac52c2bd3de06
+SIZE (cabal/th-abstraction-0.4.3.0/th-abstraction-0.4.3.0.tar.gz) = 38595
+SHA256 (cabal/transformers-compat-0.7.1/transformers-compat-0.7.1.tar.gz) = ac0b861534c14d3cfd61534f474674e3b634b8decea072ffd4d21f8b59f35080
+SIZE (cabal/transformers-compat-0.7.1/transformers-compat-0.7.1.tar.gz) = 44363
+SHA256 (cabal/transformers-compat-0.7.1/revision/1.cabal) = 873ef500790cae136d14b2e890da1fe4df963e372f21b1671fa3c6cdfb23b10f
+SIZE (cabal/transformers-compat-0.7.1/revision/1.cabal) = 5807
+SHA256 (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 1b27bec5e0d522b27a6029ebf4c4a6d40acbc083c787008e32fb55c4b1d128d2
+SIZE (cabal/unordered-containers-0.2.19.1/unordered-containers-0.2.19.1.tar.gz) = 58030
+SHA256 (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a
+SIZE (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = 10726
+SHA256 (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = fb4a53c02bd4d7fdf155c0604da9a5bb0f3b3bfce5d9960aea11c2ae235b9f35
+SIZE (cabal/vector-0.12.3.1/vector-0.12.3.1.tar.gz) = 151420
+SHA256 (cabal/vector-0.12.3.1/revision/1.cabal) = 040210919e5ce454dcee3320f77803da3dbda579c8428dc25ff0155732234808
+SIZE (cabal/vector-0.12.3.1/revision/1.cabal) = 7946
diff --git a/devel/hs-hasktags/files/patch-hasktags.cabal b/devel/hs-hasktags/files/patch-hasktags.cabal
new file mode 100644
index 000000000000..dcf7a7c235bf
--- /dev/null
+++ b/devel/hs-hasktags/files/patch-hasktags.cabal
@@ -0,0 +1,216 @@
+--- hasktags.cabal.orig 2001-09-09 01:46:40 UTC
++++ hasktags.cabal
+@@ -1,106 +1,107 @@
+-Name: hasktags
+-Version: 0.72.0
+-Copyright: The University Court of the University of Glasgow
+-License: BSD3
+-License-File: LICENSE
+-Author: The GHC Team
+-Maintainer:
+- Jack Henahan <jhenahan@me.com>,
+- Marc Weber <marco-oweber@gmx.de>,
+- Marco Túlio Pimenta Gontijo <marcotmarcot@gmail.com>
+-homepage: http://github.com/MarcWeber/hasktags
+-bug-reports: http://github.com/MarcWeber/hasktags/issues
+-Synopsis: Produces ctags "tags" and etags "TAGS" files for Haskell programs
+-Description:
+- Produces ctags "tags" and etags "TAGS" files for Haskell programs.
+-Category: Development
+-build-type: Simple
+-cabal-version: >=1.10
+-extra-source-files:
+- README.md,
+- TODO,
+- testcases/HUnitBase.lhs
+- testcases/Repair.lhs
+- testcases/blockcomment.hs
+- testcases/constructor.hs
+- testcases/module.hs
+- testcases/space.hs
+- testcases/substring.hs
+- testcases/tabs.hs
+- testcases/testcase1.hs
+- testcases/testcase2.hs
+- testcases/testcase3.lhs
+- testcases/testcase4.hs
+- testcases/testcase8.hs
+- testcases/twoblockcommentshs.hs
+- testcases/twoblockcommentslhs.lhs
+- testcases/twoblockcommentstogether.hs
+- testcases/typesig.hs
+- testcases/expected_failures_testing_suite.hs
+- testcases/testcase9.hs
+- testcases/testcase10.hs
+- testcases/testcase11.hs
+- testcases/simple.hs
+- testcases/monad-base-control.hs
+- testcases/16-regression.hs
+- testcases/9.hs
+- testcases/9-too.hs
+-
+-Flag debug
+- Default: False
+- Description: When set to true tokens will be print at various places. This helps understanding why hasktags does not behave the way it should
+-
+-source-repository head
+- type: git
+- location: http://github.com/MarcWeber/hasktags
+-
+-library
+- default-language: Haskell2010
+- hs-source-dirs: src
+- ghc-options: -Wall
+- exposed-modules: Hasktags
+- other-modules: Tags, DebugShow
+- build-depends:
+- utf8-string,
+- base >= 4 && < 5,
+- bytestring >= 0.9 && < 0.11,
+- directory >= 1.2.6 && < 1.4,
+- filepath,
+- json >= 0.5 && < 0.11,
+- microlens-platform >= 0.3.8.0 && < 0.5
+-
+-Executable hasktags
+- Main-Is: src/Main.hs
+- Build-Depends:
+- base,
+- directory,
+- filepath,
+- hasktags,
+- optparse-applicative,
+- containers
+- other-modules: Paths_hasktags
+- ghc-options: -Wall
+- default-language: Haskell2010
+-
+- if flag(debug)
+- cpp-options: -Ddebug
+-
+-Test-Suite testsuite
+- Type: exitcode-stdio-1.0
+- Main-Is: Test.hs
+- hs-source-dirs: src, tests
+- Build-Depends:
+- utf8-string,
+- base,
+- bytestring,
+- directory,
+- filepath,
+- json,
+- HUnit,
+- microlens-platform
+- other-modules: Tags, Hasktags, DebugShow
+- ghc-options: -Wall
+- default-language: Haskell2010
+-
+- if flag(debug)
+- cpp-options: -Ddebug
++Name: hasktags
++Version: 0.72.0
++x-revision: 2
++Copyright: The University Court of the University of Glasgow
++License: BSD3
++License-File: LICENSE
++Author: The GHC Team
++Maintainer:
++ Jack Henahan <jhenahan@me.com>,
++ Marc Weber <marco-oweber@gmx.de>,
++ Marco Túlio Pimenta Gontijo <marcotmarcot@gmail.com>
++homepage: http://github.com/MarcWeber/hasktags
++bug-reports: http://github.com/MarcWeber/hasktags/issues
++Synopsis: Produces ctags "tags" and etags "TAGS" files for Haskell programs
++Description:
++ Produces ctags "tags" and etags "TAGS" files for Haskell programs.
++Category: Development
++build-type: Simple
++cabal-version: >=1.10
++extra-source-files:
++ README.md,
++ TODO,
++ testcases/HUnitBase.lhs
++ testcases/Repair.lhs
++ testcases/blockcomment.hs
++ testcases/constructor.hs
++ testcases/module.hs
++ testcases/space.hs
++ testcases/substring.hs
++ testcases/tabs.hs
++ testcases/testcase1.hs
++ testcases/testcase2.hs
++ testcases/testcase3.lhs
++ testcases/testcase4.hs
++ testcases/testcase8.hs
++ testcases/twoblockcommentshs.hs
++ testcases/twoblockcommentslhs.lhs
++ testcases/twoblockcommentstogether.hs
++ testcases/typesig.hs
++ testcases/expected_failures_testing_suite.hs
++ testcases/testcase9.hs
++ testcases/testcase10.hs
++ testcases/testcase11.hs
++ testcases/simple.hs
++ testcases/monad-base-control.hs
++ testcases/16-regression.hs
++ testcases/9.hs
++ testcases/9-too.hs
++
++Flag debug
++ Default: False
++ Description: When set to true tokens will be print at various places. This helps understanding why hasktags does not behave the way it should
++
++source-repository head
++ type: git
++ location: http://github.com/MarcWeber/hasktags
++
++library
++ default-language: Haskell2010
++ hs-source-dirs: src
++ ghc-options: -Wall
++ exposed-modules: Hasktags
++ other-modules: Tags, DebugShow
++ build-depends:
++ utf8-string,
++ base >= 4.8 && < 5,
++ bytestring >= 0.9 && < 0.12,
++ directory >= 1.2.6 && < 1.4,
++ filepath,
++ json >= 0.5 && < 0.11,
++ microlens-platform >= 0.3.8.0 && < 0.5
++
++Executable hasktags
++ Main-Is: src/Main.hs
++ Build-Depends:
++ base,
++ directory,
++ filepath,
++ hasktags,
++ optparse-applicative,
++ containers
++ other-modules: Paths_hasktags
++ ghc-options: -Wall
++ default-language: Haskell2010
++
++ if flag(debug)
++ cpp-options: -Ddebug
++
++Test-Suite testsuite
++ Type: exitcode-stdio-1.0
++ Main-Is: Test.hs
++ hs-source-dirs: src, tests
++ Build-Depends:
++ utf8-string,
++ base,
++ bytestring,
++ directory,
++ filepath,
++ json,
++ HUnit,
++ microlens-platform
++ other-modules: Tags, Hasktags, DebugShow
++ ghc-options: -Wall
++ default-language: Haskell2010
++
++ if flag(debug)
++ cpp-options: -Ddebug