[126905] trunk/dports/fuse/osxfuse

[ryandesign at macports.org]

Revision: 126905
          https://trac.macports.org/changeset/126905
Author:   ryandesign at macports.org
Date:     2014-10-16 19:30:31 -0700 (Thu, 16 Oct 2014)
Log Message:
-----------
osxfuse: update to 2.7.0 to fix build on Yosemite (#44189)

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	2014-10-17 02:29:00 UTC (rev 126904)
+++ trunk/dports/fuse/osxfuse/Portfile	2014-10-17 02:30:31 UTC (rev 126905)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                osxfuse
-version             2.6.4
-revision            1
+version             2.7.0
 categories          fuse devel
 platforms           macosx
 license             BSD APSL
@@ -37,12 +36,12 @@
 
 distfiles
 set mp.dist {
-    osxfuse     7b0d8d3   {rmd160 05a8896c7cd738966da1f3f18e8a17723b140dff sha256 bba529834f61fe79be00b4a6298f40a86dd8170f91979c4eeaf9378a1ce067cd}
-    kext        c59029c   {rmd160 a19f4d8b0f4a4660b614e1716f21db749677444c sha256 77205fce0f289c3473d3621ca612cb33d86ebf4ea932712661c9527f91013bae}
+    osxfuse     8eb90a2   {rmd160 563f74f3e17caa644be3f01290f4587aea164a56 sha256 82ad7fe7c2b1c31ef522186f0761fb3ab2817027e5dd5cbe85be690f70e846b1}
+    kext        122937c   {rmd160 b912555b99c832a1a6d2cad9d0b6c667e906c8b5 sha256 723b89ac3c52eea2ed3eeb02fc838886e6d4bce29c605761413d89085a03778e}
     framework   9fdde8a   {rmd160 4124b3e9c396ee41dfce35d480caff41936b8000 sha256 9dd705e05de0b346000853c08c143a15d73673684afcc9bbcf55e6c71b33fb87}
-    prefpane    8c3ea24   {rmd160 08376d5848025074b4a4feee3d5ed99bc456dfeb sha256 a6a4c5397d7faf9a3f068ddf409e8afc19292a03db0b094bbd144d5c64757118}
+    prefpane    99d92a5   {rmd160 04706b6e84b8a2ac2a430b53c66c38f34af92b3f sha256 9d8d2990c0f72e1953f1506f9d84bc18299f4b8b9f691c3ecdc4a98b5a81d20b}
     fuse        98b9960   {rmd160 589cbe0c819caded56dc4be64727580e1400fd9e sha256 f60205e19c2971228b78d180dc65cda2a6271a567229acdeb19567fcbcebb641}
-    support     1213520   {rmd160 1f774cd0d5273c02716a533463c1d374c793dfc1 sha256 57ccf15e451c132874664c00990c2df12d0dced32ba2cfe6bc6c1be863b663a9}
+    support     4b8cfd3   {rmd160 1c03c561c6c8a0650421393857fb356330ea1926 sha256 b30899548a573968b62c109d3394f12f8ef9f79ab981f8e559ba7ab7be77e58a}
 }
 
 depends_build       port:autoconf \

Modified: trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- build.sh.orig	2013-12-21 16:40:29.000000000 +0100
-+++ build.sh	2013-12-21 16:43:01.000000000 +0100
+--- build.sh.orig	2014-06-09 15:41:49.000000000 -0500
++++ build.sh	2014-10-16 21:26:27.000000000 -0500
 @@ -12,7 +12,7 @@
  # Beware: GNU libtool cannot handle directory names containing whitespace.
  #         Therefore, do not set M_CONF_TMPDIR to such a directory.
@@ -9,7 +9,7 @@
  readonly M_PLISTSIGNER_TEST_KEY="`dirname $0`/prefpane/autoinstaller/TestKeys/private_key.der"
  
  # Other constants
-@@ -98,31 +98,31 @@
+@@ -104,37 +104,37 @@
  declare M_XCODE_VERSION_REQUIRED=""
  
  # SDK 10.5
@@ -46,8 +46,15 @@
  declare M_SDK_109=""
  declare M_SDK_109_XCODE=""
  declare M_SDK_109_COMPILER=""
-@@ -1841,7 +1841,7 @@
  
+ # 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 @@
+ 
      local ms_osxfuse_out="$M_CONF_TMPDIR/osxfuse-homebrew-$ms_os_version-$ms_osxfuse_version"
      local ms_osxfuse_build="$ms_osxfuse_out/build/"
 -    local ms_osxfuse_root="$m_prefix"
@@ -55,7 +62,7 @@
  
      if [ -e "$ms_osxfuse_out" ]
      then
-@@ -1870,7 +1870,7 @@
+@@ -1906,7 +1906,7 @@
  
      m_log "building OSXFUSE kernel extension and tools"
  
@@ -64,7 +71,7 @@
  
      m_exit_on_error "xcodebuild cannot build configuration $m_configuration."
  
-@@ -1945,7 +1945,7 @@
+@@ -1984,7 +1984,7 @@
      xcrun make -j4 >$m_stdout 2>$m_stderr
      m_exit_on_error "make failed while compiling the OSXFUSE library."
  
@@ -73,14 +80,12 @@
      m_exit_on_error "cannot prepare library build for installation."
  
      for f in "$ms_osxfuse_root"/lib/libosxfuse_i64*.dylib; do
-@@ -2343,7 +2343,7 @@ function m_handler()
-                     M_XCODE50_VERSION=$m_xcode_version
+@@ -2387,7 +2387,7 @@
+                     M_XCODE51_VERSION=$m_xcode_version
                  fi
                  ;;
--            5.1*)
-+            5.1*|[6789]*)
-                 m_version_compare $M_XCODE51_VERSION $m_xcode_version
+-            6.0*)
++            [6789]*)
+                 m_version_compare $M_XCODE60_VERSION $m_xcode_version
                  if [[ $? != 2 ]]
                  then
-
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141016/acb7920d/attachment-0001.html>