<!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>[146365] trunk/dports/science/plplot</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/146365">146365</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2016-03-06 04:50:06 -0800 (Sun, 06 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>plplot: add support for OCaml binding</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceplplotPortfile">trunk/dports/science/plplot/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsscienceplplotfilespatchbindingsocamlCMakeListstxtdiff">trunk/dports/science/plplot/files/patch-bindings-ocaml-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsscienceplplotfilespatchbindingsocamlplplot_coreidldiff">trunk/dports/science/plplot/files/patch-bindings-ocaml-plplot_core.idl.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceplplotPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/plplot/Portfile (146364 => 146365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/Portfile 2016-03-06 12:47:13 UTC (rev 146364)
+++ trunk/dports/science/plplot/Portfile 2016-03-06 12:50:06 UTC (rev 146365)
</span><span class="lines">@@ -69,8 +69,6 @@
</span><span class="cx"> -DFREETYPE_INCLUDE_DIR_ft2build=${prefix}/include/freetype2 \
</span><span class="cx"> -DFREETYPE_LIBRARIES=${prefix}/lib/libfreetype.dylib \
</span><span class="cx"> -DPL_FREETYPE_FONT_PATH=${prefix}/share/fonts/freefont-ttf \
</span><del>- -DLTDL_INCLUDE_DIR=${prefix}/include \
- -DLTDL_LIBRARY_DIR=${prefix}/lib \
</del><span class="cx"> -DWITH_FREETYPE=ON \
</span><span class="cx"> -DQHULL_INCLUDE_DIR=${prefix}/include \
</span><span class="cx"> -DQHULL_LIBRARIES=${prefix}/lib/libqhull.dylib \
</span><span class="lines">@@ -211,6 +209,15 @@
</span><span class="cx"> configure.args-append -DENABLE_java=ON
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant ocaml description {Add support for OCaml} {
+ patchfiles-append patch-bindings-ocaml-plplot_core.idl.diff \
+ patch-bindings-ocaml-CMakeLists.txt.diff
+ depends_lib-append port:ocaml \
+ port:swig-ocaml
+ configure.args-delete -DENABLE_ocaml=OFF
+ configure.args-append -DENABLE_ocaml=ON
+}
+
</ins><span class="cx"> variant python26 conflicts python27 description {Add support for python26} {
</span><span class="cx"> depends_lib-append port:python26 \
</span><span class="cx"> port:py26-numpy \
</span></span></pre></div>
<a id="trunkdportsscienceplplotfilespatchbindingsocamlCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/plplot/files/patch-bindings-ocaml-CMakeLists.txt.diff (0 => 146365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/files/patch-bindings-ocaml-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/science/plplot/files/patch-bindings-ocaml-CMakeLists.txt.diff 2016-03-06 12:50:06 UTC (rev 146365)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- bindings/ocaml/CMakeLists.txt.orig 2015-08-13 02:35:27.000000000 +0900
++++ bindings/ocaml/CMakeLists.txt 2016-03-05 23:29:15.000000000 +0900
+@@ -99,7 +99,7 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/libplplot_stubs.a
+ COMMAND ${OCAMLC} -ccopt -I${CAMLIDL_LIB_DIR} -c ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
+ COMMAND ${OCAMLC} -ccopt -I${CMAKE_SOURCE_DIR}/include -ccopt -I${CMAKE_BINARY_DIR}/include -ccopt -I${CMAKE_SOURCE_DIR}/lib/qsastime -ccopt -I${CMAKE_BINARY_DIR} -ccopt -I${CAMLIDL_LIB_DIR} -ccopt -DPLPLOT_HAVE_CONFIG_H -c ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
+- COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src -lplplot ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
++ COMMAND ${OCAMLMKLIB} -o plplot_stubs -L${CAMLIDL_LIB_DIR} -lcamlidl -L${CMAKE_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.o ${CMAKE_CURRENT_BINARY_DIR}/plplot_impl.o ${ocaml_STATIC_FLAGS}
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_core_stubs.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_impl.c
</ins></span></pre></div>
<a id="trunkdportsscienceplplotfilespatchbindingsocamlplplot_coreidldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/plplot/files/patch-bindings-ocaml-plplot_core.idl.diff (0 => 146365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/files/patch-bindings-ocaml-plplot_core.idl.diff (rev 0)
+++ trunk/dports/science/plplot/files/patch-bindings-ocaml-plplot_core.idl.diff 2016-03-06 12:50:06 UTC (rev 146365)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+--- bindings/ocaml/plplot_core.idl.orig 2015-08-13 02:35:27.000000000 +0900
++++ bindings/ocaml/plplot_core.idl 2016-03-05 22:08:31.000000000 +0900
+@@ -204,9 +204,6 @@
+ PLFLT plgwidth(void);
+ PLFLT plgchrht(void);
+
+-#define QUOTEME(x) #x
+-#define RAW_ML(x) quote(mlmli, QUOTEME(x));
+-
+ // plstripc function
+ quote(mlmli,
+ "external plstripc : string -> string -> float -> float -> float -> float -> \
+@@ -327,8 +324,8 @@
+ ml_plsexit ()");
+ quote(mli, "val plunset_exit : unit -> unit");
+
+-RAW_ML(external plgriddata : float array -> float array -> float array -> float array -> float array -> plplot_grid_method_type -> float -> float array array = "ml_plgriddata_bytecode" "ml_plgriddata")
+-RAW_ML(external plparseopts : string array -> plplot_parse_method_type list -> unit = "ml_plparseopts")
+-RAW_ML(external pllegend : plplot_legend_opt -> plplot_position_opt -> float -> float -> float -> int -> int -> int -> int -> int -> plplot_legend_opt array -> float -> float -> float -> float -> int array -> string array -> int array -> int array -> float array -> float array -> int array -> int array -> float array -> int array -> float array -> int array -> string array -> float * float = "ml_pllegend_byte" "ml_pllegend")
+-RAW_ML(external plcolorbar : plplot_colorbar_opt -> plplot_position_opt -> float -> float -> float -> float -> int -> int -> int -> float -> float -> int -> float -> plplot_colorbar_opt array -> string array -> string array -> float array -> int array -> float array array -> float * float = "ml_plcolorbar_byte" "ml_plcolorbar")
++quote(mlmli, "external plgriddata : float array -> float array -> float array -> float array -> float array -> plplot_grid_method_type -> float -> float array array = \"ml_plgriddata_bytecode\" \"ml_plgriddata\"")
++quote(mlmli, "external plparseopts : string array -> plplot_parse_method_type list -> unit = \"ml_plparseopts\"")
++quote(mlmli, "external pllegend : plplot_legend_opt -> plplot_position_opt -> float -> float -> float -> int -> int -> int -> int -> int -> plplot_legend_opt array -> float -> float -> float -> float -> int array -> string array -> int array -> int array -> float array -> float array -> int array -> int array -> float array -> int array -> float array -> int array -> string array -> float * float = \"ml_pllegend_byte\" \"ml_pllegend\"")
++quote(mlmli, "external plcolorbar : plplot_colorbar_opt -> plplot_position_opt -> float -> float -> float -> float -> int -> int -> int -> float -> float -> int -> float -> plplot_colorbar_opt array -> string array -> string array -> float array -> int array -> float array array -> float * float = \"ml_plcolorbar_byte\" \"ml_plcolorbar\"")
+
</ins></span></pre>
</div>
</div>
</body>
</html>