Index: Mk/bsd.ruby.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.ruby.mk,v retrieving revision 1.210 diff -u -r1.210 bsd.ruby.mk --- Mk/bsd.ruby.mk 24 Aug 2011 00:52:12 -0000 1.210 +++ Mk/bsd.ruby.mk 29 Aug 2011 07:23:20 -0000 @@ -386,10 +386,8 @@ # .if defined(USE_RUBYGEMS) -. if ${RUBY_VER} == 1.8 BUILD_DEPENDS+= ${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems RUN_DEPENDS+= ${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems -. endif PKGNAMEPREFIX?= rubygem- EXTRACT_SUFX= .gem Index: lang/ruby19/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/ruby19/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- lang/ruby19/Makefile 23 Aug 2011 03:47:28 -0000 1.12 +++ lang/ruby19/Makefile 29 Aug 2011 07:40:09 -0000 @@ -86,10 +86,7 @@ PLIST_SUB+= IF_DEFAULT="@comment " .endif -GEMS_DIR= ${PREFIX}/lib/ruby/gems/${RUBY_VER} -PLIST_SUB+= GEMS_DIR="lib/ruby/gems/${RUBY_VER}" - -INSTALLED_SCRIPTS= irb erb rdoc ri ruby testrb gem +INSTALLED_SCRIPTS= irb erb rdoc ri ruby testrb EXTSAMPLES= bigdecimal/sample/*.rb \ curses/hello.rb \ @@ -136,6 +133,12 @@ ${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/ .endfor +# we get ruby-gems from ports +.for d in bin/gem doc/rubygems lib/rubygems test/rubygems \ + lib/rubygems.rb lib/ubygems.rb gem_prelude.rb + ${RM} -rf ${BUILD_WRKSRC}/${d} +.endfor + # we get rake from ports .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ${RM} -rf ${BUILD_WRKSRC}/${d} @@ -166,8 +169,6 @@ ${TOUCH} ${RUBY_DOCDIR}/.keep_me ${TOUCH} ${RUBY_SITEARCHLIBDIR}/.keep_me ${TOUCH} ${RUBY_VENDORARCHLIBDIR}/.keep_me - ${MKDIR} ${GEMS_DIR}/gems - ${TOUCH} ${GEMS_DIR}/gems/.keep_me post-install: # @@ -285,29 +286,6 @@ @${FIND} -ds ${RUBY_LIBDIR}/ -type d | ${SORT} -r | \ ${SED} -E -e 's,^${RUBY_LIBDIR}(.*),@dirrm %%RUBY_LIBDIR%%\1,' >> pkg-plist -# -# Find all gem files/folders -# - @${FIND} -ds ${GEMS_DIR}/ ! -type d | \ - ${SED} 's,^${GEMS_DIR},%%GEMS_DIR%%,' >> pkg-plist - @${FIND} -ds ${GEMS_DIR}/ -type d | ${SORT} -r | \ - ${SED} -E -e 's,^${GEMS_DIR}(.*),@dirrm %%GEMS_DIR%%\1,' >> pkg-plist - - @${ECHO_CMD} "%%RUBY_SITEARCHLIBDIR%%/.keep_me" >> pkg-plist - @${ECHO_CMD} "@dirrmtry %%RUBY_SITEARCHLIBDIR%%" >> pkg-plist - @${ECHO_CMD} "@dirrmtry %%RUBY_SITELIBDIR%%" >> pkg-plist - @${ECHO_CMD} "@dirrmtry lib/ruby/site_ruby" >> pkg-plist - - @${ECHO_CMD} "%%RUBY_VENDORARCHLIBDIR%%/.keep_me" >> pkg-plist - @${ECHO_CMD} "@dirrmtry %%RUBY_VENDORARCHLIBDIR%%" >> pkg-plist - @${ECHO_CMD} "@dirrmtry %%RUBY_VENDORLIBDIR%%" >> pkg-plist - @${ECHO_CMD} "@dirrmtry lib/ruby/vendor_ruby" >> pkg-plist - @${ECHO_CMD} "@dirrmtry lib/ruby/gems" >> pkg-plist - - @${ECHO_CMD} "@dirrmtry lib/ruby" >> pkg-plist - - @${SED} -i "" -E -e "s,${RUBY_ARCH},%%RUBY_ARCH%%,g" pkg-plist - test: @(cd ${WRKSRC}; ${MAKE} test) Index: lang/ruby19/pkg-plist =================================================================== RCS file: /home/ncvs/ports/lang/ruby19/pkg-plist,v retrieving revision 1.10 diff -u -r1.10 pkg-plist --- lang/ruby19/pkg-plist 23 Aug 2011 03:47:28 -0000 1.10 +++ lang/ruby19/pkg-plist 29 Aug 2011 07:55:05 -0000 @@ -10,8 +10,6 @@ %%IF_DEFAULT%%bin/ruby bin/testrb%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/testrb -bin/gem%%RUBY_SUFFIX%% -%%IF_DEFAULT%%bin/gem lib/lib%%RUBY_NAME%%-static.a lib/lib%%RUBY_NAME%%.so lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% @@ -71,14 +69,9 @@ %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja %%PORTDOCS%%%%RUBY_DOCDIR%%/ripper/README -%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/ChangeLog -%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/History.txt -%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/LICENSE.txt -%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/README %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja %%PORTDOCS%%%%RUBY_DOCDIR%%/stringio/README -%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rubygems %%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/stringio @@ -719,91 +712,6 @@ %%RUBY_LIBDIR%%/rss/parser.rb %%RUBY_LIBDIR%%/rss/rexmlparser.rb %%RUBY_LIBDIR%%/rss/rss.rb -%%RUBY_LIBDIR%%/rubygems/builder.rb -%%RUBY_LIBDIR%%/rubygems/command.rb -%%RUBY_LIBDIR%%/rubygems/command_manager.rb -%%RUBY_LIBDIR%%/rubygems/commands/build_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/cert_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/check_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/cleanup_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/contents_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/dependency_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/environment_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/fetch_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/generate_index_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/help_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/install_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/list_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/lock_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/mirror_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/outdated_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/owner_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/pristine_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/push_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/query_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/rdoc_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/search_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/server_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/setup_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/sources_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/specification_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/stale_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/uninstall_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/unpack_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/update_command.rb -%%RUBY_LIBDIR%%/rubygems/commands/which_command.rb -%%RUBY_LIBDIR%%/rubygems/config_file.rb -%%RUBY_LIBDIR%%/rubygems/custom_require.rb -%%RUBY_LIBDIR%%/rubygems/defaults.rb -%%RUBY_LIBDIR%%/rubygems/dependency.rb -%%RUBY_LIBDIR%%/rubygems/dependency_installer.rb -%%RUBY_LIBDIR%%/rubygems/dependency_list.rb -%%RUBY_LIBDIR%%/rubygems/doc_manager.rb -%%RUBY_LIBDIR%%/rubygems/errors.rb -%%RUBY_LIBDIR%%/rubygems/exceptions.rb -%%RUBY_LIBDIR%%/rubygems/ext/builder.rb -%%RUBY_LIBDIR%%/rubygems/ext/configure_builder.rb -%%RUBY_LIBDIR%%/rubygems/ext/ext_conf_builder.rb -%%RUBY_LIBDIR%%/rubygems/ext/rake_builder.rb -%%RUBY_LIBDIR%%/rubygems/ext.rb -%%RUBY_LIBDIR%%/rubygems/format.rb -%%RUBY_LIBDIR%%/rubygems/gem_openssl.rb -%%RUBY_LIBDIR%%/rubygems/gem_path_searcher.rb -%%RUBY_LIBDIR%%/rubygems/gem_runner.rb -%%RUBY_LIBDIR%%/rubygems/gemcutter_utilities.rb -%%RUBY_LIBDIR%%/rubygems/indexer.rb -%%RUBY_LIBDIR%%/rubygems/install_update_options.rb -%%RUBY_LIBDIR%%/rubygems/installer.rb -%%RUBY_LIBDIR%%/rubygems/local_remote_options.rb -%%RUBY_LIBDIR%%/rubygems/old_format.rb -%%RUBY_LIBDIR%%/rubygems/package/f_sync_dir.rb -%%RUBY_LIBDIR%%/rubygems/package/tar_header.rb -%%RUBY_LIBDIR%%/rubygems/package/tar_input.rb -%%RUBY_LIBDIR%%/rubygems/package/tar_output.rb -%%RUBY_LIBDIR%%/rubygems/package/tar_reader/entry.rb -%%RUBY_LIBDIR%%/rubygems/package/tar_reader.rb -%%RUBY_LIBDIR%%/rubygems/package/tar_writer.rb -%%RUBY_LIBDIR%%/rubygems/package.rb -%%RUBY_LIBDIR%%/rubygems/package_task.rb -%%RUBY_LIBDIR%%/rubygems/platform.rb -%%RUBY_LIBDIR%%/rubygems/remote_fetcher.rb -%%RUBY_LIBDIR%%/rubygems/require_paths_builder.rb -%%RUBY_LIBDIR%%/rubygems/requirement.rb -%%RUBY_LIBDIR%%/rubygems/security.rb -%%RUBY_LIBDIR%%/rubygems/server.rb -%%RUBY_LIBDIR%%/rubygems/source_index.rb -%%RUBY_LIBDIR%%/rubygems/source_info_cache.rb -%%RUBY_LIBDIR%%/rubygems/source_info_cache_entry.rb -%%RUBY_LIBDIR%%/rubygems/spec_fetcher.rb -%%RUBY_LIBDIR%%/rubygems/specification.rb -%%RUBY_LIBDIR%%/rubygems/test_utilities.rb -%%RUBY_LIBDIR%%/rubygems/text.rb -%%RUBY_LIBDIR%%/rubygems/uninstaller.rb -%%RUBY_LIBDIR%%/rubygems/user_interaction.rb -%%RUBY_LIBDIR%%/rubygems/validator.rb -%%RUBY_LIBDIR%%/rubygems/version.rb -%%RUBY_LIBDIR%%/rubygems/version_option.rb -%%RUBY_LIBDIR%%/rubygems.rb %%RUBY_LIBDIR%%/rss/slash.rb %%RUBY_LIBDIR%%/rss/syndication.rb %%RUBY_LIBDIR%%/rss/taxonomy.rb @@ -855,7 +763,6 @@ %%RUBY_LIBDIR%%/tmpdir.rb %%RUBY_LIBDIR%%/tracer.rb %%RUBY_LIBDIR%%/tsort.rb -%%RUBY_LIBDIR%%/ubygems.rb %%RUBY_LIBDIR%%/un.rb %%RUBY_LIBDIR%%/uri/common.rb %%RUBY_LIBDIR%%/uri/ftp.rb @@ -926,11 +833,6 @@ @dirrm %%RUBY_LIBDIR%%/test @dirrm %%RUBY_LIBDIR%%/syck @dirrm %%RUBY_LIBDIR%%/shell -@dirrm %%RUBY_LIBDIR%%/rubygems/package/tar_reader -@dirrm %%RUBY_LIBDIR%%/rubygems/package -@dirrm %%RUBY_LIBDIR%%/rubygems/ext -@dirrm %%RUBY_LIBDIR%%/rubygems/commands -@dirrm %%RUBY_LIBDIR%%/rubygems @dirrm %%RUBY_LIBDIR%%/rss/maker @dirrm %%RUBY_LIBDIR%%/rss/dublincore @dirrm %%RUBY_LIBDIR%%/rss/content @@ -989,9 +891,6 @@ @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dl @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%% -%%GEMS_DIR%%/gems/.keep_me -@dirrm %%GEMS_DIR%%/gems -@dirrm %%GEMS_DIR%% @dirrm %%RUBY_LIBDIR%%/ %%RUBY_SITEARCHLIBDIR%%/.keep_me @dirrm %%RUBY_SITEARCHLIBDIR%% @@ -1000,6 +899,5 @@ %%RUBY_VENDORARCHLIBDIR%%/.keep_me @dirrm %%RUBY_VENDORARCHLIBDIR%% @dirrm %%RUBY_VENDORLIBDIR%% -@dirrmtry lib/ruby/gems @dirrmtry lib/ruby/vendor_ruby @dirrmtry lib/ruby Index: lang/ruby19/files/patch-common.mk =================================================================== RCS file: /home/ncvs/ports/lang/ruby19/files/patch-common.mk,v retrieving revision 1.3 diff -u -r1.3 patch-common.mk --- lang/ruby19/files/patch-common.mk 23 Aug 2011 03:47:28 -0000 1.3 +++ lang/ruby19/files/patch-common.mk 29 Aug 2011 07:47:30 -0000 @@ -1,5 +1,14 @@ --- common.mk.orig 2011-05-17 21:19:20.689620679 -0400 +++ common.mk 2011-05-17 21:19:28.688621223 -0400 +@@ -96,7 +96,7 @@ + + GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) + +-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb ++PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb + PRELUDES = prelude.c miniprelude.c + GOLFPRELUDES = golf_prelude.c + @@ -256,7 +256,7 @@ install-capi: capi pre-install-capi do-install-capi post-install-capi pre-install-capi:: install-prereq Index: devel/ruby-gems/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/ruby-gems/Makefile,v retrieving revision 1.44 diff -u -r1.44 Makefile --- devel/ruby-gems/Makefile 28 Aug 2011 20:01:09 -0000 1.44 +++ devel/ruby-gems/Makefile 29 Aug 2011 07:26:05 -0000 @@ -44,10 +44,6 @@ .include -.if ${RUBY_VER} == 1.9 -IGNORE= already included in this ruby distribution -.endif - do-install: @${MKDIR} ${PREFIX}/${GEMS_DOC_BASE_DIR}/ @${TOUCH} ${PREFIX}/${GEMS_DOC_BASE_DIR}/.keep_this