From 15424a1b86f53c31b1fbfcc282d3d8fed9497055 Mon Sep 17 00:00:00 2001
From: pho <pho@pkgsrc.org>
Date: Fri, 27 Jan 2023 13:43:22 +0000
Subject: [PATCH] devel/hs-monad-logger: Update to 0.3.39

0.3.39
* Make the previous change backwards compatible with CPP

0.3.38
* Drop old deprecated instances to support transformers 0.6 #39

0.3.37
* Add Semigroup/Monoid instances to LoggingT, NoLoggingT, and
  WriterLoggingT
---
 devel/hs-monad-logger/Makefile                |  5 +--
 devel/hs-monad-logger/PLIST                   | 40 +++++++++----------
 devel/hs-monad-logger/buildlink3.mk           |  6 +--
 devel/hs-monad-logger/distinfo                |  9 ++---
 .../patches/patch-monad-logger.cabal          | 15 -------
 5 files changed, 29 insertions(+), 46 deletions(-)
 delete mode 100644 devel/hs-monad-logger/patches/patch-monad-logger.cabal

diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index a7018bcc9af1..cb264d40297f 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2022/09/07 06:50:48 pho Exp $
+# $NetBSD: Makefile,v 1.6 2023/01/27 13:43:22 pho Exp $
 
-DISTNAME=	monad-logger-0.3.36
-PKGREVISION=	4
+DISTNAME=	monad-logger-0.3.39
 CATEGORIES=	devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/hs-monad-logger/PLIST b/devel/hs-monad-logger/PLIST
index 5ca521e37f66..ed8385b2489f 100644
--- a/devel/hs-monad-logger/PLIST
+++ b/devel/hs-monad-logger/PLIST
@@ -1,26 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1 2022/02/23 16:16:33 pho Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/01/27 13:43:22 pho Exp $
 lib/monad-logger-${PKGVERSION}/${HS_VERSION}/package-description
 lib/monad-logger-${PKGVERSION}/${HS_VERSION}/package-id
-lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.dyn_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger/CallStack.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger/CallStack.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger/CallStack.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger/CallStack.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Paths_monad_logger.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger/CallStack.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_monad_logger.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Paths_monad_logger.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Paths_monad_logger.p_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_monad_logger.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}/monad-logger-${PKGVERSION}/LICENSE
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/Control-Monad-Logger-CallStack.html
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/Control-Monad-Logger.html
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/doc-index.html
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/haddock-bundle.min.js
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/index.html
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/linuwial.css
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/meta.json
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/monad-logger.haddock
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/quick-jump.css
-share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/synopsis.png
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/LICENSE
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/Control-Monad-Logger-CallStack.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/Control-Monad-Logger.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/haddock-bundle.min.js
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/linuwial.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/meta.json
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/monad-logger.haddock
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/monad-logger-${PKGVERSION}/html/synopsis.png
diff --git a/devel/hs-monad-logger/buildlink3.mk b/devel/hs-monad-logger/buildlink3.mk
index dfb5a94d60ea..c3a89c1f8520 100644
--- a/devel/hs-monad-logger/buildlink3.mk
+++ b/devel/hs-monad-logger/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/09/07 06:50:48 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2023/01/27 13:43:22 pho Exp $
 
 BUILDLINK_TREE+=	hs-monad-logger
 
 .if !defined(HS_MONAD_LOGGER_BUILDLINK3_MK)
 HS_MONAD_LOGGER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-monad-logger+=	hs-monad-logger>=0.3.36
-BUILDLINK_ABI_DEPENDS.hs-monad-logger+=	hs-monad-logger>=0.3.36nb4
+BUILDLINK_API_DEPENDS.hs-monad-logger+=	hs-monad-logger>=0.3.39
+BUILDLINK_ABI_DEPENDS.hs-monad-logger+=	hs-monad-logger>=0.3.39
 BUILDLINK_PKGSRCDIR.hs-monad-logger?=	../../devel/hs-monad-logger
 
 .include "../../devel/hs-conduit/buildlink3.mk"
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
index 4f4b2d277a51..8b92f2e4f503 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1 2022/02/23 16:16:33 pho Exp $
+$NetBSD: distinfo,v 1.2 2023/01/27 13:43:22 pho Exp $
 
-BLAKE2s (monad-logger-0.3.36.tar.gz) = ebb7cf948a25a989cf3b977e7f8b007014a9a93fda0b0796c19cd50ff87e2509
-SHA512 (monad-logger-0.3.36.tar.gz) = c2dcf616f9e58be024f0bec144cd60cf78f465c1a8df6cf1ae0d896a44303e2bc8bdc18cf0f2cdf56c4485d1506d23b1417d84c66f327c73362da2aec71abdc0
-Size (monad-logger-0.3.36.tar.gz) = 11609 bytes
-SHA1 (patch-monad-logger.cabal) = 39165bd7783417087f8d97d9058a4bf191e830b3
+BLAKE2s (monad-logger-0.3.39.tar.gz) = 52f7ebe407a03dacd47a1dfed0e21d6ae94b08325f43c58c108a4b3e8d1dc5e5
+SHA512 (monad-logger-0.3.39.tar.gz) = 2f353ff26f121ef9e89d033a6ab9a240422aab91e6cbc8112d81d52b217c24deb6800c2c641e417ac430ff791666bd0e676bcea4aa7cbdb22df167f2d51364d4
+Size (monad-logger-0.3.39.tar.gz) = 11777 bytes
diff --git a/devel/hs-monad-logger/patches/patch-monad-logger.cabal b/devel/hs-monad-logger/patches/patch-monad-logger.cabal
deleted file mode 100644
index 007993247e0a..000000000000
--- a/devel/hs-monad-logger/patches/patch-monad-logger.cabal
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-monad-logger.cabal,v 1.1 2022/02/23 16:16:33 pho Exp $
-
-Fix build with fast-logger-3.1
-
---- monad-logger.cabal.orig	2020-11-24 17:16:19.000000000 +0000
-+++ monad-logger.cabal
-@@ -42,7 +42,7 @@ library
-     , conduit >=1.0 && <1.4
-     , conduit-extra >=1.1 && <1.4
-     , exceptions >=0.6 && <0.11
--    , fast-logger >=2.1 && <3.1
-+    , fast-logger >=2.1
-     , lifted-base
-     , monad-control >=1.0
-     , monad-loops