ports/146052: [PATCH] databases/rrdtool: update to 1.4.3
Sunpoet Po-Chuan Hsieh
sunpoet at sunpoet.net
Mon Apr 26 02:50:04 UTC 2010
>Number: 146052
>Category: ports
>Synopsis: [PATCH] databases/rrdtool: update to 1.4.3
>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: Mon Apr 26 02:50:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.0-STABLE FreeBSD 8.0-STABLE #0: Fri Mar 19 09:16:38 CST 2010
>Description:
- Update to 1.4.3
- Include PR/144850
- Sort pkg-plist and add missing entry
- Sort MAN1, OPTIONS and PORTEXAMPLES
Port maintainer (sylvio at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- rrdtool-1.4.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/rrdtool/Makefile /usr/ports/sunpoet/rrdtool/Makefile
--- /usr/ports/databases/rrdtool/Makefile 2010-04-26 10:35:32.000000000 +0800
+++ /usr/ports/sunpoet/rrdtool/Makefile 2010-04-26 10:46:27.000000000 +0800
@@ -6,8 +6,7 @@
#
PORTNAME= rrdtool
-PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTVERSION= 1.4.3
CATEGORIES= databases graphics
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
@@ -32,14 +31,14 @@
CONFIGURE_ARGS= --disable-tcl
PORTDOCS= *
-PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl piped-demo.pl \
- perftest.pl shared-demo.pl stripes.pl
+PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \
+ piped-demo.pl shared-demo.pl stripes.pl
-OPTIONS= PYTHON_MODULE "Build PYTHON bindings" off \
- RUBY_MODULE "Build RUBY bindings" off \
+OPTIONS= DEJAVU "Use DejaVu fonts (requires X11)" off \
+ MMAP "Use mmap in rrd_update" on \
PERL_MODULE "Build PERL module" on \
- DEJAVU "Use DejaVu fonts (requires X11)" off \
- MMAP "Use mmap in rrd_update" on
+ PYTHON_MODULE "Build PYTHON bindings" off \
+ RUBY_MODULE "Build RUBY bindings" off
.include <bsd.port.options.mk>
@@ -88,11 +87,12 @@
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
- rrdbuild.1 rrdcached.1 rrdcgi.1 rrdcreate.1 rrddump.1 rrdfetch.1 rrdfirst.1 rrdflushcached.1 \
- rrdgraph.1 rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \
- rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
- rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \
- rrdxport.1 rrdlastupdate.1
+ rrdbuild.1 rrdcached.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
+ rrdfetch.1 rrdfirst.1 rrdflushcached.1 rrdgraph.1 \
+ rrdgraph_data.1 rrdgraph_examples.1 rrdgraph_graph.1 \
+ rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdlastupdate.1 \
+ rrdresize.1 rrdrestore.1 rrdthreads.1 rrdtool.1 rrdtune.1 \
+ rrdtutorial.1 rrdupdate.1 rrdxport.1
.if !defined(WITHOUT_PERL_MODULE)
MAN3= RRDp.3 RRDs.3
@@ -113,10 +113,10 @@
.endif
post-install:
-.if !defined(BATCH)
+.if !defined(BATCH) && !defined(NOPORTEXAMPLES)
@${ECHO_MSG} ""
@${ECHO_MSG} "############################################################################"
- @${ECHO_MSG} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code #"
+ @${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code #"
@${ECHO_MSG} "############################################################################"
.endif
diff -ruN --exclude=CVS /usr/ports/databases/rrdtool/distinfo /usr/ports/sunpoet/rrdtool/distinfo
--- /usr/ports/databases/rrdtool/distinfo 2010-02-13 13:26:27.000000000 +0800
+++ /usr/ports/sunpoet/rrdtool/distinfo 2010-04-26 03:37:02.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (rrdtool-1.4.2.tar.gz) = 9318d3b4016dd9dd9897f1eac7548032
-SHA256 (rrdtool-1.4.2.tar.gz) = e55ebe13b16515a275185229a93ee1fc266010a9e3c6b05b229a1530695311cb
-SIZE (rrdtool-1.4.2.tar.gz) = 1355269
+MD5 (rrdtool-1.4.3.tar.gz) = 492cf946c72f85987238faa2c311b7bb
+SHA256 (rrdtool-1.4.3.tar.gz) = 1aecfba0cb255aef6ae27534825022b83996abec0b7b94576e3b9d061ddf6d73
+SIZE (rrdtool-1.4.3.tar.gz) = 1381821
diff -ruN --exclude=CVS /usr/ports/databases/rrdtool/files/patch-bindings-Makefile.in /usr/ports/sunpoet/rrdtool/files/patch-bindings-Makefile.in
--- /usr/ports/databases/rrdtool/files/patch-bindings-Makefile.in 2010-02-13 13:26:27.000000000 +0800
+++ /usr/ports/sunpoet/rrdtool/files/patch-bindings-Makefile.in 2010-04-26 03:43:56.000000000 +0800
@@ -1,6 +1,6 @@
---- ./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 @@
+--- bindings/Makefile.in.orig 2010-03-23 01:30:03.000000000 +0800
++++ bindings/Makefile.in 2010-04-26 03:43:31.000000000 +0800
+@@ -696,9 +696,9 @@
all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@
install-data-local:
@@ -13,13 +13,12 @@
$(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 building the ruby module
-@@ -692,7 +692,8 @@
+@@ -709,7 +709,7 @@
# rules for building the pyton module
- python:
+ python: Makefile
- 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
diff -ruN --exclude=CVS /usr/ports/databases/rrdtool/files/patch-doc-Makefile.in /usr/ports/sunpoet/rrdtool/files/patch-doc-Makefile.in
--- /usr/ports/databases/rrdtool/files/patch-doc-Makefile.in 2010-02-13 13:26:27.000000000 +0800
+++ /usr/ports/sunpoet/rrdtool/files/patch-doc-Makefile.in 2010-04-26 03:45:28.000000000 +0800
@@ -1,6 +1,6 @@
---- ./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 @@
+--- doc/Makefile.in.orig 2010-04-26 03:40:16.000000000 +0800
++++ doc/Makefile.in 2010-04-26 03:44:14.000000000 +0800
+@@ -344,9 +344,9 @@
# what should go into the distribution
EXTRA_DIST = $(POD) $(POD3) $(HTML) $(MAN) $(MAN3) $(TXT) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod
diff -ruN --exclude=CVS /usr/ports/databases/rrdtool/files/patch-examples-Makefile.in /usr/ports/sunpoet/rrdtool/files/patch-examples-Makefile.in
--- /usr/ports/databases/rrdtool/files/patch-examples-Makefile.in 2010-02-13 13:26:27.000000000 +0800
+++ /usr/ports/sunpoet/rrdtool/files/patch-examples-Makefile.in 2010-04-26 03:46:03.000000000 +0800
@@ -1,6 +1,6 @@
---- ./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 @@
+--- examples/Makefile.in.orig 2010-03-23 01:30:04.000000000 +0800
++++ examples/Makefile.in 2010-04-26 03:45:47.000000000 +0800
+@@ -369,7 +369,7 @@
top_srcdir = @top_srcdir@
SUBDIRS = rrdcached
EXTRA_DIST = cgi-demo.cgi.in
diff -ruN --exclude=CVS /usr/ports/databases/rrdtool/files/patch-src-rrd_open.c /usr/ports/sunpoet/rrdtool/files/patch-src-rrd_open.c
--- /usr/ports/databases/rrdtool/files/patch-src-rrd_open.c 2010-02-13 13:26:27.000000000 +0800
+++ /usr/ports/sunpoet/rrdtool/files/patch-src-rrd_open.c 2010-04-26 03:46:34.000000000 +0800
@@ -1,6 +1,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 @@
+--- src/rrd_open.c.orig 2010-03-23 00:05:55.000000000 +0800
++++ src/rrd_open.c 2010-04-26 03:46:23.000000000 +0800
+@@ -555,9 +555,6 @@
int ret;
#ifdef HAVE_MMAP
diff -ruN --exclude=CVS /usr/ports/databases/rrdtool/pkg-plist /usr/ports/sunpoet/rrdtool/pkg-plist
--- /usr/ports/databases/rrdtool/pkg-plist 2010-03-08 13:21:16.000000000 +0800
+++ /usr/ports/sunpoet/rrdtool/pkg-plist 2010-04-26 10:23:10.000000000 +0800
@@ -14,18 +14,19 @@
lib/librrd_th.so
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_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
+%%WITH_PERL%%%%SITE_PERL%%/RRDp.pm
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/py_rrdtool-0.2.1-py2.6.egg-info
%%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
%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/RRDCached.pm
%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/rrdcached-size.pl
- at dirrm share/rrdtool/examples/rrdcached
- at dirrm share/rrdtool/examples
- at dirrm share/rrdtool
+%%PORTEXAMPLES%%@dirrm share/rrdtool/examples/rrdcached
+%%PORTEXAMPLES%%@dirrm share/rrdtool/examples
+%%PORTEXAMPLES%%@dirrm share/rrdtool
--- rrdtool-1.4.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list