 @@ -1,14 +1,14 @@
-# $NetBSD: gem.mk,v 1.20 2013/04/08 11:17:15 rodent Exp $
+# $NetBSD: gem.mk,v 1.21 2013/07/07 15:16:38 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
+#
 @@ -130,26 +130,28 @@ OVERRIDE_GEMSPEC?=	# default is empty
 RUBYGEM_LANG?=	en_US.UTF-8
 RUBYGEM_ENV?=	LANG=${RUBYGEM_LANG} LC_CTYPE=${RUBYGEM_LANG}
 .if !empty(OVERRIDE_GEMSPEC)
 UPDATE_GEMSPEC=		../../lang/ruby/files/update-gemspec.rb
 .endif
 .if ${GEM_BUILD} == "rake"
 USE_RAKE?=		YES
 .endif
 # print-PLIST support
 PRINT_PLIST_AWK+=	/${GEM_NAME}\.info$$/ \
 			{ gsub(/${GEM_NAME}\.info/, "$${GEM_NAME}.info"); }
 PRINT_PLIST_AWK+=	/${GEM_NAME}\.(gem|gemspec)$$/ \
 			{ gsub(/${GEM_NAME}\.gem/, "$${GEM_NAME}.gem"); }
 PRINT_PLIST_AWK+=	/${GEM_NAME:S/./[.]/g}[.](gem|gemspec)$$/ \
 	{ gsub(/${PKGVERSION_NOREV:S|/|\\/|g}[.]gem/, "$${PKGVERSION}.gem"); }
 PRINT_PLIST_AWK+=	/^${GEM_LIBDIR:S|/|\\/|g}/ \
 	{ gsub(/${GEM_LIBDIR:S|/|\\/|g}/, "$${GEM_LIBDIR}"); print; next; }
 PRINT_PLIST_AWK+=	/^${GEM_DOCDIR:S|/|\\/|g}/ \
 			{ next; }
 PRINT_PLIST_AWK+=	/^${GEM_HOME:S|/|\\/|g}/ \
 			{ gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); \
 			print; next; }
 PRINT_PLIST_AWK+=	/^${RUBY_GEM_BASE:S|/|\\/|g}/ \
 		{ gsub(/${RUBY_GEM_BASE:S|/|\\/|g}/, "$${RUBY_GEM_BASE}"); \
 @@ -216,29 +218,29 @@ DISTFILES?=	${DISTNAME}${EXTRACT_SUFX}
+#
 .if !empty(DISTFILES:M*.gem)
 EXTRACT_ONLY?=	# empty
 .endif
 # Specify GEM_PATH
 GEM_PATH?=	${PREFIX}/${GEM_HOME}
 # Base directory for Gems
 MAKE_ENV+=	GEM_PATH=${GEM_PATH}
 # Directory for the Gem to install
 GEM_NAME?=	${DISTNAME}
 GEM_LIBDIR=	${GEM_HOME}/gems/${GEM_NAME}
 GEM_DOCDIR=	${GEM_HOME}/doc/${GEM_NAME}
 GEM_CACHEDIR=	${GEM_HOME}/cache
 GEM_DOCDIR=	${GEM_HOME}/doc/${GEM_NAME}
 GEM_LIBDIR=	${GEM_HOME}/gems/${GEM_NAME}
 # Installed gems have wrapper scripts that call the right interpreter,
 # regardless of the #! line at the head of a script, so we can skip
 # the interpreter path check for gems.  ANd it is also true for files'
 # permission.
+#
 CHECK_INTERPRETER_SKIP+=	${GEM_LIBDIR}/*
 CHECK_PERMS_SKIP+=		${GEM_LIBDIR}/*
 # RUBYGEM holds the path to RubyGems' gem command
 EVAL_PREFIX+=	RUBYGEM_PREFIX=${RUBYGEM_NAME}
 RUBYGEM=	${RUBYGEM_PREFIX}/bin/${RUBYGEM_NAME}
 @@ -252,30 +254,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 ${_DISTDIR:Q}${_gem_:Q}
+		${RUBYGEM} unpack ${_DISTDIR:Q}/${_gem_:Q}
 	${RUN} cd ${WRKDIR} && \
 		${SETENV} ${MAKE_ENV} TZ=UTC ${RUBYGEM_ENV} \
-		${RUBYGEM} spec --ruby ${_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/*
 @@ -350,32 +352,35 @@ _gem-build-install-root-check:
 		${FAIL_MSG} "Installing ${GEM_NAME}.gem into installation root failed."
 .if !empty(GEM_CLEANBUILD)
 .PHONY: _gem-build-cleanbuild
 _gem-build-cleanbuild:
 	@${STEP_MSG} "Cleaning intermediate gem build files"
 	${RUN} cd ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_LIBDIR} &&	\
 	find . -print | sort -r |					\
 	while read file; do						\
 		case $$file in						\
 		${GEM_CLEANBUILD:@.p.@./${.p.}) ;;@}			\
 		*)	continue ;;					\
 		esac;							\
-		[ ! -e ${WRKSRC:Q}"/$$file" ] || continue;		\
+		if [ -e ${WRKSRC:Q}"/$$file" ]; then			\
-		if [ -d "$$file" ]; then				\
+			&& continue;					\
-			${ECHO} "rmdir "${GEM_NAME}"/$$file";		\
+		elif [ -d "$$file" ]; then				\
 			rfile=`echo $$file | ${SED} -e 's|^\./||'`;	\
 			${ECHO} "rmdir "${GEM_NAME}"/$$rfile";		\
 			rmdir $$file;					\
-		else							\
+		elif [ -f "$$file" ]; then				\
-			${ECHO} "rm "${GEM_NAME}"/$$file";		\
+			rfile=`echo $$file | ${SED} -e 's|^\./||'`;	\
 			${ECHO} "rm "${GEM_NAME}"/$$rfile";		\
 			rm -f $$file;					\
 		fi;							\
 	done
 .endif
 ###
 ### gem-install
 ###
 ### The gem-install target installs the gem in ${_RUBY_INSTALL_ROOT} into
 ### the actual gem repository.
 ###
 GENERATE_PLIST+=	${RUBYGEM_GENERATE_PLIST}
 RUBYGEM_GENERATE_PLIST=	\