From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 1 16:30:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DAF441065696 for ; Tue, 1 Dec 2009 16:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9DFB68FC29 for ; Tue, 1 Dec 2009 16:30:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nB1GU3fR004998 for ; Tue, 1 Dec 2009 16:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nB1GU3vc004996; Tue, 1 Dec 2009 16:30:03 GMT (envelope-from gnats) Resent-Date: Tue, 1 Dec 2009 16:30:03 GMT Resent-Message-Id: <200912011630.nB1GU3vc004996@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Zhen REN Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A605106566C for ; Tue, 1 Dec 2009 16:22:03 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 091CC8FC13 for ; Tue, 1 Dec 2009 16:22:03 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nB1GM2c5041438 for ; Tue, 1 Dec 2009 16:22:02 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id nB1GM2BQ041437; Tue, 1 Dec 2009 16:22:02 GMT (envelope-from nobody) Message-Id: <200912011622.nB1GM2BQ041437@www.freebsd.org> Date: Tue, 1 Dec 2009 16:22:02 GMT From: Zhen REN To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/141058: [UPDATE] update databases/rrdtool to 1.4.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2009 16:30:03 -0000 >Number: 141058 >Category: ports >Synopsis: [UPDATE] update databases/rrdtool to 1.4.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Dec 01 16:30:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Zhen REN >Release: 7.2-RELEASE-p4 >Organization: >Environment: FreeBSD tango 7.2-RELEASE-p4 FreeBSD 7.2-RELEASE-p4 #0: Fri Oct 2 12:21:39 UTC 2009 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: update databases/rrdtool to 1.4.2 >How-To-Repeat: N/A >Fix: N/A Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/renzhen/ncvs/ports/databases/rrdtool/Makefile,v retrieving revision 1.88 diff -u -r1.88 Makefile --- Makefile 21 Nov 2009 11:12:37 -0000 1.88 +++ Makefile 1 Dec 2009 22:50:43 -0000 @@ -6,7 +6,7 @@ # PORTNAME= rrdtool -PORTVERSION= 1.3.9 +PORTVERSION= 1.4.2 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ Index: distinfo =================================================================== RCS file: /home/renzhen/ncvs/ports/databases/rrdtool/distinfo,v retrieving revision 1.39 diff -u -r1.39 distinfo --- distinfo 21 Nov 2009 11:12:37 -0000 1.39 +++ distinfo 1 Dec 2009 22:51:18 -0000 @@ -1,3 +1,3 @@ -MD5 (rrdtool-1.3.9.tar.gz) = 37db5959b2eff90ed8f8a0178bba5d6b -SHA256 (rrdtool-1.3.9.tar.gz) = 9e8757192a56e006d7c593970aca4850a05fa34807a5092d1d132da8f48e0108 -SIZE (rrdtool-1.3.9.tar.gz) = 1189442 +MD5 (rrdtool-1.4.2.tar.gz) = 9318d3b4016dd9dd9897f1eac7548032 +SHA256 (rrdtool-1.4.2.tar.gz) = e55ebe13b16515a275185229a93ee1fc266010a9e3c6b05b229a1530695311cb +SIZE (rrdtool-1.4.2.tar.gz) = 1355269 Index: pkg-plist =================================================================== RCS file: /home/renzhen/ncvs/ports/databases/rrdtool/pkg-plist,v retrieving revision 1.27 diff -u -r1.27 pkg-plist --- pkg-plist 4 May 2009 12:42:16 -0000 1.27 +++ pkg-plist 2 Dec 2009 00:17:00 -0000 @@ -1,16 +1,18 @@ -bin/rrdtool +bin/rrdcached bin/rrdcgi +bin/rrdtool bin/rrdupdate +include/rrd.h +include/rrd_client.h +include/rrd_format.h lib/librrd.a lib/librrd.la lib/librrd.so -lib/librrd.so.4 +lib/librrd.so.5 lib/librrd_th.a lib/librrd_th.la lib/librrd_th.so -lib/librrd_th.so.4 -include/rrd.h -include/rrd_format.h +lib/librrd_th.so.5 libdata/pkgconfig/librrd.pc %%WITH_PERL%%%%SITE_PERL%%/RRDp.pm %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist Index: files/patch-bindings-Makefile.in =================================================================== RCS file: /home/renzhen/ncvs/ports/databases/rrdtool/files/patch-bindings-Makefile.in,v retrieving revision 1.7 diff -u -r1.7 patch-bindings-Makefile.in --- files/patch-bindings-Makefile.in 23 Jan 2008 02:56:54 -0000 1.7 +++ files/patch-bindings-Makefile.in 1 Dec 2009 23:23:17 -0000 @@ -1,24 +1,25 @@ ---- ./bindings/Makefile.in.orig 2008-01-08 10:36:56.000000000 +0800 -+++ ./bindings/Makefile.in 2008-01-08 10:38:18.000000000 +0800 -@@ -544,9 +544,9 @@ +--- ./bindings/Makefile.in.orig 2009-12-01 23:10:30.000000000 +0000 ++++ ./bindings/Makefile.in 2009-12-01 23:14:10.000000000 +0000 +@@ -679,9 +679,9 @@ all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@ install-data-local: -- test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true -- test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true -- test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true -+ test -f perl-piped/Makefile && cd perl-piped && $(MAKE) pure_install || true -+ test -f perl-shared/Makefile && cd perl-shared && $(MAKE) pure_install || true -+ test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) install || true - test -d python/build && cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true +- $(AM_V_GEN)test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true +- $(AM_V_GEN)test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true +- $(AM_V_GEN)test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true ++ $(AM_V_GEN)test -f perl-piped/Makefile && cd perl-piped && $(MAKE) pure_install || true ++ $(AM_V_GEN)test -f perl-shared/Makefile && cd perl-shared && $(MAKE) pure_install || true ++ $(AM_V_GEN)test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) install || true + $(AM_V_GEN)test -d python/build && cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true - # rules for buildung the ruby module -@@ -557,7 +557,7 @@ + # rules for building the ruby module +@@ -692,7 +692,8 @@ - # rules for buildung the pyton module + # rules for building the pyton module python: - cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build + cd python && env INCDIR=../../src BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build ++ # rules for building the perl module perl_piped: perl-piped/Makefile Index: files/patch-doc-Makefile.in =================================================================== RCS file: /home/renzhen/ncvs/ports/databases/rrdtool/files/patch-doc-Makefile.in,v retrieving revision 1.4 diff -u -r1.4 patch-doc-Makefile.in --- files/patch-doc-Makefile.in 3 May 2007 08:33:29 -0000 1.4 +++ files/patch-doc-Makefile.in 1 Dec 2009 23:23:17 -0000 @@ -1,9 +1,9 @@ ---- doc/Makefile.in.orig Thu May 3 12:26:06 2007 -+++ doc/Makefile.in Thu May 3 12:26:35 2007 -@@ -239,9 +239,9 @@ +--- ./doc/Makefile.in.orig 2009-12-01 23:14:57.000000000 +0000 ++++ ./doc/Makefile.in 2009-12-01 23:18:22.000000000 +0000 +@@ -327,9 +327,9 @@ # what should go into the distribution - EXTRA_DIST = $(POD) $(HTML) $(MAN) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd + EXTRA_DIST = $(POD) $(POD3) $(HTML) $(MAN) $(MAN3) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod -idocdir = $(RRDDOCDIR)/txt +idocdir = $(datadir)/doc/rrdtool/txt idoc_DATA = $(POD) $(TXT) Index: files/patch-examples-Makefile.in =================================================================== RCS file: /home/renzhen/ncvs/ports/databases/rrdtool/files/patch-examples-Makefile.in,v retrieving revision 1.5 diff -u -r1.5 patch-examples-Makefile.in --- files/patch-examples-Makefile.in 3 May 2007 08:33:29 -0000 1.5 +++ files/patch-examples-Makefile.in 1 Dec 2009 23:23:17 -0000 @@ -1,8 +1,8 @@ ---- examples/Makefile.in.orig Thu May 3 12:27:17 2007 -+++ examples/Makefile.in Thu May 3 12:27:41 2007 -@@ -219,7 +219,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ +--- ./examples/Makefile.in.orig 2009-12-01 23:18:52.000000000 +0000 ++++ ./examples/Makefile.in 2009-12-01 23:19:10.000000000 +0000 +@@ -352,7 +352,7 @@ + top_srcdir = @top_srcdir@ + SUBDIRS = rrdcached EXTRA_DIST = cgi-demo.cgi.in -examplesdir = $(pkgdatadir)/examples +examplesdir = $(datadir)/examples/rrdtool Index: files/patch-src-rrd_open.c =================================================================== RCS file: /home/renzhen/ncvs/ports/databases/rrdtool/files/patch-src-rrd_open.c,v retrieving revision 1.1 diff -u -r1.1 patch-src-rrd_open.c --- files/patch-src-rrd_open.c 30 Jun 2008 05:52:25 -0000 1.1 +++ files/patch-src-rrd_open.c 1 Dec 2009 23:23:17 -0000 @@ -1,12 +1,12 @@ ---- src/rrd_open.c.orig 2008-06-30 12:52:29.000000000 +0800 -+++ src/rrd_open.c 2008-06-30 12:53:14.000000000 +0800 -@@ -388,9 +388,6 @@ +--- ./src/rrd_open.c.orig 2009-12-01 23:21:20.000000000 +0000 ++++ ./src/rrd_open.c 2009-12-01 23:22:41.000000000 +0000 +@@ -552,9 +552,6 @@ int ret; #ifdef HAVE_MMAP -- ret = msync(rrd_file->file_start, rrd_file->file_len, MS_ASYNC); +- ret = msync(rrd_simple_file->file_start, rrd_file->file_len, MS_ASYNC); - if (ret != 0) - rrd_set_error("msync rrd_file: %s", rrd_strerror(errno)); - ret = munmap(rrd_file->file_start, rrd_file->file_len); + ret = munmap(rrd_simple_file->file_start, rrd_file->file_len); if (ret != 0) rrd_set_error("munmap rrd_file: %s", rrd_strerror(errno)); >Release-Note: >Audit-Trail: >Unformatted: