From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 30 09:40:24 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 70F4E16A4DF for ; Wed, 30 Aug 2006 09:40:24 +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 969B043D58 for ; Wed, 30 Aug 2006 09:40:22 +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 k7U9eMLL073248 for ; Wed, 30 Aug 2006 09:40:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k7U9eMbg073245; Wed, 30 Aug 2006 09:40:22 GMT (envelope-from gnats) Resent-Date: Wed, 30 Aug 2006 09:40:22 GMT Resent-Message-Id: <200608300940.k7U9eMbg073245@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 F0A2216A4E1 for ; Wed, 30 Aug 2006 09:35:41 +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 24CEE43D53 for ; Wed, 30 Aug 2006 09:35:41 +0000 (GMT) (envelope-from ssedov@mbsd.msk.ru) Received: from [80.250.160.136] (helo=fonon.realnet) by com1.ht-systems.ru with esmtpa (Exim 4.62) (envelope-from ) id 1GIMTz-0004m7-TZ for FreeBSD-gnats-submit@freebsd.org; Wed, 30 Aug 2006 13:35:39 +0400 Received: by fonon.realnet (Postfix, from userid 1001) id B22A61147B; Wed, 30 Aug 2006 13:35:14 +0400 (MSD) Message-Id: <20060830093514.B22A61147B@fonon.realnet> Date: Wed, 30 Aug 2006 13:35:14 +0400 (MSD) From: Stanislav Sedov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/102685: [PATCH]: lang/ruby18 - yet one fix to PREFIX-clean ports support 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: Wed, 30 Aug 2006 09:40:24 -0000 >Number: 102685 >Category: ports >Synopsis: [PATCH]: lang/ruby18 - yet one fix to PREFIX-clean ports support >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: Wed Aug 30 09:40: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: Patch for extconf to find header files/includes in ruby's stock directory first. It will not interfere with current ruby ports as all of them gets installed into LOCALBASE. I have deleted files/patch-mkmf.rb and added files/patch-lib_mkmf.rb This PR depends on ports/102663 >How-To-Repeat: >Fix: --- ruby.dd begins here --- diff -ruN ruby18.orig/Makefile ruby18/Makefile --- ruby18.orig/Makefile Wed Aug 30 13:07:15 2006 +++ ruby18/Makefile Wed Aug 30 13:31:39 2006 @@ -7,7 +7,7 @@ PORTNAME= ruby PORTVERSION= ${RUBY_PORTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= lang ruby ipv6 MASTER_SITES= ${MASTER_SITE_RUBY} diff -ruN ruby18.orig/files/patch-lib_mkmf.rb ruby18/files/patch-lib_mkmf.rb --- ruby18.orig/files/patch-lib_mkmf.rb Thu Jan 1 03:00:00 1970 +++ ruby18/files/patch-lib_mkmf.rb Wed Aug 30 13:15:05 2006 @@ -0,0 +1,25 @@ +--- lib/mkmf.rb.orig Thu Aug 17 09:47:50 2006 ++++ lib/mkmf.rb Wed Aug 30 13:14:44 2006 +@@ -113,8 +113,12 @@ + + topdir = File.dirname(libdir = File.dirname(__FILE__)) + extdir = File.expand_path("ext", topdir) ++setuparchdir = topdir + \ ++ "/#{Config::CONFIG["ruby_version"]}/#{Config::CONFIG["arch"]}" + $extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/" +-if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h") ++if not $extmk and File.exist?(setuparchdir + "/ruby.h") ++ $hdrdir = $topdir = setuparchdir ++elsif not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h") + $hdrdir = $topdir = Config::CONFIG["archdir"] + elsif File.exist?(($top_srcdir ||= topdir) + "/ruby.h") and + File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h") +@@ -1281,7 +1285,7 @@ + + mfile.print <<-SITEINSTALL + +-site-install: site-install-so site-install-rb ++site-install: site-install-so site-install-rb install + site-install-so: install-so + site-install-rb: install-rb + diff -ruN ruby18.orig/files/patch-mkmf.rb ruby18/files/patch-mkmf.rb --- ruby18.orig/files/patch-mkmf.rb Wed Aug 30 13:07:15 2006 +++ ruby18/files/patch-mkmf.rb Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- lib/mkmf.rb.orig Mon Nov 28 01:22:53 2005 -+++ lib/mkmf.rb Thu Jan 12 01:35:31 2006 -@@ -1153,7 +1153,7 @@ - - mfile.print <<-SITEINSTALL - --site-install: site-install-so site-install-rb -+site-install: site-install-so site-install-rb install - site-install-so: install-so - site-install-rb: install-rb - --- ruby.dd ends here --- >Release-Note: >Audit-Trail: >Unformatted: