mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
- Update to 2.4.1 [1]
- Use proper PORTEXAMPLES - Start script updated to avoid deadlock with sshd PR: ports/126966 [mostly 1] Submitted by: chinsan
This commit is contained in:
parent
ecb4cb53c9
commit
27caa13672
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=219540
10 changed files with 104 additions and 28 deletions
|
@ -6,8 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= smokeping
|
||||
PORTVERSION= 2.3.6
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 2.4.1
|
||||
CATEGORIES= net-mgmt www
|
||||
MASTER_SITES= http://oss.oetiker.ch/smokeping/pub/ \
|
||||
http://smokeping.cs.pu.edu.tw/pub/
|
||||
|
@ -16,6 +15,7 @@ MAINTAINER= lth@FreeBSD.org
|
|||
COMMENT= Latency logging and graphing system
|
||||
|
||||
RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \
|
||||
p5-CGI-Session>0:${PORTSDIR}/www/p5-CGI-Session \
|
||||
p5-CGI-SpeedyCGI>0:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
|
||||
p5-CGI.pm>0:${PORTSDIR}/www/p5-CGI.pm \
|
||||
p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
|
||||
|
@ -28,9 +28,6 @@ RUN_DEPENDS= rrdtool:${PORTSDIR}/databases/rrdtool \
|
|||
NO_BUILD= yes
|
||||
USE_PERL5= yes
|
||||
|
||||
NO_BUILD= yes
|
||||
USE_PERL5= yes
|
||||
|
||||
OPTIONS= FPING "Support for fping probes" on
|
||||
OPTIONS+= ECHOPING "Support for EchoPing probes" off
|
||||
OPTIONS+= CURL "Support for Curl probes" off
|
||||
|
@ -194,6 +191,7 @@ post-extract:
|
|||
${RM} ${WRKSRC}/lib/BER.pm
|
||||
${RM} ${WRKSRC}/lib/SNMP_*.pm
|
||||
${RM} -rf ${WRKSRC}/lib/Digest
|
||||
${RM} -rf ${WRKSRC}/lib/CGI
|
||||
|
||||
pre-patch:
|
||||
${REINPLACE_CMD} -e s!/usr/bin/!%%PREFIX%%/bin/! \
|
||||
|
@ -220,6 +218,7 @@ pre-configure:
|
|||
${WRKSRC}/bin/smokeping.dist \
|
||||
${WRKSRC}/bin/tSmoke.dist \
|
||||
${WRKSRC}/htdocs/smokeping.cgi.dist \
|
||||
${WRKSRC}/htdocs/tr.cgi.dist \
|
||||
${WRKSRC}/etc/config.dist \
|
||||
${WRKSRC}/lib/Smokeping/probes/*.pm
|
||||
${FIND} ${WRKSRC} -name \*.bak -delete
|
||||
|
@ -232,6 +231,7 @@ pre-configure:
|
|||
${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}/htdocs/tr.cgi.dist ${WRKSRC}/htdocs/tr.cgi
|
||||
|
||||
pre-su-install:
|
||||
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
|
||||
|
@ -255,6 +255,8 @@ do-install:
|
|||
${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}/${FILE}.html
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt ${DOCSDIR}/${FILE}.txt
|
||||
.endfor
|
||||
.endif
|
||||
.if !defined(NOPORTEXAMPLES)
|
||||
${MKDIR} ${EXAMPLESDIR}
|
||||
(cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR})
|
||||
.endif
|
||||
|
@ -266,12 +268,12 @@ do-install:
|
|||
fi
|
||||
.endfor
|
||||
${MKDIR} ${PREFIX}/smokeping/htdocs
|
||||
${MKDIR} ${PREFIX}/smokeping/htdocs/img
|
||||
${CP} -R ${WRKSRC}/htdocs ${PREFIX}/smokeping/
|
||||
${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/smokeping/htdocs
|
||||
${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
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
MD5 (smokeping-2.3.6.tar.gz) = 06d5ed4ed693a17960dfa3361443bf72
|
||||
SHA256 (smokeping-2.3.6.tar.gz) = 20e75da551b9a1f8b2957e8c4ff7f273fcf765eb39fbccafd6e74a7c6cb556b5
|
||||
SIZE (smokeping-2.3.6.tar.gz) = 580785
|
||||
MD5 (smokeping-2.4.1.tar.gz) = b7cda5c04c04cbccd9639160470b57f8
|
||||
SHA256 (smokeping-2.4.1.tar.gz) = fc02bdea6841fd9f94eb6b8af182270e42e2ac47ec667c08dfd5ca68e6130e33
|
||||
SIZE (smokeping-2.4.1.tar.gz) = 913176
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
-use lib qw(lib);
|
||||
+use lib qw(%%PREFIX%%/smokeping/lib);
|
||||
|
||||
use Smokeping 2.003006;
|
||||
use Smokeping 2.004000;
|
||||
|
||||
-Smokeping::main("etc/config.dist");
|
||||
+$0 = "%%PREFIX%%/bin/smokeping";
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
-use lib "/usr/local/rrdtool-1.0.39/lib/perl";
|
||||
+use lib qw(%%PREFIX%%/smokeping/lib);
|
||||
|
||||
use Smokeping 2.003006;
|
||||
use Smokeping 2.004001;
|
||||
use Net::SMTP;
|
||||
@@ -60,7 +59,7 @@
|
||||
use RRDs;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
-datadir = /tmp/smokeping-ms/data
|
||||
-piddir = /tmp/smokeping-ms/var
|
||||
+imgcache = %%PREFIX%%/smokeping/htdocs/img
|
||||
+imgurl = /smokeimg
|
||||
+imgurl = img
|
||||
+datadir = %%PREFIX%%/var/smokeping
|
||||
+piddir = %%PREFIX%%/var/smokeping
|
||||
cgiurl = http://some.url/smokeping.cgi
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
+use lib qw(%%PREFIX%%/smokeping/lib);
|
||||
use CGI::Carp qw(fatalsToBrowser);
|
||||
|
||||
use Smokeping 2.003006;
|
||||
use Smokeping 2.004000;
|
||||
|
||||
-Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
|
||||
+Smokeping::cgi("%%PREFIX%%/etc/smokeping/config");
|
||||
|
|
12
net-mgmt/smokeping/files/patch-htdocs__tr.cgi.dist
Normal file
12
net-mgmt/smokeping/files/patch-htdocs__tr.cgi.dist
Normal file
|
@ -0,0 +1,12 @@
|
|||
--- ./htdocs/tr.cgi.dist.orig 2008-07-09 14:35:43.000000000 +0200
|
||||
+++ ./htdocs/tr.cgi.dist 2008-07-09 14:49:01.000000000 +0200
|
||||
@@ -1,7 +1,6 @@
|
||||
-#!/usr/sepp/bin/speedy-5.8.8 -w
|
||||
+#!%%PREFIX%%/bin/speedy -w
|
||||
use strict;
|
||||
-use lib qw(/home/oposs/smokeping/software/lib);
|
||||
-use lib qw(perl);
|
||||
+use lib qw(%%PREFIX%%/smokeping/lib);
|
||||
|
||||
use CGI;
|
||||
use CGI::Util qw(expires);
|
|
@ -2,8 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
# PROVIDE: smokeping
|
||||
# REQUIRE: DAEMON
|
||||
# BEFORE: LOGIN
|
||||
# REQUIRE: sshd
|
||||
# KEYWORD: shutdown
|
||||
|
||||
# Define these smokeping_* variables in one of these files:
|
||||
|
@ -24,6 +23,7 @@ smokeping_group=${smokeping_group-"%%GROUP%%"}
|
|||
|
||||
name="smokeping"
|
||||
rcvar=`set_rcvar`
|
||||
load_rc_config $name
|
||||
command="/usr/local/bin/smokeping"
|
||||
command_args="--logfile=${smokeping_logfile}"
|
||||
pidfile="${smokeping_pidfile}"
|
||||
|
@ -36,6 +36,5 @@ smokeping_reloadcmd()
|
|||
$command --reload
|
||||
}
|
||||
|
||||
load_rc_config $name
|
||||
run_rc_command "$1"
|
||||
|
||||
|
|
|
@ -24,12 +24,12 @@ 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:
|
||||
To enable Apache web access, add something like the following to
|
||||
your %%PREFIX%%/etc/apache/httpd.conf:
|
||||
|
||||
DocumentRoot %%PREFIX%%/smokeping/htdocs
|
||||
ScriptAlias /smokeping.cgi %%PREFIX%%/smokeping/htdocs/smokeping.cgi
|
||||
Alias /smokeimg/ %%PREFIX%%/smokeping/htdocs/img/
|
||||
Alias /cropper/ %%PREFIX%%/smokeping/htdocs/cropper/
|
||||
ScriptAlias /tr.cgi %%PREFIX%%/smokeping/htdocs/tr.cgi
|
||||
|
||||
Enjoy!
|
||||
|
||||
|
|
|
@ -102,12 +102,12 @@ etc/smokeping/tmail.dist
|
|||
%%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
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.echoping
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.fping-instances
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.multiple-probes
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.simple
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.targetvars-with-Curl
|
||||
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config.template
|
||||
smokeping/htdocs/cropper/cropper.css
|
||||
smokeping/htdocs/cropper/cropper.js
|
||||
smokeping/htdocs/cropper/cropper.uncompressed.js
|
||||
|
@ -124,10 +124,47 @@ smokeping/htdocs/cropper/licence.txt
|
|||
smokeping/htdocs/cropper/marqueeHoriz.gif
|
||||
smokeping/htdocs/cropper/marqueeVert.gif
|
||||
smokeping/htdocs/cropper/smokeping-zoom.js
|
||||
smokeping/htdocs/resource/Tr/image/ajax-loader.gif
|
||||
smokeping/htdocs/resource/qx/icon/CrystalClear/16/actions/view-refresh.png
|
||||
smokeping/htdocs/resource/qx/icon/Nuvola/16/actions/view-refresh.png
|
||||
smokeping/htdocs/resource/qx/static/image/blank.gif
|
||||
smokeping/htdocs/resource/qx/static/image/dotted_white.gif
|
||||
smokeping/htdocs/resource/qx/static/log/log.html
|
||||
smokeping/htdocs/resource/qx/widget/Windows/arrows/down.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/arrows/down_small.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/arrows/next.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/arrows/up.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/arrows/up_small.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/cursors/alias.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/cursors/copy.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/cursors/move.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/cursors/nodrop.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/menu/checkbox.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/menu/radiobutton.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/splitpane/knob-horizontal.png
|
||||
smokeping/htdocs/resource/qx/widget/Windows/splitpane/knob-vertical.png
|
||||
smokeping/htdocs/resource/qx/widget/Windows/table/ascending.png
|
||||
smokeping/htdocs/resource/qx/widget/Windows/table/descending.png
|
||||
smokeping/htdocs/resource/qx/widget/Windows/table/selectColumnOrder.png
|
||||
smokeping/htdocs/resource/qx/widget/Windows/window/close.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/window/maximize.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/window/minimize.gif
|
||||
smokeping/htdocs/resource/qx/widget/Windows/window/restore.gif
|
||||
smokeping/htdocs/script/Tr.js
|
||||
smokeping/htdocs/smokeping.cgi
|
||||
smokeping/htdocs/tr.cgi
|
||||
smokeping/htdocs/tr.html
|
||||
smokeping/lib/Config/Grammar.pm
|
||||
smokeping/lib/Config/Grammar/Document.pm
|
||||
smokeping/lib/Config/Grammar/Dynamic.pm
|
||||
smokeping/lib/JSON.pm
|
||||
smokeping/lib/JSON/Converter.pm
|
||||
smokeping/lib/JSON/PP.pm
|
||||
smokeping/lib/JSON/PP5005.pm
|
||||
smokeping/lib/JSON/PP56.pm
|
||||
smokeping/lib/JSON/Parser.pm
|
||||
smokeping/lib/Qooxdoo/JSONRPC.pm
|
||||
smokeping/lib/Qooxdoo/Services/Tr.pm
|
||||
smokeping/lib/Smokeping.pm
|
||||
smokeping/lib/Smokeping/Colorspace.pm
|
||||
smokeping/lib/Smokeping/Config.pm
|
||||
|
@ -196,9 +233,35 @@ smokeping/lib/Smokeping/sorters/base.pm
|
|||
@dirrm smokeping/lib/Smokeping/probes
|
||||
@dirrm smokeping/lib/Smokeping/matchers
|
||||
@dirrm smokeping/lib/Smokeping
|
||||
@dirrm smokeping/lib/Qooxdoo/Services
|
||||
@dirrm smokeping/lib/Qooxdoo
|
||||
@dirrm smokeping/lib/JSON
|
||||
@dirrm smokeping/lib/Config/Grammar
|
||||
@dirrm smokeping/lib/Config
|
||||
@dirrm smokeping/lib
|
||||
@dirrm smokeping/htdocs/script
|
||||
@dirrm smokeping/htdocs/resource/qx/widget/Windows/window
|
||||
@dirrm smokeping/htdocs/resource/qx/widget/Windows/table
|
||||
@dirrm smokeping/htdocs/resource/qx/widget/Windows/splitpane
|
||||
@dirrm smokeping/htdocs/resource/qx/widget/Windows/menu
|
||||
@dirrm smokeping/htdocs/resource/qx/widget/Windows/cursors
|
||||
@dirrm smokeping/htdocs/resource/qx/widget/Windows/arrows
|
||||
@dirrm smokeping/htdocs/resource/qx/widget/Windows
|
||||
@dirrm smokeping/htdocs/resource/qx/widget
|
||||
@dirrm smokeping/htdocs/resource/qx/static/log
|
||||
@dirrm smokeping/htdocs/resource/qx/static/image
|
||||
@dirrm smokeping/htdocs/resource/qx/static
|
||||
@dirrm smokeping/htdocs/resource/qx/icon/Nuvola/16/actions
|
||||
@dirrm smokeping/htdocs/resource/qx/icon/Nuvola/16
|
||||
@dirrm smokeping/htdocs/resource/qx/icon/Nuvola
|
||||
@dirrm smokeping/htdocs/resource/qx/icon/CrystalClear/16/actions
|
||||
@dirrm smokeping/htdocs/resource/qx/icon/CrystalClear/16
|
||||
@dirrm smokeping/htdocs/resource/qx/icon/CrystalClear
|
||||
@dirrm smokeping/htdocs/resource/qx/icon
|
||||
@dirrm smokeping/htdocs/resource/qx
|
||||
@dirrm smokeping/htdocs/resource/Tr/image
|
||||
@dirrm smokeping/htdocs/resource/Tr
|
||||
@dirrm smokeping/htdocs/resource
|
||||
@dirrm smokeping/htdocs/cropper/lib
|
||||
@dirrm smokeping/htdocs/cropper
|
||||
@dirrm smokeping/htdocs
|
||||
|
@ -207,5 +270,5 @@ smokeping/lib/Smokeping/sorters/base.pm
|
|||
%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping/probes
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%
|
||||
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
|
||||
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
|
||||
@dirrmtry smokeping
|
||||
|
|
Loading…
Add table
Reference in a new issue