6 files changed, 32 insertions, 15 deletions

diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index 6e5cf4a80f76..7894a08e0ab8 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	2.0.9
-PORTREVISION=	2
+PORTVERSION=	2.1.0
 CATEGORIES=	net www
 MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/ \
 		http://smokeping.cs.pu.edu.tw/pub/
@@ -188,6 +187,8 @@ ETC1=		basepage.html config smokemail tmail
 post-extract:
 	@${RM} ${WRKSRC}/lib/BER.pm
 	@${RM} ${WRKSRC}/lib/SNMP_*.pm
+	@${RM} ${WRKSRC}/lib/Smokeping/svn-commit.tmp
+	@${RM} ${WRKSRC}/lib/svn-commit.tmp
 
 pre-patch:
 	@${REINPLACE_CMD} -e s!/usr/bin/!%%PREFIX%%/bin/! \
diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo
index 8191165b37a6..55f0bde7c126 100644
--- a/net-mgmt/smokeping/distinfo
+++ b/net-mgmt/smokeping/distinfo
@@ -1,3 +1,3 @@
-MD5 (smokeping-2.0.9.tar.gz) = 512c0bc38176451df7d664050b1283d9
-SHA256 (smokeping-2.0.9.tar.gz) = c9fc10d04afae31ac5283101f0211e842faf98784301178833ada1e3e4a0dcf5
-SIZE (smokeping-2.0.9.tar.gz) = 393777
+MD5 (smokeping-2.1.0.tar.gz) = 0587f58b7a4e22960c10d04ccf5376e0
+SHA256 (smokeping-2.1.0.tar.gz) = 759771237835030fcc09361be331ae9a44f16a9aa09881d35133c0192734d9ff
+SIZE (smokeping-2.1.0.tar.gz) = 501881
diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping.dist b/net-mgmt/smokeping/files/patch-bin-smokeping.dist
index 1221dc933b5c..a0f3a7d787cc 100644
--- a/net-mgmt/smokeping/files/patch-bin-smokeping.dist
+++ b/net-mgmt/smokeping/files/patch-bin-smokeping.dist
@@ -9,7 +9,7 @@
 -use lib qw(lib);
 +use lib qw(%%PREFIX%%/smokeping/lib);
  
- use Smokeping 2.000009;
+ use Smokeping 2.001000;
   
 -Smokeping::main("etc/config.dist");
 +Smokeping::main("%%PREFIX%%/etc/smokeping/config");
diff --git a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
index 0e07d3b0ed0c..cf497ca00765 100644
--- a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
+++ b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
@@ -14,7 +14,7 @@
 -use lib "/usr/local/rrdtool-1.0.39/lib/perl";
 +use lib qw(%%PREFIX%%/smokeping/lib);
  
- use Smokeping 2.000009;
+ use Smokeping 2.001000;
  use Net::SMTP;
 @@ -60,7 +59,7 @@
  use RRDs;
diff --git a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
index ae61a621367a..4f0284cc82f4 100644
--- a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
+++ b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
@@ -10,7 +10,7 @@
 +use lib qw(%%PREFIX%%/smokeping/lib);
  use CGI::Carp qw(fatalsToBrowser);
  
- use Smokeping 2.000009;
+ use Smokeping 2.001000;
  
 -Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 +Smokeping::cgi("%%PREFIX%%/etc/smokeping/config");
diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist
index cdaa2c042fda..e2a915ec246c 100644
--- a/net-mgmt/smokeping/pkg-plist
+++ b/net-mgmt/smokeping/pkg-plist
@@ -109,13 +109,18 @@ etc/smokeping/tmail.dist
 %%PORTDOCS%%%%EXAMPLESDIR%%/config.targetvars-with-Curl
 %%PORTDOCS%%%%EXAMPLESDIR%%/config.template
 smokeping/htdocs/smokeping.cgi
+smokeping/lib/Config/Grammar.pm
 smokeping/lib/Smokeping.pm
+smokeping/lib/Smokeping/Colorspace.pm
+smokeping/lib/Smokeping/Examples.pm
+smokeping/lib/Smokeping/RRDtools.pm
 smokeping/lib/Smokeping/ciscoRttMonMIB.pm
-smokeping/lib/Smokeping/matchers/base.pm
+smokeping/lib/Smokeping/matchers/Avgratio.pm
 smokeping/lib/Smokeping/matchers/CheckLatency.pm
 smokeping/lib/Smokeping/matchers/CheckLoss.pm
 smokeping/lib/Smokeping/matchers/Median.pm
-smokeping/lib/Smokeping/matchers/Avgratio.pm
+smokeping/lib/Smokeping/matchers/Medratio.pm
+smokeping/lib/Smokeping/matchers/base.pm
 smokeping/lib/Smokeping/probes/AnotherDNS.pm
 smokeping/lib/Smokeping/probes/AnotherSSH.pm
 smokeping/lib/Smokeping/probes/CiscoRTTMonDNS.pm
@@ -125,13 +130,18 @@ 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/EchoPingDNS.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/EchoPingLDAP.pm
+smokeping/lib/Smokeping/probes/EchoPingPlugin.pm
 smokeping/lib/Smokeping/probes/EchoPingSmtp.pm
+smokeping/lib/Smokeping/probes/EchoPingWhois.pm
 smokeping/lib/Smokeping/probes/FPing.pm
 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/Radius.pm
@@ -139,14 +149,18 @@ smokeping/lib/Smokeping/probes/RemoteFPing.pm
 smokeping/lib/Smokeping/probes/SSH.pm
 smokeping/lib/Smokeping/probes/TacacsPlus.pm
 smokeping/lib/Smokeping/probes/TelnetIOSPing.pm
+smokeping/lib/Smokeping/probes/TelnetJunOSPing.pm
+smokeping/lib/Smokeping/probes/WebProxyFilter.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
+smokeping/lib/Smokeping/sorters/Loss.pm
+smokeping/lib/Smokeping/sorters/Max.pm
+smokeping/lib/Smokeping/sorters/Median.pm
+smokeping/lib/Smokeping/sorters/StdDev.pm
+smokeping/lib/Smokeping/sorters/base.pm
 @dirrmtry etc/smokeping
 @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
@@ -156,13 +170,15 @@ smokeping/lib/Config/Grammar.pm
 @dirrmtry var
 @dirrm smokeping/htdocs
 @dirrm smokeping/lib/Config
-@dirrm smokeping/lib/Smokeping/probes
 @dirrm smokeping/lib/Smokeping/matchers
+@dirrm smokeping/lib/Smokeping/probes
+@dirrm smokeping/lib/Smokeping/sorters
 @dirrm smokeping/lib/Smokeping
 @dirrm smokeping/lib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Config
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/probes
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/matchers
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/probes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/sorters
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%