CVS commit: pkgsrc/devel/hs-strict

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/hs-strict
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Thu, 26 Jan 2023 11:30:52 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Jan 26 11:30:52 UTC 2023

Modified Files:
        pkgsrc/devel/hs-strict: Makefile PLIST buildlink3.mk
Removed Files:
        pkgsrc/devel/hs-strict/patches: patch-strict.cabal

Log Message:
devel/hs-strict: Fix build with GHC 9.4


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

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-strict/Makefile
diff -u pkgsrc/devel/hs-strict/Makefile:1.5 pkgsrc/devel/hs-strict/Makefile:1.6
--- pkgsrc/devel/hs-strict/Makefile:1.5 Sat Feb 26 03:58:08 2022
+++ pkgsrc/devel/hs-strict/Makefile     Thu Jan 26 11:30:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/02/26 03:58:08 pho Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/26 11:30:52 pho Exp $
 
 DISTNAME=      strict-0.4.0.1
 PKGREVISION=   4
@@ -8,8 +8,12 @@ MAINTAINER=    pho%cielonegro.org@localhost
 COMMENT=       Strict data types and String IO
 LICENSE=       modified-bsd
 
-.include "../../mk/haskell.mk"
-.include "../../devel/hs-assoc/buildlink3.mk"
+HASKELL_UNRESTRICT_DEPENDENCIES+=      \
+       hashable        \
+       text
+
 .include "../../devel/hs-hashable/buildlink3.mk"
 .include "../../devel/hs-these/buildlink3.mk"
+.include "../../devel/hs-assoc/buildlink3.mk"
+.include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/hs-strict/buildlink3.mk
diff -u pkgsrc/devel/hs-strict/buildlink3.mk:1.5 pkgsrc/devel/hs-strict/buildlink3.mk:1.6
--- pkgsrc/devel/hs-strict/buildlink3.mk:1.5    Sat Feb 26 03:58:08 2022
+++ pkgsrc/devel/hs-strict/buildlink3.mk        Thu Jan 26 11:30:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/02/26 03:58:08 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2023/01/26 11:30:52 pho Exp $
 
 BUILDLINK_TREE+=       hs-strict
 
@@ -9,9 +9,9 @@ BUILDLINK_API_DEPENDS.hs-strict+=       hs-str
 BUILDLINK_ABI_DEPENDS.hs-strict+=      hs-strict>=0.4.0.1nb4
 BUILDLINK_PKGSRCDIR.hs-strict?=                ../../devel/hs-strict
 
-.include "../../devel/hs-assoc/buildlink3.mk"
 .include "../../devel/hs-hashable/buildlink3.mk"
 .include "../../devel/hs-these/buildlink3.mk"
+.include "../../devel/hs-assoc/buildlink3.mk"
 .endif # HS_STRICT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-strict

Index: pkgsrc/devel/hs-strict/PLIST
diff -u pkgsrc/devel/hs-strict/PLIST:1.1 pkgsrc/devel/hs-strict/PLIST:1.2
--- pkgsrc/devel/hs-strict/PLIST:1.1    Fri Apr 23 08:24:36 2021
+++ pkgsrc/devel/hs-strict/PLIST        Thu Jan 26 11:30:52 2023
@@ -1,43 +1,43 @@
-@comment $NetBSD: PLIST,v 1.1 2021/04/23 08:24:36 pho Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/01/26 11:30:52 pho Exp $
 lib/strict-${PKGVERSION}/${HS_VERSION}/package-description
 lib/strict-${PKGVERSION}/${HS_VERSION}/package-id
-lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict.dyn_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Classes.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Classes.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Classes.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Classes.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Either.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Classes.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Either.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Either.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Either.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Maybe.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Either.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Maybe.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Maybe.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Maybe.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/These.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Maybe.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/These.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/These.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/These.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Tuple.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/These.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Tuple.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Tuple.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Tuple.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/Strict.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Strict/Tuple.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/Strict.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/Strict.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/Strict.p_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/Strict.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}/strict-${PKGVERSION}/LICENSE
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-Classes.html
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-Either.html
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-Maybe.html
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-These.html
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-Tuple.html
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict.html
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/System-IO-Strict.html
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/doc-index.html
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/haddock-bundle.min.js
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/index.html
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/linuwial.css
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/meta.json
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/quick-jump.css
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/strict.haddock
-share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/synopsis.png
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/LICENSE
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-Classes.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-Either.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-Maybe.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-These.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict-Tuple.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/Data-Strict.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/System-IO-Strict.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/haddock-bundle.min.js
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/linuwial.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/meta.json
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/strict.haddock
+${PLIST.doc}share/doc/${HS_PLATFORM}/strict-${PKGVERSION}/html/synopsis.png

Prev by Date: CVS commit: pkgsrc/devel/hs-these
Next by Date: CVS commit: pkgsrc/devel/hs-strict
Previous by Thread: CVS commit: pkgsrc/devel/hs-these
Next by Thread: CVS commit: pkgsrc/devel/hs-strict
Indexes:

Home | Main Index | Thread Index | Old Index