summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/ruby-actionpack3/Makefile8
-rw-r--r--www/ruby-actionpack3/patches/patch-.._actionpack.gemspec15
2 files changed, 5 insertions, 18 deletions
diff --git a/www/ruby-actionpack3/Makefile b/www/ruby-actionpack3/Makefile
index 241cb6df034..e7f8b763f08 100644
--- a/www/ruby-actionpack3/Makefile
+++ b/www/ruby-actionpack3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/06/11 03:20:58 taca Exp $
+# $NetBSD: Makefile,v 1.7 2011/08/12 15:19:41 taca Exp $
DISTNAME= actionpack-${RUBY_RAILS3_VERSION}
CATEGORIES= devel
@@ -8,8 +8,6 @@ HOMEPAGE= http://www.rubyonrails.org/
COMMENT= Toolkit for building modeling frameworks (part of Rails)
LICENSE= mit
-RUBY_RAILS= 3
-
#DEPENDS+= ${RUBY_ACTIVESUPPORT_DEPENDS}
DEPENDS+= ${RUBY_ACTIVEMODEL_DEPENDS}
DEPENDS+= ${RUBY_PKGPREFIX}-builder>=2.1.2:../../textproc/ruby-builder
@@ -20,5 +18,9 @@ DEPENDS+= ${RUBY_PKGPREFIX}-rack-mount>=0.6.14<0.7:../../www/ruby-rack-mount
DEPENDS+= ${RUBY_PKGPREFIX}-tzinfo>=0.3.23<0.4:../../time/ruby-tzinfo
DEPENDS+= ${RUBY_PKGPREFIX}-erubis>=2.6.6<2.7:../../www/erubis
+RUBY_RAILS= 3
+
+OVERRIDE_GEMSPEC+= builder>=2.1.2
+
.include "../../lang/ruby/gem.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-actionpack3/patches/patch-.._actionpack.gemspec b/www/ruby-actionpack3/patches/patch-.._actionpack.gemspec
deleted file mode 100644
index 0f6a6f2a87c..00000000000
--- a/www/ruby-actionpack3/patches/patch-.._actionpack.gemspec
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-.._actionpack.gemspec,v 1.5 2011/06/17 13:50:01 taca Exp $
-
-Allow depending later version gem of builder.
-
---- ../actionpack-3.0.9.gemspec.orig 2011-04-06 09:18:37.000000000 +0900
-+++ ../actionpack-3.0.9.gemspec 2011-04-06 09:18:37.000000000 +0900
-@@ -56,7 +56,7 @@ dependencies:
- requirement: &id003 !ruby/object:Gem::Requirement
- none: false
- requirements:
-- - - ~>
-+ - - >=
- - !ruby/object:Gem::Version
- hash: 15
- segments: