CVS commit: pkgsrc/lang/ruby

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Fri Oct 24 05:32:21 UTC 2025

Modified Files:
        pkgsrc/lang/ruby: gem-extract.mk gem.mk

Log Message:
lang/ruby: fix gem handling

* Do not modify EXTRACT_ONLY here.
* Do not manually extract gem rely on mk/extract/extract.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby/gem-extract.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/lang/ruby/gem.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby/gem-extract.mk
diff -u pkgsrc/lang/ruby/gem-extract.mk:1.1 pkgsrc/lang/ruby/gem-extract.mk:1.2
--- pkgsrc/lang/ruby/gem-extract.mk:1.1 Sun Mar  8 14:41:12 2015
+++ pkgsrc/lang/ruby/gem-extract.mk     Fri Oct 24 05:32:21 2025
@@ -1,4 +1,4 @@
-# $NetBSD: gem-extract.mk,v 1.1 2015/03/08 14:41:12 taca Exp $
+# $NetBSD: gem-extract.mk,v 1.2 2025/10/24 05:32:21 taca Exp $
 #
 # This Makefile fragment is intended to be included by packages that extract
 # Ruby gems files.
@@ -20,10 +20,9 @@ _GEM_DISTFILES=              ${DISTFILES:M*.gem}
 .PHONY: gem-extract
 post-extract: gem-extract
 .if !target(gem-extract)
-gem-extract: fake-home
+gem-extract: # fake-home
 .  for _gem_ in ${_GEM_DISTFILES}
-       ${RUN} cd ${WRKDIR} && ${SETENV} ${MAKE_ENV} ${RUBYGEM_ENV} \
-               ${RUBYGEM} unpack ${_DISTDIR:Q}/${_gem_:Q}
+       ${RUN} ${ECHO} "Generating gemspec file from ${_gem_:R}"
        ${RUN} cd ${WRKDIR} && \
                ${SETENV} ${MAKE_ENV} TZ=UTC ${RUBYGEM_ENV} \
                ${RUBYGEM} spec --ruby ${_DISTDIR:Q}/${_gem_:Q} > ${_gem_}spec

Index: pkgsrc/lang/ruby/gem.mk
diff -u pkgsrc/lang/ruby/gem.mk:1.54 pkgsrc/lang/ruby/gem.mk:1.55
--- pkgsrc/lang/ruby/gem.mk:1.54        Sun May 26 00:15:32 2024
+++ pkgsrc/lang/ruby/gem.mk     Fri Oct 24 05:32:21 2025
@@ -1,4 +1,4 @@
-# $NetBSD: gem.mk,v 1.54 2024/05/26 00:15:32 taca Exp $
+# $NetBSD: gem.mk,v 1.55 2025/10/24 05:32:21 taca Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
@@ -188,13 +188,6 @@ PKG_SKIP_REASON+=  "Please uninstall ${RU
 .  endif
 .endif
 
-# If any of the DISTFILES are gems, then skip the normal do-extract actions
-# and extract them ourselves in gem-extract.
-#
-.if !empty(DISTFILES:M*.gem)
-EXTRACT_ONLY?= # empty
-.endif
-
 # Directory for the Gem to install
 GEM_NAME?=     ${DISTNAME}
 GEM_CACHEDIR=  ${GEM_HOME}/cache