Update to 1.7.0

Fix packaging with pyton support.
While here, remove the annoying sleeps at the end of the configure script.

PR:		221768
Submitted by:	Daniel Ylitalo <daniel AT blodan DOT se>
Committed at:	FreeBSD 201709 DevSummit

5 files changed, 79 insertions, 30 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index d2ccbbc99386..d841671cc872 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rrdtool
-PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTVERSION=	1.7.0
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -21,12 +20,10 @@ 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
@@ -57,6 +54,19 @@ PYTHON_USES=		python
 RUBY_CONFIGURE_ENABLE=	ruby
 RUBY_USE=		RUBY=yes
 
+.include <bsd.port.options.mk>
+
+.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
@@ -83,9 +93,16 @@ post-install-EXAMPLES-on:
 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
 
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 17cccb2d831b..f59591a93f48 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -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
diff --git a/databases/rrdtool/files/patch-bindings_python_setup.py b/databases/rrdtool/files/patch-bindings_python_setup.py
index 2d882683a64e..86b777c0429b 100644
--- a/databases/rrdtool/files/patch-bindings_python_setup.py
+++ b/databases/rrdtool/files/patch-bindings_python_setup.py
@@ -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', '../..')
diff --git a/databases/rrdtool/files/patch-configure b/databases/rrdtool/files/patch-configure
index b8c70e3432c4..32328d990c0b 100644
--- a/databases/rrdtool/files/patch-configure
+++ b/databases/rrdtool/files/patch-configure
@@ -1,6 +1,6 @@
---- 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
@@ -9,3 +9,34 @@
      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!"
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 3e0d50ea4320..228f03900b2c 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -10,7 +10,15 @@ 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
@@ -32,6 +40,7 @@ libdata/pkgconfig/librrd.pc
 %%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
@@ -41,17 +50,6 @@ libdata/pkgconfig/librrd.pc
 %%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
@@ -76,6 +74,7 @@ libdata/pkgconfig/librrd.pc
 %%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
@@ -125,6 +124,8 @@ libdata/pkgconfig/librrd.pc
 %%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
@@ -141,3 +142,4 @@ libdata/pkgconfig/librrd.pc
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.txt
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt
+share/locale/hu/LC_MESSAGES/rrdtool.mo