<!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>[127938] trunk/dports/devel/icu/Portfile</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/127938">127938</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2014-11-08 08:48:23 -0800 (Sat, 08 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>icu: whitespace changes only</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelicuPortfile">trunk/dports/devel/icu/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelicuPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/icu/Portfile (127937 => 127938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/icu/Portfile 2014-11-08 16:45:53 UTC (rev 127937)
+++ trunk/dports/devel/icu/Portfile 2014-11-08 16:48:23 UTC (rev 127938)
</span><span class="lines">@@ -73,152 +73,151 @@
</span><span class="cx"> if { ${supported_archs} ne "noarch" } {
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx"> }
</span><del>-
-extract.suffix .tgz
-distfiles ${distname}-src${extract.suffix}
-
-checksums rmd160 9bd1b4bdc2010545c76a927dcf46049686beeab9 \
- sha256 6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28
-
-patchfiles patch-config-mh-darwin.diff
-
-# icu appends -O2 to the cflags and cxxflags
-configure.optflags-delete -Os
-
-# 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_exists universal] && [variant_isset universal]} {
- merger-post-destroot {
- set rebuilton ""
- 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 "" } {
- set rebuilton [exec /usr/bin/tail -n 1 ${dir}${prefix}/bin/icu-config]
- } else {
- reinplace "s|^# Rebuilt on .*|${rebuilton}|" ${dir}${prefix}/bin/icu-config
</del><ins>+
+ extract.suffix .tgz
+ distfiles ${distname}-src${extract.suffix}
+
+ checksums rmd160 9bd1b4bdc2010545c76a927dcf46049686beeab9 \
+ sha256 6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28
+
+ patchfiles patch-config-mh-darwin.diff
+
+ # icu appends -O2 to the cflags and cxxflags
+ configure.optflags-delete -Os
+
+ # 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_exists universal] && [variant_isset universal]} {
+ merger-post-destroot {
+ set rebuilton ""
+ 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 "" } {
+ set rebuilton [exec /usr/bin/tail -n 1 ${dir}${prefix}/bin/icu-config]
+ } else {
+ reinplace "s|^# Rebuilt on .*|${rebuilton}|" ${dir}${prefix}/bin/icu-config
+ }
+
+ # Removing architecture specific information from the Makefile include files is necessary to merge them correctly.
+ # It is conceivable 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>-
- # Removing architecture specific information from the Makefile include files is necessary to merge them correctly.
- # It is conceivable 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
</del><span class="cx"> }
</span><ins>+ } else {
+ post-destroot {
+ # stay consistent with the universal build (see comments above)
+ if { [file exists ${destroot}${prefix}/bin/icu-config] } {
+ reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${destroot}${prefix}/bin/icu-config
+ }
+ if { [file exists ${destroot}${prefix}/lib/icu/${version}/Makefile.inc] } {
+ reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${destroot}${prefix}/lib/icu/${version}/Makefile.inc
+ }
+ if { [file exists ${destroot}${prefix}/lib/icu/${version}/pkgdata.inc] } {
+ reinplace -E {s:-arch +[^ ]+::g} ${destroot}${prefix}/lib/icu/${version}/pkgdata.inc
+ }
+ }
</ins><span class="cx"> }
</span><del>-} else {
- post-destroot {
- # stay consistent with the universal build (see comments above)
- if { [file exists ${destroot}${prefix}/bin/icu-config] } {
- reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${destroot}${prefix}/bin/icu-config
</del><ins>+
+ set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
+ configure.cmd ./runConfigureICU ${platform}
+
+ configure.args --enable-static \
+ --disable-samples
+
+ configure.universal_args-delete --disable-dependency-tracking
+ 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 "yes"
+ }
+
+ # Fix bug #11981 that prevents ICU from building when upgrading.
+ # The default configure flags causes utilisation of outdated ICU
+ # headers/libs instead of the right ones.
+ configure.cppflags
+ configure.ldflags
+
+ build.type gnu
+ build.args VERBOSE=1
+
+ use_parallel_build yes
+
+ test.run yes
+ test.target check
+ test.args VERBOSE=1
+
+ if { ${name} eq ${subport} } {
+ post-destroot {
+ xinstall -d ${destroot}${docdir}
+ eval xinstall -m 0644 [glob ${worksrcpath}/../*.{css,html,txt}] ${destroot}${docdir}
</ins><span class="cx"> }
</span><del>- if { [file exists ${destroot}${prefix}/lib/icu/${version}/Makefile.inc] } {
- reinplace {s| -DSIZEOF_VOID_P=[48]||g} ${destroot}${prefix}/lib/icu/${version}/Makefile.inc
</del><ins>+
+ if { [variant_isset doc] } {
+ ui_warn "You have requested an obsolete variant. Replaced by port ${name}-docs"
+ depends_build-append port:${name}-docs
</ins><span class="cx"> }
</span><del>- if { [file exists ${destroot}${prefix}/lib/icu/${version}/pkgdata.inc] } {
- reinplace -E {s:-arch +[^ ]+::g} ${destroot}${prefix}/lib/icu/${version}/pkgdata.inc
</del><ins>+ if { [variant_isset doxygen] } {
+ ui_warn "You have requested an obsolete variant. Replaced by port ${name}-doxygen-docs"
+ depends_build-append port:${name}-doxygen-docs
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-}
-
-set platform [switch ${os.platform} {darwin {format MacOSX} freebsd {format FreeBSD}}]
-configure.cmd ./runConfigureICU ${platform}
-
-configure.args --enable-static \
- --disable-samples
-
-configure.universal_args-delete --disable-dependency-tracking
-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 "yes"
-}
-
-# Fix bug #11981 that prevents ICU from building when upgrading.
-# The default configure flags causes utilisation of outdated ICU
-# headers/libs instead of the right ones.
-configure.cppflags
-configure.ldflags
-
-build.type gnu
-build.args VERBOSE=1
-
-use_parallel_build yes
-
-test.run yes
-test.target check
-test.args VERBOSE=1
-
-if { ${name} eq ${subport} } {
-post-destroot {
- xinstall -d ${destroot}${docdir}
- eval xinstall -m 0644 [glob ${worksrcpath}/../*.{css,html,txt}] ${destroot}${docdir}
-}
-
-if { [variant_isset doc] } {
- ui_warn "You have requested an obsolete variant. Replaced by port ${name}-docs"
- depends_build-append port:${name}-docs
-}
-if { [variant_isset doxygen] } {
- ui_warn "You have requested an obsolete variant. Replaced by port ${name}-doxygen-docs"
- depends_build-append port:${name}-doxygen-docs
-}
-
-}
-
-# icu @51.2_0 and earlier also installed the following files directly, bypassing destroot:
-# ${prefix}/lib/icu/${version}/pkgdata.inc
-# These files can be removed from the below deactivation block after August 2014.
-pre-deactivate {
- if {[variant_isset universal]} {
- # Ticket #23773
- foreach f [list "${prefix}/bin/icu-config" \
- "${prefix}/lib/icu/${version}/Makefile.inc" \
- "${prefix}/lib/icu/${version}/pkgdata.inc" \
- "${prefix}/lib/pkgconfig/icu-i18n.pc" \
- "${prefix}/lib/pkgconfig/icu-io.pc" \
- "${prefix}/lib/pkgconfig/icu-le.pc" \
- "${prefix}/lib/pkgconfig/icu-lx.pc" \
- "${prefix}/lib/pkgconfig/icu-uc.pc"] {
- delete ${f}
</del><ins>+
+ # icu @51.2_0 and earlier also installed the following files directly, bypassing destroot:
+ # ${prefix}/lib/icu/${version}/pkgdata.inc
+ # These files can be removed from the below deactivation block after August 2014.
+ pre-deactivate {
+ if {[variant_isset universal]} {
+ # Ticket #23773
+ foreach f [list "${prefix}/bin/icu-config" \
+ "${prefix}/lib/icu/${version}/Makefile.inc" \
+ "${prefix}/lib/icu/${version}/pkgdata.inc" \
+ "${prefix}/lib/pkgconfig/icu-i18n.pc" \
+ "${prefix}/lib/pkgconfig/icu-io.pc" \
+ "${prefix}/lib/pkgconfig/icu-le.pc" \
+ "${prefix}/lib/pkgconfig/icu-lx.pc" \
+ "${prefix}/lib/pkgconfig/icu-uc.pc"] {
+ delete ${f}
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ platform freebsd {
+ build.env MAKE=/usr/local/bin/gmake
+ destroot.env MAKE=/usr/local/bin/gmake
+ }
+
+ platform darwin 8 {
+ patchfiles-append patch-common-putil.cpp.diff
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-platform freebsd {
- build.env MAKE=/usr/local/bin/gmake
- destroot.env MAKE=/usr/local/bin/gmake
-}
-
-platform darwin 8 {
- patchfiles-append patch-common-putil.cpp.diff
-}
-}
-
</del><span class="cx"> livecheck.url http://site.icu-project.org/download
</span><span class="cx"> livecheck.regex {>ICU4C \((\d+(?:\.\d+)*)\)<}
</span></span></pre>
</div>
</div>
</body>
</html>