<!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>[116846] users/cal/ports/macports/mpstats</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/116846">116846</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-02-08 06:41:30 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mpstats: move UUID to $prefix/var/macports/stats-uuid, move config to $prefix/etc/macports/stats.conf
Don't reinplace stats.conf and install it directly (rather than just as
.default) so we can update the stats URL for existing users.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#userscalportsmacportsmpstatsPortfile">users/cal/ports/macports/mpstats/Portfile</a></li>
<li><a href="#userscalportsmacportsmpstatsfilesmpstatstcl">users/cal/ports/macports/mpstats/files/mpstats.tcl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#userscalportsmacportsmpstatsfilesstatsconf">users/cal/ports/macports/mpstats/files/stats.conf</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#userscalportsmacportsmpstatsfilesmpstatsconf">users/cal/ports/macports/mpstats/files/mpstats.conf</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="userscalportsmacportsmpstatsPortfile"></a>
<div class="modfile"><h4>Modified: users/cal/ports/macports/mpstats/Portfile (116845 => 116846)</h4>
<pre class="diff"><span>
<span class="info">--- users/cal/ports/macports/mpstats/Portfile 2014-02-08 14:12:48 UTC (rev 116845)
+++ users/cal/ports/macports/mpstats/Portfile 2014-02-08 14:41:30 UTC (rev 116846)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name mpstats
</span><del>-version 0.1
</del><ins>+version 0.1.2
</ins><span class="cx"> categories sysutils
</span><span class="cx"> license BSD
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -52,9 +52,11 @@
</span><span class="cx"> ${worksrcpath}/mpstats.plist.default \
</span><span class="cx"> ${destroot}${launchd_dir}${startupitem.plist}.default
</span><span class="cx">
</span><ins>+ xinstall -m 755 -d \
+ ${destroot}${prefix}/etc/macports
</ins><span class="cx"> xinstall -m 444 \
</span><del>- ${filespath}/mpstats.conf \
- ${destroot}${prefix}/etc/mpstats.conf.default
</del><ins>+ ${filespath}/stats.conf \
+ ${destroot}${prefix}/etc/macports/stats.conf
</ins><span class="cx">
</span><span class="cx"> # install the plist, if startupitem.install is set
</span><span class="cx"> if {[getuid] == 0 && ${startupitem.install} ne no} {
</span><span class="lines">@@ -66,13 +68,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-activate {
</span><del>- if {![file exists ${prefix}/etc/mpstats.conf]} {
- xinstall -m 644 \
- ${prefix}/etc/mpstats.conf.default \
- ${prefix}/etc/mpstats.conf
-
- reinplace "s|@STATS_UUID@|[exec uuidgen]|" \
- ${prefix}/etc/mpstats.conf
</del><ins>+ set uuidfile ${prefix}/var/macports/stats-uuid
+ if {![file exists ${uuidfile}] || [file size ${uuidfile}] == 0} {
+ set uuid [exec /usr/bin/uuidgen]
+ set fd [open ${uuidfile} w]
+ puts $fd $uuid
+ close $fd
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # the result of this will usually be too large for a 64bit integer, but we don't really care
</span></span></pre></div>
<a id="userscalportsmacportsmpstatsfilesmpstatsconf"></a>
<div class="delfile"><h4>Deleted: users/cal/ports/macports/mpstats/files/mpstats.conf (116845 => 116846)</h4>
<pre class="diff"><span>
<span class="info">--- users/cal/ports/macports/mpstats/files/mpstats.conf 2014-02-08 14:12:48 UTC (rev 116845)
+++ users/cal/ports/macports/mpstats/files/mpstats.conf 2014-02-08 14:41:30 UTC (rev 116846)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>-# $Id$
-# configuration for mpstats
-
-# Where to submit usage data
-stats_url http://stats.macports.neverpanic.de/submissions
-
-# Unique identifier for usage statistics - should be of the form produced by
-# `uuidgen`. Note that mpstats.conf.default has a placeholder value here, as
-# the id needs to be unique for each installation and so can't be generated
-# in advance or included in the archive.
-stats_id @STATS_UUID@
</del></span></pre></div>
<a id="userscalportsmacportsmpstatsfilesmpstatstcl"></a>
<div class="modfile"><h4>Modified: users/cal/ports/macports/mpstats/files/mpstats.tcl (116845 => 116846)</h4>
<pre class="diff"><span>
<span class="info">--- users/cal/ports/macports/mpstats/files/mpstats.tcl 2014-02-08 14:12:48 UTC (rev 116845)
+++ users/cal/ports/macports/mpstats/files/mpstats.tcl 2014-02-08 14:41:30 UTC (rev 116846)
</span><span class="lines">@@ -49,21 +49,30 @@
</span><span class="cx">
</span><span class="cx"> proc read_config {} {
</span><span class="cx"> global prefix stats_url stats_id
</span><del>- set stats_url localhost
- set stats_id 123
- set conf_path "${prefix}/etc/mpstats.conf"
</del><ins>+ set conf_path "${prefix}/etc/macports/stats.conf"
</ins><span class="cx"> if {[file isfile $conf_path]} {
</span><span class="cx"> set fd [open $conf_path r]
</span><span class="cx"> while {[gets $fd line] >= 0} {
</span><span class="cx"> set optname [lindex $line 0]
</span><span class="cx"> if {$optname eq "stats_url"} {
</span><span class="cx"> set stats_url [lindex $line 1]
</span><del>- } elseif {$optname eq "stats_id"} {
- set stats_id [lindex $line 1]
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> close $fd
</span><span class="cx"> }
</span><ins>+
+ set uuid_path "${prefix}/var/macports/stats-uuid"
+ if {[file isfile $uuid_path]} {
+ set fd [open $uuid_path r]
+ gets $fd stats_id
+ close $fd
+ if {[string length $stats_id] == 0} {
+ puts stderr "UUID file ${uuid_path} seems to be empty. Abort."
+ }
+ } else {
+ puts stderr "UUID file ${uuid_path} missing. Abort."
+ exit 1
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # extraction of gcc version
</span><span class="lines">@@ -88,7 +97,8 @@
</span><span class="cx"> # Set gcc version
</span><span class="cx"> return $gcc_v
</span><span class="cx"> } else {
</span><del>- ui_warn "gcc exists but could not read version information"
</del><ins>+ # ui_warn "gcc exists but could not read version information"
+ # Don't warn since that's the default now that gcc -> clang
</ins><span class="cx"> return none
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="userscalportsmacportsmpstatsfilesstatsconffromrev116821userscalportsmacportsmpstatsfilesmpstatsconf"></a>
<div class="copfile"><h4>Copied: users/cal/ports/macports/mpstats/files/stats.conf (from rev 116821, users/cal/ports/macports/mpstats/files/mpstats.conf) (0 => 116846)</h4>
<pre class="diff"><span>
<span class="info">--- users/cal/ports/macports/mpstats/files/stats.conf (rev 0)
+++ users/cal/ports/macports/mpstats/files/stats.conf 2014-02-08 14:41:30 UTC (rev 116846)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+# $Id$
+# configuration for mpstats
+
+# Where to submit usage data
+stats_url http://stats.macports.neverpanic.de/submissions
</ins></span></pre>
</div>
</div>
</body>
</html>