Tue Oct 31 17:01:38 2017 UTC ()
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


(spz)
diff -r1.23 -r1.23.4.1 pkgsrc/devel/ruby-redmine/Makefile
diff -r1.4 -r1.4.4.1 pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile
diff -r1.2 -r1.2.20.1 pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile.common
diff -r1.5 -r1.5.4.1 pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile
diff -r1.3 -r1.3.20.1 pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile.common
cvs diff -r1.23 -r1.23.4.1 pkgsrc/devel/ruby-redmine/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-redmine/Attic/Makefile 2017/09/18 09:53:18 1.23
+++ pkgsrc/devel/ruby-redmine/Attic/Makefile 2017/10/31 17:01:37 1.23.4.1
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile,v 1.23 2017/09/18 09:53:18 maya Exp $ 1# $NetBSD: Makefile,v 1.23.4.1 2017/10/31 17:01:37 spz Exp $
2 2
3DISTNAME= redmine-3.3.2 3DISTNAME= redmine-3.3.2
4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} 4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
5PKGREVISION= 3 5PKGREVISION= 3
6PREV_PKGPATH= devel/redmine 6PREV_PKGPATH= devel/redmine
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= http://www.redmine.org/releases/ 8MASTER_SITES= http://www.redmine.org/releases/
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= http://www.redmine.org/ 11HOMEPAGE= http://www.redmine.org/
12COMMENT= Flexible project management web application 12COMMENT= Flexible project management web application
13LICENSE= gnu-gpl-v2 # and so on. 13LICENSE= gnu-gpl-v2 # and so on.
14 14
15.include "../../lang/ruby/rubyversion.mk" 
16 
17# nokogirl version required is broken in Ruby 2.3 15# nokogirl version required is broken in Ruby 2.3
18# Ruby 2.4 will be supported by Redmine 3.4. 16# Ruby 2.4 will be supported by Redmine 3.4.
19RUBY_VERSIONS_ACCEPTED= 22 17RUBY_VERSIONS_ACCEPTED= 22
20 18
 19.include "../../lang/ruby/rubyversion.mk"
 20
21GEMS_DISTFILES+= actionmailer-4.2.7.1.gem actionpack-4.2.7.1.gem 21GEMS_DISTFILES+= actionmailer-4.2.7.1.gem actionpack-4.2.7.1.gem
22GEMS_DISTFILES+= actionpack-action_caching-1.1.1.gem 22GEMS_DISTFILES+= actionpack-action_caching-1.1.1.gem
23GEMS_DISTFILES+= actionpack-xml_parser-1.0.2.gem actionview-4.2.7.1.gem 23GEMS_DISTFILES+= actionpack-xml_parser-1.0.2.gem actionview-4.2.7.1.gem
24GEMS_DISTFILES+= activejob-4.2.7.1.gem activemodel-4.2.7.1.gem 24GEMS_DISTFILES+= activejob-4.2.7.1.gem activemodel-4.2.7.1.gem
25GEMS_DISTFILES+= activerecord-4.2.7.1.gem activesupport-4.2.7.1.gem 25GEMS_DISTFILES+= activerecord-4.2.7.1.gem activesupport-4.2.7.1.gem
26GEMS_DISTFILES+= addressable-2.5.0.gem arel-6.0.3.gem builder-3.2.2.gem 26GEMS_DISTFILES+= addressable-2.5.0.gem arel-6.0.3.gem builder-3.2.2.gem
27GEMS_DISTFILES+= bundler-1.10.6.gem capybara-2.11.0.gem 27GEMS_DISTFILES+= bundler-1.10.6.gem capybara-2.11.0.gem
28GEMS_DISTFILES+= childprocess-0.5.9.gem coderay-1.1.1.gem 28GEMS_DISTFILES+= childprocess-0.5.9.gem coderay-1.1.1.gem
29GEMS_DISTFILES+= css_parser-1.4.7.gem docile-1.1.5.gem 29GEMS_DISTFILES+= css_parser-1.4.7.gem docile-1.1.5.gem
30GEMS_DISTFILES+= erubis-2.7.0.gem ffi-1.9.14.gem globalid-0.3.7.gem 30GEMS_DISTFILES+= erubis-2.7.0.gem ffi-1.9.14.gem globalid-0.3.7.gem
31GEMS_DISTFILES+= hike-1.2.3.gem htmlentities-4.3.1.gem i18n-0.7.0.gem 31GEMS_DISTFILES+= hike-1.2.3.gem htmlentities-4.3.1.gem i18n-0.7.0.gem
32GEMS_DISTFILES+= jquery-rails-3.1.4.gem json-1.8.3.gem loofah-2.0.3.gem 32GEMS_DISTFILES+= jquery-rails-3.1.4.gem json-1.8.3.gem loofah-2.0.3.gem
33GEMS_DISTFILES+= mail-2.6.4.gem mime-types-3.1.gem 33GEMS_DISTFILES+= mail-2.6.4.gem mime-types-3.1.gem
cvs diff -r1.4 -r1.4.4.1 pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile 2017/09/16 19:27:00 1.4
+++ pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile 2017/10/31 17:01:37 1.4.4.1
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.4.4.1 2017/10/31 17:01:37 spz Exp $
2 2
3DISTNAME= redmine-plugins-1.2.0 3DISTNAME= redmine-plugins-1.2.0
4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} 4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
5CATEGORIES= devel meta-pkgs 5CATEGORIES= devel meta-pkgs
6MASTER_SITES= # blank 6MASTER_SITES= # blank
7DISTFILES= # blank 7DISTFILES= # blank
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.redmine.org/ 10HOMEPAGE= http://www.redmine.org/
11COMMENT= Redmine plugins meta package 11COMMENT= Redmine plugins meta package
12 12
13DEPENDS+= ${RUBY_PKGPREFIX}-redmine_code_review-[0-9]*:../../devel/ruby-redmine_code_review 13DEPENDS+= ${RUBY_PKGPREFIX}-redmine_code_review-[0-9]*:../../devel/ruby-redmine_code_review
14DEPENDS+= ${RUBY_PKGPREFIX}-redmine_jenkins-[0-9]*:../../devel/ruby-redmine_jenkins 14DEPENDS+= ${RUBY_PKGPREFIX}-redmine_jenkins-[0-9]*:../../devel/ruby-redmine_jenkins
15DEPENDS+= ${RUBY_PKGPREFIX}-redmine_lightbox2-[0-9]*:../../devel/ruby-redmine_lightbox2 15DEPENDS+= ${RUBY_PKGPREFIX}-redmine_lightbox2-[0-9]*:../../devel/ruby-redmine_lightbox2
16DEPENDS+= ${RUBY_PKGPREFIX}-redmine_startpage-[0-9]*:../../devel/ruby-redmine_startpage 16DEPENDS+= ${RUBY_PKGPREFIX}-redmine_startpage-[0-9]*:../../devel/ruby-redmine_startpage
17DEPENDS+= ${RUBY_PKGPREFIX}-redmine_theme_changer-[0-9]*:../../devel/ruby-redmine_theme_changer 17DEPENDS+= ${RUBY_PKGPREFIX}-redmine_theme_changer-[0-9]*:../../devel/ruby-redmine_theme_changer
18DEPENDS+= ${RUBY_PKGPREFIX}-redmine_work_time-[0-9]*:../../devel/ruby-redmine_work_time 18DEPENDS+= ${RUBY_PKGPREFIX}-redmine_work_time-[0-9]*:../../devel/ruby-redmine_work_time
19 19
20META_PACKAGE= yes 20META_PACKAGE= yes
21MESSAGE_SRC+= ${.CURDIR}/MESSAGE.common ${.CURDIR}/MESSAGE 21MESSAGE_SRC+= ${.CURDIR}/MESSAGE.common ${.CURDIR}/MESSAGE
 22RUBY_VERSIONS_ACCEPTED= 22
