Update pystring to version 1.1.4

[Niclas Rosenvik <nros%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Mon Oct 9 11:20:44 2023 +0200
Changeset:	d4224a2c079c245cb42e4a369a255f56f5f8dba9

Modified Files:
	pystring/Makefile
	pystring/buildlink3.mk
	pystring/distinfo
	pystring/patches/patch-Makefile
Removed Files:
	pystring/patches/patch-pystring.cpp

Log Message:
Update pystring to version 1.1.4

patch-pystring.cpp removed, it is included in this
release.

Changes from release notes:
* Direct return function wrappers for partition,rpartition,
  split, rsplit and splitlines
* Fix for deadlock in split_nt function
* Declaring global strings for performance improvement
* CMake build system
* Allow default values in make file to be overridden
* CI tests
* Updates to license file

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d4224a2c079c245cb42e4a369a255f56f5f8dba9

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

diffstat:
 pystring/Makefile                   |  6 ++++--
 pystring/buildlink3.mk              |  1 +
 pystring/distinfo                   |  9 ++++-----
 pystring/patches/patch-Makefile     | 11 ++---------
 pystring/patches/patch-pystring.cpp | 17 -----------------
 5 files changed, 11 insertions(+), 33 deletions(-)

diffs:
diff --git a/pystring/Makefile b/pystring/Makefile
index 93078b89e4..917aa9c4ad 100644
--- a/pystring/Makefile
+++ b/pystring/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
-GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
-DISTNAME=	pystring-1.1.3
+DISTNAME=	pystring-1.1.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=imageworks/}
+GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/imageworks/pystring/
@@ -16,6 +16,8 @@ USE_LIBTOOL=	yes
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 
+MAKE_ENV+=	LIBDIR=${PREFIX}/lib
+
 INSTALLATION_DIRS+=	include/pystring lib
 
 post-install:
diff --git a/pystring/buildlink3.mk b/pystring/buildlink3.mk
index 0ce2054842..e461d2eb45 100644
--- a/pystring/buildlink3.mk
+++ b/pystring/buildlink3.mk
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	pystring
 PYSTRING_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pystring+=	pystring>=1.1.3
+BUILDLINK_ABI_DEPENDS.pystring+=	pystring>=1.1.4
 BUILDLINK_PKGSRCDIR.pystring?=		../../wip/pystring
 .endif	# PYSTRING_BUILDLINK3_MK
 
diff --git a/pystring/distinfo b/pystring/distinfo
index f5872d09c1..79ee3f3d5a 100644
--- a/pystring/distinfo
+++ b/pystring/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-BLAKE2s (pystring-1.1.3.tar.gz) = 91fa8f699f50c4bb24ddadfcebaca9972bbe90c4af68cdb31662cb7313e28fa6
-SHA512 (pystring-1.1.3.tar.gz) = a46bb2e96d6eb351a4a8097cde46ac2877d28e88f9e57e0ac36c42e8fc8543517c4be70306a01e2f88a891fc53c612494aeb37f47a200d94b8e1b050ed16eff6
-Size (pystring-1.1.3.tar.gz) = 18364 bytes
-SHA1 (patch-Makefile) = 5e9a6f5419e0e48b310798c513daced28f3e8745
-SHA1 (patch-pystring.cpp) = 8f5e710e5991abf3875c843596f56328f50c3bba
+BLAKE2s (pystring-1.1.4.tar.gz) = 1fb80b5ddcfd017c9c62093d9d5f24604e47e9e86ab4d9efadccfc43b9af20c5
+SHA512 (pystring-1.1.4.tar.gz) = 9c0460fea67885492f9b0d29a9ba312d960fd5e43577cdcfd47faf04397ff4b7e456ed68f1948b923d2f63f9922d576b93e4ca1a27376bcb6d29c683828acb01
+Size (pystring-1.1.4.tar.gz) = 19184 bytes
+SHA1 (patch-Makefile) = 8fdfcd61d2d98c4bb2d335f95f6760efc64b7152
diff --git a/pystring/patches/patch-Makefile b/pystring/patches/patch-Makefile
index edffe8d6a6..31a6e9dd18 100644
--- a/pystring/patches/patch-Makefile
+++ b/pystring/patches/patch-Makefile
@@ -1,16 +1,9 @@
 $NetBSD$
 
-* Install lib under prefix
+* Add DESTDIR support
 
---- Makefile.orig	2022-03-13 07:58:23.892668148 +0000
+--- Makefile.orig	2022-09-27 00:28:46.000000000 +0000
 +++ Makefile
-@@ -1,5 +1,5 @@
- LIBTOOL = libtool
--LIBDIR = /usr/lib
-+LIBDIR = $(PREFIX)/lib
- CXX = g++
- CXXFLAGS = -g -O3 -Wall -Wextra -Wshadow -Wconversion -Wcast-qual -Wformat=2
- 
 @@ -12,7 +12,7 @@ libpystring.la: pystring.lo
  	$(LIBTOOL) --mode=link --tag=CXX $(CXX) -o $@ $< -rpath $(LIBDIR)
  
diff --git a/pystring/patches/patch-pystring.cpp b/pystring/patches/patch-pystring.cpp
deleted file mode 100644
index 4a04c99a93..0000000000
--- a/pystring/patches/patch-pystring.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* fix deadlock in split_path, from upstream
-https://github.com/imageworks/pystring/issues/20
-https://github.com/imageworks/pystring/pull/24
-
---- pystring.cpp.orig	2022-03-13 08:47:35.684732958 +0000
-+++ pystring.cpp
-@@ -1361,7 +1361,7 @@ namespace path
-         while(!head2.empty() && ((pystring::slice(head2,-1) == "/") ||
-                                  (pystring::slice(head2,-1) == "\\")))
-         {
--            head2 = pystring::slice(head,0,-1);
-+            head2 = pystring::slice(head2,0,-1);
-         }
-         
-         if(!head2.empty()) head = head2;