<!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>[153090] 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/153090">153090</a></dd>
<dt>Author</dt> <dd>dports@macports.org</dd>
<dt>Date</dt> <dd>2016-09-24 00:07:34 -0700 (Sat, 24 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>osxfuse: update to v3.5.0, which fixes build on Sierra & on Xcode 8.0
(#50588, #52228)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsfuseosxfusePortfile">trunk/dports/fuse/osxfuse/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/fuse/osxfuse/files/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsfuseosxfusePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/fuse/osxfuse/Portfile (153089 => 153090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/fuse/osxfuse/Portfile 2016-09-24 03:19:23 UTC (rev 153089)
+++ trunk/dports/fuse/osxfuse/Portfile 2016-09-24 07:07:34 UTC (rev 153090)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name osxfuse
</span><del>-version 2.8.2
</del><ins>+version 3.5.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories fuse devel
</span><span class="cx"> platforms macosx
</span><span class="lines">@@ -46,12 +46,12 @@
</span><span class="cx">
</span><span class="cx"> distfiles
</span><span class="cx"> set mp.dist {
</span><del>- osxfuse bf71481
- kext b6b3cbe
- framework 2ab904a
- prefpane 8ad486b
- fuse 98b9960
- support 664d8ba
</del><ins>+ osxfuse cc7d953
+ kext 7cd1ac5
+ framework 3784fac
+ prefpane 40ce5d1
+ fuse 4ff5ecf
+ support 8268f48
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> depends_build port:autoconf \
</span><span class="lines">@@ -68,31 +68,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if { $use_signed_kext } {
</span><del>- master_sites-append sourceforge:project/osxfuse/osxfuse-${version}/
</del><ins>+ master_sites-append https://github.com/osxfuse/osxfuse/releases/download/osxfuse-${version}
</ins><span class="cx"> distfiles-append ${name}-${version}.dmg
</span><span class="cx"> }
</span><span class="cx">
</span><del>-checksums osxfuse-bf71481.tar.gz \
- rmd160 121cc22174e19ecb32c6b61552c007c327be26b7 \
- sha256 b0cdfb642d2b2ed5b30d561803c875913eb27ec86a440601101d4e468eaa17c4 \
- kext-b6b3cbe.tar.gz \
- rmd160 07e2aca43b53dad2104f8306db42e082e75351ef \
- sha256 7f776c43ad15e0b1916d6ebea3d56c0b4f7c7b0beb81f28fe380099759bd2349 \
- framework-2ab904a.tar.gz \
- rmd160 af79296880d18d8f8a27803e348ff6429280f0e7 \
- sha256 1591c26d0d01311007105ab3789d43abc6e824aaee681aef8b601413dafea65e \
- prefpane-8ad486b.tar.gz \
- rmd160 c157ff7907743ab66e1ecb03106deb816aeffb70 \
- sha256 d1b6233640c77d124c7c7e97c5bc370fa8ade8b041b127b6bbc1ae4a44b8bad4 \
- fuse-98b9960.tar.gz \
- rmd160 589cbe0c819caded56dc4be64727580e1400fd9e \
- sha256 f60205e19c2971228b78d180dc65cda2a6271a567229acdeb19567fcbcebb641 \
- support-664d8ba.tar.gz \
- rmd160 d4c578037996dc5959eb8aa2097ff1ccf4f7b619 \
- sha256 84e64541e5ad1baeb70a513960349edad736da1e1ad83ef889d938a571086c58 \
- osxfuse-2.8.2.dmg \
- rmd160 eaf94873fe650584a68fd011bb6bb6195a373e91 \
- sha256 c0cc4066642136fdd4f5fead10bed2e495f636f86f451deee85dbb5aa95fa7fa
</del><ins>+checksums osxfuse-cc7d953.tar.gz \
+ rmd160 2ca7b31a4840b5e9c53d94442f688189460407df \
+ sha256 c43c6340158859d56521a75566ae0ffe832a95118a433be18068461c7694feed \
+ kext-7cd1ac5.tar.gz \
+ rmd160 c14ccc734543674c673aab23e06db8864d3f8819 \
+ sha256 c7941b2b63c3efb8e433d7e0bceeb79ef6bcd7950ca720e4d6cc4555eab80981 \
+ framework-3784fac.tar.gz \
+ rmd160 9fd00fcaf05e5daebcda2c026c0d7419f09efc1f \
+ sha256 43adbac8520267a2f757b1f16eaf39986703680795b2407c166fe191a6123c17 \
+ prefpane-40ce5d1.tar.gz \
+ rmd160 122f64bb99d7b4f12cbde72183a369b92aee244c \
+ sha256 750b093004efb6b66d3a249eb76c85b396873be76c0f3c5e569e26b7570a394f \
+ fuse-4ff5ecf.tar.gz \
+ rmd160 31ecc4df7d407d01e11b018fb95e9072245c8e4a \
+ sha256 73a71f7ef8e8755e5f41d15e20339693b9ce4df63c713f5164243ef93afdf36a \
+ support-8268f48.tar.gz \
+ rmd160 4d532893d223b004f436a9033428dbe0fe3e7057 \
+ sha256 2f33a0544861d232bf85a3c6f0ce88d4c8d6e1609d25d699076ec6e36de1fdf8 \
+ osxfuse-3.5.0.dmg \
+ rmd160 7860e737e7f3fcb6195f35676b0f32430c1e90af \
+ sha256 6d331236ee45782e404f46324a5e6d444943641d3fb62c4d84ba7fab8f4534a5
</ins><span class="cx">
</span><span class="cx"> # extract phase will just extract the dmg; post-extract will expand
</span><span class="cx"> # the tarballs
</span><span class="lines">@@ -104,8 +104,8 @@
</span><span class="cx"> post-extract {
</span><span class="cx"> # Extract the pkg and the appropriate payload from the binary dmg
</span><span class="cx"> if { $use_signed_kext } {
</span><del>- system -W ${workpath}/${name}-${version} "pkgutil --expand 'Install OSXFUSE ${branch}.pkg' ${workpath}/pkg"
- system -W ${workpath}/pkg/10.9/OSXFUSECore.pkg "gzip -dc Payload | cpio -id"
</del><ins>+ system -W ${workpath}/${name}-${version} "pkgutil --expand 'FUSE for macOS' ${workpath}/pkg"
+ system -W ${workpath}/pkg/Core.pkg "gzip -dc Payload | cpio -id"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Extract the source tarballs
</span><span class="lines">@@ -121,33 +121,27 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-buildsystem.diff \
- patch-kext-location.diff \
- patch-xcode.diff
-
-post-patch {
- reinplace "s,@@TMP@@,${workpath}/.tmp,g" ${worksrcpath}/build.sh
-
- # Only build the archs we want, not the hardcoded universal archs
- reinplace -E "s,@@ARCHS@@,[get_canonical_archs],g" ${worksrcpath}/build.sh
-
- # Inject the destroot path as the buildsystem tries to write to the prefix directly
- reinplace -E "s,@@DESTROOT@@,${destroot},g" ${worksrcpath}/build.sh
-
- # Correct the location of the kext
- reinplace -E "s,@@PREFIX@@,${prefix},g" ${worksrcpath}/kext/common/fuse_param.h
-}
-
</del><span class="cx"> use_configure no
</span><span class="cx">
</span><del>-build.cmd ./build.sh
-# Yes, they really named this target homebrew
-build.target -t homebrew
-build.args -f ${prefix}
</del><ins>+build.cmd ./build.sh -t packagemanager
+build.target -a build
+build.args -v 5 \
+ --build-directory="${workpath}" -- \
+ -a [join [get_canonical_archs] " -a "] \
+ --framework-prefix="${prefix}" \
+ --fsbundle-prefix="${prefix}" \
+ --library-prefix="${prefix}"
</ins><span class="cx">
</span><del>-# The build step already does everything
-destroot {}
</del><ins>+# Clear CPATH and LIBRARY_PATH because a ncurses include file
+# conflicts with the one in MacPorts. It doesn't matter much anyway
+# because osxfuse doesn't have any dependencies to link against.
+compiler.cpath
+compiler.library_path
</ins><span class="cx">
</span><ins>+destroot.target -a install
+destroot.args -v 5 --build-directory="${workpath}"
+destroot.destdir -- "${destroot}${prefix}"
+
</ins><span class="cx"> # Move filesystem bundle into place
</span><span class="cx"> post-destroot {
</span><span class="cx"> # Set proper permissions
</span><span class="lines">@@ -155,7 +149,7 @@
</span><span class="cx"> file attributes $f -owner root -group wheel
</span><span class="cx"> }
</span><span class="cx"> # Enable setuid on helper binary
</span><del>- file attributes ${destroot}${prefix}/Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs -permissions 04755
</del><ins>+ file attributes ${destroot}${prefix}/Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse -permissions 04755
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -169,11 +163,9 @@
</span><span class="cx"> # signed binary instead here too.
</span><span class="cx"> if { $use_signed_kext } {
</span><span class="cx"> post-destroot {
</span><del>- delete ${destroot}${prefix}/Library/Filesystems/osxfusefs.fs/Support/osxfusefs.kext \
- ${destroot}${prefix}/Library/Filesystems/osxfusefs.fs/Support/osxfusefs.kext.dSYM
-
- file copy ${workpath}/pkg/10.9/OSXFUSECore.pkg/Library/Filesystems/osxfusefs.fs/Support/osxfusefs.kext \
- ${destroot}${prefix}/Library/Filesystems/osxfusefs.fs/Support
</del><ins>+ delete ${destroot}${prefix}/Library/Filesystems/osxfuse.fs/Contents/Extensions
+ file copy ${workpath}/pkg/Core.pkg/Library/Filesystems/osxfuse.fs/Contents/Extensions \
+ ${destroot}${prefix}/Library/Filesystems/osxfuse.fs/Contents
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -181,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> notes {
</span><span class="cx"> When upgrading, unmount all FUSE filesystems and then unload the kernel extension.
</span><del>- Unloading can be done via: sudo kextunload -b com.github.osxfuse.filesystems.osxfusefs
</del><ins>+ Unloading can be done via: sudo kextunload -b com.github.osxfuse.filesystems.osxfuse
</ins><span class="cx"> Alternatively (or if this fails), just reboot your computer now.
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>