22 23
23.include "../../lang/ruby/rubyversion.mk" 24.include "../../lang/ruby/rubyversion.mk"
24.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.2.20.1 pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile.common (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile.common 2015/07/07 22:23:25 1.2
+++ pkgsrc/meta-pkgs/ruby-redmine-plugins/Makefile.common 2017/10/31 17:01:37 1.2.20.1
@@ -1,25 +1,27 @@ @@ -1,25 +1,27 @@
1# $NetBSD: Makefile.common,v 1.2 2015/07/07 22:23:25 rodent Exp $ 1# $NetBSD: Makefile.common,v 1.2.20.1 2017/10/31 17:01:37 spz Exp $
2# 2#
3# used by devel/ruby-redmine_bootstrap_kit/Makefile 3# used by devel/ruby-redmine_bootstrap_kit/Makefile
4# used by devel/ruby-redmine_code_review/Makefile 4# used by devel/ruby-redmine_code_review/Makefile
5# used by devel/ruby-redmine_jenkins/Makefile 5# used by devel/ruby-redmine_jenkins/Makefile
6# used by devel/ruby-redmine_lightbox2/Makefile 6# used by devel/ruby-redmine_lightbox2/Makefile
7# used by devel/ruby-redmine_startpage/Makefile 7# used by devel/ruby-redmine_startpage/Makefile
8# used by devel/ruby-redmine_theme_changer/Makefile 8# used by devel/ruby-redmine_theme_changer/Makefile
9# used by devel/ruby-redmine_work_time/Makefile 9# used by devel/ruby-redmine_work_time/Makefile
10 10
11CATEGORIES= devel 11CATEGORIES= devel
12 12
 13RUBY_VERSIONS_ACCEPTED= 22
 14
13.include "../../lang/ruby/rubyversion.mk" 15.include "../../lang/ruby/rubyversion.mk"
14 16
15DEPENDS+= ${RUBY_PKGPREFIX}-redmine-[0-9]*:../../devel/ruby-redmine 17DEPENDS+= ${RUBY_PKGPREFIX}-redmine-[0-9]*:../../devel/ruby-redmine
16 18
17USE_LANGUAGES= # none 19USE_LANGUAGES= # none
18 20
19RM_DIR= share/${RUBY_PKGPREFIX}-redmine 21RM_DIR= share/${RUBY_PKGPREFIX}-redmine
20GEM_HOME= ${RM_DIR}/gems 22GEM_HOME= ${RM_DIR}/gems
21PLIST_SUBST+= GEM_HOME=${GEM_HOME} 23PLIST_SUBST+= GEM_HOME=${GEM_HOME}
22 24
23REDMINE_PLUGINDIR= ${RM_DIR}/app/plugins 25REDMINE_PLUGINDIR= ${RM_DIR}/app/plugins
24 26
25MESSAGE_SRC= ../../meta-pkgs/ruby-redmine-plugins/MESSAGE.common 27MESSAGE_SRC= ../../meta-pkgs/ruby-redmine-plugins/MESSAGE.common
cvs diff -r1.5 -r1.5.4.1 pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile 2017/09/16 19:27:00 1.5
+++ pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile 2017/10/31 17:01:38 1.5.4.1
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.5.4.1 2017/10/31 17:01:38 spz Exp $
2 2
3DISTNAME= redmine-themes-1.3.0 3DISTNAME= redmine-themes-1.3.0
4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} 4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
5CATEGORIES= devel meta-pkgs 5CATEGORIES= devel meta-pkgs
6MASTER_SITES= # blank 6MASTER_SITES= # blank
7DISTFILES= # blank 7DISTFILES= # blank
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.redmine.org/ 10HOMEPAGE= http://www.redmine.org/
11COMMENT= Redmine themes meta package 11COMMENT= Redmine themes meta package
12 12
13DEPENDS+= ${RUBY_PKGPREFIX}-redmine-flatly-light-theme-[0-9]*:../../devel/ruby-redmine-flatly-light-theme 13DEPENDS+= ${RUBY_PKGPREFIX}-redmine-flatly-light-theme-[0-9]*:../../devel/ruby-redmine-flatly-light-theme
14DEPENDS+= ${RUBY_PKGPREFIX}-redmine-gitmike-theme-[a-z0-9]*:../../devel/ruby-redmine-gitmike-theme 14DEPENDS+= ${RUBY_PKGPREFIX}-redmine-gitmike-theme-[a-z0-9]*:../../devel/ruby-redmine-gitmike-theme
15DEPENDS+= ${RUBY_PKGPREFIX}-redmine-minimalflat-theme-[0-9]*:../../devel/ruby-redmine-minimalflat-theme 15DEPENDS+= ${RUBY_PKGPREFIX}-redmine-minimalflat-theme-[0-9]*:../../devel/ruby-redmine-minimalflat-theme
16DEPENDS+= ${RUBY_PKGPREFIX}-redmine-red-andy-theme-[0-9]*:../../devel/ruby-redmine-red-andy-theme 16DEPENDS+= ${RUBY_PKGPREFIX}-redmine-red-andy-theme-[0-9]*:../../devel/ruby-redmine-red-andy-theme
17 17
18META_PACKAGE= yes 18META_PACKAGE= yes
 19RUBY_VERSIONS_ACCEPTED= 22
