<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120843] trunk/dports/devel/icu</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120843">120843</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2014-06-09 14:08:40 -0700 (Mon, 09 Jun 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>icu
 * update version 51.2 -&gt; 53.1
 * simplify Portfile to reflect upstream improvements in ICU build mechanism
 * allow ICU to choose the optimization level
 * simplify universal build process
 * remove cross compiling ability to simplify code
 * as there is no maintainer, add copious comments</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelicuPortfile">trunk/dports/devel/icu/Portfile</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelicufilesinlinepatch">trunk/dports/devel/icu/files/inline.patch</a></li>
<li><a href="#trunkdportsdevelicufilespatchconfigmhdarwindiff">trunk/dports/devel/icu/files/patch-config-mh-darwin.diff</a></li>
<li><a href="#trunkdportsdevelicufilespatchconfigurediff">trunk/dports/devel/icu/files/patch-configure.diff</a></li>
<li><a href="#trunkdportsdevelicufilespatchuniversaldiff">trunk/dports/devel/icu/files/patch-universal.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelicuPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/icu/Portfile (120842 => 120843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/icu/Portfile        2014-06-09 20:21:32 UTC (rev 120842)
+++ trunk/dports/devel/icu/Portfile        2014-06-09 21:08:40 UTC (rev 120843)
</span><span class="lines">@@ -8,8 +8,8 @@
</span><span class="cx"> set my_name     icu4c
</span><span class="cx"> # Don't forget to increase the revision number of the dependents (e.g. boost)
</span><span class="cx"> # whenever the library version number changes. Thanks.
</span><del>-version         51.2
-revision        1
</del><ins>+# port echo depends:icu finds dependencies
+version         53.1
</ins><span class="cx"> categories      devel textproc
</span><span class="cx"> platforms       darwin freebsd
</span><span class="cx"> license         MIT
</span><span class="lines">@@ -28,60 +28,92 @@
</span><span class="cx"> distname        ${my_name}-[join [split ${version} .] _]
</span><span class="cx"> extract.suffix  .tgz
</span><span class="cx"> distfiles       ${distname}-src${extract.suffix}
</span><del>-patchfiles      patch-configure.diff \
-                patch-config-mh-darwin.diff \
-                inline.patch
</del><span class="cx"> 
</span><span class="cx"> checksums       ${distname}-src.tgz \
</span><del>-                rmd160  ef1256bb87b3dcec1cf40b32b11c5c3f1bd48af6 \
-                sha256  deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc
</del><ins>+                rmd160  9bd1b4bdc2010545c76a927dcf46049686beeab9 \
+                sha256  6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28
</ins><span class="cx"> 
</span><span class="cx"> worksrcdir      ${name}/source
</span><span class="cx"> set docdir      ${prefix}/share/doc/${name}
</span><span class="cx"> 
</span><del>-if {[variant_isset universal]} {
-    patchfiles-append   patch-universal.diff
</del><ins>+# icu appends -O2 to the cflags and cxxflags
+configure.optflags-delete -Os
</ins><span class="cx"> 
</span><del>-    # weirdly, icu needs a separate source dir built for the build
-    # machine in order to cross-compile
-    pre-configure {
-        global merger_configure_args
-        set cross 0
-        set 32bit 0
-        set crosspath ${worksrcpath}-cross
-        if {${os.major} &lt; 9 || [sysctl hw.cpu64bit_capable] == 0} {
-            set 32bit 1
-        }
-        foreach a $universal_archs_to_use {
-            if {($32bit &amp;&amp; ($a eq &quot;x86_64&quot; || $a eq &quot;ppc64&quot;)) 
-                || (${os.arch} eq &quot;powerpc&quot; &amp;&amp; ($a eq &quot;x86_64&quot; || $a eq &quot;i386&quot;))
-                || (${os.arch} eq &quot;i386&quot; &amp;&amp; ($a eq &quot;ppc&quot; || $a eq &quot;ppc64&quot;))} {
-                set cross 1
-                set merger_configure_args($a) --with-cross-build=${crosspath}
</del><ins>+# ICU has three mechanisms to aid other projects in building properly
+#     1) .pc files for pkg-config
+#     2) shell script icu-config that can output compiler flags
+#     3) Makefile include files Makefile.inc and pkgdata.inc
+# For a time, all three assumed other projects would want to be
+#     built as ICU had been built, regardless of whether it was appropriate.
+# For the most part, the extraneous flags have been removed.
+#     1) They have been removed completely from the .pc files.
+#        pkg-config is the recommended way of building against ICU.
+#     2) icu-config does not print them out, but they are still contained in the script itself.
+#     3) They still exist in the Makefile include files.
+#
+# for descriptions of the problem, see
+#     r101578
+#     #40069
+#     https://bugs.gentoo.org/show_bug.cgi?id=202059
+#
+# for upstream reports and discussion, see
+#    http://bugs.icu-project.org/trac/ticket/10308
+#    http://bugs.icu-project.org/trac/ticket/6102
+if {[variant_isset universal]} {
+    merger-post-destroot {
+        set rebuilton &quot;&quot;
+        foreach arch ${universal_archs_to_use} {
+            set dir ${destroot}-${arch}
+            
+            # SIZEOF_VOID_P is no longer used in icu-config, so remove it to facilitate merging of the shell script
+            reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${dir}${prefix}/bin/icu-config
+            
+            # icu-config contains the exact time it was built, which makes merging difficult
+            # ensure that all versions of icu-config have the same build timestamp
+            if { ${rebuilton} eq &quot;&quot; } {
+                set rebuilton [exec /usr/bin/tail -n 1 ${dir}${prefix}/bin/icu-config]
+            } else {
+                reinplace &quot;s|^# Rebuilt on .*|${rebuilton}|&quot; ${dir}${prefix}/bin/icu-config
</ins><span class="cx">             }
</span><ins>+            
+            # Removing architecture specific information from the Makefile include files is necessary to merge them correctly.
+            # It is concivable that this could cause problems for certain projects.
+            # The developers of ICU suggest using pkg-config over both icu-config and the Makefile includes.
+            reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${dir}${prefix}/lib/icu/${version}/Makefile.inc
+            reinplace -E {s:-arch +[^ ]+::g} ${dir}${prefix}/lib/icu/${version}/pkgdata.inc
</ins><span class="cx">         }
</span><del>-        if {$cross} {
-            copy ${worksrcpath} ${crosspath}
-            set configure_dir_save  ${configure.dir}
-            configure.dir ${crosspath}
-            portconfigure::configure_main
-            configure.dir $configure_dir_save
-            system -W ${crosspath} &quot;${build.cmd}[portbuild::build_getjobsarg]&quot;
-        }
</del><span class="cx">     }
</span><ins>+} else {
+    post-destroot {
+        # stay consistent with the universal build (see comments above)
+        reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${destroot}${prefix}/bin/icu-config
+        reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${destroot}${prefix}/lib/icu/${version}/Makefile.inc
+        reinplace -E {s:-arch +[^ ]+::g} ${destroot}${prefix}/lib/icu/${version}/pkgdata.inc
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-post-patch {
-    reinplace &quot;s|__PREFIX__|${prefix}|g&quot; ${worksrcpath}/config/mh-darwin
</del><ins>+post-destroot {
+    # The ICU build mechanism passes rpath to the linker, but this should not be necessary if the shared libraries were built correctly.
+    reinplace {s|^default_ENABLE_RPATH=&quot;YES&quot;$|default_ENABLE_RPATH=&quot;NO&quot;|g} ${destroot}${prefix}/bin/icu-config
+    reinplace -E {s| -Wl,-rpath,.+/lib||g} ${destroot}${prefix}/lib/icu/${version}/pkgdata.inc
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
</span><span class="cx"> configure.cmd   ./runConfigureICU ${platform}
</span><span class="cx"> 
</span><ins>+# enable-rpath forces ICU to build the shared library correctly (with directory name in -install_name)
</ins><span class="cx"> configure.args  --enable-static \
</span><del>-                --disable-samples
</del><ins>+                --disable-samples \
+                --enable-rpath
</ins><span class="cx"> 
</span><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span><ins>+if {[variant_isset universal]} {
+    # ICU detects cross compiling by trying to run binaries.
+    # r73849 and #29904 indicate that cross compiling is a problem.
+    # Of the solutions tried (r79660, r73865, and r73849), simply disallowing cross compiling is by far the simplest.
+    # Note that #29904 should not show up again because universal now better recognizes 32/64-bit cross compiling (r79658)
+    set merger_must_run_binaries &quot;yes&quot;
+}
</ins><span class="cx"> 
</span><span class="cx"> # Fix bug #11981 that prevents ICU from building when upgrading.
</span><span class="cx"> # The default configure flags causes utilisation of outdated ICU
</span><span class="lines">@@ -89,85 +121,18 @@
</span><span class="cx"> configure.cppflags
</span><span class="cx"> configure.ldflags
</span><span class="cx"> 
</span><del>-post-configure {
-    if {[variant_isset universal]} {
-        # Ticket #23773
-        foreach a ${universal_archs_to_use} {
-            reinplace &quot;s|__ARCH__|${a}|g&quot; ${worksrcpath}-${a}/Makefile
-        }
-    }
-}
-
</del><span class="cx"> build.type      gnu
</span><span class="cx"> 
</span><span class="cx"> use_parallel_build  yes
</span><span class="cx"> 
</span><del>-post-build {
-    if {[variant_isset universal]} {
-        set dirs {}
-        foreach arch ${universal_archs_to_use} {
-            lappend dirs ${worksrcpath}-${arch}
-        }
-    } else {
-        set dirs ${worksrcpath}
-    }
-    foreach dir ${dirs} {
-        foreach f {Makefile.inc icu-config icu-i18n.pc icu-io.pc icu-le.pc icu-lx.pc icu-uc.pc icu.pc pkgdata.inc} {
-            reinplace -E {s|-arch [a-z0-9_]+||g} ${dir}/config/${f}
-        }
-    }
-}
-
</del><span class="cx"> test.run        yes
</span><span class="cx"> test.target     check
</span><span class="cx"> 
</span><span class="cx"> post-destroot {
</span><span class="cx">     xinstall -d ${destroot}${docdir}
</span><span class="cx">     eval xinstall -m 0644 [glob ${worksrcpath}/../*.{css,html,txt}] ${destroot}${docdir}
</span><del>-
-    if {[variant_isset universal]} {
-        # Ticket #23773
-        foreach a ${universal_archs_to_use} {
-            reinplace &quot;s|/Makefile.inc|/Makefile-${a}.inc|g&quot; ${destroot}${prefix}/bin/icu-config-${a}
-        }
-        ln -s current/Makefile.inc ${destroot}${prefix}/lib/icu/Makefile.inc
-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><del>-post-activate {
-    if {[variant_isset universal]} {
-        # Ticket #23773
-        set a ${configure.build_arch}
-        if {$a == &quot;ppc64&quot;} {
-            if {![file exists ${prefix}/bin/icu-config-${a}]} {
-                set a &quot;ppc&quot;
-            }
-        } elseif {$a == &quot;x86_64&quot;} {
-            if {![file exists ${prefix}/bin/icu-config-${a}]} {
-                set a &quot;i386&quot;
-                if {![file exists ${prefix}/bin/icu-config-${a}]} {
-                    set a &quot;ppc&quot;
-                }
-            }
-        } elseif {$a == &quot;i386&quot;} {
-            if {![file exists ${prefix}/bin/icu-config-${a}]} {
-                set a &quot;ppc&quot;
-            }
-        }
-        foreach {p q} [list &quot;${prefix}/bin/icu-config-${a}&quot; &quot;${prefix}/bin/icu-config&quot; \
-                            &quot;${prefix}/lib/icu/${version}/Makefile-${a}.inc&quot; &quot;${prefix}/lib/icu/${version}/Makefile.inc&quot; \
-                            &quot;${prefix}/lib/pkgconfig/icu-i18n-${a}.pc&quot; &quot;${prefix}/lib/pkgconfig/icu-i18n.pc&quot; \
-                            &quot;${prefix}/lib/pkgconfig/icu-io-${a}.pc&quot; &quot;${prefix}/lib/pkgconfig/icu-io.pc&quot; \
-                            &quot;${prefix}/lib/pkgconfig/icu-le-${a}.pc&quot; &quot;${prefix}/lib/pkgconfig/icu-le.pc&quot; \
-                            &quot;${prefix}/lib/pkgconfig/icu-lx-${a}.pc&quot; &quot;${prefix}/lib/pkgconfig/icu-lx.pc&quot; \
-                            &quot;${prefix}/lib/pkgconfig/icu-uc-${a}.pc&quot; &quot;${prefix}/lib/pkgconfig/icu-uc.pc&quot;] {
-            if {[file exists ${p}]} {
-                ln -s ${p} ${q}
-            }
-        }
-    }
-}
-
</del><span class="cx"> # icu @51.2_0 and earlier also installed the following files directly, bypassing destroot:
</span><span class="cx"> #   ${prefix}/lib/icu/${version}/pkgdata.inc
</span><span class="cx"> # These files can be removed from the below deactivation block after August 2014.
</span><span class="lines">@@ -192,8 +157,8 @@
</span><span class="cx">     extract.only        ${distname}-src${extract.suffix}
</span><span class="cx">     distfiles-append    ${distname}-docs.zip
</span><span class="cx">     checksums-append    ${distname}-docs.zip \
</span><del>-                        rmd160  87f332c1c2e4c5322cd110f93e8ccb288d0303a9 \
-                        sha256  c488b3ddbb99a4a368cfc74e725d6a9e491ae6ac0169caba2197c15ffb85b7c5
</del><ins>+                        rmd160  60ce19f8633c18d670ad2f0b8d7920cd6ed0a314 \
+                        sha256  2c700534d52b98615b4baffcf0502f37540604e67817625f05d6e2fbf98d0c0b
</ins><span class="cx"> 
</span><span class="cx">     post-extract {
</span><span class="cx">         xinstall -m 0755 -d ${worksrcpath}/doc
</span></span></pre></div>
<a id="trunkdportsdevelicufilesinlinepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/icu/files/inline.patch (120842 => 120843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/icu/files/inline.patch        2014-06-09 20:21:32 UTC (rev 120842)
+++ trunk/dports/devel/icu/files/inline.patch        2014-06-09 21:08:40 UTC (rev 120843)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- common/umutex.h.orig        2012-06-01 07:52:44.000000000 -0700
-+++ common/umutex.h        2013-01-18 23:34:55.000000000 -0800
-@@ -29,7 +29,7 @@
- #if U_PLATFORM_IS_DARWIN_BASED
- #if defined(__STRICT_ANSI__)
- #define UPRV_REMAP_INLINE
--#define inline
-+#define inline __inline__
- #endif
- #include &lt;libkern/OSAtomic.h&gt;
- #define USE_MAC_OS_ATOMIC_INCREMENT 1
</del></span></pre></div>
<a id="trunkdportsdevelicufilespatchconfigmhdarwindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/icu/files/patch-config-mh-darwin.diff (120842 => 120843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/icu/files/patch-config-mh-darwin.diff        2014-06-09 20:21:32 UTC (rev 120842)
+++ trunk/dports/devel/icu/files/patch-config-mh-darwin.diff        2014-06-09 21:08:40 UTC (rev 120843)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- config/mh-darwin.orig        2011-10-14 04:38:41.000000000 -0700
-+++ config/mh-darwin        2011-10-14 05:32:55.000000000 -0700
-@@ -28,7 +28,7 @@
- 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))
-+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name __PREFIX__/lib/$(notdir $(MIDDLE_SO_TARGET))
- endif

- ## Compiler switch to embed a runtime search path
</del></span></pre></div>
<a id="trunkdportsdevelicufilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/icu/files/patch-configure.diff (120842 => 120843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/icu/files/patch-configure.diff        2014-06-09 20:21:32 UTC (rev 120842)
+++ trunk/dports/devel/icu/files/patch-configure.diff        2014-06-09 21:08:40 UTC (rev 120843)
</span><span class="lines">@@ -1,73 +0,0 @@
</span><del>---- configure.org        2013-05-30 14:16:18.000000000 +0200
-+++ configure        2013-05-30 14:17:11.000000000 +0200
-@@ -4066,7 +4066,7 @@
-         then
-             # 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
--            CFLAGS=&quot;$CFLAGS -Wall -std=c99 -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings&quot;
-+            CFLAGS=&quot;$CFLAGS -std=c99 -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings&quot;
-         else
-             case &quot;${host}&quot; in
-             *-*-cygwin)
-@@ -4078,7 +4078,7 @@
-         fi
-         if test &quot;$GXX&quot; = yes
-         then
--            CXXFLAGS=&quot;$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long&quot;
-+            CXXFLAGS=&quot;$CXXFLAGS -W -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long&quot;
-         else
-             case &quot;${host}&quot; in
-             *-*-cygwin)
-@@ -6006,40 +6006,6 @@
-   $as_echo_n &quot;(cached) &quot; &gt;&amp;6
- else
-   ac_cv_c_bigendian=unknown
--    # See if we're dealing with a universal compiler.
--    cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext
--/* end confdefs.h.  */
--#ifndef __APPLE_CC__
--               not a universal capable compiler
--             #endif
--             typedef int dummy;
--
--_ACEOF
--if ac_fn_c_try_compile &quot;$LINENO&quot;; then :
--
--        # Check for potential -arch flags.  It is not universal unless
--        # there are at least two -arch flags with different values.
--        ac_arch=
--        ac_prev=
--        for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
--         if test -n &quot;$ac_prev&quot;; then
--           case $ac_word in
--             i?86 | x86_64 | ppc | ppc64)
--               if test -z &quot;$ac_arch&quot; || test &quot;$ac_arch&quot; = &quot;$ac_word&quot;; then
--                 ac_arch=$ac_word
--               else
--                 ac_cv_c_bigendian=universal
--                 break
--               fi
--               ;;
--           esac
--           ac_prev=
--         elif test &quot;x$ac_word&quot; = &quot;x-arch&quot;; then
--           ac_prev=arch
--         fi
--       done
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     if test $ac_cv_c_bigendian = unknown; then
-       # See if sys/param.h defines the BYTE_ORDER macro.
-       cat confdefs.h - &lt;&lt;_ACEOF &gt;conftest.$ac_ext
-@@ -6214,11 +6180,6 @@
- ;; #(
-    no)
-       ;; #(
--   universal)
--
--$as_echo &quot;#define AC_APPLE_UNIVERSAL_BUILD 1&quot; &gt;&gt;confdefs.h
--
--     ;; #(
-    *)
-      as_fn_error $? &quot;unknown endianness
-  presetting ac_cv_c_bigendian=no (or yes) will help&quot; &quot;$LINENO&quot; 5 ;;
</del></span></pre></div>
<a id="trunkdportsdevelicufilespatchuniversaldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/icu/files/patch-universal.diff (120842 => 120843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/icu/files/patch-universal.diff        2014-06-09 20:21:32 UTC (rev 120842)
+++ trunk/dports/devel/icu/files/patch-universal.diff        2014-06-09 21:08:40 UTC (rev 120843)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>---- Makefile.in.orig        2013-05-23 15:06:32.000000000 -0500
-+++ Makefile.in        2013-08-15 01:22:22.000000000 -0500
-@@ -169,15 +169,18 @@
-         $(INSTALL_SCRIPT) $(top_srcdir)/install-sh $(DESTDIR)$(pkgdatadir)/install-sh
-         @$(MKINSTALLDIRS) $(DESTDIR)$(libdir)/pkgconfig
-         $(INSTALL_DATA) $(ALL_PKGCONFIG_FILES) $(DESTDIR)$(libdir)/pkgconfig/
-+        @for f in $(ALL_PKGCONFIG_SUFFIX); do \
-+          mv &quot;$(DESTDIR)$(libdir)/pkgconfig/icu-$${f}.pc&quot; &quot;$(DESTDIR)$(libdir)/pkgconfig/icu-$${f}-__ARCH__.pc&quot;; \
-+        done;
-         $(INSTALL_DATA) $(top_srcdir)/../license.html $(DESTDIR)$(pkgdatadir)/license.html
--        $(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
--        $(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile.inc
-+        $(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config-__ARCH__
-+        $(INSTALL_DATA) $(top_builddir)/config/Makefile.inc $(DESTDIR)$(pkglibdir)/Makefile-__ARCH__.inc
-         $(INSTALL_DATA) $(top_builddir)/config/pkgdata.inc $(DESTDIR)$(pkglibdir)/pkgdata.inc
- #        @echo icuinfo.xml is built after make check.
- #        -$(INSTALL_DATA) $(top_builddir)/config/icuinfo.xml $(DESTDIR)$(pkglibdir)/icuinfo.xml
-         cd $(DESTDIR)$(pkglibdir)/..; \
-             $(RM) current &amp;&amp; ln -s $(VERSION) current; \
--            $(RM) Makefile.inc &amp;&amp; ln -s current/Makefile.inc Makefile.inc; \
-+#            $(RM) Makefile.inc &amp;&amp; ln -s current/Makefile.inc Makefile.inc; \
-             $(RM) pkgdata.inc &amp;&amp; ln -s current/pkgdata.inc pkgdata.inc

- ifeq ($(DOXYGEN),)
</del></span></pre>
</div>
</div>

</body>
</html>