[37739] trunk/dports/lang/ruby

[kimuraw at macports.org]

Revision: 37739
          http://trac.macosforge.org/projects/macports/changeset/37739
Author:   kimuraw at macports.org
Date:     2008-06-21 02:28:12 -0700 (Sat, 21 Jun 2008)
Log Message:
-----------
update lang/ruby-1.8.7-p22 to rev2
- add missing Config::CONFIG['vendorarch']
- correct files/patch-mkconfig.rb

Revision Links:
--------------
    http://trac.macosforge.org/projects/macports/changeset/2

Modified Paths:
--------------
    trunk/dports/lang/ruby/Portfile
    trunk/dports/lang/ruby/files/patch-mkconfig.rb

Added Paths:
-----------
    trunk/dports/lang/ruby/files/patch-configure.in

Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile	2008-06-21 08:00:14 UTC (rev 37738)
+++ trunk/dports/lang/ruby/Portfile	2008-06-21 09:28:12 UTC (rev 37739)
@@ -4,7 +4,7 @@
 
 name			ruby
 version			1.8.7-p22
-revision		1
+revision		2
 
 categories		lang ruby
 maintainers		kimuraw
@@ -35,6 +35,7 @@
 				port:ncurses
 				
 patchfiles		patch-Makefile.in \
+				patch-configure.in \
 				patch-mkmf.rb \
 				patch-mkconfig.rb \
 				patch-socket.c \
@@ -97,6 +98,10 @@
 	patchfiles-append		patch-thread-hooks
 }
 
+variant no_doc {
+	destroot.target-delete	install-doc
+}
+
 default_variants	+thread_hooks
 
 livecheck.check	regex

Added: trunk/dports/lang/ruby/files/patch-configure.in
===================================================================
--- trunk/dports/lang/ruby/files/patch-configure.in	                        (rev 0)
+++ trunk/dports/lang/ruby/files/patch-configure.in	2008-06-21 09:28:12 UTC (rev 37739)
@@ -0,0 +1,23 @@
+--- configure.in.orig	2008-06-15 19:28:47.000000000 +0900
++++ configure.in	2008-06-21 18:18:50.000000000 +0900
+@@ -1731,6 +1731,7 @@
+ AC_SUBST(arch)dnl
+ AC_SUBST(sitearch)dnl
+ AC_SUBST(sitedir)dnl
++AC_SUBST(vendorarch)dnl
+ AC_SUBST(vendordir)dnl
+ 
+ configure_args=$ac_configure_args
+@@ -1753,8 +1754,10 @@
+ fi
+ 
+ case "$target_os" in
+-  mingw*) sitearch="$target_cpu-$rb_cv_msvcrt" ;;
+-  *) sitearch="${arch}" ;;
++  mingw*) sitearch="$target_cpu-$rb_cv_msvcrt"
++  	  vendorarch="$target_cpu-$rb_cv_msvcrt" ;;
++  *) sitearch="${arch}"
++     vendorarch="${arch}" ;;
+ esac
+ 
+ AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")

Modified: trunk/dports/lang/ruby/files/patch-mkconfig.rb
===================================================================
--- trunk/dports/lang/ruby/files/patch-mkconfig.rb	2008-06-21 08:00:14 UTC (rev 37738)
+++ trunk/dports/lang/ruby/files/patch-mkconfig.rb	2008-06-21 09:28:12 UTC (rev 37739)
@@ -1,16 +1,16 @@
---- lib/mkmf.rb.orig	2008-05-29 20:23:36.000000000 +0900
-+++ lib/mkmf.rb	2008-06-21 14:00:40.000000000 +0900
-@@ -54,6 +54,13 @@
- $vendordir = CONFIG["vendordir"]
- $vendorlibdir = CONFIG["vendorlibdir"]
- $vendorarchdir = CONFIG["vendorarchdir"]
-+# macports -rvendor-specific support
-+if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
-+  CONFIG["sitearch"] = CONFIG["vendorarch"]
-+  CONFIG["sitedir"] = CONFIG["vendordir"]
-+  CONFIG["sitelibdir"] = CONFIG["vendorlibdir"]
-+  CONFIG["sitearchdir"] = CONFIG["vendorarchdir"]
-+end
- 
- $mswin = /mswin/ =~ RUBY_PLATFORM
- $bccwin = /bccwin/ =~ RUBY_PLATFORM
+--- mkconfig.rb.orig	2008-06-21 17:22:11.000000000 +0900
++++ mkconfig.rb	2008-06-21 17:23:00.000000000 +0900
+@@ -147,6 +147,13 @@
+   CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
+   CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
+   CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)"
++  # macports -rvendor-specific support
++  if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
++    CONFIG["sitearch"] = CONFIG["vendorarch"]
++    CONFIG["sitedir"] = CONFIG["vendordir"]
++    CONFIG["sitelibdir"] = CONFIG["vendorlibdir"]
++    CONFIG["sitearchdir"] = CONFIG["vendorarchdir"]
++  end
+   CONFIG["topdir"] = File.dirname(__FILE__)
+   MAKEFILE_CONFIG = {}
+   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080621/e9b92a85/attachment.htm