 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.31 2014/04/07 11:49:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2014/10/07 16:09:53 adam Exp $
 bin/derb
 bin/genbrk
 bin/gencfu
 bin/gencnval
 bin/gendict
 bin/genrb
 bin/icu-config
 bin/icuinfo
 bin/makeconv
 bin/pkgdata
 bin/uconv
 include/layout/LEFontInstance.h
 include/layout/LEGlyphFilter.h
 @@ -84,26 +84,27 @@ include/unicode/platform.h
 include/unicode/plurfmt.h
 include/unicode/plurrule.h
 include/unicode/ptypes.h
 include/unicode/putil.h
 include/unicode/rbbi.h
 include/unicode/rbnf.h
 include/unicode/rbtz.h
 include/unicode/regex.h
 include/unicode/region.h
 include/unicode/reldatefmt.h
 include/unicode/rep.h
 include/unicode/resbund.h
 include/unicode/schriter.h
 include/unicode/scientificformathelper.h
 include/unicode/search.h
 include/unicode/selfmt.h
 include/unicode/simpletz.h
 include/unicode/smpdtfmt.h
 include/unicode/sortkey.h
 include/unicode/std_string.h
 include/unicode/strenum.h
 include/unicode/stringpiece.h
 include/unicode/stringtriebuilder.h
 include/unicode/stsearch.h
 include/unicode/symtable.h
 include/unicode/tblcoll.h
 include/unicode/timezone.h
 @@ -188,55 +189,55 @@ include/unicode/utmscale.h
 include/unicode/utrace.h
 include/unicode/utrans.h
 include/unicode/utypes.h
 include/unicode/uvernum.h
 include/unicode/uversion.h
 include/unicode/vtzone.h
 lib/icu/${PKGVERSION}/Makefile.inc
 lib/icu/${PKGVERSION}/pkgdata.inc
 lib/icu/Makefile.inc
 lib/icu/current
 lib/icu/pkgdata.inc
 lib/libicudata.a
 lib/libicudata.so
-lib/libicudata.so.53
+lib/libicudata.so.54
 lib/libicudata.so.${PKGVERSION}
 lib/libicui18n.a
 lib/libicui18n.so
-lib/libicui18n.so.53
+lib/libicui18n.so.54
 lib/libicui18n.so.${PKGVERSION}
 lib/libicuio.a
 lib/libicuio.so
-lib/libicuio.so.53
+lib/libicuio.so.54
 lib/libicuio.so.${PKGVERSION}
 lib/libicule.a
 lib/libicule.so
-lib/libicule.so.53
+lib/libicule.so.54
 lib/libicule.so.${PKGVERSION}
 lib/libiculx.a
 lib/libiculx.so
-lib/libiculx.so.53
+lib/libiculx.so.54
 lib/libiculx.so.${PKGVERSION}
 lib/libicutest.a
 lib/libicutest.so
-lib/libicutest.so.53
+lib/libicutest.so.54
 lib/libicutest.so.${PKGVERSION}
 lib/libicutu.a
 lib/libicutu.so
-lib/libicutu.so.53
+lib/libicutu.so.54
 lib/libicutu.so.${PKGVERSION}
 lib/libicuuc.a
 lib/libicuuc.so
-lib/libicuuc.so.53
+lib/libicuuc.so.54
 lib/libicuuc.so.${PKGVERSION}
 lib/pkgconfig/icu-i18n.pc
 lib/pkgconfig/icu-io.pc
 lib/pkgconfig/icu-le.pc
 lib/pkgconfig/icu-lx.pc
 lib/pkgconfig/icu-uc.pc
 man/man1/derb.1
 man/man1/genbrk.1
 man/man1/gencfu.1
 man/man1/gencnval.1
 man/man1/gendict.1
 man/man1/genrb.1
 man/man1/icu-config.1

 @@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.49 2014/07/18 10:28:11 ryoon Exp $
+$NetBSD: distinfo,v 1.50 2014/10/07 16:09:53 adam Exp $
-SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f
+SHA1 (icu4c-54_1-src.tgz) = 8c752490bbf31cea26e20246430cee67d48abe34
-RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9
+RMD160 (icu4c-54_1-src.tgz) = b1440e1a3330b12336742c881863a8de6a6d2235
-Size (icu4c-53_1-src.tgz) = 23218952 bytes
+Size (icu4c-54_1-src.tgz) = 25485678 bytes
-SHA1 (patch-aa) = dc4adcbd6e3115b0f58c7452f408fcab2dd77f45
+SHA1 (patch-aa) = fd5c513e75ca17a46be4ed010455bda63731afff
 SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
-SHA1 (patch-acinclude.m4) = a6993fefca751d7e63e60130cdcd69f3adbc0589
+SHA1 (patch-acinclude.m4) = ab757e9bf7351e44edd92b96edbffc40acb44dae
 SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663
-SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067
+SHA1 (patch-af) = 6f41d58f258361e28ce3283e1b46f8a762b7c5dd
 SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
 SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
 SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c
 SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33
 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
-SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025
+SHA1 (patch-configure) = 2d17823ee06693ce382745ce345eca37001a0a7c
 SHA1 (patch-configure) = aae0978c1eb1b2bafa229ba0f2e9d581554f80b2
 SHA1 (patch-configure.ac) = ea7586eb8131ff53a483b5bd7ca162886e9045f1

 @@ -1,52 +1,52 @@
-$NetBSD: patch-aa,v 1.16 2014/06/08 09:08:20 obache Exp $
+$NetBSD: patch-aa,v 1.17 2014/10/07 16:09:53 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	2012-11-05 17:18:12.000000000 +0000
+--- Makefile.in.orig	2014-10-03 16:18:36.000000000 +0000
 +++ Makefile.in
-@@ -256,7 +256,7 @@ config/icu-i18n.pc: config/icu.pc Makefi
+@@ -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
-@@ -264,7 +264,7 @@ config/icu-io.pc: config/icu.pc Makefile
+@@ -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.
  config/icu-le.pc: config/icu.pc Makefile icudefs.mk
-@@ -272,7 +272,7 @@ config/icu-le.pc: config/icu.pc Makefile
+@@ -288,7 +288,7 @@ config/icu-le.pc: config/icu.pc Makefile
  	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Layout library" >> $@
  	@echo "Name: $(PACKAGE)-le" >> $@
  	@echo "Requires: icu-uc" >> $@
 -	@echo "Libs:" "${ICULIBS_LE}" >> $@
 +	@echo "Libs:" '-L$${libdir}' "${ICULIBS_LE}" >> $@
  	@echo $@ updated.
- config/icu-lx.pc: config/icu.pc Makefile icudefs.mk
+ ICULEHB_LIBS=@ICULEHB_LIBS@
-@@ -280,7 +280,7 @@ config/icu-lx.pc: config/icu.pc Makefile
+@@ -307,7 +307,7 @@ ifneq ($(ICULEHB_LIBS),)
- 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Paragraph Layout library" >> $@
+ else
  	@echo "Name: $(PACKAGE)-lx" >> $@
  	@echo "Requires: icu-le" >> $@
  endif
 -	@echo "Libs:" "${ICULIBS_LX}" >> $@
 +	@echo "Libs:" '-L$${libdir}' "${ICULIBS_LX}" >> $@
  	@echo $@ updated.
-@@ -302,7 +302,7 @@ $(top_builddir)/config/pkgdataMakefile:
+@@ -329,7 +329,7 @@ $(top_builddir)/config/pkgdataMakefile:
  $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
  	-$(RMV) $@
 -	$(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
 +	cp -f $(top_srcdir)/config/icu-config-top $@
  	chmod u+w $@
  	@echo "# Following from @platform_make_fragment@" >> $@
  	LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@

 @@ -1,34 +1,14 @@
-$NetBSD: patch-acinclude.m4,v 1.2 2014/07/18 10:28:11 ryoon Exp $
+$NetBSD: patch-acinclude.m4,v 1.3 2014/10/07 16:09:53 adam Exp $
-Solaris seems to need -std=c99 with recent pkgsrc so keep it
+Solaris seems to need -std=c99 with recent pkgsrc so keep it.
 and at the same time fix a typo involving CXXFLAGS.
---- acinclude.m4.orig	2013-09-13 21:36:38.000000000 +0000
+--- acinclude.m4.orig	2014-10-03 16:18:36.000000000 +0000
 +++ acinclude.m4
-@@ -69,6 +69,7 @@ powerpc*-*-linux*)
+@@ -82,6 +82,7 @@ x86_64-*-cygwin)
  *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
  *-*-nto*)	icu_cv_host_frag=mh-qnx ;;
  *-ncr-*)	icu_cv_host_frag=mh-mpras ;;
 +*-*-sco3.2v5*)	icu_cv_host_frag=mh-scoosr5 ;;
  *) 		icu_cv_host_frag=mh-unknown ;;
  esac
+ 		]
@@ -262,7 +263,7 @@ AC_DEFUN([AC_CHECK_64BIT_LIBS],
                      if test "$CAN_BUILD_64" != yes; then
                          # Nope. back out changes.
                          CFLAGS="${CFLAGS_OLD}"
 -                        CXXFLAGS="${CFLAGS_OLD}"
 +                        CXXFLAGS="${CXXFLAGS_OLD}"
                          # 2. try xarch=v9 [deprecated]
                          ## TODO: cross compile: the following won't work.
                          SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
@@ -457,9 +458,6 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
          if test "$GCC" = yes
          then
              case "${host}" in
 -            *-*-solaris*)
 -                # Don't use -std=c99 option on Solaris/GCC
 -                ;;
              *)
                  # Do not use -ansi. It limits us to C90, and it breaks some platforms.
                  # We use -std=c99 to disable the gnu99 defaults and its associated warnings

 @@ -1,49 +1,29 @@
-$NetBSD: patch-configure,v 1.5 2014/07/18 10:28:11 ryoon Exp $
+$NetBSD: patch-configure,v 1.6 2014/10/07 16:09:53 adam Exp $
 Portability fix.
-Solaris seems to need -std=c99 with recent pkgsrc so keep it
+Solaris seems to need -std=c99 with recent pkgsrc so keep it.
 and at the same time fix a typo involving CXXFLAGS.
---- configure.orig	2013-12-09 17:32:25.000000000 +0000
+--- configure.orig	2014-10-03 16:18:36.000000000 +0000
 +++ configure
-@@ -4083,9 +4083,6 @@ $as_echo "$ac_use_strict_options" >&6; }
+@@ -5172,6 +5172,7 @@ rm -f core conftest.err conftest.$ac_obj
          if test "$GCC" = yes
          then
              case "${host}" in
 -            *-*-solaris*)
 -                # Don't use -std=c99 option on Solaris/GCC
 -                ;;
              *)
                  # Do not use -ansi. It limits us to C90, and it breaks some platforms.
                  # We use -std=c99 to disable the gnu99 defaults and its associated warnings
@@ -4578,7 +4575,7 @@ fi
                      if test "$CAN_BUILD_64" != yes; then
                          # Nope. back out changes.
                          CFLAGS="${CFLAGS_OLD}"
 -                        CXXFLAGS="${CFLAGS_OLD}"
 +                        CXXFLAGS="${CXXFLAGS_OLD}"
                          # 2. try xarch=v9 [deprecated]
                          ## TODO: cross compile: the following won't work.
                          SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
@@ -4942,6 +4939,7 @@ rm -f core conftest.err conftest.$ac_obj
  *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
  *-*-nto*)	icu_cv_host_frag=mh-qnx ;;
  *-ncr-*)	icu_cv_host_frag=mh-mpras ;;
 +-*-sco3.2v5*)	icu_cv_host_frag=mh-scoosr5 ;;
  *) 		icu_cv_host_frag=mh-unknown ;;
  esac
-@@ -5452,6 +5450,29 @@ if test "x$ac_cv_header_elf_h" = "xyes";
+@@ -5682,6 +5683,29 @@ if test "x$ac_cv_header_elf_h" = "xyes";
      CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
  fi
 +# check if sys/atomic.h is present.
 +for ac_header in sys/atomic.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default"
 +if test "x$ac_cv_header_sys_atomic_h" = xyes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SYS_ATOMIC_H 1
 +_ACEOF
++
 +fi
 @@ -53,27 +33,27 @@ and at the same time fix a typo involvin
 +case "${host}" in
 +*-netbsd*)
 +if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
 +    CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
 +fi
 +;;
 +*)
 +;;
 +esac
++
  U_ENABLE_DYLOAD=1
  enable=yes
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5
-@@ -7442,13 +7463,13 @@ fi
+@@ -7691,13 +7715,13 @@ fi
  # Now that we're done using CPPFLAGS etc. for tests, we can change it
  # for build.
 -if test "${CC}" == "clang"; then
 +if test "${CC}" = "clang"; then
     CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
  else
     CLANGCFLAGS=""
  fi
 -if test "${CXX}" == "clang++"; then
 +if test "${CXX}" = "clang++"; then
     CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.93 2014/07/18 10:28:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2014/10/07 16:09:53 adam Exp $
-DISTNAME=	icu4c-53_1-src
+DISTNAME=	icu4c-54_1-src
 PKGNAME=	${DISTNAME:S/4c//:S/-src//:S/_/./g}
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.icu-project.org/
 COMMENT=	Robust and full-featured Unicode services
 LICENSE=	mit
 WRKSRC=			${WRKDIR}/icu/source
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake

 @@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.13 2013/10/19 08:47:36 adam Exp $
+$NetBSD: patch-af,v 1.14 2014/10/07 16:09:53 adam Exp $
---- runConfigureICU.orig	2013-10-04 20:54:58.000000000 +0000
+--- runConfigureICU.orig	2014-10-03 16:18:36.000000000 +0000
 +++ runConfigureICU
-@@ -315,7 +315,7 @@ case $platform in
+@@ -327,7 +327,7 @@ case $platform in
-         CXXFLAGS="--std=c++03"
+         DEBUG_CXXFLAGS='-Zi -MDd'
-         export CXXFLAGS
+         DEBUG_LDFLAGS='-DEBUG'
          ;;
 -    *BSD)
 +    *BSD | DragonFly)
          THE_OS="BSD"
          THE_COMP="the GNU C++"
-         CC=gcc; export CC
+         DEBUG_CFLAGS='-g -O0'