<!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>[136753] trunk/dports/devel/tup</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/136753">136753</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-05-25 18:56:15 -0700 (Mon, 25 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>tup: fix build on Yosemite and later (#47824); ensure we're UsingTheRightCompiler and -arch flags; use xinstall instead of file copy in destroot; take over as maintainer</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdeveltupPortfile">trunk/dports/devel/tup/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/tup/files/</li>
<li><a href="#trunkdportsdeveltupfilespatchbuildshdiff">trunk/dports/devel/tup/files/patch-build.sh.diff</a></li>
<li><a href="#trunkdportsdeveltupfilespatchreadlinkatdiff">trunk/dports/devel/tup/files/patch-readlinkat.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdeveltupPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/tup/Portfile (136752 => 136753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/tup/Portfile 2015-05-26 01:51:11 UTC (rev 136752)
+++ trunk/dports/devel/tup/Portfile 2015-05-26 01:56:15 UTC (rev 136753)
</span><span class="lines">@@ -7,8 +7,9 @@
</span><span class="cx"> github.setup gittup tup 0.7.1 v
</span><span class="cx"> revision 1
</span><span class="cx"> categories devel
</span><del>-maintainers nomaintainer
</del><span class="cx"> platforms macosx
</span><ins>+maintainers ryandesign openmaintainer
+
</ins><span class="cx"> description A build system with amazingly fast incremental build cycle
</span><span class="cx">
</span><span class="cx"> long_description \
</span><span class="lines">@@ -25,16 +26,23 @@
</span><span class="cx"> checksums rmd160 6233ec9e861483d5d2d80a55121bf99a06939121 \
</span><span class="cx"> sha256 c697e374194011c3c44d5c829cb776afa5cfd0421e419845464d36775efc1dba
</span><span class="cx">
</span><del>-build.cmd ./build.sh
-build.env-append TUP_LABEL=${version}
</del><ins>+depends_build port:pkgconfig
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig
</del><span class="cx"> depends_lib port:osxfuse \
</span><span class="cx"> port:libiconv
</span><span class="cx">
</span><del>-use_configure no
</del><ins>+patchfiles patch-build.sh.diff \
+ patch-readlinkat.diff
</ins><span class="cx">
</span><ins>+use_configure no
+
+build.cmd ./build.sh
+build.env-append CC=${configure.cc} \
+ CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
+ TUP_LABEL=${version}
+
</ins><span class="cx"> destroot {
</span><del>- file copy ${worksrcpath}/build/tup ${destroot}${prefix}/bin
- file copy ${worksrcpath}/tup.1 ${destroot}${prefix}/share/man/man1/
</del><ins>+ xinstall -m 0755 ${worksrcpath}/build/tup ${destroot}${prefix}/bin/
+ xinstall -m 0644 ${worksrcpath}/tup.1 ${destroot}${prefix}/share/man/man1/
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdeveltupfilespatchbuildshdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/tup/files/patch-build.sh.diff (0 => 136753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/tup/files/patch-build.sh.diff (rev 0)
+++ trunk/dports/devel/tup/files/patch-build.sh.diff 2015-05-26 01:56:15 UTC (rev 136753)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+--- build.sh.orig 2013-12-22 18:03:32.000000000 -0600
++++ build.sh 2015-05-25 20:52:59.000000000 -0500
+@@ -3,10 +3,9 @@
+ label=${TUP_LABEL:-bootstrap}
+ os=`uname -s`
+ plat_cflags="`pkg-config fuse --cflags`"
+-plat_ldflags="`pkg-config fuse --libs`"
++plat_ldflags="`pkg-config fuse --libs` -lm"
+ plat_files=""
+-LDFLAGS="-lm"
+-CC=gcc
++: ${CC:=gcc}
+ case "$os" in
+ Linux)
+ plat_files="$plat_files ../src/compat/dummy.c"
+@@ -37,7 +36,6 @@
+ plat_cflags="$plat_cflags -include ../src/compat/macosx.h"
+ plat_cflags="$plat_cflags -DAT_SYMLINK_NOFOLLOW=0x100"
+ plat_cflags="$plat_cflags -DAT_REMOVEDIR=0x200"
+- CC=clang
+ ;
+ FreeBSD)
+ plat_files="$plat_files ../src/compat/dummy.c"
+@@ -77,7 +75,7 @@
+ $CC $CFLAGS -c ../src/sqlite3/sqlite3.c -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION $plat_cflags
+
+ echo " bootstrap LD tup $LDFLAGS"
+-echo "const char *tup_version(void) {return \"$label\";}" | $CC -x c -c - -o tup_version.o
++echo "const char *tup_version(void) {return \"$label\";}" | $CC $CFLAGS -x c -c - -o tup_version.o
+ $CC *.o -o tup -lpthread $plat_ldflags $LDFLAGS
+
+ cd ..
</ins></span></pre></div>
<a id="trunkdportsdeveltupfilespatchreadlinkatdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/tup/files/patch-readlinkat.diff (0 => 136753)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/tup/files/patch-readlinkat.diff (rev 0)
+++ trunk/dports/devel/tup/files/patch-readlinkat.diff 2015-05-26 01:56:15 UTC (rev 136753)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+Fix build on Yosemite and later by declaring readlinkat the same way as Yosemite does
+https://github.com/gittup/tup/commit/9812548b4d3833644f0cf8f70f62628a75ffbb56
+--- src/compat/macosx.h.orig
++++ src/compat/macosx.h
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
++#include <unistd.h>
+
+ /* MacOSX 10.6 does not have *at() functions */
+ DIR *fdopendir(int fd);
+@@ -33,7 +34,7 @@ int fchownat(int dirfd, const char *pathname, uid_t owner, gid_t group, int flag
+ int fstatat(int dirfd, const char *pathname, struct stat *buf, int flags);
+ int mkdirat(int dirfd, const char *pathname, mode_t mode);
+ int openat(int dirfd, const char *pathname, int flags, ...);
+-int readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz);
++ssize_t readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz);
+ int renameat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath);
+ int symlinkat(const char *oldpath, int newdirfd, const char *newpath);
+ int unlinkat(int dirfd, const char *pathname, int flags);
+--- src/compat/readlinkat.c.orig
++++ src/compat/readlinkat.c
+@@ -23,7 +23,7 @@
+ #include <unistd.h>
+ #include "dir_mutex.h"
+
+-int readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz)
++ssize_t readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz)
+ {
+ int rc;
+
</ins></span></pre>
</div>
</div>
</body>
</html>