diff options
| author | taca <taca@pkgsrc.org> | 2007-03-15 16:41:01 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2007-03-15 16:41:01 +0000 |
| commit | 0257375859346281fb3c5a62eb8a1c79887f2519 (patch) | |
| tree | ec28575989c4b0114936eeed556b51878790f5c1 /lang | |
| parent | 25b4de70be9bb9e0bbde6e31fa8a48f97108b647 (diff) | |
| download | pkgsrc-0257375859346281fb3c5a62eb8a1c79887f2519.tar.gz | |
Updating Ruby to 1.8.6.
- discontinue use of RUBY_PATCH_DATE.
- Introduce RUBY_PATCH_LEVEL.
pkgsrc's ruby tracks Ruby's patch release and avoid to maintain
its own patch files (with RUBY_PATCH_DATE).
Changes are too much, please see ChangeLog file.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/Makefile | 4 | ||||
| -rw-r--r-- | lang/ruby/Makefile.common | 7 | ||||
| -rw-r--r-- | lang/ruby/rubyversion.mk | 16 |
3 files changed, 18 insertions, 9 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index eda29987508..9adc854ede1 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.42 2007/01/07 09:13:57 rillig Exp $ +# $NetBSD: Makefile,v 1.43 2007/03/15 16:41:01 taca Exp $ -DISTNAME= ruby-${RUBY_VERSION}.${RUBY_PATCH_DATE} +DISTNAME= ruby-${RUBY_VERSION} CATEGORIES= lang ruby MASTER_SITES= # empty DISTFILES= # empty diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common index ef59bace6fc..c3ae5168ae6 100644 --- a/lang/ruby/Makefile.common +++ b/lang/ruby/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2006/09/13 12:56:46 taca Exp $ +# $NetBSD: Makefile.common,v 1.14 2007/03/15 16:41:01 taca Exp $ # # Ruby base distribution common definition @@ -27,8 +27,13 @@ RUBY_DISTINFO_FILE= ${RUBY_SRCDIR}/distinfo RUBY_HOMEPAGE= http://www.ruby-lang.org/en/ # common default +.if !empty(RUBY_PATCH_LEVEL) +RUBY_DISTNAME?= ruby-${RUBY_VERSION}.${RUBY_PATCH_LEVEL} +.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 11b9c66413f..8b1d1d197fe 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.31 2007/01/28 15:15:57 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.32 2007/03/15 16:41:01 taca Exp $ # .if !defined(_RUBYVERSION_MK) @@ -7,10 +7,10 @@ _RUBYVERSION_MK= # defined .include "../../mk/bsd.prefs.mk" # current supported Ruby's version -RUBY18_VERSION= 1.8.5 +RUBY18_VERSION= 1.8.6 -# patch date -RUBY18_PATCH_DATE= 20061205 +# patch +RUBY18_PATCHLEVEL= # RUBY_VERSION_DEFAULT defines default version for Ruby related # packages and user can define in mk.conf. (1.6 or 1.8) @@ -25,10 +25,14 @@ RUBY_VERSION_DEFAULT?= 1.8 # .if ${RUBY_VERSION_DEFAULT} == "1.8" RUBY_VERSION?= ${RUBY18_VERSION} -RUBY_PATCH_DATE?= ${RUBY18_PATCH_DATE} +RUBY_PATCHLEVEL?= ${RUBY18_PATCHLEVEL} .endif -RUBY_VERSION_SUFFIX= ${RUBY_VERSION}.${RUBY_PATCH_DATE} +.if !empty(RUBY_PATCH_LEVEL) +RUBY_VERSION_SUFFIX= ${RUBY_VERSION}.${RUBY_PATCH_LEVEL} +.else +RUBY_VERSION_SUFFIX= ${RUBY_VERSION} +.endif # RUBY_VERSION_SUPPORTED defines the list of ${RUBY_VER} which is # supported by the package. It should be defined by the packages |