- update to 2.6.7

- pass maintainership

13 files changed, 176 insertions, 561 deletions

diff --git a/UPDATING b/UPDATING
index ed1c2f4089b0..5815d9e016e0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20120513:
+  AFFECTS: users of net-mgmt/smokeping
+  AUTHOR: lth@FreeBSD.org
+
+  Smokeping has been updated to 2.6.7, and the web server configuration
+  has changed. FastCGI is now preferred. Please check the documentation
+  that your web server configuration is OK.
+
 20120512:
   AFFECTS: users of textproc/p5-XML-SAX
   AUTHOR: crees@FreeBSD.org
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index d2e5d95c78b6..f4a615b3b76f 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -6,68 +6,96 @@
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	2.4.2
-PORTREVISION=	7
+PORTVERSION=	2.6.7
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/ \
 		http://smokeping.cs.pu.edu.tw/pub/
 
-MAINTAINER=	lth@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Latency logging and graphing system
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
 		p5-CGI-Session>0:${PORTSDIR}/www/p5-CGI-Session \
-		p5-CGI-SpeedyCGI>0:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
 		p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
 		p5-SNMP_Session>0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		p5-libwww>0:${PORTSDIR}/www/p5-libwww
+		p5-libwww>0:${PORTSDIR}/www/p5-libwww \
+		p5-CGI.pm>0:${PORTSDIR}/www/p5-CGI.pm \
+		p5-FCGI>0:${PORTSDIR}/www/p5-FCGI \
+		p5-Config-Grammar>0:${PORTSDIR}/devel/p5-Config-Grammar \
+		p5-Socket6>0:${PORTSDIR}/net/p5-Socket6
 
-NO_BUILD=	yes
 USE_PERL5=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	PERL=${PERL} PERL5LIB=${PREFIX}/smokeping/lib
+CONFIGURE_ARGS+=	\
+		--sysconfdir=${ETCDIR} \
+		--with-htdocs-dir=${PREFIX}/smokeping/htdocs \
+		--libdir=${PREFIX}/smokeping/lib
+HTDOCSDIR=	${PREFIX}/smokeping/htdocs
 
 USE_RC_SUBR=	smokeping
 
 MAN1=		smokeping.1 \
-		smokeping.cgi.1 \
+		smokeping_cgi.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 \
+MAN3=		Smokeping_matchers_Avgratio.3 \
+		Smokeping_matchers_CheckLatency.3 \
+		Smokeping_matchers_CheckLoss.3 \
+		Smokeping_matchers_ExpLoss.3 \
+		Smokeping_matchers_Median.3 \
+		Smokeping_matchers_Medratio.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_DismanPing.3 \
+		Smokeping_probes_EchoPing.3 \
+		Smokeping_probes_EchoPingChargen.3 \
+		Smokeping_probes_EchoPingDNS.3 \
+		Smokeping_probes_EchoPingDiscard.3 \
+		Smokeping_probes_EchoPingHttp.3 \
+		Smokeping_probes_EchoPingHttps.3 \
+		Smokeping_probes_EchoPingIcp.3 \
+		Smokeping_probes_EchoPingLDAP.3 \
+		Smokeping_probes_EchoPingPlugin.3 \
+		Smokeping_probes_EchoPingSmtp.3 \
+		Smokeping_probes_EchoPingWhois.3 \
+		Smokeping_probes_FPing.3 \
+		Smokeping_probes_FPing6.3 \
+		Smokeping_probes_FTPtransfer.3 \
+		Smokeping_probes_IOSPing.3 \
+		Smokeping_probes_LDAP.3 \
+		Smokeping_probes_NFSping.3 \
+		Smokeping_probes_OpenSSHJunOSPing.3 \
+		Smokeping_probes_Radius.3 \
+		Smokeping_probes_RemoteFPing.3 \
+		Smokeping_probes_SSH.3 \
+		Smokeping_probes_SipSak.3 \
+		Smokeping_probes_TCPPing.3 \
+		Smokeping_probes_TacacsPlus.3 \
+		Smokeping_probes_TelnetIOSPing.3 \
+		Smokeping_probes_TelnetJunOSPing.3 \
+		Smokeping_probes_WebProxyFilter.3 \
+		Smokeping_probes_base.3 \
+		Smokeping_probes_basefork.3 \
+		Smokeping_probes_basevars.3 \
+		Smokeping_probes_passwordchecker.3 \
+		Smokeping_probes_skel.3 \
+		Smokeping_sorters_Loss.3 \
+		Smokeping_sorters_Max.3 \
+		Smokeping_sorters_Median.3 \
+		Smokeping_sorters_StdDev.3 \
+		Smokeping_sorters_base.3
+MAN5=		smokeping_config.5 \
+		smokeping_examples.5
+MAN7=		smokeping_extend.7 \
 		smokeping_install.7 \
