summaryrefslogtreecommitdiff
path: root/net/smokeping
diff options
context:
space:
mode:
authoradrianp <adrianp>2005-10-28 21:43:18 +0000
committeradrianp <adrianp>2005-10-28 21:43:18 +0000
commitb22ecd550e89fbfdee1b2df4a59c5cc3f15f3e51 (patch)
tree77210a2d630f7554952db5fd270ee892e4953564 /net/smokeping
parent0b05ee9801ae649e743fe637f8cb3adbd64704a3 (diff)
downloadpkgsrc-b22ecd550e89fbfdee1b2df4a59c5cc3f15f3e51.tar.gz
Upgrade from smokeping 1.3.x to 2.0.4
Ok'ed bouyer@ Lots of changes but in brief: new probe programming interface allow target-specific vars get defaults from Probes section config file examples and smokeping_examples document documentation updates and reorganizing new commandline options '--config=X' and '--check' Perl 5.8.0 compatibility fix RRDtool 1.2.x compatibility fix ("unknown RRD version: 0003" on restart) See this URL for all the details: http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/CHANGES
Diffstat (limited to 'net/smokeping')
-rw-r--r--net/smokeping/MESSAGE10
-rw-r--r--net/smokeping/Makefile66
-rw-r--r--net/smokeping/PLIST121
-rw-r--r--net/smokeping/distinfo15
-rwxr-xr-xnet/smokeping/files/smokeping.sh4
-rw-r--r--net/smokeping/patches/patch-aa37
-rw-r--r--net/smokeping/patches/patch-ab34
-rw-r--r--net/smokeping/patches/patch-ac25
-rw-r--r--net/smokeping/patches/patch-ad56
9 files changed, 233 insertions, 135 deletions
diff --git a/net/smokeping/MESSAGE b/net/smokeping/MESSAGE
index 22d651f299c..63c13bb2939 100644
--- a/net/smokeping/MESSAGE
+++ b/net/smokeping/MESSAGE
@@ -1,16 +1,20 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/03/24 15:24:39 bouyer Exp $
+$NetBSD: MESSAGE,v 1.2 2005/10/28 21:43:18 adrianp Exp $
Smokeping is now installed.
The documentation can be found at ${PREFIX}/share/doc/smokeping/
-A sample config file can be found in
-${PREFIX}/share/examples/smokeping/config.dist
+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.
+
Also, 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.
===========================================================================
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index afb7134843c..09eee2c870f 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2005/08/06 06:19:29 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/10/28 21:43:18 adrianp Exp $
-DISTNAME= smokeping-1.37
+DISTNAME= smokeping-2.0.4
CATEGORIES= net
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
@@ -8,7 +8,7 @@ MAINTAINER= bouyer@NetBSD.org
HOMEPAGE= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/index.en.html
COMMENT= Latency/packet loss monitoring/graphing tool
-DEPENDS= rrdtool-1*:../../databases/rrdtool
+DEPENDS= rrdtool>=1.0:../../databases/rrdtool
DEPENDS+= fping>=2.4b2:../../net/fping
DEPENDS+= p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5
DEPENDS+= p5-libwww>=5.64:../../www/p5-libwww
@@ -20,13 +20,16 @@ NO_BUILD= YES
BUILD_DEFS+= USE_INET6
PKG_SYSCONFSUBDIR?= smokeping
+SMOKEPING_HOME= ${VARBASE}/db/smokeping
MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/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
RCD_SCRIPTS= smokeping
-REPLACE_PERL= bin/smokeping.dist
+REPLACE_PERL= bin/smokeping.dist bin/tSmoke.dist
BUILD_DEFS+= USE_SPEEDY
@@ -46,57 +49,70 @@ INTERP= perl
SUBST_CLASSES+= files
SUBST_STAGE.files= post-patch
SUBST_FILES.files= bin/smokeping.dist htdocs/smokeping.cgi.dist \
- etc/config.dist etc/smokemail.dist
+ etc/config.dist etc/smokemail.dist bin/tSmoke.dist
SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" \
-e "s|@VARBASE@|${VARBASE}|g" \
-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
-e "s|@INTERP@|${INTERP}|g" \
- -e "s|perl-5.8.0|perl|g" \
+ -e "s|perl-5.8.4|perl|g" \
-e "s|/usr/bin/perl|${PERL5}|g"
SUBST_MESSAGE.files= "Fixing configuration files."
+OWN_DIRS+= ${SMOKEPING_HOME}
+
INSTALLATION_DIRS= bin libexec/cgi-bin
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/ISG
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/matchers
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/probes
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Config
+ ${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}/share/doc/smokeping
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/matchers
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping/probes
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/smokeping
+
for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \
${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/smokeping; \
done
+
for FILE in ${WRKSRC}/doc/*.txt; do \
${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping; \
done
- for FILE in ${WRKSRC}/doc/matchers/*.txt; do \
- ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping/matchers; \
- done
- for FILE in ${WRKSRC}/doc/probes/*.txt; do \
- ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping/probes; \
+
+ for FILE in ${WRKSRC}/doc/examples/config.*; do \
+ ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/smokeping; \
done
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist \
- ${PREFIX}/bin/smokeping
+
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist ${PREFIX}/bin/smokeping
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke.dist ${PREFIX}/bin/tSmoke
+
${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/ISG/*.pm; do \
- ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/ISG; \
+
+ for FILE in ${WRKSRC}/lib/Config/*.pm; do \
+ ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Config; \
done
- for FILE in ${WRKSRC}/lib/probes/*.pm; do \
- ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/probes; \
+
+ for FILE in ${WRKSRC}/lib/Smokeping/*.pm; do \
+ ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/Smokeping; \
done
- for FILE in ${WRKSRC}/lib/matchers/*.pm; do \
- ${INSTALL_DATA} $$FILE ${PREFIX}/lib/smokeping/matchers; \
+
+ 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}/etc/config.dist \
${WRKSRC}/etc/basepage.html.dist \
- ${WRKSRC}/etc/config-echoping.dist \
+ ${WRKSRC}/etc/tmail.dist \
+ ${WRKSRC}/etc/config.dist \
${WRKSRC}/etc/smokemail.dist; do \
${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/smokeping; \
done
diff --git a/net/smokeping/PLIST b/net/smokeping/PLIST
index 47cf4cc0e64..3d8fe64936a 100644
--- a/net/smokeping/PLIST
+++ b/net/smokeping/PLIST
@@ -1,92 +1,75 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:04 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/10/28 21:43:18 adrianp Exp $
bin/smokeping
+bin/tSmoke
lib/smokeping/BER.pm
-lib/smokeping/ISG/ParseConfig.pm
+lib/smokeping/Config/Grammar.pm
lib/smokeping/SNMP_Session.pm
lib/smokeping/SNMP_util.pm
lib/smokeping/Smokeping.pm
-lib/smokeping/ciscoRttMonMIB.pm
-lib/smokeping/matchers/avgratio.pm
-lib/smokeping/matchers/base.pm
-lib/smokeping/matchers/median.pm
-lib/smokeping/probes/AnotherDNS.pm
-lib/smokeping/probes/AnotherSSH.pm
-lib/smokeping/probes/CiscoRTTMonDNS.pm
-lib/smokeping/probes/CiscoRTTMonEchoICMP.pm
-lib/smokeping/probes/CiscoRTTMonTcpConnect.pm
-lib/smokeping/probes/Curl.pm
-lib/smokeping/probes/DNS.pm
-lib/smokeping/probes/EchoPing.pm
-lib/smokeping/probes/EchoPingChargen.pm
-lib/smokeping/probes/EchoPingDiscard.pm
-lib/smokeping/probes/EchoPingHttp.pm
-lib/smokeping/probes/EchoPingHttps.pm
-lib/smokeping/probes/EchoPingIcp.pm
-lib/smokeping/probes/EchoPingSmtp.pm
-lib/smokeping/probes/FPing.pm
-lib/smokeping/probes/FPing6.pm
-lib/smokeping/probes/IOSPing.pm
-lib/smokeping/probes/LDAP.pm
-lib/smokeping/probes/Radius.pm
-lib/smokeping/probes/RemoteFPing.pm
-lib/smokeping/probes/SSH.pm
-lib/smokeping/probes/base.pm
-lib/smokeping/probes/basefork.pm
-lib/smokeping/probes/basevars.pm
-lib/smokeping/probes/passwordchecker.pm
-lib/smokeping/probes/telnetIOSPing.pm
+lib/smokeping/Smokeping/Examples.pm
+lib/smokeping/Smokeping/RRDtools.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/probes/AnotherDNS.pm
+lib/smokeping/Smokeping/probes/AnotherSSH.pm
+lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm
+lib/smokeping/Smokeping/probes/CiscoRTTMonEchoICMP.pm
+lib/smokeping/Smokeping/probes/CiscoRTTMonTcpConnect.pm
+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/EchoPingDiscard.pm
+lib/smokeping/Smokeping/probes/EchoPingHttp.pm
+lib/smokeping/Smokeping/probes/EchoPingHttps.pm
+lib/smokeping/Smokeping/probes/EchoPingIcp.pm
+lib/smokeping/Smokeping/probes/EchoPingSmtp.pm
+lib/smokeping/Smokeping/probes/FPing.pm
+lib/smokeping/Smokeping/probes/FPing6.pm
+lib/smokeping/Smokeping/probes/IOSPing.pm
+lib/smokeping/Smokeping/probes/LDAP.pm
+lib/smokeping/Smokeping/probes/Radius.pm
+lib/smokeping/Smokeping/probes/RemoteFPing.pm
+lib/smokeping/Smokeping/probes/SSH.pm
+lib/smokeping/Smokeping/probes/TelnetIOSPing.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
libexec/cgi-bin/smokeping.cgi
share/doc/smokeping/CHANGES
share/doc/smokeping/CONTRIBUTORS
share/doc/smokeping/COPYING
share/doc/smokeping/COPYRIGHT
-share/doc/smokeping/ParseConfig.pm.txt
share/doc/smokeping/README
-share/doc/smokeping/Smokeping.pm.txt
+share/doc/smokeping/Smokeping.txt
share/doc/smokeping/TODO
share/doc/smokeping/smokeping.cgi.txt
share/doc/smokeping/smokeping.txt
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/matchers/avgratio.pm.txt
-share/doc/smokeping/matchers/base.pm.txt
-share/doc/smokeping/matchers/median.pm.txt
-share/doc/smokeping/probes/AnotherDNS.pm.txt
-share/doc/smokeping/probes/AnotherSSH.pm.txt
-share/doc/smokeping/probes/CiscoRTTMonDNS.pm.txt
-share/doc/smokeping/probes/CiscoRTTMonEchoICMP.pm.txt
-share/doc/smokeping/probes/CiscoRTTMonTcpConnect.pm.txt
-share/doc/smokeping/probes/Curl.pm.txt
-share/doc/smokeping/probes/DNS.pm.txt
-share/doc/smokeping/probes/EchoPing.pm.txt
-share/doc/smokeping/probes/EchoPingChargen.pm.txt
-share/doc/smokeping/probes/EchoPingDiscard.pm.txt
-share/doc/smokeping/probes/EchoPingHttp.pm.txt
-share/doc/smokeping/probes/EchoPingHttps.pm.txt
-share/doc/smokeping/probes/EchoPingIcp.pm.txt
-share/doc/smokeping/probes/EchoPingSmtp.pm.txt
-share/doc/smokeping/probes/FPing.pm.txt
-share/doc/smokeping/probes/FPing6.pm.txt
-share/doc/smokeping/probes/IOSPing.pm.txt
-share/doc/smokeping/probes/LDAP.pm.txt
-share/doc/smokeping/probes/Radius.pm.txt
-share/doc/smokeping/probes/RemoteFPing.pm.txt
-share/doc/smokeping/probes/SSH.pm.txt
-share/doc/smokeping/probes/base.pm.txt
-share/doc/smokeping/probes/basefork.pm.txt
-share/doc/smokeping/probes/basevars.pm.txt
-share/doc/smokeping/probes/passwordchecker.pm.txt
-share/doc/smokeping/probes/telnetIOSPing.pm.txt
+share/doc/smokeping/smokeping_upgrade.txt
+share/doc/smokeping/tSmoke.txt
share/examples/rc.d/smokeping
share/examples/smokeping/basepage.html.dist
-share/examples/smokeping/config-echoping.dist
share/examples/smokeping/config.dist
+share/examples/smokeping/config.echoping
+share/examples/smokeping/config.fping-instances
+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/smokemail.dist
+share/examples/smokeping/tmail.dist
@dirrm share/examples/smokeping
-@dirrm share/doc/smokeping/matchers
-@dirrm share/doc/smokeping/probes
@dirrm share/doc/smokeping
-@dirrm lib/smokeping/probes
-@dirrm lib/smokeping/matchers
-@dirrm lib/smokeping/ISG
+@dirrm lib/smokeping/Smokeping/probes
+@dirrm lib/smokeping/Smokeping/matchers
+@dirrm lib/smokeping/Smokeping
+@dirrm lib/smokeping/Config
@dirrm lib/smokeping
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index 500f5e7d789..800be555a81 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:14:04 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/10/28 21:43:18 adrianp Exp $
-SHA1 (smokeping-1.37.tar.gz) = 3a37f0e877d7a35c108d35f61580644a2e8b4361
-RMD160 (smokeping-1.37.tar.gz) = cf7bb6bc43e6461de1144b05ea59cb8daa999ff9
-Size (smokeping-1.37.tar.gz) = 224689 bytes
-SHA1 (patch-aa) = 216a0c1764c6cc7ee381c299aec10e22801c64f0
-SHA1 (patch-ab) = 7c4444c68f251fcb8ec5dc106313effe6665bb1f
-SHA1 (patch-ac) = 6648d456ac5fa107be707d3a7aa5c4366a1904d1
+SHA1 (smokeping-2.0.4.tar.gz) = 253c060e144e0bf6062fa2663f7320c623604007
+RMD160 (smokeping-2.0.4.tar.gz) = beb3ba86ad4e0de571bc5ed18cd2ea47af194a6f
+Size (smokeping-2.0.4.tar.gz) = 375301 bytes
+SHA1 (patch-aa) = d10ea259ae0861dfb76e186c8f3ef9425bb8190a
+SHA1 (patch-ab) = f6173859e5c8b61d56be37707fa12e41554bf216
+SHA1 (patch-ac) = 504f7c3ae3d3369facfafe80f742dfb63f416537
+SHA1 (patch-ad) = c8185b03aef8fafada08ae0c117d302631bba0b3
diff --git a/net/smokeping/files/smokeping.sh b/net/smokeping/files/smokeping.sh
index e9094f5060c..43162957097 100755
--- a/net/smokeping/files/smokeping.sh
+++ b/net/smokeping/files/smokeping.sh
@@ -1,13 +1,13 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: smokeping.sh,v 1.2 2004/06/23 22:25:44 adrianp Exp $
+# $NetBSD: smokeping.sh,v 1.3 2005/10/28 21:43:18 adrianp Exp $
#
# PROVIDE: smokeping
# REQUIRE: DAEMON
name="smokeping"
command="@PREFIX@/bin/smokeping"
-pidfile="/var/run/${name}.pid"
+pidfile="@VARBASE@/run/${name}.pid"
cmd=${1:-start}
diff --git a/net/smokeping/patches/patch-aa b/net/smokeping/patches/patch-aa
index c5fe5114524..f1a571359fc 100644
--- a/net/smokeping/patches/patch-aa
+++ b/net/smokeping/patches/patch-aa
@@ -1,19 +1,40 @@
-$NetBSD: patch-aa,v 1.4 2005/01/22 21:50:54 adrianp Exp $
+$NetBSD: patch-aa,v 1.5 2005/10/28 21:43:18 adrianp Exp $
---- bin/smokeping.dist.orig 2005-01-22 19:45:31.000000000 +0000
-+++ bin/smokeping.dist 2005-01-22 19:46:58.000000000 +0000
+--- bin/smokeping.dist.orig 2005-10-23 22:09:23.000000000 +0100
++++ bin/smokeping.dist
@@ -1,12 +1,11 @@
- #!/usr/sepp/bin/perl-5.8.0 -w
+ #!/usr/sepp/bin/perl-5.8.4 -w
# -*-perl-*-
--use lib qw(/usr/pack/rrdtool-1.0.47-to/lib);
--use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
+-use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl);
+-use lib qw(lib);
+use lib qw(@PREFIX@/lib/smokeping);
- use Smokeping 1.37;
-
+ use Smokeping 2.000004;
+
-Smokeping::main("etc/config.dist");
+Smokeping::main("@PKG_SYSCONFDIR@/config");
=head1 NAME
+@@ -117,17 +116,17 @@ local system. Three paths have to be ent
+
+ One pointing to your B<rrdtool> installation
+
+- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
++ use lib qw(@PREFIX@/lib/smokeping);
+
+ One pointing to the place where you have installed the SmokePing libraries
+
+- use lib qw(/home/oetiker/public_html/smokeping/lib);
++ use lib qw(@PREFIX@/lib/smokeping);
+
+ The third path is the argument to the Smokeping::main command. It points to
+ the SmokePing configuration file.
+
+ use Smokeping;
+- Smokeping::main("/home/oetiker/.smokeping/config");
++ Smokeping::main("@PKG_SYSCONFDIR@/config");
+
+ =head1 COPYRIGHT
+
diff --git a/net/smokeping/patches/patch-ab b/net/smokeping/patches/patch-ab
index 725890a5d3c..55869b5f14d 100644
--- a/net/smokeping/patches/patch-ab
+++ b/net/smokeping/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2005/01/22 21:50:54 adrianp Exp $
+$NetBSD: patch-ab,v 1.5 2005/10/28 21:43:18 adrianp Exp $
---- htdocs/smokeping.cgi.dist.orig 2005-01-22 19:49:27.000000000 +0000
-+++ htdocs/smokeping.cgi.dist 2005-01-22 19:51:16.000000000 +0000
-@@ -1,12 +1,11 @@
+--- htdocs/smokeping.cgi.dist.orig 2005-10-23 22:16:54.000000000 +0100
++++ htdocs/smokeping.cgi.dist
+@@ -1,13 +1,12 @@
-#!/usr/sepp/bin/speedy -w
+#!@PREFIX@/bin/@INTERP@ -w
# -*-perl-*-
@@ -10,11 +10,33 @@ $NetBSD: patch-ab,v 1.4 2005/01/22 21:50:54 adrianp Exp $
-use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
-use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
+use lib qw(@PREFIX@/lib/smokeping);
+ use CGI::Carp qw(fatalsToBrowser);
- use Smokeping 1.37;
+ use Smokeping 2.000004;
-Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
+Smokeping::cgi("@PKG_SYSCONFDIR@/config");
+ =head1 NAME
- BEGIN {
+@@ -37,17 +36,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.
+
+- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
++ use lib qw(@PREFIX@/lib/smokeping);
+
+ One pointing to your B<rrdtool> installation
+
+- use lib qw(/home/oetiker/public_html/smokeping/lib);
++ use lib qw(@PREFIX@/lib/smokeping);
+
+ One pointing to the place where you have installed the SmokePing libraries
+
+ use Smokeping;
+
+- Smokeping::cgi("/home/oetiker/.smokeping/config");
++ Smokeping::cgi("@PKG_SYSCONFDIR@/config");
+
+ The third path is the argument to the Smokeping::cgi command. It points to
+ the SmokePing configuration file.
diff --git a/net/smokeping/patches/patch-ac b/net/smokeping/patches/patch-ac
index 6cfbec40971..ec0435fd530 100644
--- a/net/smokeping/patches/patch-ac
+++ b/net/smokeping/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/01/22 21:53:28 adrianp Exp $
+$NetBSD: patch-ac,v 1.5 2005/10/28 21:43:18 adrianp Exp $
---- etc/config.dist.orig 2005-01-22 19:52:46.000000000 +0000
-+++ etc/config.dist 2005-01-22 19:59:21.000000000 +0000
-@@ -4,16 +4,18 @@
+--- etc/config.dist.orig 2005-10-23 22:19:51.000000000 +0100
++++ etc/config.dist
+@@ -4,17 +4,17 @@
*** General ***
@@ -21,25 +21,25 @@ $NetBSD: patch-ac,v 1.4 2005/01/22 21:53:28 adrianp Exp $
-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
+datadir = @VARBASE@/db/smokeping
-+piddir = @VARBASE@/run
++piddir = @VARBASE@/run
+cgiurl = http://localhost/cgi-bin/smokeping.cgi
+smokemail = @PREFIX@/etc/smokeping/smokemail
-+
-+
++tmail = @PKG_SYSCONFDIR@/tmail
# specify this to get syslog logging
syslogfacility = local0
# each probe is now run in its own process
-@@ -65,7 +67,7 @@
+@@ -66,7 +66,7 @@ AVERAGE 0.5 144 720
*** Presentation ***
-template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist
-+template = @PREFIX@/etc/smokeping/basepage.html
++template = @PKG_SYSCONFDIR@/basepage.html
+ overview
-@@ -88,7 +90,7 @@
+@@ -89,7 +89,7 @@ unison_tolerance = 2
+ FPing
@@ -48,8 +48,3 @@ $NetBSD: patch-ac,v 1.4 2005/01/22 21:53:28 adrianp Exp $
*** Targets ***
-@@ -173,4 +175,3 @@
- menu = Sun Microsystems
- title = Sun Microsystems Webserver
- host = www.sun-web.com
--
diff --git a/net/smokeping/patches/patch-ad b/net/smokeping/patches/patch-ad
new file mode 100644
index 00000000000..e8735b7eacc
--- /dev/null
+++ b/net/smokeping/patches/patch-ad
@@ -0,0 +1,56 @@
+$NetBSD: patch-ad,v 1.1 2005/10/28 21:43:18 adrianp Exp $
+
+--- bin/tSmoke.dist.orig 2005-10-23 22:31:49.000000000 +0100
++++ bin/tSmoke.dist
+@@ -50,8 +50,7 @@ use strict;
+ # -- 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 "@PREFIX@/lib/smokeping";
+
+ use Smokeping 2.000004;
+ use Net::SMTP;
+@@ -60,7 +59,7 @@ use Pod::Usage;
+ use RRDs;
+
+ # Point to your Smokeping config file
+-my $cfgfile = "etc/config.dist";
++my $cfgfile = "@PKG_SYSCONFDIR@/config";
+
+ # global variables
+ my $cfg;
+@@ -473,9 +472,9 @@ past week and past month including an ov
+ Typical crontab used to invoke this are
+
+ # Quick morning alert to see what's down
+- 0 6 * * * /usr/local/smokeping/bin/tSmoke.pl --q --to=mobilephone@att.net.invalid --morning
++ 0 6 * * * @PREFIX@/bin/tSmoke.pl --q --to=mobilephone@att.net.invalid --morning
+ # Weekly report on the percent availability of network systems with no detail
+- 0 8 * * * /usr/local/smokeping/bin/tSmoke.pl --q --to=mailbox@company.com.invalid --weekly --detail=0
++ 0 8 * * * @PREFIX@/tSmoke.pl --q --to=mailbox@company.com.invalid --weekly --detail=0
+
+ =head1 SETUP
+
+@@ -495,17 +494,16 @@ We need to use the following B<libraries
+
+ Set up your libraries:
+
+- use lib "/usr/local/smokeping/lib";
+- use lib "/usr/local/rrdtool-1.0.39/lib/perl";
++ use lib "@PREFIX@/lib/smokeping";
+
+ Point to your Smokeping B<config> file
+
+- my $cfgfile = "/usr/local/smokeping/etc/config";
++ my $cfgfile = "@PKG_SYSCONFDIR@/config";
+
+ Modify the Smokeping config file to include a path for tmail in the
+ General section:
+
+- tmail = /usr/local/smokeping/etc/tmail
++ tmail = @PKG_SYSCONFDIR@/tmail
+
+ =head1 COPYRIGHT
+