Index: Mk/bsd.ruby.mk =================================================================== --- Mk/bsd.ruby.mk +++ Mk/bsd.ruby.mk @@ -46,9 +46,6 @@ # (default: setup.rb). # USE_RUBY_RDTOOL - Says that the port uses rdtool to generate documents. # USE_RUBY_RDOC - Says that the port uses rdoc to generate documents. -# USE_RUBY_FEATURES - Says that the port requires some of the following -# features for building and/or running (default: none): -# iconv # RUBY_REQUIRE - Set to a Ruby expression to evaluate before building # the port. The constant "Ruby" is set to the integer # version number of ruby, and the result of the @@ -110,13 +107,11 @@ # RUBY_PORT - Port path of ruby without PORTSDIR. # RUBY_RDTOOL_PORT - Port path of rdtool without PORTSDIR. # RUBY_RDOC_PORT - Port path of rdoc without PORTSDIR. -# RUBY_ICONV_PORT - Port path of ruby-iconv without PORTSDIR. # # DEPEND_LIBRUBY - LIB_DEPENDS entry for libruby. # DEPEND_RUBY - BUILD_DEPENDS/RUN_DEPENDS entry for ruby. # DEPEND_RUBY_RDTOOL - BUILD_DEPENDS entry for rdtool. # DEPEND_RUBY_RDOC - BUILD_DEPENDS entry for rdoc. -# DEPEND_RUBY_ICONV - BUILD_DEPENDS/RUN_DEPENDS entry for ruby-iconv. # # RUBY_LIBDIR - Installation path for architecture independent # libraries. @@ -294,14 +289,11 @@ RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//} RUBY_PORT?= ${RUBY_BASE_PORT} RUBY_RDTOOL_PORT?= textproc/ruby-rdtool -RUBY_RDOC_PORT?= textproc/ruby-rdoc -RUBY_ICONV_PORT?= converters/ruby-iconv # Depends DEPEND_LIBRUBY?= lib${RUBY_NAME}.so.${RUBY_SHLIBVER}:${PORTSDIR}/${RUBY_PORT} DEPEND_RUBY?= ${RUBY}:${PORTSDIR}/${RUBY_PORT} DEPEND_RUBY_RDTOOL?= ${RUBY_RD2}:${PORTSDIR}/${RUBY_RDTOOL_PORT} -DEPEND_RUBY_ICONV= ${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/${RUBY_ICONV_PORT} # Directories RUBY_LIBDIR?= ${_RUBY_SYSLIBDIR}/ruby/${RUBY_VER} Index: archivers/ruby-zip/Makefile =================================================================== --- archivers/ruby-zip/Makefile +++ archivers/ruby-zip/Makefile @@ -14,7 +14,6 @@ COMMENT= Ruby module for reading and writing ZIP files USE_RUBY= yes -USE_RUBY_FEATURES= zlib WRKSRC= ${WRKDIR}/rubyzip-${PORTVERSION} NO_BUILD= yes Index: devel/rubygem-activesupport/Makefile =================================================================== --- devel/rubygem-activesupport/Makefile +++ devel/rubygem-activesupport/Makefile @@ -15,7 +15,6 @@ rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json USE_RUBY= yes -USE_RUBY_FEATURES= iconv USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes Index: devel/rubygem-activesupport4/Makefile =================================================================== --- devel/rubygem-activesupport4/Makefile +++ devel/rubygem-activesupport4/Makefile @@ -20,7 +20,6 @@ USE_RUBY= yes USE_RUBYGEMS= yes -USE_RUBY_FEATURES= iconv RUBYGEM_AUTOPLIST= yes .include Index: devel/rubygem-enumerize/Makefile =================================================================== --- devel/rubygem-enumerize/Makefile +++ devel/rubygem-enumerize/Makefile @@ -15,6 +15,5 @@ USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes -USE_RUBY_FEATURES= iconv .include Index: devel/rubygem-rdoc/Makefile =================================================================== --- devel/rubygem-rdoc/Makefile +++ devel/rubygem-rdoc/Makefile @@ -16,7 +16,6 @@ USE_RUBY= yes USE_RUBYGEMS= yes -USE_RUBY_FEATURES= iconv RUBYGEM_AUTOPLIST= yes GEM_ENV+= RUBYLIB=${PREFIX}/${GEM_LIB_DIR}/lib Index: devel/rubygem-ruby-ole/Makefile =================================================================== --- devel/rubygem-ruby-ole/Makefile +++ devel/rubygem-ruby-ole/Makefile @@ -10,7 +10,6 @@ COMMENT= Library for easy read/write access to OLE compound documents USE_RUBY= yes -USE_RUBY_FEATURES= iconv USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes Index: mail/rubygem-tmail/Makefile =================================================================== --- mail/rubygem-tmail/Makefile +++ mail/rubygem-tmail/Makefile @@ -11,7 +11,6 @@ USE_RUBY= yes USE_RUBYGEMS= yes -USE_RUBY_FEATURES= racc-runtime RUBYGEM_AUTOPLIST= yes .include Index: net/ruby-tcpsocketpipe/Makefile =================================================================== --- net/ruby-tcpsocketpipe/Makefile +++ net/ruby-tcpsocketpipe/Makefile @@ -15,7 +15,6 @@ COMMENT= Ruby library to create I/O pipes for TCP socket tunneling USE_RUBY= yes -USE_RUBY_FEATURES= devel-logger NO_BUILD= yes PLIST_FILES= %%RUBY_SITELIBDIR%%/socketproxy.rb Index: net/rubygem-rightaws/Makefile =================================================================== --- net/rubygem-rightaws/Makefile +++ net/rubygem-rightaws/Makefile @@ -27,8 +27,6 @@ .if ${PORT_OPTIONS:MLIBXML} RUN_DEPENDS+= rubygem-libxml-ruby>=0.5.2:${PORTSDIR}/textproc/rubygem-libxml-ruby -.else -USE_RUBY_FEATURES= rexml .endif .include Index: sysutils/rubygem-chef/Makefile =================================================================== --- sysutils/rubygem-chef/Makefile +++ sysutils/rubygem-chef/Makefile @@ -31,7 +31,6 @@ USE_RUBY= yes USE_RUBYGEMS= yes -USE_RUBY_FEATURES= iconv RUBYGEM_AUTOPLIST= yes SUB_LIST= RUBY=${RUBY} Index: textproc/ruby-rss.alt/Makefile =================================================================== --- textproc/ruby-rss.alt/Makefile +++ textproc/ruby-rss.alt/Makefile @@ -20,7 +20,6 @@ USE_RUBY= yes USE_RUBY_SETUP= yes -USE_RUBY_FEATURES= rexml SADIR= lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH} DOCS_EN= README.en Tutorial.en Index: textproc/ruby-xmlconfigfile/Makefile =================================================================== --- textproc/ruby-xmlconfigfile/Makefile +++ textproc/ruby-xmlconfigfile/Makefile @@ -15,7 +15,6 @@ OPTIONS_DEFINE= DOCS USE_RUBY= yes -USE_RUBY_FEATURES= rexml USE_RUBY_SETUP= yes RUBY_SETUP= install.rb Index: textproc/rubygem-nokogiri/Makefile =================================================================== --- textproc/rubygem-nokogiri/Makefile +++ textproc/rubygem-nokogiri/Makefile @@ -12,7 +12,6 @@ LICENSE= MIT USE_RUBY= yes -USE_RUBY_FEATURES= iconv USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes USE_GNOME= libxml2 libxslt Index: textproc/rubygem-nokogiri14/Makefile =================================================================== --- textproc/rubygem-nokogiri14/Makefile +++ textproc/rubygem-nokogiri14/Makefile @@ -12,7 +12,6 @@ LICENSE= MIT USE_RUBY= yes -USE_RUBY_FEATURES= iconv USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes USE_GNOME= libxml2 libxslt Index: textproc/rubygem-spreadsheet/Makefile =================================================================== --- textproc/rubygem-spreadsheet/Makefile +++ textproc/rubygem-spreadsheet/Makefile @@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-ruby-ole>=1.0:${PORTSDIR}/devel/rubygem-ruby-ole USE_RUBY= yes -USE_RUBY_FEATURES= iconv USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes Index: www/ruby-google/Makefile =================================================================== --- www/ruby-google/Makefile +++ www/ruby-google/Makefile @@ -13,7 +13,6 @@ COMMENT= Ruby interface to Google's SOAP-driven Web API USE_RUBY= yes -USE_RUBY_FEATURES= soap USE_RUBY_SETUP= yes RUBY_SETUP= install.rb Index: www/ruby-wgettsv/Makefile =================================================================== --- www/ruby-wgettsv/Makefile +++ www/ruby-wgettsv/Makefile @@ -15,7 +15,6 @@ USES= shebangfix SHEBANG_FILES= wgettsv USE_RUBY= yes -USE_RUBY_FEATURES= iconv NO_WRKSUBDIR= yes NO_BUILD= yes Index: www/rubygem-maruku/Makefile =================================================================== --- www/rubygem-maruku/Makefile +++ www/rubygem-maruku/Makefile @@ -11,7 +11,6 @@ USE_RUBY= yes USE_RUBYGEMS= yes -USE_RUBY_FEATURES= iconv RUBYGEM_AUTOPLIST= yes PLIST_FILES= bin/maruku bin/marutex