+		smokeping_master_slave.7 \
 		smokeping_upgrade.7
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
@@ -77,62 +105,7 @@ GROUPS=		smokeping
 
 SUB_FILES=	pkg-deinstall pkg-message
 SUB_LIST=	USERS=${USERS} \
-		GROUPS=${GROUPS} \
-		PERL=${PERL} \
-		PKG_PREFIX=${PKG_PREFIX}
-
-DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
-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_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
+		GROUPS=${GROUPS}
 
 OPTIONS=	FPING "Support for fping probes" on
 OPTIONS+=	ECHOPING "Support for EchoPing probes" off
@@ -178,87 +151,19 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 
 .include <bsd.port.pre.mk>
 
-# Things that shouldn't have been in the tarball in the first place
+# We will take these from CPAN instead
 post-extract:
-	${RM} ${WRKSRC}/lib/BER.pm
-	${RM} ${WRKSRC}/lib/SNMP_*.pm
-	${RM} -rf ${WRKSRC}/lib/Digest
-	${RM} -rf ${WRKSRC}/lib/CGI
-
-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
+	cd ${WRKSRC}/lib ; ${RM} BER.pm SNMP_util.pm SNMP_Session.pm
 
 post-patch:
-	${FIND} ${WRKSRC} -name \*.orig -delete
-
-pre-configure:
 	${REINPLACE_CMD} ${SUB_LIST: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}/htdocs/tr.cgi.dist \
