Revision: 81605 http://trac.macports.org/changeset/81605 Author: dports@macports.org Date: 2011-08-02 16:19:30 -0700 (Tue, 02 Aug 2011) Log Message: ----------- ntfs-3g: use default PKG_CONFIG_PATH instead of adding /usr/local and other directories to it; fixes build with fuse4x installed via MacPorts + a standalone MacFUSE in /usr/local (see #30537) Modified Paths: -------------- trunk/dports/fuse/ntfs-3g/Portfile Added Paths: ----------- trunk/dports/fuse/ntfs-3g/files/ trunk/dports/fuse/ntfs-3g/files/patch-configure.diff Modified: trunk/dports/fuse/ntfs-3g/Portfile =================================================================== --- trunk/dports/fuse/ntfs-3g/Portfile 2011-08-02 22:34:15 UTC (rev 81604) +++ trunk/dports/fuse/ntfs-3g/Portfile 2011-08-02 23:19:30 UTC (rev 81605) @@ -33,6 +33,10 @@ depends_build port:pkgconfig depends_lib path:lib/pkgconfig/fuse.pc:macfuse +# Use default PKG_CONFIG_PATH to avoid picking up a FUSE installation +# in /usr/local (see #30537) +patchfiles patch-configure.diff + configure.args --exec-prefix=${prefix} --with-fuse=external platform darwin { Added: trunk/dports/fuse/ntfs-3g/files/patch-configure.diff =================================================================== --- trunk/dports/fuse/ntfs-3g/files/patch-configure.diff (rev 0) +++ trunk/dports/fuse/ntfs-3g/files/patch-configure.diff 2011-08-02 23:19:30 UTC (rev 81605) @@ -0,0 +1,12 @@ +--- configure.orig 2011-08-02 19:13:55.000000000 -0400 ++++ configure 2011-08-02 19:14:14.000000000 -0400 +@@ -20530,9 +20530,6 @@ + test "x${PKG_CONFIG}" = "xno" && { { echo "$as_me:$LINENO: error: pkg-config wasn't found! Please install from your vendor, or see http://pkg-config.freedesktop.org/wiki/" >&5 + echo "$as_me: error: pkg-config wasn't found! Please install from your vendor, or see http://pkg-config.freedesktop.org/wiki/" >&2;} + { (exit 1); exit 1; }; } +- # Libraries often install their metadata .pc files in directories +- # not searched by pkg-config. Let's workaround this. +- export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/lib/pkgconfig:/usr/lib/pkgconfig:/opt/gnome/lib/pkgconfig:/usr/share/pkgconfig:/usr/local/lib/pkgconfig:$prefix/lib/pkgconfig:/opt/gnome/share/pkgconfig:/usr/local/share/pkgconfig + + pkg_failed=no + { echo "$as_me:$LINENO: checking for FUSE_MODULE" >&5