CVS commit: pkgsrc/devel

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Jun 21 13:13:48 UTC 2017

Modified Files:
        pkgsrc/devel/ruby-railties32: Makefile PLIST
        pkgsrc/devel/ruby-railties42: Makefile PLIST
Added Files:
        pkgsrc/devel/ruby-railties32: ALTERNATIVES
        pkgsrc/devel/ruby-railties42: ALTERNATIVES

Log Message:
* Update ruby-railties32 and ruby-railties42 package to updated rails
  framework.
* Add support of pkg_alternatives to coexist of ruby-rails32 and
  ruby-rails42.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ruby-railties32/ALTERNATIVES
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/ruby-railties32/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ruby-railties32/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ruby-railties42/ALTERNATIVES
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ruby-railties42/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ruby-railties42/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ruby-railties32/Makefile
diff -u pkgsrc/devel/ruby-railties32/Makefile:1.12 pkgsrc/devel/ruby-railties32/Makefile:1.13
--- pkgsrc/devel/ruby-railties32/Makefile:1.12  Sat Nov 19 14:38:03 2016
+++ pkgsrc/devel/ruby-railties32/Makefile       Wed Jun 21 13:13:48 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2016/11/19 14:38:03 taca Exp $
+# $NetBSD: Makefile,v 1.13 2017/06/21 13:13:48 taca Exp $
 
-DISTNAME=      railties-${RUBY_RAILS_VERSION}
+DISTNAME=      railties-${RAILS_VERSION}
+PKGNAME=       ${RUBY_PKGPREFIX}-railties${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=    databases
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -16,8 +17,14 @@ DEPENDS+=    ${RUBY_ACTIONPACK_DEPENDS}
 
 RUBY_RAILS_SUPPORTED=  32
 RUBY_RAILS_STRICT_DEP= yes
-USE_RAKE=              RUN
-OVERRIDE_GEMSPEC+=     rack-ssl>=1.3.2 rdoc>=3.4
+RUBYGEM_OPTIONS+=      --format-executable
+OVERRIDE_GEMSPEC+=     rack-ssl>=1.3.2 rdoc>=3.4 \
+                       :executables rails=rails32 :files bin/rails=bin/rails32
+
+pre-configure:
+       ${TEST} ! -f ${WRKSRC}/bin/rails || \
+               ${MV} ${WRKSRC}/bin/rails ${WRKSRC}/bin/rails32
+       ${CHMOD} ${BINMODE} ${WRKSRC}/bin/rails32
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ruby-railties32/PLIST
diff -u pkgsrc/devel/ruby-railties32/PLIST:1.5 pkgsrc/devel/ruby-railties32/PLIST:1.6
--- pkgsrc/devel/ruby-railties32/PLIST:1.5      Wed Sep 11 13:38:19 2013
+++ pkgsrc/devel/ruby-railties32/PLIST  Wed Jun 21 13:13:48 2017
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2013/09/11 13:38:19 taca Exp $
-bin/rails
+@comment $NetBSD: PLIST,v 1.6 2017/06/21 13:13:48 taca Exp $
+bin/rails32${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/CHANGELOG.md
 ${GEM_LIBDIR}/README.rdoc
-${GEM_LIBDIR}/bin/rails
+${GEM_LIBDIR}/bin/rails32
 ${GEM_LIBDIR}/guides/assets/images/belongs_to.png
 ${GEM_LIBDIR}/guides/assets/images/book_icon.gif
 ${GEM_LIBDIR}/guides/assets/images/bullet.gif

Index: pkgsrc/devel/ruby-railties42/Makefile
diff -u pkgsrc/devel/ruby-railties42/Makefile:1.2 pkgsrc/devel/ruby-railties42/Makefile:1.3
--- pkgsrc/devel/ruby-railties42/Makefile:1.2   Thu May  4 07:37:09 2017
+++ pkgsrc/devel/ruby-railties42/Makefile       Wed Jun 21 13:13:48 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2017/05/04 07:37:09 taca Exp $
+# $NetBSD: Makefile,v 1.3 2017/06/21 13:13:48 taca Exp $
 
-DISTNAME=      railties-${RUBY_RAILS_VERSION}
+DISTNAME=      railties-${RAILS_VERSION}
+PKGNAME=       ${RUBY_PKGPREFIX}-railties${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=    databases
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,8 +15,15 @@ DEPENDS+=    ${RUBY_PKGPREFIX}-thor>=0.18.1
 
 RUBY_RAILS_SUPPORTED=  42
 RUBY_RAILS_STRICT_DEP= yes
-USE_RAKE=              RUN
-OVERRIDE_GEMSPEC+=     rack-ssl>=1.3.2 rdoc>=3.4
+RUBYGEM_OPTIONS+=      --format-executable
+RUBYGEM_OPTIONS+=      --format-executable
+OVERRIDE_GEMSPEC+=     rack-ssl>=1.3.2 rdoc>=3.4 \
+                       :executables rails=rails42 :files bin/rails=bin/rails42
+
+pre-configure:
+       ${TEST} ! -f ${WRKSRC}/bin/rails || \
+               ${MV} ${WRKSRC}/bin/rails ${WRKSRC}/bin/rails42
+       ${CHMOD} ${BINMODE} ${WRKSRC}/bin/rails42
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ruby-railties42/PLIST
diff -u pkgsrc/devel/ruby-railties42/PLIST:1.1 pkgsrc/devel/ruby-railties42/PLIST:1.2
--- pkgsrc/devel/ruby-railties42/PLIST:1.1      Sat Apr 22 10:17:30 2017
+++ pkgsrc/devel/ruby-railties42/PLIST  Wed Jun 21 13:13:48 2017
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2017/04/22 10:17:30 minskim Exp $
-bin/rails
+@comment $NetBSD: PLIST,v 1.2 2017/06/21 13:13:48 taca Exp $
+bin/rails42${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/CHANGELOG.md
 ${GEM_LIBDIR}/RDOC_MAIN.rdoc
 ${GEM_LIBDIR}/README.rdoc
-${GEM_LIBDIR}/bin/rails
+${GEM_LIBDIR}/bin/rails42
 ${GEM_LIBDIR}/lib/rails.rb
 ${GEM_LIBDIR}/lib/rails/all.rb
 ${GEM_LIBDIR}/lib/rails/api/task.rb

Added files:

Index: pkgsrc/devel/ruby-railties32/ALTERNATIVES
diff -u /dev/null pkgsrc/devel/ruby-railties32/ALTERNATIVES:1.1
--- /dev/null   Wed Jun 21 13:13:48 2017
+++ pkgsrc/devel/ruby-railties32/ALTERNATIVES   Wed Jun 21 13:13:48 2017
@@ -0,0 +1 @@
+bin/rails @PREFIX@/bin/rails32@RUBY_SUFFIX@

Index: pkgsrc/devel/ruby-railties42/ALTERNATIVES
diff -u /dev/null pkgsrc/devel/ruby-railties42/ALTERNATIVES:1.1
--- /dev/null   Wed Jun 21 13:13:48 2017
+++ pkgsrc/devel/ruby-railties42/ALTERNATIVES   Wed Jun 21 13:13:48 2017
@@ -0,0 +1 @@
+bin/rails @PREFIX@/bin/rails42@RUBY_SUFFIX@