From f0ef1e5a634d0ea249b4e430e1978c9c0b89f098 Mon Sep 17 00:00:00 2001 From: lth Date: Fri, 21 Dec 2007 13:55:08 +0000 Subject: - Update to 2.2.7 - Fix detection of running process, fixes [1] PR: ports/114593 [1] Submitted by: Tomoyuki Sakurai [1] --- net-mgmt/smokeping/Makefile | 103 +++++++++++---------- net-mgmt/smokeping/distinfo | 6 +- net-mgmt/smokeping/files/patch-bin-smokeping.dist | 7 +- net-mgmt/smokeping/files/patch-bin-tSmoke.dist | 2 +- net-mgmt/smokeping/files/patch-etc-config.dist | 24 ++--- .../files/patch-htdocs-smokeping.cgi.dist | 2 +- net-mgmt/smokeping/pkg-plist | 17 +++- 7 files changed, 85 insertions(+), 76 deletions(-) (limited to 'net-mgmt') diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 94183e0597a0..77455c9130e0 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -6,7 +6,7 @@ # PORTNAME= smokeping -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.7 CATEGORIES= net-mgmt www MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \ http://smokeping.cs.pu.edu.tw/pub/ @@ -15,12 +15,15 @@ MAINTAINER= lth@FreeBSD.org COMMENT= Latency logging and graphing system RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \ - ${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \ - ${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \ - ${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \ - ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ - ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ - ${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net + 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-MD5>0:${PORTSDIR}/security/p5-Digest-MD5 \ + p5-Pod-Parser>0:${PORTSDIR}/textproc/p5-Pod-Parser \ + p5-Net>0:${PORTSDIR}/net/p5-Net + +NO_BUILD= yes +USE_PERL5= yes NO_BUILD= yes USE_PERL5= yes @@ -185,13 +188,11 @@ ETC1= basepage.html config smokemail tmail # Things that shouldn't have been in the tarball in the first place 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 + ${RM} ${WRKSRC}/lib/BER.pm + ${RM} ${WRKSRC}/lib/SNMP_*.pm pre-patch: - @${REINPLACE_CMD} -e s!/usr/bin/!%%PREFIX%%/bin/! \ + ${REINPLACE_CMD} -e s!/usr/bin/!%%PREFIX%%/bin/! \ ${WRKSRC}/lib/Smokeping.pm \ ${WRKSRC}/lib/Smokeping/Examples.pm \ ${WRKSRC}/lib/Smokeping/probes/Curl.pm \ @@ -202,14 +203,14 @@ pre-patch: ${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/! \ + ${REINPLACE_CMD} -e s!/usr/share/smokeping/etc/!%%PREFIX%%/etc/smokeping/! \ ${WRKSRC}/lib/Smokeping/probes/passwordchecker.pm post-patch: - @${FIND} ${WRKSRC} -name \*.orig -delete + ${FIND} ${WRKSRC} -name \*.orig -delete pre-configure: - @${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/lib/Smokeping.pm \ ${WRKSRC}/lib/Smokeping/Examples.pm \ ${WRKSRC}/bin/smokeping.dist \ @@ -217,64 +218,64 @@ pre-configure: ${WRKSRC}/htdocs/smokeping.cgi.dist \ ${WRKSRC}/etc/config.dist \ ${WRKSRC}/lib/Smokeping/probes/*.pm - @${FIND} ${WRKSRC} -name \*.bak -delete - @${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${FIND} ${WRKSRC} -name \*.bak -delete + ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${PKGDIR}/pkg-message > ${PKGMESSAGE} - @${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${PKGDIR}/pkg-install > ${PKGINSTALL} - @${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${PKGDIR}/pkg-deinstall > ${PKGDEINSTALL} - @${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}/bin/smokeping.dist ${WRKSRC}/bin/smokeping + ${MV} ${WRKSRC}/bin/tSmoke.dist ${WRKSRC}/bin/tSmoke + ${MV} ${WRKSRC}/htdocs/smokeping.cgi.dist ${WRKSRC}/htdocs/smokeping.cgi pre-su-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke ${PREFIX}/bin .if !defined(NOPORTDOCS) - @(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) + (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 + ${INSTALL_MAN} `${FIND} ${WRKSRC}/doc -name ${FILE}` ${PREFIX}/man/man3 .endfor - @${MKDIR} ${DOCSDIR} - @${MKDIR} ${DOCSDIR}/Config - @${MKDIR} ${DOCSDIR}/Smokeping/matchers - @${MKDIR} ${DOCSDIR}/Smokeping/probes - @(cd ${WRKSRC} && ${INSTALL_DATA} ${DOC1} ${DOCSDIR}) + ${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 + ${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}/${FILE}.html + ${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt ${DOCSDIR}/${FILE}.txt .endfor - @${MKDIR} ${EXAMPLESDIR} - @(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}) + ${MKDIR} ${EXAMPLESDIR} + (cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}) .endif - @${MKDIR} ${PREFIX}/etc/smokeping + ${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 + if [ ! -f ${PREFIX}/etc/smokeping/${FILE} ]; then \ ${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping/${FILE} ; \ fi .endfor - @${MKDIR} ${PREFIX}/smokeping/htdocs - @${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi ${PREFIX}/smokeping/htdocs/smokeping.cgi - @${CP} -R ${WRKSRC}/lib ${PREFIX}/smokeping/ - @${MKDIR} ${PREFIX}/var/smokeping - @${CHOWN} -R ${USER}:${GROUP} ${PREFIX}/var/smokeping - @${MKDIR} ${PREFIX}/smokeping/htdocs/img - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/smokeping/htdocs/img + ${MKDIR} ${PREFIX}/smokeping/htdocs + ${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi ${PREFIX}/smokeping/htdocs/smokeping.cgi + ${CP} -R ${WRKSRC}/lib ${PREFIX}/smokeping/ + ${MKDIR} ${PREFIX}/var/smokeping + ${CHOWN} -R ${USER}:${GROUP} ${PREFIX}/var/smokeping + ${MKDIR} ${PREFIX}/smokeping/htdocs/img + ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/smokeping/htdocs/img post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .if !defined(BATCH) - @${CAT} ${PKGMESSAGE} + ${CAT} ${PKGMESSAGE} .endif post-deinstall: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL + PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL .include diff --git a/net-mgmt/smokeping/distinfo b/net-mgmt/smokeping/distinfo index 55f0bde7c126..d9b71c5bc58e 100644 --- a/net-mgmt/smokeping/distinfo +++ b/net-mgmt/smokeping/distinfo @@ -1,3 +1,3 @@ -MD5 (smokeping-2.1.0.tar.gz) = 0587f58b7a4e22960c10d04ccf5376e0 -SHA256 (smokeping-2.1.0.tar.gz) = 759771237835030fcc09361be331ae9a44f16a9aa09881d35133c0192734d9ff -SIZE (smokeping-2.1.0.tar.gz) = 501881 +MD5 (smokeping-2.2.7.tar.gz) = be335b105f6ff728e9f3bf9a9b76becb +SHA256 (smokeping-2.2.7.tar.gz) = 2a2a09d34037b17377893c939d43fec177fed0731e2a0070f30c649bc5a31c86 +SIZE (smokeping-2.2.7.tar.gz) = 557546 diff --git a/net-mgmt/smokeping/files/patch-bin-smokeping.dist b/net-mgmt/smokeping/files/patch-bin-smokeping.dist index a0f3a7d787cc..3b1fda440d87 100644 --- a/net-mgmt/smokeping/files/patch-bin-smokeping.dist +++ b/net-mgmt/smokeping/files/patch-bin-smokeping.dist @@ -1,17 +1,18 @@ --- bin/smokeping.dist.orig Mon Sep 26 22:15:57 2005 +++ bin/smokeping.dist Thu Oct 6 10:37:31 2005 -@@ -1,12 +1,11 @@ +@@ -1,12 +1,12 @@ -#!/usr/sepp/bin/perl-5.8.4 -w +#!%%PERL%% -w # -*-perl-*- --use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl); +-use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl); -use lib qw(lib); +use lib qw(%%PREFIX%%/smokeping/lib); - use Smokeping 2.001000; + use Smokeping 2.002007; -Smokeping::main("etc/config.dist"); ++$0 = "%%PREFIX%%/bin/smokeping"; +Smokeping::main("%%PREFIX%%/etc/smokeping/config"); =head1 NAME diff --git a/net-mgmt/smokeping/files/patch-bin-tSmoke.dist b/net-mgmt/smokeping/files/patch-bin-tSmoke.dist index cf497ca00765..6c56d497b3e2 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.001000; + use Smokeping 2.002007; 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 1269ebf8109c..76244d7d3ab3 100644 --- a/net-mgmt/smokeping/files/patch-etc-config.dist +++ b/net-mgmt/smokeping/files/patch-etc-config.dist @@ -1,22 +1,22 @@ --- 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 = Joe Random - contact = joe@some.place.xyz - mailhost = smtp.mailhost.abc + owner = Peter Random + contact = some@address.nowhere + mailhost = my.mail.host -sendmail = /usr/lib/sendmail --imgcache = /home/oetiker/public_html/.simg --imgurl = ../.simg --datadir = /home/oetiker/data/projects/AADJ-smokeping/dist/var --piddir = /home/oetiker/data/projects/AADJ-smokeping/dist/var +-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 +piddir = %%PREFIX%%/var/smokeping - cgiurl = http://people.ee.ethz.ch/~oetiker/smokeping/smokeping.cgi --smokemail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/smokemail.dist --tmail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/tmail.dist + 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 @@ -26,7 +26,7 @@ *** Presentation *** --template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist +-template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist +template = %%PREFIX%%/etc/smokeping/basepage.html + overview @@ -35,7 +35,7 @@ + FPing --binary = /usr/sepp/bin/fping +-binary = /usr/sbin/fping +binary = %%PREFIX%%/sbin/fping *** Targets *** diff --git a/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist b/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist index 4f0284cc82f4..2b7f903369ed 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.001000; + use Smokeping 2.002007; -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 e2a915ec246c..c3fb37d16606 100644 --- a/net-mgmt/smokeping/pkg-plist +++ b/net-mgmt/smokeping/pkg-plist @@ -110,10 +110,17 @@ etc/smokeping/tmail.dist %%PORTDOCS%%%%EXAMPLESDIR%%/config.template smokeping/htdocs/smokeping.cgi smokeping/lib/Config/Grammar.pm +smokeping/lib/Config/Grammar/Document.pm +smokeping/lib/Config/Grammar/Dynamic.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/Master.pm +smokeping/lib/Smokeping/RRDhelpers.pm smokeping/lib/Smokeping/RRDtools.pm +smokeping/lib/Smokeping/Slave.pm smokeping/lib/Smokeping/ciscoRttMonMIB.pm smokeping/lib/Smokeping/matchers/Avgratio.pm smokeping/lib/Smokeping/matchers/CheckLatency.pm @@ -168,17 +175,17 @@ smokeping/lib/Smokeping/sorters/base.pm @exec chown smokeping:smokeping %D/var/smokeping @dirrmtry var/smokeping @dirrmtry var -@dirrm smokeping/htdocs -@dirrm smokeping/lib/Config -@dirrm smokeping/lib/Smokeping/matchers -@dirrm smokeping/lib/Smokeping/probes @dirrm smokeping/lib/Smokeping/sorters +@dirrm smokeping/lib/Smokeping/probes +@dirrm smokeping/lib/Smokeping/matchers @dirrm smokeping/lib/Smokeping +@dirrm smokeping/lib/Config/Grammar +@dirrm smokeping/lib/Config @dirrm smokeping/lib +@dirrm smokeping/htdocs %%PORTDOCS%%@dirrm %%DOCSDIR%%/Config %%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%% -- cgit