Update to 2.2.7

New in Version 2.2
* Ajax based ineractive graph zooming.
Click on any graph in detail mode and use the mouse to mark your area of
interest in navigator graph.
* Multi Target Graphs
Show information from multiple targts in a graph.
* Master/Slave setup for multi source smokeping deployments.
With one central Smokeping Master node, you can run a series of Slave nodes,
taking their configuration from the master. This allows you to ping a single
target from multiple locations.
* Standard Deviation
The standard deviation is now used in several places to give a number for
the variation in round trip times as depicted by the smoke.

See http://oss.oetiker.ch/smokeping/pub/CHANGES for all the details.

OK'ed bouyer@

9 files changed, 150 insertions, 56 deletions

diff --git a/net/smokeping/MESSAGE b/net/smokeping/MESSAGE
index 9008b149277..beff7a084d0 100644
--- a/net/smokeping/MESSAGE
+++ b/net/smokeping/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: MESSAGE,v 1.4 2007/11/22 20:25:54 adrianp Exp $
 
 Smokeping is now installed.
 The documentation can be found at ${PREFIX}/share/doc/smokeping/
@@ -7,14 +7,26 @@ The documentation can be found at ${PREFIX}/share/doc/smokeping/
 A sample config file can be found in:
 	${PREFIX}/share/examples/smokeping/config.dist
 
-Please copy it as ${PKG_SYSCONFDIR}/config and adjust it as needed.
-You may also want to have a look at basepage.html and smokemail in
-this directory.
+A copy has been installed as ${PKG_SYSCONFDIR}/config and you will
+need to adjust it as needed.  You may also want to have a look at
+basepage.html and smokemail in this directory.
 
-Also, make sure that your web's server /cgi-bin/smokeping.cgi refers to
+Make sure that your web's server /cgi-bin/smokeping.cgi refers to
 ${PREFIX}/libexec/cgi-bin/smokeping.cgi, or copy the smokeping in your
 web server's cgi space.
 
-If upgrading from version 1.x there is detailed information on what has
-changed available on the smokeping homepage.
+You will need to make smokeping accessible through your HTTP server.
+If you are running Apache then you may add the following lines to httpd.conf:
+
+	Include ${PKG_SYSCONFDIR}/smokeping.conf
+
+to make smokeping accessible through:
+
+	http://localhost/cgi-bin/smokeping.cgi
+
+Please remember to grant write permissions to the following directory for
+the user your web server runs as:
+
+	${PREFIX}/share/smokeping/.simg
+
 ===========================================================================
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 423a5a5952c..8ff3313fa9e 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:59 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/11/22 20:25:54 adrianp Exp $
 
-DISTNAME=	smokeping-2.0.9
+DISTNAME=	smokeping-2.2.7
 CATEGORIES=	net
 MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/
 
@@ -19,12 +19,15 @@ NO_BUILD=	YES
 PKG_SYSCONFSUBDIR?=	smokeping
 SMOKEPING_HOME=		${VARBASE}/db/smokeping
 MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+BUILD_DEFS+=		VARBASE
 
 EGDIR=		${PREFIX}/share/examples/smokeping
+SPDIR=		${PREFIX}/share/smokeping
 CONF_FILES=	${EGDIR}/basepage.html.dist ${PKG_SYSCONFDIR}/basepage.html
 CONF_FILES+=	${EGDIR}/smokemail.dist ${PKG_SYSCONFDIR}/smokemail
 CONF_FILES+=	${EGDIR}/config.dist ${PKG_SYSCONFDIR}/config
 CONF_FILES+=	${EGDIR}/tmail.dist ${PKG_SYSCONFDIR}/tmail
+CONF_FILES+=	${EGDIR}/smokeping.conf ${PKG_SYSCONFDIR}/smokeping.conf
 RCD_SCRIPTS=	smokeping
 REPLACE_PERL=	bin/smokeping.dist bin/tSmoke.dist
 
@@ -33,13 +36,17 @@ REPLACE_PERL=	bin/smokeping.dist bin/tSmoke.dist
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-patch
 SUBST_FILES.files=	bin/smokeping.dist htdocs/smokeping.cgi.dist \
-			etc/config.dist etc/smokemail.dist bin/tSmoke.dist
+			etc/config.dist etc/smokemail.dist bin/tSmoke.dist \
+			etc/basepage.html.dist smokeping.conf
 SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_SED.files+=	-e "s|@VARBASE@|${VARBASE}|g"
 SUBST_SED.files+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_SED.files+=	-e "s|@INTERP@|${INTERP}|g"
 SUBST_SED.files+=	-e "s|perl-5.8.4|perl|g"
 SUBST_SED.files+=	-e "s|/usr/bin/perl|${PERL5}|g"
