svn commit: r407355 - in head/databases/rrdtool: . files
Niclas Zeising
zeising at FreeBSD.org
Wed Jan 27 11:48:12 UTC 2016
Author: zeising
Date: Wed Jan 27 11:48:09 2016
New Revision: 407355
URL: https://svnweb.freebsd.org/changeset/ports/407355
Log:
Update to 1.5.5
Rework the DEJAVU option to actually work. [1]
Before this commit rrdtool
depends on x11-fonts/dejavu if that port is already installed, but not
otherwise, and this sort of implicit dependencies are bad.
Make the DEJAVU option default to on. If cairo and pango are built without
X11 support, please consider disabling this option to avoid pulling in large
parts of X11
Remove the JSON option. This is a third party patch that doesn't apply any
more. Feel free to port it to this version of RRDTool.
Discussed with: marino [1]
PR: 205883 [1]
Submitted by: marino [1]
Added:
head/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in (contents, props changed)
Deleted:
head/databases/rrdtool/files/patch-bindings_perl-shared_Makefile.PL
head/databases/rrdtool/files/patch-src-rrd_open.c
head/databases/rrdtool/files/patch-src__rrd_graph.c
head/databases/rrdtool/files/patch-src__rrdupdate.c
head/databases/rrdtool/files/thirdparty-json.diff
Modified:
head/databases/rrdtool/Makefile
head/databases/rrdtool/distinfo
head/databases/rrdtool/files/patch-bindings-Makefile.in
head/databases/rrdtool/files/patch-configure
head/databases/rrdtool/files/patch-doc-Makefile.in
head/databases/rrdtool/files/patch-examples-Makefile.in
head/databases/rrdtool/pkg-plist
Modified: head/databases/rrdtool/Makefile
==============================================================================
--- head/databases/rrdtool/Makefile Wed Jan 27 11:18:29 2016 (r407354)
+++ head/databases/rrdtool/Makefile Wed Jan 27 11:48:09 2016 (r407355)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= rrdtool
-PORTVERSION= 1.4.8
-PORTREVISION= 9
+PORTVERSION= 1.5.5
CATEGORIES= databases graphics
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
@@ -27,12 +26,11 @@ CONFIGURE_ARGS= --disable-tcl --disable-
PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \
piped-demo.pl shared-demo.pl stripes.pl
-OPTIONS_DEFINE= DEJAVU GRAPH JSON MMAP NLS PERL_MODULE PYTHON_MODULE \
+OPTIONS_DEFINE= DEJAVU GRAPH MMAP NLS PERL_MODULE PYTHON_MODULE \
RUBY_MODULE EXAMPLES DOCS
-OPTIONS_DEFAULT= GRAPH MMAP PERL_MODULE
+OPTIONS_DEFAULT= DEJAVU GRAPH MMAP PERL_MODULE
GRAPH_DESC= Enable the rrdtool graph command (needs cairo)
DEJAVU_DESC= Use DejaVu fonts (requires X11)
-JSON_DESC= Support of json export
MMAP_DESC= Use mmap in rrd_update
PERL_MODULE_DESC= Build PERL module
PYTHON_MODULE_DESC= Build PYTHON bindings
@@ -73,10 +71,6 @@ PLIST_SUB+= WITH_PERL="@comment "
CONFIGURE_ARGS+= --disable-mmap
.endif
-.if ${PORT_OPTIONS:MJSON}
-EXTRA_PATCHES+= ${FILESDIR}/thirdparty-json.diff
-.endif
-
.if ${PORT_OPTIONS:MGRAPH}
LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 \
libpng.so:${PORTSDIR}/graphics/png
@@ -94,7 +88,7 @@ USE_GNOME+= intltool
CONFIGURE_ARGS+=--disable-nls
.endif
-.if exists(${LOCALBASE}/share/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU}
+.if ${PORT_OPTIONS:MDEJAVU}
RUN_DEPENDS+= dejavu>0:${PORTSDIR}/x11-fonts/dejavu
.endif
@@ -122,8 +116,5 @@ post-install:
@${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code #"
@${ECHO_MSG} "############################################################################"
.endif
-.if ${PORT_OPTIONS:MPERL_MODULE}
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/RRDs/RRDs.so
-.endif
.include <bsd.port.mk>
Modified: head/databases/rrdtool/distinfo
==============================================================================
--- head/databases/rrdtool/distinfo Wed Jan 27 11:18:29 2016 (r407354)
+++ head/databases/rrdtool/distinfo Wed Jan 27 11:48:09 2016 (r407355)
@@ -1,2 +1,2 @@
-SHA256 (rrdtool-1.4.8.tar.gz) = de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6
-SIZE (rrdtool-1.4.8.tar.gz) = 1379482
+SHA256 (rrdtool-1.5.5.tar.gz) = 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6
+SIZE (rrdtool-1.5.5.tar.gz) = 2187685
Modified: head/databases/rrdtool/files/patch-bindings-Makefile.in
==============================================================================
--- head/databases/rrdtool/files/patch-bindings-Makefile.in Wed Jan 27 11:18:29 2016 (r407354)
+++ head/databases/rrdtool/files/patch-bindings-Makefile.in Wed Jan 27 11:48:09 2016 (r407355)
@@ -1,24 +1,21 @@
---- 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@
-
+--- bindings/Makefile.in.orig 2016-01-27 10:49:53 UTC
++++ bindings/Makefile.in
+@@ -711,15 +711,15 @@ all-local: @COMP_PERL@ @COMP_RUBY@ @COM
install-data-local:
-- $(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 building the ruby module
-@@ -709,7 +709,7 @@
-
- # rules for building the pyton module
- 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
+ $(AM_V_GEN)test -f ${builddir}/perl-piped/Makefile \
+ && ( cd ${builddir}/perl-piped \
+- && $(MAKE) install ) \
++ && $(MAKE) pure-install ) \
+ || true
+ $(AM_V_GEN)test -f ${builddir}/perl-shared/Makefile \
+ && ( cd ${builddir}/perl-shared \
+- && $(MAKE) install ) \
++ && $(MAKE) pure-install ) \
+ || true
+ $(AM_V_GEN)test -f ${builddir}/ruby/Makefile \
+ && ( cd ${builddir}/ruby \
+- && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install ) \
++ && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) pure-install ) \
+ || true
+ $(AM_V_GEN)test -d ${builddir}/python/build \
+ && ( cd ${builddir}/python \
Modified: head/databases/rrdtool/files/patch-configure
==============================================================================
--- head/databases/rrdtool/files/patch-configure Wed Jan 27 11:18:29 2016 (r407354)
+++ head/databases/rrdtool/files/patch-configure Wed Jan 27 11:48:09 2016 (r407355)
@@ -1,6 +1,6 @@
---- configure.orig 2013-05-23 09:55:19.000000000 +0200
-+++ configure 2014-07-15 19:59:43.000000000 +0200
-@@ -12846,7 +12846,7 @@
+--- configure.orig 2015-11-10 16:59:23 UTC
++++ configure
+@@ -13172,7 +13172,7 @@ fi
if test "x$GCC" = "xyes"; then
Modified: head/databases/rrdtool/files/patch-doc-Makefile.in
==============================================================================
--- head/databases/rrdtool/files/patch-doc-Makefile.in Wed Jan 27 11:18:29 2016 (r407354)
+++ head/databases/rrdtool/files/patch-doc-Makefile.in Wed Jan 27 11:48:09 2016 (r407355)
@@ -1,9 +1,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 @@
+--- doc/Makefile.in.orig 2016-01-27 10:49:53 UTC
++++ doc/Makefile.in
+@@ -377,9 +377,9 @@ CLEANFILES = $(GENERATED_EXTRADIST) pod2
# 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
+ EXTRA_DIST = $(GENERATED_EXTRADIST) $(POD) $(POD3) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod
-idocdir = $(RRDDOCDIR)/txt
+idocdir = $(datadir)/doc/rrdtool/txt
idoc_DATA = $(POD) $(TXT)
Modified: head/databases/rrdtool/files/patch-examples-Makefile.in
==============================================================================
--- head/databases/rrdtool/files/patch-examples-Makefile.in Wed Jan 27 11:18:29 2016 (r407354)
+++ head/databases/rrdtool/files/patch-examples-Makefile.in Wed Jan 27 11:48:09 2016 (r407355)
@@ -1,11 +1,11 @@
---- 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 @@
+--- examples/Makefile.in.orig 2016-01-27 10:49:53 UTC
++++ examples/Makefile.in
+@@ -420,7 +420,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = rrdcached
- EXTRA_DIST = cgi-demo.cgi.in
+ EXTRA_DIST = cgi-demo.cgi.in stripes.py
-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
-
+ stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl \
+ stripes.py
Added: head/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in Wed Jan 27 11:48:09 2016 (r407355)
@@ -0,0 +1,11 @@
+--- examples/rrdcached/Makefile.in.orig 2016-01-27 10:49:53 UTC
++++ examples/rrdcached/Makefile.in
+@@ -356,7 +356,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-examplesdir = $(pkgdatadir)/examples/rrdcached
++examplesdir = $(datadir)/examples/rrdtool/rrdcached
+ examples_SCRIPTS = rrdcached-size.pl
+ examples_DATA = RRDCached.pm
+ EXTRA_DIST = $(examples_DATA) $(examples_SCRIPTS)
Modified: head/databases/rrdtool/pkg-plist
==============================================================================
--- head/databases/rrdtool/pkg-plist Wed Jan 27 11:18:29 2016 (r407354)
+++ head/databases/rrdtool/pkg-plist Wed Jan 27 11:48:09 2016 (r407355)
@@ -10,11 +10,11 @@ include/rrd_format.h
lib/librrd.a
lib/librrd.so
lib/librrd.so.4
-lib/librrd.so.4.2.1
+lib/librrd.so.4.3.5
lib/librrd_th.a
lib/librrd_th.so
lib/librrd_th.so.4
-lib/librrd_th.so.4.2.1
+lib/librrd_th.so.4.3.5
libdata/pkgconfig/librrd.pc
%%PORTDOCS%%man/man1/bin_dec_hex.1.gz
%%PORTDOCS%%man/man1/cdeftutorial.1.gz
@@ -45,16 +45,11 @@ libdata/pkgconfig/librrd.pc
%%PORTDOCS%%man/man1/rrdupdate.1.gz
%%PORTDOCS%%man/man1/rrdxport.1.gz
%%PORTDOCS%%man/man3/librrd.3.gz
-%%WITH_PERL%%%%PERL5_MAN3%%/RRDp.3.gz
-%%WITH_PERL%%%%PERL5_MAN3%%/RRDs.3.gz
-%%WITH_PERL%%%%SITE_ARCH%%/auto/RRDs/RRDs.so
-%%WITH_PERL%%%%SITE_ARCH%%/RRDs.pm
-%%WITH_PERL%%%%SITE_PERL%%/RRDp.pm
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool.so
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/py_rrdtool-0.2.2-py%%PYTHON_VER%%.egg-info
-%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
-%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/RRDCached.pm
-%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/rrdcached-size.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rrdcached/RRDCached.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rrdcached/rrdcached-size.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stripes.py
%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
More information about the svn-ports-head
mailing list