ports/130063: databases/rrdtool update

[Dikshie]

>Number:         130063
>Category:       ports
>Synopsis:       databases/rrdtool update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 30 20:10:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Dikshie
>Release:        FreeBSD-7.1-PRERELEASE
>Organization:
Keio University
>Environment:
FreeBSD totoro.sfc.wide.ad.jp 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #5: Sun Dec 21 15:53:55 JST 2008     dikshie at totoro.sfc.wide.ad.jp:/usr/obj/usr/src/sys/T41  i386

>Description:
rrdtool update to 1.3.5 and i propose to disable mmap(); 
i found that my cacti stop working and found that rrdtool can not 
read rrd files size more than 2 GBytes, disable mmap() solve this problem. 
i also re-submitted rrdtool/files/patch*

>How-To-Repeat:

>Fix:
--- /usr/ports/databases/rrdtool/Makefile       2008-12-13 22:27:01.000000000 +0900
+++ Makefile    2008-12-31 04:41:08.000000000 +0900
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=      rrdtool
-PORTVERSION=   1.3.3
-PORTREVISION=  1
+PORTVERSION=   1.3.5
 CATEGORIES=    databases graphics
 MASTER_SITES=  http://oss.oetiker.ch/rrdtool/pub/
 
@@ -29,7 +28,7 @@
 USE_GMAKE=     yes
 WANT_PERL=     yes
 
-CONFIGURE_ARGS=        --disable-tcl
+CONFIGURE_ARGS=        --disable-tcl --disable-mmap
 
 PORTDOCS=      *
 PORTEXAMPLES=  4charts.pl bigtops.pl cgi-demo.cgi minmax.pl piped-demo.pl \

--- distinfo.orig       2008-12-29 21:20:22.000000000 +0900
+++ distinfo    2008-12-31 04:40:10.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (rrdtool-1.3.3.tar.gz) = 42e7a5b7d5eeaa63959b75822f9f1e2c
-SHA256 (rrdtool-1.3.3.tar.gz) = f21a5dc4db3d6884588d25d88a940a70991f9562ddaff8e117ab0c86ed038d2c
-SIZE (rrdtool-1.3.3.tar.gz) = 1064805
+MD5 (rrdtool-1.3.5.tar.gz) = 3f14381e64c2037f40af16380be9e9f3
+SHA256 (rrdtool-1.3.5.tar.gz) = f4792427fc8f342a36acc5948cad3b4bbd6e018be9675cfb441bc0de5929a3f2
+SIZE (rrdtool-1.3.5.tar.gz) = 1075738



--- Makefile.in.orig    2008-12-29 21:38:21.000000000 +0900
+++ Makefile.in 2008-12-29 21:42:00.000000000 +0900
@@ -604,9 +604,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
 
 # rules for buildung the ruby module
@@ -617,7 +617,7 @@
 
 # rules for buildung 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

--- Makefile.in.orig    2008-12-16 07:06:35.000000000 +0900
+++ Makefile.in 2008-12-29 21:44:40.000000000 +0900
@@ -304,9 +304,9 @@
 
 # what should go into the distribution
 EXTRA_DIST = $(POD) $(HTML) $(MAN) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd
-idocdir = $(RRDDOCDIR)/txt
+idocdir = $(datadir)/doc/rrdtool/txt
 idoc_DATA = $(POD) $(TXT)
-ihtmldir = $(RRDDOCDIR)/html
+ihtmldir = $(datadir)/doc/rrdtool/html
 ihtml_DATA = $(HTML)
 imandir = $(mandir)/man1
 iman_DATA = $(MAN)

--- Makefile.in.orig    2008-12-29 21:45:01.000000000 +0900
+++ Makefile.in 2008-12-29 21:45:39.000000000 +0900
@@ -284,7 +284,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 EXTRA_DIST = cgi-demo.cgi.in
-examplesdir = $(pkgdatadir)/examples
+examplesdir = $(datadir)/examples/rrdtool
 examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
        stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl


--- Makefile.in.orig    2008-12-29 21:45:01.000000000 +0900
+++ Makefile.in 2008-12-29 21:45:39.000000000 +0900
@@ -284,7 +284,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 EXTRA_DIST = cgi-demo.cgi.in
-examplesdir = $(pkgdatadir)/examples
+examplesdir = $(datadir)/examples/rrdtool
 examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
        stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl
 

--- rrd_open.c.orig     2008-12-29 21:46:02.000000000 +0900
+++ rrd_open.c  2008-12-29 21:47:50.000000000 +0900
@@ -466,9 +466,6 @@
     int       ret;
 
 #ifdef HAVE_MMAP
-    ret = msync(rrd_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);
     if (ret != 0)
         rrd_set_error("munmap rrd_file: %s", rrd_strerror(errno));




>Release-Note:
>Audit-Trail:
>Unformatted: