pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ruby Fixes dependency pattern for the case RUBY_J...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7055e7770248
branches:  trunk
changeset: 632097:7055e7770248
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Mar 15 08:16:03 2014 +0000

description:
Fixes dependency pattern for the case RUBY_JSON_TYPE=pure.

diffstat:

 lang/ruby/json.mk |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r 465c2c64956a -r 7055e7770248 lang/ruby/json.mk
--- a/lang/ruby/json.mk Sat Mar 15 07:41:09 2014 +0000
+++ b/lang/ruby/json.mk Sat Mar 15 08:16:03 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: json.mk,v 1.7 2014/02/11 16:20:03 taca Exp $
+# $NetBSD: json.mk,v 1.8 2014/03/15 08:16:03 obache Exp $
 
 # This file handles appropriate dependency to ruby-json pacakge.
 #
@@ -75,14 +75,16 @@
 
 .  if !empty(_RUBY_JSON_REQD)
 .    if ${RUBY_JSON_TYPE} == "pure"
-_RUBY_JSON_PKG=        ../../textproc/ruby-json-pure
+_RUBY_JSON_PKGSRCDIR=  ../../textproc/ruby-json-pure
+_RUBY_JSON_PKGNAME=    ${RUBY_PKGPREFIX}-json-pure
 .    else
-_RUBY_JSON_PKG=        ../../textproc/ruby-json
+_RUBY_JSON_PKGSRCDIR=  ../../textproc/ruby-json
+_RUBY_JSON_PKGNAME=    ${RUBY_PKGPREFIX}-json
 .    endif
 .    if ${_RUBY_JSON_DEPENDS} == "build"
-BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-json>=${_RUBY_JSON_VERS}:${_RUBY_JSON_PKG}
+BUILD_DEPENDS+= ${_RUBY_JSON_PKGNAME}>=${_RUBY_JSON_VERS}:${_RUBY_JSON_PKGSRCDIR}
 .    else
-DEPENDS+= ${RUBY_PKGPREFIX}-json>=${_RUBY_JSON_VERS}:${_RUBY_JSON_PKG}
+DEPENDS+= ${_RUBY_JSON_PKGNAME}>=${_RUBY_JSON_VERS}:${_RUBY_JSON_PKGSRCDIR}
 .    endif
 .  endif
 



Home | Main Index | Thread Index | Old Index