From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 24 15:20:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D30ED660 for ; Sun, 24 Mar 2013 15:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id B5801F52 for ; Sun, 24 Mar 2013 15:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2OFK0d9070151 for ; Sun, 24 Mar 2013 15:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2OFK05g070150; Sun, 24 Mar 2013 15:20:00 GMT (envelope-from gnats) Resent-Date: Sun, 24 Mar 2013 15:20:00 GMT Resent-Message-Id: <201303241520.r2OFK05g070150@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, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 32478639; Sun, 24 Mar 2013 15:17:32 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from sunpoet.net (sunpoet-1-pt.tunnel.tserv29.fmt1.ipv6.he.net [IPv6:2001:470:66:3a7::2]) by mx1.freebsd.org (Postfix) with ESMTP id C3DAAF41; Sun, 24 Mar 2013 15:17:31 +0000 (UTC) Received: by sunpoet.net (Postfix, from userid 1000) id 99250DB; Sun, 24 Mar 2013 23:17:43 +0800 (CST) Message-Id: <20130324151743.99250DB@sunpoet.net> Date: Sun, 24 Mar 2013 23:17:43 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/177342: [PATCH] databases/ruby-bdb: fix build with Ruby 2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Mar 2013 15:20:00 -0000 >Number: 177342 >Category: ports >Synopsis: [PATCH] databases/ruby-bdb: fix build with Ruby 2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 24 15:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 9.1-STABLE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r247564: Sat Mar 2 08:05:30 >Description: - Fix build with Ruby 2.0 - Update COMMENT - Convert to new options framework - Minor Makefile cleanup - Pet portlint Port maintainer (knu@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- ruby20-bdb5-0.6.6.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 315028) +++ Makefile (working copy) @@ -1,24 +1,21 @@ -# New ports collection makefile for: Ruby-BDB -# Date created: 8 March 2001 -# Whom: Akinori MUSHA aka knu -# +# Created by: Akinori MUSHA aka knu # $FreeBSD$ -# PORTNAME= bdb PORTVERSION= 0.6.6 CATEGORIES= databases ruby MASTER_SITES= ftp://ftp.idaemons.org/pub/distfiles/ruby/ \ http://idaemons.org/distfiles/ruby/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= knu + LOCAL/knu PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} PKGNAMESUFFIX= ${WITH_BDB_VER} DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org -COMMENT= Ruby interface to Sleepycat's Berkeley DB revision 2 or later +COMMENT= Ruby interface to Oracle Berkeley DB revision 2 or later +OPTIONS_DEFINE= DOCS EXAMPLES + USE_BDB= yes USE_BZIP2= yes @@ -32,44 +29,40 @@ --with-db-lib=${BDB_LIB_DIR} INSTALL_TARGET= site-install -DOCS= Changes \ - README.en \ - bdb.rd \ - docs/*.rd +DOCS= Changes README.en bdb.rd docs/*.rd +DOCSDIR= ${RUBY_MODDOCDIR} +EXAMPLESDIR= ${RUBY_MODEXAMPLESDIR} +PLIST_FILES= %%RUBY_SITEARCHLIBDIR%%/bdb.so +PORTDOCS= * +PORTEXAMPLES= * .include -PLIST_FILES= %%RUBY_SITEARCHLIBDIR%%/bdb.so - -.if !defined(NOPORTDOCS) -DOCSDIR= ${RUBY_MODDOCDIR} -PORTDOCS= * +post-patch: +.if ${RUBY_VER} == 2.0 + @${REINPLACE_CMD} -e '/remove_const/d' ${WRKSRC}/src/features.rb .endif -.if !defined(NOPORTEXAMPLES) -EXAMPLESDIR= ${RUBY_MODEXAMPLESDIR} -PORTEXAMPLES= * -.endif post-build: -.if !defined(NOPORTDOCS) - ( cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc ) +.if ${PORT_OPTIONS:MDOCS} + (cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc) .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR}/doc - (cd ${WRKSRC} && ${INSTALL_MAN} ${DOCS} ${DOCSDIR}) - (cd ${WRKSRC}/docs/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}/doc) + (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}) + (cd ${WRKSRC}/docs/doc && ${COPYTREE_SHARE} . ${DOCSDIR}/doc) .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR}/ - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} "! -empty") + (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR} "! -empty") .endif -regression-test: +regression-test: build @${MKDIR} ${BUILD_WRKSRC}/tmp - ( cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \ - ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test ) + (cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test) .include Index: pkg-descr =================================================================== --- pkg-descr (revision 315028) +++ pkg-descr (working copy) @@ -2,5 +2,4 @@ later. DB >= 2 is required. (some functionalities like join are not available with DB < 2.6) -Author: Guy Decoux -WWW: http://moulon.inra.fr/ruby/bdb.html +WWW: http://moulon.inra.fr/ruby/bdb.html --- ruby20-bdb5-0.6.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: