CVS commit: pkgsrc/converters/hs-base64

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 30 07:59:38 UTC 2023

Modified Files:
        pkgsrc/converters/hs-base64: Makefile distinfo
Added Files:
        pkgsrc/converters/hs-base64/patches: patch-base64.cabal

Log Message:
hs-base64: manually unrestrict 'base'

HASKELL_UNRESTRICT_DEPENDENCIES has issues because 'base' matches 'base64'


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/hs-base64/Makefile \
    pkgsrc/converters/hs-base64/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/converters/hs-base64/patches/patch-base64.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-base64/Makefile
diff -u pkgsrc/converters/hs-base64/Makefile:1.1 pkgsrc/converters/hs-base64/Makefile:1.2
--- pkgsrc/converters/hs-base64/Makefile:1.1    Sat Jan 28 18:23:35 2023
+++ pkgsrc/converters/hs-base64/Makefile        Mon Jan 30 07:59:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/01/28 18:23:35 pho Exp $
+# $NetBSD: Makefile,v 1.2 2023/01/30 07:59:37 wiz Exp $
 
 DISTNAME=      base64-0.4.2.4
 CATEGORIES=    converters
@@ -8,7 +8,6 @@ COMMENT=        Modern RFC 4648-compliant Base6
 LICENSE=       modified-bsd
 
 HASKELL_UNRESTRICT_DEPENDENCIES+=      \
-       base    \
        text
 
 .include "../../textproc/hs-text-short/buildlink3.mk"
Index: pkgsrc/converters/hs-base64/distinfo
diff -u pkgsrc/converters/hs-base64/distinfo:1.1 pkgsrc/converters/hs-base64/distinfo:1.2
--- pkgsrc/converters/hs-base64/distinfo:1.1    Sat Jan 28 18:23:35 2023
+++ pkgsrc/converters/hs-base64/distinfo        Mon Jan 30 07:59:37 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2023/01/28 18:23:35 pho Exp $
+$NetBSD: distinfo,v 1.2 2023/01/30 07:59:37 wiz 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
+SHA1 (patch-base64.cabal) = 6127c823ff69e3a79d63cb85f07f92bf9e2f23c7

Added files:

Index: pkgsrc/converters/hs-base64/patches/patch-base64.cabal
diff -u /dev/null pkgsrc/converters/hs-base64/patches/patch-base64.cabal:1.1
--- /dev/null   Mon Jan 30 07:59:38 2023
+++ pkgsrc/converters/hs-base64/patches/patch-base64.cabal      Mon Jan 30 07:59:38 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-base64.cabal,v 1.1 2023/01/30 07:59:38 wiz Exp $
+
+Unrestrict 'base' dependency, HASKELL_UNRESTRICT_DEPENDENCIES does
+too much since 'base' matches 'base64'.
+
+--- base64.cabal.orig  2023-01-30 07:53:35.450363448 +0000
++++ base64.cabal
+@@ -51,7 +51,7 @@ library
+     Data.ByteString.Base64.Internal.W64.Loop
+ 
+   build-depends:
+-      base           >=4.14     && <4.17
++      base           >=4.14
+     , bytestring     >=0.10     && <0.12
+     , deepseq        >=1.4.3.0  && <1.5
+     , text
+@@ -68,7 +68,7 @@ test-suite tasty
+   other-modules:    Internal
+   main-is:          Main.hs
+   build-depends:
+-      base               >=4.14 && <4.17
++      base               >=4.14
+     , base64
+     , base64-bytestring
+     , bytestring
+@@ -88,7 +88,7 @@ benchmark bench
+   hs-source-dirs:   benchmarks
+   main-is:          Base64Bench.hs
+   build-depends:
+-      base               >=4.14 && <4.17
++      base               >=4.14
+     , base64
+     , base64-bytestring
+     , bytestring