diff options
| author | taca <taca@pkgsrc.org> | 2010-09-13 13:36:59 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2010-09-13 13:36:59 +0000 |
| commit | dfe5d209f107562548663f79c79dfc5baa442d30 (patch) | |
| tree | 15eab292d71ddd9a157b49ee3f1b5e9a860bc632 /www | |
| parent | 5d6d076bcf9831a7516ecefdfab9393e0ce9055f (diff) | |
| download | pkgsrc-dfe5d209f107562548663f79c79dfc5baa442d30.tar.gz | |
* Add CONFLICTS with previous package name without "${RUBY_PKGPREFIX}-".
* Fix shbang commnad of rails command.
Bump PKGREVISION.
Diffstat (limited to 'www')
| -rw-r--r-- | www/rails/Makefile | 5 | ||||
| -rw-r--r-- | www/rails/patches/patch-aa | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/www/rails/Makefile b/www/rails/Makefile index 9a316ba833a..97611d8b8c1 100644 --- a/www/rails/Makefile +++ b/www/rails/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2010/09/10 12:51:30 taca Exp $ +# $NetBSD: Makefile,v 1.19 2010/09/13 13:36:59 taca Exp $ DISTNAME= rails-2.3.9 +PKGREVISION= 1 CATEGORIES= www MAINTAINER= minskim@NetBSD.org @@ -14,7 +15,7 @@ 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 -CONFLICTS+= ruby[1-9][0-9]-rails-[0-9]* +CONFLICTS+= ruby[1-9][0-9]-rails-[0-9]* rails-[0-9]* REPLACE_RUBY_DIRS= bin REPLACE_RUBY_PAT= * diff --git a/www/rails/patches/patch-aa b/www/rails/patches/patch-aa new file mode 100644 index 00000000000..0fcd01c22c1 --- /dev/null +++ b/www/rails/patches/patch-aa @@ -0,0 +1,9 @@ +$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' |