git: 64bcfa1862df - main - databases/rrdtool: Fix build with PYTHON option on
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 04 Jan 2023 20:36:16 UTC
The branch main has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=64bcfa1862df7eb01a7ac7cbc6a841b7b038cdc5
commit 64bcfa1862df7eb01a7ac7cbc6a841b7b038cdc5
Author: Tatsuki Makino <tatsuki_makino@hotmail.com>
AuthorDate: 2023-01-04 20:28:58 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-01-04 20:35:48 +0000
databases/rrdtool: Fix build with PYTHON option on
- Add py-setuptools build dependency to PYTHON option (Build PYTHON bindings)
to fix build when this option is used
- Add harfbuzz lib depends to GRAPH option (Enable the rrdtool graph command)
- Use configure helper for EXAMPLES option
- Define LICENSE_FILE
PR: 265203
Reported by: Sigi <freebsd-bt@beatsnet.com>
MFH: 2023Q1 (build fixes)
---
databases/rrdtool/Makefile | 17 ++--
databases/rrdtool/files/patch-bindings_Makefile.in | 16 +++
.../rrdtool/files/patch-bindings_python_setup.py | 14 ---
databases/rrdtool/files/patch-configure | 16 +--
databases/rrdtool/files/patch-doc-Makefile.in | 14 ---
...ples-Makefile.in => patch-examples_Makefile.in} | 4 +-
.../files/patch-examples_rrdcached_Makefile.in | 4 +-
databases/rrdtool/pkg-plist | 109 +--------------------
8 files changed, 35 insertions(+), 159 deletions(-)
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 2958f1e4e24a..82ca0bfe76b8 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,6 +1,6 @@
PORTNAME= rrdtool
DISTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases graphics
MASTER_SITES= https://github.com/oetiker/rrdtool-1.x/releases/download/v${DISTVERSION}/
@@ -9,6 +9,7 @@ COMMENT= Round Robin Database Tools
WWW= https://oss.oetiker.ch/rrdtool/
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cpe gmake gnome libtool pathfix pkgconfig shebangfix
CPE_VENDOR= rrdtool_project
@@ -18,12 +19,11 @@ USE_RC_SUBR= rrdcached
SHEBANG_FILES= examples/rrdcached/rrdcached-size.pl examples/stripes.py
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-tcl
-
+CONFIGURE_ENV= RRDDOCDIR=${DOCSDIR:Q}
INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-
CONFLICTS= rrdtool12
-
+PORTDOCS= *
PORTEXAMPLES= cgi-demo.cgi
OPTIONS_DEFINE= DEJAVU DOCS EXAMPLES GRAPH LOCKTIMEOUT MMAP NLS PERL \
@@ -41,7 +41,9 @@ RUBY_DESC= Build RUBY bindings
DEJAVU_RUN_DEPENDS= dejavu>0:x11-fonts/dejavu
DOCS_USES= groff
DOCS_CONFIGURE_ENABLE= docs
+EXAMPLES_CONFIGURE_ENABLE= examples
GRAPH_LIB_DEPENDS= libfreetype.so:print/freetype2 \
+ libharfbuzz.so:print/harfbuzz \
libpng.so:graphics/png
GRAPH_USE= GNOME=cairo,pango
GRAPH_CONFIGURE_OFF= --disable-rrd_graph \
@@ -60,8 +62,9 @@ PERL_PORTEXAMPLES= 4charts.pl bigtops.pl minmax.pl perftest.pl \
piped-demo.pl rrdcached/rrdcached-size.pl \
rrdcached/RRDCached.pm shared-demo.pl \
stripes.pl
+PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR}
PYTHON_USES= python
-PYTHON_USE= flavors,optsuffix
+PYTHON_USE= PYTHON=flavors,optsuffix
PYTHON_CONFIGURE_ENABLE= python
PYTHON_PORTEXAMPLES= stripes.py
RUBY_USE= RUBY=yes
@@ -71,10 +74,6 @@ post-extract:
@${REINPLACE_CMD} -E 's|(^rrdtool_LDADD = librrd.la)|\1 $$\(ALL_LIBS\)|' \
${WRKSRC}/src/Makefile.in
-post-extract-EXAMPLES-off:
- @${REINPLACE_CMD} -e '/^DIST_SUBDIRS = /s| examples||' \
- ${WRKSRC}/Makefile.in
-
post-install-EXAMPLES-on:
.if !defined(BATCH)
@${ECHO_MSG} ""
diff --git a/databases/rrdtool/files/patch-bindings_Makefile.in b/databases/rrdtool/files/patch-bindings_Makefile.in
new file mode 100644
index 000000000000..a874e91ffa7b
--- /dev/null
+++ b/databases/rrdtool/files/patch-bindings_Makefile.in
@@ -0,0 +1,16 @@
+--- bindings/Makefile.in.orig 2022-03-14 14:29:39 UTC
++++ bindings/Makefile.in
+@@ -727,11 +727,11 @@ all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@
+ install-data-local:
+ $(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 \
diff --git a/databases/rrdtool/files/patch-bindings_python_setup.py b/databases/rrdtool/files/patch-bindings_python_setup.py
deleted file mode 100644
index c9de9833d087..000000000000
--- a/databases/rrdtool/files/patch-bindings_python_setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- bindings/python/setup.py.orig 2022-03-14 14:27:57 UTC
-+++ bindings/python/setup.py
-@@ -2,10 +2,7 @@ import sys
- import os
- import sys
-
--try:
-- from setuptools import setup, Extension
--except ImportError:
-- sys.exit('The setup requires setuptools.')
-+from distutils.core import setup, Extension
-
- 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 a1656b431ccf..a70b30a69a20 100644
--- a/databases/rrdtool/files/patch-configure
+++ b/databases/rrdtool/files/patch-configure
@@ -1,6 +1,6 @@
--- configure.orig 2022-03-14 14:29:38 UTC
+++ configure
-@@ -22491,7 +22491,7 @@ else
+@@ -22491,7 +22491,7 @@ fi
if test "${enable_ruby_site_install+set}" = set; then :
enableval=$enable_ruby_site_install; RUBY_MAKE_OPTIONS=
else
@@ -9,19 +9,7 @@
fi
-@@ -23388,9 +23388,9 @@ else
- if test -x "$PYTHON_CONFIG"; then
- PYTHON_INCLUDES=`$PYTHON_CONFIG --includes 2>/dev/null`
- else
-- 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
- fi
-
-@@ -28807,19 +28807,6 @@ $as_echo "and out again" >&6; }
+@@ -28807,19 +28807,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; }
diff --git a/databases/rrdtool/files/patch-doc-Makefile.in b/databases/rrdtool/files/patch-doc-Makefile.in
deleted file mode 100644
index 7e5bdad35605..000000000000
--- a/databases/rrdtool/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.in.orig 2022-08-03 14:35:20 UTC
-+++ doc/Makefile.in
-@@ -394,9 +394,9 @@ EXTRA_DIST = $(GENERATED_EXTRADIST) $(POD) $(POD3) rrd
- EXTRA_DIST = $(GENERATED_EXTRADIST) $(POD) $(POD3) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod \
- rrdpython.pod rrdrados.pod rrdruby.pod
-
--idocdir = $(RRDDOCDIR)/txt
-+idocdir = $(datadir)/doc/rrdtool/txt
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(RRDDOCDIR)/html
-+ihtmldir = $(datadir)/doc/rrdtool/html
- ihtml_DATA = $(HTML)
- imandir = $(mandir)/man1
- iman_DATA = $(MAN)
diff --git a/databases/rrdtool/files/patch-examples-Makefile.in b/databases/rrdtool/files/patch-examples_Makefile.in
similarity index 74%
rename from databases/rrdtool/files/patch-examples-Makefile.in
rename to databases/rrdtool/files/patch-examples_Makefile.in
index 3096ee59ada4..e5e0b6a5f497 100644
--- a/databases/rrdtool/files/patch-examples-Makefile.in
+++ b/databases/rrdtool/files/patch-examples_Makefile.in
@@ -1,6 +1,6 @@
---- examples/Makefile.in.orig 2022-08-03 15:28:50 UTC
+--- examples/Makefile.in.orig 2022-03-14 14:29:40 UTC
+++ examples/Makefile.in
-@@ -431,7 +431,7 @@ EXTRA_DIST = cgi-demo.cgi.in stripes.py
+@@ -431,7 +431,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = rrdcached
EXTRA_DIST = cgi-demo.cgi.in stripes.py
diff --git a/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in b/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in
index 881e2576114c..795905d8894b 100644
--- a/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in
+++ b/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in
@@ -1,6 +1,6 @@
---- examples/rrdcached/Makefile.in.orig 2022-08-03 15:28:50 UTC
+--- examples/rrdcached/Makefile.in.orig 2022-03-14 14:29:40 UTC
+++ examples/rrdcached/Makefile.in
-@@ -368,7 +368,7 @@ top_srcdir = @top_srcdir@
+@@ -368,7 +368,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index 78ef5b2877c6..00d9480eae2b 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -16,8 +16,10 @@ lib/librrd.so.8.3.0
%%PERL%%%%SITE_ARCH%%/auto/RRDs/RRDs.so
%%PERL%%%%PERL5_MAN3%%/RRDp.3.gz
%%PERL%%%%PERL5_MAN3%%/RRDs.3.gz
-%%PERL%%lib/perllocal.pod
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info/top_level.txt
%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool%%PYTHON_EXT_SUFFIX%%.so
%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
libdata/pkgconfig/librrd.pc
@@ -46,7 +48,7 @@ libdata/pkgconfig/librrd.pc
%%PORTDOCS%%%%PYTHON%%man/man1/rrdpython.1.gz
%%PORTDOCS%%man/man1/rrdresize.1.gz
%%PORTDOCS%%man/man1/rrdrestore.1.gz
-%%RUBY%%man/man1/rrdruby.1.gz
+%%PORTDOCS%%%%RUBY%%man/man1/rrdruby.1.gz
%%PORTDOCS%%man/man1/rrdthreads.1.gz
%%PORTDOCS%%man/man1/rrdtool.1.gz
%%PORTDOCS%%man/man1/rrdtune.1.gz
@@ -54,106 +56,5 @@ libdata/pkgconfig/librrd.pc
%%PORTDOCS%%man/man1/rrdupdate.1.gz
%%PORTDOCS%%man/man1/rrdxport.1.gz
%%PORTDOCS%%man/man3/librrd.3.gz
-%%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/rrd_pdpcalc.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%%%%PYTHON%%%%DOCSDIR%%/html/rrdpython.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
-%%RUBY%%%%DOCSDIR%%/html/rrdruby.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/rrd_pdpcalc.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrd_pdpcalc.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%%%%PYTHON%%%%DOCSDIR%%/txt/rrdpython.pod
-%%PORTDOCS%%%%PYTHON%%%%DOCSDIR%%/txt/rrdpython.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.txt
-%%RUBY%%%%DOCSDIR%%/txt/rrdruby.pod
-%%RUBY%%%%DOCSDIR%%/txt/rrdruby.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
%%NLS%%share/locale/fr/LC_MESSAGES/rrdtool.mo
%%NLS%%share/locale/hu/LC_MESSAGES/rrdtool.mo