Attachment 22363 Details for Bug 38833 – file.diff

[patch] file.diff

file.diff (text/plain), 6.27 KB, created by Lars Thegler on 2002-06-02 19:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Thegler

Created: 2002-06-02 19:40:00 UTC

Size: 6.27 KB

patch

obsolete

>diff -Naur /usr/ports/net/smokeping/Makefile smokeping/Makefile
>--- /usr/ports/net/smokeping/Makefile	Mon May 13 20:47:12 2002
>+++ smokeping/Makefile	Sun Jun  2 16:43:37 2002
>@@ -2,11 +2,11 @@
> # Date created:				Tue Feb 12 22:17:40 CET 2002
> # Whom:                                 Lars Thegler <lars@thegler.dk>
> #
>-# $FreeBSD: ports/net/smokeping/Makefile,v 1.4 2002/04/28 16:26:21 pat Exp $
>+# $FreeBSD: ports/net/smokeping/Makefile,v 1.3 2002/04/02 01:10:03 kuriyama Exp $
> #
> 
> 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 @@
> 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 @@
> 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 @@
> 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 @@
> 		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 @@
> 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 -Naur /usr/ports/net/smokeping/distinfo smokeping/distinfo
>--- /usr/ports/net/smokeping/distinfo	Mon May 13 20:47:13 2002
>+++ smokeping/distinfo	Sun Jun  2 15:30:29 2002
>@@ -1 +1 @@
>-MD5 (smokeping-1.8.tar.gz) = 0be3dccdeea9ce0180ac33c08ce55ee8
>+MD5 (smokeping-1.12.tar.gz) = 959dd5b64f067c3f6bfaf26a33f640fa
>diff -Naur /usr/ports/net/smokeping/pkg-deinstall smokeping/pkg-deinstall
>--- /usr/ports/net/smokeping/pkg-deinstall	Mon Apr  1 15:47:18 2002
>+++ smokeping/pkg-deinstall	Sun Jun  2 18:38:23 2002
>@@ -1,7 +1,58 @@
> #!/bin/sh
>+#
> # $FreeBSD: ports/net/smokeping/pkg-deinstall,v 1.2 2002/04/01 13:47:18 kuriyama Exp $
> #
> 
>+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 @@
>     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
>+
>+    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
> 
>-exit 0
>+    delete_account smokeping smokeping
>+fi
>diff -Naur /usr/ports/net/smokeping/pkg-install smokeping/pkg-install
>--- /usr/ports/net/smokeping/pkg-install	Mon Apr  1 15:47:18 2002
>+++ smokeping/pkg-install	Sun Jun  2 18:39:04 2002
>@@ -1,4 +1,7 @@
> #! /bin/sh
>+#
>+# $FreeBSD$
>+#
> 
> ask() {
>     local question default answer
>diff -Naur /usr/ports/net/smokeping/pkg-plist smokeping/pkg-plist
>--- /usr/ports/net/smokeping/pkg-plist	Mon Apr  1 15:47:18 2002
>+++ smokeping/pkg-plist	Mon May 13 21:27:26 2002
>@@ -34,6 +34,8 @@
> 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 @@
> 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

Actions: View | Diff

Attachments on bug 38833: 22363