+SUBST_SED.files+=	-e "s|@SPDIR@|${SPDIR}|g"
+SUBST_SED.files+=	-e "s|cropper/|/smokeping/cropper/|g"
+SUBST_SED.files+=	-e "s|= cache|= /smokeping/.simg|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 OWN_DIRS+=		${SMOKEPING_HOME}
@@ -48,14 +55,22 @@ INSTALLATION_DIRS=	bin libexec/cgi-bin
 
 .include "options.mk"
 
+post-extract:
+	${CP} ${FILESDIR}/smokeping.conf ${WRKSRC}
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Config
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Config/Grammar
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Smokeping
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Smokeping/matchers
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Smokeping/probes
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Smokeping/sorters
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/smokeping
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${SPDIR}
+	${INSTALL_DATA_DIR} ${SPDIR}/.simg
+	${INSTALL_DATA_DIR} ${SPDIR}/cropper
 
 	for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/smokeping; \
@@ -66,7 +81,7 @@ do-install:
 	done
 
 	for FILE in ${WRKSRC}/doc/examples/config.*; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/smokeping; \
+	  ${INSTALL_DATA} $$FILE ${EGDIR}; \
 	done
 
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist ${PREFIX}/bin/smokeping
@@ -83,6 +98,10 @@ do-install:
 	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Config; \
 	done
 
