From nobody Sat Jan 18 22:22:55 2025
X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YbB1q2XF4z5kxX5;
	Sat, 18 Jan 2025 22:22:55 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4YbB1q1vLyz3QDp;
	Sat, 18 Jan 2025 22:22:55 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1737238975;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=gKtVfHoxwiCVYZ3gg9V5VnNYBXmx8je3QaylfZfAgrw=;
	b=oTeKQdL0C89VpA2/XF6F+W37wfwG5KpkNdAn/lA4pj8b582QBSXOGuzUbGZJI6xzmtOy/f
	g4wXwnTGtIHR6Ca1RVCNdEwr1L35InT7IeDVWs5gOgPdeJrWG4Setj+BsiWdlCIfSmPMRm
	HzjclcVqJAbd0Kbh2UqymJNQlLMhWy71nhxw1Em+2zIpXEUcyllyPKwSTV+OTW1VeYwiZN
	CrvGgUaBSIKdpeV8K7qUghF+FuqVEEdPSAmX9ERwAGNcN40FAoL/YdH/SkkmOjgiknCmY3
	tPSXlqiOX3LPhe0HTompaePW+8Irvv5abm1m0RXHeX79KrTDQcwm8/tBzOJDCw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1737238975;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=gKtVfHoxwiCVYZ3gg9V5VnNYBXmx8je3QaylfZfAgrw=;
	b=FuN8CdgB7kQH7gknggqtEwibCt+Iz2spJRfGTssckrY0SMzgJz1k/B2bi2u0hyyDGvW/P4
	2MSNfHytUR8CT0JcON1oFlQ72SiKus8iirfQr4mfySrslNagJWoDSA3d54fVm/twt1pM3T
	8gGV2PqhhmQ0kw8CM7hnAPcgw342jB5KeW99OmFTjtAdaJUdfnOWVt4SgM93WshRC+j7Vw
	D6Ca7pcEB4Uu4/+2EUglSdxT9OSUgT3VKzXeQxVZZ7nljzcKYmh/AmOfKxFcyL/jUY1T1d
	1thUPqwH3MTfOtuOknoR4nc+a6GbkzGu6+G7qawL5b6dPOAWvAC9zVZXSr8q0Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737238975; a=rsa-sha256; cv=none;
	b=eGB4MfzDEVgHtrrsT7/H4wK9M8ujhYjCTU56YLsR6sKmNf9TvnqXQWc3pIcyjVpxP6TNQg
	lZN3uU7AQXKA9JbxWbFM7WM2ZPOeG5hv8/lOTy8DpuPeU3cdqn7gBnAWV/VlznhTlu4D7x
	5EVdmqogJtC1d9cZBalY+nmMj2BE9OvOk6vxiGDm/Bq9LMoJecr/Jv+7O3VYgFOOeMWI5M
	camopaA4C6CnJpTY9LRDK6UVaduSO0QQXUoFRmhfGNNU/qdtvkIkG3W6uTq46Frlw8U//x
	Ul6Ye+bxKqDGCQkwyT5e50GrXVChNQC3QMzp1dhvocPXHmfHOOPy7Z08Tv58Sw==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YbB1q1FKVz6ns;
	Sat, 18 Jan 2025 22:22:55 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50IMMtLj004051;
	Sat, 18 Jan 2025 22:22:55 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50IMMtgg004048;
	Sat, 18 Jan 2025 22:22:55 GMT
	(envelope-from git)
Date: Sat, 18 Jan 2025 22:22:55 GMT
Message-Id: <202501182222.50IMMtgg004048@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
        dev-commits-ports-main@FreeBSD.org
From: Daniel Engberg <diizzy@FreeBSD.org>
Subject: git: 59d0fbddd388 - main - lang/spidermonkey*: Fix build
  with ICU 76.1
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-all@freebsd.org
Sender: owner-dev-commits-ports-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: diizzy
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 59d0fbddd38882adc9224ad44c193551d9a68fee
Auto-Submitted: auto-generated

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=59d0fbddd38882adc9224ad44c193551d9a68fee

commit 59d0fbddd38882adc9224ad44c193551d9a68fee
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-01-18 22:19:39 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-01-18 22:19:44 +0000

    lang/spidermonkey*: Fix build with ICU 76.1
    
    Link with both icu-uc and icu-i18n
    
    Reference:
    https://src.fedoraproject.org/rpms/mozjs115/blob/23148a636b715c72899774aa846e34c7947000c6/f/mozjs115.spec#_125
    
    Approved by:    portmgr (blanket)
---
 lang/spidermonkey102/Makefile | 1 +
 lang/spidermonkey115/Makefile | 1 +
 lang/spidermonkey128/Makefile | 1 +
 lang/spidermonkey78/Makefile  | 1 +
 lang/spidermonkey91/Makefile  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/lang/spidermonkey102/Makefile b/lang/spidermonkey102/Makefile
index 93605d2e069d..8a1116001c47 100644
--- a/lang/spidermonkey102/Makefile
+++ b/lang/spidermonkey102/Makefile
@@ -70,6 +70,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 	@${FIND} ${WRKSRC}/python/mozbuild -name *.py -exec \
 		${REINPLACE_CMD} 's|"rU"|"r"|g' {} \;
 
diff --git a/lang/spidermonkey115/Makefile b/lang/spidermonkey115/Makefile
index 6d41057f91d4..cb5264d78a46 100644
--- a/lang/spidermonkey115/Makefile
+++ b/lang/spidermonkey115/Makefile
@@ -69,6 +69,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
diff --git a/lang/spidermonkey128/Makefile b/lang/spidermonkey128/Makefile
index 318dc4fbebda..81ed8c9d13b6 100644
--- a/lang/spidermonkey128/Makefile
+++ b/lang/spidermonkey128/Makefile
@@ -65,6 +65,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/libjs_static.ajs
diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile
index bdf12250b81f..73f94ca67e80 100644
--- a/lang/spidermonkey78/Makefile
+++ b/lang/spidermonkey78/Makefile
@@ -71,6 +71,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 	@${FIND} ${WRKSRC}/build/pymake ${WRKSRC}/python/mozbuild -name *.py -exec \
 		${REINPLACE_CMD} "s|'rU'|'r'|g" {} \;
 
diff --git a/lang/spidermonkey91/Makefile b/lang/spidermonkey91/Makefile
index 29fb3357ab84..59725bde231a 100644
--- a/lang/spidermonkey91/Makefile
+++ b/lang/spidermonkey91/Makefile
@@ -79,6 +79,7 @@ USE_GCC=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/js/moz.configure
+	@${REINPLACE_CMD} -e 's|icu-i18n|icu-uc icu-i18n|g' ${WRKSRC}/js/moz.configure
 	@${FIND} ${WRKSRC}/python/mozbuild -name *.py -exec \
 		${REINPLACE_CMD} 's|"rU"|"r"|g' {} \;