Re: [32055] trunk/dports/fuse
In the future, please don't make changes to my Portfiles without telling me
Before committing this change I certainly opened Ticket #13185 and cc'd you. So I guess you probably overlooked my mail. Anyway, sorry if I made you feel bad. On Dec 15, 2007, at 4:01 AM, eridius@macports.org wrote:
Revision 32055 Author eridius@macports.org Date 2007-12-14 11:01:31 -0800 (Fri, 14 Dec 2007) Log Message
Fix the message takanori made of my MacFUSE portfiles. In the future, please don't make changes to my Portfiles without telling me Modified Paths
trunk/dports/fuse/fusefs/Portfile trunk/dports/fuse/libfuse/Portfile trunk/dports/fuse/sshfs/Portfile Diff
Modified: trunk/dports/fuse/fusefs/Portfile (32054 => 32055) --- 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) @@ -5,7 +5,7 @@
name fusefs version 1.1 -revision 2 +revision 3 categories fuse devel platforms darwin maintainers eridius@macports.org @@ -19,21 +19,14 @@
homepage http://code.google.com/p/macfuse/ master_sites macports -distname macfuse-${version} -checksums md5 42487d7684b1f9a8eb2f8a61b10f7913 \ - sha1 6347e5b6b0f810a3e5b0fbc82cbccfdf3f4c6311 +distname fusefs-${version} +worksrcdir fusefs +checksums md5 e34f44bcbb43a370a0ef204054276ae4 \ + sha1 776a7cf88c82bf63a8f086f086d06fb08a60c860
-platform darwin 8 {} +livecheck.distname MacFUSE-Core-(.*).dmg +livecheck.version 10.5-${version}.1
-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 - use_bzip2 yes
destroot.violate_mtree yes @@ -42,17 +35,18 @@ xcode.target fusefs load_fusefs fusefs.fs mount_fusefs xcode.build.settings OBJROOT=build/ SYMROOT=build/
-# ensure that user is running OS X 10.4 +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 pre-fetch { - 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" + if {![variant_isset darwin_8] && ![variant_isset darwin_9]} { + return -code error "MacFUSE requires at least Mac OS X 10.4 to run" } }
@@ -85,6 +79,11 @@ fs-traverse file [list ${macfuse_bundle_dir}] { file attributes $file -owner root -group wheel } + + # 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} + } }
post-activate { Modified: trunk/dports/fuse/libfuse/Portfile (32054 => 32055) --- 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) @@ -4,8 +4,7 @@
name libfuse version 2.7.1 -revision 2 -set macfuse_version 1.1 +revision 3 categories fuse devel platforms darwin maintainers eridius@macports.org @@ -14,46 +13,74 @@
homepage http://fuse.sourceforge.net/
-master_sites macports:fusefs -distname macfuse-${macfuse_version} -dist_subdir fusefs -checksums md5 42487d7684b1f9a8eb2f8a61b10f7913 \ - sha1 6347e5b6b0f810a3e5b0fbc82cbccfdf3f4c6311 +distname fuse-${version} +master_sites sourceforge:fuse +checksums ${distfiles} md5 f95b4a238a3df5a92e9013ecb55c2c17 \ + sha1 ea28a61ff63cd0cf12cd7c9c092a57d79c12edf8
-platform darwin 8 {} +livecheck.distname fuse-2.X
-if {[variant_isset darwin_8]} { - set product_version 10.4 -} else { - set product_version 10.5 +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 }
-worksrcdir ${distname}/core/${product_version}/${name}/ fuse-${version} - -#livecheck.distname fuse-2.X - -use_bzip2 yes - -depends_lib port:pkgconfig -depends_run port:fusefs - pre-fetch { # LibFUSE currently only works on OS X # so error out if attempting to install elsewhere - if {${os.platform} != "darwin"} { + if {![variant_isset darwin]} { return -code error "LibFUSE is only supported for Mac OS X" } + + if {[variant_isset darwin]} { + patch_checksum + } }
-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" -} +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" + } + } +} \ No newline at end of file Modified: trunk/dports/fuse/sshfs/Portfile (32054 => 32055) --- 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) @@ -5,7 +5,6 @@ name sshfs version 1.8 revision 2 -set macfuse_version 1.1 categories fuse platforms darwin maintainers eridius@macports.org @@ -39,7 +38,7 @@
platform darwin { depends_run port:fusefs - patch_sites http://macfuse.googlecode.com/svn/tags/macfuse-$ {macfuse_version}/filesystems/sshfs + patch_sites http://macfuse.googlecode.com/svn/tags/macfuse-1.1/filesystems/sshfs patchfiles sshfs-fuse-${version}-macosx.patch checksums-append sshfs-fuse-${version}-macosx.patch md5 5d3cec641c22e89dd840c6bbc3af89d4 \ sha1 79f058e0ae4b90ec09d50ab39401773d146bdf95 _______________________________________________ macports-changes mailing list macports-changes@lists.macosforge.org http://lists.macosforge.org/mailman/listinfo/macports-changes
I did not know that ticket was open, since Trac's email has always been a bit suspect - right now it apparently emails the dev list for every ticket, which means my mail client can't seem to separate my tickets from everyone else's. Anyway, I've received a bunch of emails over the past few weeks of people getting strange errors trying to install MacFUSE and I never knew what caused them until today, when I discovered you'd updated my ports. Next time please email me directly rather than relying on Trac's fickle email. -Kevin Ballard On Dec 14, 2007, at 4:30 PM, Yamamoto Takanori wrote:
In the future, please don't make changes to my Portfiles without telling me
Before committing this change I certainly opened Ticket #13185 and cc'd you. So I guess you probably overlooked my mail.
Anyway, sorry if I made you feel bad.
On Dec 15, 2007, at 4:01 AM, eridius@macports.org wrote:
Revision 32055 Author eridius@macports.org Date 2007-12-14 11:01:31 -0800 (Fri, 14 Dec 2007) Log Message
Fix the message takanori made of my MacFUSE portfiles. In the future, please don't make changes to my Portfiles without telling me Modified Paths
trunk/dports/fuse/fusefs/Portfile trunk/dports/fuse/libfuse/Portfile trunk/dports/fuse/sshfs/Portfile Diff
Modified: trunk/dports/fuse/fusefs/Portfile (32054 => 32055) --- 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) @@ -5,7 +5,7 @@
name fusefs version 1.1 -revision 2 +revision 3 categories fuse devel platforms darwin maintainers eridius@macports.org @@ -19,21 +19,14 @@
homepage http://code.google.com/p/macfuse/ master_sites macports -distname macfuse-${version} -checksums md5 42487d7684b1f9a8eb2f8a61b10f7913 \ - sha1 6347e5b6b0f810a3e5b0fbc82cbccfdf3f4c6311 +distname fusefs-${version} +worksrcdir fusefs +checksums md5 e34f44bcbb43a370a0ef204054276ae4 \ + sha1 776a7cf88c82bf63a8f086f086d06fb08a60c860
-platform darwin 8 {} +livecheck.distname MacFUSE-Core-(.*).dmg +livecheck.version 10.5-${version}.1
-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 - use_bzip2 yes
destroot.violate_mtree yes @@ -42,17 +35,18 @@ xcode.target fusefs load_fusefs fusefs.fs mount_fusefs xcode.build.settings OBJROOT=build/ SYMROOT=build/
-# ensure that user is running OS X 10.4 +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 pre-fetch { - 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" + if {![variant_isset darwin_8] && ![variant_isset darwin_9]} { + return -code error "MacFUSE requires at least Mac OS X 10.4 to run" } }
@@ -85,6 +79,11 @@ fs-traverse file [list ${macfuse_bundle_dir}] { file attributes $file -owner root -group wheel } + + # 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} + } }
post-activate { Modified: trunk/dports/fuse/libfuse/Portfile (32054 => 32055) --- 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) @@ -4,8 +4,7 @@
name libfuse version 2.7.1 -revision 2 -set macfuse_version 1.1 +revision 3 categories fuse devel platforms darwin maintainers eridius@macports.org @@ -14,46 +13,74 @@
homepage http://fuse.sourceforge.net/
-master_sites macports:fusefs -distname macfuse-${macfuse_version} -dist_subdir fusefs -checksums md5 42487d7684b1f9a8eb2f8a61b10f7913 \ - sha1 6347e5b6b0f810a3e5b0fbc82cbccfdf3f4c6311 +distname fuse-${version} +master_sites sourceforge:fuse +checksums ${distfiles} md5 f95b4a238a3df5a92e9013ecb55c2c17 \ + sha1 ea28a61ff63cd0cf12cd7c9c092a57d79c12edf8
-platform darwin 8 {} +livecheck.distname fuse-2.X
-if {[variant_isset darwin_8]} { - set product_version 10.4 -} else { - set product_version 10.5 +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 }
-worksrcdir ${distname}/core/${product_version}/${name}/ fuse-${version} - -#livecheck.distname fuse-2.X - -use_bzip2 yes - -depends_lib port:pkgconfig -depends_run port:fusefs - pre-fetch { # LibFUSE currently only works on OS X # so error out if attempting to install elsewhere - if {${os.platform} != "darwin"} { + if {![variant_isset darwin]} { return -code error "LibFUSE is only supported for Mac OS X" } + + if {[variant_isset darwin]} { + patch_checksum + } }
-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" -} +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" + } + } +} \ No newline at end of file Modified: trunk/dports/fuse/sshfs/Portfile (32054 => 32055) --- 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) @@ -5,7 +5,6 @@ name sshfs version 1.8 revision 2 -set macfuse_version 1.1 categories fuse platforms darwin maintainers eridius@macports.org @@ -39,7 +38,7 @@
platform darwin { depends_run port:fusefs - patch_sites http://macfuse.googlecode.com/svn/tags/macfuse-$ {macfuse_version}/filesystems/sshfs + patch_sites http://macfuse.googlecode.com/svn/tags/macfuse-1.1/filesystems/sshfs patchfiles sshfs-fuse-${version}-macosx.patch checksums-append sshfs-fuse-${version}-macosx.patch md5 5d3cec641c22e89dd840c6bbc3af89d4 \ sha1 79f058e0ae4b90ec09d50ab39401773d146bdf95 _______________________________________________ macports-changes mailing list macports-changes@lists.macosforge.org http://lists.macosforge.org/mailman/listinfo/macports-changes
-- Kevin Ballard http://kevin.sb.org eridius@macports.org http://www.tildesoft.com
Kevin Ballard wrote:
I did not know that ticket was open, since Trac's email has always been a bit suspect - right now it apparently emails the dev list for every ticket, which means my mail client can't seem to separate my tickets from everyone else's.
Trac is sending tickets to macports-tickets, not to macports-dev. Most probably you are subscribed to both and you should update the filters in your mail client. Rainer
On Dec 15, 2007, at 12:29 AM, Rainer Müller wrote:
Kevin Ballard wrote:
I did not know that ticket was open, since Trac's email has always been a bit suspect - right now it apparently emails the dev list for every ticket, which means my mail client can't seem to separate my tickets from everyone else's.
Trac is sending tickets to macports-tickets, not to macports-dev. Most probably you are subscribed to both and you should update the filters in your mail client.
Before letting the count-down timer "maintainer-not-reacting" start, the ticket has to be assigned to him/her. Trac should -- meanwhile -- do mail the maintainer reliably. If you don't assign a ticket to a maintainer, he'll probably never find it -- polling trac for your tickets from time to time is doable, searching for all tickets that could relate to the ports you maintain isn't. Regards, -Markus -- Dipl. Inf. (FH) Markus W. Weissmann http://www.macports.org/ http://www.mweissmann.de/
participants (4)
-
Kevin Ballard
-
Markus Weissmann
-
Rainer Müller
-
Yamamoto Takanori