CVS commit: pkgsrc/devel/hs-errors

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/hs-errors
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Thu, 26 Jan 2023 09:33:08 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Jan 26 09:33:08 UTC 2023

Modified Files:
        pkgsrc/devel/hs-errors: Makefile PLIST buildlink3.mk distinfo
Removed Files:
        pkgsrc/devel/hs-errors/patches: patch-errors.cabal

Log Message:
devel/hs-errors: Fix build with GHC 9.4


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/hs-errors/Makefile \
    pkgsrc/devel/hs-errors/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/hs-errors/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/hs-errors/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/hs-errors/patches/patch-errors.cabal

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/hs-errors/Makefile
diff -u pkgsrc/devel/hs-errors/Makefile:1.6 pkgsrc/devel/hs-errors/Makefile:1.7
--- pkgsrc/devel/hs-errors/Makefile:1.6 Sat Feb 26 03:57:53 2022
+++ pkgsrc/devel/hs-errors/Makefile     Thu Jan 26 09:33:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/02/26 03:57:53 pho Exp $
+# $NetBSD: Makefile,v 1.7 2023/01/26 09:33:08 pho Exp $
 
 DISTNAME=      errors-2.3.0
 PKGREVISION=   4
@@ -8,7 +8,11 @@ MAINTAINER=    pho%cielonegro.org@localhost
 COMMENT=       Simplified error-handling
 LICENSE=       modified-bsd
 
-.include "../../devel/hs-safe/buildlink3.mk"
+HASKELL_UNRESTRICT_DEPENDENCIES+=      \
+       text    \
+       transformers-compat
+
 .include "../../devel/hs-transformers-compat/buildlink3.mk"
+.include "../../devel/hs-safe/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/hs-errors/buildlink3.mk
diff -u pkgsrc/devel/hs-errors/buildlink3.mk:1.6 pkgsrc/devel/hs-errors/buildlink3.mk:1.7
--- pkgsrc/devel/hs-errors/buildlink3.mk:1.6    Sat Feb 26 03:57:53 2022
+++ pkgsrc/devel/hs-errors/buildlink3.mk        Thu Jan 26 09:33:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2022/02/26 03:57:53 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2023/01/26 09:33:08 pho Exp $
 
 BUILDLINK_TREE+=       hs-errors
 
@@ -9,8 +9,8 @@ BUILDLINK_API_DEPENDS.hs-errors+=       hs-err
 BUILDLINK_ABI_DEPENDS.hs-errors+=      hs-errors>=2.3.0nb4
 BUILDLINK_PKGSRCDIR.hs-errors?=                ../../devel/hs-errors
 
-.include "../../devel/hs-safe/buildlink3.mk"
 .include "../../devel/hs-transformers-compat/buildlink3.mk"
+.include "../../devel/hs-safe/buildlink3.mk"
 .endif # HS_ERRORS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-errors

Index: pkgsrc/devel/hs-errors/PLIST
diff -u pkgsrc/devel/hs-errors/PLIST:1.2 pkgsrc/devel/hs-errors/PLIST:1.3
--- pkgsrc/devel/hs-errors/PLIST:1.2    Fri Apr 23 09:10:06 2021
+++ pkgsrc/devel/hs-errors/PLIST        Thu Jan 26 09:33:08 2023
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.2 2021/04/23 09:10:06 pho Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/01/26 09:33:08 pho Exp $
 lib/errors-${PKGVERSION}/${HS_VERSION}/package-description
 lib/errors-${PKGVERSION}/${HS_VERSION}/package-id
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error.dyn_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Safe.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Safe.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Safe.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Safe.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Script.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Safe.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Script.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Script.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Script.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Util.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Script.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Util.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Util.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Util.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/EitherR.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Util.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/EitherR.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/EitherR.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/EitherR.p_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/EitherR.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
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/LICENSE
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error-Safe.html
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error-Script.html
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error-Util.html
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error.html
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Data-EitherR.html
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/doc-index.html
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/errors.haddock
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/haddock-bundle.min.js
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/index.html
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/linuwial.css
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/meta.json
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/quick-jump.css
-share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/synopsis.png
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/LICENSE
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error-Safe.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error-Script.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error-Util.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Data-EitherR.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/errors.haddock
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/haddock-bundle.min.js
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/linuwial.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/meta.json
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/synopsis.png

Index: pkgsrc/devel/hs-errors/distinfo
diff -u pkgsrc/devel/hs-errors/distinfo:1.4 pkgsrc/devel/hs-errors/distinfo:1.5
--- pkgsrc/devel/hs-errors/distinfo:1.4 Fri Feb 11 13:36:25 2022
+++ pkgsrc/devel/hs-errors/distinfo     Thu Jan 26 09:33:08 2023
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2022/02/11 13:36:25 pho Exp $
+$NetBSD: distinfo,v 1.5 2023/01/26 09:33:08 pho Exp $
 
 BLAKE2s (errors-2.3.0.tar.gz) = 24f8d08e30fd11e3443063084b56f643f3787e58b00c996917f76b6f03654745
 SHA512 (errors-2.3.0.tar.gz) = dddfc63505fd7023c4a669b3cc3d736cf7ecb774b53dcdfeee2d203dcdf4684f5d149a1c217134de214b64af4e154a3ef08b315615c85a1c734ceb42e80823b4
 Size (errors-2.3.0.tar.gz) = 9184 bytes
-SHA1 (patch-errors.cabal) = b681b1edfd7b938b63d439c830072a00de503dd4

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/converters/hs-text-conversions
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/converters/hs-text-conversions
Indexes:

Home | Main Index | Thread Index | Old Index