pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/hs-hiedb



Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Jan 26 17:46:41 UTC 2023

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

Log Message:
devel/hs-hiedb: Update to 0.4.2.0

0.4.2.0 -- 2022-09-12
* Support GHC 9.4


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

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-hiedb/Makefile
diff -u pkgsrc/devel/hs-hiedb/Makefile:1.6 pkgsrc/devel/hs-hiedb/Makefile:1.7
--- pkgsrc/devel/hs-hiedb/Makefile:1.6  Wed Nov 23 16:18:37 2022
+++ pkgsrc/devel/hs-hiedb/Makefile      Thu Jan 26 17:46:41 2023
@@ -1,18 +1,21 @@
-# $NetBSD: Makefile,v 1.6 2022/11/23 16:18:37 adam Exp $
+# $NetBSD: Makefile,v 1.7 2023/01/26 17:46:41 pho Exp $
 
-DISTNAME=      hiedb-0.4.1.0
-PKGREVISION=   5
+DISTNAME=      hiedb-0.4.2.0
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Generates a references DB from .hie files
 LICENSE=       modified-bsd
 
-# purs is built with optparse-applicative, and can generate shell
+HASKELL_UNRESTRICT_DEPENDENCIES+=      \
+       algebraic-graphs
+
+# hiedb is built with optparse-applicative, and can generate shell
 # completion scripts automatically.
 OPTPARSE_APPLICATIVE_EXECUTABLES+=     hiedb
 .include "../../devel/hs-optparse-applicative/application.mk"
 
+# lib:hiedb
 .include "../../math/hs-algebraic-graphs/buildlink3.mk"
 .include "../../devel/hs-ansi-terminal/buildlink3.mk"
 .include "../../misc/hs-extra/buildlink3.mk"
@@ -21,6 +24,9 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+=    hiedb
 .include "../../devel/hs-optparse-applicative/buildlink3.mk"
 .include "../../databases/hs-sqlite-simple/buildlink3.mk"
 .include "../../devel/hs-terminal-size/buildlink3.mk"
+
+# exe:hiedb
 .include "../../devel/hs-ghc-paths/buildlink3.mk"
+
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/hs-hiedb/PLIST
diff -u pkgsrc/devel/hs-hiedb/PLIST:1.1 pkgsrc/devel/hs-hiedb/PLIST:1.2
--- pkgsrc/devel/hs-hiedb/PLIST:1.1     Wed Feb 16 09:44:11 2022
+++ pkgsrc/devel/hs-hiedb/PLIST Thu Jan 26 17:46:41 2023
@@ -1,76 +1,76 @@
-@comment $NetBSD: PLIST,v 1.1 2022/02/16 09:44:11 pho Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/01/26 17:46:41 pho Exp $
 bin/hiedb
 lib/hiedb-${PKGVERSION}/${HS_VERSION}/package-description
 lib/hiedb-${PKGVERSION}/${HS_VERSION}/package-id
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb.dyn_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HieDb.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Compat.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Compat.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Compat.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Compat.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Create.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Compat.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Create.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Create.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Create.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Dump.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Create.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Dump.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Dump.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Dump.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Html.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Dump.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Html.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Html.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Html.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Query.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Html.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Query.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Query.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Query.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Run.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Query.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Run.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Run.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Run.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Types.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Run.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Types.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Types.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Types.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Utils.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Types.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Utils.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Utils.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/Utils.p_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HieDb/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}/hiedb-${PKGVERSION}/LICENSE
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Compat.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Create.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Dump.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Html.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Query.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Run.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Types.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Utils.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-58.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-60.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-A.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-All.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-C.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-D.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-E.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-F.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-G.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-H.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-I.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-K.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-L.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-M.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-N.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-O.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-P.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-Q.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-R.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-S.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-T.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-U.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-V.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-W.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/haddock-bundle.min.js
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/hiedb.haddock
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/index.html
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/linuwial.css
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/meta.json
-share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/quick-jump.css
-share/doc/${HS_PLATFORM}/hiedb-${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}/hiedb-${PKGVERSION}/LICENSE
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Compat.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Create.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Dump.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Html.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Query.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Run.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Types.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb-Utils.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/HieDb.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-58.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-60.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-A.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-All.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-C.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-D.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-E.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-F.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-G.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-H.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-I.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-K.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-L.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-M.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-N.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-O.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-P.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-Q.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-R.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-S.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-T.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-U.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-V.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index-W.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/haddock-bundle.min.js
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/hiedb.haddock
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/linuwial.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/meta.json
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/hiedb-${PKGVERSION}/html/synopsis.png
Index: pkgsrc/devel/hs-hiedb/distinfo
diff -u pkgsrc/devel/hs-hiedb/distinfo:1.1 pkgsrc/devel/hs-hiedb/distinfo:1.2
--- pkgsrc/devel/hs-hiedb/distinfo:1.1  Wed Feb 16 09:44:11 2022
+++ pkgsrc/devel/hs-hiedb/distinfo      Thu Jan 26 17:46:41 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/02/16 09:44:11 pho Exp $
+$NetBSD: distinfo,v 1.2 2023/01/26 17:46:41 pho Exp $
 
-BLAKE2s (hiedb-0.4.1.0.tar.gz) = 1132e7c7d8a455729096d19f37fba7157e14a6ae728e29e2a63d11b2d99f2544
-SHA512 (hiedb-0.4.1.0.tar.gz) = b4d20f110e756a4bc056df41d6115e9faa8c91b2668abbae64de27b6169e4fb7e1067e1584f7a08dcc6e7a82923e41bab02ad7f0c6958fae764e94a46ee01aed
-Size (hiedb-0.4.1.0.tar.gz) = 27822 bytes
-SHA1 (patch-hiedb.cabal) = 2c6cdfd6e571f2511b89f6f9f79ba8d874b0e174
+BLAKE2s (hiedb-0.4.2.0.tar.gz) = 867db56fd13a72db0419d44f75239fa0a8be44779acdf142fc44b484dfebf6c7
+SHA512 (hiedb-0.4.2.0.tar.gz) = 77b7b45ed63e72c8e93a7945f76449e3350f3bf4f6e6c5e6e526e44d852c9fcc20019fc0ac734e367722cf212ba99518ee7a1f6fa28decb4f236c93ad3f7dde8
+Size (hiedb-0.4.2.0.tar.gz) = 27945 bytes
+SHA1 (patch-src_HieDb_Query.hs) = b1093cb1d99e6d70fac92322aedb8a62d2099e62

Index: pkgsrc/devel/hs-hiedb/buildlink3.mk
diff -u pkgsrc/devel/hs-hiedb/buildlink3.mk:1.5 pkgsrc/devel/hs-hiedb/buildlink3.mk:1.6
--- pkgsrc/devel/hs-hiedb/buildlink3.mk:1.5     Wed Nov 23 16:18:37 2022
+++ pkgsrc/devel/hs-hiedb/buildlink3.mk Thu Jan 26 17:46:41 2023
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/11/23 16:18:37 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2023/01/26 17:46:41 pho Exp $
 
 BUILDLINK_TREE+=       hs-hiedb
 
 .if !defined(HS_HIEDB_BUILDLINK3_MK)
 HS_HIEDB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-hiedb+=       hs-hiedb>=0.4.1
-BUILDLINK_ABI_DEPENDS.hs-hiedb+=       hs-hiedb>=0.4.1.0nb5
+BUILDLINK_API_DEPENDS.hs-hiedb+=       hs-hiedb>=0.4.2
+BUILDLINK_ABI_DEPENDS.hs-hiedb+=       hs-hiedb>=0.4.2.0
 BUILDLINK_PKGSRCDIR.hs-hiedb?=         ../../devel/hs-hiedb
 
 .include "../../math/hs-algebraic-graphs/buildlink3.mk"

Added files:

Index: pkgsrc/devel/hs-hiedb/patches/patch-src_HieDb_Query.hs
diff -u /dev/null pkgsrc/devel/hs-hiedb/patches/patch-src_HieDb_Query.hs:1.1
--- /dev/null   Thu Jan 26 17:46:41 2023
+++ pkgsrc/devel/hs-hiedb/patches/patch-src_HieDb_Query.hs      Thu Jan 26 17:46:41 2023
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_HieDb_Query.hs,v 1.1 2023/01/26 17:46:41 pho Exp $
+
+Fix build with algebraic-graphs-0.7:
+https://github.com/wz1000/HieDb/pull/44
+
+--- src/HieDb/Query.hs.orig    2023-01-26 17:43:53.352091323 +0000
++++ src/HieDb/Query.hs
+@@ -267,4 +267,4 @@ getReachableUnreachable db symbols = do
+   return (Set.toList xs, Set.toList ys)
+ 
+ splitByReachability :: Ord a => AdjacencyMap a -> [a] -> (Set a, Set a)
+-splitByReachability m vs = let s = Set.fromList (dfs vs m) in (s, vertexSet m Set.\\ s)
++splitByReachability m vs = let s = Set.fromList (dfs m vs) in (s, vertexSet m Set.\\ s)



Home | Main Index | Thread Index | Old Index