[94352] trunk/dports/science/plplot/Portfile

[takeshi at macports.org]

Revision: 94352
          https://trac.macports.org/changeset/94352
Author:   takeshi at macports.org
Date:     2012-06-15 15:47:01 -0700 (Fri, 15 Jun 2012)
Log Message:
-----------
plplot: fixed build with universal variant

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

Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile	2012-06-15 22:41:59 UTC (rev 94351)
+++ trunk/dports/science/plplot/Portfile	2012-06-15 22:47:01 UTC (rev 94352)
@@ -5,6 +5,7 @@
 
 name            plplot
 version         5.9.9
+revision        1
 platforms       darwin
 maintainers     takeshi openmaintainer
 categories      science
@@ -40,15 +41,23 @@
     reinplace "s|-framework AquaTerm|-F${frameworks_dir} -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
 }
 
+if {[variant_isset universal]} {
+    set cflags "${configure.cppflags} ${configure.cflags} ${configure.universal_cflags}"
+    set cxxflags "${configure.cppflags} ${configure.cxxflags} ${configure.universal_cxxflags}"
+} else {
+    set cflags "${configure.cppflags} ${configure.cppflags}"
+    set cxxflags "${configure.cppflags} ${configure.cxxflags}"
+}
+
 configure.dir           ${workpath}/build
 configure.cmd           cmake
 configure.env           HOME=${workpath}
 configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}
 configure.args          -DCMAKE_VERBOSE_MAKEFILE=ON \
                         -DCMAKE_C_COMPILER=${configure.cc} \
-                        -DCMAKE_C_FLAGS=\"${configure.cflags} ${configure.cppflags}\" \
+                        -DCMAKE_C_FLAGS=\"${cflags}\" \
                         -DCMAKE_CXX_COMPILER=${configure.cxx} \
-                        -DCMAKE_CXX_FLAGS=\"${configure.cxxflags} ${configure.cppflags}\" \
+                        -DCMAKE_CXX_FLAGS=\"${cxxflags}\" \
                         -DCMAKE_INCLUDE_PATH=${prefix}/include \
                         -DCMAKE_LIBRARY_PATH=${prefix}/lib \
                         -DTCL_INCLUDE_PATH=${prefix}/include \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120615/ab12d42a/attachment.html>