- Update to 2.0.3

- Added OPTIONS for more probes

21 files changed, 364 insertions, 362 deletions

diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index da91cfd..7ffeb52 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	1.42
+PORTVERSION=	2.0.3
 CATEGORIES=	net www
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
@@ -25,7 +25,10 @@ OPTIONS=	FPING "Support for fping probes" on
 OPTIONS+=	ECHOPING "Support for EchoPing probes" off
 OPTIONS+=	CURL "Support for Curl probes" off
 OPTIONS+=	LDAP "Support for LDAP probes" off
+OPTIONS+=	LDAPSSL "Support for SSL-enabled LDAP probes" off
 OPTIONS+=	RADIUS "Support for Radius probes" off
+OPTIONS+=	TELNET "Support for TelnetIOSPing probes" off
+OPTIONS+=	DNS "Support for AnotherDNS probes" off
 
 .include <bsd.port.pre.mk>
 
@@ -41,7 +44,7 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping
 RUN_DEPENDS+=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
 .endif
 
-.ifdef(WITH_LDAP)
+.if defined(WITH_LDAP) || defined(WITH_LDAPSSL)
 RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
@@ -49,20 +52,68 @@ RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 RUN_DEPENDS+=	${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
 .endif
 
-.if defined(WITH_LDAP) || defined(WITH_RADIUS)
+.if defined(WITH_LDAP) || defined(WITH_LDAPSSL) || defined(WITH_RADIUS)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 .endif
 
+.ifdef(WITH_LDAPSSL)
+RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
+.endif
+
+.ifdef(WITH_TELNET)
+RUN_DEPENDS+=	${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet
+.endif
+
+.ifdef(WITH_DNS)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+.endif
+
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 
-MAN1=		ParseConfig.pm.1 \
-		Smokeping.pm.1 \
-		smokeping.1 \
+MAN1=		smokeping.1 \
 		smokeping.cgi.1 \
-		smokeping_config.1 \
-		smokeping_install.1
+		tSmoke.1
+MAN3=		Config::Grammar.3 \
+		Smokeping.3 \
+		Smokeping::Examples.3 \
+		Smokeping::RRDtools.3 \
+		Smokeping::matchers::Avgratio.3 \
+		Smokeping::matchers::Median.3 \
+		Smokeping::matchers::base.3 \
+		Smokeping::probes::AnotherDNS.3 \
+		Smokeping::probes::AnotherSSH.3 \
+		Smokeping::probes::CiscoRTTMonDNS.3 \
+		Smokeping::probes::CiscoRTTMonEchoICMP.3 \
+		Smokeping::probes::CiscoRTTMonTcpConnect.3 \
+		Smokeping::probes::Curl.3 \
+		Smokeping::probes::DNS.3 \
+		Smokeping::probes::EchoPing.3 \
+		Smokeping::probes::EchoPingChargen.3 \
+		Smokeping::probes::EchoPingDiscard.3 \
+		Smokeping::probes::EchoPingHttp.3 \
+		Smokeping::probes::EchoPingHttps.3 \
+		Smokeping::probes::EchoPingIcp.3 \
+		Smokeping::probes::EchoPingSmtp.3 \
+		Smokeping::probes::FPing.3 \
+		Smokeping::probes::FPing6.3 \
+		Smokeping::probes::IOSPing.3 \
+		Smokeping::probes::LDAP.3 \
+		Smokeping::probes::Radius.3 \
+		Smokeping::probes::RemoteFPing.3 \
+		Smokeping::probes::SSH.3 \
+		Smokeping::probes::TelnetIOSPing.3 \
+		Smokeping::probes::base.3 \
+		Smokeping::probes::basefork.3 \
+		Smokeping::probes::basevars.3 \
+		Smokeping::probes::passwordchecker.3 \
+		Smokeping::probes::skel.3
+MAN5=		smokeping_config.5
+MAN7=		smokeping_examples.7 \
+		smokeping_extend.7 \
+		smokeping_install.7 \
+		smokeping_upgrade.7
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -81,58 +132,90 @@ FILES_SUB=	USER=${USER} GROUP=${GROUP} \
 		PERL=${PERL} PREFIX=${PREFIX}
 
 DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
-DOC2=		ParseConfig.pm \
-		Smokeping.pm \
-		matchers/avgratio.pm \
-		matchers/base.pm \
-		matchers/median.pm \
-		probes/AnotherDNS.pm \
-		probes/AnotherSSH.pm \
-		probes/CiscoRTTMonDNS.pm \
-		probes/CiscoRTTMonEchoICMP.pm \
-		probes/CiscoRTTMonTcpConnect.pm \
-		probes/Curl.pm \
-		probes/DNS.pm \
-		probes/EchoPing.pm \
-		probes/EchoPingChargen.pm \
-		probes/EchoPingDiscard.pm \
-		probes/EchoPingHttp.pm \
-		probes/EchoPingHttps.pm \
-		probes/EchoPingIcp.pm \
-		probes/EchoPingSmtp.pm \
-		probes/FPing.pm \
-		probes/FPing6.pm \
-		probes/IOSPing.pm \
-		probes/LDAP.pm \
-		probes/Radius.pm \
-		probes/RemoteFPing.pm \
-		probes/SSH.pm \
-		probes/base.pm \
-		probes/basefork.pm \
-		probes/basevars.pm \
-		probes/passwordchecker.pm \
-		probes/telnetIOSPing.pm \
+DOC2=		Config/Grammar \
+		Smokeping \
+		Smokeping/Examples \
+		Smokeping/RRDtools \
+		Smokeping/matchers/Avgratio \
+		Smokeping/matchers/Median \
+		Smokeping/matchers/base \
+		Smokeping/probes/AnotherDNS \
+		Smokeping/probes/AnotherSSH \
+		Smokeping/probes/CiscoRTTMonDNS \
+		Smokeping/probes/CiscoRTTMonEchoICMP \
+		Smokeping/probes/CiscoRTTMonTcpConnect \
+		Smokeping/probes/Curl \
+		Smokeping/probes/DNS \
+		Smokeping/probes/EchoPing \
+		Smokeping/probes/EchoPingChargen \
+		Smokeping/probes/EchoPingDiscard \
+		Smokeping/probes/EchoPingHttp \
+		Smokeping/probes/EchoPingHttps \
+		Smokeping/probes/EchoPingIcp \
+		Smokeping/probes/EchoPingSmtp \
+		Smokeping/probes/FPing \
+		Smokeping/probes/FPing6 \
+		Smokeping/probes/IOSPing \
+		Smokeping/probes/LDAP \
+		Smokeping/probes/Radius \
+		Smokeping/probes/RemoteFPing \
+		Smokeping/probes/SSH \
+		Smokeping/probes/TelnetIOSPing \
+		Smokeping/probes/base \
+		Smokeping/probes/basefork \
+		Smokeping/probes/basevars \
+		Smokeping/probes/passwordchecker \
+		Smokeping/probes/skel \
 		smokeping.cgi \
 		smokeping \
 		smokeping_config \
-		smokeping_install
-ETC1=		basepage.html config smokemail config-echoping
+		smokeping_examples \
+		smokeping_extend \
+		smokeping_install \
+		smokeping_upgrade \
+		tSmoke
+
+EXAMPLES=	config.echoping \
+		config.fping-instances \
+		config.multiple-probes \
+		config.simple \
+		config.targetvars-with-Curl \
+		config.template
+
+ETC1=		basepage.html config smokemail tmail
 
 # Things that shouldn't have been in the tarball in the first place
 post-extract:
 	@${RM} ${WRKSRC}/lib/BER.pm
 	@${RM} ${WRKSRC}/lib/SNMP_*.pm
 
+pre-patch:
+	@${REINPLACE_CMD} -e s!/usr/bin/!%%PREFIX%%/bin/! \
+		${WRKSRC}/lib/Smokeping.pm \
+		${WRKSRC}/lib/Smokeping/Examples.pm \
+		${WRKSRC}/lib/Smokeping/probes/Curl.pm \
+		${WRKSRC}/lib/Smokeping/probes/IOSPing.pm \
+		${WRKSRC}/lib/Smokeping/probes/DNS.pm \
+		${WRKSRC}/lib/Smokeping/probes/RemoteFPing.pm \
+		${WRKSRC}/lib/Smokeping/probes/SSH.pm \
+		${WRKSRC}/lib/Smokeping/probes/FPing6.pm \
+		${WRKSRC}/lib/Smokeping/probes/EchoPing.pm \
+		${WRKSRC}/lib/Smokeping/probes/FPing.pm
+	@${REINPLACE_CMD} -e s!/usr/share/smokeping/etc/!%%PREFIX%%/etc/smokeping/! \
+		${WRKSRC}/lib/Smokeping/probes/passwordchecker.pm
+
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 pre-configure:
 	@${REINPLACE_CMD} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/lib/Smokeping.pm \
+		${WRKSRC}/lib/Smokeping/Examples.pm \
 		${WRKSRC}/bin/smokeping.dist \
+		${WRKSRC}/bin/tSmoke.dist \
 		${WRKSRC}/htdocs/smokeping.cgi.dist \
 		${WRKSRC}/etc/config.dist \
-		${WRKSRC}/etc/config-echoping.dist \
-		${WRKSRC}/lib/probes/*.pm
+		${WRKSRC}/lib/Smokeping/probes/*.pm
 	@${FIND} ${WRKSRC} -name \*.bak -delete
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-message > ${PKGMESSAGE}
@@ -141,31 +224,33 @@ pre-configure:
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-deinstall > ${PKGDEINSTALL}
 	@${MV} ${WRKSRC}/bin/smokeping.dist ${WRKSRC}/bin/smokeping
+	@${MV} ${WRKSRC}/bin/tSmoke.dist ${WRKSRC}/bin/tSmoke
 	@${MV} ${WRKSRC}/htdocs/smokeping.cgi.dist ${WRKSRC}/htdocs/smokeping.cgi
 
-# work around  a bug in bsd.port.mk, see PR 63293 - remove when resolved
-do-build:
-	@${DO_NADA}
-
 pre-su-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-.for FILE in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/doc/man/man1/${FILE} ${PREFIX}/man/man1
+	@(cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1)
+	@(cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN5} ${PREFIX}/man/man5)
+	@(cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN7} ${PREFIX}/man/man7)
+.for FILE in ${MAN3}
+	@${INSTALL_MAN} `${FIND} ${WRKSRC}/doc -name ${FILE}` ${PREFIX}/man/man3
 .endfor
 	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/matchers
-	@${MKDIR} ${DOCSDIR}/probes
-.for FILE in ${DOC1}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
-.endfor
+	@${MKDIR} ${DOCSDIR}/Config
+	@${MKDIR} ${DOCSDIR}/Smokeping/matchers
+	@${MKDIR} ${DOCSDIR}/Smokeping/probes
+	@(cd ${WRKSRC} && ${INSTALL_DATA} ${DOC1} ${DOCSDIR})
 .for FILE in ${DOC2}
-	${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}/${FILE}.html
-	${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt  ${DOCSDIR}/${FILE}.txt
+	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}/${FILE}.html
+	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt  ${DOCSDIR}/${FILE}.txt
 .endfor
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR})
 .endif
 	@${MKDIR} ${PREFIX}/etc/smokeping
 .for FILE in ${ETC1}
diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo
index ef69fb9..435c699 100644
--- a/net-mgmt/smokeping/distinfo
+++ b/net-mgmt/smokeping/distinfo
@@ -1,2 +1,2 @@
-MD5 (smokeping-1.42.tar.gz) = 7e786ba53560a81e10658b2a79fb2e9f
-SIZE (smokeping-1.42.tar.gz) = 236121
+MD5 (smokeping-2.0.3.tar.gz) = 2f64d4fbab68bf5cb9021705ab2891b4
+SIZE (smokeping-2.0.3.tar.gz) = 372456
diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping.dist b/net-mgmt/smokeping/files/patch-bin-smokeping.dist
index 5f51556..410785f 100644
--- a/net-mgmt/smokeping/files/patch-bin-smokeping.dist
+++ b/net-mgmt/smokeping/files/patch-bin-smokeping.dist
@@ -1,22 +1,22 @@
---- bin/smokeping.dist.orig	Sun Jan 30 17:56:30 2005
-+++ bin/smokeping.dist	Mon Feb  7 21:46:26 2005
+--- bin/smokeping.dist.orig	Mon Sep 26 22:15:57 2005
++++ bin/smokeping.dist	Thu Oct  6 10:37:31 2005
 @@ -1,12 +1,11 @@
--#!/usr/sepp/bin/perl-5.8.0 -w
+-#!/usr/sepp/bin/perl-5.8.4 -w
 +#!%%PERL%% -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%%/smokeping/lib);
  
- use Smokeping 1.42;
- 
+ use Smokeping 2.000003;
+  
 -Smokeping::main("etc/config.dist");
 +Smokeping::main("%%PREFIX%%/etc/smokeping/config");
  
  =head1 NAME
  
-@@ -101,22 +100,8 @@
+@@ -112,22 +111,8 @@
  
  =head1 SETUP
  
diff --git a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
new file mode 100644
index 0000000..f1eb140
--- /dev/null
+++ b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
@@ -0,0 +1,63 @@
+--- bin/tSmoke.dist.orig	Mon Sep 19 00:50:50 2005
++++ bin/tSmoke.dist	Mon Sep 19 00:54:58 2005
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!%%PERL%%
+ #
+ #-----------------------------------------------
+ # tSmoke.pl
+@@ -50,8 +50,7 @@
+ # -- 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(%%PREFIX%%/smokeping/lib);
+ 
+ use Smokeping 2.000001;
+ use Net::SMTP;
+@@ -60,7 +59,7 @@
+ use RRDs;
+ 
+ # Point to your Smokeping config file
+-my $cfgfile = "etc/config.dist";
++my $cfgfile = "%%PREFIX%%/etc/config";
+ 
+ # global variables
+ my $cfg;
+@@ -479,33 +478,8 @@
+ 
+ =head1 SETUP
+ 
+-When installing tSmoke, some variables must be adjusted to fit your local system.
+-
+-We need to use the following B<libraries>:
+-
+-=over
+-
+-=item Smokeping
+-
+-=item RRDTool Perl bindings
+-
+-=item Getopt::Long
+-
+-=back
+-
+-Set up your libraries:
+-
+- use lib "/usr/local/smokeping/lib";
+- use lib "/usr/local/rrdtool-1.0.39/lib/perl";
+-
+-Point to your Smokeping B<config> file
+-
+- my $cfgfile = "/usr/local/smokeping/etc/config";
+-
+-Modify the Smokeping config file to include a path for tmail in the
+-General section:
+-
+- tmail = /usr/local/smokeping/etc/tmail
++When installing tSmoke, this file has been adjusted to fit your
++local system. There should be no need for further path adjustments.
+ 
+ =head1 COPYRIGHT
+ 
diff --git a/net-mgmt/smokeping/files/patch-etc-config.dist b/net-mgmt/smokeping/files/patch-etc-config.dist
index 56ab475..1269ebf 100644
--- a/net-mgmt/smokeping/files/patch-etc-config.dist
+++ b/net-mgmt/smokeping/files/patch-etc-config.dist
@@ -1,6 +1,6 @@
---- etc/config.dist.orig	Sun Jan 18 15:55:11 2004
-+++ etc/config.dist	Sun Jan 18 15:57:10 2004
-@@ -7,13 +7,13 @@
+--- etc/config.dist.orig	Thu Jun  2 15:47:39 2005
++++ etc/config.dist	Sun Sep 18 18:14:12 2005
+@@ -7,14 +7,14 @@
  owner    = Joe Random
  contact  = joe@some.place.xyz
  mailhost = smtp.mailhost.abc
@@ -16,11 +16,13 @@
 +piddir  = %%PREFIX%%/var/smokeping
  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
 +smokemail = %%PREFIX%%/etc/smokeping/smokemail
++tmail = %%PREFIX%%/etc/smokeping/tmail
  # specify this to get syslog logging
- # syslogfacility = local0
- 
-@@ -63,7 +63,7 @@
+ syslogfacility = local0
+ # each probe is now run in its own process
+@@ -66,7 +66,7 @@
  
  *** Presentation ***
  
@@ -29,7 +31,7 @@
  
  + overview 
  
-@@ -86,7 +86,7 @@
+@@ -89,7 +89,7 @@
  
  + FPing
  
diff --git a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
index 10fc6dd..b3b3e80 100644
--- a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
+++ b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
@@ -1,6 +1,6 @@
---- htdocs/smokeping.cgi.dist.orig	Sun Jan 30 17:56:30 2005
-+++ htdocs/smokeping.cgi.dist	Mon Feb  7 21:49:11 2005
-@@ -1,12 +1,11 @@
+--- htdocs/smokeping.cgi.dist.orig	Mon Sep 26 22:15:57 2005
++++ htdocs/smokeping.cgi.dist	Thu Oct  6 10:40:18 2005
+@@ -1,13 +1,12 @@
 -#!/usr/sepp/bin/speedy -w
 +#!%%PREFIX%%/bin/speedy -w
  # -*-perl-*-
@@ -8,11 +8,12 @@
 -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%%/smokeping/lib);
+ use CGI::Carp qw(fatalsToBrowser);
  
- use Smokeping 1.42;
+ use Smokeping 2.000003;
  
 -Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 +Smokeping::cgi("%%PREFIX%%/etc/smokeping/config");
  
+ =head1 NAME
  
- BEGIN {
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-Curl.pm b/net-mgmt/smokeping/files/patch-lib-probes-Curl.pm
deleted file mode 100644
index 0dfe8a9..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-Curl.pm
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/probes/Curl.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/Curl.pm	Sun Jan 11 18:06:12 2004
-@@ -1,6 +1,6 @@
- package probes::Curl;
- 
--my $DEFAULTBIN = "/usr/bin/curl";
-+my $DEFAULTBIN = "%%PREFIX%%/bin/curl";
- 
- =head1 NAME
- 
-@@ -15,7 +15,7 @@
-  *** Probes ***
-  + Curl
- 
-- binary = /usr/bin/curl # default value
-+ binary = %%PREFIX%%/bin/curl # default value
- 
-  *** Targets ***
- 
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPing.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPing.pm
deleted file mode 100644
index bd90fa1..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPing.pm
+++ /dev/null
@@ -1,28 +0,0 @@
---- lib/probes/EchoPing.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/EchoPing.pm	Sun Jan 11 18:06:12 2004
-@@ -1,6 +1,6 @@
- package probes::EchoPing;
- 
--my $DEFAULTBIN = "/usr/bin/echoping";
-+my $DEFAULTBIN = "%%PREFIX%%/bin/echoping";
- 
- =head1 NAME
- 
-@@ -16,7 +16,7 @@
-  *** Probes ***
-  + EchoPing
- 
-- binary = /usr/bin/echoping # default value
-+ binary = %%PREFIX%%/bin/echoping # default value
- 
-  *** Targets ***
- 
-@@ -105,7 +105,7 @@
- 
- The location of the echoping binary should probably be a global variable
- instead of a probe-specific one. As things are, every EchoPing -derived probe 
--has to declare it if the default (/usr/bin/echoping) isn't correct.
-+has to declare it if the default (%%PREFIX%%/bin/echoping) isn't correct.
- 
- =head1 AUTHOR
- 
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingChargen.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingChargen.pm
deleted file mode 100644
index 29305add..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingChargen.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/EchoPingChargen.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/EchoPingChargen.pm	Sun Jan 11 18:06:12 2004
-@@ -13,7 +13,7 @@
-  *** Probes ***
-  + EchoPingChargen
- 
-- binary = /usr/bin/echoping
-+ binary = %%PREFIX%%/bin/echoping
- 
-  *** Targets ***
- 
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingDiscard.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingDiscard.pm
deleted file mode 100644
index fe12d11..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingDiscard.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/EchoPingDiscard.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/EchoPingDiscard.pm	Sun Jan 11 18:06:12 2004
-@@ -13,7 +13,7 @@
-  *** Probes ***
-  + EchoPingDiscard
- 
-- binary = /usr/bin/echoping
-+ binary = %%PREFIX%%/bin/echoping
- 
-  *** Targets ***
- 
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttp.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttp.pm
deleted file mode 100644
index 43aa1a4..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttp.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/EchoPingHttp.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/EchoPingHttp.pm	Sun Jan 11 18:06:12 2004
-@@ -13,7 +13,7 @@
-  *** Probes ***
-  + EchoPingHttp
- 
-- binary = /usr/bin/echoping # mandatory
-+ binary = %%PREFIX%%/bin/echoping # mandatory
-  
- 
-  *** Targets ***
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttps.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttps.pm
deleted file mode 100644
index e8d7036..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingHttps.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/EchoPingHttps.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/EchoPingHttps.pm	Sun Jan 11 18:06:12 2004
-@@ -14,7 +14,7 @@
-  *** Probes ***
-  + EchoPingHttps
- 
-- binary = /usr/bin/echoping # mandatory
-+ binary = %%PREFIX%%/bin/echoping # mandatory
- 
-  *** Targets ***
- 
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingIcp.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingIcp.pm
deleted file mode 100644
index 60d762c..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingIcp.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/EchoPingIcp.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/EchoPingIcp.pm	Sun Jan 11 18:06:12 2004
-@@ -14,7 +14,7 @@
-  *** Probes ***
-  + EchoPingIcp
- 
-- binary = /usr/bin/echoping # mandatory
-+ binary = %%PREFIX%%/bin/echoping # mandatory
-  
-  *** Targets ***
- 
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingSmtp.pm b/net-mgmt/smokeping/files/patch-lib-probes-EchoPingSmtp.pm
deleted file mode 100644
index bf4fa61..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-EchoPingSmtp.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/EchoPingSmtp.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/EchoPingSmtp.pm	Sun Jan 11 18:06:12 2004
-@@ -13,7 +13,7 @@
-  *** Probes ***
-  + EchoPingSmtp
- 
-- binary = /usr/bin/echoping # mandatory
-+ binary = %%PREFIX%%/bin/echoping # mandatory
- 
-  *** Targets ***
-  probe = EchoPingSmtp
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-IOSPing.pm b/net-mgmt/smokeping/files/patch-lib-probes-IOSPing.pm
deleted file mode 100644
index 4868b78..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-IOSPing.pm
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/probes/IOSPing.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/IOSPing.pm	Sun Jan 11 18:06:12 2004
-@@ -8,7 +8,7 @@
- 
-  *** Probes ***
-  + IOSPing
-- binary = /usr/bin/remsh
-+ binary = %%PREFIX%%/bin/remsh
-  packetsize = 1024
-  forks = 1
- 
-@@ -27,8 +27,8 @@
- The binary and ioshost options are mandatory.
- 
- The binary option specifies the path of the binary to be used to
--connect to the IOS device.  Commonly used binaries are /usr/bin/rsh
--and /usr/bin/remsh, although any script or binary should work if can
-+connect to the IOS device.  Commonly used binaries are %%PREFIX%%/bin/rsh
-+and %%PREFIX%%/bin/remsh, although any script or binary should work if can
- be called as 
- 
-     /path/to/binary [ -l user ] router ping
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-LDAP.pm b/net-mgmt/smokeping/files/patch-lib-probes-LDAP.pm
deleted file mode 100644
index d66dadf..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-LDAP.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/LDAP.pm.orig	Fri Feb 20 00:28:14 2004
-+++ lib/probes/LDAP.pm	Fri Feb 20 00:28:44 2004
-@@ -13,7 +13,7 @@
-  *** Probes ***
-  + LDAP
- 
-- passwordfile = /usr/share/smokeping/etc/password # optional
-+ passwordfile = %%PREFIX%%/etc/smokeping/password # optional
-  sleeptime = 0.5 # optional, 1 second by default
- 
-  *** Targets ***
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-Radius.pm b/net-mgmt/smokeping/files/patch-lib-probes-Radius.pm
deleted file mode 100644
index 0e25c7e..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-Radius.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/Radius.pm.orig	Fri Feb 20 00:29:00 2004
-+++ lib/probes/Radius.pm	Fri Feb 20 00:29:21 2004
-@@ -13,7 +13,7 @@
-  *** Probes ***
-  + Radius
- 
-- passwordfile = /usr/share/smokeping/etc/password
-+ passwordfile = %%PREFIX%%/etc/smokeping/password
-  secretfile = /etc/raddb/secret
-  sleeptime = 0.5 # optional, 1 second by default
- 
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-RemoteFPing.pm b/net-mgmt/smokeping/files/patch-lib-probes-RemoteFPing.pm
deleted file mode 100644
index b88f9a5..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-RemoteFPing.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/RemoteFPing.pm.orig	Sun Jan 11 18:06:12 2004
-+++ lib/probes/RemoteFPing.pm	Sun Jan 11 18:06:12 2004
-@@ -8,7 +8,7 @@
- 
-  *** Probes ***
-  + RemoteFPing
-- binary = /usr/bin/ssh
-+ binary = %%PREFIX%%/bin/ssh
-  packetsize = 1024
-  forks = 1
- 
diff --git a/net-mgmt/smokeping/files/patch-lib-probes-passwordchecker.pm b/net-mgmt/smokeping/files/patch-lib-probes-passwordchecker.pm
deleted file mode 100644
index 031a030..0000000
--- a/net-mgmt/smokeping/files/patch-lib-probes-passwordchecker.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/probes/passwordchecker.pm.orig	Fri Feb 20 00:29:34 2004
-+++ lib/probes/passwordchecker.pm	Fri Feb 20 00:29:55 2004
-@@ -16,7 +16,7 @@
-  *** Probes ***
-  + MyPasswordChecker
-  # location of the file containing usernames and passwords
-- passwordfile = /usr/share/smokeping/etc/passwords
-+ passwordfile = %%PREFIX%%/etc/smokeping/passwords
- 
- The specified password file:
- 
diff --git a/net-mgmt/smokeping/pkg-message b/net-mgmt/smokeping/pkg-message
index ba60a08..b95c237 100644
--- a/net-mgmt/smokeping/pkg-message
+++ b/net-mgmt/smokeping/pkg-message
@@ -7,13 +7,15 @@ NOTE: A set of sample configuration files have been installed:
   %%PREFIX%%/etc/smokeping/config
   %%PREFIX%%/etc/smokeping/smokemail
   %%PREFIX%%/etc/smokeping/basepage.html
-  %%PREFIX%%/etc/smokeping/config-echoping
+  %%PREFIX%%/etc/smokeping/tmail
 
-You *MUST* edit these to suit your requirements. Please refer to
-%%PREFIX%%/share/doc/smokeping/smokeping_install.txt and 
-%%PREFIX%%/share/doc/smokeping/smokeping_config.txt for further
+You *MUST* edit these to suit your requirements. Please read the
+manpages 'smokeping_install' and 'smokeping_config' for further
 details on installation and configuration.
 
+If you are upgrading from a previous version of Smokeping, the
+manpage 'smokeping_upgrade' may be of help.
+
 
 Once configured, you can start SmokePing data collection by running:
 
diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist
index 7560f1e..c05739f 100644
--- a/net-mgmt/smokeping/pkg-plist
+++ b/net-mgmt/smokeping/pkg-plist
@@ -1,4 +1,5 @@
 bin/smokeping
+bin/tSmoke
 etc/rc.d/smokeping.sh
 @unexec if cmp -s %D/etc/smokeping/basepage.html %D/etc/smokeping/basepage.html.dist; then rm -f %D/etc/smokeping/basepage.html; fi
 etc/smokeping/basepage.html.dist
@@ -9,19 +10,17 @@ etc/smokeping/config.dist
 @unexec if cmp -s %D/etc/smokeping/smokemail %D/etc/smokeping/smokemail.dist; then rm -f %D/etc/smokeping/smokemail; fi
 etc/smokeping/smokemail.dist
 @exec [ -f %B/smokemail ] || cp %B/%f %B/smokemail
-@unexec if cmp -s %D/etc/smokeping/config-echoping %D/etc/smokeping/config-echoping.dist; then rm -f %D/etc/smokeping/config-echoping; fi
-etc/smokeping/config-echoping.dist
-@exec [ -f %B/config-echoping ] || cp %B/%f %B/config-echoping
+@unexec if cmp -s %D/etc/smokeping/tmail %D/etc/smokeping/tmail.dist; then rm -f %D/etc/smokeping/tmail; fi
+etc/smokeping/tmail.dist
+@exec [ -f %B/tmail ] || cp %B/%f %B/tmail
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/ParseConfig.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/ParseConfig.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/Smokeping.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/Smokeping.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping.txt
 %%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.html
 %%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.txt
 %%PORTDOCS%%%%DOCSDIR%%/smokeping.html
@@ -30,97 +29,122 @@ etc/smokeping/config-echoping.dist
 %%PORTDOCS%%%%DOCSDIR%%/smokeping_config.txt
 %%PORTDOCS%%%%DOCSDIR%%/smokeping_install.html
 %%PORTDOCS%%%%DOCSDIR%%/smokeping_install.txt
-%%PORTDOCS%%%%DOCSDIR%%/matchers/avgratio.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/matchers/avgratio.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/matchers/base.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/matchers/base.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/matchers/median.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/matchers/median.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/AnotherDNS.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/AnotherDNS.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/AnotherSSH.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/AnotherSSH.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/CiscoRTTMonDNS.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/CiscoRTTMonDNS.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/CiscoRTTMonEchoICMP.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/CiscoRTTMonEchoICMP.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/CiscoRTTMonTcpConnect.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/CiscoRTTMonTcpConnect.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/Curl.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/Curl.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/DNS.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/DNS.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPing.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPing.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingChargen.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingChargen.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingDiscard.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingDiscard.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingHttp.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingHttp.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingHttps.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingHttps.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingIcp.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingIcp.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingSmtp.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/EchoPingSmtp.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/FPing.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/FPing.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/FPing6.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/FPing6.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/IOSPing.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/IOSPing.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/LDAP.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/LDAP.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/Radius.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/Radius.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/RemoteFPing.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/RemoteFPing.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/SSH.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/SSH.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/base.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/base.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/basefork.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/basefork.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/basevars.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/basevars.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/passwordchecker.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/passwordchecker.pm.txt
-%%PORTDOCS%%%%DOCSDIR%%/probes/telnetIOSPing.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/probes/telnetIOSPing.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/Config/Grammar.html
+%%PORTDOCS%%%%DOCSDIR%%/Config/Grammar.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Avgratio.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Avgratio.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/base.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/base.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Median.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Median.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherDNS.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherDNS.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherSSH.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherSSH.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonDNS.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonDNS.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonEchoICMP.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonEchoICMP.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonTcpConnect.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonTcpConnect.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Curl.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Curl.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/DNS.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/DNS.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPing.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPing.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingChargen.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingChargen.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingDiscard.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingDiscard.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttp.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttp.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttps.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttps.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingIcp.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingIcp.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingSmtp.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingSmtp.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing6.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing6.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/IOSPing.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/IOSPing.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/LDAP.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/LDAP.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Radius.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Radius.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/RemoteFPing.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/RemoteFPing.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/SSH.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/SSH.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/TelnetIOSPing.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/TelnetIOSPing.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/base.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/base.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basefork.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basefork.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basevars.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basevars.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/passwordchecker.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/passwordchecker.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/skel.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/skel.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/Examples.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/Examples.txt
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/RRDtools.html
+%%PORTDOCS%%%%DOCSDIR%%/Smokeping/RRDtools.txt
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_examples.html
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_examples.txt
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_extend.html
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_extend.txt
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_upgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/smokeping_upgrade.txt
+%%PORTDOCS%%%%DOCSDIR%%/tSmoke.html
+%%PORTDOCS%%%%DOCSDIR%%/tSmoke.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/config.echoping
+%%PORTDOCS%%%%EXAMPLESDIR%%/config.fping-instances
+%%PORTDOCS%%%%EXAMPLESDIR%%/config.multiple-probes
+%%PORTDOCS%%%%EXAMPLESDIR%%/config.simple
+%%PORTDOCS%%%%EXAMPLESDIR%%/config.targetvars-with-Curl
+%%PORTDOCS%%%%EXAMPLESDIR%%/config.template
 smokeping/htdocs/smokeping.cgi
-smokeping/lib/ISG/ParseConfig.pm
 smokeping/lib/Smokeping.pm
-smokeping/lib/ciscoRttMonMIB.pm
-smokeping/lib/matchers/base.pm
-smokeping/lib/matchers/median.pm
-smokeping/lib/matchers/avgratio.pm
-smokeping/lib/probes/AnotherDNS.pm
-smokeping/lib/probes/AnotherSSH.pm
-smokeping/lib/probes/CiscoRTTMonDNS.pm
-smokeping/lib/probes/CiscoRTTMonEchoICMP.pm
-smokeping/lib/probes/CiscoRTTMonTcpConnect.pm
-smokeping/lib/probes/Curl.pm
-smokeping/lib/probes/DNS.pm
-smokeping/lib/probes/EchoPing.pm
-smokeping/lib/probes/EchoPingChargen.pm
-smokeping/lib/probes/EchoPingDiscard.pm
-smokeping/lib/probes/EchoPingHttp.pm
-smokeping/lib/probes/EchoPingHttps.pm
-smokeping/lib/probes/EchoPingIcp.pm
-smokeping/lib/probes/EchoPingSmtp.pm
-smokeping/lib/probes/FPing.pm
-smokeping/lib/probes/FPing6.pm
-smokeping/lib/probes/IOSPing.pm
-smokeping/lib/probes/LDAP.pm
-smokeping/lib/probes/Radius.pm
-smokeping/lib/probes/RemoteFPing.pm
-smokeping/lib/probes/SSH.pm
-smokeping/lib/probes/base.pm
-smokeping/lib/probes/basefork.pm
-smokeping/lib/probes/basevars.pm
-smokeping/lib/probes/passwordchecker.pm
-smokeping/lib/probes/telnetIOSPing.pm
+smokeping/lib/Smokeping/ciscoRttMonMIB.pm
+smokeping/lib/Smokeping/matchers/base.pm
+smokeping/lib/Smokeping/matchers/Median.pm
+smokeping/lib/Smokeping/matchers/Avgratio.pm
+smokeping/lib/Smokeping/probes/AnotherDNS.pm
+smokeping/lib/Smokeping/probes/AnotherSSH.pm
+smokeping/lib/Smokeping/probes/CiscoRTTMonDNS.pm
+smokeping/lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm
+smokeping/lib/Smokeping/probes/CiscoRTTMonTcpConnect.pm
+smokeping/lib/Smokeping/probes/Curl.pm
+smokeping/lib/Smokeping/probes/DNS.pm
+smokeping/lib/Smokeping/probes/EchoPing.pm
+smokeping/lib/Smokeping/probes/EchoPingChargen.pm
+smokeping/lib/Smokeping/probes/EchoPingDiscard.pm
+smokeping/lib/Smokeping/probes/EchoPingHttp.pm
+smokeping/lib/Smokeping/probes/EchoPingHttps.pm
+smokeping/lib/Smokeping/probes/EchoPingIcp.pm
+smokeping/lib/Smokeping/probes/EchoPingSmtp.pm
+smokeping/lib/Smokeping/probes/FPing.pm
+smokeping/lib/Smokeping/probes/FPing6.pm
+smokeping/lib/Smokeping/probes/IOSPing.pm
+smokeping/lib/Smokeping/probes/LDAP.pm
+smokeping/lib/Smokeping/probes/Radius.pm
+smokeping/lib/Smokeping/probes/RemoteFPing.pm
+smokeping/lib/Smokeping/probes/SSH.pm
+smokeping/lib/Smokeping/probes/TelnetIOSPing.pm
+smokeping/lib/Smokeping/probes/base.pm
+smokeping/lib/Smokeping/probes/basefork.pm
+smokeping/lib/Smokeping/probes/basevars.pm
+smokeping/lib/Smokeping/probes/passwordchecker.pm
+smokeping/lib/Smokeping/probes/skel.pm
+smokeping/lib/Smokeping/Examples.pm
+smokeping/lib/Smokeping/RRDtools.pm
+smokeping/lib/Config/Grammar.pm
 @unexec rmdir %D/etc/smokeping 2>/dev/null || true
 @exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img
 @unexec rm -rf %D/smokeping/htdocs/img 2>/dev/null || true
@@ -129,11 +153,15 @@ smokeping/lib/probes/telnetIOSPing.pm
 @unexec rmdir %D/var/smokeping 2>/dev/null || true
 @unexec rmdir %D/var 2>/dev/null || true
 @dirrm smokeping/htdocs
-@dirrm smokeping/lib/probes
-@dirrm smokeping/lib/matchers
-@dirrm smokeping/lib/ISG
+@dirrm smokeping/lib/Config
+@dirrm smokeping/lib/Smokeping/probes
+@dirrm smokeping/lib/Smokeping/matchers
+@dirrm smokeping/lib/Smokeping
 @dirrm smokeping/lib
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/probes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/matchers
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Config
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/probes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/matchers
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @unexec rmdir %D/smokeping 2>/dev/null || true