Mon Feb 21 14:31:06 2011 UTC ()
* Start upate of ruby18 and ruby19 packags.
* Remove redundant GEM_HOME definition from PLIST.


(taca)
diff -r1.57 -r1.58 pkgsrc/lang/ruby/rubyversion.mk
cvs diff -r1.57 -r1.58 pkgsrc/lang/ruby/rubyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rubyversion.mk 2011/02/02 08:47:01 1.57
+++ pkgsrc/lang/ruby/rubyversion.mk 2011/02/21 14:31:06 1.58
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: rubyversion.mk,v 1.57 2011/02/02 08:47:01 obache Exp $ 1# $NetBSD: rubyversion.mk,v 1.58 2011/02/21 14:31:06 taca Exp $
2# 2#
3 3
4.if !defined(_RUBYVERSION_MK) 4.if !defined(_RUBYVERSION_MK)
5_RUBYVERSION_MK= # defined 5_RUBYVERSION_MK= # defined
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9# current supported Ruby's version 9# current supported Ruby's version
10RUBY18_VERSION= 1.8.7 10RUBY18_VERSION= 1.8.7
11RUBY19_VERSION= 1.9.2 11RUBY19_VERSION= 1.9.2
12 12
13# patch 13# patch
14RUBY18_PATCHLEVEL= pl330 14RUBY18_PATCHLEVEL= pl334
15RUBY19_PATCHLEVEL= pl136 15RUBY19_PATCHLEVEL= pl180
16 16
17# current API compatible version. 17# current API compatible version.
18RUBY18_API_VERSION= 1.8.7 18RUBY18_API_VERSION= 1.8.7
19RUBY19_API_VERSION= 1.9.1 19RUBY19_API_VERSION= 1.9.1
20 20
21# RUBY_VERSION_DEFAULT defines default version for Ruby related 21# RUBY_VERSION_DEFAULT defines default version for Ruby related
22# packages and user can define in mk.conf. (1.8 or 1.9) 22# packages and user can define in mk.conf. (1.8 or 1.9)
23# 23#
24RUBY_VERSION_DEFAULT?= 1.8 24RUBY_VERSION_DEFAULT?= 1.8
25_RUBY_VERSION_DEFAULT= ${RUBY_VERSION_DEFAULT:S/.//} 25_RUBY_VERSION_DEFAULT= ${RUBY_VERSION_DEFAULT:S/.//}
26 26
27# RUBY_VERSION defines the specific Ruby's version which is supported 27# RUBY_VERSION defines the specific Ruby's version which is supported
28# by the package. It should be defined by packages whose distfiles 28# by the package. It should be defined by packages whose distfiles
@@ -326,28 +326,27 @@ MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER @@ -326,28 +326,27 @@ MESSAGE_SUBST+= RUBY="${RUBY}" RUBY_VER
326 RUBY_VERSION="${RUBY_VERSION}" \ 326 RUBY_VERSION="${RUBY_VERSION}" \
327 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \ 327 RUBY_PKGPREFIX="${RUBY_PKGPREFIX}" \
328 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} 328 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
329 329
330PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \ 330PLIST_SUBST+= RUBY=${RUBY:Q} RUBY_VER=${RUBY_VER:Q} \
331 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \ 331 RUBY_PKGPREFIX=${RUBY_PKGPREFIX} \
332 RUBY_VERSION=${RUBY_VERSION:Q} \ 332 RUBY_VERSION=${RUBY_VERSION:Q} \
333 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \ 333 RUBY_VER_DIR=${RUBY_VER_DIR:Q} \
334 RUBY_DLEXT=${RUBY_DLEXT:Q} RUBY_SLEXT=${RUBY_SLEXT:Q} \ 334 RUBY_DLEXT=${RUBY_DLEXT:Q} RUBY_SLEXT=${RUBY_SLEXT:Q} \
335 RUBY_SHLIB=${RUBY_SHLIB:Q} \ 335 RUBY_SHLIB=${RUBY_SHLIB:Q} \
336 RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \ 336 RUBY_SHLIBALIAS=${RUBY_SHLIBALIAS:Q} \
337 RUBY_STATICLIB=${RUBY_STATICLIB:Q} \ 337 RUBY_STATICLIB=${RUBY_STATICLIB:Q} \
338 RUBY_ARCH=${RUBY_ARCH:Q} \ 338 RUBY_ARCH=${RUBY_ARCH:Q} \
339 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",} \ 339 ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
340 GEM_HOME=${GEM_HOME:Q} 
341 340
342# 341#
343# make dynamic PLIST 342# make dynamic PLIST
344# 343#
345.if !empty(RUBY_DYNAMIC_DIRS) 344.if !empty(RUBY_DYNAMIC_DIRS)
346 345
347RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work 346RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work
348 347
349.if !defined(PLIST_SRC) 348.if !defined(PLIST_SRC)
350. if exists(${PKGDIR}/PLIST.common) 349. if exists(${PKGDIR}/PLIST.common)
351PLIST_SRC+= ${PKGDIR}/PLIST.common 350PLIST_SRC+= ${PKGDIR}/PLIST.common
352. elif exists(${PKGDIR}/PLIST) 351. elif exists(${PKGDIR}/PLIST)
353PLIST_SRC+= ${PKGDIR}/PLIST 352PLIST_SRC+= ${PKGDIR}/PLIST