lang/ruby*: remove obsolete patches

Remove no longer needed patches for ftp.
While here, fix the test target for ruby21

PR:		192998
Submitted by:	Robert Grimm <rfgrimm@gmail.com>

5 files changed, 4 insertions, 65 deletions

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 17740592ca74..8cce8d759d87 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -177,7 +177,7 @@ RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 # Ruby 1.9
 #
 RUBY_RELVERSION=	1.9.3
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	547
 
@@ -193,7 +193,7 @@ RUBY21=			"@comment "
 # Ruby 2.0
 #
 RUBY_RELVERSION=	2.0.0
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	481
 
@@ -209,7 +209,7 @@ RUBY21=			"@comment "
 # Ruby 2.1
 #
 RUBY_RELVERSION=	2.1.2
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 
diff --git a/lang/ruby19/files/patch-lib_uri_generic.rb b/lang/ruby19/files/patch-lib_uri_generic.rb
deleted file mode 100644
index 74c04fa79553..000000000000
--- a/lang/ruby19/files/patch-lib_uri_generic.rb
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/uri/generic.rb.orig	2009-06-18 16:47:45.000000000 +0400
-+++ lib/uri/generic.rb	2009-06-18 16:48:54.000000000 +0400
-@@ -1032,7 +1032,15 @@
-           end
-         end
- 
--        str << path_query
-+        path = path_query
-+
-+        #
-+        # Add URI delimiter if the path misses it (like as in FTP)
-+        #
-+        if not path.empty? and not str.empty? and path[0, 1] != '/'
-+          path = '/' + path 
-+        end
-+        str << path
-       end
- 
-       if @fragment
diff --git a/lang/ruby20/files/patch-lib_uri_generic.rb b/lang/ruby20/files/patch-lib_uri_generic.rb
deleted file mode 100644
index a8b483e1fd9b..000000000000
--- a/lang/ruby20/files/patch-lib_uri_generic.rb
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/uri/generic.rb.orig	2013-11-27 04:27:22.851503866 +0000
-+++ lib/uri/generic.rb	2013-11-27 04:27:58.130502926 +0000
-@@ -1481,7 +1481,17 @@
-           end
-         end
- 
--        str << path_query
-+        path = path_query
-+
-+        #
-+        # Add URI delimiter if the path misses it (like as in FTP)
-+        #
-+        if not path.empty? and not str.empty? and path[0, 1] != '/'
-+          path = '/' + path
-+        end
-+        str << path
-+       end 
-+       if @fragment
-       end
- 
-       if @fragment
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index 47e46598eff6..adda9ab7db9a 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -229,6 +229,6 @@ validate:
 	rm -rf ${WRKSRC}/rubyspec/*
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/mspec.git)
-	(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${STAGEDIR}${PREFIX}/bin/ruby${RUBY_SUFFIX})
+	(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${PREFIX}/bin/ruby${RUBY_SUFFIX} .)
 
 .include <bsd.port.post.mk>
diff --git a/lang/ruby21/files/patch-lib_uri_generic.rb b/lang/ruby21/files/patch-lib_uri_generic.rb
deleted file mode 100644
index a8b483e1fd9b..000000000000
--- a/lang/ruby21/files/patch-lib_uri_generic.rb
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/uri/generic.rb.orig	2013-11-27 04:27:22.851503866 +0000
-+++ lib/uri/generic.rb	2013-11-27 04:27:58.130502926 +0000
-@@ -1481,7 +1481,17 @@
-           end
-         end
- 
--        str << path_query
-+        path = path_query
-+
-+        #
-+        # Add URI delimiter if the path misses it (like as in FTP)
-+        #
-+        if not path.empty? and not str.empty? and path[0, 1] != '/'
-+          path = '/' + path
-+        end
-+        str << path
-+       end 
-+       if @fragment
-       end
- 
-       if @fragment