From 01465597bf860449ed6be1e7ef2bc63bc5829aeb Mon Sep 17 00:00:00 2001 From: bluhm Date: Sat, 20 Sep 2025 19:45:37 +0000 Subject: [PATCH] Replace p5-URI-ws with new p5-URI to resolve a plist conflict. The latter contains all features of the former. OK ajacoutot@ sthen@ --- devel/quirks/Makefile | 2 +- devel/quirks/files/Quirks.pm | 3 ++- net/p5-AnyEvent-WebSocket-Client/Makefile | 4 ++-- www/Makefile | 1 - www/p5-Catalyst-Runtime/Makefile | 5 ++--- www/p5-URI-ws/Makefile | 18 ------------------ www/p5-URI-ws/distinfo | 2 -- www/p5-URI-ws/pkg/DESCR | 3 --- www/p5-URI-ws/pkg/PLIST | 4 ---- www/p5-URI/Makefile | 1 + www/p5-URI/pkg/PLIST | 2 ++ 11 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 www/p5-URI-ws/Makefile delete mode 100644 www/p5-URI-ws/distinfo delete mode 100644 www/p5-URI-ws/pkg/DESCR delete mode 100644 www/p5-URI-ws/pkg/PLIST diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile index ecd6e478aa2..6f40137ccb3 100644 --- a/devel/quirks/Makefile +++ b/devel/quirks/Makefile @@ -3,7 +3,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-7.142 +PKGNAME = quirks-7.143 PKG_ARCH = * MAINTAINER = Marc Espie diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm index 2cabdde83d4..1dfe6ef3a6c 100644 --- a/devel/quirks/files/Quirks.pm +++ b/devel/quirks/files/Quirks.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: Quirks.pm,v 1.1747 2025/09/16 14:31:05 ajacoutot Exp $ +# $OpenBSD: Quirks.pm,v 1.1748 2025/09/20 19:45:37 bluhm Exp $ # # Copyright (c) 2009 Marc Espie # @@ -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 diff --git a/net/p5-AnyEvent-WebSocket-Client/Makefile b/net/p5-AnyEvent-WebSocket-Client/Makefile index 6c1e015378e..51530cfc1cc 100644 --- a/net/p5-AnyEvent-WebSocket-Client/Makefile +++ b/net/p5-AnyEvent-WebSocket-Client/Makefile @@ -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 \ diff --git a/www/Makefile b/www/Makefile index 00d55108ed5..be8209c9efb 100644 --- a/www/Makefile +++ b/www/Makefile @@ -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 diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile index cec68c3daba..4fee330ffe0 100644 --- a/www/p5-Catalyst-Runtime/Makefile +++ b/www/p5-Catalyst-Runtime/Makefile @@ -3,6 +3,7 @@ COMMENT= elegant MVC Web Application Framework 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>=1.0 \ 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 \ @@ -59,7 +59,6 @@ TEST_DEPENDS= devel/p5-Term-Size-Any \ www/p5-Catalyst-Plugin-ConfigLoader \ www/p5-CatalystX-LeakChecker>=0.05 - MAKE_ENV= TEST_POD=Yes CONFIGURE_ARGS= --skipdeps diff --git a/www/p5-URI-ws/Makefile b/www/p5-URI-ws/Makefile deleted file mode 100644 index 797185f22a2..00000000000 --- a/www/p5-URI-ws/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -COMMENT = WebSocket support for URI package - -DISTNAME = URI-ws-0.03 - -CATEGORIES = www - -MAINTAINER = Wen Heping - -# Perl -PERMIT_PACKAGE = Yes - -MODULES = cpan - -RUN_DEPENDS = www/p5-URI - -PKG_ARCH = * - -.include diff --git a/www/p5-URI-ws/distinfo b/www/p5-URI-ws/distinfo deleted file mode 100644 index cbbb17284a0..00000000000 --- a/www/p5-URI-ws/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (URI-ws-0.03.tar.gz) = bmsOQXKstqU8IiY5wABgjC3WHVCEhkdIKshgDVDlQe8= -SIZE (URI-ws-0.03.tar.gz) = 11724 diff --git a/www/p5-URI-ws/pkg/DESCR b/www/p5-URI-ws/pkg/DESCR deleted file mode 100644 index 50349070f72..00000000000 --- a/www/p5-URI-ws/pkg/DESCR +++ /dev/null @@ -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. diff --git a/www/p5-URI-ws/pkg/PLIST b/www/p5-URI-ws/pkg/PLIST deleted file mode 100644 index 50b6f767d3f..00000000000 --- a/www/p5-URI-ws/pkg/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -${P5SITE}/URI/ws.pm -${P5SITE}/URI/wss.pm -@man man/man3p/URI::ws.3p -@man man/man3p/URI::wss.3p diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile index fcc39643e42..d0f712d3183 100644 --- a/www/p5-URI/Makefile +++ b/www/p5-URI/Makefile @@ -1,6 +1,7 @@ COMMENT = library to parse Uniform Resource Identifiers DISTNAME = URI-5.34 +REVISION = 0 CATEGORIES = www diff --git a/www/p5-URI/pkg/PLIST b/www/p5-URI/pkg/PLIST index ecd7413715b..f16da77bb62 100644 --- a/www/p5-URI/pkg/PLIST +++ b/www/p5-URI/pkg/PLIST @@ -1,3 +1,5 @@ +@pkgpath www/p5-URI-ws +@conflict p5-URI-ws-* ${P5SITE}/URI/ ${P5SITE}/URI.pm ${P5SITE}/URI/Escape.pm