Let net/ruby-uri and devel/ruby-timex retire, which have now been

included in the standard distribution of ruby. (both 1.6 and 1.7)

Bump PORTREVISIONs of dependent ports for those who don't use
portupgrade/pkgdb which can handle stale package dependencies.

7 files changed, 1 insertions, 64 deletions

diff --git a/net/Makefile b/net/Makefile
index 60e8de85f21..40a96c7dec9 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -402,7 +402,6 @@
     SUBDIR += ruby-snmp
     SUBDIR += ruby-soap
     SUBDIR += ruby-tcpsocketpipe
-    SUBDIR += ruby-uri
     SUBDIR += ruby-xmlrpc
     SUBDIR += rwhois
     SUBDIR += samba
diff --git a/net/ruby-soap/Makefile b/net/ruby-soap/Makefile
index 23247e7d9ba..bbdb5f9c559 100644
--- a/net/ruby-soap/Makefile
+++ b/net/ruby-soap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	soap
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	net ruby
 MASTER_SITES=	http://www.jin.gr.jp/~nahi/Ruby/SOAP4R/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -16,7 +17,6 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/application.rb:${PORTSDIR}/sysutils/ruby-application.rb \
-		${RUBY_SITELIBDIR}/uri.rb:${PORTSDIR}/net/ruby-uri \
 		${RUBY_SITELIBDIR}/http-access2.rb:${PORTSDIR}/www/ruby-http-access \
 		${RUBY_SITELIBDIR}/GServer.rb:${PORTSDIR}/net/ruby-gserver \
 		${RUBY_SITELIBDIR}/date3.rb:${PORTSDIR}/devel/ruby-date2 \
diff --git a/net/ruby-uri/Makefile b/net/ruby-uri/Makefile
deleted file mode 100644
index 9ff3b5f6b2c..00000000000
--- a/net/ruby-uri/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	Ruby-uri
-# Date created:		14 Aug 2000
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	uri
-PORTVERSION=	0.9
-PORTEPOCH=	1
-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}/uri.rb ${RUBY_SITELIBDIR}/
-	${INSTALL_DATA} ${WRKSRC}/uri/* ${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-uri/distinfo b/net/ruby-uri/distinfo
deleted file mode 100644
index e850b2e06a1..00000000000
--- a/net/ruby-uri/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ruby/uri-0.9.tar.gz) = 94119dfc5ab674c6116051313b2e9b69
diff --git a/net/ruby-uri/pkg-comment b/net/ruby-uri/pkg-comment
deleted file mode 100644
index 4e1ca37750d..00000000000
--- a/net/ruby-uri/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ruby interface to parse URIs according to RFC 2396
diff --git a/net/ruby-uri/pkg-descr b/net/ruby-uri/pkg-descr
deleted file mode 100644
index 9ac6852e558..00000000000
--- a/net/ruby-uri/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a Ruby interface to parse URIs according to RFC 2396.  FTP and
-HTTP URLs are supported for the present.
-
-
-Author:	Tomoyuki Kosimizu <greentea@fa2.so-net.ne.jp>
-WWW:	http://www02.so-net.ne.jp/%7Egreentea/ruby/uri/
diff --git a/net/ruby-uri/pkg-plist b/net/ruby-uri/pkg-plist
deleted file mode 100644
index 458cb28b970..00000000000
--- a/net/ruby-uri/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%RUBY_SITELIBDIR%%/uri.rb
-%%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/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/uri/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/uri