diff options
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby19/files/patch-lib_uri_generic.rb | 19 | ||||
-rw-r--r-- | lang/ruby20/files/patch-lib_uri_generic.rb | 21 | ||||
-rw-r--r-- | lang/ruby21/Makefile | 2 | ||||
-rw-r--r-- | lang/ruby21/files/patch-lib_uri_generic.rb | 21 |
4 files changed, 1 insertions, 62 deletions
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 |