From: Jeremie Courreges-Anglas <jca@wxcvbn.org>
Subject: [update] devel/npth
To: ports@openbsd.org
Cc: Pierre-Emmanuel Andre <pea@openbsd.org>
Date: Sun, 14 Sep 2025 20:08:42 +0200

Update to latest upstream version.  The check for pthread_rwlock_t is
broken so amend it to avoid dropping the npth_rwlock_* API.

pea: while here, I'm taking maintainer since security/gnupg (which I
maintain) is the only consumer.

ok?


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/npth/Makefile,v
diff -u -p -r1.13 Makefile
--- Makefile	21 Sep 2023 09:50:01 -0000	1.13
+++ Makefile	14 Sep 2025 17:58:56 -0000
@@ -1,15 +1,14 @@
 COMMENT=	new GNU Portable Threads Library
 
-DISTNAME=	npth-1.6
-REVISION=	0
+DISTNAME=	npth-1.8
 
-SHARED_LIBS=	npth 1.0	# 1.1
+SHARED_LIBS=	npth 1.1	# 3.0
 
 CATEGORIES=	devel
 
 HOMEPAGE=	https://www.gnupg.org/software/npth/index.html
 
-MAINTAINER=	Pierre-Emmanuel Andre <pea@openbsd.org>
+MAINTAINER=	Jeremie Courreges-Anglas <jca@wxcvbn.org>
 
 # GPLv2
 PERMIT_PACKAGE=	Yes
@@ -22,8 +21,8 @@ SITES=			${SITE_GNUPG:=npth/}
 
 CONFIGURE_STYLE=	gnu
 
-LIBnpth_MAJOR=${LIBnpth_VERSION:R} 
-LIBnpth_MINOR=${LIBnpth_VERSION:E} 
+LIBnpth_MAJOR=${LIBnpth_VERSION:R}
+LIBnpth_MINOR=${LIBnpth_VERSION:E}
 
 SUBST_VARS=		LIBnpth_MAJOR LIBnpth_MINOR
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/npth/distinfo,v
diff -u -p -r1.4 distinfo
--- distinfo	18 Sep 2018 10:08:23 -0000	1.4
+++ distinfo	14 Sep 2025 17:09:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (npth-1.6.tar.bz2) = E5Or2a3PB2LTR5jcNP3PTQ0iqEEHIedvHjr80dqk4tE=
-SIZE (npth-1.6.tar.bz2) = 300486
+SHA256 (npth-1.8.tar.bz2) = i9JLTyOjBl1uWybpirqc54PqT9eBBpwbNdFJaU6Qyj4=
+SIZE (npth-1.8.tar.bz2) = 317739
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/devel/npth/patches/patch-configure,v
diff -u -p -r1.5 patch-configure
--- patches/patch-configure	11 Mar 2022 18:50:52 -0000	1.5
+++ patches/patch-configure	14 Sep 2025 17:19:25 -0000
@@ -1,14 +1,26 @@
+Override shared lib version.
+Add include missing for pthread_rwlock_t existence check.
+
 Index: configure
 --- configure.orig
 +++ configure
-@@ -2311,8 +2311,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2623,8 +2623,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  #   (Interfaces removed:		AGE=0)
  #
- LIBNPTH_LT_CURRENT=1
--LIBNPTH_LT_AGE=1
--LIBNPTH_LT_REVISION=2
+ LIBNPTH_LT_CURRENT=3
+-LIBNPTH_LT_AGE=3
+-LIBNPTH_LT_REVISION=0
 +LIBNPTH_LT_AGE=${LIBnpth_MAJOR}
 +LIBNPTH_LT_REVISION=${LIBnpth_MINOR}
  ################################################
  
+ 
+@@ -14419,7 +14419,7 @@ fi
+ 
+ printf "%s\n" "#define HAVE_PTHREAD 1" >>confdefs.h
+ 
+-    ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "$ac_includes_default"
++    ac_fn_c_check_type "$LINENO" "pthread_rwlock_t" "ac_cv_type_pthread_rwlock_t" "#include <pthread.h>"
+ if test "x$ac_cv_type_pthread_rwlock_t" = xyes
+ then :
  
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/npth/pkg/PLIST,v
diff -u -p -r1.3 PLIST
--- pkg/PLIST	11 Mar 2022 18:50:52 -0000	1.3
+++ pkg/PLIST	14 Sep 2025 17:09:11 -0000
@@ -1,7 +1,7 @@
-bin/npth-config
 include/npth.h
-lib/libnpth.a
+@static-lib lib/libnpth.a
 lib/libnpth.la
 @lib lib/libnpth.so.${LIBnpth_VERSION}
+lib/pkgconfig/npth.pc
 share/aclocal/
 share/aclocal/npth.m4

-- 
jca