From efc2e498c6c99c6de2f94062a5ba5c1f61ba814f Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 23 Apr 2020 06:33:13 +0000
Subject: [PATCH] Update to icu4c-67.1.

---
 textproc/icu4c/Makefile                       |  6 +++---
 textproc/icu4c/distinfo                       |  4 ++--
 .../patches/patch-source_common_Makefile_in   |  4 ++--
 .../patches/patch-source_common_putil_cpp     |  8 +++----
 .../patch-source_config_icu-config-bottom     | 21 +++++++++++--------
 .../patches/patch-source_data_Makefile_in     | 18 ----------------
 .../patches/patch-source_i18n_Makefile_in     |  4 ++--
 .../icu4c/patches/patch-source_io_Makefile_in |  4 ++--
 .../patches/patch-source_layoutex_Makefile_in |  4 ++--
 .../patches/patch-source_stubdata_Makefile_in |  4 ++--
 .../patch-source_tools_ctestfw_Makefile_in    |  4 ++--
 .../patch-source_tools_toolutil_Makefile_in   |  4 ++--
 12 files changed, 35 insertions(+), 50 deletions(-)
 delete mode 100644 textproc/icu4c/patches/patch-source_data_Makefile_in

diff --git a/textproc/icu4c/Makefile b/textproc/icu4c/Makefile
index f4f70f5f774..0cebaa2aeda 100644
--- a/textproc/icu4c/Makefile
+++ b/textproc/icu4c/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.79 2020/03/20 16:44:27 naddy Exp $
+# $OpenBSD: Makefile,v 1.80 2020/04/23 06:33:13 ajacoutot Exp $
 
 NOT_FOR_ARCHS=		${GCC3_ARCHS}
 
 COMMENT-main=		International Components for Unicode
 COMMENT-wwwdata=	ICU data file for use with /var/www chroot jails
 
-VERSION=		66.1
+VERSION=		67.1
 DISTNAME=		icu4c-${VERSION:S/./_/g}-src
 PKGNAME-main=		icu4c-${VERSION}
 PKGNAME-wwwdata=	icu4c-wwwdata-${VERSION}
@@ -15,7 +15,7 @@ PKGNAME-wwwdata=	icu4c-wwwdata-${VERSION}
 # LDFLAGS); @lib and LIBicudata_VERSION must be added manually;
 # (see ports/infrastructure/lib/OpenBSD/FS2.pm)
 MAJ_V=			${VERSION:R}
-SO_VERSION=		17.0
+SO_VERSION=		18.0
 .for _lib in icudata icui18n icuio icutest icutu icuuc
 SHARED_LIBS+=		${_lib} ${SO_VERSION}
 .endfor
diff --git a/textproc/icu4c/distinfo b/textproc/icu4c/distinfo
index 56ecd84e81c..b854a5a92d5 100644
--- a/textproc/icu4c/distinfo
+++ b/textproc/icu4c/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icu4c-66_1-src.tgz) = UqPyIJq5VVnBzwoU8kM4AB84lhW/AOJYXvPbxD7PCi4=
-SIZE (icu4c-66_1-src.tgz) = 24361305
+SHA256 (icu4c-67_1-src.tgz) = lKgM1vJRpTvSqZf28bWsZlP+eR36tm4esCJ3QPuG1dw=
+SIZE (icu4c-67_1-src.tgz) = 24518055
diff --git a/textproc/icu4c/patches/patch-source_common_Makefile_in b/textproc/icu4c/patches/patch-source_common_Makefile_in
index 5962ab040e2..8b63c9a48fa 100644
--- a/textproc/icu4c/patches/patch-source_common_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_common_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-source_common_Makefile_in,v 1.13 2019/10/16 13:42:58 ajacoutot Exp $
+$OpenBSD: patch-source_common_Makefile_in,v 1.14 2020/04/23 06:33:13 ajacoutot Exp $
 
 Don't strip static libraries.
 
@@ -13,4 +13,4 @@ Index: source/common/Makefile.in
 +	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
  endif
  ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ # For MinGW, do we want the DLL to go in the bin location?
diff --git a/textproc/icu4c/patches/patch-source_common_putil_cpp b/textproc/icu4c/patches/patch-source_common_putil_cpp
index 51eed3cd0c4..f8216d35c29 100644
--- a/textproc/icu4c/patches/patch-source_common_putil_cpp
+++ b/textproc/icu4c/patches/patch-source_common_putil_cpp
@@ -1,11 +1,11 @@
-$OpenBSD: patch-source_common_putil_cpp,v 1.4 2019/10/16 13:42:58 ajacoutot Exp $
+$OpenBSD: patch-source_common_putil_cpp,v 1.5 2020/04/23 06:33:13 ajacoutot Exp $
 
 https://reviews.freebsd.org/D10128
 
 Index: source/common/putil.cpp
 --- source/common/putil.cpp.orig
 +++ source/common/putil.cpp
