Mon Sep 13 13:36:59 2010 UTC ()
* Add CONFLICTS with previous package name without "${RUBY_PKGPREFIX}-".
* Fix shbang commnad of rails command.

Bump PKGREVISION.


(taca)
diff -r1.18 -r1.19 pkgsrc/www/rails/Makefile
diff -r0 -r1.4 pkgsrc/www/rails/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/www/rails/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/rails/Attic/Makefile 2010/09/10 12:51:30 1.18
+++ pkgsrc/www/rails/Attic/Makefile 2010/09/13 13:36:59 1.19
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.18 2010/09/10 12:51:30 taca Exp $ 1# $NetBSD: Makefile,v 1.19 2010/09/13 13:36:59 taca Exp $
2 2
3DISTNAME= rails-2.3.9 3DISTNAME= rails-2.3.9
 4PKGREVISION= 1
4CATEGORIES= www 5CATEGORIES= www
5 6
6MAINTAINER= minskim@NetBSD.org 7MAINTAINER= minskim@NetBSD.org
7HOMEPAGE= http://www.rubyonrails.org/ 8HOMEPAGE= http://www.rubyonrails.org/
8COMMENT= Framework for developing database-backed web applications 9COMMENT= Framework for developing database-backed web applications
9LICENSE= mit 10LICENSE= mit
10 11
11DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=2.3.9:../../devel/ruby-activesupport 12DEPENDS+= ${RUBY_PKGPREFIX}-activesupport>=2.3.9:../../devel/ruby-activesupport
12DEPENDS+= ${RUBY_PKGPREFIX}-activerecord>=2.3.9:../../databases/ruby-activerecord 13DEPENDS+= ${RUBY_PKGPREFIX}-activerecord>=2.3.9:../../databases/ruby-activerecord
13DEPENDS+= ${RUBY_PKGPREFIX}-actionpack>=2.3.9:../../www/ruby-actionpack 14DEPENDS+= ${RUBY_PKGPREFIX}-actionpack>=2.3.9:../../www/ruby-actionpack
14DEPENDS+= ${RUBY_PKGPREFIX}-actionmailer>=2.3.9:../../mail/ruby-actionmailer 15DEPENDS+= ${RUBY_PKGPREFIX}-actionmailer>=2.3.9:../../mail/ruby-actionmailer
15DEPENDS+= ${RUBY_PKGPREFIX}-activeresource>=2.3.9:../../www/ruby-activeresource 16DEPENDS+= ${RUBY_PKGPREFIX}-activeresource>=2.3.9:../../www/ruby-activeresource
16 17
17CONFLICTS+= ruby[1-9][0-9]-rails-[0-9]* 18CONFLICTS+= ruby[1-9][0-9]-rails-[0-9]* rails-[0-9]*
18 19
19REPLACE_RUBY_DIRS= bin 20REPLACE_RUBY_DIRS= bin
20REPLACE_RUBY_PAT= * 21REPLACE_RUBY_PAT= *
21 22
22.include "../../lang/ruby/gem.mk" 23.include "../../lang/ruby/gem.mk"
23.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/www/rails/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.4 2010/09/13 13:36:59 taca Exp $

--- bin/rails.orig	2010-09-07 05:45:01.000000000 +0000
+++ bin/rails
@@ -1,3 +1,4 @@
+#!/usr/pkg/bin/ruby
 $:.unshift File.expand_path("../../lib", __FILE__)
 
 require 'ruby_version_check'