diff options
author | taca <taca> | 2014-05-01 12:45:09 +0000 |
---|---|---|
committer | taca <taca> | 2014-05-01 12:45:09 +0000 |
commit | b42655b867e8cf67d301c496ac9f83a9ff7eb727 (patch) | |
tree | c07be7b744ca1a1e6239f8be89663568b91e37ad /lang | |
parent | 90ceda9a8fb71a18a523112787454ddd185838ee (diff) | |
download | pkgsrc-b42655b867e8cf67d301c496ac9f83a9ff7eb727.tar.gz |
Fix broken print-PLIST with gem based packages.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ruby/gem.mk | 20 | ||||
-rw-r--r-- | lang/ruby/rubyversion.mk | 6 |
2 files changed, 15 insertions, 11 deletions
diff --git a/lang/ruby/gem.mk b/lang/ruby/gem.mk index 9b190098e39..a79031cccb5 100644 --- a/lang/ruby/gem.mk +++ b/lang/ruby/gem.mk @@ -1,4 +1,4 @@ -# $NetBSD: gem.mk,v 1.30 2014/03/15 12:30:26 taca Exp $ +# $NetBSD: gem.mk,v 1.31 2014/05/01 12:45:09 taca Exp $ # # This Makefile fragment is intended to be included by packages that build # and install Ruby gems. @@ -249,26 +249,26 @@ PLIST_SUBST+= GEM_EXTSDIR=${GEM_EXTSDIR} PLIST_SUBST+= GEM_EXTSDIR="@comment " .endif -# print-PLIST support -PRINT_PLIST_AWK+= /${GEM_NAME}\.info$$/ \ +# Add indirect support for print-PLIST +_RUBY_PRINT_PLIST_GEM= /${GEM_NAME}\.info$$/ \ { gsub(/${GEM_NAME}\.info/, "$${GEM_NAME}.info"); } -PRINT_PLIST_AWK+= /${GEM_NAME}\.(gem|gemspec)$$/ \ +_RUBY_PRINT_PLIST_GEM+= /${GEM_NAME}\.(gem|gemspec)$$/ \ { gsub(/${GEM_NAME}\.gem/, "$${GEM_NAME}.gem"); } -PRINT_PLIST_AWK+= /${GEM_NAME:S/./[.]/g}[.](gem|gemspec)$$/ \ +_RUBY_PRINT_PLIST_GEM+= /${GEM_NAME:S/./[.]/g}[.](gem|gemspec)$$/ \ { gsub(/${PKGVERSION_NOREV:S|/|\\/|g}[.]gem/, "$${PKGVERSION}.gem"); } .if !empty(GEM_EXTSDIR) -PRINT_PLIST_AWK+= /^${GEM_EXTSDIR:S|/|\\/|g}/ \ +_RUBY_PRINT_PLIST_GEM+= /^${GEM_EXTSDIR:S|/|\\/|g}/ \ { gsub(/${GEM_EXTSDIR:S|/|\\/|g}/, "$${GEM_EXTSDIR}"); \ print; next; } .endif -PRINT_PLIST_AWK+= /^${GEM_LIBDIR:S|/|\\/|g}/ \ +_RUBY_PRINT_PLIST_GEM+= /^${GEM_LIBDIR:S|/|\\/|g}/ \ { gsub(/${GEM_LIBDIR:S|/|\\/|g}/, "$${GEM_LIBDIR}"); print; next; } -PRINT_PLIST_AWK+= /^${GEM_DOCDIR:S|/|\\/|g}/ \ +_RUBY_PRINT_PLIST_GEM+= /^${GEM_DOCDIR:S|/|\\/|g}/ \ { next; } -PRINT_PLIST_AWK+= /^${GEM_HOME:S|/|\\/|g}/ \ +_RUBY_PRINT_PLIST_GEM+= /^${GEM_HOME:S|/|\\/|g}/ \ { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); \ print; next; } -PRINT_PLIST_AWK+= /^${RUBY_GEM_BASE:S|/|\\/|g}/ \ +_RUBY_PRINT_PLIST_GEM+= /^${RUBY_GEM_BASE:S|/|\\/|g}/ \ { gsub(/${RUBY_GEM_BASE:S|/|\\/|g}/, "$${RUBY_GEM_BASE}"); \ print; next; } diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 31b20c037f4..30f3aae17f3 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.116 2014/03/14 19:54:23 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.117 2014/05/01 12:45:09 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -625,6 +625,10 @@ PRINT_PLIST_AWK+= /^${RUBY_SITERIDIR:S|/|\\/|g}/ \ print; next; } PRINT_PLIST_AWK+= /^${RUBY_SYSRIDIR:S|/|\\/|g}\// \ { next; } + +# Insert part of PRINT_PLIST_AWK from gem.mk +PRINT_PLIST_AWK+= ${_RUBY_PRINT_PLIST_GEM} + PRINT_PLIST_AWK+= /\/${RUBY_NAME}/ \ { sub(/${RUBY_NAME}/, "$${RUBY_NAME}"); } PRINT_PLIST_AWK+= /^${GEM_HOME:S|/|\\/|g:S|.|\\.|g}/ \ |