Index: head/databases/rrdtool/Makefile =================================================================== --- head/databases/rrdtool/Makefile (revision 450261) +++ head/databases/rrdtool/Makefile (revision 450262) @@ -1,92 +1,109 @@ # Created by: Dmitry Sivachenko # $FreeBSD$ PORTNAME= rrdtool -PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTVERSION= 1.7.0 CATEGORIES= databases graphics MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/ MAINTAINER= zeising@FreeBSD.org COMMENT= Round Robin Database Tools LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS= rrdtool12-* CONFIGURE_ARGS= --disable-tcl CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 USE_RC_SUBR= rrdcached USE_LDCONFIG= yes GNU_CONFIGURE= yes USES= gmake groff libtool pathfix pkgconfig shebangfix -SHEBANG_FILES= examples/rrdcached/rrdcached-size.pl USE_GNOME= glib20 libxml2 INSTALL_TARGET= install-strip -PORTEXAMPLES= 4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \ - piped-demo.pl shared-demo.pl stripes.pl +PORTEXAMPLES= cgi-demo.cgi OPTIONS_DEFINE= DEJAVU GRAPH MMAP NLS PERL PYTHON \ RUBY EXAMPLES DOCS OPTIONS_DEFAULT=DEJAVU GRAPH MMAP PERL OPTIONS_SUB= yes GRAPH_DESC= Enable the rrdtool graph command (needs cairo) DEJAVU_DESC= Use DejaVu fonts (requires X11) MMAP_DESC= Use mmap in rrd_update PERL_DESC= Build PERL module PYTHON_DESC= Build PYTHON bindings RUBY_DESC= Build RUBY bindings DEJAVU_RUN_DEPENDS= dejavu>0:x11-fonts/dejavu GRAPH_CONFIGURE_OFF= --disable-rrdcgi --disable-rrd_graph GRAPH_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libpng.so:graphics/png GRAPH_USE= GNOME=cairo,pango GRAPH_USES= gnome MMAP_CONFIGURE_ENABLE= mmap NLS_CONFIGURE_ENABLE= nls NLS_USE= GNOME=intltool NLS_USES= gettext PERL_CONFIGURE_OFF= --disable-perl PERL_CONFIGURE_ON= --enable-perl --enable-perl-site-install PERL_USES= perl5 PYTHON_CONFIGURE_ENABLE=python PYTHON_USES= python RUBY_CONFIGURE_ENABLE= ruby RUBY_USE= RUBY=yes +.include + +.if ${PORT_OPTIONS:MPERL} +SHEBANG_FILES= examples/rrdcached/rrdcached-size.pl +PORTEXAMPLES+= 4charts.pl bigtops.pl minmax.pl perftest.pl \ + piped-demo.pl shared-demo.pl stripes.pl \ + rrdcached/RRDCached.pm rrdcached/rrdcached-size.pl +.endif +.if ${PORT_OPTIONS:MPYTHON} +SHEBANG_FILES+= examples/stripes.py +PORTEXAMPLES+= stripes.py +.endif + post-extract: @${REINPLACE_CMD} -E 's|(^rrdcached_LDADD = librrd_th.la)|\1 $$\(ALL_LIBS\)|' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -E 's|(^rrdtool_LDADD = librrd.la)|\1 $$\(ALL_LIBS\)|' \ ${WRKSRC}/src/Makefile.in post-extract-DOCS-off: @${REINPLACE_CMD} -e '/^SUBDIRS = /s| doc | |' \ ${WRKSRC}/Makefile.in post-extract-EXAMPLES-off: @${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \ ${WRKSRC}/Makefile.in post-install-EXAMPLES-on: .if !defined(BATCH) @${ECHO_MSG} "" @${ECHO_MSG} "############################################################################" @${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code #" @${ECHO_MSG} "############################################################################" .endif post-install-PERL-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/RRDs/RRDs.so +post-install-PERL-off: + ${RM} ${STAGEDIR}${EXAMPLESDIR}/*.pl + ${RM} -r ${STAGEDIR}${EXAMPLESDIR}/rrdcached + post-install-PYTHON-on: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/rrdtool.so + +post-install-PYTHON-off: + ${RM} ${STAGEDIR}${EXAMPLESDIR}/stripes.py post-install-RUBY-on: ${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/RRD.so .include Index: head/databases/rrdtool/distinfo =================================================================== --- head/databases/rrdtool/distinfo (revision 450261) +++ head/databases/rrdtool/distinfo (revision 450262) @@ -1,2 +1,3 @@ -SHA256 (rrdtool-1.6.0.tar.gz) = cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 -SIZE (rrdtool-1.6.0.tar.gz) = 2186538 +TIMESTAMP = 1497920098 +SHA256 (rrdtool-1.7.0.tar.gz) = f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b +SIZE (rrdtool-1.7.0.tar.gz) = 2849994 Index: head/databases/rrdtool/files/patch-bindings_python_setup.py =================================================================== --- head/databases/rrdtool/files/patch-bindings_python_setup.py (revision 450261) +++ head/databases/rrdtool/files/patch-bindings_python_setup.py (revision 450262) @@ -1,16 +1,14 @@ ---- bindings/python/setup.py.orig 2015-11-10 15:07:11 UTC +--- bindings/python/setup.py.orig 2017-03-10 18:03:11 UTC +++ bindings/python/setup.py -@@ -28,12 +28,7 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # +@@ -1,10 +1,7 @@ + #!/usr/bin/env python + import os -try: -- # Attempt to build using Distribute, which also supports bdist_wheel -- from setuptools import setup -- from setuptools.extension import Extension +- from setuptools import setup, Extension -except ImportError: -- from distutils.core import setup, Extension +- sys.exit('The setup requires setuptools.') +from distutils.core import setup, Extension - import sys, os TOP_SRCDIR = os.environ.get('ABS_TOP_SRCDIR', '../..') + TOP_BUILDDIR = os.environ.get('ABS_TOP_BUILDDIR', '../..') Index: head/databases/rrdtool/files/patch-configure =================================================================== --- head/databases/rrdtool/files/patch-configure (revision 450261) +++ head/databases/rrdtool/files/patch-configure (revision 450262) @@ -1,11 +1,42 @@ ---- configure.orig 2015-11-10 16:59:23 UTC +--- configure.orig 2017-05-16 11:55:23 UTC +++ configure -@@ -13172,7 +13172,7 @@ fi +@@ -13698,7 +13698,7 @@ fi if test "x$GCC" = "xyes"; then - for flag in -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition -W; do + for flag in -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition; do oCFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" cachename=rd_cv_gcc_flag_`echo $flag|sed 's/[^A-Za-z]/_/g'` +@@ -22422,9 +22422,9 @@ $as_echo "$am_cv_python_pyexecdir" >&6; } + $as_echo_n "checking for headers required to compile python extensions... " >&6; } + py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"` + py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" ++PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION} -I${py_prefix}/include/python${PYTHON_VERSION}m" + if test "$py_prefix" != "$py_exec_prefix"; then +- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" ++ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION} -I${py_exec_prefix}/include/python${PYTHON_VERSION}m" + fi + + save_CPPFLAGS="$CPPFLAGS" +@@ -27780,18 +27780,6 @@ $as_echo_n "checking in... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: and out again" >&5 + $as_echo "and out again" >&6; } + +-echo $ECHO_N "ordering CD from http://tobi.oetiker.ch/wish $ECHO_C" 1>&6 +-sleep 1 +-echo $ECHO_N ".$ECHO_C" 1>&6 +-sleep 1 +-echo $ECHO_N ".$ECHO_C" 1>&6 +-sleep 1 +-echo $ECHO_N ".$ECHO_C" 1>&6 +-sleep 1 +-echo $ECHO_N ".$ECHO_C" 1>&6 +-sleep 1 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: just kidding ;-)" >&5 +-$as_echo " just kidding ;-)" >&6; } + echo + echo "----------------------------------------------------------------" + echo "Config is DONE!" Index: head/databases/rrdtool/pkg-plist =================================================================== --- head/databases/rrdtool/pkg-plist (revision 450261) +++ head/databases/rrdtool/pkg-plist (revision 450262) @@ -1,143 +1,145 @@ bin/rrdcached %%GRAPH%%bin/rrdcgi bin/rrdcreate bin/rrdinfo bin/rrdtool bin/rrdupdate include/rrd.h include/rrd_client.h include/rrd_format.h lib/librrd.a lib/librrd.so lib/librrd.so.8 -lib/librrd.so.8.0.0 +lib/librrd.so.8.1.0 +%%PERL%%%%SITE_PERL%%/RRDp.pm +%%PERL%%%%SITE_ARCH%%/RRDs.pm +%%PERL%%%%SITE_ARCH%%/auto/RRDs/RRDs.so +%%PERL%%%%PERL5_MAN3%%/RRDp.3.gz +%%PERL%%%%PERL5_MAN3%%/RRDs.3.gz +%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info +%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool.so +%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so libdata/pkgconfig/librrd.pc %%PORTDOCS%%man/man1/bin_dec_hex.1.gz %%PORTDOCS%%man/man1/cdeftutorial.1.gz %%PORTDOCS%%man/man1/rpntutorial.1.gz %%PORTDOCS%%man/man1/rrd-beginners.1.gz %%PORTDOCS%%man/man1/rrdbuild.1.gz %%PORTDOCS%%man/man1/rrdcached.1.gz %%PORTDOCS%%man/man1/rrdcgi.1.gz %%PORTDOCS%%man/man1/rrdcreate.1.gz %%PORTDOCS%%man/man1/rrddump.1.gz %%PORTDOCS%%man/man1/rrdfetch.1.gz %%PORTDOCS%%man/man1/rrdfirst.1.gz %%PORTDOCS%%man/man1/rrdflushcached.1.gz %%PORTDOCS%%man/man1/rrdgraph.1.gz %%PORTDOCS%%man/man1/rrdgraph_data.1.gz %%PORTDOCS%%man/man1/rrdgraph_examples.1.gz %%PORTDOCS%%man/man1/rrdgraph_graph.1.gz %%PORTDOCS%%man/man1/rrdgraph_rpn.1.gz %%PORTDOCS%%man/man1/rrdinfo.1.gz %%PORTDOCS%%man/man1/rrdlast.1.gz %%PORTDOCS%%man/man1/rrdlastupdate.1.gz +%%PORTDOCS%%man/man1/rrdlist.1.gz %%PORTDOCS%%man/man1/rrdresize.1.gz %%PORTDOCS%%man/man1/rrdrestore.1.gz %%PORTDOCS%%man/man1/rrdthreads.1.gz %%PORTDOCS%%man/man1/rrdtool.1.gz %%PORTDOCS%%man/man1/rrdtune.1.gz %%PORTDOCS%%man/man1/rrdtutorial.1.gz %%PORTDOCS%%man/man1/rrdupdate.1.gz %%PORTDOCS%%man/man1/rrdxport.1.gz %%PORTDOCS%%man/man3/librrd.3.gz -%%PERL%%%%PERL5_MAN3%%/RRDp.3.gz -%%PERL%%%%PERL5_MAN3%%/RRDs.3.gz -%%PERL%%%%SITE_ARCH%%/auto/RRDs/RRDs.so -%%PERL%%%%SITE_ARCH%%/RRDs.pm -%%PERL%%%%SITE_PERL%%/RRDp.pm -%%PYTHON%%%%PYTHON_SITELIBDIR%%/py_rrdtool-0.2.2-py%%PYTHON_VER%%.egg-info -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool.so -%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so -%%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 %%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/rrdlist.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/rrdlist.pod +%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlist.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 +share/locale/hu/LC_MESSAGES/rrdtool.mo