From ebd2087018c6ae0142a99b7f1f4e54d82f72e715 Mon Sep 17 00:00:00 2001
From: pho <pho@pkgsrc.org>
Date: Thu, 26 Jan 2023 08:53:08 +0000
Subject: [PATCH] devel/hs-pretty-simple: Update to 4.1.2.0

4.1.2.0
* Fix a problem with the pHPrint function incorrectly outputting a trailing
  newline to stdout, instead of the handle you pass it. #118
* Add a web app where you can play around with pretty-simple in your
  browser. #116. This took a lot of hard work by @georgefst!

4.1.1.0
* Make the pretty-printed output with outputOptionsCompact enabled a little
  more compact. #110. Thanks @juhp!
* Add a --compact / -C flag to the pretty-simple executable that enables
  outputOptionsCompact. #111. Thanks again @juhp!
* Add pTraceWith and pTraceShowWith to Debug.Pretty.Simple. #104. Thanks
  @LeviButcher!

4.1.0.0
* Fix a regression which arose in 4.0, whereby excess spaces would be
  inserted for unusual strings like dates and IP addresses. #105
* Attach warnings to debugging functions, so that they're easy to find and
  remove. #103
* Some minor improvements to the CLI tool:
  - Add a --version/-v flag. #83
  - Add a trailing newline. #87
  - Install by default, without requiring a flag. #94
---
 databases/hs-direct-sqlite/Makefile           |  6 +-
 databases/hs-direct-sqlite/PLIST              | 84 +++++++++----------
 databases/hs-direct-sqlite/buildlink3.mk      |  7 +-
 databases/hs-direct-sqlite/distinfo           |  9 +-
 .../patches/patch-direct-sqlite.cabal         | 15 ----
 5 files changed, 51 insertions(+), 70 deletions(-)
 delete mode 100644 databases/hs-direct-sqlite/patches/patch-direct-sqlite.cabal

diff --git a/databases/hs-direct-sqlite/Makefile b/databases/hs-direct-sqlite/Makefile
index 2980f6cde35d..a7b93390764c 100644
--- a/databases/hs-direct-sqlite/Makefile
+++ b/databases/hs-direct-sqlite/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2022/11/23 16:18:34 adam Exp $
+# $NetBSD: Makefile,v 1.5 2023/01/26 08:53:08 pho Exp $
 
-DISTNAME=	direct-sqlite-2.3.26
-PKGREVISION=	3
+DISTNAME=	direct-sqlite-2.3.27
 CATEGORIES=	databases
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -11,6 +10,5 @@ LICENSE=	modified-bsd
 CONFIGURE_ARGS+=	-f systemlib
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../math/hs-semigroups/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/hs-direct-sqlite/PLIST b/databases/hs-direct-sqlite/PLIST
index 9839253144eb..9ba633576027 100644
--- a/databases/hs-direct-sqlite/PLIST
+++ b/databases/hs-direct-sqlite/PLIST
@@ -1,49 +1,49 @@
-@comment $NetBSD: PLIST,v 1.1 2022/02/16 09:42:21 pho Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/01/26 08:53:08 pho Exp $
 lib/direct-sqlite-${PKGVERSION}/${HS_VERSION}/package-description
 lib/direct-sqlite-${PKGVERSION}/${HS_VERSION}/package-id
-lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3.dyn_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings/Types.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings/Types.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings/Types.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings/Types.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Direct.dyn_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Bindings/Types.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Direct.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Direct.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Direct.p_hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Database/SQLite3/Direct.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
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/LICENSE
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/Database-SQLite3-Bindings-Types.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/Database-SQLite3-Bindings.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/Database-SQLite3-Direct.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/Database-SQLite3.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/direct-sqlite.haddock
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-A.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-All.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-B.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-C.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-D.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-E.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-F.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-G.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-I.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-L.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-M.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-N.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-O.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-P.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-R.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-S.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-T.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-U.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/haddock-bundle.min.js
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/index.html
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/linuwial.css
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/meta.json
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/quick-jump.css
-share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/synopsis.png
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/LICENSE
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/Database-SQLite3-Bindings-Types.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/Database-SQLite3-Bindings.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/Database-SQLite3-Direct.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/Database-SQLite3.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/direct-sqlite.haddock
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-A.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-All.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-B.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-C.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-D.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-E.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-F.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-G.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-I.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-L.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-M.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-N.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-O.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-P.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-R.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-S.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-T.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index-U.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/haddock-bundle.min.js
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/linuwial.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/meta.json
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/direct-sqlite-${PKGVERSION}/html/synopsis.png
diff --git a/databases/hs-direct-sqlite/buildlink3.mk b/databases/hs-direct-sqlite/buildlink3.mk
index d52d03fdc635..dfb3764396af 100644
--- a/databases/hs-direct-sqlite/buildlink3.mk
+++ b/databases/hs-direct-sqlite/buildlink3.mk
@@ -1,16 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.4 2022/11/23 16:18:34 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2023/01/26 08:53:08 pho Exp $
 
 BUILDLINK_TREE+=	hs-direct-sqlite
 
 .if !defined(HS_DIRECT_SQLITE_BUILDLINK3_MK)
 HS_DIRECT_SQLITE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-direct-sqlite+=	hs-direct-sqlite>=2.3.26
