<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[32055] trunk/dports/fuse</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/32055">32055</a></dd>
<dt>Author</dt> <dd>eridius@macports.org</dd>
<dt>Date</dt> <dd>2007-12-14 11:01:31 -0800 (Fri, 14 Dec 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the message takanori made of my MacFUSE portfiles.
In the future, please don't make changes to my Portfiles without telling me</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsfusefusefsPortfile">trunk/dports/fuse/fusefs/Portfile</a></li>
<li><a href="#trunkdportsfuselibfusePortfile">trunk/dports/fuse/libfuse/Portfile</a></li>
<li><a href="#trunkdportsfusesshfsPortfile">trunk/dports/fuse/sshfs/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsfusefusefsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/fuse/fusefs/Portfile (32054 => 32055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/fuse/fusefs/Portfile 2007-12-14 19:00:02 UTC (rev 32054)
+++ trunk/dports/fuse/fusefs/Portfile 2007-12-14 19:01:31 UTC (rev 32055)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name fusefs
</span><span class="cx"> version 1.1
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories fuse devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers eridius@macports.org
</span><span class="lines">@@ -19,21 +19,14 @@
</span><span class="cx">
</span><span class="cx"> homepage http://code.google.com/p/macfuse/
</span><span class="cx"> master_sites macports
</span><del>-distname macfuse-${version}
-checksums md5 42487d7684b1f9a8eb2f8a61b10f7913 \
- sha1 6347e5b6b0f810a3e5b0fbc82cbccfdf3f4c6311
</del><ins>+distname fusefs-${version}
+worksrcdir fusefs
+checksums md5 e34f44bcbb43a370a0ef204054276ae4 \
+ sha1 776a7cf88c82bf63a8f086f086d06fb08a60c860
</ins><span class="cx">
</span><del>-platform darwin 8 {}
</del><ins>+livecheck.distname MacFUSE-Core-(.*).dmg
+livecheck.version 10.5-${version}.1
</ins><span class="cx">
</span><del>-if {[variant_isset darwin_8]} {
- set product_version 10.4
-} else {
- set product_version 10.5
-}
-
-worksrcdir ${distname}/core/${product_version}/${name}
-livecheck.distname MacFUSE-Core-${product_version}-(.*).dmg
-
</del><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><span class="cx"> destroot.violate_mtree yes
</span><span class="lines">@@ -42,17 +35,18 @@
</span><span class="cx"> xcode.target fusefs load_fusefs fusefs.fs mount_fusefs
</span><span class="cx"> xcode.build.settings OBJROOT=build/ SYMROOT=build/
</span><span class="cx">
</span><del>-# ensure that user is running OS X 10.4
</del><ins>+platform darwin 8 {
+ worksrcdir fusefs/10.4
+}
+
+platform darwin 9 {
+ worksrcdir fusefs/10.5
+}
+
+# ensure that user is running OS X 10.4 or higher
</ins><span class="cx"> pre-fetch {
</span><del>- if {${os.platform} == "darwin"} {
- set vers [split [exec sw_vers -productVersion] .]
- set majorVersion [lindex $vers 0]
- set minorVersion [lindex $vers 1]
- if {"$majorVersion.$minorVersion" < 10.4} {
- return -code error "MacFUSE requires at least Mac OS X 10.4 to run"
- }
- } else {
- return -code error "MacFUSE is for Mac OS X only"
</del><ins>+ if {![variant_isset darwin_8] && ![variant_isset darwin_9]} {
+ return -code error "MacFUSE requires at least Mac OS X 10.4 to run"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -85,6 +79,11 @@
</span><span class="cx"> fs-traverse file [list ${macfuse_bundle_dir}] {
</span><span class="cx"> file attributes $file -owner root -group wheel
</span><span class="cx"> }
</span><ins>+
+ # copy header files that libfuse needs
+ foreach file [list fuse_ioctl.h fuse_mount.h fuse_param.h fuse_version.h] {
+ file copy -- ${worksrcpath}/common/${file} ${destroot}${prefix}/include/${file}
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-activate {
</span></span></pre></div>
<a id="trunkdportsfuselibfusePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/fuse/libfuse/Portfile (32054 => 32055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/fuse/libfuse/Portfile 2007-12-14 19:00:02 UTC (rev 32054)
+++ trunk/dports/fuse/libfuse/Portfile 2007-12-14 19:01:31 UTC (rev 32055)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name libfuse
</span><span class="cx"> version 2.7.1
</span><del>-revision 2
-set macfuse_version 1.1
</del><ins>+revision 3
</ins><span class="cx"> categories fuse devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers eridius@macports.org
</span><span class="lines">@@ -14,46 +13,74 @@
</span><span class="cx">
</span><span class="cx"> homepage http://fuse.sourceforge.net/
</span><span class="cx">
</span><del>-master_sites macports:fusefs
-distname macfuse-${macfuse_version}
-dist_subdir fusefs
-checksums md5 42487d7684b1f9a8eb2f8a61b10f7913 \
- sha1 6347e5b6b0f810a3e5b0fbc82cbccfdf3f4c6311
</del><ins>+distname fuse-${version}
+master_sites sourceforge:fuse
+checksums ${distfiles} md5 f95b4a238a3df5a92e9013ecb55c2c17 \
+ sha1 ea28a61ff63cd0cf12cd7c9c092a57d79c12edf8
</ins><span class="cx">
</span><del>-platform darwin 8 {}
</del><ins>+livecheck.distname fuse-2.X
</ins><span class="cx">
</span><del>-if {[variant_isset darwin_8]} {
- set product_version 10.4
-} else {
- set product_version 10.5
</del><ins>+depends_lib port:pkgconfig
+
+platform darwin {
+ depends_run port:fusefs
+ if {[variant_isset darwin_8]} {
+ patch_sites http://macfuse.googlecode.com/svn/tags/macfuse-1.1/core/10.4/libfuse/
+ checksums-append fuse-2.7.1-macosx.patch md5 36b116114c04f8e7c65a5c8aad753573 \
+ sha1 5cb3440a73b2634e18f76263c35044e58b0daaa5
+ } else {
+ patch_sites http://macfuse.googlecode.com/svn/tags/macfuse-1.1/core/10.5/libfuse/
+ checksums-append fuse-2.7.1-macosx.patch md5 85f1654ae01064ef1c398dbfde1a3f53 \
+ sha1 24d735331ec897c77e19203d3d38ab55ae56f292
+
+ }
+ patchfiles fuse-2.7.1-macosx.patch
+
+ configure.post_args-append CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L"
+
+ # override patch.pre_args since it defaults to -p0
+ patch.pre_args -p1
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-worksrcdir ${distname}/core/${product_version}/${name}/fuse-${version}
-
-#livecheck.distname fuse-2.X
-
-use_bzip2 yes
-
-depends_lib port:pkgconfig
-depends_run port:fusefs
-
</del><span class="cx"> pre-fetch {
</span><span class="cx"> # LibFUSE currently only works on OS X
</span><span class="cx"> # so error out if attempting to install elsewhere
</span><del>- if {${os.platform} != "darwin"} {
</del><ins>+ if {![variant_isset darwin]} {
</ins><span class="cx"> return -code error "LibFUSE is only supported for Mac OS X"
</span><span class="cx"> }
</span><ins>+
+ if {[variant_isset darwin]} {
+ patch_checksum
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-post-extract {
- system "cd ${workpath}/${distname}/core/${product_version}/${name} && gzip -dc fuse-current.tar.gz | tar --no-same-owner -xf -"
- system "cd ${worksrcpath} && patch -p1 < ../fuse-current-macosx.patch"
-}
-
-patch {
- reinplace "s|--prefix=/usr/local|--prefix=${prefix}|" ${worksrcpath}/darwin_configure.sh
-}
-
-configure {
- system "cd ${worksrcpath} && /bin/sh ./darwin_configure.sh ${workpath}/${distname}/core/${product_version}/fusefs"
-}
</del><ins>+proc patch_checksum {} {
+ global checksums_array UI_PREFIX
+ # assume we only have one patchfile, because at the moment that's true
+ set patchfile [option patchfiles]
+ # do our own checksumming of an existing $patchfile because URL changes between revisions
+ # if the checksum fails, delete the patchfile
+ # a lot of this code is copied from checksum_main
+ # Eventually this technique should be replaced with a patchfile dist subdir
+ if {[file exists [option distpath]/$patchfile]} {
+ ui_info "$UI_PREFIX $patchfile exists, checksumming to detect URL change"
+ if {[parse_checksums [option checksums]] == "yes"} {
+ ui_info "$UI_PREFIX [format [msgcat::mc "Checksumming %s"] $patchfile]"
+ set fullpath [file join [option distpath] $patchfile]
+ if {[info exists checksums_array($patchfile)]} {
+ set checksums $checksums_array($patchfile)
+
+ foreach {type sum} $checksums {
+ set calculated_sum [calc_$type $fullpath]
+ if {![string equal $sum $calculated_sum]} {
+ ui_debug "Checksum mismatch for $patchfile"
+ delete $fullpath
+ break
+ }
+ }
+ }
+ } else {
+ return -code error "Unable to parse checksum string"
+ }
+ }
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkdportsfusesshfsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/fuse/sshfs/Portfile (32054 => 32055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/fuse/sshfs/Portfile 2007-12-14 19:00:02 UTC (rev 32054)
+++ trunk/dports/fuse/sshfs/Portfile 2007-12-14 19:01:31 UTC (rev 32055)
</span><span class="lines">@@ -5,7 +5,6 @@
</span><span class="cx"> name sshfs
</span><span class="cx"> version 1.8
</span><span class="cx"> revision 2
</span><del>-set macfuse_version 1.1
</del><span class="cx"> categories fuse
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers eridius@macports.org
</span><span class="lines">@@ -39,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><span class="cx"> depends_run port:fusefs
</span><del>- patch_sites http://macfuse.googlecode.com/svn/tags/macfuse-${macfuse_version}/filesystems/sshfs
</del><ins>+ patch_sites http://macfuse.googlecode.com/svn/tags/macfuse-1.1/filesystems/sshfs
</ins><span class="cx"> patchfiles sshfs-fuse-${version}-macosx.patch
</span><span class="cx"> checksums-append sshfs-fuse-${version}-macosx.patch md5 5d3cec641c22e89dd840c6bbc3af89d4 \
</span><span class="cx"> sha1 79f058e0ae4b90ec09d50ab39401773d146bdf95
</span></span></pre>
</div>
</div>
</body>
</html>