CVS commit: pkgsrc/lang/ruby

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Dec 19 14:41:16 UTC 2020

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

Log Message:
lang/ruby: try removing extra directory

Try removing extra directory and make "make print-PLIST" happy a little.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/ruby/gem-vars.mk
cvs rdiff -u -r1.42 -r1.43 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-vars.mk
diff -u pkgsrc/lang/ruby/gem-vars.mk:1.9 pkgsrc/lang/ruby/gem-vars.mk:1.10
--- pkgsrc/lang/ruby/gem-vars.mk:1.9    Sun Nov  3 19:04:06 2019
+++ pkgsrc/lang/ruby/gem-vars.mk        Sat Dec 19 14:41:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: gem-vars.mk,v 1.9 2019/11/03 19:04:06 rillig Exp $
+# $NetBSD: gem-vars.mk,v 1.10 2020/12/19 14:41:16 taca Exp $
 #
 # This Makefile fragment defines various make(1) variables for Ruby gems
 # support.
@@ -22,10 +22,12 @@ GEM_EXTSDIR_NEEDS_SUBDIR?=  yes
 .if exists(${RUBYGEM})
 RUBY_GEM_ARCH!=        ${RUBYGEM} environment platform | ${SED} -e 's|.*:||'
 
+GEM_EXTSBASE=  ${GEM_HOME}/extensions
+
 .  if !empty(GEM_EXTSDIR_NEEDS_SUBDIR:M[nN][oO])
-GEM_EXTSDIR=   ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}
+GEM_EXTSDIR=   ${GEM_EXTSBASE}/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}
 .  else
-GEM_EXTSDIR=   ${GEM_HOME}/extensions/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}/${GEM_NAME}
+GEM_EXTSDIR=   ${GEM_EXTSBASE}/${RUBY_GEM_ARCH}/${RUBY_VER_DIR}/${GEM_NAME}
 .  endif
 
 .  if !empty(GEM_EXTSDIR)

Index: pkgsrc/lang/ruby/gem.mk
diff -u pkgsrc/lang/ruby/gem.mk:1.42 pkgsrc/lang/ruby/gem.mk:1.43
--- pkgsrc/lang/ruby/gem.mk:1.42        Sat May  2 17:03:11 2020
+++ pkgsrc/lang/ruby/gem.mk     Sat Dec 19 14:41:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: gem.mk,v 1.42 2020/05/02 17:03:11 taca Exp $
+# $NetBSD: gem.mk,v 1.43 2020/12/19 14:41:16 taca Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
@@ -326,6 +326,9 @@ _gem-build-cleanbuild:
                fi;                                                     \
        done
 .  endif
+       @${RMDIR} ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_BUILDINFO_DIR} \
+               ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_EXTSBASE} \
+                       >/dev/null 2>&1 || true
 .  if !empty(GEM_EXTSDIR) && !empty(GEM_CLEANBUILD_EXTENSIONS)
        ${RUN} \
        if test ! -d ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_EXTSDIR}; then \