From 3deaececa23b26b70c3b1c696bd2b8bce793b91c Mon Sep 17 00:00:00 2001
From: knu <knu@FreeBSD.org>
Date: Tue, 13 Jul 2004 07:03:54 +0000
Subject: Pull in the latest change to mkmf.rb to avoid build error when
 devel/readline is installed.

---
 lang/ruby18/Makefile            |  1 +
 lang/ruby18/files/patch-mkmf.rb | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 lang/ruby18/files/patch-mkmf.rb

diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index cddf3a6f017c..90084a8c767b 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
diff --git a/lang/ruby18/files/patch-mkmf.rb b/lang/ruby18/files/patch-mkmf.rb
new file mode 100644
index 000000000000..fcb200f6b9e3
--- /dev/null
+++ b/lang/ruby18/files/patch-mkmf.rb
@@ -0,0 +1,21 @@
+--- lib/mkmf.rb.orig	Fri Apr 23 23:25:28 2004
++++ lib/mkmf.rb	Tue Jul 13 15:57:40 2004
+@@ -670,7 +670,7 @@
+     ldirs.concat(defaults.collect {|dir| dir + "/lib"})
+     ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
+   end
+-  $LIBPATH |= ldirs
++  $LIBPATH = ldirs | $LIBPATH
+ 
+   [idir, ldir]
+ end
+@@ -969,8 +969,7 @@
+   $LIBRUBYARG = ""
+   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
+   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
+-  $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"]
+-  $LIBPATH.unshift("$(topdir)") if $extmk
++  $LIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
+   $INSTALLFILES = nil
+ 
+   $objs = nil
-- 
cgit