<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114134] trunk/dports/science/plplot/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114134">114134</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2013-11-29 22:35:18 -0800 (Fri, 29 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>plplot: exclude tk with -x11 not to link x11 libraries, closing #37035</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceplplotPortfile">trunk/dports/science/plplot/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceplplotPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/plplot/Portfile (114133 => 114134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/Portfile 2013-11-30 03:48:44 UTC (rev 114133)
+++ trunk/dports/science/plplot/Portfile 2013-11-30 06:35:18 UTC (rev 114134)
</span><span class="lines">@@ -35,10 +35,8 @@
</span><span class="cx"> port:libiconv \
</span><span class="cx"> port:libLASi \
</span><span class="cx"> port:libpng \
</span><del>- path:lib/pkgconfig/pango.pc:pango \
</del><span class="cx"> port:swig-tcl \
</span><span class="cx"> port:tcl \
</span><del>- port:tk \
</del><span class="cx"> port:zlib
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -76,8 +74,6 @@
</span><span class="cx"> -DCMAKE_LIBRARY_PATH=${prefix}/lib \
</span><span class="cx"> -DTCL_INCLUDE_PATH=${prefix}/include \
</span><span class="cx"> -DTCL_LIBRARY=${prefix}/lib/libtcl.dylib \
</span><del>- -DTK_INCLUDE_PATH=${prefix}/include \
- -DTK_LIBRARY=${prefix}/lib/libtk.dylib \
</del><span class="cx"> -DFREETYPE_INCLUDE_DIR=${prefix}/include/freetype2 \
</span><span class="cx"> -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
</span><span class="cx"> -DPL_FREETYPE_FONT_PATH=${prefix}/share/fonts/freefont-ttf \
</span><span class="lines">@@ -92,7 +88,7 @@
</span><span class="cx"> -DPLD_pdfcairo=ON \
</span><span class="cx"> -DPLD_pngcairo=ON \
</span><span class="cx"> -DPLD_svgcairo=ON \
</span><del>- -DPLD_tk=ON \
</del><ins>+ -DPLD_tk=OFF \
</ins><span class="cx"> -DPLD_wxwidgets=OFF \
</span><span class="cx"> -DPLD_wxpng=OFF \
</span><span class="cx"> -DPLD_xcairo=OFF \
</span><span class="lines">@@ -126,7 +122,7 @@
</span><span class="cx"> -DENABLE_python=OFF \
</span><span class="cx"> -DENABLE_qt=OFF \
</span><span class="cx"> -DENABLE_tcl=ON \
</span><del>- -DENABLE_tk=ON \
</del><ins>+ -DENABLE_tk=OFF \
</ins><span class="cx"> -DENABLE_wxwidgets=OFF \
</span><span class="cx"> -DBUILD_TEST=OFF \
</span><span class="cx"> -DHAVE_AGG=OFF \
</span><span class="lines">@@ -191,56 +187,65 @@
</span><span class="cx"> # * CMAKE_Fortran_COMPILER is used later in build.
</span><span class="cx"> # * To avoid -arch ${build_arch} to be passed configure.ld_archflags is unset.
</span><span class="cx">
</span><del>-if {[variant_isset gcc43] || [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] || [variant_isset gcc48]} {
- configure.ld_archflags ""
- configure.args-delete -DENABLE_f77=OFF \
- -DENABLE_f95=OFF
- configure.args-append -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
- -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
-} elseif {[variant_isset g95]} {
- configure.ld_archflags ""
- configure.args-delete -DENABLE_f77=OFF \
- -DENABLE_f95=OFF
- configure.args-append -DCMAKE_OSX_DEPLOYMENT_TARGET=\"\" \
- -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
</del><ins>+set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+set g95_conflicts {}
+
+foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
+
+ set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
+
+ foreach over ${gcc_versions} {
+ if {${ver} == ${over}} {
+ continue
+ }
+
+ set over_no_dot [join [split ${over} "."] ""]
+ append variant_line " conflicts gcc${over_no_dot}"
+ }
+ append variant_line { {}}
+
+ eval $variant_line
+
+ append g95_conflicts " conflicts gcc${ver_no_dot}"
</ins><span class="cx"> }
</span><del>-variant gcc43 conflicts g95 gcc44 gcc45 gcc46 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.3} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc43
- configure.fc ${prefix}/bin/gfortran-mp-4.3
</del><ins>+
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
+
+foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
+
+ if {[variant_isset gcc${ver_no_dot}]} {
+ depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
+ depends_build-append port:gcc${ver_no_dot}
+
+ configure.fc ${prefix}/bin/gfortran-mp-${ver}
+ configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+ configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+ configure.ld_archflags ""
+ configure.args-delete -DENABLE_f77=OFF \
+ -DENABLE_f95=OFF
+ configure.args-append -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
+ -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
+ }
</ins><span class="cx"> }
</span><del>-variant gcc44 conflicts g95 gcc43 gcc45 gcc46 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.4} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc44
- configure.fc ${prefix}/bin/gfortran-mp-4.4
-}
-variant gcc45 conflicts g95 gcc43 gcc44 gcc46 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.5} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc45
- configure.fc ${prefix}/bin/gfortran-mp-4.5
-}
-variant gcc46 conflicts g95 gcc43 gcc44 gcc45 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.6} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc46
- configure.fc ${prefix}/bin/gfortran-mp-4.6
-}
-variant gcc47 conflicts g95 gcc43 gcc44 gcc45 gcc46 gcc48 universal description {Add support for fortran using gfortran-mp-4.7} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc47
- configure.fc ${prefix}/bin/gfortran-mp-4.7
-}
-variant gcc48 conflicts g95 gcc43 gcc44 gcc45 gcc46 gcc47 universal description {Add support for fortran using gfortran-mp-4.8} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc48
- configure.fc ${prefix}/bin/gfortran-mp-4.8
-}
-variant g95 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 universal description {Add support for fortran using g95} {
- depends_lib-append port:g95
- configure.fc ${prefix}/bin/g95
</del><ins>+
+if {[variant_isset g95]} {
+ depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
+ depends_build-append port:g95
+
+ configure.fc ${prefix}/bin/g95
+ configure.f77 ${prefix}/bin/g95
+ configure.f90 ${prefix}/bin/g95
</ins><span class="cx"> # Ad hoc fix to enable build of f95 binding by disabling some features
</span><span class="cx"> if {${os.major}<10} {
</span><span class="cx"> patchfiles-append patch-sfstubsf95.f90.diff
</span><span class="cx"> }
</span><ins>+ configure.ld_archflags ""
+ configure.args-delete -DENABLE_f77=OFF \
+ -DENABLE_f95=OFF
+ configure.args-append -DCMAKE_OSX_DEPLOYMENT_TARGET=\"\" \
+ -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant octave description {Add support for Octave} {
</span><span class="lines">@@ -358,12 +363,19 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> variant x11 {
</span><ins>+ depends_lib-append path:lib/pkgconfig/pango.pc:pango \
+ port:tk
</ins><span class="cx"> configure.args-append -DPLD_xcairo=ON \
</span><span class="cx"> -DPLD_xwin=ON \
</span><del>- -DPLD_xfig=ON
</del><ins>+ -DPLD_xfig=ON \
+ -DPLD_tk=ON \
+ -DENABLE_tk=ON \
+ -DTK_INCLUDE_PATH=${prefix}/include \
+ -DTK_LIBRARY=${prefix}/lib/libtk.dylib \
</ins><span class="cx"> configure.args-delete -DPLD_xcairo=OFF \
</span><span class="cx"> -DPLD_xwin=OFF \
</span><del>- -DPLD_xfig=OFF
</del><ins>+ -DPLD_xfig=OFF \
+ -DENABLE_tk=OFF
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre>
</div>
</div>
</body>
</html>