py-ICU: updated to 2.5

Version 2.4.3 -> 2.5
--------------------
- added support for turning on -pedantic with gcc or clang
- added support for ICU 67.1
- added wrappers for FormattedValue, ConstrainedFieldPosition, UFieldCategory
- made FormattedValue iterable via nextPosition()
- added wrappers for FormattedDateInterval, FormattedNumber, FormattedList
- added wrappers for FormattedRelativeDateTime and enums
- added wrappers for UNumberFormatFields, UNumberFormatAttribute
- added wrappers for NumberRangeFormatter, FormattedNumberRange and enums
- added icu.ICU_MAX_MAJOR_VERSION global set to largest ICU version supported

3 files changed, 25 insertions, 25 deletions

diff --git a/textproc/py-ICU/Makefile b/textproc/py-ICU/Makefile
index 15c9c849898..8627a462c6c 100644
--- a/textproc/py-ICU/Makefile
+++ b/textproc/py-ICU/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/06/02 08:24:51 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/07/15 15:04:18 adam Exp $
 
-DISTNAME=	PyICU-2.4.3
-PKGREVISION=	4
+DISTNAME=	PyICU-2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/PyICU/ICU/}
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=P/PyICU/}
diff --git a/textproc/py-ICU/distinfo b/textproc/py-ICU/distinfo
index 308bd07ee8a..668b6e9e6b2 100644
--- a/textproc/py-ICU/distinfo
+++ b/textproc/py-ICU/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2020/03/24 04:08:55 gutteridge Exp $
+$NetBSD: distinfo,v 1.5 2020/07/15 15:04:18 adam Exp $
 
-SHA1 (PyICU-2.4.3.tar.gz) = 594c97ce83744f4173d20b7d465e9149ba83cc09
-RMD160 (PyICU-2.4.3.tar.gz) = b2b7a4a739f081193865795be156e338637524ec
-SHA512 (PyICU-2.4.3.tar.gz) = 77b81b0e9a17972696967ebc0421d05c1119a43c7e853f8d939390dddefa4a2a35dd316e08c10c10a283472bb64738016e47c5f45c7c6191d9dba296057740a0
-Size (PyICU-2.4.3.tar.gz) = 219819 bytes
+SHA1 (PyICU-2.5.tar.gz) = 73de6ee88f679678789eceb382b7c1452e91c53b
+RMD160 (PyICU-2.5.tar.gz) = c4f56298ee1dc78164fb7a8ee9cefd36fb27f005
+SHA512 (PyICU-2.5.tar.gz) = b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548
+Size (PyICU-2.5.tar.gz) = 225591 bytes
 SHA1 (patch-locale.cpp) = 4e259f3130e94bd8114d7781e36e21236c13d5b6
-SHA1 (patch-setup.py) = 8a9c83d128c2cf95f3094abaeb0d9f85b2eb4840
+SHA1 (patch-setup.py) = 07837aecbb2adbfa8e9222c4eb3790ee0f0199df
diff --git a/textproc/py-ICU/patches/patch-setup.py b/textproc/py-ICU/patches/patch-setup.py
index adf3c402f64..5ea10f2b8ee 100644
--- a/textproc/py-ICU/patches/patch-setup.py
+++ b/textproc/py-ICU/patches/patch-setup.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-setup.py,v 1.1 2020/03/21 17:02:14 gutteridge Exp $
+$NetBSD: patch-setup.py,v 1.2 2020/07/15 15:04:18 adam Exp $
 
 Add NetBSD support.
 
---- setup.py.orig	2020-03-19 20:58:31.000000000 +0000
+--- setup.py.orig	2020-05-26 22:08:37.000000000 +0000
 +++ setup.py
