Fri Jul 18 10:28:11 2014 UTC ()
Fix SCO OpenSrver 5.0.7/3.2 build.
Add configuration for SCOOSR5.


(ryoon)
diff -r1.92 -r1.93 pkgsrc/textproc/icu/Makefile
diff -r1.48 -r1.49 pkgsrc/textproc/icu/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-acinclude.m4
diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h
diff -r0 -r1.1 pkgsrc/textproc/icu/patches/patch-config_mh-scoosr5
diff -r1.4 -r1.5 pkgsrc/textproc/icu/patches/patch-configure
diff -r1.2 -r1.3 pkgsrc/textproc/icu/patches/patch-configure.ac

cvs diff -r1.92 -r1.93 pkgsrc/textproc/icu/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/icu/Makefile 2014/06/08 09:09:01 1.92
+++ pkgsrc/textproc/icu/Makefile 2014/07/18 10:28:11 1.93
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.92 2014/06/08 09:09:01 obache Exp $ 1# $NetBSD: Makefile,v 1.93 2014/07/18 10:28:11 ryoon Exp $
2 2
3DISTNAME= icu4c-53_1-src 3DISTNAME= icu4c-53_1-src
4PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} 4PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g}
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.icu-project.org/ 10HOMEPAGE= http://www.icu-project.org/
11COMMENT= Robust and full-featured Unicode services 11COMMENT= Robust and full-featured Unicode services
12LICENSE= mit 12LICENSE= mit
13 13
14WRKSRC= ${WRKDIR}/icu/source 14WRKSRC= ${WRKDIR}/icu/source
@@ -65,26 +65,30 @@ PLIST_SUBST+= MH_NAME=mh-aix-va @@ -65,26 +65,30 @@ PLIST_SUBST+= MH_NAME=mh-aix-va
65. endif 65. endif
66.elif ${OPSYS} == "HPUX" 66.elif ${OPSYS} == "HPUX"
67. if !empty(CC_VERSION:Mgcc*) 67. if !empty(CC_VERSION:Mgcc*)
68PLIST_SUBST+= MH_NAME=mh-hpux-gcc 68PLIST_SUBST+= MH_NAME=mh-hpux-gcc
69. else 69. else
70PLIST_SUBST+= MH_NAME=mh-hpux-acc 70PLIST_SUBST+= MH_NAME=mh-hpux-acc
71. endif 71. endif
72.elif ${OPSYS} == "Darwin" 72.elif ${OPSYS} == "Darwin"
73PLIST_SUBST+= MH_NAME=mh-darwin 73PLIST_SUBST+= MH_NAME=mh-darwin
74.elif ${OPSYS} == "Haiku" 74.elif ${OPSYS} == "Haiku"
75PLIST_SUBST+= MH_NAME=mh-haiku 75PLIST_SUBST+= MH_NAME=mh-haiku
76.elif ${OPSYS} == "IRIX" 76.elif ${OPSYS} == "IRIX"
77PLIST_SUBST+= MH_NAME=mh-irix 77PLIST_SUBST+= MH_NAME=mh-irix
 78.elif ${OPSYS} == "Cygwin"
 79PLIST_SUBST+= MH_NAME=mh-cygwin
 80.elif ${OS_VARIANT} == "SCOOSR5"
 81PLIST_SUBST+= MH_NAME=mh-scoosr5
78.elif ${OPSYS} == "OSF1" 82.elif ${OPSYS} == "OSF1"
79PLIST_SUBST+= MH_NAME=mh-alpha-osf 83PLIST_SUBST+= MH_NAME=mh-alpha-osf
80.elif ${OPSYS} == "QNX" 84.elif ${OPSYS} == "QNX"
81PLIST_SUBST+= MH_NAME=mh-qnx 85PLIST_SUBST+= MH_NAME=mh-qnx
82.else 86.else
83# For unknown systems, set the filename to mh-unknown so that the user 87# For unknown systems, set the filename to mh-unknown so that the user
84# gets a warning about missing files. 88# gets a warning about missing files.
85PLIST_SUBST+= MH_NAME=mh-unknown 89PLIST_SUBST+= MH_NAME=mh-unknown
86.endif 90.endif
87 91
88.if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin" 92.if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin"
89INSTALL_UNSTRIPPED= yes 93INSTALL_UNSTRIPPED= yes
90.endif 94.endif

