diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
| commit | 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 (patch) | |
| tree | 4b7c9cc25a344fafc9d2f536ba6e474a9bb281e6 /shells | |
| parent | 063580a062ba10ffba035c8d96b541b5ce7a426d (diff) | |
| download | pkgsrc-3cc59ce5299d6358f3c1487cc9da3d48ef0a0647.tar.gz | |
*: Move SUBST_STAGE from post-patch to pre-configure
Performing substitutions during post-patch breaks tools such as mkpatches,
making it very difficult to regenerate correct patches after making changes,
and often leading to substituted string replacements being committed.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/lshell/Makefile | 4 | ||||
| -rw-r--r-- | shells/xonsh/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/shells/lshell/Makefile b/shells/lshell/Makefile index 21d26ea8030..4733234f6b7 100644 --- a/shells/lshell/Makefile +++ b/shells/lshell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/07/03 05:03:33 adam Exp $ +# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:36 jperkin Exp $ DISTNAME= lshell-0.9.16 CATEGORIES= shells python @@ -22,7 +22,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # not yet ported as of 0.9.16 EGDIR= share/examples/lshell SUBST_CLASSES+= setup -SUBST_STAGE.setup= post-patch +SUBST_STAGE.setup= pre-configure SUBST_FILES.setup= setup.py SUBST_SED.setup= -e 's,/etc,${EGDIR},' SUBST_SED.setup+= -e 's,share/man,${PKGMANDIR},' diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile index b925ae9b383..4aaf1a009d9 100644 --- a/shells/xonsh/Makefile +++ b/shells/xonsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/08/21 11:34:57 kamil Exp $ +# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:36 jperkin Exp $ DISTNAME= xonsh-0.4.5 CATEGORIES= shells python @@ -21,7 +21,7 @@ PKG_SHELL= ${PREFIX}/bin/xon.sh PKG_SHELL+= ${PREFIX}/bin/xonsh SUBST_CLASSES+= xonsh -SUBST_STAGE.xonsh= post-patch +SUBST_STAGE.xonsh= pre-configure SUBST_FILES.xonsh= scripts/xon.sh SUBST_SED.xonsh= -e 's,python3,${PYTHONBIN},' |