On Fri, Sep 19, 2025 at 10:19:01PM +0100, Stuart Henderson wrote:
> I think this should probably just replace p5-URI-ws (quirks and @pkgpath)
The new p5-URI seems to be equivalent to p5-URI-ws.
I am not a quirks expert. Is that how it works?
Do I also need a @conflict in p5-URI?
bluhm
Index: net/p5-AnyEvent-WebSocket-Client/Makefile
===================================================================
RCS file:
/data/mirror/openbsd/cvs/ports/net/p5-AnyEvent-WebSocket-Client/Makefile,v
diff -u -p -r1.1.1.1 Makefile
--- net/p5-AnyEvent-WebSocket-Client/Makefile 11 Jun 2025 10:28:25 -0000
1.1.1.1
+++ net/p5-AnyEvent-WebSocket-Client/Makefile 19 Sep 2025 21:38:38 -0000
@@ -1,6 +1,7 @@
COMMENT = WebSocket client for AnyEvent
DISTNAME = AnyEvent-WebSocket-Client-0.55
+REVISION = 0
CATEGORIES = net devel
@@ -15,8 +16,7 @@ RUN_DEPENDS = devel/p5-AnyEvent \
devel/p5-PerlX-Maybe \
net/p5-Protocol-WebSocket \
security/p5-Net-SSLeay \
- www/p5-URI \
- www/p5-URI-ws
+ www/p5-URI>=5.34
TEST_DEPENDS = devel/p5-Devel-Cycle \
devel/p5-EV \
devel/p5-Test-Memory-Cycle \
Index: www/p5-Catalyst-Runtime/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/www/p5-Catalyst-Runtime/Makefile,v
diff -u -p -r1.31 Makefile
--- www/p5-Catalyst-Runtime/Makefile 11 Mar 2022 20:10:20 -0000 1.31
+++ www/p5-Catalyst-Runtime/Makefile 19 Sep 2025 21:39:07 -0000
@@ -3,6 +3,7 @@ COMMENT= elegant MVC Web Application Fra
MODULES= cpan
PKG_ARCH= *
DISTNAME= Catalyst-Runtime-5.90128
+REVISION= 0
CATEGORIES= www
HOMEPAGE= http://www.catalystframework.org/
@@ -47,8 +48,7 @@ RUN_DEPENDS= converters/p5-JSON-MaybeXS>
www/p5-Plack-Middleware-RemoveRedundantBody>=0.03 \
www/p5-Plack-Middleware-ReverseProxy>=0.04 \
www/p5-Plack-Test-ExternalServer \
- www/p5-URI>=1.65 \
- www/p5-URI-ws>=0.03 \
+ www/p5-URI>=5.34 \
www/p5-libwww>=5.837
TEST_DEPENDS= devel/p5-Term-Size-Any \
@@ -58,7 +58,6 @@ TEST_DEPENDS= devel/p5-Term-Size-Any \
www/p5-Catalyst-Action-REST \
www/p5-Catalyst-Plugin-ConfigLoader \
www/p5-CatalystX-LeakChecker>=0.05
-
MAKE_ENV= TEST_POD=Yes
Index: www/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/www/Makefile,v
diff -u -p -r1.1156 Makefile
--- www/Makefile 4 Sep 2025 11:46:56 -0000 1.1156
+++ www/Makefile 19 Sep 2025 21:39:18 -0000
@@ -357,7 +357,6 @@
SUBDIR += p5-URI-Fetch
SUBDIR += p5-URI-Find
SUBDIR += p5-URI-Query
- SUBDIR += p5-URI-ws
SUBDIR += p5-URL-Encode
SUBDIR += p5-W3C-LinkChecker
SUBDIR += p5-WWW-Bugzilla
Index: www/p5-URI/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/www/p5-URI/Makefile,v
diff -u -p -r1.55 Makefile
--- www/p5-URI/Makefile 18 Sep 2025 18:29:58 -0000 1.55
+++ www/p5-URI/Makefile 19 Sep 2025 21:39:38 -0000
@@ -1,6 +1,7 @@
COMMENT = library to parse Uniform Resource Identifiers
DISTNAME = URI-5.34
+REVISION = 0
CATEGORIES = www
Index: www/p5-URI/pkg/PLIST
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/www/p5-URI/pkg/PLIST,v
diff -u -p -r1.17 PLIST
--- www/p5-URI/pkg/PLIST 18 Sep 2025 18:29:58 -0000 1.17
+++ www/p5-URI/pkg/PLIST 19 Sep 2025 22:04:59 -0000
@@ -1,3 +1,5 @@
+@pkgpath www/p5-URI-ws
+@conflict p5-URI-ws-*
${P5SITE}/URI/
${P5SITE}/URI.pm
${P5SITE}/URI/Escape.pm
Index: devel/quirks/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/devel/quirks/Makefile,v
diff -u -p -r1.1735 Makefile
--- devel/quirks/Makefile 16 Sep 2025 14:31:05 -0000 1.1735
+++ devel/quirks/Makefile 19 Sep 2025 21:41:07 -0000
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-7.142
+PKGNAME = quirks-7.143
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/devel/quirks/files/Quirks.pm,v
diff -u -p -r1.1747 Quirks.pm
--- devel/quirks/files/Quirks.pm 16 Sep 2025 14:31:05 -0000 1.1747
+++ devel/quirks/files/Quirks.pm 19 Sep 2025 21:47:17 -0000
@@ -1289,6 +1289,7 @@ setup_obsolete_reason(
3 => 'ruby34-rgen',
5 => 'libmusicbrainz',
5 => 'libunique',
+ 5 => 'p5-URI-ws',
);
# though it's not yet used, these should be pkgnames, so that eventually
Index: www/p5-URI-ws/Makefile
===================================================================
RCS file: www/p5-URI-ws/Makefile
diff -N www/p5-URI-ws/Makefile
--- www/p5-URI-ws/Makefile 11 Mar 2022 20:10:37 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-COMMENT = WebSocket support for URI package
-
-DISTNAME = URI-ws-0.03
-
-CATEGORIES = www
-
-MAINTAINER = Wen Heping <[email protected]>
-
-# Perl
-PERMIT_PACKAGE = Yes
-
-MODULES = cpan
-
-RUN_DEPENDS = www/p5-URI
-
-PKG_ARCH = *
-
-.include <bsd.port.mk>
Index: www/p5-URI-ws/distinfo
===================================================================
RCS file: www/p5-URI-ws/distinfo
diff -N www/p5-URI-ws/distinfo
--- www/p5-URI-ws/distinfo 21 Aug 2020 22:38:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (URI-ws-0.03.tar.gz) = bmsOQXKstqU8IiY5wABgjC3WHVCEhkdIKshgDVDlQe8=
-SIZE (URI-ws-0.03.tar.gz) = 11724
Index: www/p5-URI-ws/pkg/DESCR
===================================================================
RCS file: www/p5-URI-ws/pkg/DESCR
diff -N www/p5-URI-ws/pkg/DESCR
--- www/p5-URI-ws/pkg/DESCR 21 Aug 2020 22:38:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-After this module is installed, the URI package provides the same
-set of methods for WebSocket URIs as it does for HTTP ones. For
-secure WebSockets, see URI::wss.
Index: www/p5-URI-ws/pkg/PLIST
===================================================================
RCS file: www/p5-URI-ws/pkg/PLIST
diff -N www/p5-URI-ws/pkg/PLIST
--- www/p5-URI-ws/pkg/PLIST 11 Mar 2022 20:10:37 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-${P5SITE}/URI/ws.pm
-${P5SITE}/URI/wss.pm
-@man man/man3p/URI::ws.3p
-@man man/man3p/URI::wss.3p