-@@ -85,6 +85,7 @@ CONFIGURE_WITH_ICU_CONFIG = {
+@@ -86,6 +86,7 @@ CONFIGURE_WITH_ICU_CONFIG = {
      'win32': False,   # no icu-config
      'sunos5': False,  # not tested
      'cygwin': False,  # not tested
@@ -12,7 +12,7 @@ Add NetBSD support.
  }
  
  CONFIGURE_WITH_PKG_CONFIG = {
-@@ -94,6 +95,7 @@ CONFIGURE_WITH_PKG_CONFIG = {
+@@ -95,6 +96,7 @@ CONFIGURE_WITH_PKG_CONFIG = {
      'win32': False,   # no pkg-config ?
      'sunos5': False,  # not tested
      'cygwin': False,  # not tested
@@ -20,7 +20,7 @@ Add NetBSD support.
  }
  
  INCLUDES = {
-@@ -103,6 +105,7 @@ INCLUDES = {
+@@ -104,6 +106,7 @@ INCLUDES = {
      'win32': ['c:/icu/include'],
      'sunos5': [],
      'cygwin': [],
@@ -28,15 +28,16 @@ Add NetBSD support.
  }
  
  VER_FLAGS = {
-@@ -112,6 +115,7 @@ VER_FLAGS = {
-     'win32': ['/DPYICU_VER=\\"%s\\"' %(VERSION)],
-     'sunos5': ['-DPYICU_VER="%s"' %(VERSION)],
-     'cygwin': ['-DPYICU_VER="%s"' %(VERSION)],
-+    'netbsd': ['-DPYICU_VER="%s"' %(VERSION)],
+@@ -119,6 +122,8 @@ VER_FLAGS = {
+                '-DPYICU_ICU_MAX_VER="%s"' %(ICU_MAX_MAJOR_VERSION)],
+     'cygwin': ['-DPYICU_VER="%s"' %(VERSION),
+                '-DPYICU_ICU_MAX_VER="%s"' %(ICU_MAX_MAJOR_VERSION)],
++    'netbsd': ['-DPYICU_VER="%s"' %(VERSION),
++               '-DPYICU_ICU_MAX_VER="%s"' %(ICU_MAX_MAJOR_VERSION)],
  }
  
- CFLAGS = {
-@@ -121,6 +125,7 @@ CFLAGS = {
+ PEDANTIC_FLAGS = {
+@@ -137,6 +142,7 @@ CFLAGS = {
      'win32': ['/Zc:wchar_t', '/EHsc'],
      'sunos5': ['-std=c++11'],
      'cygwin': ['-D_GNU_SOURCE=1', '-std=c++11'],
@@ -44,7 +45,7 @@ Add NetBSD support.
  }
  
  # added to CFLAGS when setup is invoked with --debug
-@@ -131,6 +136,7 @@ DEBUG_CFLAGS = {
+@@ -147,6 +153,7 @@ DEBUG_CFLAGS = {
      'win32': ['/Od', '/DDEBUG'],
      'sunos5': ['-DDEBUG'],
      'cygwin': ['-Og', '-g', '-DDEBUG'],
@@ -52,7 +53,7 @@ Add NetBSD support.
  }
  
  LFLAGS = {
-@@ -140,6 +146,7 @@ LFLAGS = {
+@@ -156,6 +163,7 @@ LFLAGS = {
      'win32': ['/LIBPATH:c:/icu/lib'],
      'sunos5': [],
      'cygwin': [],
@@ -60,7 +61,7 @@ Add NetBSD support.
  }
  
  LIBRARIES = {
-@@ -149,6 +156,7 @@ LIBRARIES = {
+@@ -165,6 +173,7 @@ LIBRARIES = {
      'win32': ['icuin', 'icuuc', 'icudt'],
      'sunos5': ['icui18n', 'icuuc', 'icudata'],
      'cygwin': ['icui18n', 'icuuc', 'icudata'],
@@ -68,7 +69,7 @@ Add NetBSD support.
  }
  
  platform = sys.platform
-@@ -156,6 +164,8 @@ if platform.startswith(('linux', 'gnu'))
+@@ -172,6 +181,8 @@ if platform.startswith(('linux', 'gnu'))
      platform = 'linux'
  elif platform.startswith('freebsd'):
      platform = 'freebsd'