[73010] trunk/dports/fuse/macfuse
dports at macports.org
dports at macports.org
Sun Oct 31 19:13:05 PDT 2010
Revision: 73010
http://trac.macports.org/changeset/73010
Author: dports at macports.org
Date: 2010-10-31 19:13:02 -0700 (Sun, 31 Oct 2010)
Log Message:
-----------
macfuse: update patch for libfuse build process:
* force autoreconf before configure to avoid libtool version
errors (#25759)
* add --with-libiconv-prefix to configure args (and add libiconv
dependency); see #16892 and #17841
Modified Paths:
--------------
trunk/dports/fuse/macfuse/Portfile
trunk/dports/fuse/macfuse/files/patch-10.5_libfuse_fuse-2.7.3-macosx.patch.diff
trunk/dports/fuse/macfuse/files/patch-10.6_libfuse_fuse-2.7.3-macosx.patch.diff
Modified: trunk/dports/fuse/macfuse/Portfile
===================================================================
--- trunk/dports/fuse/macfuse/Portfile 2010-11-01 02:00:59 UTC (rev 73009)
+++ trunk/dports/fuse/macfuse/Portfile 2010-11-01 02:13:02 UTC (rev 73010)
@@ -5,7 +5,7 @@
name macfuse
version 2.0.3
-revision 3
+revision 4
categories fuse devel
platforms macosx
maintainers dports
@@ -29,7 +29,8 @@
sha1 60ea1536091740e2faeb9ebf72d8696ccd11ce2f \
rmd160 e9a79de37d84ee5e21f63f02b924d04a5df94636
-depends_build port:pkgconfig
+depends_build port:pkgconfig port:autoconf port:automake port:libtool
+depends_lib port:libiconv
patchfiles patch-10.5-to-10.6.diff \
patch-macfuse_buildtool.sh.diff \
Modified: trunk/dports/fuse/macfuse/files/patch-10.5_libfuse_fuse-2.7.3-macosx.patch.diff
===================================================================
--- trunk/dports/fuse/macfuse/files/patch-10.5_libfuse_fuse-2.7.3-macosx.patch.diff 2010-11-01 02:00:59 UTC (rev 73009)
+++ trunk/dports/fuse/macfuse/files/patch-10.5_libfuse_fuse-2.7.3-macosx.patch.diff 2010-11-01 02:13:02 UTC (rev 73010)
@@ -1,11 +1,20 @@
---- 10.5/libfuse/fuse-2.7.3-macosx.patch 2008-12-02 21:32:20.000000000 -0500
-+++ 10.5/libfuse/fuse-2.7.3-macosx.patch 2009-12-22 22:59:21.000000000 -0500
-@@ -37607,7 +37607,7 @@
+--- 10.5/libfuse/fuse-2.7.3-macosx.patch.orig 2010-10-31 19:01:52.000000000 -0400
++++ 10.5/libfuse/fuse-2.7.3-macosx.patch 2010-10-31 19:08:48.000000000 -0400
+@@ -37601,13 +37601,15 @@
+ diff -Naur old/darwin_configure.sh new/darwin_configure.sh
+ --- old/darwin_configure.sh 1969-12-31 16:00:00.000000000 -0800
+ +++ new/darwin_configure.sh 2008-11-26 21:50:02.000000000 -0800
+-@@ -0,0 +1,6 @@
++@@ -0,0 +1,8 @@
+ +#! /bin/sh
+ +
+MACFUSE_SRCROOT=${MACFUSE_SRCROOT:-$1}
+MACFUSE_SRCROOT=${MACFUSE_SRCROOT:?}
+
-+CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch ppc -arch x86_64 -arch ppc64 -isysroot /Developer/SDKs/MacOSX10.5.sdk" LDFLAGS="-arch i386 -arch ppc -arch x86_64 -arch ppc64 -framework CoreFoundation" ./configure --prefix=/usr/local --disable-dependency-tracking --disable-static
-++CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch ppc -arch x86_64 -arch ppc64 -isysroot /Developer/SDKs/MacOSX10.5.sdk" LDFLAGS="-arch i386 -arch ppc -arch x86_64 -arch ppc64 -framework CoreFoundation" ./configure --prefix=@@PREFIX@@ --disable-dependency-tracking --disable-static
+++@@PREFIX@@/bin/autoreconf --install --force
+++
+++CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch ppc -arch x86_64 -arch ppc64 -isysroot /Developer/SDKs/MacOSX10.5.sdk" LDFLAGS="-arch i386 -arch ppc -arch x86_64 -arch ppc64 -framework CoreFoundation" ./configure --prefix=@@PREFIX@@ --disable-dependency-tracking --disable-static --with-libiconv-prefix=@@PREFIX@@
diff -Naur old/darwin_configure_ino64.sh new/darwin_configure_ino64.sh
--- old/darwin_configure_ino64.sh 1969-12-31 16:00:00.000000000 -0800
+++ new/darwin_configure_ino64.sh 2008-11-26 21:50:02.000000000 -0800
Modified: trunk/dports/fuse/macfuse/files/patch-10.6_libfuse_fuse-2.7.3-macosx.patch.diff
===================================================================
--- trunk/dports/fuse/macfuse/files/patch-10.6_libfuse_fuse-2.7.3-macosx.patch.diff 2010-11-01 02:00:59 UTC (rev 73009)
+++ trunk/dports/fuse/macfuse/files/patch-10.6_libfuse_fuse-2.7.3-macosx.patch.diff 2010-11-01 02:13:02 UTC (rev 73010)
@@ -1,11 +1,20 @@
---- 10.6/libfuse/fuse-2.7.3-macosx.patch 2009-12-18 01:38:35.000000000 -0500
-+++ 10.6/libfuse/fuse-2.7.3-macosx.patch 2009-12-18 02:39:51.000000000 -0500
-@@ -37607,7 +37607,7 @@
+--- 10.6/libfuse/fuse-2.7.3-macosx.patch.orig 2010-10-31 19:01:52.000000000 -0400
++++ 10.6/libfuse/fuse-2.7.3-macosx.patch 2010-10-31 19:08:48.000000000 -0400
+@@ -37601,13 +37601,15 @@
+ diff -Naur old/darwin_configure.sh new/darwin_configure.sh
+ --- old/darwin_configure.sh 1969-12-31 16:00:00.000000000 -0800
+ +++ new/darwin_configure.sh 2008-11-26 21:50:02.000000000 -0800
+-@@ -0,0 +1,6 @@
++@@ -0,0 +1,8 @@
+ +#! /bin/sh
+ +
+MACFUSE_SRCROOT=${MACFUSE_SRCROOT:-$1}
+MACFUSE_SRCROOT=${MACFUSE_SRCROOT:?}
+
-+CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.6.sdk" LDFLAGS="-arch i386 -arch x86_64 -framework CoreFoundation" ./configure --prefix=/usr/local --disable-dependency-tracking --disable-static
-++CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.6.sdk" LDFLAGS="-arch i386 -arch x86_64 -framework CoreFoundation" ./configure --prefix=@@PREFIX@@ --disable-dependency-tracking --disable-static
+++@@PREFIX@@/bin/autoreconf --install --force
+++
+++CFLAGS="-D__FreeBSD__=10 -D_POSIX_C_SOURCE=200112L -I$MACFUSE_SRCROOT/common -O -gdwarf-2 -arch i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.6.sdk" LDFLAGS="-arch i386 -arch x86_64 -framework CoreFoundation" ./configure --prefix=@@PREFIX@@ --disable-dependency-tracking --disable-static --with-libiconv-prefix=@@PREFIX@@
diff -Naur old/darwin_configure_ino64.sh new/darwin_configure_ino64.sh
--- old/darwin_configure_ino64.sh 1969-12-31 16:00:00.000000000 -0800
+++ new/darwin_configure_ino64.sh 2008-11-26 21:50:02.000000000 -0800
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101031/63b5af26/attachment-0001.html>
More information about the macports-changes
mailing list