Update to pointfree-1.1.1.8 v1.1.1.8: * Dependency update for GHC 8.10 * Enable UnicodeSyntaxdiff -r1.4 -r1.5 pkgsrc/devel/pointfree/Makefile
(pho)
@@ -1,31 +1,13 @@ | @@ -1,31 +1,13 @@ | |||
1 | # $NetBSD: Makefile,v 1.4 2022/01/18 02:48:16 pho Exp $ | 1 | # $NetBSD: Makefile,v 1.5 2022/02/11 13:17:21 pho Exp $ | |
2 | # | |||
3 | 2 | |||
4 | DISTNAME= pointfree-1.1.1.7 | 3 | DISTNAME= pointfree-1.1.1.8 | |
5 | PKGNAME= ${DISTNAME} | 4 | PKGNAME= ${DISTNAME} | |
6 | PKGREVISION= 2 | |||
7 | CATEGORIES= devel | 5 | CATEGORIES= devel | |
8 | 6 | |||
9 | MAINTAINER= pho@cielonegro.org | 7 | MAINTAINER= pho@cielonegro.org | |
10 | COMMENT= Convert Haskell expressions to pointfree form | 8 | COMMENT= Convert Haskell expressions to pointfree form | |
11 | LICENSE= mit | 9 | LICENSE= mit | |
12 | 10 | |||
13 | # "pointfree.cabal" declares an empty library (exposing no symbols at | |||
14 | # all), and the executable doesn't depend on the library either. This | |||
15 | # is not only pointless, but also makes Cabal do a weird thing | |||
16 | # possibly due to a bug: it embeds an rpath to the *build directory* | |||
17 | # which serves absolutely no purpose. Disable the library as a | |||
18 | # workaround. | |||
19 | SUBST_CLASSES+= 1 | |||
20 | SUBST_STAGE.1= post-extract | |||
21 | SUBST_FILES.1= pointfree.cabal | |||
22 | SUBST_SED.1= -e "s|Library|Library+ buildable: False|" | |||
23 | ||||
24 | SUBST_CLASSES+= 2 | |||
25 | SUBST_STAGE.2= pre-configure | |||
26 | SUBST_FILES.2= pointfree.cabal | |||
27 | SUBST_FILTER_CMD.2= ${TR} '+' \\n | |||
28 | ||||
29 | .include "../../devel/hs-haskell-src-exts/buildlink3.mk" | 11 | .include "../../devel/hs-haskell-src-exts/buildlink3.mk" | |
30 | .include "../../mk/haskell.mk" | 12 | .include "../../mk/haskell.mk" | |
31 | .include "../../mk/bsd.pkg.mk" | 13 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.4 2021/10/26 10:18:05 nia Exp $ | 1 | $NetBSD: distinfo,v 1.5 2022/02/11 13:17:21 pho Exp $ | |
2 | 2 | |||
3 | BLAKE2s (pointfree-1.1.1.7.tar.gz) = dd41c88a5ac9014f15dbd2e37910bb4288371b1ff34d598db588f70d40b1b5cc | 3 | BLAKE2s (pointfree-1.1.1.8.tar.gz) = 6c47340e598f9e5fe7fe88d6e284ea7c67d1655129a3fe4cb918cbf8a6b6765b | |
4 | SHA512 (pointfree-1.1.1.7.tar.gz) = e03d9643b659d6a70677ddecb2d9ef26f6f40e94b126e56cd2125638b2c78d2c22f70bb1373a3d6aa97c87e7aef17ae8cd766da62e37f312ecbce9fdb527dd40 | 4 | SHA512 (pointfree-1.1.1.8.tar.gz) = 476d7e57b58c4a3b46c67d11449366d7efa3ac267c5a0acb253ed535381b9dedc70c375505a0f53e3f14f7bc62d591dbf3fca0d231a5170f3374d249cfa7dc12 | |
5 | Size (pointfree-1.1.1.7.tar.gz) = 20463 bytes | 5 | Size (pointfree-1.1.1.8.tar.gz) = 20568 bytes | |
6 | SHA1 (patch-pointfree.cabal) = 8be9fbe13cff031351294a56b7ed3370845f991b | 6 | SHA1 (patch-pointfree.cabal) = a3f936af1cb9e0a5a507035a7cf0fcaef44b8d48 |
@@ -1,2 +1,38 @@ | @@ -1,2 +1,38 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2021/04/23 15:40:30 pho Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2022/02/11 13:17:21 pho Exp $ | |
2 | bin/pointfree | 2 | bin/pointfree | |
3 | lib/${PKGNAME}/${HS_VERSION}/package-description | |||
4 | lib/${PKGNAME}/${HS_VERSION}/package-id | |||
5 | lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so | |||
6 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Common.dyn_hi | |||
7 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Common.hi | |||
8 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Common.p_hi | |||
9 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Optimize.dyn_hi | |||
10 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Optimize.hi | |||
11 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Optimize.p_hi | |||
12 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Parser.dyn_hi | |||
13 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Parser.hi | |||
14 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Parser.p_hi | |||
15 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/PrettyPrinter.dyn_hi | |||
16 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/PrettyPrinter.hi | |||
17 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/PrettyPrinter.p_hi | |||
18 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Rules.dyn_hi | |||
19 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Rules.hi | |||
20 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Rules.p_hi | |||
21 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Transform.dyn_hi | |||
22 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Transform.hi | |||
23 | lib/${HS_PLATFORM}/${HS_PKGID}/Plugin/Pl/Transform.p_hi | |||
24 | lib/${HS_PLATFORM}/${HS_PKGID}/Pointfree.dyn_hi | |||
25 | lib/${HS_PLATFORM}/${HS_PKGID}/Pointfree.hi | |||
26 | lib/${HS_PLATFORM}/${HS_PKGID}/Pointfree.p_hi | |||
27 | lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a | |||
28 | lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a | |||
29 | share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE | |||
30 | share/doc/${HS_PLATFORM}/${PKGNAME}/html/Pointfree.html | |||
31 | share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html | |||
32 | share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js | |||
33 | share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html | |||
34 | share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css | |||
35 | share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json | |||
36 | share/doc/${HS_PLATFORM}/${PKGNAME}/html/pointfree.haddock | |||
37 | share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css | |||
38 | share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png |
@@ -1,33 +1,24 @@ | @@ -1,33 +1,24 @@ | |||
1 | $NetBSD: patch-pointfree.cabal,v 1.1 2021/04/23 15:40:31 pho Exp $ | 1 | $NetBSD: patch-pointfree.cabal,v 1.2 2022/02/11 13:17:21 pho Exp $ | |
2 | 2 | |||
3 | Fix build with GHC 9. | 3 | Fix build with GHC 9.2 | |
4 | 4 | |||
5 | --- pointfree.cabal.orig 2021-04-23 15:37:47.335125491 +0000 | 5 | --- pointfree.cabal.orig 2001-09-09 01:46:40.000000000 +0000 | |
6 | +++ pointfree.cabal | 6 | +++ pointfree.cabal | |
7 | @@ -27,7 +27,7 @@ Library+ buildable: False | 7 | @@ -27,7 +27,7 @@ Library | |
8 | Exposed-modules: Pointfree | 8 | Exposed-modules: Pointfree | |
9 | Default-language: Haskell2010 | 9 | Default-language: Haskell2010 | |
10 | 10 | |||
11 | - Build-depends: base >= 4.5 && < 4.14, | 11 | - Build-depends: base >= 4.5 && < 4.15, | |
12 | + Build-depends: base >= 4.5 && < 5, | 12 | + Build-depends: base >= 4.5 && < 5, | |
13 | array >= 0.3 && < 0.6, | 13 | array >= 0.3 && < 0.6, | |
14 | containers >= 0.4 && < 0.7, | 14 | containers >= 0.4 && < 0.7, | |
15 | haskell-src-exts >= 1.20 && < 1.24, | 15 | haskell-src-exts >= 1.20 && < 1.24, | |
16 | @@ -44,7 +44,7 @@ Executable pointfree | 16 | @@ -44,7 +44,7 @@ Executable pointfree | |
17 | Main-is: Main.hs | 17 | Main-is: Main.hs | |
18 | Default-language: Haskell2010 | 18 | Default-language: Haskell2010 | |
19 | GHC-options: -W | 19 | GHC-options: -W | |
20 | - Build-depends: base >= 4.5 && < 4.14, | 20 | - Build-depends: base >= 4.5 && < 4.15, | |
21 | + Build-depends: base >= 4.5 && < 5, | 21 | + Build-depends: base >= 4.5 && < 5, | |
22 | array >= 0.3 && < 0.6, | 22 | array >= 0.3 && < 0.6, | |
23 | containers >= 0.4 && < 0.7, | 23 | containers >= 0.4 && < 0.7, | |
24 | haskell-src-exts >= 1.20 && < 1.24, | 24 | haskell-src-exts >= 1.20 && < 1.24, | |
25 | @@ -68,7 +68,7 @@ Test-suite tests | |||
26 | Plugin.Pl.Transform | |||
27 | ||||
28 | Build-depends: | |||
29 | - base >= 4.5 && < 4.14, | |||
30 | + base >= 4.5 && < 5, | |||
31 | array >= 0.3 && < 0.6, | |||
32 | containers >= 0.4 && < 0.7, | |||
33 | haskell-src-exts >= 1.20 && < 1.24, |