On Mon, Jun 10, 2019 at 12:49:04AM -0400, Kurt Mosiejczuk wrote:
> Here's an update for textproc/py-ICU to bring it to 2.3.1.
>
> Regression tests all pass on both amd64 and sparc64. With the
> update installed, the regression tests for devel/py-parsedate and
> textproc/py-natsort also pass (on amd64).
>
> misc/gramps is the only other consumer, but it has no regression tests.
>
> Tweaked PERMIT_PACKAGE line while here.
Oops, sorry I missed your mail and updated the port alongside icu4c.
You can change to PERMIT_PACKAGE though.
Thanks.
>
> --Kurt
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/py-ICU/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile 28 Apr 2019 20:51:55 -0000 1.18
> +++ Makefile 10 Jun 2019 03:55:42 -0000
> @@ -2,10 +2,9 @@
>
> COMMENT= Python extension wrapping the ICU C++ API
>
> -MODPY_EGG_VERSION= 2.2
> +MODPY_EGG_VERSION= 2.3.1
> DISTNAME= PyICU-${MODPY_EGG_VERSION}
> PKGNAME= py-ICU-${MODPY_EGG_VERSION}
> -REVISION= 0
>
> CATEGORIES= textproc
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/textproc/py-ICU/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 8 Feb 2019 19:44:52 -0000 1.7
> +++ distinfo 10 Jun 2019 03:55:42 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (PyICU-2.2.tar.gz) = 6mrou2hF4uFFzwPNgM8lhIe4D8o2aa6Ke/DFEF3xCXM=
> -SIZE (PyICU-2.2.tar.gz) = 211135
> +SHA256 (PyICU-2.3.1.tar.gz) = 3bK0U4U7TCXbOCvF6MTN4Js/RpbvHhSU+ClOF09FnPQ=
> +SIZE (PyICU-2.3.1.tar.gz) = 214761
> Index: patches/patch-setup_py
> ===================================================================
> RCS file: /cvs/ports/textproc/py-ICU/patches/patch-setup_py,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-setup_py
> --- patches/patch-setup_py 8 Feb 2019 19:44:52 -0000 1.6
> +++ patches/patch-setup_py 10 Jun 2019 03:55:42 -0000
> @@ -2,7 +2,7 @@ $OpenBSD: patch-setup_py,v 1.6 2019/02/0
> Index: setup.py
> --- setup.py.orig
> +++ setup.py
> -@@ -60,6 +60,7 @@ CONFIGURE_WITH_ICU_CONFIG = {
> +@@ -82,6 +82,7 @@ CONFIGURE_WITH_ICU_CONFIG = {
> 'darwin': True,
> 'linux': True,
> 'freebsd': False, # not tested
> @@ -10,7 +10,7 @@ Index: setup.py
> 'win32': False, # no icu-config
> 'sunos5': False, # not tested
> 'cygwin': False, # not tested
> -@@ -69,6 +70,7 @@ INCLUDES = {
> +@@ -100,6 +101,7 @@ INCLUDES = {
> 'darwin': [],
> 'linux': [],
> 'freebsd': ['/usr/local/include'],
> @@ -18,15 +18,23 @@ Index: setup.py
> 'win32': ['c:/icu/include'],
> 'sunos5': [],
> 'cygwin': [],
> -@@ -78,6 +80,7 @@ CFLAGS = {
> +@@ -109,6 +111,7 @@ VER_FLAGS = {
> 'darwin': ['-DPYICU_VER="%s"' %(VERSION)],
> 'linux': ['-DPYICU_VER="%s"' %(VERSION)],
> - 'freebsd': ['-DPYICU_VER="%s"' %(VERSION), '-std=c++11'],
> -+ 'openbsd': ['-DPYICU_VER="%s"' %(VERSION), '-std=c++11'],
> - 'win32': ['/Zc:wchar_t', '/EHsc', '/DPYICU_VER=\\"%s\\"' %(VERSION)],
> - 'sunos5': ['-DPYICU_VER="%s"' %(VERSION), '-std=c++11'],
> - 'cygwin': ['-DPYICU_VER="%s"' %(VERSION), '-D_GNU_SOURCE=1',
> '-std=c++11'],
> -@@ -88,6 +91,7 @@ DEBUG_CFLAGS = {
> + 'freebsd': ['-DPYICU_VER="%s"' %(VERSION)],
> ++ 'openbsd': ['-DPYICU_VER="%s"' %(VERSION)],
> + 'win32': ['/DPYICU_VER=\\"%s\\"' %(VERSION)],
> + 'sunos5': ['-DPYICU_VER="%s"' %(VERSION)],
> + 'cygwin': ['-DPYICU_VER="%s"' %(VERSION)],
> +@@ -118,6 +121,7 @@ CFLAGS = {
> + 'darwin': [],
> + 'linux': [],
> + 'freebsd': ['-std=c++11'],
> ++ 'openbsd': ['-std=c++11'],
> + 'win32': ['/Zc:wchar_t', '/EHsc'],
> + 'sunos5': ['-std=c++11'],
> + 'cygwin': ['-D_GNU_SOURCE=1', '-std=c++11'],
> +@@ -128,6 +132,7 @@ DEBUG_CFLAGS = {
> 'darwin': ['-O0', '-g', '-DDEBUG'],
> 'linux': ['-O0', '-g', '-DDEBUG'],
> 'freebsd': ['-O0', '-g', '-DDEBUG'],
> @@ -34,7 +42,7 @@ Index: setup.py
> 'win32': ['/Od', '/DDEBUG'],
> 'sunos5': ['-DDEBUG'],
> 'cygwin': ['-Og', '-g', '-DDEBUG'],
> -@@ -97,6 +101,7 @@ LFLAGS = {
> +@@ -137,6 +142,7 @@ LFLAGS = {
> 'darwin': [],
> 'linux': [],
> 'freebsd': ['-L/usr/local/lib'],
> @@ -42,7 +50,7 @@ Index: setup.py
> 'win32': ['/LIBPATH:c:/icu/lib'],
> 'sunos5': [],
> 'cygwin': [],
> -@@ -106,6 +111,7 @@ LIBRARIES = {
> +@@ -146,6 +152,7 @@ LIBRARIES = {
> 'darwin': [],
> 'linux': [],
> 'freebsd': ['icui18n', 'icuuc', 'icudata'],
> @@ -50,7 +58,7 @@ Index: setup.py
> 'win32': ['icuin', 'icuuc', 'icudt'],
> 'sunos5': ['icui18n', 'icuuc', 'icudata'],
> 'cygwin': ['icui18n', 'icuuc', 'icudata'],
> -@@ -116,6 +122,8 @@ if platform.startswith(('linux', 'gnu')):
> +@@ -156,6 +163,8 @@ if platform.startswith(('linux', 'gnu')):
> platform = 'linux'
> elif platform.startswith('freebsd'):
> platform = 'freebsd'
>
--
Antoine
