[pkgsrc/trunk]: pkgsrc/lang/ruby lang/ruby: try removing extra directory

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b564359fd04
branches:  trunk
changeset: 443698:3b564359fd04
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Dec 19 14:41:16 2020 +0000

description:
lang/ruby: try removing extra directory

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

diffstat:

 lang/ruby/gem-vars.mk |  8 +++++---
 lang/ruby/gem.mk      |  5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r e70800d8e027 -r 3b564359fd04 lang/ruby/gem-vars.mk
--- a/lang/ruby/gem-vars.mk     Sat Dec 19 14:38:01 2020 +0000
+++ b/lang/ruby/gem-vars.mk     Sat Dec 19 14:41:16 2020 +0000
@@ -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 @@
 .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)
diff -r e70800d8e027 -r 3b564359fd04 lang/ruby/gem.mk
--- a/lang/ruby/gem.mk  Sat Dec 19 14:38:01 2020 +0000
+++ b/lang/ruby/gem.mk  Sat Dec 19 14:41:16 2020 +0000
@@ -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 @@
                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 \