[pkgsrc/trunk]: pkgsrc/devel/ruby-redmine Stop patching gemspec file and use ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d8de56770b8
branches:  trunk
changeset: 355050:6d8de56770b8
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Nov 19 15:57:26 2016 +0000

description:
Stop patching gemspec file and use OVERRIDE_GEMSPEC with updated
update-gemspec.rb script.

diffstat:

 devel/ruby-redmine/Makefile                         |   8 ++++++--
 devel/ruby-redmine/distinfo                         |   3 +--
 devel/ruby-redmine/patches/patch-tilt-1.4.1.gemspec |  14 --------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diffs (61 lines):

diff -r 39c730abbe48 -r 6d8de56770b8 devel/ruby-redmine/Makefile
--- a/devel/ruby-redmine/Makefile       Sat Nov 19 15:44:56 2016 +0000
+++ b/devel/ruby-redmine/Makefile       Sat Nov 19 15:57:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/10/09 21:41:58 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/11/19 15:57:26 taca Exp $
 
 DISTNAME=      redmine-3.1.2
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME}
@@ -155,6 +155,10 @@
 GEM_EXTSDIR_NEEDS_SUBDIR=      no
 .include "../../lang/ruby/gem-extract.mk"
 
+# remove rdoc dependency
+pre-configure:
+       ${RUBY} ${.CURDIR}/${UPDATE_GEMSPEC} ${WRKDIR}/tilt-1.4.1.gemspec rdoc:
+
 do-build:
 .for _gem_ in ${DISTFILES:M*.gem:S/.gem$//g}
        ${RUN} cd ${WRKDIR}/${_gem_} && ${SETENV} ${MAKE_ENV} ${RUBYGEM_ENV} \
@@ -198,7 +202,7 @@
                ${DESTDIR}${PREFIX}/${RM_DIR}/app
        ${INSTALL_DATA} ${FILESDIR}/secrets.yml \
                ${DESTDIR}${PREFIX}/${RM_DIR}/app/config
-       # XXX: Rewrite this to use ${INSTALL_DATA} and remove pax from USE_TOOLS
+#      XXX: Rewrite this to use ${INSTALL_DATA} and remove pax from USE_TOOLS
        cd ${WRKDIR}/${DISTNAME} && pax -rw -pmp . \
                ${DESTDIR}${PREFIX}/${RM_DIR}/app
        ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/redmine_*${RUBY_SUFFIX}.sh
diff -r 39c730abbe48 -r 6d8de56770b8 devel/ruby-redmine/distinfo
--- a/devel/ruby-redmine/distinfo       Sat Nov 19 15:44:56 2016 +0000
+++ b/devel/ruby-redmine/distinfo       Sat Nov 19 15:57:26 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2015/11/21 09:32:07 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2016/11/19 15:57:26 taca Exp $
 
 SHA1 (actionmailer-4.2.4.gem) = a866394bb4682afaa6d54458b1f3be0dca5e862e
 RMD160 (actionmailer-4.2.4.gem) = d703ffa8caa8fb150f5fb2aaa5ec915f4498224c
@@ -224,4 +224,3 @@
 RMD160 (unicorn-5.0.1.gem) = f83d63c0906a3dd091d6e72ee183d6ae41371745
 SHA512 (unicorn-5.0.1.gem) = 57298a925215a6652dfaf2c8887374984ee5eb0a2b70b0b7d8f8558a31eef84c430484ebf6052f0f95ad3b21395cae01d9c408210f2173a25da7b53e10806c5d
 Size (unicorn-5.0.1.gem) = 208896 bytes
-SHA1 (patch-tilt-1.4.1.gemspec) = e334acb71636f1ecf896da8e121665d100356381
diff -r 39c730abbe48 -r 6d8de56770b8 devel/ruby-redmine/patches/patch-tilt-1.4.1.gemspec
--- a/devel/ruby-redmine/patches/patch-tilt-1.4.1.gemspec       Sat Nov 19 15:44:56 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-tilt-1.4.1.gemspec,v 1.1 2015/07/05 23:55:25 rodent Exp $
-
-Don't depend on ruby-rdoc.
-
---- tilt-1.4.1.gemspec.orig    2015-03-29 02:21:01.000000000 +0000
-+++ tilt-1.4.1.gemspec
-@@ -46,7 +46,6 @@ Gem::Specification.new do |s|
-       s.add_development_dependency(%q<sass>, [">= 0"])
-       s.add_development_dependency(%q<wikicloth>, [">= 0"])
-       s.add_development_dependency(%q<yajl-ruby>, [">= 0"])
--      s.add_development_dependency(%q<rdoc>, [">= 0"])
-     else
-       s.add_dependency(%q<asciidoctor>, [">= 0.1.0"])
-       s.add_dependency(%q<RedCloth>, [">= 0"])