Attachment #241077 for bug #270422

View | Details | Raw Unified | Return to bug 270422
Collapse All | Expand All




PORTNAME=	icu
DISTVERSIONPREFIX=	release-
DISTVERSION=	73-rc
PORTREVISION?=	0 # keep for icu-lx
PORTEPOCH?=	1
CATEGORIES?=	devel
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

MAINTAINER=	office@FreeBSD.org
COMMENT?=	International Components for Unicode (from IBM)

CPE_VENDOR=	${PORTNAME}-project
CPE_PRODUCT=	international_components_for_unicode
USE_LDCONFIG=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	unicode-org
WRKSRC_SUBDIR=	icu4c/source

ICUMAJOR=	${PORTVERSION:C/\..*//}
PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}

Lines 1-3 Link Here

(-)b/devel/icu/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1666140801	1	TIMESTAMP = 1679594200
2	SHA256 (icu4c-72_1-src.tgz) = a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68	2	SHA256 (unicode-org-icu-release-73-rc_GH0.tar.gz) = e9932ab1ab13a79c5d4769e00dee3d7c031ead70662d908ac03570fe16e7ec44
3	SIZE (icu4c-72_1-src.tgz) = 26303933	3	SIZE (unicode-org-icu-release-73-rc_GH0.tar.gz) = 81490090




--- common/putil.cpp.orig	2023-03-23 17:56:40 UTC
+++ common/putil.cpp
@@ -2004,7 +2004,7 @@ remapPlatformDependentCodepage(const char *locale, con
          */
         name = "ISO-8859-1";
     }
-#elif U_PLATFORM_IS_DARWIN_BASED
+#elif U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM == U_PF_BSD
     if (locale == nullptr && *name == 0) {
         /*
         No locale was specified, and an empty name was passed in.
@@ -2023,11 +2023,6 @@ remapPlatformDependentCodepage(const char *locale, con
          */
         name = "UTF-8";
     }

-        name = "EUC-KR";
-    }
 #elif U_PLATFORM == U_PF_HPUX
     if (locale != nullptr && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) {
         /* HP decided to extend big5 as hkbig5 even though it's not compatible :-( */
@@ -2183,7 +2178,7 @@ int_getDefaultCodepage()
        nl_langinfo may use the same buffer as setlocale. */
     {
         const char *codeset = nl_langinfo(U_NL_LANGINFO_CODESET);




include/unicode/filteredbrk.h
include/unicode/fmtable.h
include/unicode/format.h
include/unicode/formattednumber.h
include/unicode/formattedvalue.h
include/unicode/fpositer.h
include/unicode/gender.h

include/unicode/search.h
include/unicode/selfmt.h
include/unicode/simpleformatter.h
include/unicode/simplenumberformatter.h
include/unicode/simpletz.h
include/unicode/smpdtfmt.h
include/unicode/sortkey.h

include/unicode/uenum.h
include/unicode/ufieldpositer.h
include/unicode/uformattable.h
include/unicode/uformattednumber.h
include/unicode/uformattedvalue.h
include/unicode/ugender.h
include/unicode/uidna.h

include/unicode/unorm2.h
include/unicode/unum.h
include/unicode/unumberformatter.h
include/unicode/unumberoptions.h
include/unicode/unumberrangeformatter.h
include/unicode/unumsys.h
include/unicode/uobject.h

include/unicode/uset.h
include/unicode/usetiter.h
include/unicode/ushape.h
include/unicode/usimplenumberformatter.h
include/unicode/uspoof.h
include/unicode/usprep.h
include/unicode/ustdio.h

Return to bug 270422

Lines 1-11 Link Here

(-)b/devel/icu/Makefile (-5 / +5 lines)
1	PORTNAME= icu	1	PORTNAME= icu
2	DISTVERSION= 72_1	2	DISTVERSIONPREFIX= release-
		3	DISTVERSION= 73-rc
3	PORTREVISION?= 0 # keep for icu-lx	4	PORTREVISION?= 0 # keep for icu-lx
4	PORTEPOCH?= 1	5	PORTEPOCH?= 1
5	CATEGORIES?= devel	6	CATEGORIES?= devel
6	MASTER_SITES= https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/rc/-&/:S/_/-/g}/ \
7	SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION}
8	DISTNAME= icu4c-${DISTVERSION}-src
9		7
10	MAINTAINER= office@FreeBSD.org	8	MAINTAINER= office@FreeBSD.org
11	COMMENT?= International Components for Unicode (from IBM)	9	COMMENT?= International Components for Unicode (from IBM)
Lines 30-36 TEST_TARGET= check Link Here
30	CPE_VENDOR= ${PORTNAME}-project	28	CPE_VENDOR= ${PORTNAME}-project
31	CPE_PRODUCT= international_components_for_unicode	29	CPE_PRODUCT= international_components_for_unicode
32	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
33	WRKSRC= ${WRKDIR}/icu/source	31	USE_GITHUB= yes
		32	GH_ACCOUNT= unicode-org
		33	WRKSRC_SUBDIR= icu4c/source
34		34
35	ICUMAJOR= ${PORTVERSION:C/\..*//}	35	ICUMAJOR= ${PORTVERSION:C/\..*//}
36	PLIST_SUB+= ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}	36	PLIST_SUB+= ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}

Lines 1-15 Link Here

