6 files changed, 44 insertions, 34 deletions

diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index b5a2a3d2b180..f48726909bfe 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	1.20
+PORTVERSION=	1.21
 CATEGORIES=	net www
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
@@ -24,21 +24,20 @@ RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool \
 
 USE_PERL5=	yes
 
-MAN1=		DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.1 \
+MAN1=		Curl.pm.1 DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.1 \
 		EchoPingHttp.pm.1 EchoPingHttps.pm.1 EchoPingIcp.pm.1 EchoPingSmtp.pm.1 \
-		FPing.pm.1 FPing6.pm.1 IOSPing.pm.1 ParseConfig.pm.1 Smokeping.pm.1 \
-		base.pm.1 basefork.pm.1 basevars.pm.1 \
-		smokeping.1 smokeping.cgi.1 \
-		smokeping_config.1 smokeping_install.1
+		FPing.pm.1 FPing6.pm.1 IOSPing.pm.1 ParseConfig.pm.1 RemoteFPing.pm.1 \
+		Smokeping.pm.1 base.pm.1 basefork.pm.1 basevars.pm.1 smokeping.1 \
+		smokeping.cgi.1 smokeping_config.1 smokeping_install.1 telnetIOSPing.pm.1
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 DOCDIR=		${PREFIX}/share/doc/smokeping
 DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
 DOC2=		Curl.pm DNS.pm EchoPing.pm EchoPingChargen.pm EchoPingDiscard.pm \
 		EchoPingHttp.pm EchoPingHttps.pm EchoPingIcp.pm EchoPingSmtp.pm \
-		FPing.pm FPing6.pm IOSPing.pm ParseConfig.pm Smokeping.pm \
+		FPing.pm FPing6.pm IOSPing.pm ParseConfig.pm RemoteFPing.pm Smokeping.pm \
 		base.pm basefork.pm basevars.pm smokeping.cgi \
-		smokeping smokeping_config smokeping_install
+		smokeping smokeping_config smokeping_install telnetIOSPing.pm
 ETC1=		basepage.html config smokemail config-echoping
 
 pre-patch:
diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo
index c8d54c9538f6..2c04795e050e 100644
--- a/net-mgmt/smokeping/distinfo
+++ b/net-mgmt/smokeping/distinfo
@@ -1 +1 @@
-MD5 (smokeping-1.20.tar.gz) = 6252d186a3e591d11388db54f6940e04
+MD5 (smokeping-1.21.tar.gz) = ae33364826cec30610e1e5dc930bd1bf
diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist
index 963fdd05c121..975ba9bb22fa 100644
--- a/net-mgmt/smokeping/pkg-plist
+++ b/net-mgmt/smokeping/pkg-plist
@@ -44,6 +44,8 @@ share/doc/smokeping/IOSPing.pm.html
 share/doc/smokeping/IOSPing.pm.txt
 share/doc/smokeping/ParseConfig.pm.html
 share/doc/smokeping/ParseConfig.pm.txt
+share/doc/smokeping/RemoteFPing.pm.html
+share/doc/smokeping/RemoteFPing.pm.txt
 share/doc/smokeping/Smokeping.pm.html
 share/doc/smokeping/Smokeping.pm.txt
 share/doc/smokeping/base.pm.html
@@ -60,12 +62,14 @@ share/doc/smokeping/smokeping_config.html
 share/doc/smokeping/smokeping_config.txt
 share/doc/smokeping/smokeping_install.html
 share/doc/smokeping/smokeping_install.txt
+share/doc/smokeping/telnetIOSPing.pm.html
+share/doc/smokeping/telnetIOSPing.pm.txt
 smokeping/htdocs/smokeping.cgi
+smokeping/lib/ISG/ParseConfig.pm
+smokeping/lib/ISG/VppGateway.pm
 smokeping/lib/Smokeping.pm
-smokeping/lib/probes/FPing.pm
-smokeping/lib/probes/FPing6.pm
-smokeping/lib/probes/IOSPing.pm
-smokeping/lib/probes/base.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
@@ -73,12 +77,14 @@ smokeping/lib/probes/EchoPingHttp.pm
 smokeping/lib/probes/EchoPingHttps.pm
 smokeping/lib/probes/EchoPingIcp.pm
 smokeping/lib/probes/EchoPingSmtp.pm
-smokeping/lib/probes/DNS.pm
+smokeping/lib/probes/FPing.pm
+smokeping/lib/probes/FPing6.pm
+smokeping/lib/probes/IOSPing.pm
+smokeping/lib/probes/RemoteFPing.pm
+smokeping/lib/probes/base.pm
 smokeping/lib/probes/basefork.pm
 smokeping/lib/probes/basevars.pm
