Fix OpenBSD 5.5 build

* OpenBSD 5.5 has /usr/include/sys/atomic.h, but it is different from NetBSD's
  one

3 files changed, 23 insertions, 11 deletions

diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo
index 6ab99f30ad0..bb06b19eed8 100644
--- a/textproc/icu/distinfo
+++ b/textproc/icu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2014/04/07 11:49:57 adam Exp $
+$NetBSD: distinfo,v 1.46 2014/05/05 21:25:11 ryoon Exp $
 
 SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f
 RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9
@@ -17,8 +17,8 @@ SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91
 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
 SHA1 (patch-config_mh-cygwin) = e3aa7a926244b448ce12ab2f89156348a02c0659
 SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025
-SHA1 (patch-configure) = bea560028b869defa7b5eab8c148aaf6f0e8f3ee
-SHA1 (patch-configure.ac) = d90bf98e97cb2051dd64b847b97092440c1c03f8
+SHA1 (patch-configure) = 6888d11d4e0eb809c50780fec7fbff53861d1901
+SHA1 (patch-configure.ac) = 8a273518838ecb38378ca4577f8b93985e4e86b6
 SHA1 (patch-data_Makefile.in) = a5dcfe848a0444f0a1c036b7f4e343468bf3b3d1
 SHA1 (patch-i18n_Makefile.in) = 935965c0418994271d844a4c908cd9e1fe8279fd
 SHA1 (patch-io_Makefile.in) = f5f5eabb31ea7120130d13c397fab1feddd30447
diff --git a/textproc/icu/patches/patch-configure b/textproc/icu/patches/patch-configure
index f2bd91b814e..5229a202e4c 100644
--- a/textproc/icu/patches/patch-configure
+++ b/textproc/icu/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2014/03/04 12:07:16 obache Exp $
+$NetBSD: patch-configure,v 1.4 2014/05/05 21:25:11 ryoon Exp $
 
 Portability fix.
 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-10-04 20:54:58.000000000 +0000
+--- configure.orig	2013-12-09 17:32:25.000000000 +0000
 +++ configure
 @@ -4083,9 +4083,6 @@ $as_echo "$ac_use_strict_options" >&6; }
          if test "$GCC" = yes
@@ -25,7 +25,7 @@ and at the same time fix a typo involving CXXFLAGS.
                          # 2. try xarch=v9 [deprecated]
                          ## TODO: cross compile: the following won't work.
                          SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
-@@ -5452,6 +5449,23 @@ if test "x$ac_cv_header_elf_h" = "xyes";
+@@ -5452,6 +5449,29 @@ if test "x$ac_cv_header_elf_h" = "xyes";
      CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
  fi
  
@@ -42,14 +42,20 @@ and at the same time fix a typo involving CXXFLAGS.
 +
 +done
 +
++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 +7456,13 @@ fi
+@@ -7442,13 +7462,13 @@ fi
  # Now that we're done using CPPFLAGS etc. for tests, we can change it
  # for build.
  
diff --git a/textproc/icu/patches/patch-configure.ac b/textproc/icu/patches/patch-configure.ac
index 428f186f47f..904183763d7 100644
--- a/textproc/icu/patches/patch-configure.ac
+++ b/textproc/icu/patches/patch-configure.ac
@@ -1,24 +1,30 @@
-$NetBSD: patch-configure.ac,v 1.1 2014/03/04 12:07:16 obache Exp $
+$NetBSD: patch-configure.ac,v 1.2 2014/05/05 21:25:11 ryoon Exp $
 
 * Detect NetBSD libatomic
 * test(1) portability fix
 
---- configure.ac.orig	2013-10-04 20:54:58.000000000 +0000
+--- configure.ac.orig	2013-12-09 17:32:25.000000000 +0000
 +++ configure.ac
-@@ -407,6 +407,12 @@ if test "x$ac_cv_header_elf_h" = "xyes";
+@@ -407,6 +407,18 @@ 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.
 +AC_CHECK_HEADERS([sys/atomic.h])
++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
  AC_MSG_CHECKING([whether to enable dynamic loading of plugins])
-@@ -1249,13 +1255,13 @@ fi
+@@ -1249,13 +1261,13 @@ fi
  # Now that we're done using CPPFLAGS etc. for tests, we can change it
  # for build.