[28412] trunk/dports/net/smokeping

source_changes at macosforge.org source_changes at macosforge.org
Thu Aug 30 11:29:15 PDT 2007


Revision: 28412
          http://trac.macosforge.org/projects/macports/changeset/28412
Author:   markd at macports.org
Date:     2007-08-30 11:29:15 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Update to 2.2.2.

Modified Paths:
--------------
    trunk/dports/net/smokeping/Portfile
    trunk/dports/net/smokeping/files/patch-bin-smokeping.dist
    trunk/dports/net/smokeping/files/patch-etc-config.dist
    trunk/dports/net/smokeping/files/patch-htdocs-smokeping.cgi.dist

Modified: trunk/dports/net/smokeping/Portfile
===================================================================
--- trunk/dports/net/smokeping/Portfile	2007-08-30 17:55:00 UTC (rev 28411)
+++ trunk/dports/net/smokeping/Portfile	2007-08-30 18:29:15 UTC (rev 28412)
@@ -3,9 +3,9 @@
 PortSystem 1.0
 PortGroup		perl5 1.0
 name			smokeping
-version			2.1.1
+version			2.2.2
 categories		net perl
-maintainers		markd at macports.org
+maintainers		markd
 description		A deluxe latency logging and graphing system.
 long_description	SmokePing is a deluxe latency measurement tool. \
 			It can measure, store, and display latency, latency \
@@ -17,7 +17,7 @@
 platforms		darwin
 homepage                http://oss.oetiker.ch/smokeping/
 master_sites		http://oss.oetiker.ch/smokeping/pub/
-checksums		md5 458234413003fd5efb04d61cdfd71da8
+checksums		md5 91ea44b6ba876e625653c2205c92c243
 
 patchfiles		patch-bin-smokeping.dist \
 			patch-bin-tSmoke.dist \
@@ -113,12 +113,9 @@
 	file copy ${worksrcpath}/TODO ${destroot}${smokedoc}
 
 # etc
-	xinstall -m 755 -d ${destroot}${smokeetc}
-	file copy ${worksrcpath}/etc/basepage.html.dist ${destroot}${smokeetc}/basepage.html
 # Leave the config.dist filename for users to remove so upgrades won't destroy the config file.
