Sun Jul 14 21:08:17 2013 UTC ()
Fix shell syntax error which has been breaking all gem builds on SunOS for
the past week as per the reports on pkgsrc-bulk.  Not sure why it wasn't
showing up on other platforms, but I am assuming this is the correct fix.


(jperkin)
diff -r1.21 -r1.22 pkgsrc/lang/ruby/gem.mk
cvs diff -r1.21 -r1.22 pkgsrc/lang/ruby/gem.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/gem.mk 2013/07/07 15:16:38 1.21
+++ pkgsrc/lang/ruby/gem.mk 2013/07/14 21:08:17 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gem.mk,v 1.21 2013/07/07 15:16:38 taca Exp $ 1# $NetBSD: gem.mk,v 1.22 2013/07/14 21:08:17 jperkin Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that build 3# This Makefile fragment is intended to be included by packages that build
4# and install Ruby gems. 4# and install Ruby gems.
5# 5#
6# Package-settable variables: 6# Package-settable variables:
7# 7#
8# RUBYGEMS_REQD 8# RUBYGEMS_REQD
9# Minimum version of required rubygems. Ruby base packages contain: 9# Minimum version of required rubygems. Ruby base packages contain:
10# 10#
11# ruby18-base: none 11# ruby18-base: none
12# ruby193-base: 1.8.11 12# ruby193-base: 1.8.11
13# ruby200-base: 2.0.0 13# ruby200-base: 2.0.0
14# 14#
@@ -353,27 +353,27 @@ _gem-build-install-root-check: @@ -353,27 +353,27 @@ _gem-build-install-root-check:
353 353
354.if !empty(GEM_CLEANBUILD) 354.if !empty(GEM_CLEANBUILD)
355.PHONY: _gem-build-cleanbuild 355.PHONY: _gem-build-cleanbuild
356_gem-build-cleanbuild: 356_gem-build-cleanbuild:
357 @${STEP_MSG} "Cleaning intermediate gem build files" 357 @${STEP_MSG} "Cleaning intermediate gem build files"
358 ${RUN} cd ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_LIBDIR} && \ 358 ${RUN} cd ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_LIBDIR} && \
359 find . -print | sort -r | \ 359 find . -print | sort -r | \
360 while read file; do \ 360 while read file; do \
361 case $$file in \ 361 case $$file in \
362 ${GEM_CLEANBUILD:@.p.@./${.p.}) ;;@} \ 362 ${GEM_CLEANBUILD:@.p.@./${.p.}) ;;@} \
363 *) continue ;; \ 363 *) continue ;; \
364 esac; \ 364 esac; \
365 if [ -e ${WRKSRC:Q}"/$$file" ]; then \ 365 if [ -e ${WRKSRC:Q}"/$$file" ]; then \
366 && continue; \ 366 continue; \
367 elif [ -d "$$file" ]; then \ 367 elif [ -d "$$file" ]; then \
368 rfile=`echo $$file | ${SED} -e 's|^\./||'`; \ 368 rfile=`echo $$file | ${SED} -e 's|^\./||'`; \
369 ${ECHO} "rmdir "${GEM_NAME}"/$$rfile"; \ 369 ${ECHO} "rmdir "${GEM_NAME}"/$$rfile"; \
370 rmdir $$file; \ 370 rmdir $$file; \
371 elif [ -f "$$file" ]; then \ 371 elif [ -f "$$file" ]; then \
372 rfile=`echo $$file | ${SED} -e 's|^\./||'`; \ 372 rfile=`echo $$file | ${SED} -e 's|^\./||'`; \
373 ${ECHO} "rm "${GEM_NAME}"/$$rfile"; \ 373 ${ECHO} "rm "${GEM_NAME}"/$$rfile"; \
374 rm -f $$file; \ 374 rm -f $$file; \
375 fi; \ 375 fi; \
376 done 376 done
377.endif 377.endif
378 378
379### 379###