pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/hs-hscolour Fix build with GHC 9
details: https://anonhg.NetBSD.org/pkgsrc/rev/8c17b9688e64
branches: trunk
changeset: 451148:8c17b9688e64
user: pho <pho%pkgsrc.org@localhost>
date: Sat Apr 24 17:00:46 2021 +0000
description:
Fix build with GHC 9
diffstat:
textproc/hs-hscolour/Makefile | 4 +-
textproc/hs-hscolour/PLIST | 156 +++++++++++-----------
textproc/hs-hscolour/distinfo | 3 +-
textproc/hs-hscolour/patches/patch-hscolour.cabal | 27 +++
4 files changed, 108 insertions(+), 82 deletions(-)
diffs (224 lines):
diff -r ddbea95434c5 -r 8c17b9688e64 textproc/hs-hscolour/Makefile
--- a/textproc/hs-hscolour/Makefile Sat Apr 24 16:50:41 2021 +0000
+++ b/textproc/hs-hscolour/Makefile Sat Apr 24 17:00:46 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/02/28 14:31:04 mef Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/24 17:00:46 pho Exp $
DISTNAME= hscolour-1.24.4
CATEGORIES= textproc
@@ -7,7 +7,5 @@
COMMENT= Colourise Haskell code
LICENSE= gnu-gpl-v2
-BUILDLINK_API_DEPENDS.ghc+= ghc<=8.10
-BUILDLINK_API_DEPENDS.ghc+= ghc>=8.8
.include "../../mk/haskell.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ddbea95434c5 -r 8c17b9688e64 textproc/hs-hscolour/PLIST
--- a/textproc/hs-hscolour/PLIST Sat Apr 24 16:50:41 2021 +0000
+++ b/textproc/hs-hscolour/PLIST Sat Apr 24 17:00:46 2021 +0000
@@ -1,82 +1,82 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/13 04:53:17 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/04/24 17:00:46 pho Exp $
bin/HsColour
-${HS_INTF}/package-description
-${HS_INTF}/package-id
-${HS_IMPL}/Language/Haskell/HsColour.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour.hi
-${HS_IMPL}/Language/Haskell/HsColour.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/ACSS.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/ACSS.hi
-${HS_IMPL}/Language/Haskell/HsColour/ACSS.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/ANSI.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/ANSI.hi
-${HS_IMPL}/Language/Haskell/HsColour/ANSI.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/Anchors.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/Anchors.hi
-${HS_IMPL}/Language/Haskell/HsColour/Anchors.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/CSS.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/CSS.hi
-${HS_IMPL}/Language/Haskell/HsColour/CSS.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/Classify.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/Classify.hi
-${HS_IMPL}/Language/Haskell/HsColour/Classify.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/ColourHighlight.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/ColourHighlight.hi
-${HS_IMPL}/Language/Haskell/HsColour/ColourHighlight.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/Colourise.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/Colourise.hi
-${HS_IMPL}/Language/Haskell/HsColour/Colourise.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/General.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/General.hi
-${HS_IMPL}/Language/Haskell/HsColour/General.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/HTML.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/HTML.hi
-${HS_IMPL}/Language/Haskell/HsColour/HTML.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/InlineCSS.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/InlineCSS.hi
-${HS_IMPL}/Language/Haskell/HsColour/InlineCSS.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/LaTeX.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/LaTeX.hi
-${HS_IMPL}/Language/Haskell/HsColour/LaTeX.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/MIRC.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/MIRC.hi
-${HS_IMPL}/Language/Haskell/HsColour/MIRC.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/Options.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/Options.hi
-${HS_IMPL}/Language/Haskell/HsColour/Options.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/Output.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/Output.hi
-${HS_IMPL}/Language/Haskell/HsColour/Output.p_hi
-${HS_IMPL}/Language/Haskell/HsColour/TTY.dyn_hi
-${HS_IMPL}/Language/Haskell/HsColour/TTY.hi
-${HS_IMPL}/Language/Haskell/HsColour/TTY.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
+lib/hscolour-${PKGVERSION}/${HS_VERSION}/package-description
+lib/hscolour-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ACSS.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ACSS.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ACSS.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ANSI.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ANSI.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ANSI.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Anchors.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Anchors.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Anchors.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/CSS.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/CSS.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/CSS.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Classify.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Classify.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Classify.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ColourHighlight.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ColourHighlight.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/ColourHighlight.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Colourise.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Colourise.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Colourise.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/General.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/General.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/General.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/HTML.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/HTML.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/HTML.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/InlineCSS.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/InlineCSS.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/InlineCSS.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/LaTeX.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/LaTeX.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/LaTeX.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/MIRC.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/MIRC.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/MIRC.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Options.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Options.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Options.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Output.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Output.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/Output.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/TTY.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/TTY.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Haskell/HsColour/TTY.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_DOCS}/LICENCE-LGPL
-${HS_DOCS}/html/Language-Haskell-HsColour-ACSS.html
-${HS_DOCS}/html/Language-Haskell-HsColour-ANSI.html
-${HS_DOCS}/html/Language-Haskell-HsColour-Anchors.html
-${HS_DOCS}/html/Language-Haskell-HsColour-CSS.html
-${HS_DOCS}/html/Language-Haskell-HsColour-Classify.html
-${HS_DOCS}/html/Language-Haskell-HsColour-ColourHighlight.html
-${HS_DOCS}/html/Language-Haskell-HsColour-Colourise.html
-${HS_DOCS}/html/Language-Haskell-HsColour-General.html
-${HS_DOCS}/html/Language-Haskell-HsColour-HTML.html
-${HS_DOCS}/html/Language-Haskell-HsColour-InlineCSS.html
-${HS_DOCS}/html/Language-Haskell-HsColour-LaTeX.html
-${HS_DOCS}/html/Language-Haskell-HsColour-MIRC.html
-${HS_DOCS}/html/Language-Haskell-HsColour-Options.html
-${HS_DOCS}/html/Language-Haskell-HsColour-Output.html
-${HS_DOCS}/html/Language-Haskell-HsColour-TTY.html
-${HS_DOCS}/html/Language-Haskell-HsColour.html
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/hscolour.haddock
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/synopsis.png
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/LICENCE-LGPL
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ACSS.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ANSI.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Anchors.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-CSS.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Classify.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-ColourHighlight.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Colourise.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-General.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-HTML.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-InlineCSS.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-LaTeX.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-MIRC.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Options.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-Output.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour-TTY.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/Language-Haskell-HsColour.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/hscolour.haddock
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/hscolour-${PKGVERSION}/html/synopsis.png
share/${HS_PLATFORM}/hscolour-${PKGVERSION}/data/rgb24-example-.hscolour
share/${HS_PLATFORM}/hscolour-${PKGVERSION}/hscolour.css
diff -r ddbea95434c5 -r 8c17b9688e64 textproc/hs-hscolour/distinfo
--- a/textproc/hs-hscolour/distinfo Sat Apr 24 16:50:41 2021 +0000
+++ b/textproc/hs-hscolour/distinfo Sat Apr 24 17:00:46 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2020/01/02 14:25:33 pho Exp $
+$NetBSD: distinfo,v 1.4 2021/04/24 17:00:46 pho Exp $
SHA1 (hscolour-1.24.4.tar.gz) = 6b9d64a56dc3436a352824eac367e1e40ae149b3
RMD160 (hscolour-1.24.4.tar.gz) = 385831baaead9b6dd1d37bcf45a61c53160b3405
SHA512 (hscolour-1.24.4.tar.gz) = 39b631c0a8346beff1c2e02ca8e72c1b1e3f7dafcedad7dc9de274e6750501de2bc553fe72a7d3459d4f9797e916f27e28ff96f705c2c0f9d3e0eec0ac6182c7
Size (hscolour-1.24.4.tar.gz) = 28729 bytes
+SHA1 (patch-hscolour.cabal) = bb57b5d665a39451ffbd96f3f9ac3c07308894ca
diff -r ddbea95434c5 -r 8c17b9688e64 textproc/hs-hscolour/patches/patch-hscolour.cabal
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/hs-hscolour/patches/patch-hscolour.cabal Sat Apr 24 17:00:46 2021 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-hscolour.cabal,v 1.1 2021/04/24 17:00:46 pho Exp $
+
+Fix build with GHC 9. This is probably a Cabal bug. When a package
+defines both a library an executable which share the same set of
+modules, Cabal appears to link an executable with rpath pointing at
+the build directory which doesn't serve any purpose.
+
+--- hscolour.cabal.orig 2021-04-24 16:56:21.123893246 +0000
++++ hscolour.cabal
+@@ -20,7 +20,7 @@ Description:
+ Category: Language
+ Build-Type: Simple
+ Data-files: hscolour.css, data/rgb24-example-.hscolour
+-Cabal-version: >=1.6
++Cabal-version: >=1.8
+
+
+ Library
+@@ -47,7 +47,7 @@ Library
+
+
+ Executable HsColour
+- Build-depends: base < 10, containers
++ Build-depends: base < 10, containers, hscolour
+ Main-is: HsColour.hs
+ --ghc-options: -O -W
+ Extensions: CPP
Home |
Main Index |
Thread Index |
Old Index