[84074] trunk/dports/science/root

[ryandesign at macports.org]

Revision: 84074
          http://trac.macports.org/changeset/84074
Author:   ryandesign at macports.org
Date:     2011-09-15 23:23:20 -0700 (Thu, 15 Sep 2011)
Log Message:
-----------
root: use /usr/bin/file to avoid problems when /opt/local/bin/file is installed and xorg-libX11 is universal; see #31260

Modified Paths:
--------------
    trunk/dports/science/root/Portfile

Added Paths:
-----------
    trunk/dports/science/root/files/
    trunk/dports/science/root/files/patch-configure.diff

Modified: trunk/dports/science/root/Portfile
===================================================================
--- trunk/dports/science/root/Portfile	2011-09-16 05:53:07 UTC (rev 84073)
+++ trunk/dports/science/root/Portfile	2011-09-16 06:23:20 UTC (rev 84074)
@@ -37,6 +37,8 @@
                     port:libpng \
                     port:tiff
 
+patchfiles          patch-configure.diff
+
 post-patch {
     reinplace "s|-lfreetype| \`freetype-config --libs\`|g" ${worksrcpath}/config/root-config.in
     reinplace "s|\"/usr/include\"|\"${prefix}/include/\" \"/usr/include\"|g" ${worksrcpath}/configure

Added: trunk/dports/science/root/files/patch-configure.diff
===================================================================
--- trunk/dports/science/root/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/root/files/patch-configure.diff	2011-09-16 06:23:20 UTC (rev 84074)
@@ -0,0 +1,37 @@
+--- configure.orig	2011-08-18 09:46:14.000000000 -0500
++++ configure	2011-09-14 17:42:51.000000000 -0500
+@@ -356,14 +356,14 @@
+ 
+     case $arch in
+     macosx)
+-        logmsg " file -L $chklibcompat | grep 'i386'"
+-        if file -L $chklibcompat | grep 'i386' > /dev/null 2>& 1 ; then
++        logmsg " /usr/bin/file -L $chklibcompat | grep 'i386'"
++        if /usr/bin/file -L $chklibcompat | grep 'i386' > /dev/null 2>& 1 ; then
+             ret=1
+         fi
+         ;;
+     macosx64)
+-        logmsg " file -L $chklibcompat | grep 'x86_64'"
+-        if file -L $chklibcompat | grep 'x86_64' > /dev/null 2>& 1 ; then
++        logmsg " /usr/bin/file -L $chklibcompat | grep 'x86_64'"
++        if /usr/bin/file -L $chklibcompat | grep 'x86_64' > /dev/null 2>& 1 ; then
+             ret=1
+         fi
+         ;;
+@@ -403,12 +403,12 @@
+             ret=1
+         fi
+     else
+-        if file -L $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
++        if /usr/bin/file -L $chklib64 | grep 'ASCII' > /dev/null 2>& 1 ; then
+             check_link $chklib64
+             ret=$link_result
+         else
+-            logmsg " file -L $chklib64 | grep '64-bit'"
+-            if file -L $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
++            logmsg " /usr/bin/file -L $chklib64 | grep '64-bit'"
++            if /usr/bin/file -L $chklib64 | grep '64-bit' > /dev/null 2>& 1 ; then
+                 ret=1
+             fi
+         fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110915/de6eaec2/attachment-0001.html>