<!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>[114196] trunk/dports/x11/xtide</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/114196">114196</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2013-12-01 20:12:21 -0800 (Sun, 01 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>xtide: update to 2.13.2; add an upstream patch for clang compatibility; break out the harmonics data into its own xtide-data port; remove maintainer at his request; see #41460</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xtidePortfile">trunk/dports/x11/xtide/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/x11/xtide/files/</li>
<li><a href="#trunkdportsx11xtidefilespatchconfigureacdiff">trunk/dports/x11/xtide/files/patch-configure.ac.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xtidePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xtide/Portfile (114195 => 114196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xtide/Portfile 2013-12-02 02:40:07 UTC (rev 114195)
+++ trunk/dports/x11/xtide/Portfile 2013-12-02 04:12:21 UTC (rev 114196)
</span><span class="lines">@@ -3,13 +3,10 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name xtide
</span><del>-version 2.11
-revision 1
-
</del><ins>+version 2.13.2
</ins><span class="cx"> categories x11 science
</span><span class="cx"> platforms darwin
</span><del>-license GPL-3+
-maintainers jberry openmaintainer
</del><ins>+maintainers nomaintainer
</ins><span class="cx">
</span><span class="cx"> description Tide prediction software, with a large database of locations.
</span><span class="cx"> long_description XTide is a package that provides tide and current predictions \
</span><span class="lines">@@ -17,47 +14,78 @@
</span><span class="cx"> can be generated, or a tide clock can be provided on your desktop. \
</span><span class="cx"> For x11, plain command line, and as an http server.
</span><span class="cx">
</span><ins>+use_bzip2 yes
</ins><span class="cx"> homepage http://www.flaterco.com/xtide/
</span><span class="cx"> master_sites ftp://ftp.flaterco.com/xtide/
</span><del>-use_bzip2 yes
</del><span class="cx">
</span><del>-set harmonics_version 20110410
-set harmonics_file harmonics-dwf-${harmonics_version}-free.tar.bz2
</del><ins>+set docdir ${prefix}/share/doc/${subport}
+set harmonics_dir ${prefix}/share/${name}/harmonics
</ins><span class="cx">
</span><del>-distfiles-append ${harmonics_file}
-checksums ${distname}${extract.suffix} \
- md5 1d85890bb13b3345154e0f68831b7ebd \
- sha1 6f2386ba0e6e1df0d304d3ef037317462d9cc24d \
- rmd160 8c302774f244e958de529653a903d9be2f45b07b \
- ${harmonics_file} \
- md5 985c2f69eea343782142fa459fc34128 \
- sha1 9a33ade09c5ba0a6db007adb4075f7b1475b1130 \
- rmd160 43a788ce9864236d45087ba6ba0a9c6b8287c07d
</del><ins>+if {${name} eq ${subport}} {
+ license GPL-3+
+ master_sites-append http://pkgs.fedoraproject.org/repo/pkgs/${name}/${distfiles}/59de866e0684e123419d7a1c97ea23a5/
</ins><span class="cx">
</span><del>-depends_lib port:libpng port:libtcd port:xorg-libXaw
</del><ins>+ checksums rmd160 1a6cb8885fb71361cc7ce035186a6ac627a9cb0d \
+ sha256 fabf6b3097bb345598649ea55d1f2db269cbb651cddd73c60a9768088173d542
</ins><span class="cx">
</span><del>-post-patch {
- # Make the default harmonics path conveniently point to our directory
- reinplace s|harmonics.tcd|${prefix}/share/${name}/harmonics| ${worksrcpath}/HarmonicsPath.cc
-}
</del><ins>+ depends_lib port:libpng \
+ port:libtcd \
+ port:xorg-libXaw \
+ port:${name}-data
</ins><span class="cx">
</span><del>-post-destroot {
- xinstall -d -m 755 ${destroot}${prefix}/share/${name}/harmonics \
- ${destroot}${prefix}/share/doc/${name}
- xinstall -m 644 ${workpath}/harmonics-dwf-${harmonics_version}-free.tcd ${destroot}${prefix}/share/${name}/harmonics
- xinstall -m 644 ${workpath}/harmonics_boilerplate.txt ${destroot}${prefix}/share/doc/${name}
</del><ins>+ patchfiles patch-configure.ac.diff
+
+ post-patch {
+ # Make the default harmonics path conveniently point to our directory.
+ reinplace s|harmonics\\.tcd|${harmonics_dir}| ${worksrcpath}/HarmonicsPath.cc
+ }
+
+ # Per the configure script: "if using GCC, version 4.4 or later is required"
+ compiler.blacklist gcc-* apple-gcc-* macports-gcc-4.2 macports-gcc-4.3
+
+ # Regenerate configure after patching configure.ac for clang compatibility.
+ use_autoreconf yes
+
+ livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-notes "
</del><ins>+subport ${name}-data {
+ version 20121224
+ supported_archs noarch
+
+ description Harmonics data for XTide.
+
+ long_description ${description}
+
+ worksrcdir harmonics-dwf-${version}
+ distname ${worksrcdir}-free
+ master_sites-append http://pkgs.fedoraproject.org/repo/pkgs/${name}/${distfiles}/f9a8c5414aa14bd6b08d1be4e6a3eea7/
+
+ checksums rmd160 40ef64cff50ddcaf91b8648441a12ce2c6b07734 \
+ sha256 d80d7e99181c60a42660392abbe25789c395453dd88944c41dc19c7f4b0f11be
+
+ use_configure no
+
+ build {}
+
+ destroot {
+ xinstall -d -m 755 ${destroot}${harmonics_dir} ${destroot}${docdir}
+ xinstall -m 644 -W ${worksrcpath} ${distname}.tcd ${destroot}${harmonics_dir}
+ xinstall -m 644 -W ${worksrcpath} COPYING ChangeLog ${destroot}${docdir}
+ }
+
+ livecheck.regex harmonics-dwf-(\[0-9\]+)-free${extract.suffix}
+
+ notes "
</ins><span class="cx"> Only public domain harmonics for the United States are included in this port.\
</span><span class="cx"> Additional harmonics licensed for non-commercial use only can be downloaded\
</span><span class="cx"> from
</span><span class="cx">
</span><del>-[lindex ${master_sites} 0]harmonics-dwf-20110410-nonfree.tar.bz2
</del><ins>+[lindex ${master_sites} 0]harmonics-dwf-20111230-nonfree${extract.suffix}
</ins><span class="cx">
</span><del>-and extracted into ${prefix}/share/${name}/harmonics to make them available to ${name}.
</del><ins>+and extracted into ${harmonics_dir} to make them available to ${name}.
</ins><span class="cx"> "
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}files.html
</span><del>-livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</del></span></pre></div>
<a id="trunkdportsx11xtidefilespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xtide/files/patch-configure.ac.diff (0 => 114196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xtide/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/x11/xtide/files/patch-configure.ac.diff 2013-12-02 04:12:21 UTC (rev 114196)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+--- configure.ac.orig 2013-07-19 21:31:17.000000000 -0500
++++ configure.ac 2013-11-28 20:14:11.000000000 -0600
+@@ -23,14 +23,17 @@
+ AC_SUBST([ADDED_CXXFLAGS])
+
+ # Extended initializer lists were added in 4.4.
++# Clang fraudulently identifies itself as an old GCC.
+ AC_MSG_CHECKING([if using a version of GCC older than 4.4])
+ AC_PREPROC_IFELSE(
+ [AC_LANG_SOURCE([[
++#ifndef __clang__
+ #ifdef __GNUC__
+ #if (__GNUC__ * 100 + __GNUC_MINOR__) < 404
+ #FAIL
+ #endif
+ #endif
++#endif
+ ]])],
+ [
+ AC_MSG_RESULT(no)
+@@ -107,7 +110,7 @@
+ [
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([if it helps to add -std=gnu++0x to CXXFLAGS])
+- CXXFLAGS="-std=gnu++0x ${CXXFLAGS}"
++ CXXFLAGS="-std=gnu++0x ${SAVED_CXXFLAGS}"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[#include <vector>]],
+ [[std::vector<int> test = {1}]])],
+@@ -117,8 +120,22 @@
+ ],
+ [
+ AC_MSG_RESULT(no)
+- AC_DEFINE(NO_INITIALIZER_LISTS)
+- SKIP_COMPLICATED=1
++ # Clang needs -std=c++11 instead
++ AC_MSG_CHECKING([if it helps to add -std=c++11 to CXXFLAGS])
++ CXXFLAGS="-std=c++11 ${SAVED_CXXFLAGS}"
++ AC_COMPILE_IFELSE(
++ [AC_LANG_PROGRAM([[#include <vector>]],
++ [[std::vector<int> test = {1}]])],
++ [
++ AC_MSG_RESULT(yes)
++ ADDED_CXXFLAGS="${ADDED_CXXFLAGS} -std=c++11"
++ ],
++ [
++ AC_MSG_RESULT(no)
++ AC_DEFINE(NO_INITIALIZER_LISTS)
++ SKIP_COMPLICATED=1
++ ]
++ )
+ ]
+ )
+ ]
</ins></span></pre>
</div>
</div>
</body>
</html>