[87161] trunk/dports/lang/ruby19

kimuraw at macports.org kimuraw at macports.org
Sat Nov 12 08:44:45 PST 2011


Revision: 87161
          http://trac.macports.org/changeset/87161
Author:   kimuraw at macports.org
Date:     2011-11-12 08:44:41 -0800 (Sat, 12 Nov 2011)
Log Message:
-----------
lang/ruby19: upgrade to 1.9.3-p0.
  - license changed {Ruby GPL-2} -> {Ruby BSD}
  - allow build with Xcode-4.2 llvm-clang
  - add variant "doc"

Modified Paths:
--------------
    trunk/dports/lang/ruby19/Portfile

Added Paths:
-----------
    trunk/dports/lang/ruby19/files/patch-lib-rubygems-specification.rb.diff

Modified: trunk/dports/lang/ruby19/Portfile
===================================================================
--- trunk/dports/lang/ruby19/Portfile	2011-11-12 16:15:09 UTC (rev 87160)
+++ trunk/dports/lang/ruby19/Portfile	2011-11-12 16:44:41 UTC (rev 87161)
@@ -3,8 +3,8 @@
 PortSystem			1.0
 
 name				ruby19
-version				1.9.2-p290
-revision			2
+version				1.9.3-p0
+revision			0
 
 categories			lang ruby
 maintainers			kimuraw openmaintainer
@@ -19,15 +19,15 @@
 					and slightly incompatible from version 1.8.
 
 homepage			http://www.ruby-lang.org/
-license				{Ruby GPL-2}
+license				{Ruby BSD}
 
 master_sites		ruby:1.9
 use_bzip2			yes
 distname			ruby-${version}
 
-checksums			md5 096758c3e853b839dc980b183227b182 \
-					rmd160 9722a91445fa81a101a2a8ab5753780c4601cc5a \
-					sha1 8f25a74f50a10fdd9724e3c74ccd7bae596e198b
+checksums			md5 65401fb3194cdccd6c1175ab29b8fdb8 \
+					rmd160 92e95f1d41f89864e2e4791b522a815e6bf51711 \
+					sha1 f63c116411b981ef54c2caeefb9ccc4d71a5d2cf
 use_parallel_build	yes
 
 depends_lib			port:libiconv \
@@ -39,19 +39,31 @@
 					port:libffi \
 					port:gdbm
 
-# ruby-1.9.x built with clang or llvm-gcc does not work
-# see list "MacPorts on Lion (common issues, fixes, and workarounds)"
-# http://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html
-if {${configure.compiler} == "clang" ||
-	${configure.compiler} == "llvm-gcc-4.2"} {
-	configure.compiler gcc-4.2
-	if {![file executable ${configure.cc}]} {
-		depends_build-append port:apple-gcc42
-		configure.compiler apple-gcc-4.2
+default_variants	+doc
+
+# https://github.com/rubygems/rubygems/pull/196
+# fix 'Invalid gemspec in [... json-1.6.1.gemspec]: invalid date format in
+#      specification: "2011-09-18 00:00:00.000000000Z"'
+patchfiles			patch-lib-rubygems-specification.rb.diff
+
+# ruby-1.9.3 supports Xcode-4.2 clang and gcc-4.2.
+# ruby built with llvm-gcc will be broken.
+# http://svn.ruby-lang.org/repos/ruby/tags/v1_9_3_0/NEWS
+# http://redmine.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatforms
+if {${configure.compiler} == "llvm-gcc-4.2"} {
+    if {[vercmp $xcodeversion 4.2] >= 0} {
+		configure.compiler clang
+	else
+		configure.compiler gcc-4.2
+		if {![file executable ${configure.cc}]} {
+			depends_build-append port:apple-gcc42
+			configure.compiler apple-gcc-4.2
+		}
 	}
 }
 
 configure.args		--enable-shared \
+					--disable-install-doc \
 					--mandir="${prefix}/share/man" \
 					--enable-pthread \
 					--without-tk \
@@ -120,6 +132,10 @@
 	}
 }
 
+variant doc description "Install rdoc indexes and C API documents" {
+		configure.args-delete   --disable-install-doc
+}
+
 variant tk conflicts mactk description "Build using MacPorts Tk" {
 		configure.args-delete   --without-tk
 		configure.args-append   --with-tk
@@ -133,7 +149,13 @@
 }
 
 variant universal {
+		# use ruby built-in universal mechanism.
 		configure.args-append   --with-arch=[join ${universal_archs} ,]
+		# clear macports' universal flags
+		configure.universal_cflags
+		configure.universal_cppflags
+		configure.universal_cxxflags
+		configure.universal_ldflags
 }
 
 livecheck.type	regex

Added: trunk/dports/lang/ruby19/files/patch-lib-rubygems-specification.rb.diff
===================================================================
--- trunk/dports/lang/ruby19/files/patch-lib-rubygems-specification.rb.diff	                        (rev 0)
+++ trunk/dports/lang/ruby19/files/patch-lib-rubygems-specification.rb.diff	2011-11-12 16:44:41 UTC (rev 87161)
@@ -0,0 +1,13 @@
+Index: lib/rubygems/specification.rb
+===================================================================
+--- lib/rubygems/specification.rb	(revision 33692)
++++ lib/rubygems/specification.rb	(working copy)
+@@ -984,7 +984,7 @@
+     # way to do it.
+     @date = case date
+             when String then
+-              if /\A(\d{4})-(\d{2})-(\d{2})\Z/ =~ date then
++              if /\A(\d{4})-(\d{2})-(\d{2})/ =~ date then
+                 Time.utc($1.to_i, $2.to_i, $3.to_i)
+               else
+                 raise(Gem::InvalidSpecificationException,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111112/6c42bf78/attachment.html>


More information about the macports-changes mailing list