-BUILDLINK_ABI_DEPENDS.hs-direct-sqlite+=	hs-direct-sqlite>=2.3.26nb3
+BUILDLINK_API_DEPENDS.hs-direct-sqlite+=	hs-direct-sqlite>=2.3.27
+BUILDLINK_ABI_DEPENDS.hs-direct-sqlite+=	hs-direct-sqlite>=2.3.27
 BUILDLINK_PKGSRCDIR.hs-direct-sqlite?=		../../databases/hs-direct-sqlite
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../math/hs-semigroups/buildlink3.mk"
 .endif	# HS_DIRECT_SQLITE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-direct-sqlite
diff --git a/databases/hs-direct-sqlite/distinfo b/databases/hs-direct-sqlite/distinfo
index e8dc2f3e3a9e..e89ddbf3db74 100644
--- a/databases/hs-direct-sqlite/distinfo
+++ b/databases/hs-direct-sqlite/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1 2022/02/16 09:42:21 pho Exp $
+$NetBSD: distinfo,v 1.2 2023/01/26 08:53:08 pho Exp $
 
-BLAKE2s (direct-sqlite-2.3.26.tar.gz) = 51c16f3e93c50ac68c600abfdeb57f2aa9464645767a10d41260fc06d6430e8a
-SHA512 (direct-sqlite-2.3.26.tar.gz) = 1675c668263d40b398e252596e821fa7fb5934ced67074a3f840021e43970784daeb2d233f0fb5d53db1e92b41d18a48e0ed0d0fb487270638556ea2423264ef
-Size (direct-sqlite-2.3.26.tar.gz) = 2215712 bytes
-SHA1 (patch-direct-sqlite.cabal) = 898009a12c4a26f2b963dfdeffc4b8bfefe10bbe
+BLAKE2s (direct-sqlite-2.3.27.tar.gz) = a71b539fe06d44b55464e0e829536f8f5ff8edea76a65e7a770fae9500b71d3a
+SHA512 (direct-sqlite-2.3.27.tar.gz) = 946890504c768f5dc7af91e4ce8eff6790b36df3bf249b05548a4356757d24f2d94ad4b9b2a65a0db17dd14a968d4c4f020775b4c52224978c26c324f57f7616
+Size (direct-sqlite-2.3.27.tar.gz) = 2383676 bytes
diff --git a/databases/hs-direct-sqlite/patches/patch-direct-sqlite.cabal b/databases/hs-direct-sqlite/patches/patch-direct-sqlite.cabal
deleted file mode 100644
index 212e336e773a..000000000000
--- a/databases/hs-direct-sqlite/patches/patch-direct-sqlite.cabal
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-direct-sqlite.cabal,v 1.1 2022/02/16 09:42:21 pho Exp $
-
-Fix build with semigroups-0.20
-
---- direct-sqlite.cabal.orig	2020-02-24 08:40:57.000000000 +0000
-+++ direct-sqlite.cabal
-@@ -55,7 +55,7 @@ library
-                     Database.SQLite3.Direct
-   build-depends:    base       >= 4.1 && < 5
-                   , bytestring >= 0.9.2.1
--                  , semigroups >= 0.18 && < 0.20
-+                  , semigroups >= 0.18
-                   , text       >= 0.11
-   default-language: Haskell2010
-   include-dirs:     .