+	for FILE in ${WRKSRC}/lib/Config/Grammar/*.pm; do \
+	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Config/Grammar; \
+	done
+
 	for FILE in ${WRKSRC}/lib/Smokeping/*.pm; do \
 	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping; \
 	done
@@ -95,12 +114,19 @@ do-install:
 	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping/probes; \
 	done
 
+	for FILE in ${WRKSRC}/lib/Smokeping/sorters/*.pm; do \
+	  ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping/sorters; \
+	done
+
+	cd ${WRKSRC}/htdocs/cropper && ${PAX} -rw -pm . ${SPDIR}/cropper
+
 	for FILE in ${WRKSRC}/etc/config.dist \
 	    ${WRKSRC}/etc/basepage.html.dist \
 	    ${WRKSRC}/etc/tmail.dist \
 	    ${WRKSRC}/etc/config.dist \
+	    ${WRKSRC}/smokeping.conf \
 	    ${WRKSRC}/etc/smokemail.dist; do \
-	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/smokeping; \
+	  ${INSTALL_DATA} $$FILE ${EGDIR}; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/smokeping/PLIST b/net/smokeping/PLIST
index c7d21293f7d..6f478daff07 100644
--- a/net/smokeping/PLIST
+++ b/net/smokeping/PLIST
@@ -1,19 +1,28 @@
-@comment $NetBSD: PLIST,v 1.7 2006/08/09 21:48:53 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/11/22 20:25:54 adrianp Exp $
 bin/smokeping
 bin/tSmoke
 lib/smokeping/BER.pm
 lib/smokeping/Config/Grammar.pm
+lib/smokeping/Config/Grammar/Document.pm
+lib/smokeping/Config/Grammar/Dynamic.pm
 lib/smokeping/SNMP_Session.pm
 lib/smokeping/SNMP_util.pm
 lib/smokeping/Smokeping.pm
+lib/smokeping/Smokeping/Colorspace.pm
+lib/smokeping/Smokeping/Config.pm
 lib/smokeping/Smokeping/Examples.pm
+lib/smokeping/Smokeping/Graphs.pm
+lib/smokeping/Smokeping/Master.pm
+lib/smokeping/Smokeping/RRDhelpers.pm
 lib/smokeping/Smokeping/RRDtools.pm
+lib/smokeping/Smokeping/Slave.pm
 lib/smokeping/Smokeping/ciscoRttMonMIB.pm
 lib/smokeping/Smokeping/matchers/Avgratio.pm
 lib/smokeping/Smokeping/matchers/Median.pm
 lib/smokeping/Smokeping/matchers/base.pm
 lib/smokeping/Smokeping/matchers/CheckLatency.pm
 lib/smokeping/Smokeping/matchers/CheckLoss.pm
+lib/smokeping/Smokeping/matchers/Medratio.pm
 lib/smokeping/Smokeping/probes/AnotherDNS.pm
 lib/smokeping/Smokeping/probes/AnotherSSH.pm
 lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm
@@ -23,13 +32,18 @@ lib/smokeping/Smokeping/probes/Curl.pm
 lib/smokeping/Smokeping/probes/DNS.pm
 lib/smokeping/Smokeping/probes/EchoPing.pm
 lib/smokeping/Smokeping/probes/EchoPingChargen.pm
+lib/smokeping/Smokeping/probes/EchoPingDNS.pm
 lib/smokeping/Smokeping/probes/EchoPingDiscard.pm
 lib/smokeping/Smokeping/probes/EchoPingHttp.pm
 lib/smokeping/Smokeping/probes/EchoPingHttps.pm
 lib/smokeping/Smokeping/probes/EchoPingIcp.pm
+lib/smokeping/Smokeping/probes/EchoPingLDAP.pm
+lib/smokeping/Smokeping/probes/EchoPingPlugin.pm
 lib/smokeping/Smokeping/probes/EchoPingSmtp.pm
+lib/smokeping/Smokeping/probes/EchoPingWhois.pm
 lib/smokeping/Smokeping/probes/FPing.pm
 lib/smokeping/Smokeping/probes/FPing6.pm
+lib/smokeping/Smokeping/probes/FTPtransfer.pm
 lib/smokeping/Smokeping/probes/IOSPing.pm
 lib/smokeping/Smokeping/probes/LDAP.pm
 lib/smokeping/Smokeping/probes/Radius.pm
@@ -37,12 +51,35 @@ lib/smokeping/Smokeping/probes/RemoteFPing.pm
 lib/smokeping/Smokeping/probes/SSH.pm
 lib/smokeping/Smokeping/probes/TacacsPlus.pm
 lib/smokeping/Smokeping/probes/TelnetIOSPing.pm
+lib/smokeping/Smokeping/probes/TelnetJunOSPing.pm
+lib/smokeping/Smokeping/probes/WebProxyFilter.pm
 lib/smokeping/Smokeping/probes/base.pm
 lib/smokeping/Smokeping/probes/basefork.pm
 lib/smokeping/Smokeping/probes/basevars.pm
 lib/smokeping/Smokeping/probes/passwordchecker.pm
 lib/smokeping/Smokeping/probes/skel.pm
+lib/smokeping/Smokeping/sorters/Loss.pm
+lib/smokeping/Smokeping/sorters/Max.pm
+lib/smokeping/Smokeping/sorters/Median.pm
+lib/smokeping/Smokeping/sorters/StdDev.pm
+lib/smokeping/Smokeping/sorters/base.pm
 libexec/cgi-bin/smokeping.cgi
+share/smokeping/cropper/cropper.css
+share/smokeping/cropper/cropper.js
+share/smokeping/cropper/cropper.uncompressed.js
+share/smokeping/cropper/lib/builder.js
+share/smokeping/cropper/lib/controls.js
+share/smokeping/cropper/lib/dragdrop.js
+share/smokeping/cropper/lib/effects.js
+share/smokeping/cropper/lib/prototype.js
+share/smokeping/cropper/lib/prototype.js.LICENSE
+share/smokeping/cropper/lib/scriptaculous.js
+share/smokeping/cropper/lib/slider.js
+share/smokeping/cropper/lib/unittest.js
+share/smokeping/cropper/licence.txt
+share/smokeping/cropper/marqueeHoriz.gif
+share/smokeping/cropper/marqueeVert.gif
+share/smokeping/cropper/smokeping-zoom.js
 share/doc/smokeping/CHANGES
 share/doc/smokeping/CONTRIBUTORS
 share/doc/smokeping/COPYING
@@ -56,6 +93,7 @@ share/doc/smokeping/smokeping_config.txt
 share/doc/smokeping/smokeping_examples.txt
 share/doc/smokeping/smokeping_extend.txt
 share/doc/smokeping/smokeping_install.txt
+share/doc/smokeping/smokeping_master_slave.txt
 share/doc/smokeping/smokeping_upgrade.txt
 share/doc/smokeping/tSmoke.txt
 share/examples/rc.d/smokeping
@@ -67,12 +105,19 @@ share/examples/smokeping/config.multiple-probes
 share/examples/smokeping/config.simple
 share/examples/smokeping/config.targetvars-with-Curl
 share/examples/smokeping/config.template
+share/examples/smokeping/smokeping.conf
 share/examples/smokeping/smokemail.dist
 share/examples/smokeping/tmail.dist
 @dirrm share/examples/smokeping
 @dirrm share/doc/smokeping
+@dirrm share/smokeping/cropper/lib
+@dirrm share/smokeping/cropper
+@dirrm share/smokeping/.simg
+@dirrm share/smokeping
 @dirrm lib/smokeping/Smokeping/probes
 @dirrm lib/smokeping/Smokeping/matchers
+@dirrm lib/smokeping/Smokeping/sorters
 @dirrm lib/smokeping/Smokeping
+@dirrm lib/smokeping/Config/Grammar
 @dirrm lib/smokeping/Config
 @dirrm lib/smokeping
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index 7ba639e4418..c85276890ef 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2007/11/22 20:25:54 adrianp Exp $
 
-SHA1 (smokeping-2.0.9.tar.gz) = 89427122eada5fdf5f6145705f080583fb2d245a
-RMD160 (smokeping-2.0.9.tar.gz) = 3ddbe35f6ec634773d6facc5d7e4c17c17753984
-Size (smokeping-2.0.9.tar.gz) = 393777 bytes
-SHA1 (patch-aa) = 10784cd4e981ad7acedaee6b661ac802d9a31e2e
-SHA1 (patch-ab) = 56d9f1e7e850f476309474c7a256b654092960dc
-SHA1 (patch-ac) = 504f7c3ae3d3369facfafe80f742dfb63f416537
-SHA1 (patch-ad) = f512f9964d81d0231d01a8c0c80e7b193ecb757a
+SHA1 (smokeping-2.2.7.tar.gz) = 5011db1ccefa0d5ec967006fc482b42c4ebbeadb
+RMD160 (smokeping-2.2.7.tar.gz) = 037b3f8ac442b270e9633769635a0de1f8286454
+Size (smokeping-2.2.7.tar.gz) = 557546 bytes
+SHA1 (patch-aa) = f7d5bdf27df7be788a016aad71a894e03ad07bb8
+SHA1 (patch-ab) = 0a6afc983a48da77369b45220b69589901c7b93a
+SHA1 (patch-ac) = cb822e28a25672e08a9e0255615a580bbaee7432
+SHA1 (patch-ad) = 7726e0c3697e32d93218358078800fce5428b1b2
diff --git a/net/smokeping/files/smokeping.conf b/net/smokeping/files/smokeping.conf
new file mode 100644
index 00000000000..4ada02ffac4
--- /dev/null
+++ b/net/smokeping/files/smokeping.conf
@@ -0,0 +1,12 @@
+# $NetBSD: smokeping.conf,v 1.1 2007/11/22 20:25:54 adrianp Exp $
+#
+# smokeping configuration file fragment for Apache
+
+<IfModule mod_alias.c>
+    Alias /smokeping/ "@SPDIR@/"
+</IfModule>
+
+<Directory "@SPDIR@">
+    Order allow,deny
+    Allow from all
+</Directory>
diff --git a/net/smokeping/patches/patch-aa b/net/smokeping/patches/patch-aa
index defc45cc71b..accf655f7ac 100644
--- a/net/smokeping/patches/patch-aa
+++ b/net/smokeping/patches/patch-aa
@@ -1,23 +1,23 @@
-$NetBSD: patch-aa,v 1.6 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: patch-aa,v 1.7 2007/11/22 20:25:54 adrianp Exp $
 
---- bin/smokeping.dist.orig	2006-07-14 12:17:59.000000000 +0100
+--- bin/smokeping.dist.orig	2007-11-05 21:59:38.000000000 +0000
 +++ bin/smokeping.dist
 @@ -1,12 +1,11 @@
  #!/usr/sepp/bin/perl-5.8.4 -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(@PREFIX@/lib/smokeping);
  
- use Smokeping 2.000009;
+ use Smokeping 2.002007;
   
 -Smokeping::main("etc/config.dist");
 +Smokeping::main("@PKG_SYSCONFDIR@/config");
  
  =head1 NAME
  
-@@ -117,17 +116,17 @@ local system. Three paths have to be ent
+@@ -128,17 +127,17 @@ local system. Three paths have to be ent
  
  One pointing to your B<rrdtool> installation
  
diff --git a/net/smokeping/patches/patch-ab b/net/smokeping/patches/patch-ab
index 984c0c63a5b..544adee168b 100644
--- a/net/smokeping/patches/patch-ab
+++ b/net/smokeping/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: patch-ab,v 1.7 2007/11/22 20:25:54 adrianp Exp $
 
---- htdocs/smokeping.cgi.dist.orig	2006-07-14 12:17:59.000000000 +0100
+--- htdocs/smokeping.cgi.dist.orig	2007-11-05 21:59:38.000000000 +0000
 +++ htdocs/smokeping.cgi.dist
 @@ -1,13 +1,12 @@
 -#!/usr/sepp/bin/speedy -w
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.6 2006/08/09 21:48:53 adrianp Exp $
 +use lib qw(@PREFIX@/lib/smokeping);
  use CGI::Carp qw(fatalsToBrowser);
  
- use Smokeping 2.000009;
+ use Smokeping 2.002007;
  
 -Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 +Smokeping::cgi("@PKG_SYSCONFDIR@/config");
diff --git a/net/smokeping/patches/patch-ac b/net/smokeping/patches/patch-ac
index ec0435fd530..134d35a26cc 100644
--- a/net/smokeping/patches/patch-ac
+++ b/net/smokeping/patches/patch-ac
@@ -1,27 +1,26 @@
-$NetBSD: patch-ac,v 1.5 2005/10/28 21:43:18 adrianp Exp $
+$NetBSD: patch-ac,v 1.6 2007/11/22 20:25:54 adrianp Exp $
 
---- etc/config.dist.orig	2005-10-23 22:19:51.000000000 +0100
+--- etc/config.dist.orig	2007-10-15 08:49:18.000000000 +0100
 +++ etc/config.dist
-@@ -4,17 +4,17 @@
- 
+@@ -1,16 +1,16 @@
  *** General ***
  
--owner    = Joe Random
--contact  = joe@some.place.xyz
--mailhost = smtp.mailhost.abc
+-owner    = Peter Random
+-contact  = some@address.nowhere
+-mailhost = my.mail.host
 -sendmail = /usr/lib/sendmail
--imgcache = /home/oetiker/public_html/.simg
+-imgcache = /home/oetiker/public_html/smokeping-ms/cache
 +owner    = Charlie Root
 +contact  = root@localhost
 +mailhost = smtp.mynet
 +sendmail = /usr/sbin/sendmail
-+imgcache = @PREFIX@/share/httpd/htdocs/.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 = @SPDIR@/.simg
+ imgurl   = cache
+-datadir  = /tmp/smokeping-ms/data
+-piddir  = /tmp/smokeping-ms/var
+-cgiurl   = http://some.url/smokeping.cgi
+-smokemail = /home/oetiker/checkouts/smokeping/trunk/software/etc/smokemail.dist
+-tmail = /home/oetiker/checkouts/smokeping/trunk/software/etc/tmail.dist
 +datadir  = @VARBASE@/db/smokeping
 +piddir  = @VARBASE@/run
 +cgiurl   = http://localhost/cgi-bin/smokeping.cgi
@@ -30,21 +29,21 @@ $NetBSD: patch-ac,v 1.5 2005/10/28 21:43:18 adrianp Exp $
  # specify this to get syslog logging
  syslogfacility = local0
  # each probe is now run in its own process
-@@ -66,7 +66,7 @@ AVERAGE  0.5 144   720
+@@ -44,7 +44,7 @@ AVERAGE  0.5 144   720
  
  *** Presentation ***
  
--template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist
+-template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist
 +template = @PKG_SYSCONFDIR@/basepage.html
  
- + overview 
+ + charts
  
-@@ -89,7 +89,7 @@ unison_tolerance = 2
+@@ -96,7 +96,7 @@ unison_tolerance = 2
  
  + FPing
  
--binary = /usr/sepp/bin/fping
+-binary = /usr/sbin/fping
 +binary = @PREFIX@/sbin/fping
  
- *** Targets ***
- 
+ *** Slaves ***
+ secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.dist
diff --git a/net/smokeping/patches/patch-ad b/net/smokeping/patches/patch-ad
index a065843a67e..6778ec25dc4 100644
--- a/net/smokeping/patches/patch-ad
+++ b/net/smokeping/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2006/08/09 21:48:53 adrianp Exp $
+$NetBSD: patch-ad,v 1.3 2007/11/22 20:25:54 adrianp Exp $
 
---- bin/tSmoke.dist.orig	2006-07-14 12:17:59.000000000 +0100
+--- bin/tSmoke.dist.orig	2007-11-05 21:59:38.000000000 +0000
 +++ bin/tSmoke.dist
 @@ -50,8 +50,7 @@ use strict;
  # -- Getopt::Long
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.2 2006/08/09 21:48:53 adrianp Exp $
 -use lib "/usr/local/rrdtool-1.0.39/lib/perl";
 +use lib "@PREFIX@/lib/smokeping";
  
- use Smokeping 2.000009;
+ use Smokeping 2.002007;
  use Net::SMTP;
 @@ -60,7 +59,7 @@ use Pod::Usage;
  use RRDs;
@@ -50,7 +50,7 @@ $NetBSD: patch-ad,v 1.2 2006/08/09 21:48:53 adrianp Exp $
  General section:
  
 - tmail = /usr/local/smokeping/etc/tmail
-+ tmail = @PKG_SYSCONFDIR@/tmail
++ @PKG_SYSCONFDIR@/tmail
  
  =head1 COPYRIGHT