Re: pkg/49077 (Unbreak textproc/icu on OS X TIger)

[venture37 <venture37%geeklan.co.uk@localhost>]

The following reply was made to PR pkg/49077; it has been noted by GNATS.

From: venture37 <venture37%geeklan.co.uk@localhost>
To: gnats-bugs%NetBSD.org@localhost, macos-pkg-people%netbsd.org@localhost, 
 pkg-manager%netbsd.org@localhost, pkgsrc-bugs%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, 
 obache%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/49077 (Unbreak textproc/icu on OS X TIger)
Date: Sat, 25 Oct 2014 20:02:59 +0100

 Updated version of diff which applies cleanly to icu-54.1
 Updated ifdef to be more specific whilst only applying to OS X Tiger
 (the original definition in the patch upstream +
 __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
 
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/textproc/icu/distinfo,v
 retrieving revision 1.50
 diff -u -r1.50 distinfo
 --- distinfo	7 Oct 2014 16:09:53 -0000	1.50
 +++ distinfo	25 Oct 2014 18:56:25 -0000
 @@ -9,6 +9,7 @@
  SHA1 (patch-acinclude.m4) = ab757e9bf7351e44edd92b96edbffc40acb44dae
  SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663
  SHA1 (patch-af) = 6f41d58f258361e28ce3283e1b46f8a762b7c5dd
 +SHA1 (patch-common_putil.cpp) = d2e2e7f4ca73bbd04eb8eba8ee3eafe2134ea922
  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_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
  SHA1 (patch-configure) = 2d17823ee06693ce382745ce345eca37001a0a7c
  SHA1 (patch-configure.ac) = ea7586eb8131ff53a483b5bd7ca162886e9045f1
 +SHA1 (patch-tools-toolutil-pkg_genc.c) =
 a14451d912c9ea4bdba85ef5a920d3c7c1257d6e
 Index: patches/patch-common_putil.cpp
 ===================================================================
 RCS file: patches/patch-common_putil.cpp
 diff -N patches/patch-common_putil.cpp
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ patches/patch-common_putil.cpp	25 Oct 2014 18:56:25 -0000
 @@ -0,0 +1,19 @@
 +$NetBSD$
 +
 +--- 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.
 +  *
 Index: patches/patch-tools-toolutil-pkg_genc.c
 ===================================================================
 RCS file: patches/patch-tools-toolutil-pkg_genc.c
 diff -N patches/patch-tools-toolutil-pkg_genc.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ patches/patch-tools-toolutil-pkg_genc.c	25 Oct 2014 18:56:25 -0000
 @@ -0,0 +1,21 @@
 +$NetBSD$
 +
 +--- 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