 @@ -1,25 +1,26 @@
-# $NetBSD: gem.mk,v 1.16 2012/10/03 12:58:34 asau Exp $
+# $NetBSD: gem.mk,v 1.17 2013/03/07 16:42:53 taca Exp $
+#
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
+#
 # Package-settable variables:
+#
 # RUBYGEMS_REQD
 #	Minimum version of required rubygems.  Ruby base packages contain:
+#
 #		ruby18-base:	none
 #		ruby193-base:	1.8.11
 #		ruby200-base:	2.0.0
+#
 #	If newer version of rubygems is resuiqred, set RUBYGEMS_REQD to
 #	minimum version.
+#
 #	Default: not defined
+#
 # OVERRIDE_GEMSPEC
 #	Fix version of depending gem or modify files in gemspec.
+#
 #	(1) Specify as gem and dependency pattern as usual pkgsrc's one.
+#
 #		Example:
 #		    When gemspec contains "json~>1.4.7" as runtime dependency
 @@ -27,27 +28,32 @@
 #		    "json>=1.4.6" then use:
+#
 #			OVERRIDE_GEMSPEC+= json>=1.4.6
+#
 #		    If you want to change depending gem to "json_pure>=1.4.6"
 #		    then use:
+#
 #			OVERRIDE_GEMSPEC+= json:json_pure>=1.4.6
+#
 #		    You can also remove dependency:
+#
 #			OVERRIDE_GEMSPEC+= json:
+#
-#	(2) Modify files in gemspec.
+#	(2) Modify instance of gemspec.
+#
 #		Example:
 #			Rename gem's name to "foo" (setting instance @name):
+#
 #			OVERRIDE_GEMSPEC+= :name=foo
+#
 #		Example:
 #			Remove files (a.rb and b.rb) from 'files':
+#
 #			OVERRIDE_GEMSPEC+= :files a.rb= b.rb=
+#
 #		Example:
 #			Add a file (exec.rb) to 'executables':
+#
 #			OVERRIDE_GEMSPEC+= :executables exec.rb
