5 files changed, 15 insertions, 42 deletions

diff --git a/www/ruby-http-access/Makefile b/www/ruby-http-access/Makefile
index d57e1f16e13b..1eb7a0e4131f 100644
--- a/www/ruby-http-access/Makefile
+++ b/www/ruby-http-access/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	http-access
-PORTVERSION=	0.0.4p3
+PORTVERSION=	2.B
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.jin.gr.jp/~nahi/Ruby/http-access/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -20,19 +21,15 @@ USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-DOCS_EN=	README_en.txt
-DOCS_JA=	README_ja.txt
+post-patch:
+	${RUBY} -i.orig -pe 'gsub(/\burb\b/, "uri"); gsub(/\bURb\b/, "URI")' \
+		${WRKSRC}/lib/http-access2.rb
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/http-access.rb ${RUBY_SITELIBDIR}/
+	cd ${WRKSRC}; ${RUBY} install.rb
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
-.for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
-.endfor
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
-.endfor
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/ruby-http-access/distinfo b/www/ruby-http-access/distinfo
index 758f5d1adf69..d06e9ce19023 100644
--- a/www/ruby-http-access/distinfo
+++ b/www/ruby-http-access/distinfo
@@ -1 +1 @@
-MD5 (ruby/http-access-0.0.4p3.tar.gz) = d55c36317a08bbba4d9cb7422dcd227d
+MD5 (ruby/http-access2_B.tar.gz) = bb661432f29ba636d0f5bcb85b416a28
diff --git a/www/ruby-http-access/files/patch-http-access.rb b/www/ruby-http-access/files/patch-http-access.rb
deleted file mode 100644
index 5c7f7072b295..000000000000
--- a/www/ruby-http-access/files/patch-http-access.rb
+++ /dev/null
@@ -1,24 +0,0 @@
---- http-access.rb.orig	Fri Jun  9 21:09:28 2000
-+++ http-access.rb	Sat Mar 31 20:31:39 2001
-@@ -28,7 +28,6 @@
- 
- #----------------------------------------------------------------------
- class HTTPAccess
--  include URIModule
- 
-   HTTP_Port = 80
-   attr_reader :http_version, :code, :message, :headers
-@@ -109,7 +108,12 @@
-   end
- 
-   def request_post(path, query, header=nil, maxbytes=nil, &block)
--    queryStr = escape_query(query)
-+    queryStr = case query
-+      when Array
-+        escape_query(query)
-+      else
-+	query.to_s
-+      end
-     request('POST', path, header, queryStr)
-     if block
-       get_response
diff --git a/www/ruby-http-access/pkg-descr b/www/ruby-http-access/pkg-descr
index c43c293ef3a2..422dfe44551c 100644
--- a/www/ruby-http-access/pkg-descr
+++ b/www/ruby-http-access/pkg-descr
@@ -1,3 +1,3 @@
 This is a Ruby library to access the Internet via HTTP.
 
-WWW:	http://www.jin.gr.jp/~nahi/Ruby/http-access/README_en.txt
+WWW:	http://www.ruby-lang.org/en/raa-list.rhtml?name=http-access2
diff --git a/www/ruby-http-access/pkg-plist b/www/ruby-http-access/pkg-plist
index f7e604ec2a75..5e25833f9cad 100644
--- a/www/ruby-http-access/pkg-plist
+++ b/www/ruby-http-access/pkg-plist
@@ -1,5 +1,5 @@
-%%RUBY_SITELIBDIR%%/http-access.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/http-access/README_en.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/http-access/ja/README_ja.txt
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/http-access/ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/http-access
+%%RUBY_SITELIBDIR%%/http-access2.rb
+%%RUBY_SITELIBDIR%%/http-access2/http.rb
+@dirrm %%RUBY_SITELIBDIR%%/http-access2
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/http-access/wcat.rb
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/http-access