diff options
-rw-r--r-- | MOVED | 1 | ||||
-rw-r--r-- | net-mgmt/Makefile | 1 | ||||
-rw-r--r-- | net-mgmt/smokeping/Makefile | 2 | ||||
-rw-r--r-- | net/Makefile | 1 | ||||
-rw-r--r-- | net/smokeping/Makefile | 280 | ||||
-rw-r--r-- | net/smokeping/distinfo | 3 | ||||
-rw-r--r-- | net/smokeping/files/patch-bin-smokeping.dist | 43 | ||||
-rw-r--r-- | net/smokeping/files/patch-bin-tSmoke.dist | 63 | ||||
-rw-r--r-- | net/smokeping/files/patch-etc-config.dist | 42 | ||||
-rw-r--r-- | net/smokeping/files/patch-htdocs-smokeping.cgi.dist | 45 | ||||
-rw-r--r-- | net/smokeping/files/smokeping.in | 41 | ||||
-rw-r--r-- | net/smokeping/pkg-deinstall | 55 | ||||
-rw-r--r-- | net/smokeping/pkg-descr | 8 | ||||
-rw-r--r-- | net/smokeping/pkg-install | 30 | ||||
-rw-r--r-- | net/smokeping/pkg-message | 35 | ||||
-rw-r--r-- | net/smokeping/pkg-plist | 185 |
16 files changed, 3 insertions, 832 deletions
@@ -3142,3 +3142,4 @@ databases/ruby-postgres|databases/rubygem-postgres|2007-08-03|Port updated in ru editors/flim113||2007-08-05|Expired: distfile no longer available editors/semi113||2007-08-05|Expired: distfile no longer available deskutils/intclock|x11-clocks/intclock|2007-08-08|Moved to a more appropriate category +net/smokeping|net-mgmt/smokeping|2007-08-10|Moved to a more appropriate category diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index 7eaf5e3f9e32..4fea5a1ed964 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -215,6 +215,7 @@ SUBDIR += sipcalc SUBDIR += sjitter SUBDIR += slate + SUBDIR += smokeping SUBDIR += snmptt SUBDIR += softflowd SUBDIR += subcalc diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 289fbc9f02ca..90a0d7a8e36a 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -7,7 +7,7 @@ PORTNAME= smokeping PORTVERSION= 2.1.0 -CATEGORIES= net www +CATEGORIES= net-mgmt www MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \ http://smokeping.cs.pu.edu.tw/pub/ diff --git a/net/Makefile b/net/Makefile index 54438bd7113c..1efb7d25d0c0 100644 --- a/net/Makefile +++ b/net/Makefile @@ -808,7 +808,6 @@ SUBDIR += smb4k SUBDIR += smbldap-tools SUBDIR += smm++ - SUBDIR += smokeping SUBDIR += sniffit SUBDIR += sntop SUBDIR += sobby diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile deleted file mode 100644 index 289fbc9f02ca..000000000000 --- a/net/smokeping/Makefile +++ /dev/null @@ -1,280 +0,0 @@ -# New ports collection makefile for: SmokePing -# Date created: Tue Feb 12 22:17:40 CET 2002 -# Whom: Lars Thegler <lars@thegler.dk> -# -# $FreeBSD$ -# - -PORTNAME= smokeping -PORTVERSION= 2.1.0 -CATEGORIES= net www -MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \ - http://smokeping.cs.pu.edu.tw/pub/ - -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 - -OPTIONS= FPING "Support for fping probes" on -OPTIONS+= ECHOPING "Support for EchoPing probes" off -OPTIONS+= CURL "Support for Curl probes" off -OPTIONS+= LDAP "Support for LDAP probes" off -OPTIONS+= LDAPSSL "Support for SSL-enabled LDAP probes" off -OPTIONS+= RADIUS "Support for Radius probes" off -OPTIONS+= TELNET "Support for TelnetIOSPing probes" off -OPTIONS+= DNS "Support for AnotherDNS probes" off - -.include <bsd.port.pre.mk> - -.ifdef(WITH_FPING) -RUN_DEPENDS+= ${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping -.endif - -.ifdef(WITH_ECHOPING) -RUN_DEPENDS+= ${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping -.endif - -.ifdef(WITH_CURL) -RUN_DEPENDS+= ${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl -.endif - -.if defined(WITH_LDAP) || defined(WITH_LDAPSSL) -RUN_DEPENDS+= ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap -.endif - -.ifdef(WITH_RADIUS) -RUN_DEPENDS+= ${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius -.endif - -.if defined(WITH_LDAP) || defined(WITH_LDAPSSL) || defined(WITH_RADIUS) -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -.endif - -.ifdef(WITH_LDAPSSL) -RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL -.endif - -.ifdef(WITH_TELNET) -RUN_DEPENDS+= ${SITE_PERL}/Net/Telnet.pm:${PORTSDIR}/net/p5-Net-Telnet -.endif - -.ifdef(WITH_DNS) -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS -.endif - -NO_BUILD= yes -USE_PERL5= yes - -USE_RC_SUBR= smokeping - -MAN1= smokeping.1 \ - smokeping.cgi.1 \ - tSmoke.1 -MAN3= Config::Grammar.3 \ - Smokeping.3 \ - Smokeping::Examples.3 \ - Smokeping::RRDtools.3 \ - Smokeping::matchers::Avgratio.3 \ - Smokeping::matchers::Median.3 \ - Smokeping::matchers::base.3 \ - Smokeping::probes::AnotherDNS.3 \ - Smokeping::probes::AnotherSSH.3 \ - Smokeping::probes::CiscoRTTMonDNS.3 \ - Smokeping::probes::CiscoRTTMonEchoICMP.3 \ - Smokeping::probes::CiscoRTTMonTcpConnect.3 \ - Smokeping::probes::Curl.3 \ - Smokeping::probes::DNS.3 \ - Smokeping::probes::EchoPing.3 \ - Smokeping::probes::EchoPingChargen.3 \ - Smokeping::probes::EchoPingDiscard.3 \ - Smokeping::probes::EchoPingHttp.3 \ - Smokeping::probes::EchoPingHttps.3 \ - Smokeping::probes::EchoPingIcp.3 \ - Smokeping::probes::EchoPingSmtp.3 \ - Smokeping::probes::FPing.3 \ - Smokeping::probes::FPing6.3 \ - Smokeping::probes::IOSPing.3 \ - Smokeping::probes::LDAP.3 \ - Smokeping::probes::Radius.3 \ - Smokeping::probes::RemoteFPing.3 \ - Smokeping::probes::SSH.3 \ - Smokeping::probes::TelnetIOSPing.3 \ - Smokeping::probes::base.3 \ - Smokeping::probes::basefork.3 \ - Smokeping::probes::basevars.3 \ - Smokeping::probes::passwordchecker.3 \ - Smokeping::probes::skel.3 -MAN5= smokeping_config.5 -MAN7= smokeping_examples.7 \ - smokeping_extend.7 \ - smokeping_install.7 \ - smokeping_upgrade.7 - -PKGMESSAGE= ${WRKDIR}/pkg-message -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall - -USER= smokeping -SMOKEPING_UID= 117 -GROUP= smokeping -SMOKEPING_GID= 117 - -SUB_LIST+= USER=${USER} UID=${SMOKEPING_UID} \ - GROUP=${GROUP} GID=${SMOKEPING_GID} \ - PERL=${PERL} PREFIX=${PREFIX} - -DOC1= CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO -DOC2= Config/Grammar \ - Smokeping \ - Smokeping/Examples \ - Smokeping/RRDtools \ - Smokeping/matchers/Avgratio \ - Smokeping/matchers/Median \ - Smokeping/matchers/base \ - Smokeping/probes/AnotherDNS \ - Smokeping/probes/AnotherSSH \ - Smokeping/probes/CiscoRTTMonDNS \ - Smokeping/probes/CiscoRTTMonEchoICMP \ - Smokeping/probes/CiscoRTTMonTcpConnect \ - Smokeping/probes/Curl \ - Smokeping/probes/DNS \ - Smokeping/probes/EchoPing \ - Smokeping/probes/EchoPingChargen \ - Smokeping/probes/EchoPingDiscard \ - Smokeping/probes/EchoPingHttp \ - Smokeping/probes/EchoPingHttps \ - Smokeping/probes/EchoPingIcp \ - Smokeping/probes/EchoPingSmtp \ - Smokeping/probes/FPing \ - Smokeping/probes/FPing6 \ - Smokeping/probes/IOSPing \ - Smokeping/probes/LDAP \ - Smokeping/probes/Radius \ - Smokeping/probes/RemoteFPing \ - Smokeping/probes/SSH \ - Smokeping/probes/TelnetIOSPing \ - Smokeping/probes/base \ - Smokeping/probes/basefork \ - Smokeping/probes/basevars \ - Smokeping/probes/passwordchecker \ - Smokeping/probes/skel \ - smokeping.cgi \ - smokeping \ - smokeping_config \ - smokeping_examples \ - smokeping_extend \ - smokeping_install \ - smokeping_upgrade \ - tSmoke - -EXAMPLES= config.echoping \ - config.fping-instances \ - config.multiple-probes \ - config.simple \ - config.targetvars-with-Curl \ - config.template - -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 - -pre-patch: - @${REINPLACE_CMD} -e s!/usr/bin/!%%PREFIX%%/bin/! \ - ${WRKSRC}/lib/Smokeping.pm \ - ${WRKSRC}/lib/Smokeping/Examples.pm \ - ${WRKSRC}/lib/Smokeping/probes/Curl.pm \ - ${WRKSRC}/lib/Smokeping/probes/IOSPing.pm \ - ${WRKSRC}/lib/Smokeping/probes/DNS.pm \ - ${WRKSRC}/lib/Smokeping/probes/RemoteFPing.pm \ - ${WRKSRC}/lib/Smokeping/probes/SSH.pm \ - ${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/! \ - ${WRKSRC}/lib/Smokeping/probes/passwordchecker.pm - -post-patch: - @${FIND} ${WRKSRC} -name \*.orig -delete - -pre-configure: - @${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/lib/Smokeping.pm \ - ${WRKSRC}/lib/Smokeping/Examples.pm \ - ${WRKSRC}/bin/smokeping.dist \ - ${WRKSRC}/bin/tSmoke.dist \ - ${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/=/%%!/} \ - ${PKGDIR}/pkg-message > ${PKGMESSAGE} - @${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${PKGDIR}/pkg-install > ${PKGINSTALL} - @${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 - -pre-su-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 -.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) -.for FILE in ${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}) -.for FILE in ${DOC2} - @${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}) -.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} ; \ - 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 - -post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(BATCH) - @${CAT} ${PKGMESSAGE} -.endif - -post-deinstall: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL - -.include <bsd.port.post.mk> diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo deleted file mode 100644 index 55f0bde7c126..000000000000 --- a/net/smokeping/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -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/smokeping/files/patch-bin-smokeping.dist b/net/smokeping/files/patch-bin-smokeping.dist deleted file mode 100644 index a0f3a7d787cc..000000000000 --- a/net/smokeping/files/patch-bin-smokeping.dist +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 @@ --#!/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(lib); -+use lib qw(%%PREFIX%%/smokeping/lib); - - use Smokeping 2.001000; - --Smokeping::main("etc/config.dist"); -+Smokeping::main("%%PREFIX%%/etc/smokeping/config"); - - =head1 NAME - -@@ -112,22 +111,8 @@ - - =head1 SETUP - --When installing SmokePing, this file has to be adjusted to fit your --local system. Three paths have to be entered. -- --One pointing to your B<rrdtool> installation -- -- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); -- --One pointing to the place where you have installed the SmokePing libraries -- -- use lib qw(/home/oetiker/public_html/smokeping/lib); -- --The third path is the argument to the Smokeping::main command. It points to --the SmokePing configuration file. -- -- use Smokeping; -- Smokeping::main("/home/oetiker/.smokeping/config"); -+When installing SmokePing, this file has been adjusted to fit your -+local system. There should be no need for further path adjustments. - - =head1 COPYRIGHT - diff --git a/net/smokeping/files/patch-bin-tSmoke.dist b/net/smokeping/files/patch-bin-tSmoke.dist deleted file mode 100644 index cf497ca00765..000000000000 --- a/net/smokeping/files/patch-bin-tSmoke.dist +++ /dev/null @@ -1,63 +0,0 @@ ---- bin/tSmoke.dist.orig Mon Sep 19 00:50:50 2005 -+++ bin/tSmoke.dist Mon Sep 19 00:54:58 2005 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!%%PERL%% - # - #----------------------------------------------- - # tSmoke.pl -@@ -50,8 +50,7 @@ - # -- Getopt::Long - # - # Point the lib variables to your implementation --use lib qw(lib); --use lib "/usr/local/rrdtool-1.0.39/lib/perl"; -+use lib qw(%%PREFIX%%/smokeping/lib); - - use Smokeping 2.001000; - use Net::SMTP; -@@ -60,7 +59,7 @@ - use RRDs; - - # Point to your Smokeping config file --my $cfgfile = "etc/config.dist"; -+my $cfgfile = "%%PREFIX%%/etc/config"; - - # global variables - my $cfg; -@@ -479,33 +478,8 @@ - - =head1 SETUP - --When installing tSmoke, some variables must be adjusted to fit your local system. -- --We need to use the following B<libraries>: -- --=over -- --=item Smokeping -- --=item RRDTool Perl bindings -- --=item Getopt::Long -- --=back -- --Set up your libraries: -- -- use lib "/usr/local/smokeping/lib"; -- use lib "/usr/local/rrdtool-1.0.39/lib/perl"; -- --Point to your Smokeping B<config> file -- -- my $cfgfile = "/usr/local/smokeping/etc/config"; -- --Modify the Smokeping config file to include a path for tmail in the --General section: -- -- tmail = /usr/local/smokeping/etc/tmail -+When installing tSmoke, this file has been adjusted to fit your -+local system. There should be no need for further path adjustments. - - =head1 COPYRIGHT - diff --git a/net/smokeping/files/patch-etc-config.dist b/net/smokeping/files/patch-etc-config.dist deleted file mode 100644 index 1269ebf8109c..000000000000 --- a/net/smokeping/files/patch-etc-config.dist +++ /dev/null @@ -1,42 +0,0 @@ ---- 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 --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 -+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 -+smokemail = %%PREFIX%%/etc/smokeping/smokemail -+tmail = %%PREFIX%%/etc/smokeping/tmail - # specify this to get syslog logging - syslogfacility = local0 - # each probe is now run in its own process -@@ -66,7 +66,7 @@ - - *** Presentation *** - --template = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/basepage.html.dist -+template = %%PREFIX%%/etc/smokeping/basepage.html - - + overview - -@@ -89,7 +89,7 @@ - - + FPing - --binary = /usr/sepp/bin/fping -+binary = %%PREFIX%%/sbin/fping - - *** Targets *** - diff --git a/net/smokeping/files/patch-htdocs-smokeping.cgi.dist b/net/smokeping/files/patch-htdocs-smokeping.cgi.dist deleted file mode 100644 index 4f0284cc82f4..000000000000 --- a/net/smokeping/files/patch-htdocs-smokeping.cgi.dist +++ /dev/null @@ -1,45 +0,0 @@ ---- htdocs/smokeping.cgi.dist.orig Mon Sep 26 22:15:57 2005 -+++ htdocs/smokeping.cgi.dist Thu Oct 6 10:40:18 2005 -@@ -1,13 +1,12 @@ --#!/usr/sepp/bin/speedy -w -+#!%%PREFIX%%/bin/speedy -w - # -*-perl-*- - --use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); --use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib); -+use lib qw(%%PREFIX%%/smokeping/lib); - use CGI::Carp qw(fatalsToBrowser); - - use Smokeping 2.001000; - --Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config"); -+Smokeping::cgi("%%PREFIX%%/etc/smokeping/config"); - - =head1 NAME - -@@ -34,23 +34,8 @@ - - =head1 SETUP - --When installing SmokePing, this file has to be adjusted to fit your --local system. Three paths have to be entered. -- -- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); -- --One pointing to your B<rrdtool> installation -- -- use lib qw(/home/oetiker/public_html/smokeping/lib); -- --One pointing to the place where you have installed the SmokePing libraries -- -- use Smokeping; -- -- Smokeping::cgi("/home/oetiker/.smokeping/config"); -- --The third path is the argument to the Smokeping::cgi command. It points to --the SmokePing configuration file. -++When installing SmokePing, this file has been adjusted to fit your -++local system. There should be no need for further path adjustments. - - =head1 COPYRIGHT - diff --git a/net/smokeping/files/smokeping.in b/net/smokeping/files/smokeping.in deleted file mode 100644 index f44b2d387059..000000000000 --- a/net/smokeping/files/smokeping.in +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# PROVIDE: smokeping -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown - -# Define these smokeping_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/smokeping -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -smokeping_enable=${smokeping_enable-"NO"} -smokeping_flags=${smokeping_flags-""} -smokeping_pidfile=${smokeping_pidfile-"%%PREFIX%%/var/smokeping/smokeping.pid"} -smokeping_logfile=${smokeping_logfile-"/var/log/smokeping.log"} -smokeping_user=${smokeping_user-"%%USER%%"} -smokeping_group=${smokeping_group-"%%GROUP%%"} - -. %%RC_SUBR%% - -name="smokeping" -rcvar=`set_rcvar` -command="/usr/local/bin/smokeping" -command_args="--logfile=${smokeping_logfile}" -pidfile="${smokeping_pidfile}" - -extra_commands="reload" -reload_cmd="smokeping_reloadcmd" - -smokeping_reloadcmd() -{ - $command --reload -} - -load_rc_config $name -run_rc_command "$1" - diff --git a/net/smokeping/pkg-deinstall b/net/smokeping/pkg-deinstall deleted file mode 100644 index e02852135496..000000000000 --- a/net/smokeping/pkg-deinstall +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -echo 'Stopping Smokeping daemon.' -if [ -f ${PKG_PREFIX}/var/smokeping/smokeping.pid ]; then - if [ -x ${PKG_PREFIX}/etc/rc.d/smokeping.sh ]; then - ${PKG_PREFIX}/etc/rc.d/smokeping.sh stop > /dev/null - fi - rm ${PKG_PREFIX}/var/smokeping/smokeping.pid -fi - -case $2 in -POST-DEINSTALL) - - if [ ! -n "$BATCH" ]; then - - if [ -d ${PKG_PREFIX}/etc/smokeping -o -d ${PKG_PREFIX}/var/smokeping ]; then - echo '=================================================================' - echo - echo 'You seem to have some custom config and data.' - echo 'The "%%USER%%" user and "%%GROUP%%" group were therefore not deleted.' - echo - echo 'You may delete them with:' - echo - echo ' pw groupdel %%GROUP%%' - echo ' pw userdel %%USER%%' - echo - echo 'The config and data can be deleted with:' - echo - echo " rm -R ${PKG_PREFIX}/etc/smokeping" - echo " rm -R ${PKG_PREFIX}/var/smokeping" - echo - echo '=================================================================' - else - if pw groupdel -n %%GROUP%%; then - echo 'Removed group "%%GROUP%%".' - else - echo 'Removing group "%%GROUP%%" failed...' - exit 1 - fi - - if pw userdel -n %%USER%%; then - echo 'Removed user "%%USER%%".' - else - echo 'Removing user "%%USER%%" failed...' - exit 1 - fi - fi - fi - - exit 0 - ;; -esac diff --git a/net/smokeping/pkg-descr b/net/smokeping/pkg-descr deleted file mode 100644 index 4be1823b5287..000000000000 --- a/net/smokeping/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -SmokePing is a latency logging and graphing system. It consists of a -daemon process which organizes the latency measurements and a CGI -which presents the graphs. - -WWW: http://oss.oetiker.ch/smokeping/ - ---lars -lars@thegler.dk diff --git a/net/smokeping/pkg-install b/net/smokeping/pkg-install deleted file mode 100644 index 593c79f0135e..000000000000 --- a/net/smokeping/pkg-install +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# - -case $2 in -PRE-INSTALL) - if ! pw groupshow %%GROUP%% 2>/dev/null 1>&2; then - if pw groupadd %%GROUP%% -g %%GID%% ; then - echo 'Added group "%%GROUP%%".' - else - echo 'Adding group "%%GROUP%%" failed...' - exit 1 - fi - fi - - if ! pw usershow %%USER%% 2>/dev/null 1>&2; then - if pw useradd %%USER%% -u %%UID%% -g %%GROUP%% -h - \ - -s /nonexistent -c "SmokePing Daemon"; \ - then - echo 'Added user "%%USER%%".' - else - echo 'Adding user "%%USER%%" failed...' - exit 1 - fi - fi - - exit 0 - ;; -esac diff --git a/net/smokeping/pkg-message b/net/smokeping/pkg-message deleted file mode 100644 index a1fe2a445c28..000000000000 --- a/net/smokeping/pkg-message +++ /dev/null @@ -1,35 +0,0 @@ -================================================================= - -SmokePing has now been installed in %%PREFIX%%/smokeping/. - -NOTE: A set of sample configuration files have been installed: - - %%PREFIX%%/etc/smokeping/config - %%PREFIX%%/etc/smokeping/smokemail - %%PREFIX%%/etc/smokeping/basepage.html - %%PREFIX%%/etc/smokeping/tmail - -You *MUST* edit these to suit your requirements. Please read the -manpages 'smokeping_install' and 'smokeping_config' for further -details on installation and configuration. - -If you are upgrading from a previous version of Smokeping, the -manpage 'smokeping_upgrade' may be of help. - -Once configured, you can start SmokePing by adding: - - smokeping_enable="YES" - -to /etc/rc.conf, and then running, as root: - - %%PREFIX%%/etc/rc.d/smokeping start - -To enable Apache web access, add the following to your -%%PREFIX%%/etc/apache/httpd.conf: - - ScriptAlias /smokeping.cgi %%PREFIX%%/smokeping/htdocs/smokeping.cgi - Alias /smokeimg/ %%PREFIX%%/smokeping/htdocs/img/ - -Enjoy! - -================================================================= diff --git a/net/smokeping/pkg-plist b/net/smokeping/pkg-plist deleted file mode 100644 index e2a915ec246c..000000000000 --- a/net/smokeping/pkg-plist +++ /dev/null @@ -1,185 +0,0 @@ -bin/smokeping -bin/tSmoke -@unexec if cmp -s %D/etc/smokeping/basepage.html %D/etc/smokeping/basepage.html.dist; then rm -f %D/etc/smokeping/basepage.html; fi -etc/smokeping/basepage.html.dist -@exec [ -f %B/basepage.html ] || cp %B/%f %B/basepage.html -@unexec if cmp -s %D/etc/smokeping/config %D/etc/smokeping/config.dist; then rm -f %D/etc/smokeping/config; fi -etc/smokeping/config.dist -@exec [ -f %B/config ] || cp %B/%f %B/config -@unexec if cmp -s %D/etc/smokeping/smokemail %D/etc/smokeping/smokemail.dist; then rm -f %D/etc/smokeping/smokemail; fi -etc/smokeping/smokemail.dist -@exec [ -f %B/smokemail ] || cp %B/%f %B/smokemail -@unexec if cmp -s %D/etc/smokeping/tmail %D/etc/smokeping/tmail.dist; then rm -f %D/etc/smokeping/tmail; fi -etc/smokeping/tmail.dist -@exec [ -f %B/tmail ] || cp %B/%f %B/tmail -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/Smokeping.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping.cgi.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_config.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_install.txt -%%PORTDOCS%%%%DOCSDIR%%/Config/Grammar.html -%%PORTDOCS%%%%DOCSDIR%%/Config/Grammar.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Avgratio.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Avgratio.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/base.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/base.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Median.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/matchers/Median.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherDNS.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherDNS.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherSSH.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/AnotherSSH.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonDNS.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonDNS.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonEchoICMP.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonEchoICMP.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonTcpConnect.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/CiscoRTTMonTcpConnect.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Curl.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Curl.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/DNS.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/DNS.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingChargen.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingChargen.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingDiscard.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingDiscard.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttp.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttp.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttps.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingHttps.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingIcp.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingIcp.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingSmtp.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/EchoPingSmtp.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing6.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/FPing6.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/IOSPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/IOSPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/LDAP.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/LDAP.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Radius.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/Radius.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/RemoteFPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/RemoteFPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/SSH.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/SSH.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/TelnetIOSPing.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/TelnetIOSPing.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/base.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/base.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basefork.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basefork.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basevars.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/basevars.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/passwordchecker.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/passwordchecker.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/skel.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/probes/skel.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/Examples.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/Examples.txt -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/RRDtools.html -%%PORTDOCS%%%%DOCSDIR%%/Smokeping/RRDtools.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_examples.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_examples.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_extend.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_extend.txt -%%PORTDOCS%%%%DOCSDIR%%/smokeping_upgrade.html -%%PORTDOCS%%%%DOCSDIR%%/smokeping_upgrade.txt -%%PORTDOCS%%%%DOCSDIR%%/tSmoke.html -%%PORTDOCS%%%%DOCSDIR%%/tSmoke.txt -%%PORTDOCS%%%%EXAMPLESDIR%%/config.echoping -%%PORTDOCS%%%%EXAMPLESDIR%%/config.fping-instances -%%PORTDOCS%%%%EXAMPLESDIR%%/config.multiple-probes -%%PORTDOCS%%%%EXAMPLESDIR%%/config.simple -%%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/Avgratio.pm -smokeping/lib/Smokeping/matchers/CheckLatency.pm -smokeping/lib/Smokeping/matchers/CheckLoss.pm -smokeping/lib/Smokeping/matchers/Median.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 -smokeping/lib/Smokeping/probes/CiscoRTTMonEchoICMP.pm -smokeping/lib/Smokeping/probes/CiscoRTTMonTcpConnect.pm -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 -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/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 -@exec mkdir -p %D/var/smokeping -@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 -@dirrm smokeping/lib -%%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%% -@dirrmtry smokeping |