diff options
| author | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-05-23 19:22:54 +0000 |
| commit | cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5 (patch) | |
| tree | dfd45506cac9c8adb60a55d809ab0dbc4d5a750e /devel/ruby-redmine | |
| parent | afe0216c35d9e0e0b96fe80eb38badf368ef84a7 (diff) | |
| download | pkgsrc-cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5.tar.gz | |
all: replace SUBST_SED with the simpler SUBST_VARS
pkglint -Wall -r --only "substitution command" -F
With manual review and indentation fixes since pkglint doesn't get that
part correct in every case.
Diffstat (limited to 'devel/ruby-redmine')
| -rw-r--r-- | devel/ruby-redmine/Makefile | 8 | ||||
| -rw-r--r-- | devel/ruby-redmine/options.mk | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/ruby-redmine/Makefile b/devel/ruby-redmine/Makefile index 307f1f08cb0..2326c516c75 100644 --- a/devel/ruby-redmine/Makefile +++ b/devel/ruby-redmine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/04/03 00:32:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.39 2019/05/23 19:22:59 rillig Exp $ DISTNAME= redmine-3.3.2 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -136,9 +136,9 @@ SUBST_SED.rake= -e "s|/usr/bin/env rake|${PREFIX}/${RM_DIR}/gems/bin/rake|g" SUBST_CLASSES+= shell SUBST_FILES.shell= ${DESTDIR}${PREFIX}/bin/redmine_*${RUBY_SUFFIX}.sh SUBST_MESSAGE.shell= Fixing paths in helper shell scripts. -SUBST_SED.shell= -e "s|@PREFIX@|${PREFIX}|g;s|@GEM@|${GEM}|g" -SUBST_SED.shell+= -e "s|@RUBY@|${RUBY}|g" -SUBST_SED.shell+= -e "s|@RUBY_PKGPREFIX@|${RUBY_PKGPREFIX}|g" +SUBST_VARS.shell= PREFIX +SUBST_VARS.shell+= RUBY +SUBST_VARS.shell+= RUBY_PKGPREFIX SUBST_STAGE.shell= post-install REPLACE_BASH+= nokogiri-1.6.7.2/build_all nokogiri-1.6.7.2/test_all diff --git a/devel/ruby-redmine/options.mk b/devel/ruby-redmine/options.mk index ced14cca3bc..da9b461fc71 100644 --- a/devel/ruby-redmine/options.mk +++ b/devel/ruby-redmine/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2017/01/04 23:05:12 rodent Exp $ +# $NetBSD: options.mk,v 1.6 2019/05/23 19:22:59 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.redmine @@ -52,7 +52,7 @@ SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure SUBST_MESSAGE.prefix= Setting PREFIX and RUBY_PKGPREFIX. SUBST_FILES.prefix= ${WRKDIR}/unicorn.rb -SUBST_SED.prefix+= -e "s|@RUBY_PKGPREFIX@|${RUBY_PKGPREFIX}|g" +SUBST_VARS.prefix= RUBY_PKGPREFIX SUBST_VARS.prefix+= PREFIX RCD_SCRIPTS+= redmine_unicorn${RUBY_SUFFIX} |