diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-06-03 02:33:32 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-06-03 02:33:32 +0000 |
commit | b4add079991411f3e60628ebf3e43f44c7b97bb8 (patch) | |
tree | dc70bb1496f959d5d9b4403735b933822ac97258 /net/smokeping | |
parent | Update to 0.41. (diff) |
upgrade to 1.12
PR: 38833
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=60507
Diffstat (limited to 'net/smokeping')
-rw-r--r-- | net/smokeping/Makefile | 12 | ||||
-rw-r--r-- | net/smokeping/distinfo | 2 | ||||
-rw-r--r-- | net/smokeping/pkg-deinstall | 77 | ||||
-rw-r--r-- | net/smokeping/pkg-install | 3 | ||||
-rw-r--r-- | net/smokeping/pkg-plist | 3 |
5 files changed, 85 insertions, 12 deletions
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile index 11af91a57c4a..fbb3fcb688d7 100644 --- a/net/smokeping/Makefile +++ b/net/smokeping/Makefile @@ -6,7 +6,7 @@ # PORTNAME= smokeping -PORTVERSION= 1.8 +PORTVERSION= 1.12 CATEGORIES= net www MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/ @@ -15,6 +15,9 @@ MAINTAINER= lars@thegler.dk BUILD_DEPENDS= rrdtool:${PORTSDIR}/net/rrdtool \ ${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \ ${SITE_PERL}/BER.pm:${PORTSDIR}/net/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-PodParser \ ${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping USE_PERL5= yes @@ -22,7 +25,7 @@ USE_PERL5= yes MAN1= EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.1 \ EchoPingHttp.pm.1 EchoPingHttps.pm.1 \ EchoPingIcp.pm.1 EchoPingSmtp.pm.1 \ - FPing.pm.1 ParseConfig.pm.1 Smokeping.pm.1 \ + FPing.pm.1 FPing6.pm.1 ParseConfig.pm.1 Smokeping.pm.1 \ base.pm.1 basefork.pm.1 basevars.pm.1 \ smokeping.1 smokeping.cgi.1 \ smokeping_config.1 smokeping_install.1 @@ -34,7 +37,7 @@ DOC1= CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO DOC2= EchoPing.pm EchoPingChargen.pm EchoPingDiscard.pm \ EchoPingHttp.pm EchoPingHttps.pm \ EchoPingIcp.pm EchoPingSmtp.pm \ - FPing.pm ParseConfig.pm Smokeping.pm \ + FPing.pm FPing6.pm ParseConfig.pm Smokeping.pm \ base.pm basefork.pm basevars.pm smokeping.cgi \ smokeping smokeping_config smokeping_install ETC1= basepage.html config smokemail config-echoping @@ -51,7 +54,7 @@ pre-patch: s|/home/oetiker/.smokeping/config|${PREFIX}/etc/smokeping/config|; \ s|/usr/lib/sendmail|/usr/sbin/sendmail|; \ s|/usr/sepp/bin/fping|${PREFIX}/sbin/fping|; \ - s|piddir = /usr/local/smokeping/var|piddir = ${PREFIX}/var/smokeping|; \ + s|dir = /usr/local/smokeping/var|dir = ${PREFIX}/var/smokeping|; \ s|imgcache = /home/oetiker/public_html/.simg|imgcache = ${PREFIX}/smokeping/htdocs/img|; \ s|imgurl = ../.simg|imgurl = /smokeimg|; \ ' \ @@ -64,6 +67,7 @@ pre-patch: do-build: @${RM} ${WRKSRC}/lib/BER.pm @${RM} ${WRKSRC}/lib/SNMP_*.pm + @${RM} ${WRKSRC}/probe-report.patch pre-install: PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo index 3f8c69c35b78..6c6ac41ec347 100644 --- a/net/smokeping/distinfo +++ b/net/smokeping/distinfo @@ -1 +1 @@ -MD5 (smokeping-1.8.tar.gz) = 0be3dccdeea9ce0180ac33c08ce55ee8 +MD5 (smokeping-1.12.tar.gz) = 959dd5b64f067c3f6bfaf26a33f640fa diff --git a/net/smokeping/pkg-deinstall b/net/smokeping/pkg-deinstall index 901e0c3182be..525a4f3fd2dc 100644 --- a/net/smokeping/pkg-deinstall +++ b/net/smokeping/pkg-deinstall @@ -1,7 +1,58 @@ #!/bin/sh +# # $FreeBSD$ # +ask() { + local question default answer + + question=$1 + default=$2 + if [ -z "${PACKAGE_BUILDING}" ]; then + read -p "${question} [${default}]? " answer + fi + if [ x${answer} = x ]; then + answer=${default} + fi + echo ${answer} +} + +yesno() { + local dflt question answer + + question=$1 + dflt=$2 + while :; do + answer=$(ask "${question}" "${dflt}") + case "${answer}" in + [Yy]*) return 0;; + [Nn]*) return 1;; + esac + echo "Please answer yes or no." + done +} + +delete_account() { + local u g home + + u=$1 + g=$2 + if yesno "Do you want me to remove group \"${g}\"" y; then + pw groupdel -n ${g} + echo "Done." + fi + if yesno "Do you want me to remove user \"${u}\"" y; then + eval home=~${u} + pw userdel -n ${u} + echo "Done." + if [ -d "${home}" ]; then + echo "Please remember to check if there's any unsent mail left" + echo "in the home directory \"${home}\"" + fi + + fi +} + 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 @@ -13,11 +64,23 @@ if [ "$2" != "POST-DEINSTALL" ]; then exit 0 fi -if [ -d ${PKG_PREFIX}/smokeping ]; then - echo "----------------------------------------------------------------" - echo "To delete your custom SmokePing configuration and all collected" - echo "data permanently, use 'rm -R ${PKG_PREFIX}/smokeping'" - echo "----------------------------------------------------------------" -fi +if [ ! -n "$BATCH" ]; then -exit 0 + if [ -d ${PKG_PREFIX}/etc/smokeping ]; then + echo "You have some custom SmokePing configuration in \"${PKG_PREFIX}/etc/smokeping/\"." + if yesno "Would you like me to remove it" y; then + rm -R ${PKG_PREFIX}/etc/smokeping + echo "Done." + fi + fi + + if [ -d ${PKG_PREFIX}/var/smokeping ]; then + echo "You have some collected data in \"${PKG_PREFIX}/var/smokeping/\"." + if yesno "Would you like me to remove it" y; then + rm -R ${PKG_PREFIX}/var/smokeping + echo "Done." + fi + fi + + delete_account smokeping smokeping +fi diff --git a/net/smokeping/pkg-install b/net/smokeping/pkg-install index ae0082364853..2ef9d68abd3e 100644 --- a/net/smokeping/pkg-install +++ b/net/smokeping/pkg-install @@ -1,4 +1,7 @@ #! /bin/sh +# +# $FreeBSD$ +# ask() { local question default answer diff --git a/net/smokeping/pkg-plist b/net/smokeping/pkg-plist index 78e227cba3f9..f0154851092a 100644 --- a/net/smokeping/pkg-plist +++ b/net/smokeping/pkg-plist @@ -34,6 +34,8 @@ share/doc/smokeping/EchoPingSmtp.pm.html share/doc/smokeping/EchoPingSmtp.pm.txt share/doc/smokeping/FPing.pm.html share/doc/smokeping/FPing.pm.txt +share/doc/smokeping/FPing6.pm.html +share/doc/smokeping/FPing6.pm.txt share/doc/smokeping/ParseConfig.pm.html share/doc/smokeping/ParseConfig.pm.txt share/doc/smokeping/Smokeping.pm.html @@ -55,6 +57,7 @@ share/doc/smokeping/smokeping_install.txt smokeping/htdocs/smokeping.cgi smokeping/lib/Smokeping.pm smokeping/lib/probes/FPing.pm +smokeping/lib/probes/FPing6.pm smokeping/lib/probes/base.pm smokeping/lib/probes/EchoPing.pm smokeping/lib/probes/EchoPingChargen.pm |