<!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>[118771] trunk/dports/devel</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/118771">118771</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2014-04-10 17:13:11 -0700 (Thu, 10 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>valgrind{,-devel}: combine into one portfile using subport</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelvalgrindPortfile">trunk/dports/devel/valgrind/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/devel/valgrind-devel/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelvalgrindPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/valgrind/Portfile (118770 => 118771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/valgrind/Portfile 2014-04-11 00:13:06 UTC (rev 118770)
+++ trunk/dports/devel/valgrind/Portfile 2014-04-11 00:13:11 UTC (rev 118771)
</span><span class="lines">@@ -9,7 +9,6 @@
</span><span class="cx"> mpi.setup
</span><span class="cx">
</span><span class="cx"> name valgrind
</span><del>-conflicts valgrind-devel
</del><span class="cx"> version 3.9.0
</span><span class="cx"> revision 1
</span><span class="cx"> categories devel
</span><span class="lines">@@ -27,29 +26,15 @@
</span><span class="cx">
</span><span class="cx"> homepage http://valgrind.org
</span><span class="cx"> master_sites http://valgrind.org/downloads/
</span><del>-use_bzip2 yes
</del><span class="cx">
</span><span class="cx"> checksums md5 0947de8112f946b9ce64764af7be6df2 \
</span><span class="cx"> sha1 9415e28933de9d6687f993c4bb797e6bd49583f1 \
</span><span class="cx"> sha256 e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0
</span><span class="cx">
</span><del>-# Avoid conflict of faq.html and FAQ.html, #30541
-extract.post_args-append --exclude=${distname}/docs/html/FAQ.html
-
-pre-fetch {
- if {${os.platform} eq "darwin" && (${os.major} < 9 || ${os.major} > 12)} {
- ui_error "${name} ${version} is only compatible with Mac OS X 10.5, 10.6, 10.7 and 10.8"
- return -code error "incompatible Mac OS X version"
- }
-}
-
</del><span class="cx"> depends_build bin:perl:perl5
</span><span class="cx"> # Ignore trace reports about boost, Qt and OpenMP
</span><span class="cx"> # as they are only used for tests
</span><span class="cx">
</span><del>-patchfiles link_tool_exe_darwin-ccache.diff \
- patch-compat-snowleo.diff
-
</del><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --without-mpicc
</span><span class="cx">
</span><span class="lines">@@ -85,6 +70,46 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type regex
-livecheck.url ${homepage}
-livecheck.regex ${name}-(\\d(?:\\.\\d)+)
</del><ins>+if {$subport eq $name} {
+ conflicts valgrind-devel
+ use_bzip2 yes
+
+ # Avoid conflict of faq.html and FAQ.html, #30541
+ extract.post_args-append --exclude=${distname}/docs/html/FAQ.html
+
+ pre-fetch {
+ if {${os.platform} eq "darwin" && (${os.major} < 9 || ${os.major} > 12)} {
+ ui_error "${name} ${version} is only compatible with Mac OS X 10.5, 10.6, 10.7 and 10.8"
+ return -code error "incompatible Mac OS X version"
+ }
+ }
+
+ patchfiles-append link_tool_exe_darwin-ccache.diff \
+ patch-compat-snowleo.diff
+
+ livecheck.type regex
+ livecheck.url ${homepage}
+ livecheck.regex ${name}-(\\d(?:\\.\\d)+)
+}
+
+subport valgrind-devel {
+ conflicts valgrind
+
+ svn.revision 13710
+ set vex_revision 2797
+ version 3.9.0-r${svn.revision}
+ revision 1
+
+ fetch.type svn
+ svn.url svn://svn.valgrind.org/valgrind/trunk
+ svn.args --ignore-externals
+ worksrcdir trunk
+
+ post-fetch {
+ system -W ${worksrcpath} "${svn.cmd} ${svn.pre_args} ${svn.method} svn://svn.valgrind.org/vex/trunk@${vex_revision} VEX"
+ }
+
+ use_autoreconf yes
+
+ livecheck.type none
+}
</ins></span></pre>
</div>
</div>
</body>
</html>