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 /archivers/sarab | |
| 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 'archivers/sarab')
| -rw-r--r-- | archivers/sarab/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/archivers/sarab/Makefile b/archivers/sarab/Makefile index b466894b565..4eb51b4e278 100644 --- a/archivers/sarab/Makefile +++ b/archivers/sarab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/05/14 21:06:11 mef Exp $ +# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:08 jperkin Exp $ DISTNAME= sarab-1.0.0 CATEGORIES= archivers @@ -25,20 +25,20 @@ CONF_FILES+= ${EGDIR}/sarab.conf ${PKG_SYSCONFDIR}/sarab.conf CONF_FILES+= ${EGDIR}/sarab.dcf ${PKG_SYSCONFDIR}/sarab.dcf SUBST_CLASSES+= dar -SUBST_STAGE.dar= post-patch +SUBST_STAGE.dar= pre-configure SUBST_MESSAGE.dar= Fix path to DAR utilities SUBST_FILES.dar= etc/sarab.conf SUBST_SED.dar= -e "s|/usr/local/bin/dar|${PREFIX}/bin/dar|" # archivers/dar disables building "dar_static" SUBST_CLASSES+= nocopy -SUBST_STAGE.nocopy= post-patch +SUBST_STAGE.nocopy= pre-configure SUBST_MESSAGE.nocopy= Do not copy dar_static SUBST_FILES.nocopy= etc/sarab.conf SUBST_SED.nocopy= -e "s|COPY_DAR=\"yes\"|COPY_DAR=\"no\"|" SUBST_CLASSES+= conf -SUBST_STAGE.conf= post-patch +SUBST_STAGE.conf= pre-configure SUBST_MESSAGE.conf= Fix path to SaraB configuration files SUBST_FILES.conf= sarab.sh etc/sarab.conf SUBST_SED.conf= -e "s|/etc/sarab|${PKG_SYSCONFDIR}|" @@ -46,7 +46,7 @@ SUBST_SED.conf= -e "s|/etc/sarab|${PKG_SYSCONFDIR}|" # NetBSD has /kern, and does not have /sys. Other platforms might # differ. SUBST_CLASSES+= prune -SUBST_STAGE.prune= post-patch +SUBST_STAGE.prune= pre-configure SUBST_MESSAGE.prune= Prune /kern instead of /sys SUBST_FILES.prune= etc/sarab.dcf SUBST_SED.prune= -e "s|--prune sys|--prune kern|" |