[153090] trunk/dports/fuse/osxfuse

dports at macports.org dports at macports.org
Sat Sep 24 00:07:34 PDT 2016


Revision: 153090
          https://trac.macports.org/changeset/153090
Author:   dports at macports.org
Date:     2016-09-24 00:07:34 -0700 (Sat, 24 Sep 2016)
Log Message:
-----------
osxfuse: update to v3.5.0, which fixes build on Sierra & on Xcode 8.0
(#50588, #52228)

Modified Paths:
--------------
    trunk/dports/fuse/osxfuse/Portfile

Removed Paths:
-------------
    trunk/dports/fuse/osxfuse/files/

Modified: trunk/dports/fuse/osxfuse/Portfile
===================================================================
--- 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)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                osxfuse
-version             2.8.2
+version             3.5.0
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          fuse devel
 platforms           macosx
@@ -46,12 +46,12 @@
 
 distfiles
 set mp.dist {
-    osxfuse     bf71481
-    kext        b6b3cbe
-    framework   2ab904a
-    prefpane    8ad486b
-    fuse        98b9960
-    support     664d8ba
+    osxfuse     cc7d953
+    kext        7cd1ac5
+    framework   3784fac
+    prefpane    40ce5d1
+    fuse        4ff5ecf
+    support     8268f48
 }
 
 depends_build       port:autoconf \
@@ -68,31 +68,31 @@
 }
 
 if { $use_signed_kext } {
-    master_sites-append sourceforge:project/osxfuse/osxfuse-${version}/
+    master_sites-append https://github.com/osxfuse/osxfuse/releases/download/osxfuse-${version}
     distfiles-append ${name}-${version}.dmg
 }
 
-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
+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
 
 # extract phase will just extract the dmg; post-extract will expand
 # the tarballs
@@ -104,8 +104,8 @@
 post-extract {
     # Extract the pkg and the appropriate payload from the binary dmg
     if { $use_signed_kext } {
-        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"
+        system -W ${workpath}/${name}-${version} "pkgutil --expand 'FUSE for macOS' ${workpath}/pkg"
+        system -W ${workpath}/pkg/Core.pkg "gzip -dc Payload | cpio -id"
     }
 
     # Extract the source tarballs
@@ -121,33 +121,27 @@
     }
 }
 
-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
-}
-
 use_configure   no
 
-build.cmd       ./build.sh
-# Yes, they really named this target homebrew
-build.target    -t homebrew
-build.args      -f ${prefix}
+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}" 
 
-# The build step already does everything
-destroot {}
+# 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
 
+destroot.target -a install
+destroot.args   -v 5 --build-directory="${workpath}"
+destroot.destdir -- "${destroot}${prefix}"
+
 # Move filesystem bundle into place
 post-destroot {
     # Set proper permissions
@@ -155,7 +149,7 @@
         file attributes $f -owner root -group wheel
     }
     # Enable setuid on helper binary
-    file attributes ${destroot}${prefix}/Library/Filesystems/osxfusefs.fs/Support/load_osxfusefs -permissions 04755
+    file attributes ${destroot}${prefix}/Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse -permissions 04755
 }
 
 
@@ -169,11 +163,9 @@
 # signed binary instead here too.
 if { $use_signed_kext } {
     post-destroot {
-        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
+        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
     }
 }
 
@@ -181,7 +173,7 @@
 
 notes {
     When upgrading, unmount all FUSE filesystems and then unload the kernel extension.
-    Unloading can be done via: sudo kextunload -b com.github.osxfuse.filesystems.osxfusefs
+    Unloading can be done via: sudo kextunload -b com.github.osxfuse.filesystems.osxfuse
     Alternatively (or if this fails), just reboot your computer now.
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160924/857148e3/attachment-0001.html>


More information about the macports-changes mailing list