(-)b/devel/icu/files/patch-common_putil.cpp (-6 / +6 lines)
1	--- common/putil.cpp.orig 2016-10-19 17:20:56 UTC	1	--- common/putil.cpp.orig 2023-03-23 17:56:40 UTC
2	+++ common/putil.cpp	2	+++ common/putil.cpp
3	@@ -1789,7 +1789,7 @@ remapPlatformDependentCodepage(const cha	3	@@ -2004,7 +2004,7 @@ remapPlatformDependentCodepage(const char *locale, con
4	*/	4	*/
5	name = "ISO-8859-1";	5	name = "ISO-8859-1";
6	}	6	}
7	-#elif U_PLATFORM_IS_DARWIN_BASED	7	-#elif U_PLATFORM_IS_DARWIN_BASED
8	+#elif U_PLATFORM_IS_DARWIN_BASED \|\| U_PLATFORM == U_PF_BSD	8	+#elif U_PLATFORM_IS_DARWIN_BASED \|\| U_PLATFORM == U_PF_BSD
9	if (locale == NULL && *name == 0) {	9	if (locale == nullptr && *name == 0) {
10	/*	10	/*
11	No locale was specified, and an empty name was passed in.	11	No locale was specified, and an empty name was passed in.
12	@@ -1808,11 +1808,6 @@ remapPlatformDependentCodepage(const cha	12	@@ -2023,11 +2023,6 @@ remapPlatformDependentCodepage(const char *locale, con
13	*/	13	*/
14	name = "UTF-8";	14	name = "UTF-8";
15	}	15	}
Lines 19-27 Link Here
19	- name = "EUC-KR";	19	- name = "EUC-KR";
20	- }	20	- }
21	#elif U_PLATFORM == U_PF_HPUX	21	#elif U_PLATFORM == U_PF_HPUX
22	if (locale != NULL && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) {	22	if (locale != nullptr && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) {
23	/* HP decided to extend big5 as hkbig5 even though it's not compatible :-( */	23	/* HP decided to extend big5 as hkbig5 even though it's not compatible :-( */
24	@@ -1942,7 +1937,7 @@ int_getDefaultCodepage()	24	@@ -2183,7 +2178,7 @@ int_getDefaultCodepage()
25	nl_langinfo may use the same buffer as setlocale. */	25	nl_langinfo may use the same buffer as setlocale. */
26	{	26	{
27	const char *codeset = nl_langinfo(U_NL_LANGINFO_CODESET);	27	const char *codeset = nl_langinfo(U_NL_LANGINFO_CODESET);

Lines 48-53 include/unicode/fieldpos.h Link Here

(-)b/devel/icu/pkg-plist (+5 lines)
48	include/unicode/filteredbrk.h	48	include/unicode/filteredbrk.h
49	include/unicode/fmtable.h	49	include/unicode/fmtable.h
50	include/unicode/format.h	50	include/unicode/format.h
		51	include/unicode/formattednumber.h
51	include/unicode/formattedvalue.h	52	include/unicode/formattedvalue.h
52	include/unicode/fpositer.h	53	include/unicode/fpositer.h
53	include/unicode/gender.h	54	include/unicode/gender.h
Lines 93-98 include/unicode/scientificnumberformatter.h Link Here
93	include/unicode/search.h	94	include/unicode/search.h
94	include/unicode/selfmt.h	95	include/unicode/selfmt.h
95	include/unicode/simpleformatter.h	96	include/unicode/simpleformatter.h
		97	include/unicode/simplenumberformatter.h
96	include/unicode/simpletz.h	98	include/unicode/simpletz.h
97	include/unicode/smpdtfmt.h	99	include/unicode/smpdtfmt.h
98	include/unicode/sortkey.h	100	include/unicode/sortkey.h
Lines 144-149 include/unicode/udisplayoptions.h Link Here
144	include/unicode/uenum.h	146	include/unicode/uenum.h
145	include/unicode/ufieldpositer.h	147	include/unicode/ufieldpositer.h
146	include/unicode/uformattable.h	148	include/unicode/uformattable.h
		149	include/unicode/uformattednumber.h
147	include/unicode/uformattedvalue.h	150	include/unicode/uformattedvalue.h
148	include/unicode/ugender.h	151	include/unicode/ugender.h
149	include/unicode/uidna.h	152	include/unicode/uidna.h
Lines 166-171 include/unicode/unorm.h Link Here
166	include/unicode/unorm2.h	169	include/unicode/unorm2.h
167	include/unicode/unum.h	170	include/unicode/unum.h
168	include/unicode/unumberformatter.h	171	include/unicode/unumberformatter.h
		172	include/unicode/unumberoptions.h
169	include/unicode/unumberrangeformatter.h	173	include/unicode/unumberrangeformatter.h
170	include/unicode/unumsys.h	174	include/unicode/unumsys.h
171	include/unicode/uobject.h	175	include/unicode/uobject.h
Lines 181-186 include/unicode/usearch.h Link Here
181	include/unicode/uset.h	185	include/unicode/uset.h
182	include/unicode/usetiter.h	186	include/unicode/usetiter.h
183	include/unicode/ushape.h	187	include/unicode/ushape.h
		188	include/unicode/usimplenumberformatter.h
184	include/unicode/uspoof.h	189	include/unicode/uspoof.h
185	include/unicode/usprep.h	190	include/unicode/usprep.h
186	include/unicode/ustdio.h	191	include/unicode/ustdio.h