CVS commit: pkgsrc/devel/hs-errors

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Apr 23 09:10:06 UTC 2021

Modified Files:
        pkgsrc/devel/hs-errors: Makefile PLIST buildlink3.mk

Log Message:
Update PLIST; drop dependency on hs-exceptions (which will be removed later)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hs-errors/Makefile \
    pkgsrc/devel/hs-errors/PLIST pkgsrc/devel/hs-errors/buildlink3.mk

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-errors/Makefile
diff -u pkgsrc/devel/hs-errors/Makefile:1.1 pkgsrc/devel/hs-errors/Makefile:1.2
--- pkgsrc/devel/hs-errors/Makefile:1.1 Wed Jan 15 07:19:38 2020
+++ pkgsrc/devel/hs-errors/Makefile     Fri Apr 23 09:10:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/01/15 07:19:38 pho Exp $
+# $NetBSD: Makefile,v 1.2 2021/04/23 09:10:06 pho Exp $
 
 DISTNAME=      errors-2.3.0
 CATEGORIES=    devel
@@ -7,8 +7,7 @@ MAINTAINER=     pho%cielonegro.org@localhost
 COMMENT=       Simplified error-handling
 LICENSE=       modified-bsd
 
-.include "../../devel/hs-exceptions/buildlink3.mk"
-.include "../../devel/hs-transformers-compat/buildlink3.mk"
 .include "../../devel/hs-safe/buildlink3.mk"
+.include "../../devel/hs-transformers-compat/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/hs-errors/PLIST
diff -u pkgsrc/devel/hs-errors/PLIST:1.1 pkgsrc/devel/hs-errors/PLIST:1.2
--- pkgsrc/devel/hs-errors/PLIST:1.1    Mon May 11 17:52:02 2020
+++ pkgsrc/devel/hs-errors/PLIST        Fri Apr 23 09:10:06 2021
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:02 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
-${HS_IMPL}/Control/Error.dyn_hi
-${HS_IMPL}/Control/Error.hi
-${HS_IMPL}/Control/Error.p_hi
-${HS_IMPL}/Control/Error/Safe.dyn_hi
-${HS_IMPL}/Control/Error/Safe.hi
-${HS_IMPL}/Control/Error/Safe.p_hi
-${HS_IMPL}/Control/Error/Script.dyn_hi
-${HS_IMPL}/Control/Error/Script.hi
-${HS_IMPL}/Control/Error/Script.p_hi
-${HS_IMPL}/Control/Error/Util.dyn_hi
-${HS_IMPL}/Control/Error/Util.hi
-${HS_IMPL}/Control/Error/Util.p_hi
-${HS_IMPL}/Data/EitherR.dyn_hi
-${HS_IMPL}/Data/EitherR.hi
-${HS_IMPL}/Data/EitherR.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
+@comment $NetBSD: PLIST,v 1.2 2021/04/23 09:10:06 pho Exp $
+lib/errors-${PKGVERSION}/${HS_VERSION}/package-description
+lib/errors-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Safe.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Safe.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Safe.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Script.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Script.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Script.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Util.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Util.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Error/Util.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/EitherR.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/EitherR.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/EitherR.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
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Control-Error-Safe.html
-${HS_DOCS}/html/Control-Error-Script.html
-${HS_DOCS}/html/Control-Error-Util.html
-${HS_DOCS}/html/Control-Error.html
-${HS_DOCS}/html/Data-EitherR.html
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/errors.haddock
-${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
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error-Safe.html
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error-Script.html
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error-Util.html
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Control-Error.html
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/Data-EitherR.html
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/errors.haddock
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/errors-${PKGVERSION}/html/synopsis.png
Index: pkgsrc/devel/hs-errors/buildlink3.mk
diff -u pkgsrc/devel/hs-errors/buildlink3.mk:1.1 pkgsrc/devel/hs-errors/buildlink3.mk:1.2
--- pkgsrc/devel/hs-errors/buildlink3.mk:1.1    Wed Jan 15 07:19:38 2020
+++ pkgsrc/devel/hs-errors/buildlink3.mk        Fri Apr 23 09:10:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/01/15 07:19:38 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/04/23 09:10:06 pho Exp $
 
 BUILDLINK_TREE+=       hs-errors
 
@@ -9,9 +9,8 @@ BUILDLINK_API_DEPENDS.hs-errors+=       hs-err
 BUILDLINK_ABI_DEPENDS.hs-errors+=      hs-errors>=2.3.0
 BUILDLINK_PKGSRCDIR.hs-errors?=                ../../devel/hs-errors
 
-.include "../../devel/hs-exceptions/buildlink3.mk"
-.include "../../devel/hs-transformers-compat/buildlink3.mk"
 .include "../../devel/hs-safe/buildlink3.mk"
+.include "../../devel/hs-transformers-compat/buildlink3.mk"
 .endif # HS_ERRORS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hs-errors