Revision
81604
Author
dports@macports.org
Date
2011-08-02 15:34:15 -0700 (Tue, 02 Aug 2011)

Log Message

sshfs: don't add /usr/local/lib to PKG_CONFIG_PATH; fixes build with
fuse4x installed via MacPorts + a standalone MacFUSE in /usr/local
(#30537)

Modified Paths

Added Paths

Diff

Modified: trunk/dports/fuse/sshfs/Portfile (81603 => 81604)


--- trunk/dports/fuse/sshfs/Portfile	2011-08-02 22:28:46 UTC (rev 81603)
+++ trunk/dports/fuse/sshfs/Portfile	2011-08-02 22:34:15 UTC (rev 81604)
@@ -39,7 +39,8 @@
 platform darwin {
     patch_sites         http://macfuse.googlecode.com/svn/tags/macfuse-2.0/filesystems/sshfs
     patchfiles          sshfs-fuse-${version}-macosx.patch \
-                        patch-fuse4x-compat.diff
+                        patch-fuse4x-compat.diff \
+                        patch-configure.ac.diff
     checksums-append    sshfs-fuse-${version}-macosx.patch md5 08330f4c10e25052b3a5c26d180e4752 \
                                                            sha1 24e6721c25fb883c945550ac62e20f4c35f4393e
     

Added: trunk/dports/fuse/sshfs/files/patch-configure.ac.diff (0 => 81604)


--- trunk/dports/fuse/sshfs/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/fuse/sshfs/files/patch-configure.ac.diff	2011-08-02 22:34:15 UTC (rev 81604)
@@ -0,0 +1,10 @@
+--- a/configure.ac.orig	2011-08-02 18:26:14.000000000 -0400
++++ a/configure.ac	2011-08-02 18:26:20.000000000 -0400
+@@ -36,7 +36,6 @@
+ 
+ AM_CONDITIONAL(SSH_NODELAY_SO, test "$enable_sshnodelay" = "yes")
+ 
+-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
+ PKG_CHECK_MODULES(SSHFS, [fuse >= 2.2 glib-2.0 gthread-2.0])
+ have_fuse_opt_parse=no
+ oldlibs="$LIBS"