-@@ -1931,7 +1931,7 @@ remapPlatformDependentCodepage(const char *locale, con
+@@ -1943,7 +1943,7 @@ remapPlatformDependentCodepage(const char *locale, con
           */
          name = "ISO-8859-1";
      }
@@ -14,7 +14,7 @@ Index: source/common/putil.cpp
      if (locale == NULL && *name == 0) {
          /*
          No locale was specified, and an empty name was passed in.
-@@ -1950,11 +1950,6 @@ remapPlatformDependentCodepage(const char *locale, con
+@@ -1962,11 +1962,6 @@ remapPlatformDependentCodepage(const char *locale, con
           */
          name = "UTF-8";
      }
@@ -26,7 +26,7 @@ Index: source/common/putil.cpp
  #elif U_PLATFORM == U_PF_HPUX
      if (locale != NULL && uprv_strcmp(locale, "zh_HK") == 0 && uprv_strcmp(name, "big5") == 0) {
          /* HP decided to extend big5 as hkbig5 even though it's not compatible :-( */
-@@ -2110,7 +2105,7 @@ int_getDefaultCodepage()
+@@ -2122,7 +2117,7 @@ int_getDefaultCodepage()
         nl_langinfo may use the same buffer as setlocale. */
      {
          const char *codeset = nl_langinfo(U_NL_LANGINFO_CODESET);
diff --git a/textproc/icu4c/patches/patch-source_config_icu-config-bottom b/textproc/icu4c/patches/patch-source_config_icu-config-bottom
index 592b304daf1..55ce53c0127 100644
--- a/textproc/icu4c/patches/patch-source_config_icu-config-bottom
+++ b/textproc/icu4c/patches/patch-source_config_icu-config-bottom
@@ -1,19 +1,22 @@
-$OpenBSD: patch-source_config_icu-config-bottom,v 1.10 2019/10/16 13:42:58 ajacoutot Exp $
+$OpenBSD: patch-source_config_icu-config-bottom,v 1.11 2020/04/23 06:33:13 ajacoutot Exp $
 
---- source/config/icu-config-bottom.orig	Fri Sep  9 23:28:18 2016
-+++ source/config/icu-config-bottom	Thu Dec  1 17:22:48 2016
-@@ -5,8 +5,8 @@
- ## Copyright (c) 2002-2013, International Business Machines Corporation and
- ## others. All Rights Reserved.
+Index: source/config/icu-config-bottom
+--- source/config/icu-config-bottom.orig
++++ source/config/icu-config-bottom
+@@ -9,10 +9,10 @@
+ if [ "$MINGW_MOVEDLLSTOBINDIR" = "YES" ]; then
+ 	ICUUC_FILE="${bindir}/${ICULIBS_COMMON_LIB_NAME}"
+ else
+-	ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}"
++	ICUUC_FILE="${ICULIBS_COMMON_LIB_NAME}.*.*"
+ fi
  
--ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}"
 -ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}"
-+ICUUC_FILE="${ICULIBS_COMMON_LIB_NAME}.*.*"
 +ICUUC_FILE_A="${ICULIBS_COMMON_LIB_NAME_A}"
  
  #  echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS}
  if [ "x$PKGDATA_MODE" = "x" ]; then
-@@ -98,7 +98,8 @@ usage()
+@@ -104,7 +104,8 @@ usage()
  ## Check the sanity of current variables
  sanity()
  {
diff --git a/textproc/icu4c/patches/patch-source_data_Makefile_in b/textproc/icu4c/patches/patch-source_data_Makefile_in
deleted file mode 100644
index 360b9f6e273..00000000000
--- a/textproc/icu4c/patches/patch-source_data_Makefile_in
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-source_data_Makefile_in,v 1.3 2019/07/06 12:11:01 cwen Exp $
-
-Unbreak the build on big endian archs, see:
-https://unicode-org.atlassian.net/browse/ICU-20533
-
-Index: source/data/Makefile.in
---- source/data/Makefile.in.orig
-+++ source/data/Makefile.in
-@@ -148,7 +148,8 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard $(srcdir)/in/
- # and convert it to the current type.
- ifneq ($(ICUDATA_ARCHIVE),)
- ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
--$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
-+$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE)
-+	$(MKINSTALLDIRS) $(OUTDIR)
- 	$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
- endif
- else
diff --git a/textproc/icu4c/patches/patch-source_i18n_Makefile_in b/textproc/icu4c/patches/patch-source_i18n_Makefile_in
index 8917da64f1d..0cc07d40ef5 100644
--- a/textproc/icu4c/patches/patch-source_i18n_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_i18n_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-source_i18n_Makefile_in,v 1.6 2019/10/16 13:42:59 ajacoutot Exp $
+$OpenBSD: patch-source_i18n_Makefile_in,v 1.7 2020/04/23 06:33:13 ajacoutot Exp $
 
 Don't strip static libraries.
 
