[22808] trunk/dports/lang/ruby
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 14 23:47:19 PDT 2007
Revision: 22808
http://trac.macosforge.org/projects/macports/changeset/22808
Author: pguyot at kallisys.net
Date: 2007-03-14 23:47:18 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
lang/ruby: Update to 1.8.6.
Ticket: #11557
Modified Paths:
--------------
trunk/dports/lang/ruby/Portfile
trunk/dports/lang/ruby/files/patch-Makefile.in
trunk/dports/lang/ruby/files/patch-instruby.rb
trunk/dports/lang/ruby/files/patch-mkmf.rb
Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile 2007-03-15 03:46:54 UTC (rev 22807)
+++ trunk/dports/lang/ruby/Portfile 2007-03-15 06:47:18 UTC (rev 22808)
@@ -2,7 +2,7 @@
PortSystem 1.0
name ruby
-version 1.8.5-p12
+version 1.8.6
categories lang ruby
maintainers pguyot at kallisys.net
@@ -16,10 +16,10 @@
homepage http://www.ruby-lang.org/
master_sites ruby:1.8
dist_subdir ruby
-checksums ruby-1.8.5-p12.tar.gz \
- md5 d7d12dd9124c9b7d55cdbbee313e3931 \
- sha1 15a34958c12e2fe5f41bec0ac935398b60d9c72e \
- rmd160 104e78ea4ce0d8fbd3ca1195ca064eda9c9721ea
+checksums ruby-1.8.6.tar.gz \
+ md5 23d2494aa94e7ae1ecbbb8c5e1507683 \
+ sha1 c915f65e1e42dbedc43acabcbef2bbe03233bf20 \
+ rmd160 a1ad902bb1311233cd3cf9db52ab2ec076a709f5
platforms darwin
@@ -35,7 +35,6 @@
patch-mkconfig.rb \
patch-mkmf.rb \
patch-ruby.c
-patch_sites http://ftp.ruby-lang.org/pub/ruby/1.8/
use_autoconf yes
Modified: trunk/dports/lang/ruby/files/patch-Makefile.in
===================================================================
--- trunk/dports/lang/ruby/files/patch-Makefile.in 2007-03-15 03:46:54 UTC (rev 22807)
+++ trunk/dports/lang/ruby/files/patch-Makefile.in 2007-03-15 06:47:18 UTC (rev 22808)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2005-11-10 15:22:03.000000000 -0800
-+++ Makefile.in 2006-01-08 08:19:23.000000000 -0800
-@@ -23,6 +23,8 @@
+--- Makefile.in.orig 2007-02-13 08:01:19.000000000 +0900
++++ Makefile.in 2007-03-15 14:19:03.000000000 +0900
+@@ -24,6 +24,8 @@
arch = @arch@
sitearch = @sitearch@
sitedir = @sitedir@
@@ -9,3 +9,17 @@
TESTUI = console
TESTS =
+@@ -98,11 +100,11 @@
+
+ miniruby$(EXEEXT):
+ @$(RM) $@
+- $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
++ $(PURIFY) $(CC) $(XLDFLAGS) $(LDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
+
+ $(PROGRAM):
+ @$(RM) $@
+- $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
++ $(PURIFY) $(CC) $(XLDFLAGS) $(LDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
+
+ # We must `rm' the library each time this rule is invoked because "updating" a
+ # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
Modified: trunk/dports/lang/ruby/files/patch-instruby.rb
===================================================================
--- trunk/dports/lang/ruby/files/patch-instruby.rb 2007-03-15 03:46:54 UTC (rev 22807)
+++ trunk/dports/lang/ruby/files/patch-instruby.rb 2007-03-15 06:47:18 UTC (rev 22808)
@@ -1,20 +1,29 @@
---- instruby.rb.orig 2005-07-05 07:45:33.000000000 -0700
-+++ instruby.rb 2006-01-08 08:29:51.000000000 -0800
-@@ -99,6 +99,8 @@
- archlibdir = with_destdir(CONFIG["archdir"])
- sitelibdir = with_destdir(CONFIG["sitelibdir"])
- sitearchlibdir = with_destdir(CONFIG["sitearchdir"])
-+vendorlibdir = with_destdir(CONFIG["vendorlibdir"])
-+vendorarchlibdir = with_destdir(CONFIG["vendorarchdir"])
- mandir = with_destdir(File.join(CONFIG["mandir"], "man"))
+--- instruby.rb.orig 2007-03-15 13:25:14.000000000 +0900
++++ instruby.rb 2007-03-15 13:31:29.000000000 +0900
+@@ -162,6 +162,8 @@
+ archlibdir = CONFIG["archdir"]
+ sitelibdir = CONFIG["sitelibdir"]
+ sitearchlibdir = CONFIG["sitearchdir"]
++vendorlibdir = CONFIG["vendorlibdir"]
++vendorarchlibdir = CONFIG["vendorarchdir"]
+ mandir = File.join(CONFIG["mandir"], "man")
configure_args = Shellwords.shellwords(CONFIG["configure_args"])
enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-@@ -106,7 +108,7 @@
- lib = CONFIG["LIBRUBY"]
- arc = CONFIG["LIBRUBY_A"]
-
--makedirs [bindir, libdir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir]
-+makedirs [bindir, libdir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir, vendorlibdir, vendorarchlibdir]
-
- install?(:bin) do
- ruby_bin = File.join(bindir, ruby_install_name)
+@@ -202,7 +204,7 @@
+ extout = "#$extout"
+ install?(:ext, :arch, :'ext-arch') do
+ puts "installing extension objects"
+- makedirs [archlibdir, sitearchlibdir]
++ makedirs [archlibdir, sitearchlibdir, vendorarchlibdir]
+ if noinst = CONFIG["no_install_files"] and noinst.empty?
+ noinst = nil
+ end
+@@ -210,7 +212,7 @@
+ end
+ install?(:ext, :comm, :'ext-comm') do
+ puts "installing extension scripts"
+- makedirs [rubylibdir, sitelibdir]
++ makedirs [rubylibdir, sitelibdir, vendorlibdir]
+ install_recursive("#{extout}/common", rubylibdir)
+ end
+ end
Modified: trunk/dports/lang/ruby/files/patch-mkmf.rb
===================================================================
--- trunk/dports/lang/ruby/files/patch-mkmf.rb 2007-03-15 03:46:54 UTC (rev 22807)
+++ trunk/dports/lang/ruby/files/patch-mkmf.rb 2007-03-15 06:47:18 UTC (rev 22808)
@@ -1,5 +1,5 @@
---- lib/mkmf.rb.orig 2006-08-16 22:47:50.000000000 -0700
-+++ lib/mkmf.rb 2006-09-20 16:54:17.000000000 -0700
+--- lib/mkmf.rb.orig 2007-02-28 22:23:42.000000000 +0900
++++ lib/mkmf.rb 2007-03-15 13:39:26.000000000 +0900
@@ -51,6 +51,9 @@
$sitedir = CONFIG["sitedir"]
$sitelibdir = CONFIG["sitelibdir"]
@@ -16,12 +16,12 @@
headers = cpp_include(headers)
- try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
+ try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
+ #{COMMON_HEADERS}
#{headers}
/*top*/
- int main() { return 0; }
@@ -422,6 +425,11 @@
int main() { return 0; }
- int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
+ int t() { #{func}(); return 0; }
SRC
+int #{func}();
+/*top*/
@@ -31,7 +31,7 @@
end
def try_var(var, headers = nil, &b)
-@@ -1080,6 +1088,7 @@
+@@ -1087,6 +1095,7 @@
RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
arch = #{CONFIG['arch']}
sitearch = #{CONFIG['sitearch']}
@@ -39,12 +39,3 @@
ruby_version = #{Config::CONFIG['ruby_version']}
ruby = #{$ruby}
RUBY = $(ruby#{sep})
-@@ -1400,7 +1409,7 @@
- $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
- $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
- $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
-- $LDFLAGS = (with_config("ldflags") || "").dup
-+ $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
- $INCFLAGS = "-I$(topdir) -I$(hdrdir) -I$(srcdir)"
- $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
- $LIBEXT = config['LIBEXT'].dup
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070314/af56b279/attachment.html
More information about the macports-changes
mailing list