From ea151d1c2eba86024177b9450f83501b4eda3dc2 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 27 Mar 2019 21:09:59 +0000
Subject: devel/icu: handle RC distfiles

PR:		236325
---
 devel/icu/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index cdf30c784ff2..dab3b3cdce01 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -6,7 +6,7 @@ DISTVERSION=	63_1
 PORTREVISION?=	1 # keep for icu-lx
 PORTEPOCH?=	1
 CATEGORIES?=	devel
-MASTER_SITES=	https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/_/-/g}/ \
+MASTER_SITES=	https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/rc/-&/:S/_/-/g}/ \
 		SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION}
 DISTNAME=	icu4c-${DISTVERSION}-src
 
@@ -32,7 +32,7 @@ USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/icu/source
 
 ICUMAJOR=	${PORTVERSION:C/\..*//}
-PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION}
+PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}
 
 .ifndef PKGNAMESUFFIX
 post-install:
@@ -44,7 +44,7 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
 # Filename varies by endianness: icudt<major>b.dat vs. icudt<major>l.dat
 	@(cd ${STAGEDIR}${PREFIX} && ${ECHO_CMD} \
-		${DATADIR_REL}/${PORTVERSION}/icudt*.dat >>${TMPPLIST})
+		${DATADIR_REL}/${PORTVERSION:C/r.?/1/}/icudt*.dat >>${TMPPLIST})
 .endif # PKGNAMESUFFIX
 
 .include <bsd.port.mk>
-- 
cgit v1.2.3