<!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>[130957] trunk/dports/gis/cgal</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/130957">130957</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2015-01-03 22:56:07 -0800 (Sat, 03 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cgal: remove demo variant; closes #44727
This variant hasn't worked correctly for a long time now. With newer versions
of cgal, it has been impossible to even build correctly. The design of the cgal
examples and demos now has a meaning of "install cgal first, then extract the
demos somewhere and run those separate." Therefore, we just remove the useless
variant.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgiscgalPortfile">trunk/dports/gis/cgal/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgiscgalfilespatchCMakeListstxtdiff">trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgiscgalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/cgal/Portfile (130956 => 130957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/cgal/Portfile 2015-01-04 06:01:11 UTC (rev 130956)
+++ trunk/dports/gis/cgal/Portfile 2015-01-04 06:56:07 UTC (rev 130957)
</span><span class="lines">@@ -54,49 +54,6 @@
</span><span class="cx"> configure.optflags -O3 -pipe -march=native
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant demos description {Create demos} requires qt4 {
- depends_lib-append port:libQGLViewer \
- port:ipe \
- port:metis \
- port:qt4-mac-sqlite3-plugin
-
- patchfiles-append patch-CMakeLists.txt.diff
-
- configure.args-append -DWITH_examples:BOOL=ON
- configure.args-append -DWITH_demos:BOOL=ON
- configure.args-append -DWITH_QGLViewer:BOOL=ON
- configure.args-append -DWITH_OpenGL:BOOL=ON
-
- # MacPorts installs IPE version 7; make sure to use it.
- configure.args-append -DWITH_IPE:BOOL=ON
-
- # include Qt's CMake defines, just in case
- configure.args-append ${qt_cmake_defines}
-
- post-configure {
- # Workaround a bug in the link.txt files of the ipelets demos
- set ipelink [glob ${worksrcpath}/demo/CGAL_ipelets/CMakeFiles/*/link.txt]
- foreach linkfile ${ipelink} {
- reinplace -E "s|(.*)|\\1 -lipe|" ${linkfile}
- }
- }
-
- build.target-append examples demos
- use_parallel_build no
-
- post-destroot {
- xinstall -d ${destroot}${prefix}/share/${name}
- copy ${worksrcpath}/demo ${destroot}${prefix}/share/${name}
- copy ${worksrcpath}/examples ${destroot}${prefix}/share/${name}
- eval move [glob ${destroot}${prefix}/share/${name}/demo/*/*.dylib] ${destroot}${prefix}/lib/
- delete ${destroot}${prefix}/share/${name}/demo/CMakeFiles \
- ${destroot}${prefix}/share/${name}/examples/CMakeFiles
- eval delete [glob ${destroot}${prefix}/share/${name}/demo/*/CMakeFiles]
- eval delete [glob ${destroot}${prefix}/share/${name}/demo/*/*/CMakeFiles]
- eval delete [glob ${destroot}${prefix}/share/${name}/examples/*/CMakeFiles]
- }
-}
-
</del><span class="cx"> variant debug description {Build with debug symbols} {
</span><span class="cx"> configure.args-delete -DCMAKE_BUILD_TYPE=Release
</span><span class="cx"> configure.args-append -DCMAKE_BUILD_TYPE=Debug
</span></span></pre></div>
<a id="trunkdportsgiscgalfilespatchCMakeListstxtdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff (130956 => 130957)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff 2015-01-04 06:01:11 UTC (rev 130956)
+++ trunk/dports/gis/cgal/files/patch-CMakeLists.txt.diff 2015-01-04 06:56:07 UTC (rev 130957)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>---- demo/Mesh_3/CMakeLists.txt.orig 2011-09-05 15:47:29.000000000 +0200
-+++ demo/Mesh_3/CMakeLists.txt 2011-09-29 16:51:17.000000000 +0200
-@@ -202,7 +202,7 @@
- else()
- set(other_sources ${ARGN_TAIL})
- endif()
-- qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc )
-+ qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.moc" )
- add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
-
- add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
---- demo/Mesh_3/implicit_functions/CMakeLists.txt.orig 2011-09-05 15:47:29.000000000 +0200
-+++ demo/Mesh_3/implicit_functions/CMakeLists.txt 2011-09-29 16:51:17.000000000 +0200
-@@ -51,7 +51,7 @@
- else()
- set(other_sources ${ARGN_TAIL})
- endif()
-- qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc )
-+ qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.moc" )
- add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
-
- add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
---- demo/Surface_reconstruction_points_3/CMakeLists.txt.orig 2011-09-05 15:47:56.000000000 +0200
-+++ demo/Surface_reconstruction_points_3/CMakeLists.txt 2011-09-29 16:51:17.000000000 +0200
-@@ -219,7 +219,7 @@
- else()
- set(other_sources ${ARGN_TAIL})
- endif()
-- qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" ${plugin_implementation_base_name}.moc )
-+ qt4_generate_moc( "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.moc" )
- add_file_dependencies( ${plugin_implementation_base_name}.moc "${CMAKE_CURRENT_SOURCE_DIR}/${plugin_implementation_base_name}.cpp" )
-
- add_library(${plugin_name} MODULE ${option} ${plugin_implementation_base_name}.moc ${plugin_implementation_base_name}.cpp ${other_sources})
</del></span></pre>
</div>
</div>
</body>
</html>