Update obsolete dependencies with USE_RUBY_FEATURES.

12 files changed, 19 insertions, 29 deletions

diff --git a/databases/ruby-dbd_proxy/Makefile b/databases/ruby-dbd_proxy/Makefile
index 51c0605e43b6..b93c93857c85 100644
--- a/databases/ruby-dbd_proxy/Makefile
+++ b/databases/ruby-dbd_proxy/Makefile
@@ -17,10 +17,10 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Proxy/Server driver for DBI-for-Ruby
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/dbi.rb:${RUBY_DBI_PORTDIR} \
-		${RUBY_SITELIBDIR}/drb.rb:${PORTSDIR}/net/ruby-drb
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/dbi.rb:${RUBY_DBI_PORTDIR}
 
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	drb
 USE_RUBY_SETUP=	yes
 
 WRKSRC=		${RUBY_DBI_WRKSRC}
diff --git a/irc/rbot/Makefile b/irc/rbot/Makefile
index 90a1cb9327ab..1bc8a77d11ce 100644
--- a/irc/rbot/Makefile
+++ b/irc/rbot/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES=	http://linuxbrit.co.uk/downloads/
 MAINTAINER=	david+ports@bushong.net
 COMMENT=	Ruby IRC bot similar to infobot
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb \
-		${RUBY_SITELIBDIR}/rexml/document.rb:${PORTSDIR}/textproc/ruby-rexml
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
 
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	rexml
 
 NO_BUILD=	yes
 
diff --git a/net/raggle/Makefile b/net/raggle/Makefile
index ddb8b190ff7e..23cdf77fca77 100644
--- a/net/raggle/Makefile
+++ b/net/raggle/Makefile
@@ -14,11 +14,10 @@ MASTER_SITES=	http://www.raggle.org/files/
 MAINTAINER=	gslin@ccca.nctu.edu.tw
 COMMENT=	A console RSS aggregator written in Ruby
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/rexml/rexml.rb:${PORTSDIR}/textproc/ruby-rexml	\
-		${RUBY_SITELIBDIR}/ncurses.rb:${PORTSDIR}/devel/ruby-ncurses	\
-		${RUBY_SITELIBDIR}/yaml.rb:${PORTSDIR}/devel/ruby-yaml
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/ncurses.rb:${PORTSDIR}/devel/ruby-ncurses
 
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	rexml yaml
 
 NO_BUILD=	yes
 
diff --git a/net/ruby-jabber4r/Makefile b/net/ruby-jabber4r/Makefile
index 1eb88b6b5942..e4fab6d3c255 100644
--- a/net/ruby-jabber4r/Makefile
+++ b/net/ruby-jabber4r/Makefile
@@ -15,9 +15,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby library to connect to an existing Jabber account
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/rexml/rexml.rb:${PORTSDIR}/textproc/ruby-rexml
-
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	rexml
 USE_RUBY_RDOC=		yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/net/ruby-socketproxy/Makefile b/net/ruby-socketproxy/Makefile
index c7376cf6ac40..659b6bad7f7a 100644
--- a/net/ruby-socketproxy/Makefile
+++ b/net/ruby-socketproxy/Makefile
@@ -17,10 +17,10 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby library to create I/O pipes for TCP socket tunneling
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/logger.rb:${PORTSDIR}/sysutils/ruby-devel-logger \
-		${RUBY_SITELIBDIR}/dump.rb:${PORTSDIR}/converters/ruby-dump.rb
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/dump.rb:${PORTSDIR}/converters/ruby-dump.rb
 
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	devel-logger
 
 NO_BUILD=	yes
 
diff --git a/net/ruby-tcpsocketpipe/Makefile b/net/ruby-tcpsocketpipe/Makefile
index c7376cf6ac40..659b6bad7f7a 100644
--- a/net/ruby-tcpsocketpipe/Makefile
+++ b/net/ruby-tcpsocketpipe/Makefile
@@ -17,10 +17,10 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby library to create I/O pipes for TCP socket tunneling
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/logger.rb:${PORTSDIR}/sysutils/ruby-devel-logger \
-		${RUBY_SITELIBDIR}/dump.rb:${PORTSDIR}/converters/ruby-dump.rb
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/dump.rb:${PORTSDIR}/converters/ruby-dump.rb
 
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	devel-logger
 
 NO_BUILD=	yes
 
