From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 29 21:30:30 2006 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87BF316A4DD for ; Tue, 29 Aug 2006 21:30:30 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56E4143D45 for ; Tue, 29 Aug 2006 21:30:27 +0000 (GMT) (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 k7TLUMFa012888 for ; Tue, 29 Aug 2006 21:30:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k7TLUMCo012886; Tue, 29 Aug 2006 21:30:22 GMT (envelope-from gnats) Resent-Date: Tue, 29 Aug 2006 21:30:22 GMT Resent-Message-Id: <200608292130.k7TLUMCo012886@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, Stanislav Sedov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07D5216A4DA; Tue, 29 Aug 2006 21:22:57 +0000 (UTC) (envelope-from ssedov@mbsd.msk.ru) Received: from com1.ht-systems.ru (com1.ht-systems.ru [83.97.104.204]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91D0443D49; Tue, 29 Aug 2006 21:22:56 +0000 (GMT) (envelope-from ssedov@mbsd.msk.ru) Received: from [213.87.86.31] (helo=fonon.realnet) by com1.ht-systems.ru with esmtpa (Exim 4.62) (envelope-from ) id 1GIB2s-00021Z-Fr; Wed, 30 Aug 2006 01:22:55 +0400 Received: by fonon.realnet (Postfix, from userid 1001) id 377AA11B6A; Wed, 30 Aug 2006 01:22:24 +0400 (MSD) Message-Id: <20060829212224.377AA11B6A@fonon.realnet> Date: Wed, 30 Aug 2006 01:22:24 +0400 (MSD) From: Stanislav Sedov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: knu@FreeBSD.org Subject: ports/102663: [PATCH]: lang/ruby18 small fix to allow painless PREFIX-clean ruby ports creation X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Aug 2006 21:30:30 -0000 >Number: 102663 >Category: ports >Synopsis: [PATCH]: lang/ruby18 small fix to allow painless PREFIX-clean ruby ports creation >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Aug 29 21:30:21 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Wed Aug 2 21:44:37 MSD 2006 root@fonon.realnet:/work/src/fbsd-cur/src/sys/i386/compile/FONON i386 >Description: - Most ruby ports obtain information about prefix from rbconfig.rb. Patch it to return patch with correct PREFIX if PREFIX was specifies in enviropment. It will not interfere with current ruby ports as all of them gets installed into LOCALBASE currently by default (and none of them are PREFIX-clean). - Bump-up PORTREVISION this PR depends on ports/102648 >How-To-Repeat: >Fix: --- ruby1811.diff begins here --- diff -ruN ruby18.orig/Makefile ruby18/Makefile --- ruby18.orig/Makefile Wed Aug 30 00:56:22 2006 +++ ruby18/Makefile Wed Aug 30 01:10:04 2006 @@ -7,7 +7,7 @@ PORTNAME= ruby PORTVERSION= ${RUBY_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= lang ruby ipv6 MASTER_SITES= ${MASTER_SITE_RUBY} @@ -154,6 +154,10 @@ ${MAKE} -f Makefile ${RUBY_VER:S/.//} RUBYDIR=${WRKSRC} .endif ${TOUCH} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + +post-build: + @${REINPLACE_CMD} -E -e \ + "s,(CONFIG\[\"prefix\"\][[:space:]]*=[[:space:]]*\()(.*),\1ENV\['PREFIX'\] || \2," ${WRKSRC}/rbconfig.rb post-install: # --- ruby1811.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: