Date: Wed, 30 Aug 2006 13:35:14 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102685: [PATCH]: lang/ruby18 - yet one fix to PREFIX-clean ports support Message-ID: <20060830093514.B22A61147B@fonon.realnet> Resent-Message-ID: <200608300940.k7U9eMbg073245@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060830093514.B22A61147B>