cvs diff -r1.48 -r1.49 pkgsrc/textproc/icu/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/icu/distinfo 2014/06/08 09:08:19 1.48
+++ pkgsrc/textproc/icu/distinfo 2014/07/18 10:28:11 1.49
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1$NetBSD: distinfo,v 1.48 2014/06/08 09:08:19 obache Exp $ 1$NetBSD: distinfo,v 1.49 2014/07/18 10:28:11 ryoon Exp $
2 2
3SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f 3SHA1 (icu4c-53_1-src.tgz) = 7eca017fdd101e676d425caaf28ef862d3655e0f
4RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9 4RMD160 (icu4c-53_1-src.tgz) = 9bd1b4bdc2010545c76a927dcf46049686beeab9
5Size (icu4c-53_1-src.tgz) = 23218952 bytes 5Size (icu4c-53_1-src.tgz) = 23218952 bytes
6SHA1 (patch-aa) = dc4adcbd6e3115b0f58c7452f408fcab2dd77f45 6SHA1 (patch-aa) = dc4adcbd6e3115b0f58c7452f408fcab2dd77f45
7SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 7SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
9SHA1 (patch-acinclude.m4) = 40ddfb09cbc951928296c35e8a4303cf7fbe7e17 9SHA1 (patch-acinclude.m4) = a6993fefca751d7e63e60130cdcd69f3adbc0589
10SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663 10SHA1 (patch-ad) = c2a9469bf896b5f0702d5795c3b1c2b394893663
11SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067 11SHA1 (patch-af) = dcfbaf16844292a9ae57536ae2fb62fd1659d067
12SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262 12SHA1 (patch-common_putilimp.h) = a68faa97c2bffeecaca1586e26f5bbe48e71b262
13SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c 13SHA1 (patch-common_umutex.h) = 096d3e15ef7b84533456af4570ed70747a4ef70c
14SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c 14SHA1 (patch-common_unicode_platform.h) = 82786dff790782eb07cdc527061de33e771ec63c
15SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 15SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33
16SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 16SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501
 17SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
17SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025 18SHA1 (patch-config_mh-solaris-gcc) = f81fec8f0d232b9125c7ea7ec334b78872aa2025
18SHA1 (patch-configure) = 6888d11d4e0eb809c50780fec7fbff53861d1901 19SHA1 (patch-configure) = aae0978c1eb1b2bafa229ba0f2e9d581554f80b2
19SHA1 (patch-configure.ac) = 8a273518838ecb38378ca4577f8b93985e4e86b6 20SHA1 (patch-configure.ac) = ea7586eb8131ff53a483b5bd7ca162886e9045f1

cvs diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-acinclude.m4 (expand / switch to unified diff)

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

cvs diff -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h 2012/05/08 16:10:39 1.1
+++ pkgsrc/textproc/icu/patches/patch-common_uposixdefs.h 2014/07/18 10:28:11 1.2
@@ -1,16 +1,27 @@ @@ -1,16 +1,27 @@
1$NetBSD: patch-common_uposixdefs.h,v 1.1 2012/05/08 16:10:39 hans Exp $ 1$NetBSD: patch-common_uposixdefs.h,v 1.2 2014/07/18 10:28:11 ryoon Exp $
2 2
3--- common/uposixdefs.h.orig 2012-04-05 22:46:18.000000000 +0200 3--- common/uposixdefs.h.orig 2013-10-04 20:49:24.000000000 +0000
4+++ common/uposixdefs.h 2012-05-08 15:28:20.516380420 +0200 4+++ common/uposixdefs.h
5@@ -52,9 +52,11 @@ 5@@ -42,8 +42,10 @@
 6 * and define _XOPEN_SOURCE to different values depending on __STDC_VERSION__.
 7 * In C++ source code (e.g., putil.cpp), __STDC_VERSION__ is not defined at all.
 8 */
 9+#if !defined(_SCO_DS)
 10 # define _XOPEN_SOURCE 600
 11 #endif
 12+#endif
 13
 14 /*
 15 * Make sure things like readlink and such functions work.
 16@@ -52,9 +54,11 @@
6 * 17 *
7 * z/OS needs this definition for timeval and to get usleep. 18 * z/OS needs this definition for timeval and to get usleep.
8 */ 19 */
9+#ifndef __sun 20+#if !defined(__sun) && !defined(_SCO_DS)
10 #if !defined(_XOPEN_SOURCE_EXTENDED) 21 #if !defined(_XOPEN_SOURCE_EXTENDED)
11 # define _XOPEN_SOURCE_EXTENDED 1 22 # define _XOPEN_SOURCE_EXTENDED 1
12 #endif 23 #endif
13+#endif 24+#endif
14  25
15 /* 26 /*
16 * There is an issue with turning on _XOPEN_SOURCE_EXTENDED on certain platforms. 27 * There is an issue with turning on _XOPEN_SOURCE_EXTENDED on certain platforms.

File Added: pkgsrc/textproc/icu/patches/patch-config_mh-scoosr5
$NetBSD: patch-config_mh-scoosr5,v 1.1 2014/07/18 10:28:11 ryoon Exp $

--- config/mh-scoosr5.orig	2014-03-07 11:43:35.000000000 +0000
+++ config/mh-scoosr5
@@ -0,0 +1,72 @@
+## -*-makefile-*-
+## SCO OpenServer 5.0.7/3.2-specific setup using gcc
+## Copyright (c) 1999-2010, International Business Machines Corporation and
+## others. All Rights Reserved.
+
+## Flags for position independent code
+SHAREDLIBCFLAGS = -fPIC
+SHAREDLIBCXXFLAGS = -fPIC
+SHAREDLIBCPPFLAGS = -DPIC
+
+## Commands to generate dependency files
+GEN_DEPS.c= 	$(CC) -E -MM $(DEFS) $(CPPFLAGS) $(CFLAGS)
+GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS)
+
+## These are the library specific LDFLAGS
+LDFLAGSICUDT=-nodefaultlibs -nostdlib
+
+## Additional flags when building libraries and with threads
+THREADSCPPFLAGS = -D_REENTRANT
+
+## Compiler switch to embed a runtime search path
+LD_RPATH=       -R'$$'ORIGIN 
+LD_RPATH_PRE=   -R
+
+## Compiler switch to embed a library name
+LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
+
+## Shared library options
+LD_SOOPTIONS= -Wl,-Bsymbolic
+
+## Shared object suffix
+SO=		so
+## Non-shared intermediate object suffix
+STATIC_O = ao
+
+## Compilation rules
+%.$(STATIC_O): $(srcdir)/%.c
+	$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
+%.o: $(srcdir)/%.c
+	$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
+
+%.$(STATIC_O): $(srcdir)/%.cpp
+	$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
+%.o: $(srcdir)/%.cpp
+	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
+
+
+## Dependency rules
+%.d : $(srcdir)/%.c
+	@echo "generating dependency information for $<"
+	@$(SHELL) -ec '$(GEN_DEPS.c) $< \
+		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
+		[ -s $@ ] || rm -f $@'
+
+%.d : $(srcdir)/%.cpp
+	@echo "generating dependency information for $<"
+	@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
+		| sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
+		[ -s $@ ] || rm -f $@'
+
+## Versioned libraries rules
+
+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
+	$(RM) $@ && ln -s ${<F} $@
+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
+
+## Remove shared library 's'
+STATIC_PREFIX_WHEN_USED = 
+STATIC_PREFIX = 
+
+## End SCO OpenServer 5.0.7/3.2-specific setup

cvs diff -r1.4 -r1.5 pkgsrc/textproc/icu/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/patch-configure 2014/05/05 21:25:11 1.4
+++ pkgsrc/textproc/icu/patches/patch-configure 2014/07/18 10:28:11 1.5
@@ -1,41 +1,49 @@ @@ -1,41 +1,49 @@
1$NetBSD: patch-configure,v 1.4 2014/05/05 21:25:11 ryoon Exp $ 1$NetBSD: patch-configure,v 1.5 2014/07/18 10:28:11 ryoon Exp $
2 2
3Portability fix. 3Portability fix.
4Solaris seems to need -std=c99 with recent pkgsrc so keep it 4Solaris seems to need -std=c99 with recent pkgsrc so keep it
5and at the same time fix a typo involving CXXFLAGS. 5and at the same time fix a typo involving CXXFLAGS.
6 6
7--- configure.orig 2013-12-09 17:32:25.000000000 +0000 7--- configure.orig 2013-12-09 17:32:25.000000000 +0000
8+++ configure 8+++ configure
9@@ -4083,9 +4083,6 @@ $as_echo "$ac_use_strict_options" >&6; } 9@@ -4083,9 +4083,6 @@ $as_echo "$ac_use_strict_options" >&6; }
10 if test "$GCC" = yes 10 if test "$GCC" = yes
11 then 11 then
12 case "${host}" in 12 case "${host}" in
13- *-*-solaris*) 13- *-*-solaris*)
14- # Don't use -std=c99 option on Solaris/GCC 14- # Don't use -std=c99 option on Solaris/GCC
15- ;; 15- ;;
16 *) 16 *)
17 # Do not use -ansi. It limits us to C90, and it breaks some platforms. 17 # Do not use -ansi. It limits us to C90, and it breaks some platforms.
18 # We use -std=c99 to disable the gnu99 defaults and its associated warnings 18 # We use -std=c99 to disable the gnu99 defaults and its associated warnings
19@@ -4578,7 +4575,7 @@ fi 19@@ -4578,7 +4575,7 @@ fi
20 if test "$CAN_BUILD_64" != yes; then 20 if test "$CAN_BUILD_64" != yes; then
21 # Nope. back out changes. 21 # Nope. back out changes.
22 CFLAGS="${CFLAGS_OLD}" 22 CFLAGS="${CFLAGS_OLD}"
23- CXXFLAGS="${CFLAGS_OLD}" 23- CXXFLAGS="${CFLAGS_OLD}"
24+ CXXFLAGS="${CXXFLAGS_OLD}" 24+ CXXFLAGS="${CXXFLAGS_OLD}"
25 # 2. try xarch=v9 [deprecated] 25 # 2. try xarch=v9 [deprecated]
26 ## TODO: cross compile: the following won't work. 26 ## TODO: cross compile: the following won't work.
27 SPARCV9=`isainfo -n 2>&1 | grep sparcv9` 27 SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
28@@ -5452,6 +5449,29 @@ if test "x$ac_cv_header_elf_h" = "xyes"; 28@@ -4942,6 +4939,7 @@ rm -f core conftest.err conftest.$ac_obj
 29 *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
 30 *-*-nto*) icu_cv_host_frag=mh-qnx ;;
 31 *-ncr-*) icu_cv_host_frag=mh-mpras ;;
 32+-*-sco3.2v5*) icu_cv_host_frag=mh-scoosr5 ;;
 33 *) icu_cv_host_frag=mh-unknown ;;
 34 esac
 35
 36@@ -5452,6 +5450,29 @@ if test "x$ac_cv_header_elf_h" = "xyes";
29 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1"; 37 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
30 fi 38 fi
31  39
32+# check if sys/atomic.h is present. 40+# check if sys/atomic.h is present.
33+for ac_header in sys/atomic.h 41+for ac_header in sys/atomic.h
34+do : 42+do :
35+ ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default" 43+ ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default"
36+if test "x$ac_cv_header_sys_atomic_h" = xyes; then : 44+if test "x$ac_cv_header_sys_atomic_h" = xyes; then :
37+ cat >>confdefs.h <<_ACEOF 45+ cat >>confdefs.h <<_ACEOF
38+#define HAVE_SYS_ATOMIC_H 1 46+#define HAVE_SYS_ATOMIC_H 1
39+_ACEOF 47+_ACEOF
40+ 48+
41+fi 49+fi
@@ -45,27 +53,27 @@ and at the same time fix a typo involvin @@ -45,27 +53,27 @@ and at the same time fix a typo involvin
45+case "${host}" in 53+case "${host}" in
46+*-netbsd*) 54+*-netbsd*)
47+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then 55+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
48+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1"; 56+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
49+fi 57+fi
50+;; 58+;;
51+*) 59+*)
52+;; 60+;;
53+esac 61+esac
54+ 62+
55 U_ENABLE_DYLOAD=1 63 U_ENABLE_DYLOAD=1
56 enable=yes 64 enable=yes
57 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5 65 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5
58@@ -7442,13 +7462,13 @@ fi 66@@ -7442,13 +7463,13 @@ fi
59 # Now that we're done using CPPFLAGS etc. for tests, we can change it 67 # Now that we're done using CPPFLAGS etc. for tests, we can change it
60 # for build. 68 # for build.
61  69
62-if test "${CC}" == "clang"; then 70-if test "${CC}" == "clang"; then
63+if test "${CC}" = "clang"; then 71+if test "${CC}" = "clang"; then
64 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality" 72 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
65 else 73 else
66 CLANGCFLAGS="" 74 CLANGCFLAGS=""
67 fi 75 fi
68  76
69-if test "${CXX}" == "clang++"; then 77-if test "${CXX}" == "clang++"; then
70+if test "${CXX}" = "clang++"; then 78+if test "${CXX}" = "clang++"; then
71 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality" 79 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"

cvs diff -r1.2 -r1.3 pkgsrc/textproc/icu/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/textproc/icu/patches/patch-configure.ac 2014/05/05 21:25:11 1.2
+++ pkgsrc/textproc/icu/patches/patch-configure.ac 2014/07/18 10:28:11 1.3
@@ -1,40 +1,48 @@ @@ -1,40 +1,48 @@
1$NetBSD: patch-configure.ac,v 1.2 2014/05/05 21:25:11 ryoon Exp $ 1$NetBSD: patch-configure.ac,v 1.3 2014/07/18 10:28:11 ryoon Exp $
2 2
3* Detect NetBSD libatomic 3* Detect NetBSD libatomic
4* test(1) portability fix 4* test(1) portability fix
5 5
6--- configure.ac.orig 2013-12-09 17:32:25.000000000 +0000 6--- configure.ac.orig 2013-12-09 17:32:25.000000000 +0000
7+++ configure.ac 7+++ configure.ac
8@@ -407,6 +407,18 @@ if test "x$ac_cv_header_elf_h" = "xyes"; 8@@ -407,6 +407,18 @@ if test "x$ac_cv_header_elf_h" = "xyes";
9 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1"; 9 CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
10 fi 10 fi
11  11
12+# check if sys/atomic.h is present. 12+# check if sys/atomic.h is present.
13+AC_CHECK_HEADERS([sys/atomic.h]) 13+AC_CHECK_HEADERS([sys/atomic.h])
14+case "${host}" in 14+case "${host}" in
15+*-netbsd*) 15+*-netbsd*)
16+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then 16+if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
17+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1"; 17+ CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
18+fi 18+fi
19+;; 19+;;
20+*) 20+*)
21+;; 21+;;
22+esac 22+esac
23+ 23+
24 U_ENABLE_DYLOAD=1 24 U_ENABLE_DYLOAD=1
25 enable=yes 25 enable=yes
26 AC_MSG_CHECKING([whether to enable dynamic loading of plugins]) 26 AC_MSG_CHECKING([whether to enable dynamic loading of plugins])
27@@ -1249,13 +1261,13 @@ fi 27@@ -1232,6 +1244,7 @@ case "${host}" in
 28 *-*-beos) platform=U_BEOS ;;
 29 *-*-irix*) platform=U_IRIX ;;
 30 *-ncr-*) platform=U_MPRAS ;;
 31+ *-*-sco3.2v5*) platform=USCOOSR5 ;;
 32 *) platform=U_UNKNOWN_PLATFORM ;;
 33 esac
 34 AC_SUBST(ICUDATA_CHAR)
 35@@ -1249,13 +1262,13 @@ fi
28 # Now that we're done using CPPFLAGS etc. for tests, we can change it 36 # Now that we're done using CPPFLAGS etc. for tests, we can change it
29 # for build. 37 # for build.
30  38
31-if test "${CC}" == "clang"; then 39-if test "${CC}" == "clang"; then
32+if test "${CC}" = "clang"; then 40+if test "${CC}" = "clang"; then
33 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality" 41 CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
34 else 42 else
35 CLANGCFLAGS="" 43 CLANGCFLAGS=""
36 fi 44 fi
37  45
38-if test "${CXX}" == "clang++"; then 46-if test "${CXX}" == "clang++"; then
39+if test "${CXX}" = "clang++"; then 47+if test "${CXX}" = "clang++"; then
40 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality" 48 CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"