-	file copy ${worksrcpath}/etc/config.dist ${destroot}${smokeetc}/config.dist
-	file copy ${worksrcpath}/etc/smokemail.dist ${destroot}${smokeetc}/smokemail
-	file copy ${worksrcpath}/etc/tmail.dist ${destroot}${smokeetc}/tmail
+	xinstall -m 755 -d ${destroot}${smokeetc}
+	eval xinstall -m 640 [glob ${worksrcpath}/etc/*.dist] ${destroot}${smokeetc}
 
 # lib
 	system "cp -R ${worksrcpath}/lib/ ${destroot}${smokeroot}"
@@ -202,9 +199,9 @@
 	sudo kill -HUP `cat /var/run/syslog.pid`
 
 
-5) Rename and edit the ${smokeetc}/config sample file, then test your config file.
+5) Rename and edit the ${smokeetc}/config sample files, then test your config file.
 
-   -Remove the .dist extension.  Smokeping's config file must be named 'config'.
+   -Remove the .dist extension from all files; do not change the filenames.
 
         cd ${smokeetc}
         sudo mv config.dist config

Modified: trunk/dports/net/smokeping/files/patch-bin-smokeping.dist
===================================================================
--- trunk/dports/net/smokeping/files/patch-bin-smokeping.dist	2007-08-30 17:55:00 UTC (rev 28411)
+++ trunk/dports/net/smokeping/files/patch-bin-smokeping.dist	2007-08-30 18:29:15 UTC (rev 28412)
@@ -1,23 +1,23 @@
---- bin/smokeping.dist.org.dist	2007-04-29 03:42:22.000000000 -0700
-+++ bin/smokeping.dist	2007-04-29 14:42:19.000000000 -0700
+--- bin/smokeping.dist.org	2007-08-30 08:07:38.000000000 -0700
++++ bin/smokeping.dist	2007-08-30 09:28:13.000000000 -0700
 @@ -1,12 +1,12 @@
 -#!/usr/sepp/bin/perl-5.8.4 -w
 +#!__PREFIX__/bin/perl -w
  # -*-perl-*-
  
--use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl);
+-use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl);
 -use lib qw(lib);
 +use lib qw(__PERL5__ARCHLIB__/auto/RRDs);
 +use lib qw(__PREFIX__/lib/smokeping);
  
- use Smokeping 2.001001;
+ use Smokeping 2.002002;
   
 -Smokeping::main("etc/config.dist");
 +Smokeping::main("__PREFIX__/etc/smokeping/config");
  
  =head1 NAME
  
-@@ -112,22 +112,7 @@
+@@ -118,22 +118,7 @@
  
  =head1 SETUP
  

Modified: trunk/dports/net/smokeping/files/patch-etc-config.dist
===================================================================
--- trunk/dports/net/smokeping/files/patch-etc-config.dist	2007-08-30 17:55:00 UTC (rev 28411)
+++ trunk/dports/net/smokeping/files/patch-etc-config.dist	2007-08-30 18:29:15 UTC (rev 28412)
@@ -1,17 +1,17 @@
---- etc/config.dist.org.dist	2006-03-24 08:51:02.000000000 -0800
-+++ etc/config.dist	2007-01-26 23:21:44.000000000 -0800
-@@ -7,16 +7,16 @@
- owner    = Joe Random
- contact  = joe at some.place.xyz
- mailhost = smtp.mailhost.abc
+--- etc/config.dist.org	2007-08-30 00:09:38.000000000 -0700
++++ etc/config.dist	2007-08-30 09:20:18.000000000 -0700
+@@ -3,16 +3,16 @@
+ owner    = Tobi Oetiker
+ contact  = tobi at oetiker.ch
+ mailhost = johan.oetiker.ch
 -sendmail = /usr/lib/sendmail
--imgcache = /home/oetiker/public_html/.simg
--imgurl   = ../.simg
--datadir  = /home/oetiker/data/projects/AADJ-smokeping/dist/var
--piddir  = /home/oetiker/data/projects/AADJ-smokeping/dist/var
--cgiurl   = http://people.ee.ethz.ch/~oetiker/smokeping/smokeping.cgi
--smokemail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/smokemail.dist
--tmail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/tmail.dist
+-imgcache = /home/oetiker/public_html/smokeping-ms/cache
+-imgurl   = cache
+-datadir  = /tmp/smokeping-ms/data
+-piddir  = /tmp/smokeping-ms/var
+-cgiurl   = http://johan.oetiker.ch/~oetiker/smokeping-ms/smokeping.cgi
+-smokemail = /scratch/oetiker/smoke-master/etc/smokemail.dist
+-tmail = /scratch/oetiker/smoke-master/etc/tmail.dist
 +sendmail = /usr/sbin/sendmail
 +imgcache = __PREFIX__/var/smokeping
 +imgurl   = http://myhost.mycompany.com/smokeping
@@ -26,21 +26,25 @@
  # each probe is now run in its own process
  # disable this to revert to the old behaviour
  # concurrentprobes = no
-@@ -66,7 +66,7 @@
+@@ -44,7 +44,7 @@
  
  *** Presentation ***
  
--template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist
+-template = /scratch/oetiker/smoke-master/etc/basepage.html.dist
 +template = __PREFIX__/etc/smokeping/basepage.html
  
- + overview 
+ + charts
  
-@@ -89,7 +89,7 @@
+@@ -96,10 +96,10 @@
  
  + FPing
  
--binary = /usr/sepp/bin/fping
+-binary = /usr/sbin/fping
 +binary = __PREFIX__/sbin/fping
  
- *** Targets ***
- 
+ *** Slaves ***
+-secrets=/scratch/oetiker/smoke-master/etc/smokeping_secrets.dist
++secrets=__PREFIX__/etc/smokeping/smokeping_secrets.dist
+ +boomer
+ display_name=boomer
+ color=0000ff

Modified: trunk/dports/net/smokeping/files/patch-htdocs-smokeping.cgi.dist
===================================================================
--- trunk/dports/net/smokeping/files/patch-htdocs-smokeping.cgi.dist	2007-08-30 17:55:00 UTC (rev 28411)
+++ trunk/dports/net/smokeping/files/patch-htdocs-smokeping.cgi.dist	2007-08-30 18:29:15 UTC (rev 28412)
@@ -11,7 +11,7 @@
 +use lib qw(__PREFIX__/lib/smokeping);
  use CGI::Carp qw(fatalsToBrowser);
  
- use Smokeping 2.001001;
+ use Smokeping 2.002002;
  
 -Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 +Smokeping::cgi("__PREFIX__/etc/smokeping/config");

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070830/f55f46e4/attachment.html


More information about the macports-changes mailing list