19 20
20.include "../../lang/ruby/rubyversion.mk" 21.include "../../lang/ruby/rubyversion.mk"
21.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.3.20.1 pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile.common (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile.common 2015/07/07 12:16:44 1.3
+++ pkgsrc/meta-pkgs/ruby-redmine-themes/Makefile.common 2017/10/31 17:01:38 1.3.20.1
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1# $NetBSD: Makefile.common,v 1.3 2015/07/07 12:16:44 rodent Exp $ 1# $NetBSD: Makefile.common,v 1.3.20.1 2017/10/31 17:01:38 spz Exp $
2# 2#
3# used by devel/ruby-redmine-flatly-light-theme/Makefile 3# used by devel/ruby-redmine-flatly-light-theme/Makefile
4# used by devel/ruby-redmine-gitmike-theme/Makefile 4# used by devel/ruby-redmine-gitmike-theme/Makefile
5# used by devel/ruby-redmine-minimalflat-theme/Makefile 5# used by devel/ruby-redmine-minimalflat-theme/Makefile
6# used by devel/ruby-redmine-red-andy-theme/Makefile 6# used by devel/ruby-redmine-red-andy-theme/Makefile
7 7
8CATEGORIES= devel 8CATEGORIES= devel
9 9
 10RUBY_VERSIONS_ACCEPTED= 22
 11
10.include "../../lang/ruby/rubyversion.mk" 12.include "../../lang/ruby/rubyversion.mk"
11 13
12DEPENDS+= ${RUBY_PKGPREFIX}-redmine-[0-9]*:../../devel/ruby-redmine 14DEPENDS+= ${RUBY_PKGPREFIX}-redmine-[0-9]*:../../devel/ruby-redmine
13 15
14USE_LANGUAGES= # none 16USE_LANGUAGES= # none
15NO_CONFIGURE= yes 17NO_CONFIGURE= yes
16NO_BUILD= yes 18NO_BUILD= yes
17 19
18REDMINE_THEMEDIR= share/${RUBY_PKGPREFIX}-redmine/app/public/themes 20REDMINE_THEMEDIR= share/${RUBY_PKGPREFIX}-redmine/app/public/themes