diff options
| author | taca <taca@pkgsrc.org> | 2016-11-19 15:57:26 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2016-11-19 15:57:26 +0000 |
| commit | 210f4e11960babf4508773ed9e8d7c6f50ee8551 (patch) | |
| tree | 9cd992c025bcc3744a814e814e2694fd6dd7ba94 /devel | |
| parent | 4f8b1aa29c43b1f37f2266a8760987b7749507df (diff) | |
| download | pkgsrc-210f4e11960babf4508773ed9e8d7c6f50ee8551.tar.gz | |
Stop patching gemspec file and use OVERRIDE_GEMSPEC with updated
update-gemspec.rb script.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ruby-redmine/Makefile | 8 | ||||
| -rw-r--r-- | devel/ruby-redmine/distinfo | 3 | ||||
| -rw-r--r-- | devel/ruby-redmine/patches/patch-tilt-1.4.1.gemspec | 14 |
3 files changed, 7 insertions, 18 deletions
diff --git a/devel/ruby-redmine/Makefile b/devel/ruby-redmine/Makefile index 5afdd1445af..dd657bccdea 100644 --- a/devel/ruby-redmine/Makefile +++ b/devel/ruby-redmine/Makefile @@ -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 @@ FILES_SUBST+= WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \ 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 @@ do-install: ${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 --git a/devel/ruby-redmine/distinfo b/devel/ruby-redmine/distinfo index 491718bb40a..ea8964c03b7 100644 --- a/devel/ruby-redmine/distinfo +++ b/devel/ruby-redmine/distinfo @@ -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 @@ SHA1 (unicorn-5.0.1.gem) = 0402ec9b670b22cd3476a7272a6c428d3598bec5 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 --git a/devel/ruby-redmine/patches/patch-tilt-1.4.1.gemspec b/devel/ruby-redmine/patches/patch-tilt-1.4.1.gemspec deleted file mode 100644 index 04fd9de0472..00000000000 --- a/devel/ruby-redmine/patches/patch-tilt-1.4.1.gemspec +++ /dev/null @@ -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"]) |