From 2170798e835f90876b763b641ef2f9bd9f75530a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org>
Date: Wed, 18 Oct 2023 08:53:00 +0200
Subject: [PATCH] net-p2p/*arr: Switch back to converters/libiconv dependency

In PR 274169 all *arr ports were switched to use 'USES+=libiconv' instead of a
hard dependency on the 'converters/libiconv' port.  Turns out, this is
incorrect.

Specifically 'libMonoPosixHelper' (part of .NET) is compiled against the port,
and will break when the port is not installed (incompatible with the base
version of libiconv)

This patch moves all *arr ports back to RUN_DEPENDS on converters/libiconv

PR:		274532
Reported by:	michiel@vanbaak.eu (maintainer)
---
 net-p2p/lidarr/Makefile       | 4 +++-
 net-p2p/prowlarr/Makefile     | 5 +++--
 net-p2p/radarr/Makefile       | 4 +++-
 net-p2p/readarr/Makefile      | 4 +++-
 net-p2p/sonarr-devel/Makefile | 4 +++-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/net-p2p/lidarr/Makefile b/net-p2p/lidarr/Makefile
index e50a649acdff9..087b80c8844ae 100644
--- a/net-p2p/lidarr/Makefile
+++ b/net-p2p/lidarr/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	lidarr
 DISTVERSION=	1.4.5.3639
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/lidarr/Lidarr/releases/download/v${PORTVERSION}/
 DISTNAME=	Lidarr.master.${DISTVERSION}.freebsd-core-x64
@@ -16,11 +17,12 @@ ONLY_FOR_ARCHS=	amd64
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss \
 		icu>0:devel/icu \
 		krb5>0:security/krb5 \
+		libiconv>0:converters/libiconv \
 		libinotify>0:devel/libinotify \
 		libunwind>0:devel/libunwind \
 		chromaprint>0:audio/chromaprint
 
-USES=		ssl:run sqlite:3 iconv
+USES=		ssl:run sqlite:3
 
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/net-p2p/prowlarr/Makefile b/net-p2p/prowlarr/Makefile
index 1f52557157e92..a4bb1e85c2917 100644
--- a/net-p2p/prowlarr/Makefile
+++ b/net-p2p/prowlarr/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	prowlarr
 DISTVERSION=	1.8.6.3946
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/Prowlarr/Prowlarr/releases/download/v${PORTVERSION}/
 DISTNAME=	Prowlarr.master.${PORTVERSION}.freebsd-core-x64
@@ -16,10 +16,11 @@ ONLY_FOR_ARCHS=	amd64
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss \
 		icu>0:devel/icu \
 		krb5>0:security/krb5 \
+		libiconv>0:converters/libiconv \
 		libinotify>0:devel/libinotify \
 		libunwind>0:devel/libunwind
 
-USES=	ssl:run sqlite:3 iconv
+USES=	ssl:run sqlite:3
 
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/net-p2p/radarr/Makefile b/net-p2p/radarr/Makefile
index 26c6bb13964f7..08923f35853bd 100644
--- a/net-p2p/radarr/Makefile
+++ b/net-p2p/radarr/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	radarr
 DISTVERSION=	5.0.3.8127
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/Radarr/Radarr/releases/download/v${PORTVERSION}/
 DISTNAME=	Radarr.master.${DISTVERSION}.freebsd-core-x64
@@ -16,10 +17,11 @@ ONLY_FOR_ARCHS=	amd64
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss \
 		icu>0:devel/icu \
 		krb5>0:security/krb5 \
+		libiconv>0:converters/libiconv \
 		libinotify>0:devel/libinotify \
 		libunwind>0:devel/libunwind
 
-USES=	ssl:run sqlite:3 iconv
+USES=	ssl:run sqlite:3
 
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/net-p2p/readarr/Makefile b/net-p2p/readarr/Makefile
index 377b9143297cf..57d0086ab91b7 100644
--- a/net-p2p/readarr/Makefile
+++ b/net-p2p/readarr/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	readarr
 DISTVERSION=	0.3.7.2260
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/Readarr/Readarr/releases/download/v${PORTVERSION}/
 DISTNAME=	Readarr.develop.${DISTVERSION}.freebsd-core-x64
@@ -16,10 +17,11 @@ ONLY_FOR_ARCHS=	amd64
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss \
 		icu>0:devel/icu \
 		krb5>0:security/krb5 \
+		libiconv>0:converters/libiconv \
 		libinotify>0:devel/libinotify \
 		libunwind>0:devel/libunwind
 
-USES=	ssl:run sqlite:3 iconv
+USES=	ssl:run sqlite:3
 
 USE_RC_SUBR=	${PORTNAME}
 
diff --git a/net-p2p/sonarr-devel/Makefile b/net-p2p/sonarr-devel/Makefile
index 106aba6e1096c..d32ca0ee1af47 100644
--- a/net-p2p/sonarr-devel/Makefile
+++ b/net-p2p/sonarr-devel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sonarr
 DISTVERSION=	4.0.0.697
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://download.sonarr.tv/v4/develop/${PORTVERSION}/
 PKGNAMESUFFIX=	-devel
@@ -16,10 +17,11 @@ ONLY_FOR_ARCHS=	amd64
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss \
 		icu>0:devel/icu \
 		krb5>0:security/krb5 \
+		libiconv>0:converters/libiconv \
 		libinotify>0:devel/libinotify \
 		libunwind>0:devel/libunwind
 
-USES=	ssl:run sqlite:3 iconv
+USES=	ssl:run sqlite:3
 USE_RC_SUBR=	sonarr
 
 CONFLICTS_INSTALL=	sonarr