- Update to 1.24

- Removed extraneous patch file
- Fixed binaries paths in lib/probes/*
  Noticed by: Daan van de Linde
- s/file/FILE/, to make portlint happy

PR:		58396
Submitted by:	maintainer
Approved by:	krion (implicit)

3 files changed, 32 insertions, 15 deletions

diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 483555640ab4..6643000d695c 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	1.23
+PORTVERSION=	1.24
 CATEGORIES=	net www
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
@@ -24,7 +24,8 @@ RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool \
 
 USE_PERL5=	yes
 
-MAN1=		Curl.pm.1 DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.1 \
+MAN1=		CiscoRTTMonDNS.pm.1 CiscoRTTMonEchoICMP.pm.1 CiscoRTTMonTcpConnect.pm.1 \
+		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 RemoteFPing.pm.1 \
 		Smokeping.pm.1 base.pm.1 basefork.pm.1 basevars.pm.1 smokeping.1 \
@@ -33,7 +34,8 @@ MAN1=		Curl.pm.1 DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
-DOC2=		Curl.pm DNS.pm EchoPing.pm EchoPingChargen.pm EchoPingDiscard.pm \
+DOC2=		CiscoRTTMonDNS.pm CiscoRTTMonEchoICMP.pm CiscoRTTMonTcpConnect.pm \
+		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 RemoteFPing.pm Smokeping.pm \
 		base.pm basefork.pm basevars.pm smokeping.cgi \
@@ -57,6 +59,10 @@ pre-patch:
 		s|imgurl   = ../.simg|imgurl   = /smokeimg|; \
 		' \
 		${WRKSRC}/bin/smokeping ${WRKSRC}/htdocs/smokeping.cgi ${WRKSRC}/etc/config.dist
+	@${PERL} -pi -e ' \
+		s|/usr/bin|${PREFIX}/bin|g; \
+		' \
+		${WRKSRC}/lib/probes/*
 	@${PERL} -p -e ' \
 		s|%%PREFIX%%|${PREFIX}|g; \
 		' \
@@ -65,6 +71,7 @@ pre-patch:
 do-build:
 	@${RM} ${WRKSRC}/lib/BER.pm
 	@${RM} ${WRKSRC}/lib/SNMP_*.pm
+	@${RM} ${WRKSRC}/lib/probes/patch
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
@@ -72,23 +79,23 @@ pre-install:
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-.for file in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/doc/${file} ${PREFIX}/man/man1
+.for FILE in ${MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${PREFIX}/man/man1
 .endfor
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC1}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for FILE in ${DOC1}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
-.for file in ${DOC2}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${file}.txt  ${DOCSDIR}
+.for FILE in ${DOC2}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt  ${DOCSDIR}
 .endfor
 .endif
 	@${MKDIR} ${PREFIX}/etc/smokeping
-.for file in ${ETC1}
-	@${INSTALL_DATA} ${WRKSRC}/etc/${file}.dist ${PREFIX}/etc/smokeping
-	@if [ ! -f ${PREFIX}/etc/smokeping/${file} ]; then \
-		${INSTALL_DATA} ${WRKSRC}/etc/${file}.dist ${PREFIX}/etc/smokeping/${file} ; \
+.for FILE in ${ETC1}
+	@${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping
+	@if [ ! -f ${PREFIX}/etc/smokeping/${FILE} ]; then \
+		${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping/${FILE} ; \
 	fi
 .endfor
 	@${MKDIR} ${PREFIX}/smokeping
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index 2887f03d790f..74cc64b8a664 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1 +1 @@
-MD5 (smokeping-1.23.tar.gz) = 12161de246e5a6aabed3a54c0fb26b2e
+MD5 (smokeping-1.24.tar.gz) = b206983f358afb53fbc8d6b161298f82
diff --git a/net/smokeping/pkg-plist b/net/smokeping/pkg-plist
index bbd6ea4cdd73..7ea3e0d62dbc 100644
--- a/net/smokeping/pkg-plist
+++ b/net/smokeping/pkg-plist
@@ -18,6 +18,12 @@ etc/smokeping/config-echoping.dist
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonDNS.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonDNS.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonEchoICMP.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonEchoICMP.pm.txt
+%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonTcpConnect.pm.html
+%%PORTDOCS%%%%DOCSDIR%%/CiscoRTTMonTcpConnect.pm.txt
 %%PORTDOCS%%%%DOCSDIR%%/Curl.pm.html
 %%PORTDOCS%%%%DOCSDIR%%/Curl.pm.txt
 %%PORTDOCS%%%%DOCSDIR%%/DNS.pm.html
@@ -68,6 +74,10 @@ smokeping/htdocs/smokeping.cgi
 smokeping/lib/ISG/ParseConfig.pm
 smokeping/lib/ISG/VppGateway.pm
 smokeping/lib/Smokeping.pm
+smokeping/lib/ciscoRttMonMIB.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