[119406] users/mojca/ports/science/root6/Portfile

[mojca at macports.org]

Revision: 119406
          https://trac.macports.org/changeset/119406
Author:   mojca at macports.org
Date:     2014-04-24 13:54:59 -0700 (Thu, 24 Apr 2014)
Log Message:
-----------
mojca/root6: put png discovery back on top just in case

Modified Paths:
--------------
    users/mojca/ports/science/root6/Portfile

Modified: users/mojca/ports/science/root6/Portfile
===================================================================
--- users/mojca/ports/science/root6/Portfile	2014-04-24 20:52:44 UTC (rev 119405)
+++ users/mojca/ports/science/root6/Portfile	2014-04-24 20:54:59 UTC (rev 119406)
@@ -48,15 +48,16 @@
     file mkdir ${configure.dir}
 }
 
-depends_lib         port:xz \
-                    port:pcre \
-                    port:zlib \
-                    port:jpeg \
+depends_lib         port:expat \
+                    port:gmp \
                     port:giflib \
+                    port:jpeg \
+                    port:libpng \
+                    port:lzma \
+                    port:pcre \
                     port:tiff \
-                    port:gmp \
-                    port:expat \
-                    port:lzma
+                    port:zlib \
+                    port:xz
                   # port:freetype
 
 depends_run         port:root_select
@@ -120,14 +121,13 @@
                     -Dunuran=ON \
                     -Dreflex=ON \
                     -Dtable=ON \
-                    -Dgdml=ON
+                    -Dgdml=ON \
+                    -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
+                    -DPNG_PNG_INCLUDE_DIR=${prefix}/include
 
 configure.post_args ${worksrcpath}
 
 # TODO: temporary:
-configure.args-append       -DCMAKE_INCLUDE_PATH=${install_prefix}/include
-configure.cppflags-delete   -I${install_prefix}/include
-
 configure.args-append       -DCMAKE_INCLUDE_PATH=${prefix}/include
 configure.cppflags-delete   -I${prefix}/include
 
@@ -449,11 +449,9 @@
 
 variant x11 conflicts cocoa description {Enables X11 graphical backend} {
     # Dependencies on X11 ports
-    depends_lib-append      port:xorg-libX11 port:mesa port:Xft2 port:xpm port:libpng
+    depends_lib-append      port:xorg-libX11 port:mesa port:Xft2 port:xpm
     # Disable cocoa
-    configure.args-append   -Dcocoa=OFF \
-                            -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
-                            -DPNG_PNG_INCLUDE_DIR=${prefix}/include
+    configure.args-append   -Dcocoa=OFF
 }
 
 # If neither graphical variant is set, use default
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140424/1bd0b4d9/attachment.html>