<!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>[138309] trunk/dports</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/138309">138309</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-07-05 06:03:32 -0700 (Sun, 05 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make db_select into a stub that just cleans up the symlinks it formerly enabled, because actually using it caused breakage. (#47921) No rev bumps for db46 and db48; reinstalling them is neither necessary nor sufficient to fix the problem.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesdb46Portfile">trunk/dports/databases/db46/Portfile</a></li>
<li><a href="#trunkdportsdatabasesdb48Portfile">trunk/dports/databases/db48/Portfile</a></li>
<li><a href="#trunkdportssysutilsdb_selectPortfile">trunk/dports/sysutils/db_select/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesdb46filesdb46">trunk/dports/databases/db46/files/db46</a></li>
<li><a href="#trunkdportsdatabasesdb48filesdb48">trunk/dports/databases/db48/files/db48</a></li>
<li>trunk/dports/sysutils/db_select/files/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabasesdb46Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/db46/Portfile (138308 => 138309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db46/Portfile 2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/databases/db46/Portfile 2015-07-05 13:03:32 UTC (rev 138309)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup muniversal 1.0
</span><del>-PortGroup select 1.0
</del><span class="cx">
</span><span class="cx"> name db46
</span><span class="cx"> version 4.6.21
</span><span class="lines">@@ -130,9 +129,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {$subport == $name} {
</span><del>- depends_run-append port:db_select
- select.group db
- select.file ${filespath}/db46
</del><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> foreach bin [glob -tails -directory ${destroot}${prefix}/bin/ db_*] {
</span><span class="lines">@@ -142,7 +138,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> delete ${destroot}${prefix}/share/doc/${name}/java
</span><del>- select::install ${select.group} ${select.file}
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Delete this variant on or after 2013-10-08.
</span></span></pre></div>
<a id="trunkdportsdatabasesdb46filesdb46"></a>
<div class="delfile"><h4>Deleted: trunk/dports/databases/db46/files/db46 (138308 => 138309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db46/files/db46 2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/databases/db46/files/db46 2015-07-05 13:03:32 UTC (rev 138309)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-include/db46/db.h
-include/db46/db_cxx.h
-lib/db46/libdb.a
-lib/db46/libdb.dylib
-lib/db46/libdb_cxx.a
-lib/db46/libdb_cxx.dylib
</del></span></pre></div>
<a id="trunkdportsdatabasesdb48Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/db48/Portfile (138308 => 138309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db48/Portfile 2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/databases/db48/Portfile 2015-07-05 13:03:32 UTC (rev 138309)
</span><span class="lines">@@ -3,7 +3,6 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup muniversal 1.0
</span><del>-PortGroup select 1.0
</del><span class="cx">
</span><span class="cx"> name db48
</span><span class="cx"> version 4.8.30
</span><span class="lines">@@ -50,10 +49,6 @@
</span><span class="cx"> }
</span><span class="cx"> configure.cxx ${configure.cxx} ${cxx_stdlibflags}
</span><span class="cx">
</span><del>-depends_run-append port:db_select
-select.group db
-select.file ${filespath}/db48
-
</del><span class="cx"> destroot.args docdir=${prefix}/share/doc/${name}
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span></span></pre></div>
<a id="trunkdportsdatabasesdb48filesdb48"></a>
<div class="delfile"><h4>Deleted: trunk/dports/databases/db48/files/db48 (138308 => 138309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/db48/files/db48 2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/databases/db48/files/db48 2015-07-05 13:03:32 UTC (rev 138309)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-include/db48/db.h
-include/db48/db_cxx.h
-lib/db48/libdb.a
-lib/db48/libdb.dylib
-lib/db48/libdb_cxx.a
-lib/db48/libdb_cxx.dylib
</del></span></pre></div>
<a id="trunkdportssysutilsdb_selectPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/db_select/Portfile (138308 => 138309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/db_select/Portfile 2015-07-05 12:20:59 UTC (rev 138308)
+++ trunk/dports/sysutils/db_select/Portfile 2015-07-05 13:03:32 UTC (rev 138309)
</span><span class="lines">@@ -1,21 +1,17 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup select 1.0
</del><span class="cx">
</span><span class="cx"> name db_select
</span><span class="cx"> version 0.1
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories sysutils
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> supported_archs noarch
</span><del>-description common files for selecting default db version
-long_description db_select installs files that allow 'port select' to \
- switch the default version of db. \
- It symlinks the standard compiler executables \
- in the MacPorts prefix to the selected version.
</del><ins>+description stub port
+long_description This port is only a stub.
</ins><span class="cx">
</span><span class="cx"> homepage http://www.macports.org/
</span><span class="cx"> distfiles
</span><span class="lines">@@ -23,8 +19,20 @@
</span><span class="cx"> use_configure no
</span><span class="cx"> build {}
</span><span class="cx"> destroot {
</span><del>- select::install db ${filespath}/base
- select::install db ${filespath}/none
</del><ins>+ xinstall -d ${destroot}${prefix}/share/doc/${name}
+ system "echo '$long_description' > ${destroot}${prefix}/share/doc/${name}/README.txt"
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+# Clean up symlinks from using 'port select db'
+# https://trac.macports.org/ticket/47921
+post-activate {
+ set file_list [list include/db.h include/db_cxx.h lib/libdb.a lib/libdb.dylib lib/libdb_cxx.a lib/libdb_cxx.dylib]
+ foreach f $file_list {
+ set fullpath ${prefix}/${f}
+ if {![catch {file type $fullpath}] && [registry_file_registered $fullpath] == "0"} {
+ file delete -force $fullpath
+ }
+ }
+}
+
</ins><span class="cx"> livecheck.type none
</span></span></pre>
</div>
</div>
</body>
</html>