Update smokeping 2.3.5->2.4.2

* better master/slave secrets documentation
* first cut at mtr integration
* use localtime to construct the rawlog filename
New in 2.4:
* SmokeTrace: An Ajax Traceroute tool.
* The 'blazemode' option for the FPing probe, so that the first (slow) ping packet can be ignored.

Ok'ed bouyer@

8 files changed, 184 insertions, 99 deletions

diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 17f4a1367cd..a39389dadce 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2008/05/26 02:13:23 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/08/17 11:09:10 adrianp Exp $
 
-DISTNAME=	smokeping-2.3.5
+DISTNAME=	smokeping-2.4.2
 CATEGORIES=	net
 MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/
 
@@ -38,7 +38,7 @@ 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/basepage.html.dist smokeping.conf
+			etc/basepage.html.dist smokeping.conf htdocs/tr.cgi.dist
 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"
@@ -62,16 +62,12 @@ post-extract:
 
 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} ${EGDIR}
 	${INSTALL_DATA_DIR} ${SPDIR}
 	${INSTALL_DATA_DIR} ${SPDIR}/cropper
+	${INSTALL_DATA_DIR} ${SPDIR}/resource
+	${INSTALL_DATA_DIR} ${SPDIR}/script
 
 	for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \
 		${INSTALL_DATA} \