-smokeping/lib/probes/Curl.pm
-smokeping/lib/ISG/ParseConfig.pm
-smokeping/lib/ISG/VppGateway.pm
+smokeping/lib/probes/telnetIOSPing.pm
 @unexec rmdir %D/etc/smokeping || true
 @exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img
 @unexec rm -rf %D/smokeping/htdocs/img
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index b5a2a3d2b180..f48726909bfe 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	1.20
+PORTVERSION=	1.21
 CATEGORIES=	net www
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
@@ -24,21 +24,20 @@ RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool \
 
 USE_PERL5=	yes
 
-MAN1=		DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.1 \
+MAN1=		Curl.pm.1 DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.1 \
 		EchoPingHttp.pm.1 EchoPingHttps.pm.1 EchoPingIcp.pm.1 EchoPingSmtp.pm.1 \
-		FPing.pm.1 FPing6.pm.1 IOSPing.pm.1 ParseConfig.pm.1 Smokeping.pm.1 \
-		base.pm.1 basefork.pm.1 basevars.pm.1 \
-		smokeping.1 smokeping.cgi.1 \
-		smokeping_config.1 smokeping_install.1
+		FPing.pm.1 FPing6.pm.1 IOSPing.pm.1 ParseConfig.pm.1 RemoteFPing.pm.1 \
+		Smokeping.pm.1 base.pm.1 basefork.pm.1 basevars.pm.1 smokeping.1 \
+		smokeping.cgi.1 smokeping_config.1 smokeping_install.1 telnetIOSPing.pm.1
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 DOCDIR=		${PREFIX}/share/doc/smokeping
 DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
 DOC2=		Curl.pm DNS.pm EchoPing.pm EchoPingChargen.pm EchoPingDiscard.pm \
 		EchoPingHttp.pm EchoPingHttps.pm EchoPingIcp.pm EchoPingSmtp.pm \
-		FPing.pm FPing6.pm IOSPing.pm ParseConfig.pm Smokeping.pm \
+		FPing.pm FPing6.pm IOSPing.pm ParseConfig.pm RemoteFPing.pm Smokeping.pm \
 		base.pm basefork.pm basevars.pm smokeping.cgi \
-		smokeping smokeping_config smokeping_install
+		smokeping smokeping_config smokeping_install telnetIOSPing.pm
 ETC1=		basepage.html config smokemail config-echoping
 
 pre-patch:
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index c8d54c9538f6..2c04795e050e 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1 +1 @@
-MD5 (smokeping-1.20.tar.gz) = 6252d186a3e591d11388db54f6940e04
+MD5 (smokeping-1.21.tar.gz) = ae33364826cec30610e1e5dc930bd1bf
diff --git a/net/smokeping/pkg-plist b/net/smokeping/pkg-plist
index 963fdd05c121..975ba9bb22fa 100644
--- a/net/smokeping/pkg-plist
+++ b/net/smokeping/pkg-plist
@@ -44,6 +44,8 @@ share/doc/smokeping/IOSPing.pm.html
 share/doc/smokeping/IOSPing.pm.txt
 share/doc/smokeping/ParseConfig.pm.html
 share/doc/smokeping/ParseConfig.pm.txt
+share/doc/smokeping/RemoteFPing.pm.html
+share/doc/smokeping/RemoteFPing.pm.txt
 share/doc/smokeping/Smokeping.pm.html
 share/doc/smokeping/Smokeping.pm.txt
 share/doc/smokeping/base.pm.html
@@ -60,12 +62,14 @@ share/doc/smokeping/smokeping_config.html
 share/doc/smokeping/smokeping_config.txt
 share/doc/smokeping/smokeping_install.html
 share/doc/smokeping/smokeping_install.txt
+share/doc/smokeping/telnetIOSPing.pm.html
+share/doc/smokeping/telnetIOSPing.pm.txt
 smokeping/htdocs/smokeping.cgi
+smokeping/lib/ISG/ParseConfig.pm
+smokeping/lib/ISG/VppGateway.pm
 smokeping/lib/Smokeping.pm
-smokeping/lib/probes/FPing.pm
-smokeping/lib/probes/FPing6.pm
-smokeping/lib/probes/IOSPing.pm
-smokeping/lib/probes/base.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
@@ -73,12 +77,14 @@ smokeping/lib/probes/EchoPingHttp.pm
 smokeping/lib/probes/EchoPingHttps.pm
 smokeping/lib/probes/EchoPingIcp.pm
 smokeping/lib/probes/EchoPingSmtp.pm
-smokeping/lib/probes/DNS.pm
+smokeping/lib/probes/FPing.pm
+smokeping/lib/probes/FPing6.pm
+smokeping/lib/probes/IOSPing.pm
+smokeping/lib/probes/RemoteFPing.pm
+smokeping/lib/probes/base.pm
 smokeping/lib/probes/basefork.pm
 smokeping/lib/probes/basevars.pm
-smokeping/lib/probes/Curl.pm
-smokeping/lib/ISG/ParseConfig.pm
-smokeping/lib/ISG/VppGateway.pm
+smokeping/lib/probes/telnetIOSPing.pm
 @unexec rmdir %D/etc/smokeping || true
 @exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img
 @unexec rm -rf %D/smokeping/htdocs/img