The URb module has been renamed to URI and replaced the formerly

existed URI module, to be adopted officially in the near future.

9 files changed, 26 insertions, 83 deletions

diff --git a/net/Makefile b/net/Makefile
index 93b3d3900a46..5aa7656bf930 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -336,7 +336,6 @@
     SUBDIR += ruby-snmp
     SUBDIR += ruby-soap
     SUBDIR += ruby-tcpsocketpipe
-    SUBDIR += ruby-urb
     SUBDIR += ruby-uri
     SUBDIR += ruby-xmlrpc
     SUBDIR += rwhois
diff --git a/net/ruby-urb/Makefile b/net/ruby-urb/Makefile
deleted file mode 100644
index b280e442cd6b..000000000000
--- a/net/ruby-urb/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:	URb
-# Date created:		13 July 2001
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	urb
-PORTVERSION=	0.4
-CATEGORIES=	net ruby
-MASTER_SITES=	http://arika.org/archive/
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DIST_SUBDIR=	ruby
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_RUBY=	yes
-
-NO_BUILD=	yes
-
-DOCS=		ChangeLog README
-
-do-install:
-	${MKDIR} ${RUBY_SITELIBDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/urb.rb ${RUBY_SITELIBDIR}/
-	${INSTALL_DATA} ${WRKSRC}/urb/* ${RUBY_SITELIBDIR}/${PORTNAME}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/test/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/ruby-urb/distinfo b/net/ruby-urb/distinfo
deleted file mode 100644
index 9ddc22c86961..000000000000
--- a/net/ruby-urb/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ruby/urb-0.4.tar.gz) = a087fc38ba8ca0320e7ddcd6157acab5
diff --git a/net/ruby-urb/pkg-comment b/net/ruby-urb/pkg-comment
deleted file mode 100644
index 67674220f38b..000000000000
--- a/net/ruby-urb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Ruby library for handling URIs
diff --git a/net/ruby-urb/pkg-descr b/net/ruby-urb/pkg-descr
deleted file mode 100644
index c3ca305d4998..000000000000
--- a/net/ruby-urb/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a Ruby library for handling URIs, which will replace ruby-uri
-in the not-too-distant future.
-
-Author:	akira yamada <akira@ruby-lang.org>
-WWW:	http://www.ruby-lang.org/en/raa-list.rhtml?name=URb
diff --git a/net/ruby-urb/pkg-plist b/net/ruby-urb/pkg-plist
deleted file mode 100644
index 67ff0ab85804..000000000000
--- a/net/ruby-urb/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%RUBY_SITELIBDIR%%/urb.rb
-%%RUBY_SITELIBDIR%%/urb/common.rb
-%%RUBY_SITELIBDIR%%/urb/ftp.rb
-%%RUBY_SITELIBDIR%%/urb/generic.rb
-%%RUBY_SITELIBDIR%%/urb/http.rb
-%%RUBY_SITELIBDIR%%/urb/https.rb
-%%RUBY_SITELIBDIR%%/urb/ldap.rb
-%%RUBY_SITELIBDIR%%/urb/mailto.rb
-@dirrm %%RUBY_SITELIBDIR%%/urb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/urb/http.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/urb/ldap.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/urb/mailto.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/urb/testsuite.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/urb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/urb/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/urb/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/urb
diff --git a/net/ruby-uri/Makefile b/net/ruby-uri/Makefile
index 277c657871ed..9ff3b5f6b2c6 100644
--- a/net/ruby-uri/Makefile
+++ b/net/ruby-uri/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	uri
-PORTVERSION=	4.27
+PORTVERSION=	0.9
+PORTEPOCH=	1
 CATEGORIES=	net ruby
-MASTER_SITES=	http://www02.so-net.ne.jp/%7Egreentea/ruby/uri/
+MASTER_SITES=	http://arika.org/archive/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
@@ -18,25 +19,18 @@ USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-MODULES=	uri.rb urireg.rb
-
-DOCS=		index.html
-EXAMPLES=	in-uri.txt test-uri.rb
+DOCS=		ChangeLog README
 
 do-install:
-.for f in ${MODULES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR}
-.endfor
+	${MKDIR} ${RUBY_SITELIBDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/uri.rb ${RUBY_SITELIBDIR}/
+	${INSTALL_DATA} ${WRKSRC}/uri/* ${RUBY_SITELIBDIR}/${PORTNAME}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/uri
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/uri/
-.endfor
-	${MKDIR} ${RUBY_DOCDIR}/uri
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/test/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/uri/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
 .endfor
 .endif
 
diff --git a/net/ruby-uri/distinfo b/net/ruby-uri/distinfo
index 930a9ba6ef61..e850b2e06a10 100644
--- a/net/ruby-uri/distinfo
+++ b/net/ruby-uri/distinfo
@@ -1 +1 @@
-MD5 (ruby/uri-4.27.tar.gz) = 088fd124f11c259dcd6f4601030b1ff0
+MD5 (ruby/uri-0.9.tar.gz) = 94119dfc5ab674c6116051313b2e9b69
diff --git a/net/ruby-uri/pkg-plist b/net/ruby-uri/pkg-plist
index fcf82c40a4da..458cb28b9701 100644
--- a/net/ruby-uri/pkg-plist
+++ b/net/ruby-uri/pkg-plist
@@ -1,7 +1,17 @@
 %%RUBY_SITELIBDIR%%/uri.rb
-%%RUBY_SITELIBDIR%%/urireg.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uri/test-uri.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uri/in-uri.txt
+%%RUBY_SITELIBDIR%%/uri/common.rb
+%%RUBY_SITELIBDIR%%/uri/ftp.rb
+%%RUBY_SITELIBDIR%%/uri/generic.rb
+%%RUBY_SITELIBDIR%%/uri/http.rb
+%%RUBY_SITELIBDIR%%/uri/https.rb
+%%RUBY_SITELIBDIR%%/uri/ldap.rb
+%%RUBY_SITELIBDIR%%/uri/mailto.rb
+@dirrm %%RUBY_SITELIBDIR%%/uri
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uri/http.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uri/ldap.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uri/mailto.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uri/testsuite.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/uri
-%%PORTDOCS%%%%RUBY_DOCDIR%%/uri/index.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/uri/ChangeLog
+%%PORTDOCS%%%%RUBY_DOCDIR%%/uri/README
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/uri