diff options
| author | taca <taca@pkgsrc.org> | 2011-12-24 03:30:10 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2011-12-24 03:30:10 +0000 |
| commit | 996bc4e9824516391f1c69bee8ca2efcdcd0e11f (patch) | |
| tree | cc8d78b478ac8da25fcfbc45f127430923c6c282 /lang | |
| parent | 350b01c3b589c6b1eb6172b01ab3f103638f221f (diff) | |
| download | pkgsrc-996bc4e9824516391f1c69bee8ca2efcdcd0e11f.tar.gz | |
* Remove backward compatibility handling for RUBY_VER; pkglint dosen't like it.
* Add one more PRINT_PLIST_AWK for GEM_HOME.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/rubyversion.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 1ec21af4c4b..b91ccf0e882 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.64 2011/11/08 15:18:31 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.65 2011/12/24 03:30:10 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -232,13 +232,6 @@ RUBY_VER= ${rv} . endfor .endif -# For backward compatibility -.if ${RUBY_VER} == "1.9" || ${RUBY_VER} == "192" -RUBY_VER= 19 -.elif ${RUBY_VER} == "1.8" -RUBY_VER= 18 -.endif - .if ${RUBY_VER} == "18" RUBY_VERSION= ${RUBY18_VERSION} RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL:S/pl/./} @@ -570,5 +563,7 @@ PRINT_PLIST_AWK+= /^${RUBY_SYSRIDIR:S|/|\\/|g}\// \ { next; } PRINT_PLIST_AWK+= /\/${RUBY_NAME}/ \ { sub(/${RUBY_NAME}/, "$${RUBY_NAME}"); } +PRINT_PLIST_AWK+= /^${GEM_HOME:S|/|\\/|g:S|.|\\.|g}/ \ + { gsub(/${GEM_HOME:S|/|\\/|g}/, "$${GEM_HOME}"); } .endif # _RUBY_MK |