<!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>[126905] trunk/dports/fuse/osxfuse</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/126905">126905</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-10-16 19:30:31 -0700 (Thu, 16 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>osxfuse: update to 2.7.0 to fix build on Yosemite (#44189)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsfuseosxfusePortfile">trunk/dports/fuse/osxfuse/Portfile</a></li>
<li><a href="#trunkdportsfuseosxfusefilespatchbuildsystemdiff">trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsfuseosxfusePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/fuse/osxfuse/Portfile (126904 => 126905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/fuse/osxfuse/Portfile 2014-10-17 02:29:00 UTC (rev 126904)
+++ trunk/dports/fuse/osxfuse/Portfile 2014-10-17 02:30:31 UTC (rev 126905)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name osxfuse
</span><del>-version 2.6.4
-revision 1
</del><ins>+version 2.7.0
</ins><span class="cx"> categories fuse devel
</span><span class="cx"> platforms macosx
</span><span class="cx"> license BSD APSL
</span><span class="lines">@@ -37,12 +36,12 @@
</span><span class="cx">
</span><span class="cx"> distfiles
</span><span class="cx"> set mp.dist {
</span><del>- osxfuse 7b0d8d3 {rmd160 05a8896c7cd738966da1f3f18e8a17723b140dff sha256 bba529834f61fe79be00b4a6298f40a86dd8170f91979c4eeaf9378a1ce067cd}
- kext c59029c {rmd160 a19f4d8b0f4a4660b614e1716f21db749677444c sha256 77205fce0f289c3473d3621ca612cb33d86ebf4ea932712661c9527f91013bae}
</del><ins>+ osxfuse 8eb90a2 {rmd160 563f74f3e17caa644be3f01290f4587aea164a56 sha256 82ad7fe7c2b1c31ef522186f0761fb3ab2817027e5dd5cbe85be690f70e846b1}
+ kext 122937c {rmd160 b912555b99c832a1a6d2cad9d0b6c667e906c8b5 sha256 723b89ac3c52eea2ed3eeb02fc838886e6d4bce29c605761413d89085a03778e}
</ins><span class="cx"> framework 9fdde8a {rmd160 4124b3e9c396ee41dfce35d480caff41936b8000 sha256 9dd705e05de0b346000853c08c143a15d73673684afcc9bbcf55e6c71b33fb87}
</span><del>- prefpane 8c3ea24 {rmd160 08376d5848025074b4a4feee3d5ed99bc456dfeb sha256 a6a4c5397d7faf9a3f068ddf409e8afc19292a03db0b094bbd144d5c64757118}
</del><ins>+ prefpane 99d92a5 {rmd160 04706b6e84b8a2ac2a430b53c66c38f34af92b3f sha256 9d8d2990c0f72e1953f1506f9d84bc18299f4b8b9f691c3ecdc4a98b5a81d20b}
</ins><span class="cx"> fuse 98b9960 {rmd160 589cbe0c819caded56dc4be64727580e1400fd9e sha256 f60205e19c2971228b78d180dc65cda2a6271a567229acdeb19567fcbcebb641}
</span><del>- support 1213520 {rmd160 1f774cd0d5273c02716a533463c1d374c793dfc1 sha256 57ccf15e451c132874664c00990c2df12d0dced32ba2cfe6bc6c1be863b663a9}
</del><ins>+ support 4b8cfd3 {rmd160 1c03c561c6c8a0650421393857fb356330ea1926 sha256 b30899548a573968b62c109d3394f12f8ef9f79ab981f8e559ba7ab7be77e58a}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> depends_build port:autoconf \
</span></span></pre></div>
<a id="trunkdportsfuseosxfusefilespatchbuildsystemdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff (126904 => 126905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff 2014-10-17 02:29:00 UTC (rev 126904)
+++ trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff 2014-10-17 02:30:31 UTC (rev 126905)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- build.sh.orig 2013-12-21 16:40:29.000000000 +0100
-+++ build.sh 2013-12-21 16:43:01.000000000 +0100
</del><ins>+--- build.sh.orig 2014-06-09 15:41:49.000000000 -0500
++++ build.sh 2014-10-16 21:26:27.000000000 -0500
</ins><span class="cx"> @@ -12,7 +12,7 @@
</span><span class="cx"> # Beware: GNU libtool cannot handle directory names containing whitespace.
</span><span class="cx"> # Therefore, do not set M_CONF_TMPDIR to such a directory.
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> readonly M_PLISTSIGNER_TEST_KEY="`dirname $0`/prefpane/autoinstaller/TestKeys/private_key.der"
</span><span class="cx">
</span><span class="cx"> # Other constants
</span><del>-@@ -98,31 +98,31 @@
</del><ins>+@@ -104,37 +104,37 @@
</ins><span class="cx"> declare M_XCODE_VERSION_REQUIRED=""
</span><span class="cx">
</span><span class="cx"> # SDK 10.5
</span><span class="lines">@@ -46,8 +46,15 @@
</span><span class="cx"> declare M_SDK_109=""
</span><span class="cx"> declare M_SDK_109_XCODE=""
</span><span class="cx"> declare M_SDK_109_COMPILER=""
</span><del>-@@ -1841,7 +1841,7 @@
</del><span class="cx">
</span><ins>+ # SDK 10.10
+-readonly M_SDK_1010_ARCHS="i386 x86_64"
++readonly M_SDK_1010_ARCHS="@@ARCHS@@"
+ declare M_SDK_1010=""
+ declare M_SDK_1010_XCODE=""
+ declare M_SDK_1010_COMPILER=""
+@@ -1880,7 +1880,7 @@
+
</ins><span class="cx"> local ms_osxfuse_out="$M_CONF_TMPDIR/osxfuse-homebrew-$ms_os_version-$ms_osxfuse_version"
</span><span class="cx"> local ms_osxfuse_build="$ms_osxfuse_out/build/"
</span><span class="cx"> - local ms_osxfuse_root="$m_prefix"
</span><span class="lines">@@ -55,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> if [ -e "$ms_osxfuse_out" ]
</span><span class="cx"> then
</span><del>-@@ -1870,7 +1870,7 @@
</del><ins>+@@ -1906,7 +1906,7 @@
</ins><span class="cx">
</span><span class="cx"> m_log "building OSXFUSE kernel extension and tools"
</span><span class="cx">
</span><span class="lines">@@ -64,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> m_exit_on_error "xcodebuild cannot build configuration $m_configuration."
</span><span class="cx">
</span><del>-@@ -1945,7 +1945,7 @@
</del><ins>+@@ -1984,7 +1984,7 @@
</ins><span class="cx"> xcrun make -j4 >$m_stdout 2>$m_stderr
</span><span class="cx"> m_exit_on_error "make failed while compiling the OSXFUSE library."
</span><span class="cx">
</span><span class="lines">@@ -73,14 +80,12 @@
</span><span class="cx"> m_exit_on_error "cannot prepare library build for installation."
</span><span class="cx">
</span><span class="cx"> for f in "$ms_osxfuse_root"/lib/libosxfuse_i64*.dylib; do
</span><del>-@@ -2343,7 +2343,7 @@ function m_handler()
- M_XCODE50_VERSION=$m_xcode_version
</del><ins>+@@ -2387,7 +2387,7 @@
+ M_XCODE51_VERSION=$m_xcode_version
</ins><span class="cx"> fi
</span><span class="cx"> ;;
</span><del>-- 5.1*)
-+ 5.1*|[6789]*)
- m_version_compare $M_XCODE51_VERSION $m_xcode_version
</del><ins>+- 6.0*)
++ [6789]*)
+ m_version_compare $M_XCODE60_VERSION $m_xcode_version
</ins><span class="cx"> if [[ $? != 2 ]]
</span><span class="cx"> then
</span><del>-
-
</del></span></pre>
</div>
</div>
</body>
</html>