diff options
| author | tron <tron> | 2013-12-01 11:07:13 +0000 |
|---|---|---|
| committer | tron <tron> | 2013-12-01 11:07:13 +0000 |
| commit | 4312a13e2c1ee2fa90ed39d0dfdd6aa740274f51 (patch) | |
| tree | df3702c82e23da66f6761cab42925841afe38c3c | |
| parent | cd6b11849e18f9f70375cbadb7151eeebc7cf980 (diff) | |
| download | pkgsrc-4312a13e2c1ee2fa90ed39d0dfdd6aa740274f51.tar.gz | |
Pullup ticket #4259 - requested by taca
databases/ruby-dm-serializer: dependency fix
databases/ruby-dm-types/Makefile: dependency fix
net/ruby-tw/Makefile: dependency fix
Revisions pulled up:
- databases/ruby-dm-serializer/Makefile 1.7
- databases/ruby-dm-types/Makefile 1.10
- lang/ruby/json.mk 1.3
- net/ruby-tw/Makefile 1.7
---
Module Name: pkgsrc
Committed By: taca
Date: Sun Nov 24 14:05:08 UTC 2013
Modified Files:
pkgsrc/lang/ruby: json.mk
Log Message:
Correct versions of json as bundled with Ruby.
---
Module Name: pkgsrc
Committed By: taca
Date: Sun Nov 24 14:07:50 UTC 2013
Modified Files:
pkgsrc/databases/ruby-dm-serializer: Makefile
pkgsrc/databases/ruby-dm-types: Makefile
pkgsrc/net/ruby-tw: Makefile
Log Message:
Bump PKGREVISION for json version handling change.
| -rw-r--r-- | databases/ruby-dm-serializer/Makefile | 3 | ||||
| -rw-r--r-- | databases/ruby-dm-types/Makefile | 3 | ||||
| -rw-r--r-- | lang/ruby/json.mk | 12 | ||||
| -rw-r--r-- | net/ruby-tw/Makefile | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/databases/ruby-dm-serializer/Makefile b/databases/ruby-dm-serializer/Makefile index 68a77f46acf..524c245753f 100644 --- a/databases/ruby-dm-serializer/Makefile +++ b/databases/ruby-dm-serializer/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2012/09/16 05:17:52 taca Exp $ +# $NetBSD: Makefile,v 1.6.10.1 2013/12/01 11:07:13 tron Exp $ DISTNAME= dm-serializer-1.2.2 +PKGREVISION= 1 CATEGORIES= databases MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/databases/ruby-dm-types/Makefile b/databases/ruby-dm-types/Makefile index 5b1e044b420..426a97ecee8 100644 --- a/databases/ruby-dm-types/Makefile +++ b/databases/ruby-dm-types/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2012/09/16 05:18:14 taca Exp $ +# $NetBSD: Makefile,v 1.9.10.1 2013/12/01 11:07:13 tron Exp $ DISTNAME= dm-types-1.2.2 +PKGREVISION= 1 CATEGORIES= databases MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/lang/ruby/json.mk b/lang/ruby/json.mk index af292cafbe1..1a6690a5bd6 100644 --- a/lang/ruby/json.mk +++ b/lang/ruby/json.mk @@ -1,4 +1,4 @@ -# $NetBSD: json.mk,v 1.2 2011/12/14 13:13:18 taca Exp $ +# $NetBSD: json.mk,v 1.2.16.1 2013/12/01 11:07:13 tron Exp $ # This file handles appropriate dependency to ruby-json pacakge. # @@ -28,11 +28,15 @@ WARNINGS+= "[lang/ruby/json.mk] No needs to include ../../lang/ruby/json.mk" .include "../../lang/ruby/rubyversion.mk" -. if ${RUBY_VER} != "193" +. if ${RUBY_VER} == "18" _RUBY_JSON_REQD= true . else -RUBY_JSON_VERSION= 1.5.4 +. if ${RUBY_VER} == "193" +RUBY_JSON_VERSION= 1.5.5 +. elif ${RUBY_VER} == "200" +RUBY_JSON_VERSION= 1.7.7 +. endif _RUBY_JSON_MAJOR= ${RUBY_JSON_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/} _RUBY_JSON_MINOR= ${RUBY_JSON_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/} @@ -63,7 +67,7 @@ _RUBY_JSON_REQD= true . endif . endif . endif -. endif # ${RUBY_VER} == "193" +. endif # ${RUBY_VER} != "18" . if !empty(_RUBY_JSON_REQD) . if ${RUBY_JSON_TYPE} == "json" || ${RUBY_JSON_TYPE} == "both" diff --git a/net/ruby-tw/Makefile b/net/ruby-tw/Makefile index 994c092fba6..3960eb9f2b8 100644 --- a/net/ruby-tw/Makefile +++ b/net/ruby-tw/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2013/09/23 05:16:22 tsutsui Exp $ +# $NetBSD: Makefile,v 1.6.2.1 2013/12/01 11:07:13 tron Exp $ DISTNAME= tw-0.5.1 +PKGREVISION= 1 CATEGORIES= net MAINTAINER= tsutsui@NetBSD.org |