From owner-svn-ports-head@freebsd.org Wed Jan 27 19:42:36 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D1BBA6FD6E; Wed, 27 Jan 2016 19:42:36 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AECC1CC8; Wed, 27 Jan 2016 19:42:36 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0RJgZU0070652; Wed, 27 Jan 2016 19:42:35 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0RJgZkg070649; Wed, 27 Jan 2016 19:42:35 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201601271942.u0RJgZkg070649@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 27 Jan 2016 19:42:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407379 - in head/databases/rrdtool: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2016 19:42:36 -0000 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 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