diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile index 6b64d866d0ec..2fbade2faa73 100644 --- a/devel/hs-hashtables/Makefile +++ b/devel/hs-hashtables/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2022/08/20 08:08:14 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2023/01/26 03:28:56 pho Exp $ -DISTNAME= hashtables-1.3 -PKGREVISION= 3 +DISTNAME= hashtables-1.3.1 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/hs-hashtables/PLIST b/devel/hs-hashtables/PLIST index 9f8124f7337d..1a70ca35228f 100644 --- a/devel/hs-hashtables/PLIST +++ b/devel/hs-hashtables/PLIST @@ -1,56 +1,56 @@ -@comment $NetBSD: PLIST,v 1.2 2021/04/24 04:49:49 pho Exp $ +@comment $NetBSD: PLIST,v 1.3 2023/01/26 03:28:56 pho Exp $ lib/hashtables-${PKGVERSION}/${HS_VERSION}/package-description lib/hashtables-${PKGVERSION}/${HS_VERSION}/package-id -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Class.dyn_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Class.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Class.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Class.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/IO.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Class.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/IO.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/IO.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/IO.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Array.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/IO.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Array.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Array.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Array.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CacheLine.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Array.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CacheLine.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CacheLine.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CacheLine.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CheapPseudoRandomBitStream.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CacheLine.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CheapPseudoRandomBitStream.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CheapPseudoRandomBitStream.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CheapPseudoRandomBitStream.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/IntArray.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/CheapPseudoRandomBitStream.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/IntArray.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/IntArray.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/IntArray.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Linear/Bucket.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/IntArray.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Linear/Bucket.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Linear/Bucket.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Linear/Bucket.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/UnsafeTricks.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Linear/Bucket.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/UnsafeTricks.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/UnsafeTricks.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/UnsafeTricks.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Utils.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/UnsafeTricks.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Utils.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Utils.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Utils.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Basic.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/Internal/Utils.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Basic.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Basic.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Basic.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Cuckoo.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Basic.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Cuckoo.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Cuckoo.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Cuckoo.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Linear.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Cuckoo.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Linear.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Linear.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Linear.p_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/HashTable/ST/Linear.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}/hashtables-${PKGVERSION}/LICENSE -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-Class.html -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-IO.html -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-ST-Basic.html -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-ST-Cuckoo.html -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-ST-Linear.html -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/doc-index.html -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/haddock-bundle.min.js -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/hashtables.haddock -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/index.html -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/linuwial.css -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/meta.json -share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/quick-jump.css -share/doc/${HS_PLATFORM}/hashtables-${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}/hashtables-${PKGVERSION}/LICENSE +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-Class.html +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-IO.html +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-ST-Basic.html +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-ST-Cuckoo.html +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/Data-HashTable-ST-Linear.html +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/haddock-bundle.min.js +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/hashtables.haddock +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/linuwial.css +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/meta.json +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/hashtables-${PKGVERSION}/html/synopsis.png diff --git a/devel/hs-hashtables/buildlink3.mk b/devel/hs-hashtables/buildlink3.mk index 49b2eca660a6..1c84327c77a3 100644 --- a/devel/hs-hashtables/buildlink3.mk +++ b/devel/hs-hashtables/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2022/08/20 08:08:14 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2023/01/26 03:28:56 pho Exp $ BUILDLINK_TREE+= hs-hashtables .if !defined(HS_HASHTABLES_BUILDLINK3_MK) HS_HASHTABLES_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-hashtables+= hs-hashtables>=1.3 -BUILDLINK_ABI_DEPENDS.hs-hashtables+= hs-hashtables>=1.3nb3 +BUILDLINK_API_DEPENDS.hs-hashtables+= hs-hashtables>=1.3.1 +BUILDLINK_ABI_DEPENDS.hs-hashtables+= hs-hashtables>=1.3.1 BUILDLINK_PKGSRCDIR.hs-hashtables?= ../../devel/hs-hashtables .include "../../devel/hs-hashable/buildlink3.mk" diff --git a/devel/hs-hashtables/distinfo b/devel/hs-hashtables/distinfo index c64ce34be5aa..16e4d81234ea 100644 --- a/devel/hs-hashtables/distinfo +++ b/devel/hs-hashtables/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.6 2022/08/22 10:17:39 wiz Exp $ +$NetBSD: distinfo,v 1.7 2023/01/26 03:28:56 pho Exp $ -BLAKE2s (hashtables-1.3.tar.gz) = fbd7cec05a1bd3df818a1e74adc3061986f22e0b84af9f2190a05b3bd2aa5279 -SHA512 (hashtables-1.3.tar.gz) = 7fb82e7c45c13d7bde8a216fb678d20bbd4c970f7860cbc2f08fb5524324f6b9584e1b5d397bdcb3fdbf53928758b608986167bb2bc2f1adae6feb3b0dd94444 -Size (hashtables-1.3.tar.gz) = 58599 bytes -SHA1 (patch-hashtables.cabal) = c1f036d205b25321abd5cd5ad8c30968146b27dc +BLAKE2s (hashtables-1.3.1.tar.gz) = c0483b406ea5b5e9504612e0f41a40b6d5cb18deb3eb65fc5165675772079438 +SHA512 (hashtables-1.3.1.tar.gz) = b6430e092cfa9cde3dbea34cd9e2a10869c41e40e88f79e28aa6aabfdcd359dd74fb87020f8b9e004b817a6e9a8825335fcc91c2b88f7eb93b25758c71c77833 +Size (hashtables-1.3.1.tar.gz) = 58697 bytes diff --git a/devel/hs-hashtables/patches/patch-hashtables.cabal b/devel/hs-hashtables/patches/patch-hashtables.cabal deleted file mode 100644 index 94430b3ea26d..000000000000 --- a/devel/hs-hashtables/patches/patch-hashtables.cabal +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-hashtables.cabal,v 1.1 2022/08/22 10:17:39 wiz Exp $ - -Allow building with hs-vector 0.14 - ---- hashtables.cabal.orig 2001-09-09 01:46:40.000000000 +0000 -+++ hashtables.cabal -@@ -194,7 +194,7 @@ Library - Build-depends: base >= 4.7 && <5, - hashable >= 1.4 && < 1.5, - primitive, -- vector >= 0.7 && <0.13 -+ vector >= 0.7 && <0.14 - - if flag(portable) - cpp-options: -DNO_C_SEARCH -DPORTABLE