+#
 #		Example:
 #			Rename a file (from 'ruby' to 'ruby193') in 'files':
 @@ -153,33 +159,37 @@ PRINT_PLIST_AWK+=	/^${RUBY_GEM_BASE:S|/|
 # resulting installed gem can run with older versions of rubygems.
+#
 # If we're using rake to build the local gem, then include it as a
 # build tool.
+#
 .if ${RUBY_VER} == "18"
 BUILD_DEPENDS+=	${RUBY_PKGPREFIX}-rubygems>=1.1.0:../../misc/rubygems
 DEPENDS+=	${RUBY_PKGPREFIX}-rubygems>=1.0.1:../../misc/rubygems
 .else # !ruby18
 . if defined(RUBYGEMS_REQD)
 RUBY193_RUBYGEMS_VERS=	1.8.11
 RUBY200_RUBYGEMS_VERS=	2.0.0
 _RUBYGEMS_REQD_MAJOR=	${RUBYGEMS_REQD:C/\.[0-9\.]+$//}
 _RUBYGEMS_REQD_MINORS=	${RUBYGEMS_REQD:C/^([0-9]+)\.*//}
 .  if ${RUBY_VER} == "193"
 _RUBYGEMS_MAJOR=	${RUBY193_RUBYGEMS_VERS:C/\.[0-9\.]+$//}
 _RUBYGEMS_MINORS=	${RUBY193_RUBYGEMS_VERS:C/^([0-9]+)\.*//}
 .  elif ${RUBY_VER} == "200"
 _RUBYGEMS_MAJOR=	${RUBY200_RUBYGEMS_VERS:C/\.[0-9\.]+$//}
 _RUBYGEMS_MINORS=	${RUBY200_RUBYGEMS_VERS:C/^([0-9]+)\.*//}
 .  else
 PKG_FAIL_REASON+= "Unknown Ruby version specified: ${RUBY_VER}."
 .  endif
 _RUBYGEMS_REQD=	NO
 .  if ${_RUBYGEMS_REQD_MAJOR} > ${_RUBYGEMS_MAJOR}
 _RUBYGEMS_REQD=	YES
 .  elif ${_RUBYGEMS_REQD_MAJOR} == ${_RUBYGEMS_MAJOR}
 .   if !empty(_RUBYGEMS_MINORS) && ${_RUBYGEMS_REQD_MINORS} > ${_RUBYGEMS_MINORS}
 _RUBYGEMS_REQD=	YES
 .   endif
 .  endif
 @@ -234,31 +244,30 @@ PLIST_SUBST+=		GEM_DOCDIR=${GEM_DOCDIR}
 ###
 ### The gem-extract target extracts a standard gem file.  It is an
 ### automatic dependency for the post-extract target so it doesn't
 ### disturb the usual do-extract actions.
 ###
 GEM_SPECFILE?=	${WRKDIR}/${DISTNAME}.gemspec
 .PHONY: gem-extract
 post-extract: gem-extract
 .if !target(gem-extract)
 gem-extract: fake-home
 .  for _gem_ in ${DISTFILES:M*.gem}
 	${RUN} cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} ${RUBYGEM_ENV} \
-		${RUBYGEM} unpack ${RUBYGEM_INSTALL_ROOT_OPTION} \
+		${RUBYGEM} unpack ${_DISTDIR:Q}${_gem_:Q}
 			${_DISTDIR:Q}/${_gem_:Q}
 	${RUN} cd ${WRKDIR} && \
 		${SETENV} ${MAKE_ENV} TZ=UTC ${RUBYGEM_ENV} \
-		${RUBYGEM} spec ${_DISTDIR:Q}/${_gem_:Q} > ${_gem_}spec
+		${RUBYGEM} spec --ruby ${_DISTDIR:Q}${_gem_:Q} > ${_gem_}spec
 .  endfor
 .endif
 ###
 ### gem-build
 ###
 ### The gem-build target builds a new local gem from the extracted gem's
 ### contents.  The new gem as created as ${WRKSRC}/${GEM_NAME}.gem.
 ### The local gem is then installed into a special build root under
 ### ${WRKDIR} (${RUBYGEM_INSTALL_ROOT}), possibly compiling any extensions.
 ###
 GEM_CLEANBUILD?=	ext/*
 @@ -311,27 +320,27 @@ _RUBYGEM_OPTIONS+=	--no-ri
 .if !empty(RUBY_BUILD_RDOC:M[nN][oO])
 _RUBYGEM_OPTIONS+=	--no-rdoc
 .endif
 .if !empty(CONFIGURE_ARGS)
 _RUBYGEM_OPTIONS+=	-- --build-args ${CONFIGURE_ARGS}
 .endif
 RUBYGEM_INSTALL_ROOT_OPTION=	--install-root ${RUBYGEM_INSTALL_ROOT}
 .PHONY: _gem-build-install-root
 _gem-build-install-root:
 	@${STEP_MSG} "Installing gem into installation root"
 	${RUN} ${SETENV} ${MAKE_ENV} ${RUBYGEM_ENV} \
-		${RUBYGEM} install ${RUBYGEM_OPTIONS} ${_RUBYGEM_OPTIONS}
+		${RUBYGEM} install --backtrace ${RUBYGEM_OPTIONS} ${_RUBYGEM_OPTIONS}
 # The ``gem'' command doesn't exit with a non-zero result even if the
 # install of the gem failed, so we do the check and return the proper exit
 # code ourselves.
+#
 .PHONY: _gem-build-install-root-check
 _gem-build-install-root-check:
 	${RUN} ${TEST} -f ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_CACHEDIR}/${GEM_NAME}.gem || \
 		${FAIL_MSG} "Installing ${GEM_NAME}.gem into installation root failed."
 .if !empty(GEM_CLEANBUILD)
 .PHONY: _gem-build-cleanbuild
 _gem-build-cleanbuild:

 @@ -1,19 +1,19 @@
 #!/usr/pkg/bin/ruby
 # -*- coding: utf-8 -*-
+#
-# $NetBSD: update-gemspec.rb,v 1.4 2012/03/02 03:46:09 taca Exp $
+# $NetBSD: update-gemspec.rb,v 1.5 2013/03/07 16:42:53 taca Exp $
+#
-# Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
+# Copyright (c) 2011, 2012, 2013 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Takahiro Kambe.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
+#
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 @@ -29,135 +29,148 @@
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
+#
+#
 # This is a quick and dirty tool which updates gemspec file:
+#
 require 'rubygems'
 require 'fileutils'
 require 'optparse'
 begin
   # Since newer rubygems load psych instead of syck, don't load yaml directly.
   Gem.load_yaml
 rescue NoMethodError
   # Older rubygems don't have load_yaml() and don't know about psych.
 end
 class GemSpecUpdater
   OrigSuffix = '.orig_gemspec'
   def initialize(file)
     @file = file
-    open(file) { |f|
+    @spec = Gem::Specification.load(@file)
       @spec = Gem::Specification.from_yaml(f)
     @requirements = {}
     @attr = {}
   end
+  #
   # rule should be:
-  #	rule ::= [ dependecy_specs ] [ attr_specs ]
+  #	rule ::= dependecy_specs | attr_specs
-  #	dependency_specs ::= dependency_spec [ dependency_spec ]
+  #	dependency_specs ::= dependency_spec [ SPACE dependency_spec ]
   #	dependency_spec ::= name_spec [ dependency ]
   #	name_spec ::= name [ ":" new_name ]
-  #	dependency ::= "pkgsrc's dependecy operator and version string"
+  #	dependency ::= <Rubygem's dependecy operator and version string>
-  #	command ::= ":" attr_name" attr_operations
+  #	attr_specs ::= ":" attr_name attr_operations
-  #	attr_operations ::= attr_op [ attr_op ]
+  #	attr_operations ::= assign_operation | array_operation
   #	assign_operation ::= "=" [ new_value ]
   #	array_operations ::= attr_op [ attr_op ]
   #	attr_op ::= new | old=new | old=
+  #
   def parse_rules(rules)
     key = nil
     rules.each do |s|
       s.split.each do |ru|
-        if /^:([a-z_]+)+/ =~ ru
+        if /^:([a-z_]+)=*(\S+)*/ =~ ru
           key = $1
           var = $2
           @attr[key] = var
           key = nil
         elsif /^:([a-z_]+)+/ =~ ru
           key = $1
           @attr[key] = []
         elsif not key.nil?
-          @attr[key].push ru
+          @attr[key].push ru unless key.nil?
         else
           if /([a-z0-9_:-]+)([=!><\~][=>]*)(.*)/ =~ ru
             names = $1
             op = $2
             ver = $3
             r = Gem::Version.new ver
             name, new_name = names.split(/:/, 2)
             @requirements[name] = {
               :method => :update,
               :op => op,
               :version => r,
               :name => new_name
+            }
           elsif /([a-z0-9_-]+):$/ =~ ru
             name = $1
             @requirements[name] = {
               :method => :delete,
+            }
           end
         end
       end
     end
   end
   def modify
     dependencies = @spec.instance_variable_get(:@dependencies)
     dependencies.each do |dep|
       next if dep.type != :runtime
       update = @requirements[dep.name]
       if not update.nil? and update[:method] == :update
         r = dep.requirement.requirements
         r[0][0] = update[:op]
         r[0][1] = update[:version]
         unless update[:name].nil?
           dep.name = update[:name]
         end
       end
     end
     dependencies.delete_if { |dep|
       next if dep.type != :runtime
       update = @requirements[dep.name]
       not update.nil? and update[:method] == :delete
+    }
     @attr.keys.each do |name|
-      av = @spec.instance_variable_get('@' + name)
+      modified = false
-      if av.class == Array
+      av = eval "@spec.#{name}"
       if av.class == String
         nv = @attr[name]
         av = nv
         modified = true
       elsif av.class == Array
         operation = @attr[name]
         operation.each do |op|
           if /^([^=]+)=([^=]+)$/ =~ op
             ov = $1
             nv = $2
-            av.delete_if {|a| a == ov}
+            if av.include? ov
-            av.push nv unless av.include? nv
+              av.delete ov
               modified = true
             end
             unless av.include? nv
               av.push nv
               modified = true
             end
           elsif /^([^=]+)=$/ =~ op
             ov = $1
-            av.delete_if {|a| a == ov}
+            if av.include? ov
-          else
+              av.delete(ov)
-            av.push op unless av.include? op
+              modified = true
             end
           end
         end
       end
       if modified
         eval "@spec.#{name} = av"
       end
     end
   end
   def update
     FileUtils.cp(@file, @file + OrigSuffix, :preserve => true)
     open(@file, "w") { |f|
-      f.print YAML.dump(@spec) + "\n"
+      f.print @spec.to_ruby
+    }
   end
   def dump_dependency
     dependencies = @spec.runtime_dependencies
     dependencies.each do |dep|
       puts "#{dep.name} #{dep.requirement}"
     end
   end
 end
 def usage(status)