summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2010-10-15 11:40:05 +0000
committertaca <taca@pkgsrc.org>2010-10-15 11:40:05 +0000
commitab0c16304cde4193c2202ea99af4a5d070ff9fcc (patch)
treeafa45286fad458c9cfdfbae1c73bbea6083dab78
parent6dd807f84b2f924701246b665702a0e82a44bd42 (diff)
downloadpkgsrc-ab0c16304cde4193c2202ea99af4a5d070ff9fcc.tar.gz
Update www/rails package to 2.3.10.
No change except version, it is part of Rails 2.3.10. Change depending pattern to prevent install packages for rails3.
-rw-r--r--www/rails/Makefile18
-rw-r--r--www/rails/distinfo9
-rw-r--r--www/rails/patches/patch-ad12
3 files changed, 27 insertions, 12 deletions
diff --git a/www/rails/Makefile b/www/rails/Makefile
index 9362dc5c38a..12a8a795366 100644
--- a/www/rails/Makefile
+++ b/www/rails/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2010/10/13 18:45:11 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2010/10/15 11:40:05 taca Exp $
-DISTNAME= rails-2.3.9
-PKGREVISION= 2
+DISTNAME= rails-2.3.10
CATEGORIES= www
MAINTAINER= minskim@NetBSD.org
@@ -14,15 +13,18 @@ LICENSE= mit
.if ${RUBY_VER} == "18"
DEPENDS+= ${RUBY_PKGPREFIX}-rake>=0.8.3:../../devel/rake
.endif
-DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=2.3.9:../../devel/ruby-activesupport
-DEPENDS+= ${RUBY_PKGPREFIX}-activerecord>=2.3.9:../../databases/ruby-activerecord
-DEPENDS+= ${RUBY_PKGPREFIX}-actionpack>=2.3.9:../../www/ruby-actionpack
-DEPENDS+= ${RUBY_PKGPREFIX}-actionmailer>=2.3.9:../../mail/ruby-actionmailer
-DEPENDS+= ${RUBY_PKGPREFIX}-activeresource>=2.3.9:../../www/ruby-activeresource
+DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=2.3.10<3.0.0:../../devel/ruby-activesupport
+DEPENDS+= ${RUBY_PKGPREFIX}-activerecord>=2.3.10<3.0.0:../../databases/ruby-activerecord
+DEPENDS+= ${RUBY_PKGPREFIX}-actionpack>=2.3.10<3.0.0:../../www/ruby-actionpack
+DEPENDS+= ${RUBY_PKGPREFIX}-actionmailer>=2.3.10<3.0.0:../../mail/ruby-actionmailer
+DEPENDS+= ${RUBY_PKGPREFIX}-activeresource>=2.3.10<3.0.0:../../www/ruby-activeresource
CONFLICTS+= ruby[1-9][0-9]-rails-[0-9]* rails-[0-9]*
REPLACE_RUBY_DIRS= bin
REPLACE_RUBY_PAT= *
+pre-configure:
+ ${RM} -f ${WRKSRC}/railties-3.0.0.beta3.gem
+
.include "../../mk/bsd.pkg.mk"
diff --git a/www/rails/distinfo b/www/rails/distinfo
index 943a6f2e81d..b25fc2eead8 100644
--- a/www/rails/distinfo
+++ b/www/rails/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2010/09/10 12:51:30 taca Exp $
+$NetBSD: distinfo,v 1.15 2010/10/15 11:40:05 taca Exp $
-SHA1 (rails-2.3.9.gem) = 715978bf74545ca6b369c7f9c7649e3eec0f1670
-RMD160 (rails-2.3.9.gem) = 200ca207100df8d6d1c3d5b4b03d173d339f27a1
-Size (rails-2.3.9.gem) = 211968 bytes
+SHA1 (rails-2.3.10.gem) = 14cafcd32b3560570f52fc12f470bcb31169f3ed
+RMD160 (rails-2.3.10.gem) = d776b061118890367f1e3831b456b042c1416ad4
+Size (rails-2.3.10.gem) = 1709056 bytes
SHA1 (patch-aa) = e59e8ad345d035fe850a5fe87aeff7a82590493e
+SHA1 (patch-ad) = 7bdfc7dd1f54232e4a8e85218a773af0d789e1ba
diff --git a/www/rails/patches/patch-ad b/www/rails/patches/patch-ad
new file mode 100644
index 00000000000..a3e8687390d
--- /dev/null
+++ b/www/rails/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2010/10/15 11:40:06 taca Exp $
+
+--- ../rails-2.3.10.gemspec.orig 2010-10-15 02:35:21.000000000 +0000
++++ ../rails-2.3.10.gemspec
+@@ -126,7 +126,6 @@ files:
+ - CHANGELOG
+ - fresh_rakefile
+ - MIT-LICENSE
+-- railties-3.0.0.beta3.gem
+ - Rakefile
+ - README
+ - bin/about