Fix compilation on Mac OS 10.4. From Sevan Janiyan in PR pkg/49077.

3 files changed, 43 insertions, 1 deletions

diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 52a76d6421e..fb0f1f72f1f 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2014/10/07 16:09:53 adam Exp $
+$NetBSD: distinfo,v 1.51 2014/10/26 19:46:48 bsiegert Exp $
 
 SHA1 (icu4c-54_1-src.tgz) = 8c752490bbf31cea26e20246430cee67d48abe34
 RMD160 (icu4c-54_1-src.tgz) = b1440e1a3330b12336742c881863a8de6a6d2235
@@ -9,6 +9,7 @@ SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
 SHA1 (patch-acinclude.m4) = ab757e9bf7351e44edd92b96edbffc40acb44dae
 SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663
 SHA1 (patch-af) = 6f41d58f258361e28ce3283e1b46f8a762b7c5dd
+SHA1 (patch-common_putil.cpp) = 3d35bdea709ded1ae5926729fb23995ca8734687
 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
 SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
 SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c
@@ -17,3 +18,4 @@ SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
 SHA1 (patch-configure) = 2d17823ee06693ce382745ce345eca37001a0a7c
 SHA1 (patch-configure.ac) = ea7586eb8131ff53a483b5bd7ca162886e9045f1
+SHA1 (patch-tools-toolutil-pkg_genc.c) = a38dc7f38edd5a4c743f1f1927642b12864735fe
diff --git a/textproc/icu/patches/patch-common_putil.cpp b/textproc/icu/patches/patch-common_putil.cpp
new file mode 100644
index 00000000000..8771b608edc
--- /dev/null
+++ b/textproc/icu/patches/patch-common_putil.cpp
@@ -0,0 +1,19 @@
+$NetBSD: patch-common_putil.cpp,v 1.1 2014/10/26 19:46:48 bsiegert Exp $
+
+--- common/putil.cpp.orig	2014-10-25 17:54:47.000000000 +0000
++++ common/putil.cpp
+@@ -117,6 +117,14 @@
+ #endif
+
+ /*
++ * Mac OS X 10.4 doesn't use its localtime_r() declaration in <time.h> if either _ANSI_SOURCE or _POSIX_C_SOURCE is #defined.
++ */
++#if defined(U_TZNAME) && U_PLATFORM_IS_DARWIN_BASED && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ == 1040 \
++	&& (defined(_ANSI_SOURCE) || defined(_POSIX_C_SOURCE))
++U_CFUNC struct tm *localtime_r(const time_t *, struct tm *);
++#endif
++
++/*
+  * Only include langinfo.h if we have a way to get the codeset. If we later
+  * depend on more feature, we can test on U_HAVE_NL_LANGINFO.
+  *
diff --git a/textproc/icu/patches/patch-tools-toolutil-pkg_genc.c b/textproc/icu/patches/patch-tools-toolutil-pkg_genc.c
new file mode 100644
index 00000000000..d632d1dfde7
--- /dev/null
+++ b/textproc/icu/patches/patch-tools-toolutil-pkg_genc.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-tools-toolutil-pkg_genc.c,v 1.1 2014/10/26 19:46:48 bsiegert Exp $
+
+--- tools/toolutil/pkg_genc.c.orig	2014-10-25 17:58:50.000000000 +0000
++++ tools/toolutil/pkg_genc.c
+@@ -125,13 +125,15 @@ static const struct AssemblyType {
+
+         ".long ","",HEX_0X
+     },
++    // Older assemblers for Darwin (like the one from Xcode 2.5) do not
++    // have .balign, but they take .align 4 to mean 2^4 = 16 bytes.
+     {"gcc-darwin",
+         /*"\t.section __TEXT,__text,regular,pure_instructions\n"
+         "\t.section __TEXT,__picsymbolstub1,symbol_stubs,pure_instructions,32\n"*/
+         ".globl _%s\n"
+         "\t.data\n"
+         "\t.const\n"
+-        "\t.balign 16\n"
++        "\t.align 4\n"
+         "_%s:\n\n",
+
+         ".long ","",HEX_0X