diff options
| author | taca <taca> | 2012-02-04 09:43:32 +0000 |
|---|---|---|
| committer | taca <taca> | 2012-02-04 09:43:32 +0000 |
| commit | 62e936c01e87030872e147c7fe165baf7c130be4 (patch) | |
| tree | a58a25706e1b52ff6a29517ceedb8c7f289106ca /lang | |
| parent | d1a521be5ddbd12ea6deeec284f1f0aac4d8578b (diff) | |
| download | pkgsrc-62e936c01e87030872e147c7fe165baf7c130be4.tar.gz | |
Move RUBY_DISTNAME definition back to rubyversion.mk from Makefile.common.
Some extension might need Ruby's distribution files.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/Makefile.common | 11 | ||||
| -rw-r--r-- | lang/ruby/rubyversion.mk | 14 |
2 files changed, 13 insertions, 12 deletions
diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common index c96702fdfef..48e2d41c5fd 100644 --- a/lang/ruby/Makefile.common +++ b/lang/ruby/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2011/12/18 13:20:17 taca Exp $ +# $NetBSD: Makefile.common,v 1.24 2012/02/04 09:43:32 taca Exp $ # # Ruby base distribution common definition # used by databases/ruby-gdbm/Makefile @@ -47,15 +47,6 @@ RUBY_DISTINFO_FILE= ${RUBY_SRCDIR}/distinfo RUBY_HOMEPAGE= http://www.ruby-lang.org/en/ -# common default -_RUBY_PATCHLEVEL= ${RUBY_PATCHLEVEL:S/pl/p/:S/pre/preview/} - -.if !empty(_RUBY_PATCHLEVEL) -RUBY_DISTNAME?= ruby-${RUBY_VERSION}-${_RUBY_PATCHLEVEL} -.else -RUBY_DISTNAME?= ruby-${RUBY_VERSION} -.endif - RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} EXTRACT_SUFX= .tar.bz2 STRIP?= strip diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index f5415449e5e..5ece7d0d4c2 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.70 2011/12/28 16:40:06 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.71 2012/02/04 09:43:32 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -11,7 +11,6 @@ # The preferered Ruby version to use. # # Possible values: 18 192 193 -# Compatible values: 1.9(= 192) 19(= 192) # Default: 192 # # RUBY_BUILD_RDOC @@ -353,6 +352,17 @@ RUBY_SLEXT= so .endif # +# Ruby distribution file, few package need it. +# +_RUBY_PATCHLEVEL= ${RUBY_PATCHLEVEL:S/pl/p/:S/pre/preview/} + +.if !empty(_RUBY_PATCHLEVEL) +RUBY_DISTNAME?= ruby-${RUBY_VERSION}-${_RUBY_PATCHLEVEL} +.else +RUBY_DISTNAME?= ruby-${RUBY_VERSION} +.endif + +# # Use pthread library with Ruby # .if !empty(MACHINE_PLATFORM:MDarwin-9.*-powerpc) |