@@ -91,39 +87,14 @@ do-install:
 
 	${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi.dist \
 		${PREFIX}/libexec/cgi-bin/smokeping.cgi
-
-	for FILE in ${WRKSRC}/lib/*.pm; do \
-		${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping; \
-	done
-
-	for FILE in ${WRKSRC}/lib/Config/*.pm; do \
-		${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
-
-	for FILE in ${WRKSRC}/lib/Smokeping/matchers/*.pm; do \
-		${INSTALL_DATA} \
-			$$FILE ${PREFIX}/lib/smokeping/Smokeping/matchers; \
-	done
-
-	for FILE in ${WRKSRC}/lib/Smokeping/probes/*.pm; do \
-		${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
+	${INSTALL_SCRIPT} ${WRKSRC}/htdocs/tr.cgi.dist \
+		${PREFIX}/libexec/cgi-bin/tr.cgi
 
 	cd ${WRKSRC}/htdocs/cropper && pax -rw -pm . ${SPDIR}/cropper
+	cd ${WRKSRC}/htdocs/resource && pax -rw -pm . ${SPDIR}/resource
+	cd ${WRKSRC}/htdocs/script && pax -rw -pm . ${SPDIR}/script
+	cd ${WRKSRC}/lib && pax -rw -pm . ${PREFIX}/lib/smokeping
+	${INSTALL_DATA} ${WRKSRC}/htdocs/tr.html ${SPDIR}
 
 	for FILE in ${WRKSRC}/etc/config.dist \
 		${WRKSRC}/etc/basepage.html.dist \
@@ -134,4 +105,7 @@ do-install:
 		${INSTALL_DATA} $$FILE ${EGDIR}; \
 	done
 
+	${CHMOD} ${SHAREMODE} ${PREFIX}/lib/smokeping/JSON/*.pm
+	${CHMOD} ${SHAREMODE} ${PREFIX}/lib/smokeping/JSON.pm
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/smokeping/PLIST b/net/smokeping/PLIST
index 1c716fcbc6e..8b97b26933f 100644
--- a/net/smokeping/PLIST
+++ b/net/smokeping/PLIST
@@ -1,10 +1,41 @@
-@comment $NetBSD: PLIST,v 1.9 2008/04/06 21:47:00 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/08/17 11:09:10 adrianp Exp $
 bin/smokeping
 bin/tSmoke
 lib/smokeping/BER.pm
+lib/smokeping/CGI/Session.pm
+lib/smokeping/CGI/Session/Driver.pm
+lib/smokeping/CGI/Session/Driver/DBI.pm
+lib/smokeping/CGI/Session/Driver/db_file.pm
+lib/smokeping/CGI/Session/Driver/file.pm
+lib/smokeping/CGI/Session/Driver/mysql.pm
+lib/smokeping/CGI/Session/Driver/postgresql.pm
+lib/smokeping/CGI/Session/Driver/sqlite.pm
+lib/smokeping/CGI/Session/ErrorHandler.pm
+lib/smokeping/CGI/Session/ID/incr.pm
+lib/smokeping/CGI/Session/ID/md5.pm
+lib/smokeping/CGI/Session/ID/static.pm
+lib/smokeping/CGI/Session/Serialize/default.pm
+lib/smokeping/CGI/Session/Serialize/freezethaw.pm
+lib/smokeping/CGI/Session/Serialize/json.pm
+lib/smokeping/CGI/Session/Serialize/storable.pm
+lib/smokeping/CGI/Session/Serialize/yaml.pm
+lib/smokeping/CGI/Session/Test/Default.pm
+lib/smokeping/CGI/Session/Tutorial.pm
 lib/smokeping/Config/Grammar.pm
 lib/smokeping/Config/Grammar/Document.pm
 lib/smokeping/Config/Grammar/Dynamic.pm
+lib/smokeping/Digest/HMAC.LICENSE
+lib/smokeping/Digest/HMAC.pm
+lib/smokeping/Digest/HMAC_MD5.pm
+lib/smokeping/Digest/HMAC_SHA1.pm
+lib/smokeping/JSON.pm
+lib/smokeping/JSON/Converter.pm
+lib/smokeping/JSON/PP.pm
+lib/smokeping/JSON/PP5005.pm
+lib/smokeping/JSON/PP56.pm
+lib/smokeping/JSON/Parser.pm
+lib/smokeping/Qooxdoo/JSONRPC.pm
+lib/smokeping/Qooxdoo/Services/Tr.pm
 lib/smokeping/SNMP_Session.pm
 lib/smokeping/SNMP_util.pm
 lib/smokeping/Smokeping.pm
@@ -18,11 +49,11 @@ 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/Median.pm
 lib/smokeping/Smokeping/matchers/Medratio.pm
+lib/smokeping/Smokeping/matchers/base.pm
 lib/smokeping/Smokeping/probes/AnotherDNS.pm
 lib/smokeping/Smokeping/probes/AnotherSSH.pm
 lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm
@@ -65,22 +96,7 @@ 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
+libexec/cgi-bin/tr.cgi
 share/doc/smokeping/CHANGES
 share/doc/smokeping/CONTRIBUTORS
 share/doc/smokeping/COPYING
@@ -96,6 +112,7 @@ 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/smoketrace.txt
 share/doc/smokeping/tSmoke.txt
 share/examples/rc.d/smokeping
 share/examples/smokeping/basepage.html.dist
@@ -106,18 +123,93 @@ 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/smokeping.conf
 share/examples/smokeping/tmail.dist
-@dirrm share/examples/smokeping
-@dirrm share/doc/smokeping
+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/smokeping/resource/Tr/image/ajax-loader.gif
+share/smokeping/resource/qx/icon/CrystalClear/16/actions/view-refresh.png
+share/smokeping/resource/qx/icon/Nuvola/16/actions/view-refresh.png
+share/smokeping/resource/qx/static/image/blank.gif
+share/smokeping/resource/qx/static/image/dotted_white.gif
+share/smokeping/resource/qx/widget/Windows/arrows/down.gif
+share/smokeping/resource/qx/widget/Windows/arrows/down_small.gif
+share/smokeping/resource/qx/widget/Windows/arrows/next.gif
+share/smokeping/resource/qx/widget/Windows/arrows/up.gif
+share/smokeping/resource/qx/widget/Windows/arrows/up_small.gif
+share/smokeping/resource/qx/widget/Windows/cursors/alias.gif
+share/smokeping/resource/qx/widget/Windows/cursors/copy.gif
+share/smokeping/resource/qx/widget/Windows/cursors/move.gif
+share/smokeping/resource/qx/widget/Windows/cursors/nodrop.gif
+share/smokeping/resource/qx/widget/Windows/menu/checkbox.gif
+share/smokeping/resource/qx/widget/Windows/menu/radiobutton.gif
+share/smokeping/resource/qx/widget/Windows/splitpane/knob-horizontal.png
+share/smokeping/resource/qx/widget/Windows/splitpane/knob-vertical.png
+share/smokeping/resource/qx/widget/Windows/table/ascending.png
+share/smokeping/resource/qx/widget/Windows/table/descending.png
+share/smokeping/resource/qx/widget/Windows/table/selectColumnOrder.png
+share/smokeping/resource/qx/widget/Windows/window/close.gif
+share/smokeping/resource/qx/widget/Windows/window/maximize.gif
+share/smokeping/resource/qx/widget/Windows/window/minimize.gif
+share/smokeping/resource/qx/widget/Windows/window/restore.gif
+share/smokeping/script/Tr.js
+share/smokeping/tr.html
+@dirrm share/smokeping/script
+@dirrm share/smokeping/resource/qx/widget/Windows/window
+@dirrm share/smokeping/resource/qx/widget/Windows/table
+@dirrm share/smokeping/resource/qx/widget/Windows/splitpane
+@dirrm share/smokeping/resource/qx/widget/Windows/menu
+@dirrm share/smokeping/resource/qx/widget/Windows/cursors
+@dirrm share/smokeping/resource/qx/widget/Windows/arrows
+@dirrm share/smokeping/resource/qx/widget/Windows
+@dirrm share/smokeping/resource/qx/widget
+@dirrm share/smokeping/resource/qx/static/image
+@dirrm share/smokeping/resource/qx/static
+@dirrm share/smokeping/resource/qx/icon/Nuvola/16/actions
+@dirrm share/smokeping/resource/qx/icon/Nuvola/16
+@dirrm share/smokeping/resource/qx/icon/Nuvola
+@dirrm share/smokeping/resource/qx/icon/CrystalClear/16/actions
+@dirrm share/smokeping/resource/qx/icon/CrystalClear/16
+@dirrm share/smokeping/resource/qx/icon/CrystalClear
+@dirrm share/smokeping/resource/qx/icon
+@dirrm share/smokeping/resource/qx
+@dirrm share/smokeping/resource/Tr/image
+@dirrm share/smokeping/resource/Tr
+@dirrm share/smokeping/resource
 @dirrm share/smokeping/cropper/lib
 @dirrm share/smokeping/cropper
 @dirrm share/smokeping
+@dirrm share/examples/smokeping
+@dirrm share/doc/smokeping
+@dirrm lib/smokeping/Smokeping/sorters
 @dirrm lib/smokeping/Smokeping/probes
 @dirrm lib/smokeping/Smokeping/matchers
-@dirrm lib/smokeping/Smokeping/sorters
 @dirrm lib/smokeping/Smokeping
+@dirrm lib/smokeping/Qooxdoo/Services
+@dirrm lib/smokeping/Qooxdoo
+@dirrm lib/smokeping/JSON
+@dirrm lib/smokeping/Digest
 @dirrm lib/smokeping/Config/Grammar
 @dirrm lib/smokeping/Config
+@dirrm lib/smokeping/CGI/Session/Test
+@dirrm lib/smokeping/CGI/Session/Serialize
+@dirrm lib/smokeping/CGI/Session/ID
+@dirrm lib/smokeping/CGI/Session/Driver
+@dirrm lib/smokeping/CGI/Session
+@dirrm lib/smokeping/CGI
 @dirrm lib/smokeping
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index 60802b8a6c8..56025f4437e 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.12 2008/04/12 14:14:56 adrianp Exp $
+$NetBSD: distinfo,v 1.13 2008/08/17 11:09:10 adrianp Exp $
 
-SHA1 (smokeping-2.3.5.tar.gz) = d7ed6d1cf7fde5c8c9e1cb69c1e543cdf3f3edfa
-RMD160 (smokeping-2.3.5.tar.gz) = 484efd851453024e83cb84ecad753d2051df0081
-Size (smokeping-2.3.5.tar.gz) = 580458 bytes
-SHA1 (patch-aa) = 6387c16acc98d9e991ebe31d55cf44d37b5a6382
-SHA1 (patch-ab) = 0365074b3308637c82b5a611c3283886f40a3227
-SHA1 (patch-ac) = 6cbefd4c8a6bea7ccae32b663dffd8c6fd1f73e5
-SHA1 (patch-ad) = ef7b3139a87faa5895ba48171359458aefe1496a
+SHA1 (smokeping-2.4.2.tar.gz) = 055d65c7e3c49cd0d6e8f96242131fe69dc3110e
+RMD160 (smokeping-2.4.2.tar.gz) = 4c91f1c6be77ef4d851821f5c0a8a60be0770527
+Size (smokeping-2.4.2.tar.gz) = 909514 bytes
+SHA1 (patch-aa) = 71a76129c337bfb40b226503f09118204cafebec
+SHA1 (patch-ab) = 0649530b924fcdc3ba0b082faada6d048a1dacfc
+SHA1 (patch-ac) = 14232cf5e5ad9e90308e9541f42149bcccc4027d
+SHA1 (patch-ad) = 8a41972bd8c3b6cb7bf5d8e1daa4a194b2ef9be2
+SHA1 (patch-ae) = e243eaeb2a9377647392f3501e29e210b844084b
diff --git a/net/smokeping/patches/patch-aa b/net/smokeping/patches/patch-aa
index 24f6bdd08c7..406241b6405 100644
--- a/net/smokeping/patches/patch-aa
+++ b/net/smokeping/patches/patch-aa
@@ -1,23 +1,24 @@
-$NetBSD: patch-aa,v 1.9 2008/04/12 14:14:56 adrianp Exp $
+$NetBSD: patch-aa,v 1.10 2008/08/17 11:09:10 adrianp Exp $
 
---- bin/smokeping.dist.orig	2008-03-29 07:47:19.000000000 +0000
+--- bin/smokeping.dist.orig	2008-07-24 18:37:05.000000000 +0100
 +++ bin/smokeping.dist
-@@ -1,12 +1,11 @@
- #!/usr/sepp/bin/perl-5.8.4 -w
+@@ -1,13 +1,12 @@
+ #!/usr/bin/perl -w
  # -*-perl-*-
  
--use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl);
+-use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl);
 -use lib qw(lib);
 +use lib qw(@PREFIX@/lib/smokeping);
- 
- use Smokeping 2.003005;
+ use strict;
+ use warnings;
+ use Smokeping 2.004002;
   
 -Smokeping::main("etc/config.dist");
 +Smokeping::main("@PKG_SYSCONFDIR@/config");
  
  =head1 NAME
  
-@@ -131,17 +130,17 @@ local system. Three paths have to be ent
+@@ -132,17 +131,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 ba2e13381a7..85c1a41ad84 100644
--- a/net/smokeping/patches/patch-ab
+++ b/net/smokeping/patches/patch-ab
@@ -1,25 +1,29 @@
-$NetBSD: patch-ab,v 1.9 2008/04/06 21:47:00 adrianp Exp $
+$NetBSD: patch-ab,v 1.10 2008/08/17 11:09:10 adrianp Exp $
 
---- htdocs/smokeping.cgi.dist.orig	2008-03-29 07:47:19.000000000 +0000
+--- htdocs/smokeping.cgi.dist.orig	2008-07-24 18:37:05.000000000 +0100
 +++ htdocs/smokeping.cgi.dist
-@@ -1,13 +1,12 @@
--#!/usr/sepp/bin/speedy -w
+@@ -1,17 +1,16 @@
+-#!/usr/bin/speedy
 +#!@PREFIX@/@INTERP@ -w
  # -*-perl-*-
  
--use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
--use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
+ use strict;
+ use warnings;
+ 
+-use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl);
+-use lib qw(/home/oetiker/checkouts/smokeping/trunk/software/lib);
 +use lib qw(@PREFIX@/lib/smokeping);
+ 
  use CGI::Carp qw(fatalsToBrowser);
  
- use Smokeping 2.003005;
+ use Smokeping 2.004002;
  
--Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
+-Smokeping::cgi("/home/oetiker/checkouts/smokeping/trunk/software/etc/config.dist");
 +Smokeping::cgi("@PKG_SYSCONFDIR@/config");
  
  =head1 NAME
  
-@@ -37,17 +36,17 @@ Please refer to the installation documen
+@@ -41,17 +40,17 @@ Please refer to the installation documen
  When installing SmokePing, this file has to be adjusted to fit your
  local system. Three paths have to be entered.
  
diff --git a/net/smokeping/patches/patch-ac b/net/smokeping/patches/patch-ac
index 09e4e6906d5..23400bec39d 100644
--- a/net/smokeping/patches/patch-ac
+++ b/net/smokeping/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2008/04/06 21:47:00 adrianp Exp $
+$NetBSD: patch-ac,v 1.8 2008/08/17 11:09:10 adrianp Exp $
 
---- etc/config.dist.orig	2008-02-04 17:00:46.000000000 +0000
+--- etc/config.dist.orig	2008-07-24 18:36:57.000000000 +0100
 +++ etc/config.dist
 @@ -1,19 +1,19 @@
  *** General ***
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.7 2008/04/06 21:47:00 adrianp Exp $
 -sendmail = /usr/lib/sendmail
 +owner    = Charlie Root
 +contact  = root@localhost
-+mailhost = smtp.mynet
++mailhost = localhost
 +sendmail = /usr/sbin/sendmail
  # NOTE: do not put the Image Cache below cgi-bin
  # since all files under cgi-bin will be executed ... this is not
diff --git a/net/smokeping/patches/patch-ad b/net/smokeping/patches/patch-ad
index 77db363a2ef..c23056122be 100644
--- a/net/smokeping/patches/patch-ad
+++ b/net/smokeping/patches/patch-ad
@@ -1,18 +1,18 @@
-$NetBSD: patch-ad,v 1.4 2008/04/06 21:47:00 adrianp Exp $
+$NetBSD: patch-ad,v 1.5 2008/08/17 11:09:10 adrianp Exp $
 
---- bin/tSmoke.dist.orig	2008-03-29 07:47:19.000000000 +0000
+--- bin/tSmoke.dist.orig	2008-07-24 18:37:05.000000000 +0100
 +++ bin/tSmoke.dist
-@@ -50,8 +50,7 @@ use strict;
+@@ -51,8 +51,7 @@ use warnings;
  # -- Getopt::Long
  #
  # Point the lib variables to your implementation
 -use lib qw(lib);
--use lib "/usr/local/rrdtool-1.0.39/lib/perl";
+-use lib qw(/usr/local/rrdtool-1.0.39/lib/perl);
 +use lib "@PREFIX@/lib/smokeping";
  
- use Smokeping 2.003005;
+ use Smokeping 2.004002;
  use Net::SMTP;
-@@ -60,7 +59,7 @@ use Pod::Usage;
+@@ -61,7 +60,7 @@ use Pod::Usage;
  use RRDs;
  
  # Point to your Smokeping config file
@@ -21,7 +21,7 @@ $NetBSD: patch-ad,v 1.4 2008/04/06 21:47:00 adrianp Exp $
  
  # global variables
  my $cfg;
-@@ -475,9 +474,9 @@ past week and past month including an ov
+@@ -476,9 +475,9 @@ past week and past month including an ov
  Typical crontab used to invoke this are
  
   # Quick morning alert to see what's down
@@ -33,7 +33,7 @@ $NetBSD: patch-ad,v 1.4 2008/04/06 21:47:00 adrianp Exp $
  
  =head1 SETUP
  
-@@ -497,17 +496,16 @@ We need to use the following B<libraries
+@@ -498,17 +497,16 @@ We need to use the following B<libraries
  
  Set up your libraries:
  
diff --git a/net/smokeping/patches/patch-ae b/net/smokeping/patches/patch-ae
new file mode 100644
index 00000000000..b367b3a7062
--- /dev/null
+++ b/net/smokeping/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2008/08/17 11:09:10 adrianp Exp $
+
+--- htdocs/tr.cgi.dist.orig	2008-07-24 19:25:28.000000000 +0100
++++ htdocs/tr.cgi.dist
+@@ -1,6 +1,6 @@
+-#!/usr/sepp/bin/speedy-5.8.8 -w
++#!@PREFIX@/@INTERP@ -w
+ use strict;
+-use lib qw(/home/oposs/smokeping/software/lib);
++use lib qw(@PREFIX@/lib/smokeping);
+ use lib qw(perl);
+ 
+ use CGI;