Changeset 99189

Timestamp:

Oct 29, 2012, 7:10:25 AM (12 years ago)

Author:

ryandesign@…

Message:

root: disable tiff when cocoa is enabled; update configure patch; remove symlink workaround no longer needed with this version (#36777)

Location:

trunk/dports/science/root

Files:

• Portfile (modified) (2 diffs)
• files/patch-builtin-afterimage-disabletiff.diff (added)
• files/patch-configure.diff (modified) (2 diffs)

trunk/dports/science/root/Portfile

@@ -6 +6 @@
 name                root
 version             5.34.03
-revision            0
+revision            1
 categories          science
 maintainers         gmail.com:mattiafrancescomoro hep.phy.cam.ac.uk:jonesc
@@ -354 +354 @@
         }
     }
-    # 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
 }
 

trunk/dports/science/root/files/patch-configure.diff

@@ -1 @@
---- /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"
@@ -26 +26 @@
              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"