[131918] trunk/dports/fuse/osxfuse
dports at macports.org
dports at macports.org
Tue Jan 20 15:52:10 PST 2015
Revision: 131918
https://trac.macports.org/changeset/131918
Author: dports at macports.org
Date: 2015-01-20 15:52:10 -0800 (Tue, 20 Jan 2015)
Log Message:
-----------
osxfuse: update to v2.7.4 (#46526); don't extract dmg when it's not
used (#46525; fixes build error on 10.5); fix build on PPC (#45794)
Modified Paths:
--------------
trunk/dports/fuse/osxfuse/Portfile
trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff
Modified: trunk/dports/fuse/osxfuse/Portfile
===================================================================
--- trunk/dports/fuse/osxfuse/Portfile 2015-01-20 23:26:23 UTC (rev 131917)
+++ trunk/dports/fuse/osxfuse/Portfile 2015-01-20 23:52:10 UTC (rev 131918)
@@ -4,8 +4,7 @@
PortSystem 1.0
name osxfuse
-version 2.7.3
-revision 1
+version 2.7.4
set branch [join [lrange [split ${version} .] 0 1] .]
categories fuse devel
platforms macosx
@@ -27,6 +26,15 @@
livecheck.url ${homepage}
livecheck.regex "[quotemeta [string toupper ${name}]] (\\d+(?:\\.\\d+)*)"
+# Use the published signed kext for OS 10.9 (Darwin 13) and later.
+# Don't even fetch and extract the dmg unnecessarily, since the commands don't
+# work on some earlier OS versions.
+if {${os.major} >= 13} {
+ set use_signed_kext yes
+} else {
+ set use_signed_kext no
+}
+
# We will build user-space components for the specified arch, and
# kernel modules for the kernel arch.
set kernel_arch [exec uname -m]
@@ -38,10 +46,10 @@
distfiles
set mp.dist {
- osxfuse d59bddc
- kext a264485
- framework dc53dea
- prefpane a30fa57
+ osxfuse 76b3a54
+ kext c30faa5
+ framework 2ab904a
+ prefpane f43c235
fuse 98b9960
support 4868d64
}
@@ -59,44 +67,52 @@
distfiles-append ${f}:${mp.comp}
}
-master_sites-append sourceforge
-distfiles-append ${name}-${version}.dmg
+if { $use_signed_kext } {
+ master_sites-append sourceforge
+ distfiles-append ${name}-${version}.dmg
+}
-checksums osxfuse-d59bddc.tar.gz \
- rmd160 b703a9bedf7aa73c97abaa5e2b4125db0feb33c2 \
- sha256 6acf5c456f96fedc397e5ef617124547bd0e291d96816b1c722ef995bc077672 \
- kext-a264485.tar.gz \
- rmd160 776e6f903870f2c82497d21e68a3371472423c3a \
- sha256 fa7e70685373302fbfd6c9e419af1262c9cec427b157a52e6f945b7031e04a2b \
- framework-dc53dea.tar.gz \
- rmd160 a25bfda1f77f43b7c90655b73ac913f2fa5b515b \
- sha256 ca0f7addb831b9d845ce6fddc12f32e1d7d51fa3756ca7d9f41d3e4718b8a75b \
- prefpane-a30fa57.tar.gz \
- rmd160 0bf0698bfcb0946bdba2dee308c94c373fc91f6a \
- sha256 03fe8681ded02dee1ab690d518dc8bdb5c58647024a77ef69701c2fcb8b4ce2a \
+checksums osxfuse-76b3a54.tar.gz \
+ rmd160 54fd7353b7cd03ed025fd178ff5b56bb5d39003d \
+ sha256 43d6319498e978636e792a92451f28773549dcaf0b50213dcebea2d5fa728ef2 \
+ kext-c30faa5.tar.gz \
+ rmd160 082bc07e158b2d0737f0dabe7ffc9fbf924f16ed \
+ sha256 4605609208824c297bb5e04cf61f5402204f6bc2d74d1b4b13b90a589cbc4c13 \
+ framework-2ab904a.tar.gz \
+ rmd160 af79296880d18d8f8a27803e348ff6429280f0e7 \
+ sha256 1591c26d0d01311007105ab3789d43abc6e824aaee681aef8b601413dafea65e \
+ prefpane-f43c235.tar.gz \
+ rmd160 94178a3c1fde34ee6be8f5516a640bb3d2f6a29a \
+ sha256 1de3f51eb0497a1b298427a96562beb89c55d38fdf298a69823fcf98d0c70b49 \
fuse-98b9960.tar.gz \
rmd160 589cbe0c819caded56dc4be64727580e1400fd9e \
sha256 f60205e19c2971228b78d180dc65cda2a6271a567229acdeb19567fcbcebb641 \
support-4868d64.tar.gz \
rmd160 d321d49bc3040a3227143204b57d6361eb67a9ed \
sha256 d6cd13707f0f202b2c2391b5410decf1776d1306180da8164c02e5fcf6ba8b43 \
- osxfuse-2.7.3.dmg \
- rmd160 f7b91f7750a69da97d72cf6d7ac65b4bd27408c4 \
- sha256 88d0594e46191aeafa259535398d25c4ccfa03c178e10d925a69e4dcb6293fa2
+ osxfuse-2.7.4.dmg \
+ rmd160 4ea200bac47cff694aae60b14147ae94dfb5412f \
+ sha256 e5f43f673062725d76b6c10d379d576f6148f32fab42f6d18455b11f41e92969
# extract phase will just extract the dmg; post-extract will expand
# the tarballs
-use_dmg yes
-extract.only ${name}-${version}.dmg
+if { $use_signed_kext } {
+ use_dmg yes
+ extract.only ${name}-${version}.dmg
+}
post-extract {
# Extract the pkg and the appropriate payload from the binary dmg
- 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"
+ 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"
+ }
# Extract the source tarballs
foreach { mp.comp mp.rev } ${mp.dist} {
- system -W ${workpath} "tar -xvf ${distpath}/${mp.comp}-${mp.rev}.tar.gz"
+ if { $use_signed_kext } {
+ system -W ${workpath} "tar -xvf ${distpath}/${mp.comp}-${mp.rev}.tar.gz"
+ }
if {${mp.comp} ne "osxfuse"} {
# Replace existing empty directory if it exists
file delete ${workpath}/${worksrcdir}/${mp.comp}
@@ -116,7 +132,6 @@
# Only build the archs we want, not the hardcoded universal archs
reinplace -E "s,@@ARCHS@@,[get_canonical_archs],g" ${worksrcpath}/build.sh
- reinplace -E "s,@@KERNELARCHS@@,${kernel_arch},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
@@ -154,7 +169,7 @@
# Unlike newer versions, Mavericks does not require the kext to be
# signed, but will display a warning if it's unsigned -- so use the
# signed binary instead here too.
-if {${os.major} >= 13} {
+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
Modified: trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff
===================================================================
--- trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff 2015-01-20 23:26:23 UTC (rev 131917)
+++ trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff 2015-01-20 23:52:10 UTC (rev 131918)
@@ -62,15 +62,6 @@
if [ -e "$ms_osxfuse_out" ]
then
-@@ -1906,7 +1906,7 @@
-
- m_log "building OSXFUSE kernel extension and tools"
-
-- xcodebuild -configuration "$m_configuration" -target All GCC_VERSION="$m_compiler" ARCHS="$m_archs" SDKROOT="$m_usdk_dir" MACOSX_DEPLOYMENT_TARGET="$m_platform" >$m_stdout 2>$m_stderr
-+ xcodebuild -configuration "$m_configuration" -target All GCC_VERSION="$m_compiler" ARCHS="@@KERNELARCHS@@" SDKROOT="$m_usdk_dir" MACOSX_DEPLOYMENT_TARGET="$m_platform" >$m_stdout 2>$m_stderr
-
- m_exit_on_error "xcodebuild cannot build configuration $m_configuration."
-
@@ -1984,7 +1984,7 @@
xcrun make -j4 >$m_stdout 2>$m_stderr
m_exit_on_error "make failed while compiling the OSXFUSE library."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150120/c9e3d02d/attachment-0001.html>
More information about the macports-changes
mailing list