CVS commit: pkgsrc/textproc/hs-text-short

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/hs-text-short
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Sat, 24 Apr 2021 06:05:49 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Apr 24 06:05:49 UTC 2021

Modified Files:
        pkgsrc/textproc/hs-text-short: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/textproc/hs-text-short/patches: patch-text-short.cabal

Log Message:
Fix build with GHC 9


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/hs-text-short/Makefile \
    pkgsrc/textproc/hs-text-short/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/hs-text-short/PLIST \
    pkgsrc/textproc/hs-text-short/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/textproc/hs-text-short/patches/patch-text-short.cabal

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/hs-text-short/Makefile
diff -u pkgsrc/textproc/hs-text-short/Makefile:1.2 pkgsrc/textproc/hs-text-short/Makefile:1.3
--- pkgsrc/textproc/hs-text-short/Makefile:1.2  Fri Apr  3 07:32:32 2020
+++ pkgsrc/textproc/hs-text-short/Makefile      Sat Apr 24 06:05:49 2021
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2020/04/03 07:32:32 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/24 06:05:49 pho Exp $
 
 DISTNAME=      text-short-0.1.3
 CATEGORIES=    textproc
-MASTER_SITES=  ${MASTER_SITE_HASKELL_HACKAGE:=text-short-${PKGVERSION_NOREV}/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://hackage.haskell.org/package/text-short
 COMMENT=       Memory-efficient representation of Unicode text strings
 LICENSE=       modified-bsd
 
-DEPENDS+=      hs-hashable-[0-9]*:../../devel/hs-hashable
-
+.include "../../devel/hs-hashable/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/hs-text-short/distinfo
diff -u pkgsrc/textproc/hs-text-short/distinfo:1.2 pkgsrc/textproc/hs-text-short/distinfo:1.3
--- pkgsrc/textproc/hs-text-short/distinfo:1.2  Thu Jul 16 17:56:43 2020
+++ pkgsrc/textproc/hs-text-short/distinfo      Sat Apr 24 06:05:49 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2020/07/16 17:56:43 riastradh Exp $
+$NetBSD: distinfo,v 1.3 2021/04/24 06:05:49 pho Exp $
 
 SHA1 (text-short-0.1.3.tar.gz) = e19f2a65a351185030553f51388c7b45fa135dc6
 RMD160 (text-short-0.1.3.tar.gz) = 18f758d202a55670bc1fc748e24d624d48cc1d12
 SHA512 (text-short-0.1.3.tar.gz) = 6d7a5379dbaf28a201dd44229959a293acb5ff57c4659a6a34af37e46b2e6fc5eb61a00ba26d36dd08795456246429ec20236af8e342fd0d03bfcf6d06d69428
 Size (text-short-0.1.3.tar.gz) = 24435 bytes
-SHA1 (patch-text-short.cabal) = ba4da137f2ce3c061f57cecd3f494e2bd3864364
+SHA1 (patch-text-short.cabal) = 43632121b9d9689f3a095dce365e93dc3ed1cb83

Index: pkgsrc/textproc/hs-text-short/PLIST
diff -u pkgsrc/textproc/hs-text-short/PLIST:1.1 pkgsrc/textproc/hs-text-short/PLIST:1.2
--- pkgsrc/textproc/hs-text-short/PLIST:1.1     Mon May 11 17:52:18 2020
+++ pkgsrc/textproc/hs-text-short/PLIST Sat Apr 24 06:05:49 2021
@@ -1,33 +1,33 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:18 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.2 2021/04/24 06:05:49 pho Exp $
+lib/text-short-${PKGVERSION}/${HS_VERSION}/package-description
+lib/text-short-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/Data/Text/Short.dyn_hi
-${HS_IMPL}/Data/Text/Short.hi
-${HS_IMPL}/Data/Text/Short.p_hi
-${HS_IMPL}/Data/Text/Short/Internal.dyn_hi
-${HS_IMPL}/Data/Text/Short/Internal.hi
-${HS_IMPL}/Data/Text/Short/Internal.p_hi
-${HS_IMPL}/Data/Text/Short/Partial.dyn_hi
-${HS_IMPL}/Data/Text/Short/Partial.hi
-${HS_IMPL}/Data/Text/Short/Partial.p_hi
-${HS_IMPL}/Data/Text/Short/Unsafe.dyn_hi
-${HS_IMPL}/Data/Text/Short/Unsafe.hi
-${HS_IMPL}/Data/Text/Short/Unsafe.p_hi
-${HS_IMPL}/PrimOps.dyn_hi
-${HS_IMPL}/PrimOps.hi
-${HS_IMPL}/PrimOps.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Data-Text-Short-Partial.html
-${HS_DOCS}/html/Data-Text-Short-Unsafe.html
-${HS_DOCS}/html/Data-Text-Short.html
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/synopsis.png
-${HS_DOCS}/html/text-short.haddock
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Internal.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Internal.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Internal.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Partial.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Partial.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Partial.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Unsafe.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Unsafe.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Unsafe.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/PrimOps.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/PrimOps.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/PrimOps.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/Data-Text-Short-Partial.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/Data-Text-Short-Unsafe.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/Data-Text-Short.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/synopsis.png
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/text-short.haddock
Index: pkgsrc/textproc/hs-text-short/buildlink3.mk
diff -u pkgsrc/textproc/hs-text-short/buildlink3.mk:1.1 pkgsrc/textproc/hs-text-short/buildlink3.mk:1.2
--- pkgsrc/textproc/hs-text-short/buildlink3.mk:1.1     Mon Mar 30 16:48:43 2020
+++ pkgsrc/textproc/hs-text-short/buildlink3.mk Sat Apr 24 06:05:49 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/03/30 16:48:43 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/04/24 06:05:49 pho Exp $
 
 BUILDLINK_TREE+=       hs-text-short
 
@@ -8,6 +8,8 @@ HS_TEXT_SHORT_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.hs-text-short+=  hs-text-short>=0.1.3
 BUILDLINK_ABI_DEPENDS.hs-text-short+=  hs-text-short>=0.1.3
 BUILDLINK_PKGSRCDIR.hs-text-short?=    ../../textproc/hs-text-short
+
+.include "../../devel/hs-hashable/buildlink3.mk"
 .endif # HS_TEXT_SHORT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-text-short

Index: pkgsrc/textproc/hs-text-short/patches/patch-text-short.cabal
diff -u pkgsrc/textproc/hs-text-short/patches/patch-text-short.cabal:1.2 pkgsrc/textproc/hs-text-short/patches/patch-text-short.cabal:1.3
--- pkgsrc/textproc/hs-text-short/patches/patch-text-short.cabal:1.2    Thu Jul 16 17:56:43 2020
+++ pkgsrc/textproc/hs-text-short/patches/patch-text-short.cabal        Sat Apr 24 06:05:49 2021
@@ -1,8 +1,6 @@
-$NetBSD: patch-text-short.cabal,v 1.2 2020/07/16 17:56:43 riastradh Exp $
+$NetBSD: patch-text-short.cabal,v 1.3 2021/04/24 06:05:49 pho Exp $
 
-Apply revisions 1 and 2 from hackage to support newer GHC.
-
-https://hackage.haskell.org/package/text-short-0.1.3/revisions/
+Fix build with GHC 9.
 
 --- text-short.cabal.orig      2019-07-20 15:36:12.000000000 +0000
 +++ text-short.cabal
@@ -11,14 +9,14 @@ https://hackage.haskell.org/package/text
    other-modules:       Data.Text.Short.Internal
  
 -  build-depends:       base        >= 4.7    && < 4.13
-+  build-depends:       base        >= 4.7    && < 4.15
++  build-depends:       base        >= 4.7    && < 5
                       , bytestring  >= 0.10.4 && < 0.11
                       , hashable    >= 1.2.6  && < 1.4
                       , deepseq     >= 1.3    && < 1.5
                       , text        >= 1.0    && < 1.3
                       , binary      >= 0.7.1  && < 0.9
 -                     , ghc-prim    >= 0.3.1  && < 0.6
-+                     , ghc-prim    >= 0.3.1  && < 0.7
++                     , ghc-prim    >= 0.3.1  && < 0.8
  
    if !impl(ghc >= 8.0)
       build-depends: semigroups >= 0.18.2 && < 0.20

Prev by Date: CVS commit: pkgsrc/textproc/hs-blaze-markup
Next by Date: CVS commit: pkgsrc/textproc/hs-cassava
Previous by Thread: CVS commit: pkgsrc/textproc/hs-blaze-markup
Next by Thread: CVS commit: pkgsrc/textproc/hs-cassava
Indexes:

Home | Main Index | Thread Index | Old Index