From fd59ae1cc70e21fb69fba048425bd702305271ca Mon Sep 17 00:00:00 2001 From: pho Date: Wed, 1 May 2024 14:16:03 +0000 Subject: [PATCH] converters/hs-base64: Update to 1.0 1.0.0.0 New epoch time! lots of changes to the API. Please see MIGRATION.md for more info: Add support for GHC 9.x Bumped bounds to more modern dependency set Introduced Base64 newtype, located in Data.Base64.Types, as well as ADT for associated alphabets. Signature for encodeBase64 has changed so that it produces a Base64 wrapped value. decodeBase64 and its URLsafe variants now consume a value of type Base64 and produces a decoded value of the underlying type. The old decodeBase64 and its URLsafe variants is now renamed to decodeBase64Untyped*. Fix for 32-bit systems in which memory barriers were not respected in the encoe loop (see: #56) Optimize encode and decode loops to achieve significant speedup across the board. Thanks to everyone who contributed (especially @sofia-m-a!). --- converters/hs-base64/Makefile | 9 ++------- converters/hs-base64/PLIST | 19 +++++++++++-------- converters/hs-base64/buildlink3.mk | 6 +++--- converters/hs-base64/distinfo | 8 ++++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/converters/hs-base64/Makefile b/converters/hs-base64/Makefile index 569d86c78e17..2dc2d4a785f1 100644 --- a/converters/hs-base64/Makefile +++ b/converters/hs-base64/Makefile @@ -1,17 +1,12 @@ -# $NetBSD: Makefile,v 1.7 2023/11/02 06:36:11 pho Exp $ +# $NetBSD: Makefile,v 1.8 2024/05/01 14:16:03 pho Exp $ -DISTNAME= base64-0.4.2.4 -PKGREVISION= 3 +DISTNAME= base64-1.0 CATEGORIES= converters MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Modern RFC 4648-compliant Base64 library LICENSE= modified-bsd -HASKELL_UNRESTRICT_DEPENDENCIES+= \ - base \ - text - .include "../../textproc/hs-text-short/buildlink3.mk" .include "../../mk/haskell.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/hs-base64/PLIST b/converters/hs-base64/PLIST index f634fc05f323..cbdd915ca2a4 100644 --- a/converters/hs-base64/PLIST +++ b/converters/hs-base64/PLIST @@ -1,6 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2023/10/29 16:01:26 pho Exp $ -lib/base64-${PKGVERSION}/${HS_VERSION}/package-description -lib/base64-${PKGVERSION}/${HS_VERSION}/package-id +@comment $NetBSD: PLIST,v 1.3 2024/05/01 14:16:03 pho Exp $ +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Base64/Types.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Data/Base64/Types.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Base64/Types.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Base64/Types/Internal.dyn_hi +lib/${HS_PLATFORM}/${HS_PKGID}/Data/Base64/Types/Internal.hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Base64/Types/Internal.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64.p_hi @@ -22,9 +26,6 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/Util ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/W16/Loop.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/W16/Loop.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/W16/Loop.p_hi -${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/W32/Loop.dyn_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/W32/Loop.hi -${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/W32/Loop.p_hi ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/W64/Loop.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/W64/Loop.hi ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/ByteString/Base64/Internal/W64/Loop.p_hi @@ -67,8 +68,11 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Encoding/Base64/URL. lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so +lib/base64-${PKGVERSION}/${HS_VERSION}/package-description +lib/base64-${PKGVERSION}/${HS_VERSION}/package-id share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/LICENSE ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/CHANGELOG.md +${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/Data-Base64-Types.html ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/Data-ByteString-Base64-URL.html ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/Data-ByteString-Base64.html ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/Data-ByteString-Lazy-Base64-URL.html @@ -82,14 +86,13 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/Data-Text-Lazy-En ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/Data-Text-Lazy-Encoding-Base64.html ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/Data-Text-Short-Encoding-Base64-URL.html ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/Data-Text-Short-Encoding-Base64.html +${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/MIGRATION-${PKGVERSION}.md ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/README.md ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/base64.haddock ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/doc-index.html -${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/doc-index.json ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/haddock-bundle.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/index.html ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/linuwial.css ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/meta.json ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/quick-jump.css -${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/quick-jump.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/base64-${PKGVERSION}/html/synopsis.png diff --git a/converters/hs-base64/buildlink3.mk b/converters/hs-base64/buildlink3.mk index 0797be514b78..6b4ac7693cdf 100644 --- a/converters/hs-base64/buildlink3.mk +++ b/converters/hs-base64/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2023/11/02 06:36:11 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2024/05/01 14:16:03 pho Exp $ BUILDLINK_TREE+= hs-base64 .if !defined(HS_BASE64_BUILDLINK3_MK) HS_BASE64_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-base64+= hs-base64>=0.4.2 -BUILDLINK_ABI_DEPENDS.hs-base64+= hs-base64>=0.4.2.4nb3 +BUILDLINK_API_DEPENDS.hs-base64+= hs-base64>=1.0 +BUILDLINK_ABI_DEPENDS.hs-base64+= hs-base64>=1.0 BUILDLINK_PKGSRCDIR.hs-base64?= ../../converters/hs-base64 .include "../../textproc/hs-text-short/buildlink3.mk" diff --git a/converters/hs-base64/distinfo b/converters/hs-base64/distinfo index 3cab69669521..f5a9fd7791a7 100644 --- a/converters/hs-base64/distinfo +++ b/converters/hs-base64/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2023/01/30 11:49:15 wiz Exp $ +$NetBSD: distinfo,v 1.4 2024/05/01 14:16:03 pho Exp $ -BLAKE2s (base64-0.4.2.4.tar.gz) = 6792db2de83a162db8b8fbdf55333541ebdcac75a496a817e53c355d88b9da0f -SHA512 (base64-0.4.2.4.tar.gz) = cf7e0f3b7dbd336ecee0aad8df93793c9f72dbfc882f2f5491e3910693f2c530bb2d9762baea729cb7c5cc2a4c3bf130fdff2aa2661fc23e0c8d726de58deb6f -Size (base64-0.4.2.4.tar.gz) = 22065 bytes +BLAKE2s (base64-1.0.tar.gz) = f3a6e38cf237aa24e4a4546609e00a183e6e93b48355e8c62fb87d1170940d31 +SHA512 (base64-1.0.tar.gz) = ba37eeaafff55a4ddb5b59253b1e7a00ebf543fa2745583e476e3fbd45257e9ab0f69061ff83291356318f5952d6101e0779808df7bf5a8aa340638637866e8a +Size (base64-1.0.tar.gz) = 30399 bytes