[pkgsrc/pkgsrc-2017Q3]: pkgsrc Pullup ticket #5610 - requested by taca

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3103f6de762
branches:  pkgsrc-2017Q3
changeset: 408554:d3103f6de762
user:      spz <spz%pkgsrc.org@localhost>
date:      Tue Oct 31 17:01:37 2017 +0000

description:
Pullup ticket #5610 - requested by taca
devel/ruby-redmine: build fix
meta-pkgs/ruby-redmine-plugins: build fix
meta-pkgs/ruby-redmine-themes: build fix

Revisions pulled up:
- devel/ruby-redmine/Makefile                                   1.24
- meta-pkgs/ruby-redmine-plugins/Makefile                       1.5
- meta-pkgs/ruby-redmine-plugins/Makefile.common                1.3
- meta-pkgs/ruby-redmine-themes/Makefile                        1.6
- meta-pkgs/ruby-redmine-themes/Makefile.common                 1.4

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Sep 29 13:13:26 UTC 2017

   Modified Files:
        pkgsrc/devel/ruby-redmine: Makefile

   Log Message:
   devel/ruby-redmine: Fix usage ofRUBY_VERSIONS_ACCEPTED

   Define RUBY_VERSIONS_ACCEPTED before including rubyversion.mk.
   Should be fix pbulk problem.


   To generate a diff of this commit:
   cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/ruby-redmine/Makefile

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sat Sep 30 15:48:42 UTC 2017

   Modified Files:
        pkgsrc/meta-pkgs/ruby-redmine-plugins: Makefile Makefile.common
        pkgsrc/meta-pkgs/ruby-redmine-themes: Makefile Makefile.common

   Log Message:
   meta-pkgs/ruby-redmine-*: Restrict ruby's version

   Restrict ruby-redmine depending pacakges to ruby22 only.


   To generate a diff of this commit:
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile
   cvs rdiff -u -r1.2 -r1.3 \
       pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile.common
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile.common

diffstat:

 devel/ruby-redmine/Makefile                    |  6 +++---
 meta-pkgs/ruby-redmine-plugins/Makefile        |  3 ++-
 meta-pkgs/ruby-redmine-plugins/Makefile.common |  4 +++-
 meta-pkgs/ruby-redmine-themes/Makefile         |  3 ++-
 meta-pkgs/ruby-redmine-themes/Makefile.common  |  4 +++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diffs (94 lines):

diff -r 043c82bff90b -r d3103f6de762 devel/ruby-redmine/Makefile
--- a/devel/ruby-redmine/Makefile       Tue Oct 31 16:22:46 2017 +0000
+++ b/devel/ruby-redmine/Makefile       Tue Oct 31 17:01:37 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/09/18 09:53:18 maya Exp $
+# $NetBSD: Makefile,v 1.23.4.1 2017/10/31 17:01:37 spz Exp $
 
 DISTNAME=      redmine-3.3.2
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -12,12 +12,12 @@
 COMMENT=       Flexible project management web application
 LICENSE=       gnu-gpl-v2 # and so on.
 
-.include "../../lang/ruby/rubyversion.mk"
-
 # nokogirl version required is broken in Ruby 2.3
 # Ruby 2.4 will be supported by Redmine 3.4.
 RUBY_VERSIONS_ACCEPTED=        22
 
+.include "../../lang/ruby/rubyversion.mk"
+
 GEMS_DISTFILES+=       actionmailer-4.2.7.1.gem actionpack-4.2.7.1.gem
 GEMS_DISTFILES+=       actionpack-action_caching-1.1.1.gem
 GEMS_DISTFILES+=       actionpack-xml_parser-1.0.2.gem actionview-4.2.7.1.gem
diff -r 043c82bff90b -r d3103f6de762 meta-pkgs/ruby-redmine-plugins/Makefile
--- a/meta-pkgs/ruby-redmine-plugins/Makefile   Tue Oct 31 16:22:46 2017 +0000
+++ b/meta-pkgs/ruby-redmine-plugins/Makefile   Tue Oct 31 17:01:37 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:00 wiz Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2017/10/31 17:01:37 spz Exp $
 
 DISTNAME=      redmine-plugins-1.2.0
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -19,6 +19,7 @@
 
 META_PACKAGE=  yes
 MESSAGE_SRC+=  ${.CURDIR}/MESSAGE.common ${.CURDIR}/MESSAGE
+RUBY_VERSIONS_ACCEPTED=        22
 
 .include "../../lang/ruby/rubyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 043c82bff90b -r d3103f6de762 meta-pkgs/ruby-redmine-plugins/Makefile.common
--- a/meta-pkgs/ruby-redmine-plugins/Makefile.common    Tue Oct 31 16:22:46 2017 +0000
+++ b/meta-pkgs/ruby-redmine-plugins/Makefile.common    Tue Oct 31 17:01:37 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2015/07/07 22:23:25 rodent Exp $
+# $NetBSD: Makefile.common,v 1.2.20.1 2017/10/31 17:01:37 spz Exp $
 #
 # used by devel/ruby-redmine_bootstrap_kit/Makefile
 # used by devel/ruby-redmine_code_review/Makefile
@@ -10,6 +10,8 @@
 
 CATEGORIES=    devel
 
+RUBY_VERSIONS_ACCEPTED=        22
+
 .include "../../lang/ruby/rubyversion.mk"
 
 DEPENDS+=      ${RUBY_PKGPREFIX}-redmine-[0-9]*:../../devel/ruby-redmine
diff -r 043c82bff90b -r d3103f6de762 meta-pkgs/ruby-redmine-themes/Makefile
--- a/meta-pkgs/ruby-redmine-themes/Makefile    Tue Oct 31 16:22:46 2017 +0000
+++ b/meta-pkgs/ruby-redmine-themes/Makefile    Tue Oct 31 17:01:37 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2017/10/31 17:01:38 spz Exp $
 
 DISTNAME=      redmine-themes-1.3.0
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -16,6 +16,7 @@
 DEPENDS+=      ${RUBY_PKGPREFIX}-redmine-red-andy-theme-[0-9]*:../../devel/ruby-redmine-red-andy-theme
 
 META_PACKAGE=  yes
+RUBY_VERSIONS_ACCEPTED=        22
 
 .include "../../lang/ruby/rubyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 043c82bff90b -r d3103f6de762 meta-pkgs/ruby-redmine-themes/Makefile.common
--- a/meta-pkgs/ruby-redmine-themes/Makefile.common     Tue Oct 31 16:22:46 2017 +0000
+++ b/meta-pkgs/ruby-redmine-themes/Makefile.common     Tue Oct 31 17:01:37 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2015/07/07 12:16:44 rodent Exp $
+# $NetBSD: Makefile.common,v 1.3.20.1 2017/10/31 17:01:38 spz Exp $
 #
 # used by devel/ruby-redmine-flatly-light-theme/Makefile
 # used by devel/ruby-redmine-gitmike-theme/Makefile
@@ -7,6 +7,8 @@
 
 CATEGORIES=    devel
 
+RUBY_VERSIONS_ACCEPTED=        22
+
 .include "../../lang/ruby/rubyversion.mk"
 
 DEPENDS+=      ${RUBY_PKGPREFIX}-redmine-[0-9]*:../../devel/ruby-redmine