CVS commit: pkgsrc/converters/hs-aeson-pretty

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Jan 27 16:06:25 UTC 2023

Modified Files:
        pkgsrc/converters/hs-aeson-pretty: Makefile PLIST buildlink3.mk
            distinfo
Removed Files:
        pkgsrc/converters/hs-aeson-pretty/patches: patch-aeson-pretty.cabal

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


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

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-pretty/Makefile
diff -u pkgsrc/converters/hs-aeson-pretty/Makefile:1.7 pkgsrc/converters/hs-aeson-pretty/Makefile:1.8
--- pkgsrc/converters/hs-aeson-pretty/Makefile:1.7      Sat Aug 20 08:08:12 2022
+++ pkgsrc/converters/hs-aeson-pretty/Makefile  Fri Jan 27 16:06:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/08/20 08:08:12 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2023/01/27 16:06:25 pho Exp $
 
 DISTNAME=      aeson-pretty-0.8.9
 PKGREVISION=   3
@@ -8,12 +8,19 @@ MAINTAINER=   pho%cielonegro.org@localhost
 COMMENT=       JSON pretty-printing library and command-line tool
 LICENSE=       modified-bsd
 
+HASKELL_UNRESTRICT_DEPENDENCIES+=      \
+       aeson
+
+# lib:aeson-pretty
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../devel/hs-base-compat/buildlink3.mk"
 .include "../../math/hs-scientific/buildlink3.mk"
 .include "../../devel/hs-unordered-containers/buildlink3.mk"
 .include "../../devel/hs-vector/buildlink3.mk"
+
+# exe:aeson-pretty
 .include "../../textproc/hs-attoparsec/buildlink3.mk"
 .include "../../devel/hs-cmdargs/buildlink3.mk"
+
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/converters/hs-aeson-pretty/buildlink3.mk
diff -u pkgsrc/converters/hs-aeson-pretty/buildlink3.mk:1.7 pkgsrc/converters/hs-aeson-pretty/buildlink3.mk:1.8
--- pkgsrc/converters/hs-aeson-pretty/buildlink3.mk:1.7 Sat Aug 20 08:08:12 2022
+++ pkgsrc/converters/hs-aeson-pretty/buildlink3.mk     Fri Jan 27 16:06:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2022/08/20 08:08:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2023/01/27 16:06:25 pho Exp $
 
 BUILDLINK_TREE+=       hs-aeson-pretty
 
@@ -14,8 +14,6 @@ BUILDLINK_PKGSRCDIR.hs-aeson-pretty?= ..
 .include "../../math/hs-scientific/buildlink3.mk"
 .include "../../devel/hs-unordered-containers/buildlink3.mk"
 .include "../../devel/hs-vector/buildlink3.mk"
-.include "../../textproc/hs-attoparsec/buildlink3.mk"
-.include "../../devel/hs-cmdargs/buildlink3.mk"
 .endif # HS_AESON_PRETTY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-aeson-pretty

Index: pkgsrc/converters/hs-aeson-pretty/PLIST
diff -u pkgsrc/converters/hs-aeson-pretty/PLIST:1.2 pkgsrc/converters/hs-aeson-pretty/PLIST:1.3
--- pkgsrc/converters/hs-aeson-pretty/PLIST:1.2 Fri Apr 23 08:50:40 2021
+++ pkgsrc/converters/hs-aeson-pretty/PLIST     Fri Jan 27 16:06:25 2023
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2021/04/23 08:50:40 pho Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/01/27 16:06:25 pho Exp $
 bin/aeson-pretty
 lib/aeson-pretty-${PKGVERSION}/${HS_VERSION}/package-description
 lib/aeson-pretty-${PKGVERSION}/${HS_VERSION}/package-id
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/Encode/Pretty.dyn_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/Encode/Pretty.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/Encode/Pretty.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/Encode/Pretty.p_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/Encode/Pretty.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-pretty-${PKGVERSION}/LICENSE
-share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/Data-Aeson-Encode-Pretty.html
-share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/aeson-pretty.haddock
-share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/doc-index.html
-share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/haddock-bundle.min.js
-share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/index.html
-share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/linuwial.css
-share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/meta.json
-share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/quick-jump.css
-share/doc/${HS_PLATFORM}/aeson-pretty-${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-pretty-${PKGVERSION}/LICENSE
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/Data-Aeson-Encode-Pretty.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/aeson-pretty.haddock
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/haddock-bundle.min.js
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/linuwial.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/meta.json
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-pretty-${PKGVERSION}/html/synopsis.png

Index: pkgsrc/converters/hs-aeson-pretty/distinfo
diff -u pkgsrc/converters/hs-aeson-pretty/distinfo:1.5 pkgsrc/converters/hs-aeson-pretty/distinfo:1.6
--- pkgsrc/converters/hs-aeson-pretty/distinfo:1.5      Tue Aug 23 14:10:52 2022
+++ pkgsrc/converters/hs-aeson-pretty/distinfo  Fri Jan 27 16:06:25 2023
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2022/08/23 14:10:52 wiz Exp $
+$NetBSD: distinfo,v 1.6 2023/01/27 16:06:25 pho Exp $
 
 BLAKE2s (aeson-pretty-0.8.9.tar.gz) = d5e3494741f0dd904edf6bd0ceffe869c2154ec9923f51bbf5de4f6a203d3976
 SHA512 (aeson-pretty-0.8.9.tar.gz) = 00c99799cbe9e268109116f909ea0d9ef2708e578ec363ba5455b43d76d1f89bc9820dcbd3a63a1fb300460d97a71105f028f4ad9853b56ce16a097826b1d3d5
 Size (aeson-pretty-0.8.9.tar.gz) = 5802 bytes
-SHA1 (patch-aeson-pretty.cabal) = b80e1ff80ed7c29da1cc194093506cb26c91f734