From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 8 06:10:05 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A49316A406 for ; Tue, 8 May 2007 06:10:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 092ED13C484 for ; Tue, 8 May 2007 06:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l486A4D6051308 for ; Tue, 8 May 2007 06:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l486A4o4051307; Tue, 8 May 2007 06:10:04 GMT (envelope-from gnats) Resent-Date: Tue, 8 May 2007 06:10:04 GMT Resent-Message-Id: <200705080610.l486A4o4051307@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Clive Lin Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9089516A402; Tue, 8 May 2007 06:05:45 +0000 (UTC) (envelope-from clive@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 8236A13C4B9; Tue, 8 May 2007 06:05:45 +0000 (UTC) (envelope-from clive@FreeBSD.org) Received: from freefall.freebsd.org (clive@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l4865j9e051269; Tue, 8 May 2007 06:05:45 GMT (envelope-from clive@freefall.freebsd.org) Received: (from clive@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l4865jWi051268; Tue, 8 May 2007 06:05:45 GMT (envelope-from clive) Message-Id: <200705080605.l4865jWi051268@freefall.freebsd.org> Date: Tue, 8 May 2007 06:05:45 GMT From: Clive Lin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: demon@FreeBSD.org Subject: ports/112513: net/rrdtool ruby binding build fix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Clive Lin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 May 2007 06:10:05 -0000 >Number: 112513 >Category: ports >Synopsis: net/rrdtool ruby binding build fix >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue May 08 06:10:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Clive Lin >Release: FreeBSD 6.0-STABLE i386 >Organization: freebsd.org >Environment: FreeBSD kx1 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #0: Wed Apr 4 19:06:55 CST 2007 clive@kx1:/usr/obj/usr/src/sys/KX1 i386 >Description: net/rrdtool ruby binding build fix. with this update, ports/112483 and ports/112412 can be closed. Patch in ports/112483 is incomplete. This fixes it. >How-To-Repeat: portupgrade -f ruby >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/rrdtool/Makefile,v retrieving revision 1.66 diff -u -r1.66 Makefile --- Makefile 3 May 2007 08:33:28 -0000 1.66 +++ Makefile 8 May 2007 06:00:12 -0000 @@ -25,7 +25,8 @@ CONFIGURE_ARGS= --enable-perl-site-install --disable-tcl -OPTIONS= PYTHON_MODULE "Build PYTHON bindings" off +OPTIONS= PYTHON_MODULE "Build PYTHON bindings" off \ + RUBY_MODULE "Build RUBY bindings" off .include .if defined(WITH_PYTHON_MODULE) @@ -38,6 +39,16 @@ PLIST_SUB+= WITH_PYTHON="@comment " .endif +.if defined(WITH_RUBY_MODULE) +USE_RUBY= yes +.include "${PORTSDIR}/Mk/bsd.ruby.mk" +PLIST_SUB+= WITH_RUBY="" +CONFIGURE_ARGS+= --enable-ruby +.else +CONFIGURE_ARGS+= --disable-ruby +PLIST_SUB+= WITH_RUBY="@comment " +.endif + CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2 LDFLAGS+= -L${LOCALBASE}/lib Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net/rrdtool/pkg-plist,v retrieving revision 1.20 diff -u -r1.20 pkg-plist --- pkg-plist 7 Feb 2007 09:40:25 -0000 1.20 +++ pkg-plist 8 May 2007 06:00:12 -0000 @@ -108,6 +108,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so +%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so @dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/txt %%PORTDOCS%%@dirrm %%DOCSDIR%%/html Index: files/patch-bindings-Makefile.in =================================================================== RCS file: /home/pcvs/ports/net/rrdtool/files/patch-bindings-Makefile.in,v retrieving revision 1.4 diff -u -r1.4 patch-bindings-Makefile.in --- files/patch-bindings-Makefile.in 3 May 2007 08:33:28 -0000 1.4 +++ files/patch-bindings-Makefile.in 8 May 2007 06:00:12 -0000 @@ -1,13 +1,21 @@ ---- bindings/Makefile.in.orig Thu May 3 12:28:34 2007 -+++ bindings/Makefile.in Thu May 3 12:29:17 2007 -@@ -539,8 +539,8 @@ +--- bindings/Makefile.in.orig Thu May 3 02:06:59 2007 ++++ bindings/Makefile.in Tue May 8 13:20:37 2007 +@@ -539,14 +539,14 @@ all-local: @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@ install-data-local: - test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true - test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true +- test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true + test -f perl-piped/Makefile && cd perl-piped && $(MAKE) pure_install || true + test -f perl-shared/Makefile && cd perl-shared && $(MAKE) pure_install || true - test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true ++ test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) install || true test -d python/build && cd python && env LIBDIR=$(libdir) $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true + # rules for buildung the ruby module + ruby: +- cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) ++ cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) + + # rules for buildung the pyton module + python: >Release-Note: >Audit-Trail: >Unformatted: