Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Nov 2009 05:08:02 GMT
From:      dikshie <dikshie@sfc.wide.ad.jp>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/140466: databases/rrdtool update to 1.4.1
Message-ID:  <200911110508.nAB582dC029405@www.freebsd.org>
Resent-Message-ID: <200911110510.nAB5A2TX096571@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         140466
>Category:       ports
>Synopsis:       databases/rrdtool update to 1.4.1
>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:   Wed Nov 11 05:10:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     dikshie
>Release:        FreeBSD-8.0RC2
>Organization:
Keio Univ
>Environment:
FreeBSD totoro.sfc.wide.ad.jp 8.0-RC2 FreeBSD 8.0-RC2 #38: Sat Nov  7 02:15:39 JST 2009     dikshie@totoro.sfc.wide.ad.jp:/usr/obj/usr/src/sys/T41-8  i386

>Description:
This is continuation from ports/139894: [PATCH] databases/rrdtool: update to 1.3.9 therefore please assign to sylvio. 

1.please do repocopy databases/rrdtool to databases/rrdtool13
2.update databases/rrdtool with attached patch.
3.could you please also check and recheck the pkg-plist since pkg-plist
  of rrdtool-1.4.1 now larger than before.  

thank you!
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2009-11-10 19:12:24.000000000 +0900
+++ Makefile	2009-11-11 02:00:13.000000000 +0900
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.3.8
+PORTVERSION=	1.4.1
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -40,8 +40,6 @@
 		DEJAVU		"Use DejaVu fonts (requires X11)" off \
 		MMAP		"Use mmap in rrd_update" on
 
-.include <bsd.port.pre.mk>
-
 .if defined(WITH_PYTHON_MODULE)
 USE_PYTHON=	yes
 INSTALLS_EGGINFO=yes
@@ -78,7 +76,7 @@
 .endif
 
 .if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || defined(WITH_DEJAVU)
-RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
@@ -117,4 +115,4 @@
 	@${ECHO_MSG} "############################################################################"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- distinfo.orig	2009-11-10 19:11:59.000000000 +0900
+++ distinfo	2009-11-10 19:13:55.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (rrdtool-1.3.8.tar.gz) = 0de79494ab969cebfbfae3d237de18fe
-SHA256 (rrdtool-1.3.8.tar.gz) = a7084e07a8c78e91ca7af211af11f777c7a040b93ce21ab1144dd00079da0f38
-SIZE (rrdtool-1.3.8.tar.gz) = 1021427
+MD5 (rrdtool-1.4.1.tar.gz) = 07dd73513e309347ab4e0300dd28c6d9
+SHA256 (rrdtool-1.4.1.tar.gz) = 14f23d9b22449d33963ae1104ddf27516ca2f16b026db882246a8b0a4b0e9823
+SIZE (rrdtool-1.4.1.tar.gz) = 1354801
--- files/patch-bindings-Makefile.in.orig	2009-11-11 13:55:32.000000000 +0900
+++ files/patch-bindings-Makefile.in	2009-11-10 20:26:11.000000000 +0900
@@ -1,24 +1,24 @@
---- ./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-11-10 19:32:32.000000000 +0900
++++ bindings/Makefile.in	2009-11-10 19:36:42.000000000 +0900
+@@ -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=$(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,7 @@
  
- # 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
++	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
--- files/patch-doc-Makefile.in.orig	2009-11-11 13:55:47.000000000 +0900
+++ files/patch-doc-Makefile.in	2009-11-11 13:39:04.000000000 +0900
@@ -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-11-11 02:07:31.000000000 +0900
++++ doc/Makefile.in	2009-11-11 02:08:18.000000000 +0900
+@@ -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)
--- files/patch-examples-Makefile.in.orig	2009-11-11 13:56:00.000000000 +0900
+++ files/patch-examples-Makefile.in	2009-11-11 13:38:53.000000000 +0900
@@ -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-11-10 19:38:42.000000000 +0900
++++ examples/Makefile.in	2009-11-10 19:39:19.000000000 +0900
+@@ -352,7 +352,7 @@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = rrdcached
  EXTRA_DIST = cgi-demo.cgi.in
 -examplesdir = $(pkgdatadir)/examples
 +examplesdir = $(datadir)/examples/rrdtool
--- files/patch-src-rrd_open.c.orig	2009-11-11 13:56:13.000000000 +0900
+++ files/patch-src-rrd_open.c	2009-11-10 20:28:04.000000000 +0900
@@ -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-11-10 19:41:52.000000000 +0900
++++ src/rrd_open.c	2009-11-10 19:42:32.000000000 +0900
+@@ -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));
--- pkg-plist.orig	2009-11-10 19:11:59.000000000 +0900
+++ pkg-plist.new	2009-11-11 13:50:00.000000000 +0900
@@ -1,24 +1,122 @@
-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
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so
-%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/librrd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdbuild.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcached.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdfirst.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdflushcached.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_data.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_examples.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_graph.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_rpn.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdlastupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdthreads.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html
+%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/librrd.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcached.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcached.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdflushcached.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdflushcached.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/4charts.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bigtops.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi-demo.cgi
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/minmax.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perftest.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/piped-demo.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shared-demo.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stripes.pl
+%%DATADIR%%/examples/rrdcached/RRDCached.pm
+%%DATADIR%%/examples/rrdcached/rrdcached-size.pl
+@dirrm %%DATADIR%%/examples/rrdcached
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911110508.nAB582dC029405>