cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Perl and Ruby module builds.

Browse Source 
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
This commit is contained in:
Niclas Zeising 2016-01-27 19:42:34 +00:00
parent b0a609bc05
commit 3327eb1b1f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=407379
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
databases/rrdtool/Makefile
View File

@ -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>

8
databases/rrdtool/files/patch-bindings-Makefile.in
View File

@ -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 \

6
databases/rrdtool/pkg-plist
View File

@ -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