Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 04F0C7A237 for ; Sat, 22 Apr 2017 20:11:47 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9A51584DC8; Sat, 22 Apr 2017 20:11:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2AEDB84DAE for ; Sat, 22 Apr 2017 20:11:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id qfjLbHdSAI-I for ; Sat, 22 Apr 2017 20:11:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E6DD184CDD for ; Sat, 22 Apr 2017 20:11:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DDC8CFBE4; Sat, 22 Apr 2017 20:11:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1492891905244020" MIME-Version: 1.0 Date: Sat, 22 Apr 2017 20:11:45 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/textproc/icu To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20170422201145.DDC8CFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1492891905244020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sat Apr 22 20:11:45 UTC 2017 Modified Files: pkgsrc/textproc/icu: Makefile PLIST distinfo pkgsrc/textproc/icu/patches: patch-common_putil.cpp patch-common_uposixdefs.h Added Files: pkgsrc/textproc/icu/patches: patch-Makefile.in patch-config_Makefile.inc.in patch-config_mh-darwin patch-icudefs.mk.in patch-runConfigureICU patch-tools-toolutil-pkg_genc.cpp Removed Files: pkgsrc/textproc/icu/patches: patch-aa patch-ab patch-ac patch-ad patch-af patch-common_ulist.c patch-i18n_ucol__res.cpp patch-test_intltest_apicoll.cpp patch-test_intltest_apicoll.h patch-tools-toolutil-pkg_genc.c patch-tools_pkgdata_pkgdata.cpp Log Message: Changes 59.1: * Emoji 5.0 data * Includes bidi data files from Unicode 10 beta. * Includes segmentation data files and rules from Unicode 10 beta and CLDR 31.0.1. * Does not yet include the Emoji_Component property. * Otherwise ICU 59 continues to use Unicode 9 data. CLDR 31.0.1 * Including updates for emoji 5.0, for example local names for England, Scotland, and Wales. * GMT and UTC are no longer unified, and CLDR provides distinct UTC display names, avoiding confusion with standard (winter) time in Britain. * See the CLDR download page for other CLDR features and migration issues in CLDR v31. New case mapping API (C++ & Java classes CaseMap) supports styled text. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 pkgsrc/textproc/icu/Makefile cvs rdiff -u -r1.39 -r1.40 pkgsrc/textproc/icu/PLIST cvs rdiff -u -r1.63 -r1.64 pkgsrc/textproc/icu/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/icu/patches/patch-Makefile.in \ pkgsrc/textproc/icu/patches/patch-config_Makefile.inc.in \ pkgsrc/textproc/icu/patches/patch-config_mh-darwin \ pkgsrc/textproc/icu/patches/patch-icudefs.mk.in \ pkgsrc/textproc/icu/patches/patch-runConfigureICU \ pkgsrc/textproc/icu/patches/patch-tools-toolutil-pkg_genc.cpp cvs rdiff -u -r1.18 -r0 pkgsrc/textproc/icu/patches/patch-aa cvs rdiff -u -r1.12 -r0 pkgsrc/textproc/icu/patches/patch-ab cvs rdiff -u -r1.7 -r0 pkgsrc/textproc/icu/patches/patch-ac cvs rdiff -u -r1.14 -r0 pkgsrc/textproc/icu/patches/patch-ad cvs rdiff -u -r1.15 -r0 pkgsrc/textproc/icu/patches/patch-af cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/icu/patches/patch-common_putil.cpp \ pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h cvs rdiff -u -r1.1 -r0 pkgsrc/textproc/icu/patches/patch-common_ulist.c \ pkgsrc/textproc/icu/patches/patch-i18n_ucol__res.cpp \ pkgsrc/textproc/icu/patches/patch-test_intltest_apicoll.cpp \ pkgsrc/textproc/icu/patches/patch-test_intltest_apicoll.h \ pkgsrc/textproc/icu/patches/patch-tools_pkgdata_pkgdata.cpp cvs rdiff -u -r1.2 -r0 \ pkgsrc/textproc/icu/patches/patch-tools-toolutil-pkg_genc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1492891905244020 Content-Disposition: inline Content-Length: 14278 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/icu/Makefile diff -u pkgsrc/textproc/icu/Makefile:1.107 pkgsrc/textproc/icu/Makefile:1.108 --- pkgsrc/textproc/icu/Makefile:1.107 Mon Dec 12 17:46:39 2016 +++ pkgsrc/textproc/icu/Makefile Sat Apr 22 20:11:45 2017 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.107 2016/12/12 17:46:39 adam Exp $ +# $NetBSD: Makefile,v 1.108 2017/04/22 20:11:45 adam Exp $ -DISTNAME= icu4c-58_2-src +DISTNAME= icu4c-59_1-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icu/} @@ -89,10 +89,6 @@ PLIST_SUBST+= MH_NAME=mh-qnx PLIST_SUBST+= MH_NAME=mh-unknown .endif -.if ${OPSYS} == "Cygwin" -INSTALL_UNSTRIPPED= yes -.endif - PKGCONFIG_OVERRIDE+= config/icu-i18n.pc PKGCONFIG_OVERRIDE+= config/icu-io.pc PKGCONFIG_OVERRIDE+= config/icu-le.pc @@ -111,6 +107,7 @@ CFLAGS+= -march=i486 .endif .if ${OPSYS} == "Cygwin" +INSTALL_UNSTRIPPED= yes SO_MAJOR= ${PKGVERSION_NOREV:R} . for l in data i18n io le lx test tu uc GENERATE_PLIST+= ${ECHO} bin/cygicu${l}${SO_MAJOR}.dll; Index: pkgsrc/textproc/icu/PLIST diff -u pkgsrc/textproc/icu/PLIST:1.39 pkgsrc/textproc/icu/PLIST:1.40 --- pkgsrc/textproc/icu/PLIST:1.39 Sun Dec 4 09:01:20 2016 +++ pkgsrc/textproc/icu/PLIST Sat Apr 22 20:11:45 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.39 2016/12/04 09:01:20 adam Exp $ +@comment $NetBSD: PLIST,v 1.40 2017/04/22 20:11:45 adam Exp $ bin/derb bin/genbrk bin/gencfu @@ -19,6 +19,8 @@ include/unicode/bytestrie.h include/unicode/bytestriebuilder.h include/unicode/calendar.h include/unicode/caniter.h +include/unicode/casemap.h +include/unicode/char16ptr.h include/unicode/chariter.h include/unicode/choicfmt.h include/unicode/coleitr.h @@ -38,6 +40,7 @@ include/unicode/dtitvfmt.h include/unicode/dtitvinf.h include/unicode/dtptngen.h include/unicode/dtrule.h +include/unicode/edits.h include/unicode/enumset.h include/unicode/errorcode.h include/unicode/fieldpos.h @@ -189,27 +192,27 @@ lib/icu/current lib/icu/pkgdata.inc lib/libicudata.a lib/libicudata.so -lib/libicudata.so.58 +lib/libicudata.so.59 lib/libicudata.so.${PKGVERSION} lib/libicui18n.a lib/libicui18n.so -lib/libicui18n.so.58 +lib/libicui18n.so.59 lib/libicui18n.so.${PKGVERSION} lib/libicuio.a lib/libicuio.so -lib/libicuio.so.58 +lib/libicuio.so.59 lib/libicuio.so.${PKGVERSION} lib/libicutest.a lib/libicutest.so -lib/libicutest.so.58 +lib/libicutest.so.59 lib/libicutest.so.${PKGVERSION} lib/libicutu.a lib/libicutu.so -lib/libicutu.so.58 +lib/libicutu.so.59 lib/libicutu.so.${PKGVERSION} lib/libicuuc.a lib/libicuuc.so -lib/libicuuc.so.58 +lib/libicuuc.so.59 lib/libicuuc.so.${PKGVERSION} lib/pkgconfig/icu-i18n.pc lib/pkgconfig/icu-io.pc @@ -228,6 +231,7 @@ man/man8/genccode.8 man/man8/gencmn.8 man/man8/gensprep.8 man/man8/icupkg.8 +sbin/escapesrc sbin/genccode sbin/gencmn sbin/gennorm2 Index: pkgsrc/textproc/icu/distinfo diff -u pkgsrc/textproc/icu/distinfo:1.63 pkgsrc/textproc/icu/distinfo:1.64 --- pkgsrc/textproc/icu/distinfo:1.63 Mon Dec 12 17:46:39 2016 +++ pkgsrc/textproc/icu/distinfo Sat Apr 22 20:11:45 2017 @@ -1,29 +1,24 @@ -$NetBSD: distinfo,v 1.63 2016/12/12 17:46:39 adam Exp $ +$NetBSD: distinfo,v 1.64 2017/04/22 20:11:45 adam Exp $ -SHA1 (icu4c-58_2-src.tgz) = b67913c90a484c59fda011797c6f3959d84bdc7c -RMD160 (icu4c-58_2-src.tgz) = df06e7b18a87e383d3762564f2e9a59fd75865f9 -SHA512 (icu4c-58_2-src.tgz) = 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a -Size (icu4c-58_2-src.tgz) = 23369902 bytes -SHA1 (patch-aa) = 67440d3af9b62b8c0be258c490255ba17f778ab4 -SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 -SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 +SHA1 (icu4c-59_1-src.tgz) = e86189f53c0a01cecf093a555e1ebbd14abf5b82 +RMD160 (icu4c-59_1-src.tgz) = fe4bad598bbe0833b05e4626a1c941ad5e58a809 +SHA512 (icu4c-59_1-src.tgz) = 9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4 +Size (icu4c-59_1-src.tgz) = 22706578 bytes +SHA1 (patch-Makefile.in) = 67440d3af9b62b8c0be258c490255ba17f778ab4 SHA1 (patch-acinclude.m4) = f7de1a16aad0ca77c4bbc457ba76b6171199ce09 -SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663 -SHA1 (patch-af) = 07421b669780e5eea5dc455cc39ca9737c0f728a -SHA1 (patch-common_putil.cpp) = 3058a542bcb2fdfa34b36acf389570990acd0da5 +SHA1 (patch-common_putil.cpp) = 6aa70b8698d663d3c798bafd9010a824c9609c20 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 -SHA1 (patch-common_ulist.c) = 8dd2c8152f99d762aab7e9d48293de3ccfb711cf SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e8 -SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33 +SHA1 (patch-common_uposixdefs.h) = 52a6fa2c531068de285d9babb1a98b84c564450e +SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 +SHA1 (patch-config_mh-darwin) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 SHA1 (patch-config_mh-solaris-gcc) = 19f76c27bef22cc3b572e4b67a526d5f1aa077bc SHA1 (patch-configure) = 429c0b3eb3f7d0a8cf3d01a9bc359132eebe8cf4 SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158 SHA1 (patch-i18n_digitlst.cpp) = 2db1a8e28e353ecf201f965d9719d451534865ad -SHA1 (patch-i18n_ucol__res.cpp) = 5e13b689941cf07bee997544aca19a6d6ce64511 -SHA1 (patch-test_intltest_apicoll.cpp) = e55d7cd13d2bb9f6b08f2c9c59ae475b875f110f -SHA1 (patch-test_intltest_apicoll.h) = e2a93be1da65e08abe3e6b28bd8aee33307a7c3e -SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e -SHA1 (patch-tools_pkgdata_pkgdata.cpp) = 1c87fcc511f0e6cedbaf01c5164e522c33f19458 +SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663 +SHA1 (patch-runConfigureICU) = ee780dbe797c7230208f378f73a0bc4d215b1bb2 +SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110 Index: pkgsrc/textproc/icu/patches/patch-common_putil.cpp diff -u pkgsrc/textproc/icu/patches/patch-common_putil.cpp:1.2 pkgsrc/textproc/icu/patches/patch-common_putil.cpp:1.3 --- pkgsrc/textproc/icu/patches/patch-common_putil.cpp:1.2 Fri Oct 9 23:15:34 2015 +++ pkgsrc/textproc/icu/patches/patch-common_putil.cpp Sat Apr 22 20:11:45 2017 @@ -1,8 +1,8 @@ -$NetBSD: patch-common_putil.cpp,v 1.2 2015/10/09 23:15:34 ryoon Exp $ +$NetBSD: patch-common_putil.cpp,v 1.3 2017/04/22 20:11:45 adam Exp $ ---- common/putil.cpp.orig 2015-10-08 03:53:44.000000000 +0000 +--- common/putil.cpp.orig 2017-04-10 14:22:16.000000000 +0000 +++ common/putil.cpp -@@ -117,6 +117,14 @@ +@@ -136,6 +140,14 @@ using namespace Microsoft::WRL::Wrappers #endif /* Index: pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h diff -u pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h:1.2 pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h:1.3 --- pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h:1.2 Fri Jul 18 10:28:11 2014 +++ pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h Sat Apr 22 20:11:45 2017 @@ -1,8 +1,8 @@ -$NetBSD: patch-common_uposixdefs.h,v 1.2 2014/07/18 10:28:11 ryoon Exp $ +$NetBSD: patch-common_uposixdefs.h,v 1.3 2017/04/22 20:11:45 adam Exp $ ---- common/uposixdefs.h.orig 2013-10-04 20:49:24.000000000 +0000 +--- common/uposixdefs.h.orig 2017-03-09 02:12:45.000000000 +0000 +++ common/uposixdefs.h -@@ -42,8 +42,10 @@ +@@ -44,8 +44,10 @@ * and define _XOPEN_SOURCE to different values depending on __STDC_VERSION__. * In C++ source code (e.g., putil.cpp), __STDC_VERSION__ is not defined at all. */ @@ -13,15 +13,23 @@ $NetBSD: patch-common_uposixdefs.h,v 1.2 /* * Make sure things like readlink and such functions work. -@@ -52,9 +54,11 @@ +@@ -54,9 +56,11 @@ * * z/OS needs this definition for timeval and to get usleep. */ +#if !defined(__sun) && !defined(_SCO_DS) - #if !defined(_XOPEN_SOURCE_EXTENDED) + #if !defined(_XOPEN_SOURCE_EXTENDED) && defined(__TOS_MVS__) # define _XOPEN_SOURCE_EXTENDED 1 #endif +#endif - /* - * There is an issue with turning on _XOPEN_SOURCE_EXTENDED on certain platforms. + /** + * Solaris says: +@@ -68,4 +72,7 @@ + # define _STDC_C99 + #endif + ++#if defined(__cplusplus) && defined(__NetBSD__) ++#define _ISOC99_SOURCE ++#endif + #endif /* __UPOSIXDEFS_H__ */ Added files: Index: pkgsrc/textproc/icu/patches/patch-Makefile.in diff -u /dev/null pkgsrc/textproc/icu/patches/patch-Makefile.in:1.1 --- /dev/null Sat Apr 22 20:11:45 2017 +++ pkgsrc/textproc/icu/patches/patch-Makefile.in Sat Apr 22 20:11:45 2017 @@ -0,0 +1,34 @@ +$NetBSD: patch-Makefile.in,v 1.1 2017/04/22 20:11:45 adam Exp $ + +Add linker flags for finding the libraries to pkg-config files. +Avoid using programs which need elevated privileges during the build. + +--- Makefile.in.orig 2016-09-09 21:28:18.000000000 +0000 ++++ Makefile.in +@@ -272,7 +272,7 @@ config/icu-i18n.pc: config/icu.pc Makefi + @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Internationalization library" >> $@ + @echo "Name: $(PACKAGE)-i18n" >> $@ + @echo "Requires: icu-uc" >> $@ +- @echo "Libs:" "${ICULIBS_I18N}" >> $@ ++ @echo "Libs:" '-L$${libdir}' "${ICULIBS_I18N}" >> $@ + @echo $@ updated. + + config/icu-io.pc: config/icu.pc Makefile icudefs.mk +@@ -280,7 +280,7 @@ config/icu-io.pc: config/icu.pc Makefile + @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Stream and I/O Library" >> $@ + @echo "Name: $(PACKAGE)-io" >> $@ + @echo "Requires: icu-i18n" >> $@ +- @echo "Libs:" "${ICULIBS_IO}" >> $@ ++ @echo "Libs:" '-L$${libdir}' "${ICULIBS_IO}" >> $@ + @echo $@ updated. + + ICULEHB_LIBS=@ICULEHB_LIBS@ +@@ -299,7 +299,7 @@ ifneq ($(ICULEHB_LIBS),) + else + @echo "Requires: icu-le" >> $@ + endif +- @echo "Libs:" "${ICULIBS_LX}" >> $@ ++ @echo "Libs:" '-L$${libdir}' "${ICULIBS_LX}" >> $@ + @echo $@ updated. + + Index: pkgsrc/textproc/icu/patches/patch-config_Makefile.inc.in diff -u /dev/null pkgsrc/textproc/icu/patches/patch-config_Makefile.inc.in:1.1 --- /dev/null Sat Apr 22 20:11:45 2017 +++ pkgsrc/textproc/icu/patches/patch-config_Makefile.inc.in Sat Apr 22 20:11:45 2017 @@ -0,0 +1,13 @@ +$NetBSD: patch-config_Makefile.inc.in,v 1.1 2017/04/22 20:11:45 adam Exp $ + +--- config/Makefile.inc.in.orig 2010-12-07 11:22:10.000000000 +0000 ++++ config/Makefile.inc.in +@@ -44,7 +44,7 @@ PACKAGE = @PACKAGE@ + LIBICU = lib$(ICUPREFIX) + + # Static library prefix and file extension +-STATIC_PREFIX = s ++STATIC_PREFIX = + LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX) + A = a + Index: pkgsrc/textproc/icu/patches/patch-config_mh-darwin diff -u /dev/null pkgsrc/textproc/icu/patches/patch-config_mh-darwin:1.1 --- /dev/null Sat Apr 22 20:11:45 2017 +++ pkgsrc/textproc/icu/patches/patch-config_mh-darwin Sat Apr 22 20:11:45 2017 @@ -0,0 +1,16 @@ +$NetBSD: patch-config_mh-darwin,v 1.1 2017/04/22 20:11:45 adam Exp $ + +--- config/mh-darwin.orig 2011-07-19 21:16:46.000000000 +0000 ++++ config/mh-darwin +@@ -28,11 +28,7 @@ SHLIB.c= $(CC) -dynamiclib -dynamic $(CF + SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) + + ## Compiler switches to embed a library name and version information +-ifeq ($(ENABLE_RPATH),YES) + LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) +-else +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) +-endif + + ## Compiler switch to embed a runtime search path + LD_RPATH= Index: pkgsrc/textproc/icu/patches/patch-icudefs.mk.in diff -u /dev/null pkgsrc/textproc/icu/patches/patch-icudefs.mk.in:1.1 --- /dev/null Sat Apr 22 20:11:45 2017 +++ pkgsrc/textproc/icu/patches/patch-icudefs.mk.in Sat Apr 22 20:11:45 2017 @@ -0,0 +1,20 @@ +$NetBSD: patch-icudefs.mk.in,v 1.1 2017/04/22 20:11:45 adam Exp $ + +--- icudefs.mk.in.orig 2013-10-04 20:54:58.000000000 +0000 ++++ icudefs.mk.in +@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX) + + ## If we can't use the shared libraries, use the static libraries + ifneq ($(ENABLE_SHARED),YES) +-STATIC_PREFIX_WHEN_USED = s ++STATIC_PREFIX_WHEN_USED = + else + STATIC_PREFIX_WHEN_USED = + endif + + # Static library prefix and file extension +-STATIC_PREFIX = s ++STATIC_PREFIX = + LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) + A = a + SOBJ = $(SO) Index: pkgsrc/textproc/icu/patches/patch-runConfigureICU diff -u /dev/null pkgsrc/textproc/icu/patches/patch-runConfigureICU:1.1 --- /dev/null Sat Apr 22 20:11:45 2017 +++ pkgsrc/textproc/icu/patches/patch-runConfigureICU Sat Apr 22 20:11:45 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-runConfigureICU,v 1.1 2017/04/22 20:11:45 adam Exp $ + +Add support for DragonFlyBSD and Bitrig. + +--- runConfigureICU.orig Fri Mar 27 21:17:48 2015 ++++ runConfigureICU +@@ -327,7 +327,7 @@ case $platform in + DEBUG_CXXFLAGS='-Zi -MDd' + DEBUG_LDFLAGS='-DEBUG' + ;; +- *BSD) ++ *BSD | DragonFly | Bitrig) + THE_OS="BSD" + THE_COMP="the GNU C++" + DEBUG_CFLAGS='-g -O0' Index: pkgsrc/textproc/icu/patches/patch-tools-toolutil-pkg_genc.cpp diff -u /dev/null pkgsrc/textproc/icu/patches/patch-tools-toolutil-pkg_genc.cpp:1.1 --- /dev/null Sat Apr 22 20:11:45 2017 +++ pkgsrc/textproc/icu/patches/patch-tools-toolutil-pkg_genc.cpp Sat Apr 22 20:11:45 2017 @@ -0,0 +1,16 @@ +$NetBSD: patch-tools-toolutil-pkg_genc.cpp,v 1.1 2017/04/22 20:11:45 adam Exp $ + +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. + +--- tools/toolutil/pkg_genc.cpp.orig 2015-03-27 21:10:56.000000000 +0000 ++++ tools/toolutil/pkg_genc.cpp +@@ -139,7 +139,7 @@ static const struct AssemblyType { + "#endif\n" + "\t.data\n" + "\t.const\n" +- "\t.balign 16\n" ++ "\t.align 4\n" + "_%s:\n\n", + + ".long ","",HEX_0X --_----------=_1492891905244020--