CVS commit: pkgsrc/converters/hs-aeson-better-errors

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Jan 27 16:09:29 UTC 2023

Modified Files:
        pkgsrc/converters/hs-aeson-better-errors: Makefile PLIST

Log Message:
converters/hs-aeson-better-errors: Fix build with aeson-2.1


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/converters/hs-aeson-better-errors/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/hs-aeson-better-errors/PLIST

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

Modified files:

Index: pkgsrc/converters/hs-aeson-better-errors/Makefile
diff -u pkgsrc/converters/hs-aeson-better-errors/Makefile:1.5 pkgsrc/converters/hs-aeson-better-errors/Makefile:1.6
--- pkgsrc/converters/hs-aeson-better-errors/Makefile:1.5       Wed Sep  7 06:50:44 2022
+++ pkgsrc/converters/hs-aeson-better-errors/Makefile   Fri Jan 27 16:09:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/09/07 06:50:44 pho Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/27 16:09:29 pho Exp $
 
 DISTNAME=      aeson-better-errors-0.9.1.1
 PKGREVISION=   1
@@ -8,11 +8,8 @@ MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Better error messages when decoding JSON values
 LICENSE=       mit
 
-# Relax version constraints.
-SUBST_CLASSES+=                cabal
-SUBST_STAGE.cabal=     post-extract
-SUBST_FILES.cabal=     aeson-better-errors.cabal
-SUBST_SED.cabal=       -e 's/aeson >=0.7 && <1.6 || >=2.0 && <2.1/aeson/'
+HASKELL_UNRESTRICT_DEPENDENCIES+=      \
+       aeson
 
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../devel/hs-dlist/buildlink3.mk"

Index: pkgsrc/converters/hs-aeson-better-errors/PLIST
diff -u pkgsrc/converters/hs-aeson-better-errors/PLIST:1.1 pkgsrc/converters/hs-aeson-better-errors/PLIST:1.2
--- pkgsrc/converters/hs-aeson-better-errors/PLIST:1.1  Wed Feb 23 16:08:53 2022
+++ pkgsrc/converters/hs-aeson-better-errors/PLIST      Fri Jan 27 16:09:29 2023
@@ -1,26 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1 2022/02/23 16:08:53 pho Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/01/27 16:09:29 pho Exp $
 lib/aeson-better-errors-${PKGVERSION}/${HS_VERSION}/package-description
 lib/aeson-better-errors-${PKGVERSION}/${HS_VERSION}/package-id
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.dyn_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.p_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.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}/aeson-better-errors-${PKGVERSION}/LICENSE
-share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors-Internal.html
-share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors.html
-share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/aeson-better-errors.haddock
-share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/doc-index.html
-share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/haddock-bundle.min.js
-share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/index.html
-share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/linuwial.css
-share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/meta.json
-share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/quick-jump.css
-share/doc/${HS_PLATFORM}/aeson-better-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}/aeson-better-errors-${PKGVERSION}/LICENSE
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors-Internal.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/aeson-better-errors.haddock
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/haddock-bundle.min.js
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/linuwial.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/meta.json
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/synopsis.png