@@ -13,4 +13,4 @@ Index: source/i18n/Makefile.in
 +	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
  endif
  ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ # For MinGW, do we want the DLL to go in the bin location?
diff --git a/textproc/icu4c/patches/patch-source_io_Makefile_in b/textproc/icu4c/patches/patch-source_io_Makefile_in
index 4b3d0585f50..a93b9095a97 100644
--- a/textproc/icu4c/patches/patch-source_io_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_io_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-source_io_Makefile_in,v 1.4 2017/05/24 15:44:42 ajacoutot Exp $
+$OpenBSD: patch-source_io_Makefile_in,v 1.5 2020/04/23 06:33:13 ajacoutot Exp $
 
 Don't strip static libraries.
 
@@ -13,4 +13,4 @@ Index: source/io/Makefile.in
 +	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
  endif
  ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ # For MinGW, do we want the DLL to go in the bin location?
diff --git a/textproc/icu4c/patches/patch-source_layoutex_Makefile_in b/textproc/icu4c/patches/patch-source_layoutex_Makefile_in
index f1738563ac4..01ff3495f8d 100644
--- a/textproc/icu4c/patches/patch-source_layoutex_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_layoutex_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-source_layoutex_Makefile_in,v 1.4 2017/05/24 15:44:42 ajacoutot Exp $
+$OpenBSD: patch-source_layoutex_Makefile_in,v 1.5 2020/04/23 06:33:13 ajacoutot Exp $
 
 Don't strip static libraries.
 
@@ -13,4 +13,4 @@ Index: source/layoutex/Makefile.in
 +	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
  endif
  ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ # For MinGW, do we want the DLL to go in the bin location?
diff --git a/textproc/icu4c/patches/patch-source_stubdata_Makefile_in b/textproc/icu4c/patches/patch-source_stubdata_Makefile_in
index fb3f90b0bd7..c612e7e9302 100644
--- a/textproc/icu4c/patches/patch-source_stubdata_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_stubdata_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-source_stubdata_Makefile_in,v 1.9 2017/05/24 15:44:42 ajacoutot Exp $
+$OpenBSD: patch-source_stubdata_Makefile_in,v 1.10 2020/04/23 06:33:13 ajacoutot Exp $
 
 Don't strip static libraries.
 
@@ -13,4 +13,4 @@ Index: source/stubdata/Makefile.in
 +	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
  endif
  ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ # For MinGW, do we want the DLL to go in the bin location?
diff --git a/textproc/icu4c/patches/patch-source_tools_ctestfw_Makefile_in b/textproc/icu4c/patches/patch-source_tools_ctestfw_Makefile_in
index 1beedbc97e0..b6db807eee9 100644
--- a/textproc/icu4c/patches/patch-source_tools_ctestfw_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_tools_ctestfw_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-source_tools_ctestfw_Makefile_in,v 1.1 2017/05/24 15:44:42 ajacoutot Exp $
+$OpenBSD: patch-source_tools_ctestfw_Makefile_in,v 1.2 2020/04/23 06:33:13 ajacoutot Exp $
 
 Don't strip static libraries.
 
@@ -13,4 +13,4 @@ Index: source/tools/ctestfw/Makefile.in
 +	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
  endif
  ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ # For MinGW, do we want the DLL to go in the bin location?
diff --git a/textproc/icu4c/patches/patch-source_tools_toolutil_Makefile_in b/textproc/icu4c/patches/patch-source_tools_toolutil_Makefile_in
index 8d647c9c3c7..b9e1431e0db 100644
--- a/textproc/icu4c/patches/patch-source_tools_toolutil_Makefile_in
+++ b/textproc/icu4c/patches/patch-source_tools_toolutil_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-source_tools_toolutil_Makefile_in,v 1.4 2017/05/24 15:44:42 ajacoutot Exp $
+$OpenBSD: patch-source_tools_toolutil_Makefile_in,v 1.5 2020/04/23 06:33:13 ajacoutot Exp $
 
 Don't strip static libraries.
 
@@ -13,4 +13,4 @@ Index: source/tools/toolutil/Makefile.in
 +	$(INSTALL_DATA) $(TARGET) $(DESTDIR)$(libdir)
  endif
  ifneq ($(ENABLE_SHARED),)
- 	$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
+ # For MinGW, do we want the DLL to go in the bin location?