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

mojca at macports.org mojca at macports.org
Mon Apr 7 15:56:28 PDT 2014


Revision: 118678
          https://trac.macports.org/changeset/118678
Author:   mojca at macports.org
Date:     2014-04-07 15:56:28 -0700 (Mon, 07 Apr 2014)
Log Message:
-----------
mojca/root6: move png dependencies to x11 (cocoa uses the built-in png library)

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

Modified: users/mojca/ports/science/root6/Portfile
===================================================================
--- users/mojca/ports/science/root6/Portfile	2014-04-07 22:54:47 UTC (rev 118677)
+++ users/mojca/ports/science/root6/Portfile	2014-04-07 22:56:28 UTC (rev 118678)
@@ -49,7 +49,6 @@
                     port:pcre \
                     port:zlib \
                     port:jpeg \
-                    port:libpng \
                     port:giflib \
                     port:tiff \
                     port:gmp \
@@ -109,9 +108,7 @@
                     -Dunuran=ON \
                     -Dreflex=ON \
                     -Dtable=ON \
-                    -Dgdml=ON \
-                    -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
-                    -DPNG_PNG_INCLUDE_DIR=${prefix}/include
+                    -Dgdml=ON
 
 configure.post_args ${worksrcpath}
 
@@ -373,9 +370,11 @@
 
 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
+    depends_lib-append      port:xorg-libX11 port:mesa port:Xft2 port:xpm port:libpng
     # Disable cocoa
-    configure.args-append   -Dcocoa=OFF
+    configure.args-append   -Dcocoa=OFF \
+                            -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
+                            -DPNG_PNG_INCLUDE_DIR=${prefix}/include
 }
 
 # If neither graphical variant is set, use default
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140407/34f4b4cb/attachment-0001.html>


More information about the macports-changes mailing list