Attachment 113450 Details for Bug 155002 – file.diff

[patch] file.diff

file.diff (text/plain), 4.41 KB, created by Alexey V. Panfilov on 2011-02-24 11:50:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey V. Panfilov

Created: 2011-02-24 11:50:08 UTC

Size: 4.41 KB

patch

obsolete

>diff -dddruN mrtg.orig/Makefile mrtg/Makefile
>--- mrtg.orig/Makefile	2010-12-20 22:50:45.000000000 +0300
>+++ mrtg/Makefile	2011-02-24 14:03:09.000000000 +0300
>@@ -2,11 +2,11 @@
> # Date created:				April 18th 1997
> # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
> #
>-# $FreeBSD: ports/net-mgmt/mrtg/Makefile,v 1.108 2010/12/20 19:50:45 ohauer Exp $
>+# $FreeBSD: ports/net-mgmt/mrtg/Makefile,v 1.107 2010/08/09 08:54:35 nemoliu Exp $
> #
> 
> PORTNAME=	mrtg
>-PORTVERSION=	2.17.0
>+PORTVERSION=	2.17.1
> PORTEPOCH=	1
> CATEGORIES=	net-mgmt ipv6
> MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
>diff -dddruN mrtg.orig/distinfo mrtg/distinfo
>--- mrtg.orig/distinfo	2010-12-20 22:50:45.000000000 +0300
>+++ mrtg/distinfo	2011-02-24 14:03:27.000000000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (mrtg-2.17.0.tar.gz) = 88095ed789a50b171f47000338bf3fe3980d38fe8be1050fe07fb8e7f39a8b53
>-SIZE (mrtg-2.17.0.tar.gz) = 1093864
>+SHA256 (mrtg-2.17.1.tar.gz) = c8b19ade0834f1e3153c95ce3f4a7e3d52ec6d2e9a2f39c2e9e94f4e2227139e
>+SIZE (mrtg-2.17.1.tar.gz) = 1095682
>diff -dddruN mrtg.orig/files/patch-aa mrtg/files/patch-aa
>--- mrtg.orig/files/patch-aa	2010-02-11 22:42:33.000000000 +0300
>+++ mrtg/files/patch-aa	1970-01-01 03:00:00.000000000 +0300
>@@ -1,11 +0,0 @@
>---- bin/mrtg.orig	2010-01-15 17:02:33.000000000 +0300
>-+++ bin/mrtg	2010-01-15 16:38:33.000000000 +0300
>-@@ -1608,7 +1608,7 @@
>-         print HTML "
>- 
>- 		<div class=\"graph\">
>--			<h2>".&$LOC("$sample{$peri}")." ".&$LOC("Average)")."</h2>
>-+			<h2>".&$LOC("$sample{$peri}").&$LOC(" Average\)")."</h2>
>- 			<img src=\"$imagepath$router-$full{$peri}.${main::GRAPHFMT}\" title=\"$full{$peri}\" alt=\"$full{$peri}\" />
>- 			<table>
>- 				<tr>
>diff -dddruN mrtg.orig/files/patch-ab mrtg/files/patch-ab
>--- mrtg.orig/files/patch-ab	2010-02-11 22:42:33.000000000 +0300
>+++ mrtg/files/patch-ab	1970-01-01 03:00:00.000000000 +0300
>@@ -1,32 +0,0 @@
>---- lib/mrtg2/locales_mrtg.pm.orig	2008-05-16 18:45:41.000000000 +0400
>-+++ lib/mrtg2/locales_mrtg.pm	2010-01-15 16:33:33.000000000 +0300
>-@@ -4137,10 +4137,10 @@
>-      'Max'                                    => 'íÁËÓ.',
>-      'Current'                                => 'ôÅËÕÝÉÊ',
>-      'version'                                => '×ÅÒÓÉÑ',
>--     '`Daily\' Graph \((.*) Minute'           => 'óÕÔÏÞÎÙÊ ÔÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ $1 ÍÉÎÕÔ',
>--     '`Weekly\' Graph \(30 Minute'            => 'îÅÄÅÌØÎÙÊ ÔÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 30 ÍÉÎÕÔ' ,
>--     '`Monthly\' Graph \(2 Hour'              => 'íÅÓÑÞÎÙÊ ÔÒÁÆÉË  (ÓÒÅÄÎÅÅ ÚÁ 2 ÞÁÓÁ',
>--     '`Yearly\' Graph \(1 Day'                => 'çÏÄÏ×ÏÊ ÔÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 1 ÄÅÎØ', 
>-+     '`Daily\' Graph \((.*) Minute'           => 'óÕÔÏÞÎÙÊ ÇÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ $1 ÍÉÎÕÔ',
>-+     '`Weekly\' Graph \(30 Minute'            => 'îÅÄÅÌØÎÙÊ ÇÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 30 ÍÉÎÕÔ' ,
>-+     '`Monthly\' Graph \(2 Hour'              => 'íÅÓÑÞÎÙÊ ÇÒÁÆÉË  (ÓÒÅÄÎÅÅ ÚÁ 2 ÞÁÓÁ',
>-+     '`Yearly\' Graph \(1 Day'                => 'çÏÄÏ×ÏÊ ÇÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 1 ÄÅÎØ', 
>-      'Incoming Traffic in (\S+) per Second'   => '÷ÈÏÄÑÝÉÊ ÔÒÁÆÉË × $1 × ÓÅËÕÎÄÕ',
>-      'Outgoing Traffic in (\S+) per Second'   => 'éÓÈÏÄÑÝÉÊ ÔÒÁÆÉË × $1 × ÓÅËÕÎÄÕ',
>-      'at which time (.*) had been up for(.*)' => '× ÜÔÏ ×ÒÅÍÑ $1 ÂÙÌÁ ×ËÌÀÞÅÎÁ $2',
>-@@ -4245,10 +4245,10 @@
>-      'Max'                                    => 'Ìàêñèìàëüíî',
>-      'Current'                                => 'Ñåé÷àñ',
>-      'version'                                => 'âåðñèÿ',
>--     '`Daily\' Graph \((.*) Minute'           => 'Ñóòî÷íûé òðàôèê (ñðåäíåå çà $1 ìèíóò',
>--     '`Weekly\' Graph \(30 Minute'            => 'Íåäåëüíûé òðàôèê (ñðåäíåå çà 30 ìèíóò' ,
>--     '`Monthly\' Graph \(2 Hour'              => 'Ìåñÿ÷íûé òðàôèê  (ñðåäíåå çà 2 ÷àñà',
>--     '`Yearly\' Graph \(1 Day'                => 'Ãîäîâîé òðàôèê (ñðåäíåå çà 1 äåíü', 
>-+     '`Daily\' Graph \((.*) Minute'           => 'Ñóòî÷íûé ãðàôèê (ñðåäíåå çà $1 ìèíóò',
>-+     '`Weekly\' Graph \(30 Minute'            => 'Íåäåëüíûé ãðàôèê (ñðåäíåå çà 30 ìèíóò' ,
>-+     '`Monthly\' Graph \(2 Hour'              => 'Ìåñÿ÷íûé ãðàôèê  (ñðåäíåå çà 2 ÷àñà',
>-+     '`Yearly\' Graph \(1 Day'                => 'Ãîäîâîé ãðàôèê (ñðåäíåå çà 1 äåíü', 
>-      'Incoming Traffic in (\S+) per Second'   => 'Âõîäÿùèé òðàôèê â $1 â ñåêóíäó',
>-      'Outgoing Traffic in (\S+) per Second'   => 'Èñõîäÿùèé òðàôèê â $1 â ñåêóíäó',
>-      'at which time <strong>(\S+)</strong> had been up for <strong>(\S+)</strong>' => 'âðåìÿ ïîñëå èíèöèàëèçàöèè óñòðîéñòâà <strong>$1</strong>: <strong>$2</strong>.',

Actions: View | Diff

Attachments on bug 155002: 113450