Update to 2.3.6

7 files changed, 23 insertions, 23 deletions

diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index 9273e529cbb4..9e5cd4f94bf7 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	2.2.7
-PORTREVISION=	2
+PORTVERSION=	2.3.6
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/ \
 		http://smokeping.cs.pu.edu.tw/pub/
@@ -17,11 +16,12 @@ COMMENT=	Latency logging and graphing system
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
 		p5-CGI-SpeedyCGI>0:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
-		p5-SNMP_Session>0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
 		p5-CGI.pm>0:${PORTSDIR}/www/p5-CGI.pm \
+		p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
 		p5-Digest-MD5>0:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-Pod-Parser>0:${PORTSDIR}/textproc/p5-Pod-Parser \
 		p5-Net>0:${PORTSDIR}/net/p5-Net \
+		p5-Pod-Parser>0:${PORTSDIR}/textproc/p5-Pod-Parser \
+		p5-SNMP_Session>0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
 		p5-libwww>0:${PORTSDIR}/www/p5-libwww
 
 NO_BUILD=	yes
@@ -192,6 +192,7 @@ ETC1=		basepage.html config smokemail tmail
 post-extract:
 	${RM} ${WRKSRC}/lib/BER.pm
 	${RM} ${WRKSRC}/lib/SNMP_*.pm
+	${RM} -rf ${WRKSRC}/lib/Digest
 
 pre-patch:
 	${REINPLACE_CMD} -e s!/usr/bin/!%%PREFIX%%/bin/! \
diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo
index d9b71c5bc58e..133c00460495 100644
--- a/net-mgmt/smokeping/distinfo
+++ b/net-mgmt/smokeping/distinfo
@@ -1,3 +1,3 @@
-MD5 (smokeping-2.2.7.tar.gz) = be335b105f6ff728e9f3bf9a9b76becb
-SHA256 (smokeping-2.2.7.tar.gz) = 2a2a09d34037b17377893c939d43fec177fed0731e2a0070f30c649bc5a31c86
-SIZE (smokeping-2.2.7.tar.gz) = 557546
+MD5 (smokeping-2.3.6.tar.gz) = 06d5ed4ed693a17960dfa3361443bf72
+SHA256 (smokeping-2.3.6.tar.gz) = 20e75da551b9a1f8b2957e8c4ff7f273fcf765eb39fbccafd6e74a7c6cb556b5
+SIZE (smokeping-2.3.6.tar.gz) = 580785
diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping.dist b/net-mgmt/smokeping/files/patch-bin-smokeping.dist
index 3b1fda440d87..69e0099157b8 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.002007;
+ use Smokeping 2.003006;
   
 -Smokeping::main("etc/config.dist");
 +$0 = "%%PREFIX%%/bin/smokeping";
diff --git a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist
index 6c56d497b3e2..11260260998a 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.002007;
+ use Smokeping 2.003006;
  use Net::SMTP;
 @@ -60,7 +59,7 @@
  use RRDs;
diff --git a/net-mgmt/smokeping/files/patch-etc-config.dist b/net-mgmt/smokeping/files/patch-etc-config.dist
index 76244d7d3ab3..927d126e09ba 100644
--- a/net-mgmt/smokeping/files/patch-etc-config.dist
+++ b/net-mgmt/smokeping/files/patch-etc-config.dist
@@ -1,15 +1,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    = Peter Random
- contact  = some@address.nowhere
- mailhost = my.mail.host
--sendmail = /usr/lib/sendmail
+--- 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
-+sendmail = /usr/sbin/sendmail
 +imgcache = %%PREFIX%%/smokeping/htdocs/img
 +imgurl   = /smokeimg
 +datadir  = %%PREFIX%%/var/smokeping
@@ -22,21 +20,21 @@
  # specify this to get syslog logging
  syslogfacility = local0
  # each probe is now run in its own process
-@@ -66,7 +66,7 @@
+@@ -47,7 +47,7 @@
  
  *** Presentation ***
  
 -template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist
 +template = %%PREFIX%%/etc/smokeping/basepage.html
  
- + overview 
+ + charts
  
-@@ -89,7 +89,7 @@
+@@ -105,7 +105,7 @@
  
  + FPing
  
 -binary = /usr/sbin/fping
 +binary = %%PREFIX%%/sbin/fping
  
- *** Targets ***
- 
+ *** Slaves ***
+ secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.dist
diff --git a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
index 2b7f903369ed..c9ccb0ef23c2 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.002007;
+ use Smokeping 2.003006;
  
 -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 a5cebf3314bc..784a37ddd456 100644
--- a/net-mgmt/smokeping/pkg-plist
+++ b/net-mgmt/smokeping/pkg-plist
@@ -170,6 +170,7 @@ 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/TCPPing.pm
 smokeping/lib/Smokeping/probes/TacacsPlus.pm
 smokeping/lib/Smokeping/probes/TelnetIOSPing.pm
 smokeping/lib/Smokeping/probes/TelnetJunOSPing.pm