<!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>[120891] 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/120891">120891</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2014-06-10 17:24:21 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>plplot: added patches for CMakeLists.txt and plConfig.h. deleted -DENABLE_f77. Use PortGroup compilers</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 (120890 => 120891)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/Portfile 2014-06-10 23:24:30 UTC (rev 120890)
+++ trunk/dports/science/plplot/Portfile 2014-06-11 00:24:21 UTC (rev 120891)
</span><span class="lines">@@ -2,10 +2,15 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup compilers 1.0
</ins><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><ins>+compilers.choose fc f90
+compilers.setup
+
</ins><span class="cx"> name plplot
</span><span class="cx"> version 5.10.0
</span><ins>+revision 1
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers takeshi openmaintainer
</span><span class="cx"> categories science
</span><span class="lines">@@ -34,6 +39,8 @@
</span><span class="cx"> port:swig-tcl \
</span><span class="cx"> port:tcl
</span><span class="cx">
</span><ins>+patchfiles patch-CMakeLists.txt.diff \
+ patch-plConfig.h.in.diff
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|-ObjC|-ObjC -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
</span><span class="cx"> reinplace "s|-framework AquaTerm|-F${frameworks_dir} -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
</span><span class="lines">@@ -104,7 +111,6 @@
</span><span class="cx"> -DPLD_qtwidget=OFF \
</span><span class="cx"> -DENABLE_ada=OFF \
</span><span class="cx"> -DENABLE_d=OFF \
</span><del>- -DENABLE_f77=OFF \
</del><span class="cx"> -DENABLE_f95=OFF \
</span><span class="cx"> -DENABLE_itcl=OFF \
</span><span class="cx"> -DENABLE_itk=OFF \
</span><span class="lines">@@ -121,7 +127,8 @@
</span><span class="cx"> -DENABLE_wxwidgets=OFF \
</span><span class="cx"> -DBUILD_TEST=OFF \
</span><span class="cx"> -DHAVE_AGG=OFF \
</span><del>- -DSWIG_DIR=${prefix}/bin
</del><ins>+ -DSWIG_DIR=${prefix}/bin \
+ -DPLPLOT_HAVE_CONFIG_H=ON
</ins><span class="cx"> configure.post_args ../${distname}
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="lines">@@ -129,7 +136,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[variant_isset universal]} {
</span><del>- configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\" -DENABLE_f77:BOOL=OFF -DENABLE_f95:BOOL=OFF
</del><ins>+ configure.args-append -DCMAKE_OSX_ARCHITECTURES=\"[strsed ${configure.universal_archs} "g| |;|"]\" -DENABLE_f95:BOOL=OFF
</ins><span class="cx"> } else {
</span><span class="cx"> # Adhoc fix
</span><span class="cx"> # cmake passes -arch to Fortran compiler
</span><span class="lines">@@ -182,65 +189,23 @@
</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>-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}"
</del><ins>+if {[fortran_variant_isset]} {
+ configure.ld_archflags ""
+ configure.args-delete -DENABLE_f95=OFF
+ configure.args-append -DCMAKE_Fortran_COMPILER=\"${configure.fc}\"
+ if {[variant_isset g95]} {
+ configure.args-append -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
+ } else {
+ configure.args-append -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
</ins><span class="cx"> }
</span><del>- append variant_line { {}}
-
- eval $variant_line
-
- append g95_conflicts " conflicts gcc${ver_no_dot}"
</del><span class="cx"> }
</span><span class="cx">
</span><del>-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}\"
- }
-}
-
</del><span class="cx"> if {[variant_isset g95]} {
</span><del>- 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
</del><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><del>- 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>+ configure.args-append -DCMAKE_OSX_DEPLOYMENT_TARGET=\"\"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant octave description {Add support for Octave} {
</span></span></pre>
</div>
</div>
</body>
</html>