18 files changed, 6 insertions, 119 deletions

diff --git a/devel/Makefile b/devel/Makefile
index b357fea32813..b518e3202973 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -580,7 +580,6 @@
     SUBDIR += ruby-strscan
     SUBDIR += ruby-sysvipc
     SUBDIR += ruby-textbuf
-    SUBDIR += ruby-timex
     SUBDIR += ruby-tzfile
     SUBDIR += ruby-unit
     SUBDIR += rudiments
diff --git a/devel/ruby-timex/Makefile b/devel/ruby-timex/Makefile
deleted file mode 100644
index 6320d235e105..000000000000
--- a/devel/ruby-timex/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	Ruby/timex
-# Date created:		2 November 2001
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	timex
-PORTVERSION=	0.2
-CATEGORIES=	devel ruby
-MASTER_SITES=	http://cvs.m17n.org/cgi-bin/viewcvs/${PORTNAME}/
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	timex-${PORTVERSION}${EXTRACT_SUFX}\?tarball=1\&only_with_tag=${PORTNAME}-${PORTVERSION:S/./_/g}\&cvsroot=ruby\&
-DIST_SUBDIR=	ruby
-
-MAINTAINER=	knu@FreeBSD.org
-
-USE_RUBY=	yes
-.if !defined(NOPORTDOCS)
-USE_RUBY_RD=	yes
-.endif
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-do-build:
-.if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${RUBY_RD} timex.rb > timex.html
-.endif
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/timex.rb ${RUBY_SITELIBDIR}/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/timex.html ${RUBY_DOCDIR}/${PORTNAME}/
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-timex/distinfo b/devel/ruby-timex/distinfo
deleted file mode 100644
index f75908a3c46e..000000000000
--- a/devel/ruby-timex/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ruby/timex-0.2.tar.gz?tarball=1&only_with_tag=timex-0_2&cvsroot=ruby&.tar.gz) = 33e4cd81642e3126cad6f565d4588286
diff --git a/devel/ruby-timex/pkg-comment b/devel/ruby-timex/pkg-comment
deleted file mode 100644
index 685725e5ff1f..000000000000
--- a/devel/ruby-timex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Ruby library to extend the Time class
diff --git a/devel/ruby-timex/pkg-descr b/devel/ruby-timex/pkg-descr
deleted file mode 100644
index 4da8676e52f9..000000000000
--- a/devel/ruby-timex/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The timex library extends Time to provide leapseconds and localtime -
-UTC offset information.  It also provides stringization methods for
-RFC 2822 and ISO 8601 and a date string parser method.
-
-Author:	Tanaka Akira <akr@m17n.org>
-WWW:	http://cvs.m17n.org/~akr/timex/
diff --git a/devel/ruby-timex/pkg-plist b/devel/ruby-timex/pkg-plist
deleted file mode 100644
index a06c63694ea2..000000000000
--- a/devel/ruby-timex/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%RUBY_SITELIBDIR%%/timex.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/timex/timex.html
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/timex
diff --git a/net/Makefile b/net/Makefile
index 60e8de85f217..40a96c7dec94 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 23247e7d9baf..bbdb5f9c5595 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 9ff3b5f6b2c6..000000000000
--- 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 e850b2e06a10..000000000000
--- 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 4e1ca37750d5..000000000000
--- 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 9ac6852e558f..000000000000
--- 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 458cb28b9701..000000000000
--- 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
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 55c20e4ea7fa..3b861378d6d1 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	20020122
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -20,7 +21,6 @@ MAINTAINER=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
-		${RUBY_SITELIBDIR}/uri.rb:${PORTSDIR}/net/ruby-uri \
 		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup
 
 USE_RUBY=	yes
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 55c20e4ea7fa..3b861378d6d1 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	20020122
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -20,7 +21,6 @@ MAINTAINER=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
-		${RUBY_SITELIBDIR}/uri.rb:${PORTSDIR}/net/ruby-uri \
 		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup
 
 USE_RUBY=	yes
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 55c20e4ea7fa..3b861378d6d1 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	20020122
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -20,7 +21,6 @@ MAINTAINER=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
-		${RUBY_SITELIBDIR}/uri.rb:${PORTSDIR}/net/ruby-uri \
 		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup
 
 USE_RUBY=	yes
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 55c20e4ea7fa..3b861378d6d1 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	20020122
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -20,7 +21,6 @@ MAINTAINER=	knu@FreeBSD.org
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse \
 		${RUBY_SITEARCHLIBDIR}/fnmatch.so:${PORTSDIR}/devel/ruby-fnmatch \
-		${RUBY_SITELIBDIR}/uri.rb:${PORTSDIR}/net/ruby-uri \
 		${LOCALBASE}/sbin/pkg_tarup:${PORTSDIR}/misc/pkg_tarup
 
 USE_RUBY=	yes
diff --git a/www/ruby-http-access/Makefile b/www/ruby-http-access/Makefile
index a92d78aa780b..f4836bf8ea47 100644
--- a/www/ruby-http-access/Makefile
+++ b/www/ruby-http-access/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	http-access
 PORTVERSION=	2.C
+PORTREVISION=	1
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.jin.gr.jp/~nahi/Ruby/http-access/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -15,8 +16,6 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/uri.rb:${PORTSDIR}/net/ruby-uri
-
 USE_RUBY=	yes
 
 NO_BUILD=	yes