-		${WRKSRC}/etc/config.dist \
-		${WRKSRC}/lib/Smokeping/probes/*.pm
-	${FIND} ${WRKSRC} -name \*.bak -delete
-	${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
-	${MV} ${WRKSRC}/htdocs/tr.cgi.dist ${WRKSRC}/htdocs/tr.cgi
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke ${PREFIX}/bin
-	(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
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${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
-.endfor
-.endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR})
-.endif
-	${MKDIR} ${ETCDIR}
-.for FILE in ${ETC1}
-	${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${ETCDIR}
-	if [ ! -f ${ETCDIR}/${FILE} ]; then \
-		${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${ETCDIR}/${FILE} ; \
-	fi
-.endfor
-	${MKDIR} ${PREFIX}/smokeping/htdocs
-	${MKDIR} ${PREFIX}/smokeping/htdocs/img
-	${CP} -R ${WRKSRC}/htdocs ${PREFIX}/smokeping/
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/smokeping/htdocs
-	${CP} -R ${WRKSRC}/lib ${PREFIX}/smokeping/
-	${MKDIR} ${PREFIX}/var/smokeping
-	${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/var/smokeping
+		${WRKSRC}/doc/Makefile.in
 
 post-install:
+.for FILE in basepage.html config smokemail tmail
+	[ -f ${ETCDIR}/${FILE} ] || ${CP} ${ETCDIR}/${FILE}.dist ${ETCDIR}/${FILE}
+.endfor
+	[ -f ${PREFIX}/smokeping/htdocs/smokeping.fcgi ] || ${CP} ${PREFIX}/smokeping/htdocs/smokeping.fcgi.dist ${PREFIX}/smokeping/htdocs/smokeping.fcgi
 .if !defined(BATCH)
 	${CAT} ${PKGMESSAGE}
 .endif
diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo
index 9dec411c5700..9d4d54fdf7df 100644
--- a/net-mgmt/smokeping/distinfo
+++ b/net-mgmt/smokeping/distinfo
@@ -1,2 +1,2 @@
-SHA256 (smokeping-2.4.2.tar.gz) = ed8680d1b3fdb2b1efde3aa14b37bf7e9aee2c992c5814061dbd78e6eea00d49
-SIZE (smokeping-2.4.2.tar.gz) = 909514
+SHA256 (smokeping-2.6.7.tar.gz) = 40c07e1edd5b1f66308e3af72b21f547c948cd0afe1465934387f48ac5e3c426
+SIZE (smokeping-2.6.7.tar.gz) = 423151
diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping.dist b/net-mgmt/smokeping/files/patch-bin-smokeping.dist
deleted file mode 100644
index ecc67190a4dc..000000000000
--- a/net-mgmt/smokeping/files/patch-bin-smokeping.dist
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./bin/smokeping.dist.orig	2008-10-29 15:03:35.000000000 +0100
-+++ ./bin/smokeping.dist	2008-10-29 15:05:17.000000000 +0100
-@@ -1,13 +1,13 @@
--#!/usr/bin/perl -w
-+#!%%PERL%% -w
- # -*-perl-*-
- 
--use lib qw(/usr/pack/rrdtool-1.3.0-rp/lib/perl);
--use lib qw(lib);
-+use lib qw(%%PREFIX%%/smokeping/lib);
- use strict;
- use warnings;
- use Smokeping 2.004002;
-  
--Smokeping::main("etc/config.dist");
-+$0 = "%%PREFIX%%/bin/smokeping";
-+Smokeping::main("%%PREFIX%%/etc/smokeping/config");
- 
- =head1 NAME
- 
-@@ -127,22 +127,8 @@ Please refer to L<the installation docum
- 
- =head1 SETUP
- 
--When installing SmokePing, this file has to be adjusted to fit your
--local system. Three paths have to be entered.
--
--One pointing to your B<rrdtool> installation
--
-- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
--
--One pointing to the place where you have installed the SmokePing libraries
--
-- use lib qw(/home/oetiker/public_html/smokeping/lib);
--
--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");
-+When installing SmokePing, 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-bin-tSmoke.dist b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
deleted file mode 100644
index 383881886030..000000000000
--- a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
+++ /dev/null
@@ -1,63 +0,0 @@
---- ./bin/tSmoke.dist.orig	2008-10-29 15:06:25.000000000 +0100
-+++ ./bin/tSmoke.dist	2008-10-29 15:07:53.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!%%PERL%%
- #
- #-----------------------------------------------
- # tSmoke.pl
-@@ -51,8 +51,7 @@ use warnings;
- # -- Getopt::Long
- #
- # Point the lib variables to your implementation
--use lib qw(lib);
--use lib qw(/usr/local/rrdtool-1.0.39/lib/perl);
-+use lib qw(%%PREFIX%%/smokeping/lib);
- 
- use Smokeping 2.004002;
- use Net::SMTP;
-@@ -61,7 +60,7 @@ use Pod::Usage;
- use RRDs;
- 
- # Point to your Smokeping config file
--my $cfgfile = "etc/config.dist";
-+my $cfgfile = "%%PREFIX%%/etc/config";
- 
- # global variables
- my $cfg;
-@@ -482,33 +481,8 @@ Typical crontab used to invoke this are
- 
- =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-doc__Makefile.in b/net-mgmt/smokeping/files/patch-doc__Makefile.in
new file mode 100644
index 000000000000..638d7645cdda
--- /dev/null
+++ b/net-mgmt/smokeping/files/patch-doc__Makefile.in
@@ -0,0 +1,11 @@
+--- ./doc/Makefile.in.orig	2011-11-12 11:57:45.000000000 +0100
++++ ./doc/Makefile.in	2012-02-02 14:54:50.000000000 +0100
+@@ -249,7 +249,7 @@ iman5_DATA = $(MAN5)
+ iman7dir = $(mandir)/man7
+ iman7_DATA = $(MAN7)
+ EXAMPLES := $(wildcard examples/config.*)
+-etcdir = $(sysconfdir)/examples
++etcdir = %%EXAMPLESDIR%%
+ etc_DATA = $(EXAMPLES)
+ all: all-am
+ 
diff --git a/net-mgmt/smokeping/files/patch-etc-config.dist b/net-mgmt/smokeping/files/patch-etc-config.dist
deleted file mode 100644
index f4fa1acf5aff..000000000000
--- a/net-mgmt/smokeping/files/patch-etc-config.dist
+++ /dev/null
@@ -1,40 +0,0 @@
---- etc/config.dist.orig	2008-02-04 18:00:46.000000000 +0100
-+++ etc/config.dist	2008-05-01 15:26:00.000000000 +0200
-@@ -7,13 +7,13 @@
- # NOTE: do not put the Image Cache below cgi-bin
- # since all files under cgi-bin will be executed ... this is not
- # good for images.
--imgcache = /home/oetiker/public_html/smokeping-ms/cache
--imgurl   = cache
--datadir  = /tmp/smokeping-ms/data
--piddir  = /tmp/smokeping-ms/var
-+imgcache = %%PREFIX%%/smokeping/htdocs/img
-+imgurl   = img
-+datadir  = %%PREFIX%%/var/smokeping
-+piddir  = %%PREFIX%%/var/smokeping
- 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
-+smokemail = %%PREFIX%%/etc/smokeping/smokemail
-+tmail = %%PREFIX%%/etc/smokeping/tmail
- # specify this to get syslog logging
- syslogfacility = local0
- # each probe is now run in its own process
-@@ -47,7 +47,7 @@
- 
- *** Presentation ***
- 
--template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist
-+template = %%PREFIX%%/etc/smokeping/basepage.html
- 
- + charts
- 
-@@ -105,7 +105,7 @@
- 
- + FPing
- 
--binary = /usr/sbin/fping
-+binary = %%PREFIX%%/sbin/fping
- 
- *** Slaves ***
- secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.dist
diff --git a/net-mgmt/smokeping/files/patch-etc__config.dist.in b/net-mgmt/smokeping/files/patch-etc__config.dist.in
new file mode 100644
index 000000000000..d963290ed17e
--- /dev/null
+++ b/net-mgmt/smokeping/files/patch-etc__config.dist.in
@@ -0,0 +1,44 @@
+--- ./etc/config.dist.in.orig	2011-10-30 11:33:11.000000000 +0100
++++ ./etc/config.dist.in	2012-02-02 14:54:50.000000000 +0100
+@@ -7,13 +7,13 @@ sendmail = @SENDMAIL@
+ # NOTE: do not put the Image Cache below cgi-bin
+ # since all files under cgi-bin will be executed ... this is not
+ # good for images.
+-imgcache = @prefix@/cache
+-imgurl   = cache
+-datadir  = @prefix@/data
+-piddir  = @prefix@/var
++imgcache = @prefix@/smokeping/htdocs/img
++imgurl   = img
++datadir  = @prefix@/var/smokeping
++piddir  = @prefix@/var/smokeping
+ cgiurl   = http://some.url/smokeping.cgi
+-smokemail = @prefix@/etc/smokemail.dist
+-tmail = @prefix@/etc/tmail.dist
++smokemail = @prefix@/etc/smokeping/smokemail
++tmail = @prefix@/etc/smokeping/tmail
+ # specify this to get syslog logging
+ syslogfacility = local0
+ # each probe is now run in its own process
+@@ -47,7 +47,7 @@ AVERAGE  0.5 144   720
+ 
+ *** Presentation ***
+ 
+-template = @prefix@/etc/basepage.html.dist
++template = @prefix@/etc/smokeping/basepage.html
+ 
+ + charts
+ 
+@@ -105,10 +105,10 @@ unison_tolerance = 2
+ 
+ + FPing
+ 
+-binary = /usr/sbin/fping
++binary = @prefix@/sbin/fping
+ 
+ *** Slaves ***
+-secrets=@prefix@/etc/smokeping_secrets.dist
++secrets=@prefix@/etc/smokeping/smokeping_secrets
+ +boomer
+ display_name=boomer
+ color=0000ff
diff --git a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
deleted file mode 100644
index 972fd817debb..000000000000
--- a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
+++ /dev/null
@@ -1,49 +0,0 @@
---- htdocs/smokeping.cgi.dist.orig	Mon Sep 26 22:15:57 2005
-+++ htdocs/smokeping.cgi.dist	Thu Oct  6 10:40:18 2005
-@@ -1,17 +1,16 @@
--#!/usr/bin/speedy
-+#!%%PREFIX%%/bin/speedy -w
- # -*-perl-*-
- 
- 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%%/smokeping/lib);
-
- use CGI::Carp qw(fatalsToBrowser);
- 
- use Smokeping 2.004002;
- 
--Smokeping::cgi("/home/oetiker/checkouts/smokeping/trunk/software/etc/config.dist");
-+Smokeping::cgi("%%PREFIX%%/etc/smokeping/config");
- 
- =head1 NAME
- 
-@@ -34,23 +34,8 @@
- 
- =head1 SETUP
- 
--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);
--
--One pointing to your B<rrdtool> installation
--
-- use lib qw(/home/oetiker/public_html/smokeping/lib);
--
--One pointing to the place where you have installed the SmokePing libraries
--
-- use Smokeping;
--
-- Smokeping::cgi("/home/oetiker/.smokeping/config");
--
--The third path is the argument to the Smokeping::cgi command. It points to
--the SmokePing configuration file.
-++When installing SmokePing, 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-htdocs__tr.cgi.dist b/net-mgmt/smokeping/files/patch-htdocs__tr.cgi.dist
deleted file mode 100644
index 26c30971ae6b..000000000000
--- a/net-mgmt/smokeping/files/patch-htdocs__tr.cgi.dist
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./htdocs/tr.cgi.dist.orig	2008-07-09 14:35:43.000000000 +0200
-+++ ./htdocs/tr.cgi.dist	2008-07-09 14:49:01.000000000 +0200
-@@ -1,7 +1,6 @@
--#!/usr/sepp/bin/speedy-5.8.8 -w
-+#!%%PREFIX%%/bin/speedy -w
- use strict;
--use lib qw(/home/oposs/smokeping/software/lib);
--use lib qw(perl);
-+use lib qw(%%PREFIX%%/smokeping/lib);
- 
- use CGI;
- use CGI::Util qw(expires);
diff --git a/net-mgmt/smokeping/files/patch-lib__Makefile.in b/net-mgmt/smokeping/files/patch-lib__Makefile.in
new file mode 100644
index 000000000000..66f7f167ee2f
--- /dev/null
+++ b/net-mgmt/smokeping/files/patch-lib__Makefile.in
@@ -0,0 +1,11 @@
+--- ./lib/Makefile.in.orig	2012-02-02 15:00:36.000000000 +0100
++++ ./lib/Makefile.in	2012-02-02 15:01:17.000000000 +0100
+@@ -217,7 +217,7 @@ SORT := $(wildcard Smokeping/sorters/*.p
+ PROBE := $(wildcard Smokeping/probes/*.pm)
+ MATCH := $(wildcard Smokeping/matchers/*.pm)
+ EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH)
+-perllibdir = $(prefix)/lib
++perllibdir = $(prefix)/smokeping/lib
+ nobase_perllib_DATA = $(EXTRA_DIST)
+ all: all-am
+ 
diff --git a/net-mgmt/smokeping/files/pkg-message.in b/net-mgmt/smokeping/files/pkg-message.in
index 7d2db7a0efe8..4a0e93301dcd 100644
--- a/net-mgmt/smokeping/files/pkg-message.in
+++ b/net-mgmt/smokeping/files/pkg-message.in
@@ -2,12 +2,8 @@
 
 SmokePing has now been installed in %%PREFIX%%/smokeping/.
 
-NOTE: A set of sample configuration files have been installed:
-
-  %%ETCDIR%%/config
-  %%ETCDIR%%/smokemail
-  %%ETCDIR%%/basepage.html
-  %%ETCDIR%%/tmail
+NOTE: A set of sample configuration files have been installed in
+%%ETCDIR%%.
 
 You *MUST* edit these to suit your requirements. Please read the
 manpages 'smokeping_install' and 'smokeping_config' for further
@@ -24,12 +20,8 @@ to /etc/rc.conf, and then running, as root:
 
   %%PREFIX%%/etc/rc.d/smokeping start
 
-To enable Apache web access, add something like the following to
-your %%PREFIX%%/etc/apache/httpd.conf:
-
-  DocumentRoot %%PREFIX%%/smokeping/htdocs
-  ScriptAlias /smokeping.cgi %%PREFIX%%/smokeping/htdocs/smokeping.cgi
-  ScriptAlias /tr.cgi %%PREFIX%%/smokeping/htdocs/tr.cgi
+For configuration of web access, please see the 'smokeping_install'
+manpage.
 
 Enjoy!
 
diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist
index fce981db27af..86922bb1130a 100644
--- a/net-mgmt/smokeping/pkg-plist
+++ b/net-mgmt/smokeping/pkg-plist
@@ -1,5 +1,7 @@
 @stopdaemon smokeping
+bin/smokeinfo
 bin/smokeping
+bin/smokeping_cgi
 bin/tSmoke
 @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
@@ -13,96 +15,12 @@ etc/smokeping/smokemail.dist
 @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%%/Smokeping.html
-%%PORTDOCS%%%%DOCSDIR%%/Smokeping.txt
-%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.html
-%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.txt
-%%PORTDOCS%%%%DOCSDIR%%/smokeping.html
-%%PORTDOCS%%%%DOCSDIR%%/smokeping.txt
-%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.html
-%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.txt
-%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.html
-%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.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
+@unexec if cmp -s %D/etc/smokeping/smokeping_secrets %D/etc/smokeping/smokeping_secrets.dist; then rm -f %D/etc/smokeping/smokeping_secrets; fi
+etc/smokeping/smokeping_secrets.dist
+@exec [ -f %B/smokeping_secrets ] || cp %B/%f %B/smokeping_secrets
+@unexec if cmp -s %D/smokeping/htdocs/smokeping.fcgi %D/smokeping/htdocs/smokeping.fcgi.dist; then rm -f %D/smokeping/htdocs/smokeping.fcgi; fi
+smokeping/htdocs/smokeping.fcgi.dist
+@exec [ -f %B/smokeping.fcgi ] || cp %B/%f %B/smokeping.fcgi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.echoping
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.fping-instances
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.multiple-probes
@@ -117,59 +35,20 @@ smokeping/htdocs/cropper/lib/controls.js
 smokeping/htdocs/cropper/lib/dragdrop.js
 smokeping/htdocs/cropper/lib/effects.js
 smokeping/htdocs/cropper/lib/prototype.js
-smokeping/htdocs/cropper/lib/prototype.js.LICENSE
 smokeping/htdocs/cropper/lib/scriptaculous.js
 smokeping/htdocs/cropper/lib/slider.js
+smokeping/htdocs/cropper/lib/sound.js
 smokeping/htdocs/cropper/lib/unittest.js
 smokeping/htdocs/cropper/licence.txt
 smokeping/htdocs/cropper/marqueeHoriz.gif
 smokeping/htdocs/cropper/marqueeVert.gif
 smokeping/htdocs/cropper/smokeping-zoom.js
-smokeping/htdocs/resource/Tr/image/ajax-loader.gif
-smokeping/htdocs/resource/qx/icon/CrystalClear/16/actions/view-refresh.png
-smokeping/htdocs/resource/qx/icon/Nuvola/16/actions/view-refresh.png
-smokeping/htdocs/resource/qx/static/image/blank.gif
-smokeping/htdocs/resource/qx/static/image/dotted_white.gif
-smokeping/htdocs/resource/qx/widget/Windows/arrows/down.gif
-smokeping/htdocs/resource/qx/widget/Windows/arrows/down_small.gif
-smokeping/htdocs/resource/qx/widget/Windows/arrows/next.gif
-smokeping/htdocs/resource/qx/widget/Windows/arrows/up.gif
-smokeping/htdocs/resource/qx/widget/Windows/arrows/up_small.gif
-smokeping/htdocs/resource/qx/widget/Windows/cursors/alias.gif
-smokeping/htdocs/resource/qx/widget/Windows/cursors/copy.gif
-smokeping/htdocs/resource/qx/widget/Windows/cursors/move.gif
-smokeping/htdocs/resource/qx/widget/Windows/cursors/nodrop.gif
-smokeping/htdocs/resource/qx/widget/Windows/menu/checkbox.gif
-smokeping/htdocs/resource/qx/widget/Windows/menu/radiobutton.gif
-smokeping/htdocs/resource/qx/widget/Windows/splitpane/knob-horizontal.png
-smokeping/htdocs/resource/qx/widget/Windows/splitpane/knob-vertical.png
-smokeping/htdocs/resource/qx/widget/Windows/table/ascending.png
-smokeping/htdocs/resource/qx/widget/Windows/table/descending.png
-smokeping/htdocs/resource/qx/widget/Windows/table/selectColumnOrder.png
-smokeping/htdocs/resource/qx/widget/Windows/window/close.gif
-smokeping/htdocs/resource/qx/widget/Windows/window/maximize.gif
-smokeping/htdocs/resource/qx/widget/Windows/window/minimize.gif
-smokeping/htdocs/resource/qx/widget/Windows/window/restore.gif
-smokeping/htdocs/script/Tr.js
-smokeping/htdocs/smokeping.cgi
-smokeping/htdocs/tr.cgi
-smokeping/htdocs/tr.html
-smokeping/lib/Config/Grammar.pm
-smokeping/lib/Config/Grammar/Document.pm
-smokeping/lib/Config/Grammar/Dynamic.pm
-smokeping/lib/JSON.pm
-smokeping/lib/JSON/Converter.pm
-smokeping/lib/JSON/PP.pm
-smokeping/lib/JSON/PP5005.pm
-smokeping/lib/JSON/PP56.pm
-smokeping/lib/JSON/Parser.pm
-smokeping/lib/Qooxdoo/JSONRPC.pm
-smokeping/lib/Qooxdoo/Services/Tr.pm
 smokeping/lib/Smokeping.pm
 smokeping/lib/Smokeping/Colorspace.pm
 smokeping/lib/Smokeping/Config.pm
 smokeping/lib/Smokeping/Examples.pm
 smokeping/lib/Smokeping/Graphs.pm
+smokeping/lib/Smokeping/Info.pm
 smokeping/lib/Smokeping/Master.pm
 smokeping/lib/Smokeping/RRDhelpers.pm
 smokeping/lib/Smokeping/RRDtools.pm
@@ -178,9 +57,11 @@ smokeping/lib/Smokeping/ciscoRttMonMIB.pm
 smokeping/lib/Smokeping/matchers/Avgratio.pm
 smokeping/lib/Smokeping/matchers/CheckLatency.pm
 smokeping/lib/Smokeping/matchers/CheckLoss.pm
+smokeping/lib/Smokeping/matchers/ExpLoss.pm
 smokeping/lib/Smokeping/matchers/Median.pm
 smokeping/lib/Smokeping/matchers/Medratio.pm
 smokeping/lib/Smokeping/matchers/base.pm
+smokeping/lib/Smokeping/pingMIB.pm
 smokeping/lib/Smokeping/probes/AnotherDNS.pm
 smokeping/lib/Smokeping/probes/AnotherSSH.pm
 smokeping/lib/Smokeping/probes/CiscoRTTMonDNS.pm
@@ -188,6 +69,7 @@ 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/DismanPing.pm
 smokeping/lib/Smokeping/probes/EchoPing.pm
 smokeping/lib/Smokeping/probes/EchoPingChargen.pm
 smokeping/lib/Smokeping/probes/EchoPingDNS.pm
@@ -204,9 +86,12 @@ smokeping/lib/Smokeping/probes/FPing6.pm
 smokeping/lib/Smokeping/probes/FTPtransfer.pm
 smokeping/lib/Smokeping/probes/IOSPing.pm
 smokeping/lib/Smokeping/probes/LDAP.pm
+smokeping/lib/Smokeping/probes/NFSping.pm
+smokeping/lib/Smokeping/probes/OpenSSHJunOSPing.pm
 smokeping/lib/Smokeping/probes/Radius.pm
 smokeping/lib/Smokeping/probes/RemoteFPing.pm
 smokeping/lib/Smokeping/probes/SSH.pm
+smokeping/lib/Smokeping/probes/SipSak.pm
 smokeping/lib/Smokeping/probes/TCPPing.pm
 smokeping/lib/Smokeping/probes/TacacsPlus.pm
 smokeping/lib/Smokeping/probes/TelnetIOSPing.pm
@@ -233,41 +118,9 @@ smokeping/lib/Smokeping/sorters/base.pm
 @dirrm smokeping/lib/Smokeping/probes
 @dirrm smokeping/lib/Smokeping/matchers
 @dirrm smokeping/lib/Smokeping
-@dirrm smokeping/lib/Qooxdoo/Services
-@dirrm smokeping/lib/Qooxdoo
-@dirrm smokeping/lib/JSON
-@dirrm smokeping/lib/Config/Grammar
-@dirrm smokeping/lib/Config
 @dirrm smokeping/lib
-@dirrm smokeping/htdocs/script
-@dirrm smokeping/htdocs/resource/qx/widget/Windows/window
-@dirrm smokeping/htdocs/resource/qx/widget/Windows/table
-@dirrm smokeping/htdocs/resource/qx/widget/Windows/splitpane
-@dirrm smokeping/htdocs/resource/qx/widget/Windows/menu
-@dirrm smokeping/htdocs/resource/qx/widget/Windows/cursors
-@dirrm smokeping/htdocs/resource/qx/widget/Windows/arrows
-@dirrm smokeping/htdocs/resource/qx/widget/Windows
-@dirrm smokeping/htdocs/resource/qx/widget
-@dirrm smokeping/htdocs/resource/qx/static/image
-@dirrm smokeping/htdocs/resource/qx/static
-@dirrm smokeping/htdocs/resource/qx/icon/Nuvola/16/actions
-@dirrm smokeping/htdocs/resource/qx/icon/Nuvola/16
-@dirrm smokeping/htdocs/resource/qx/icon/Nuvola
-@dirrm smokeping/htdocs/resource/qx/icon/CrystalClear/16/actions
-@dirrm smokeping/htdocs/resource/qx/icon/CrystalClear/16
-@dirrm smokeping/htdocs/resource/qx/icon/CrystalClear
-@dirrm smokeping/htdocs/resource/qx/icon
-@dirrm smokeping/htdocs/resource/qx
-@dirrm smokeping/htdocs/resource/Tr/image
-@dirrm smokeping/htdocs/resource/Tr
-@dirrm smokeping/htdocs/resource
 @dirrm smokeping/htdocs/cropper/lib
 @dirrm smokeping/htdocs/cropper
 @dirrm smokeping/htdocs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Config
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/matchers
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/probes
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry smokeping