svn commit: r407379 - in head/databases/rrdtool: . files
Niclas Zeising
zeising at FreeBSD.org
Wed Jan 27 19:42:36 UTC 2016
Author: zeising
Date: Wed Jan 27 19:42:34 2016
New Revision: 407379
URL: https://svnweb.freebsd.org/changeset/ports/407379
Log:
Fix Perl and Ruby module builds.
I made a mistake when updating one of the patches for the new version of
rrdtools, and as a consequence perl and ruby modules stopped building, fix
this by correcting the patch.
Noted by: kib
PR: 206685
Submitted by: Helge Oldach
Modified:
head/databases/rrdtool/Makefile
head/databases/rrdtool/files/patch-bindings-Makefile.in
head/databases/rrdtool/pkg-plist
Modified: head/databases/rrdtool/Makefile
==============================================================================
--- head/databases/rrdtool/Makefile Wed Jan 27 19:37:26 2016 (r407378)
+++ head/databases/rrdtool/Makefile Wed Jan 27 19:42:34 2016 (r407379)
@@ -3,6 +3,7 @@
PORTNAME= rrdtool
PORTVERSION= 1.5.5
+PORTREVISION= 1
CATEGORIES= databases graphics
MASTER_SITES= http://oss.oetiker.ch/rrdtool/pub/
@@ -116,5 +117,14 @@ 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
+.if ${PORT_OPTIONS:MPYTHON_MODULE}
+ ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/rrdtool.so
+.endif
+.if ${PORT_OPTIONS:MRUBY_MODULE}
+ ${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/RRD.so
+.endif
.include <bsd.port.mk>
Modified: head/databases/rrdtool/files/patch-bindings-Makefile.in
==============================================================================
--- head/databases/rrdtool/files/patch-bindings-Makefile.in Wed Jan 27 19:37:26 2016 (r407378)
+++ head/databases/rrdtool/files/patch-bindings-Makefile.in Wed Jan 27 19:42:34 2016 (r407379)
@@ -1,21 +1,21 @@
---- bindings/Makefile.in.orig 2016-01-27 10:49:53 UTC
+--- bindings/Makefile.in.orig 2016-01-27 17:19:31 UTC
+++ bindings/Makefile.in
@@ -711,15 +711,15 @@ all-local: @COMP_PERL@ @COMP_RUBY@ @COM
install-data-local:
$(AM_V_GEN)test -f ${builddir}/perl-piped/Makefile \
&& ( cd ${builddir}/perl-piped \
- && $(MAKE) install ) \
-+ && $(MAKE) pure-install ) \
++ && $(MAKE) pure_install ) \
|| true
$(AM_V_GEN)test -f ${builddir}/perl-shared/Makefile \
&& ( cd ${builddir}/perl-shared \
- && $(MAKE) install ) \
-+ && $(MAKE) pure-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 ) \
++ && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) install ) \
|| true
$(AM_V_GEN)test -d ${builddir}/python/build \
&& ( cd ${builddir}/python \
Modified: head/databases/rrdtool/pkg-plist
==============================================================================
--- head/databases/rrdtool/pkg-plist Wed Jan 27 19:37:26 2016 (r407378)
+++ head/databases/rrdtool/pkg-plist Wed Jan 27 19:42:34 2016 (r407379)
@@ -45,8 +45,14 @@ 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%%/rrdtool.so
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/py_rrdtool-0.2.2-py%%PYTHON_VER%%.egg-info
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rrdcached/RRDCached.pm
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rrdcached/rrdcached-size.pl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stripes.py
More information about the svn-ports-head
mailing list