diff options
author | spz <spz@pkgsrc.org> | 2017-10-31 17:01:37 +0000 |
---|---|---|
committer | spz <spz@pkgsrc.org> | 2017-10-31 17:01:37 +0000 |
commit | e103bfe4e24ee1d68f13c9d1905dec2a3623937a (patch) | |
tree | 6b8c5e90ca24d70dc5546b9c01385978ddbd61ff /devel | |
parent | c2de7cbf2343bbbf27f05da7a140f37ef3a1c7f3 (diff) | |
download | pkgsrc-e103bfe4e24ee1d68f13c9d1905dec2a3623937a.tar.gz |
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 (limited to 'devel')
-rw-r--r-- | devel/ruby-redmine/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/ruby-redmine/Makefile b/devel/ruby-redmine/Makefile index 34687a577fe..5b05bdbbc85 100644 --- a/devel/ruby-redmine/Makefile +++ b/devel/ruby-redmine/Makefile @@ -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 @@ HOMEPAGE= http://www.redmine.org/ 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 |