diff --git a/sysutils/rlogview/Makefile b/sysutils/rlogview/Makefile
index f5c118860538..236924b1b0f2 100644
--- a/sysutils/rlogview/Makefile
+++ b/sysutils/rlogview/Makefile
@@ -19,12 +19,10 @@ COMMENT=	A Ruby/GTK graphical log viewer for log4r
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/log4r.rb:${PORTSDIR}/sysutils/ruby-log4r \
 		${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk \
-		${RUBY_SITEARCHLIBDIR}/lglade.so:${PORTSDIR}/devel/ruby-libglade \
-		${RUBY_SITELIBDIR}/drb.rb:${PORTSDIR}/net/ruby-drb
-# ROMP is the alternative method to DRb.
-#		${RUBY_SITELIBDIR}/romp.rb:${PORTSDIR}/net/ruby-romp
+		${RUBY_SITEARCHLIBDIR}/lglade.so:${PORTSDIR}/devel/ruby-libglade
 
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	drb
 
 NO_BUILD=	yes
 
diff --git a/textproc/ruby-xmlconfigfile/Makefile b/textproc/ruby-xmlconfigfile/Makefile
index 38de56ce1bfe..916b485c1907 100644
--- a/textproc/ruby-xmlconfigfile/Makefile
+++ b/textproc/ruby-xmlconfigfile/Makefile
@@ -16,11 +16,10 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby module for easy handling of XML configuration files
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/rexml/document.rb:${PORTSDIR}/textproc/ruby-rexml
-
 USE_ZIP=	yes
 
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	rexml
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	install.rb
 
diff --git a/www/ruby-borges/Makefile b/www/ruby-borges/Makefile
index 3e03a863576b..b596e7c7cc40 100644
--- a/www/ruby-borges/Makefile
+++ b/www/ruby-borges/Makefile
@@ -15,9 +15,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A web application framework for Ruby that allows linear programming
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/webrick.rb:${PORTSDIR}/www/ruby-webrick
-
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	webrick
 
 NO_BUILD=	yes
 
diff --git a/www/ruby-div/Makefile b/www/ruby-div/Makefile
index e3b916964d0d..1e9e7ce6e0c0 100644
--- a/www/ruby-div/Makefile
+++ b/www/ruby-div/Makefile
@@ -15,10 +15,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A web application server using dRuby and ERB2
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/drb.rb:${PORTSDIR}/net/ruby-drb
-
 USE_RUBY=	yes
-USE_RUBY_FEATURES=	erb
+USE_RUBY_FEATURES=	drb erb
 
 NO_BUILD=	yes
 
diff --git a/www/ruby-google/Makefile b/www/ruby-google/Makefile
index 8bac75e87376..3d4925b670f0 100644
--- a/www/ruby-google/Makefile
+++ b/www/ruby-google/Makefile
@@ -16,9 +16,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A Ruby interface to Google's SOAP-driven Web API
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/soap/wsdlDriver.rb:${PORTSDIR}/net/ruby-soap
-
 USE_RUBY=	yes
+USE_RUBY_FEATURES=	soap
 USE_RUBY_SETUP=	yes
 RUBY_SETUP=	install.rb
 
diff --git a/www/ruby-webunit/Makefile b/www/ruby-webunit/Makefile
index 78473fb263e6..1b3b4a800351 100644
--- a/www/ruby-webunit/Makefile
+++ b/www/ruby-webunit/Makefile
@@ -18,11 +18,10 @@ COMMENT=	A Ruby API for automated unit testing of web sites
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/html-parser.rb:${PORTSDIR}/textproc/ruby-html-parser \
 		${RUBY_SITELIBDIR}/htmlrepair.rb:${PORTSDIR}/textproc/ruby-htmlrepair \
-		${RUBY_SITELIBDIR}/htmlsplit.rb:${PORTSDIR}/textproc/ruby-htmlsplit \
-		${RUBY_SITELIBDIR}/rexml/rexml.rb:${PORTSDIR}/textproc/ruby-rexml
+		${RUBY_SITELIBDIR}/htmlsplit.rb:${PORTSDIR}/textproc/ruby-htmlsplit
 
 USE_RUBY=	yes
-USE_RUBY_FEATURES=	testunit
+USE_RUBY_FEATURES=	rexml testunit
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes