 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.46 2012/02/19 16:32:43 taca Exp $
+# $NetBSD: Makefile,v 1.47 2012/04/22 08:11:54 taca Exp $
-DISTNAME=	rubygems-1.8.17
+DISTNAME=	rubygems-1.8.23
 CATEGORIES=	misc ruby
 MASTER_SITES=	http://production.cf.rubygems.org/rubygems/ \
 		http://rubyforge.org/frs/download.php/75309/
 EXTRACT_SUFX=	.tgz
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.rubygems.org/
 COMMENT=	Ruby standard for publishing and managing third party libraries
 LICENSE=	gnu-gpl-v2 OR ruby-license
 PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS+=	rubygems-[0-9]*
 @@ -34,37 +34,41 @@ REQD_DIRS+=	${GEM_HOME}/specifications
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-install
 SUBST_FILES.conf=	lib/rubygems/config_file.rb
 SUBST_SED.conf=		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.conf=	Fixing configuration files.
 FILES_SUBST+=		RUBYGEM_NAME=${RUBYGEM_NAME}
 # Generate a dynamic PLIST for the rubygems documentation directory.
 GENERATE_PLIST+=	\
 	${ECHO} "@comment The following lines are automatically generated." && \
 	cd ${DESTDIR}${PREFIX} && \
-	  ${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} \! -type d -print | \
+	    if [ -d ${GEM_DOCDIR:S|${PREFIX}/||} ]; then \
-		${SORT};
+		${FIND} ${GEM_DOCDIR:S|${PREFIX}/||} \! -type d -print | \
 		${SORT}; \
 	    else \
 		:; \
 	    fi
 # Force the Gem repository to be under ${DESTDIR}.  This is harmless
 # because this package depends on no other gems.
+#
 INSTALL_ENV+=		GEM_HOME=${DESTDIR}${PREFIX}/${GEM_HOME}
 INSTALL_ENV+=		GEM_PATH=${DESTDIR}${PREFIX}/${GEM_HOME}
 INSTALL_TARGET=		install
-INSTALL_TARGET+=	--vendor
+INSTALL_TARGET+=	--vendor --no-rdoc --no-ri
 .if ${_USE_DESTDIR} != "no"
 INSTALL_TARGET+=	--destdir=${DESTDIR:Q}
 .endif
 # rubygem's setup.rb is not the typical setup.rb -- manually run the
 # command to install.
+#
 do-install:
 	if [ -f ${DESTDIR}${PREFIX}/bin/${RUBYGEM_NAME} ]; then \
 		${MV} ${DESTDIR}${PREFIX}/bin/${RUBYGEM_NAME} \
 			${DESTDIR}${PREFIX}/bin/${RUBYGEM_NAME}.orig; \
 	fi
 	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.19 2011/12/15 14:40:47 taca Exp $
+@comment $NetBSD: PLIST,v 1.20 2012/04/22 08:11:54 taca Exp $
 bin/gem${RUBY_VER}.new
 ${RUBY_VENDORLIB}/gauntlet_rubygems.rb
 ${RUBY_VENDORLIB}/rbconfig/datadir.rb
 ${RUBY_VENDORLIB}/rubygems.rb
 ${RUBY_VENDORLIB}/rubygems/builder.rb
 ${RUBY_VENDORLIB}/rubygems/command.rb
 ${RUBY_VENDORLIB}/rubygems/command_manager.rb
 ${RUBY_VENDORLIB}/rubygems/commands/build_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/cert_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/check_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/cleanup_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/contents_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/dependency_command.rb
 @@ -64,31 +64,34 @@ ${RUBY_VENDORLIB}/rubygems/mock_gem_ui.r
 ${RUBY_VENDORLIB}/rubygems/old_format.rb
 ${RUBY_VENDORLIB}/rubygems/package.rb
 ${RUBY_VENDORLIB}/rubygems/package/f_sync_dir.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_header.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_input.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_output.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_reader.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_reader/entry.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_test_case.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_writer.rb
 ${RUBY_VENDORLIB}/rubygems/package_task.rb
 ${RUBY_VENDORLIB}/rubygems/path_support.rb
 ${RUBY_VENDORLIB}/rubygems/platform.rb
 ${RUBY_VENDORLIB}/rubygems/psych_additions.rb
 ${RUBY_VENDORLIB}/rubygems/psych_tree.rb
 ${RUBY_VENDORLIB}/rubygems/remote_fetcher.rb
 ${RUBY_VENDORLIB}/rubygems/require_paths_builder.rb
 ${RUBY_VENDORLIB}/rubygems/requirement.rb
 ${RUBY_VENDORLIB}/rubygems/security.rb
 ${RUBY_VENDORLIB}/rubygems/server.rb
 ${RUBY_VENDORLIB}/rubygems/source_index.rb
 ${RUBY_VENDORLIB}/rubygems/spec_fetcher.rb
 ${RUBY_VENDORLIB}/rubygems/specification.rb
 ${RUBY_VENDORLIB}/rubygems/syck_hack.rb
 ${RUBY_VENDORLIB}/rubygems/test_case.rb
 ${RUBY_VENDORLIB}/rubygems/test_utilities.rb
 ${RUBY_VENDORLIB}/rubygems/text.rb
 ${RUBY_VENDORLIB}/rubygems/uninstaller.rb
 ${RUBY_VENDORLIB}/rubygems/user_interaction.rb
 ${RUBY_VENDORLIB}/rubygems/validator.rb
 ${RUBY_VENDORLIB}/rubygems/version.rb
 ${RUBY_VENDORLIB}/rubygems/version_option.rb
 ${RUBY_VENDORLIB}/ubygems.rb
 @pkgdir lib/ruby/gems/1.9.3/doc

 @@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.36 2012/02/19 16:32:43 taca Exp $
+$NetBSD: distinfo,v 1.37 2012/04/22 08:11:54 taca Exp $
-SHA1 (rubygems-1.8.17.tgz) = ad4ab95bc3673c0c664d6fea2e40ce1cadec92cd
+SHA1 (rubygems-1.8.23.tgz) = add96c8aed4e11526995bc354a213c72a393980c
-RMD160 (rubygems-1.8.17.tgz) = 06659da8d782b3196b89d9eeeefec591fa8e0822
+RMD160 (rubygems-1.8.23.tgz) = 624c47502305f9ae91ae6acb48e8772a187a2ca8
-Size (rubygems-1.8.17.tgz) = 252560 bytes
+Size (rubygems-1.8.23.tgz) = 379999 bytes
-SHA1 (patch-aa) = cd7fde36ce3d67a5d96a3280d9f11b3c5b78a820
+SHA1 (patch-aa) = 6f58690757271a230ead260a3429732067256567
 SHA1 (patch-ab) = d2917ec23a41293049bdf901c809423126a6161d
 SHA1 (patch-ac) = 7814fd204106f67e04ee9d278666b9ba30da3478
 SHA1 (patch-ad) = 79c1a0750925862598545a992380ef7dfd8803a1
 SHA1 (patch-af) = 4a138fb8c91189e4b39a12882a05f066100f08c4
 SHA1 (patch-ag) = fe209f86dd68bfb8de7084b7a64e22a4dd6240f9
 SHA1 (patch-ah) = cc3fc04696ea66670625d107872bb7c2e19b6114
 SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e
 SHA1 (patch-al) = beeff0531ff4bd23c0796b1e28805ae6fe2202b0
 SHA1 (patch-am) = 374b16a77a3471958e0fcf7a60633658f9e9d559
 SHA1 (patch-an) = a4de56fc44a4c7556486268344d44640538db108
-SHA1 (patch-ao) = b78557ffaa2df6c251ad7bfce760574e0ef3157a
+SHA1 (patch-ao) = f2b6566e01eff03302a01e407a16120397ec5b50
 SHA1 (patch-ap) = eaf2bf2fc7cc71139df7ce2677c3ec9fa95d1081
 SHA1 (patch-test_rubygems_test__gem.rb) = 8bad451e8054fe954c13d28e542509b8adae2764

 @@ -1,70 +1,70 @@
-$NetBSD: patch-aa,v 1.11 2011/09/04 17:05:13 taca Exp $
+$NetBSD: patch-aa,v 1.12 2012/04/22 08:11:54 taca Exp $
 * Relax to allow some attribute could be nil.
 * Complete "http://" to homepage attribute if it isn't begin with it.
 * Accpet date with Time, but ignore time part.
---- lib/rubygems/specification.rb.orig	2011-08-27 00:43:50.000000000 +0000
+--- lib/rubygems/specification.rb.orig	2012-04-13 22:21:48.000000000 +0000
 +++ lib/rubygems/specification.rb
 @@ -118,6 +118,12 @@ class Gem::Specification
      @@default_value[k].nil?
+   }
 +  # under pkgsrc environment
 +  @@pkgsrc_nil_attributes = {}
 +  [:authors, :cert_chain, :executables, :extensions, :extra_rdoc_files, :licenses, :required_rubygems_version, :test_files].each do |k|
 +    @@pkgsrc_nil_attributes[k] = true
 +  end
++
    ######################################################################
    # :section: Required gemspec attributes
-@@ -984,7 +990,7 @@ class Gem::Specification
+@@ -1000,7 +1006,7 @@ class Gem::Specification
      # way to do it.
      @date = case date
              when String then
 -              if /\A(\d{4})-(\d{2})-(\d{2})\Z/ =~ date then
 +              if /\A(\d{4})-(\d{2})-(\d{2})/ =~ date then
                  Time.utc($1.to_i, $2.to_i, $3.to_i)
                else
-                 raise(Gem::InvalidSpecificationException,
+               # Workaround for where the date format output from psych isn't
-@@ -1950,7 +1956,24 @@ class Gem::Specification
+@@ -1987,7 +1993,24 @@ class Gem::Specification
      normalize
      nil_attributes = self.class.non_nil_attributes.find_all do |name|
 -      instance_variable_get("@#{name}").nil?
 +      val = instance_variable_get("@#{name}")
 +      if val.nil?
 +        if @@pkgsrc_nil_attributes.key?(name)
 +          case name
 +          when :required_rubygems_version
 +            val = Gem::Requirement.default
 +          else
 +            val = []
 +          end
 +          instance_variable_set("@#{name}", val)
 +          false
 +        end
 +      end
 +      if name == :authors and val.empty?
 +        val = ['not specified']
 +        self.authors = val
 +        false
 +      end
      end
      unless nil_attributes.empty? then
-@@ -2053,10 +2076,15 @@ class Gem::Specification
+@@ -2090,10 +2113,15 @@ class Gem::Specification
        raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
      end
 -    if homepage and not homepage.empty? and
 -       homepage !~ /\A[a-z][a-z\d+.-]*:/i then
 -      raise Gem::InvalidSpecificationException,
 +    if homepage and not homepage.empty?
 +      if @homepage =~ /\A[a-z][a-z\d+.-]*/i and
 +          @homepage !~ /\A[a-z][a-z\d+.-]*:/i
 +        @homepage = "http://" + @homepage
 +      end
 +      if homepage !~ /\A[a-z][a-z\d+.-]*:/i then
 +        raise Gem::InvalidSpecificationException,

 @@ -1,40 +1,40 @@
-$NetBSD: patch-ao,v 1.3 2011/03/23 14:35:05 taca Exp $
+$NetBSD: patch-ao,v 1.4 2012/04/22 08:11:54 taca Exp $
 Don't hard code config file's path for gem.
---- lib/rubygems/config_file.rb.orig	2011-02-26 20:40:09.000000000 +0000
+--- lib/rubygems/config_file.rb.orig	2012-03-22 21:25:48.000000000 +0000
 +++ lib/rubygems/config_file.rb
-@@ -45,32 +45,7 @@ class Gem::ConfigFile
+@@ -47,32 +47,7 @@ class Gem::ConfigFile
    PLATFORM_DEFAULTS = {}
 -  system_config_path =
 -    begin
 -      require "etc"
 -      Etc.sysconfdir
 -    rescue LoadError, NoMethodError
 -      begin
 -        # TODO: remove after we drop 1.8.7 and 1.9.1
 -        require 'Win32API'
+-
 -        CSIDL_COMMON_APPDATA = 0x0023
 -        path = 0.chr * 260
 -        if RUBY_VERSION > '1.9' then
 -          SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'PLPLP',
 -          'L', :stdcall
 -          SHGetFolderPath.call nil, CSIDL_COMMON_APPDATA, nil, 1, path
 -        else
 -          SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'LLLLP',
 -          'L'
 -          SHGetFolderPath.call 0, CSIDL_COMMON_APPDATA, 0, 1, path
 -        end
+-
 -        path.strip
 -      rescue LoadError
--        "/etc"
+-        RbConfig::CONFIG["sysconfdir"] || "/etc"
 -      end
 -    end
 +  system_config_path = '@PKG_SYSCONFDIR@'
    SYSTEM_WIDE_CONFIG_FILE = File.join system_config_path, 'gemrc'