Revision: 99189 http://trac.macports.org//changeset/99189 Author: ryandesign@macports.org Date: 2012-10-29 00:10:25 -0700 (Mon, 29 Oct 2012) Log Message: ----------- root: disable tiff when cocoa is enabled; update configure patch; remove symlink workaround no longer needed with this version (#36777) Modified Paths: -------------- trunk/dports/science/root/Portfile trunk/dports/science/root/files/patch-configure.diff Added Paths: ----------- trunk/dports/science/root/files/patch-builtin-afterimage-disabletiff.diff Modified: trunk/dports/science/root/Portfile =================================================================== --- trunk/dports/science/root/Portfile 2012-10-29 06:38:55 UTC (rev 99188) +++ trunk/dports/science/root/Portfile 2012-10-29 07:10:25 UTC (rev 99189) @@ -5,7 +5,7 @@ name root version 5.34.03 -revision 0 +revision 1 categories science maintainers gmail.com:mattiafrancescomoro hep.phy.cam.ac.uk:jonesc license LGPL-2.1+ @@ -353,13 +353,10 @@ return -code error "Unsupported compiler for cocoa support" } } - # Disable asimage and astiff, as causes build failures with cocoa enabled ?? - # Not clear why. To be looked into ... - configure.args-append --enable-cocoa --disable-asimage --disable-astiff - # Fix a small issue with the cocoa backend where the 'root' command is not created ... - post-destroot { - system "( cd ${destroot}${prefix}/bin ; ln -s root.exe root )" - } + # Enable cocoa support in configure + configure.args-append --enable-cocoa + # patch afterimage build to make sure TIFF suport is disabled. Causes problems with cocoa... + patchfiles-append patch-builtin-afterimage-disabletiff.diff } variant gcc45 conflicts gcc46 gcc47 gcc48 clang31 description {Compile using MacPorts gcc 4.5} { Added: trunk/dports/science/root/files/patch-builtin-afterimage-disabletiff.diff =================================================================== --- trunk/dports/science/root/files/patch-builtin-afterimage-disabletiff.diff (rev 0) +++ trunk/dports/science/root/files/patch-builtin-afterimage-disabletiff.diff 2012-10-29 07:10:25 UTC (rev 99189) @@ -0,0 +1,11 @@ +--- graf2d/asimage/src/libAfterImage/configure.original 2012-10-28 18:07:59.000000000 +0000 ++++ graf2d/asimage/src/libAfterImage/configure 2012-10-28 18:08:06.000000000 +0000 +@@ -7774,7 +7774,7 @@ + + + +- ++with_tiff=no + if test "$with_tiff" = no; then + have_tiff=disabled + else Modified: trunk/dports/science/root/files/patch-configure.diff =================================================================== --- trunk/dports/science/root/files/patch-configure.diff 2012-10-29 06:38:55 UTC (rev 99188) +++ trunk/dports/science/root/files/patch-configure.diff 2012-10-29 07:10:25 UTC (rev 99189) @@ -1,6 +1,6 @@ ---- /opt/local/var/macports/build/_Users_chris_Projects_MacPorts_portfiles_science_root/root/work/root/configure 2011-12-02 11:42:22.000000000 +0000 -+++ configure 2011-12-04 13:57:40.000000000 +0000 -@@ -433,19 +433,19 @@ +--- configure.original 2012-10-28 18:18:50.000000000 +0000 ++++ configure 2012-10-28 18:21:14.000000000 +0000 +@@ -436,19 +436,19 @@ chklib64file=`ar t $chklib64 | awk '{if (NR == 2) print $1}'` logmsg " ar x $chklib64 $chklib64file" ar x $chklib64 $chklib64file @@ -25,3 +25,12 @@ ret=1 fi fi +@@ -2597,7 +2597,7 @@ + if `$cwhich freetype-config > /dev/null 2>&1` && test "x$host" = "x" ; then + if test "x$macosx108" = "xyes" && (file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 || test "x$enable_cocoa" = "xyes"); then + enable_builtin_freetype="yes" +- if file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then ++ if /usr/bin/file -h `$cwhich freetype-config` | grep 'xstub' > /dev/null 2>&1 ; then + result "XQuartz not installed" + else + result "using builtin freetype"