[48382] trunk/dports/lang/ruby

[kimuraw at macports.org]

Revision: 48382
          http://trac.macports.org/changeset/48382
Author:   kimuraw at macports.org
Date:     2009-03-20 09:18:05 -0700 (Fri, 20 Mar 2009)
Log Message:
-----------
lang/ruby: 1.8.7-p72 rev3

  remove unneeded patch "patch-socket.c". ruby with this patch has the 
  following error:

    % ruby -rsocket -e 'p TCPServer.open(0)'
    -e:1:in `initialize': getaddrinfo: nodename nor servname provided,
    or not known (SocketError)
	  from -e:1:in `open'
	  from -e:1

Revision Links:
--------------
    http://trac.macports.org/changeset/3

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

Removed Paths:
-------------
    trunk/dports/lang/ruby/files/patch-socket.c

Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile	2009-03-20 15:19:58 UTC (rev 48381)
+++ trunk/dports/lang/ruby/Portfile	2009-03-20 16:18:05 UTC (rev 48382)
@@ -4,7 +4,7 @@
 
 name			ruby
 version			1.8.7-p72
-revision		2
+revision		3
 
 categories		lang ruby
 maintainers		kimuraw
@@ -38,9 +38,7 @@
 patchfiles		patch-Makefile.in \
 				patch-configure.in \
 				patch-mkmf.rb \
-				patch-mkconfig.rb \
-				patch-socket.c \
-				patch-test_socket.rb
+				patch-mkconfig.rb
 
 # http://trac.macports.org/ticket/16853
 # abandon wrapping if the line contains no space.
@@ -109,6 +107,6 @@
 
 livecheck.check	regex
 livecheck.url	http://www.ruby-lang.org/en/downloads/
-livecheck.regex	{>Ruby (.*?)</a> \(md5:}
+livecheck.regex	{>Ruby (1.8.*?)</a> \(md5:}
 
 test.run	yes

Deleted: trunk/dports/lang/ruby/files/patch-socket.c
===================================================================
--- trunk/dports/lang/ruby/files/patch-socket.c	2009-03-20 15:19:58 UTC (rev 48381)
+++ trunk/dports/lang/ruby/files/patch-socket.c	2009-03-20 16:18:05 UTC (rev 48382)
@@ -1,49 +0,0 @@
---- ext/socket/socket.c.orig	2008-06-05 23:02:57.000000000 -0700
-+++ ext/socket/socket.c	2008-06-05 23:07:36.000000000 -0700
-@@ -877,6 +877,14 @@
-     }
-     else if (FIXNUM_P(port)) {
- 	snprintf(pbuf, len, "%ld", FIX2LONG(port));
-+	/* It looks like getaddrinfo changed in Mac OS X 10.5.3 so that sending "0" 
-+	 * as the argument for the port number makes it return EAI_NONAME
-+	 * but feeding it a port number of NULL seems to do the trick.
-+	 * RSD - 2008-06-05
-+	 */ 
-+	if (FIX2LONG(port) == 0) {
-+		return "";
-+	}
- 	return pbuf;
-     }
-     else {
-@@ -3572,6 +3580,14 @@
-     else if (FIXNUM_P(port)) {
- 	snprintf(pbuf, sizeof(pbuf), "%ld", FIX2LONG(port));
- 	pptr = pbuf;
-+	/* It looks like getaddrinfo changed in Mac OS X 10.5.3 so that sending "0" 
-+	 * as the argument for the port number makes it return EAI_NONAME
-+	 * but feeding it a port number of NULL seems to do the trick.
-+	 * RSD - 2008-06-05
-+	 */ 
-+	if (FIX2LONG(port) == 0) {
-+		pptr = NULL;
-+	}
-     }
-     else {
- 	strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
-@@ -3697,7 +3713,15 @@
- 	}
- 	else if (FIXNUM_P(port)) {
- 	    snprintf(pbuf, sizeof(pbuf), "%ld", NUM2LONG(port));
--	    pptr = pbuf;
-+		pptr = pbuf;
-+		/* It looks like getaddrinfo changed in Mac OS X 10.5.3 so that sending "0" 
-+		 * as the argument for the port number makes it return EAI_NONAME
-+		 * but feeding it a port number of NULL seems to do the trick.
-+		 * RSD - 2008-06-05
-+		 */ 
-+		if (NUM2LONG(port) == 0) {
-+			pptr = NULL;
-+		}
- 	}
- 	else {
- 	    strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090320/5362d5fe/attachment.html>