diff options
| author | abs <abs> | 2011-09-08 20:17:15 +0000 |
|---|---|---|
| committer | abs <abs> | 2011-09-08 20:17:15 +0000 |
| commit | 96b66bcc95d02afbe94f65ca172b1749f365e140 (patch) | |
| tree | 562e841d2aad3c3bded8284d931962beaa26901d /mk/flavor/pkg/replace.mk | |
| parent | e2266b0e71bac10478221839031fd5977c4b7718 (diff) | |
| download | pkgsrc-96b66bcc95d02afbe94f65ca172b1749f365e140.tar.gz | |
Introduce PKGSRC_SETENV, defaulting to SETENV. Can be set to ${SETENV} -i
to santise environment
Diffstat (limited to 'mk/flavor/pkg/replace.mk')
| -rw-r--r-- | mk/flavor/pkg/replace.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/flavor/pkg/replace.mk b/mk/flavor/pkg/replace.mk index 82b3599f177..20cec47a040 100644 --- a/mk/flavor/pkg/replace.mk +++ b/mk/flavor/pkg/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.32 2011/06/04 10:05:00 obache Exp $ +# $NetBSD: replace.mk,v 1.33 2011/09/08 20:17:16 abs Exp $ # # _flavor-replace: @@ -84,7 +84,7 @@ replace-tarup: .PHONY ${RUN} [ -x ${_PKG_TARUP_CMD:Q} ] \ || ${FAIL_MSG} ${_PKG_TARUP_CMD:Q}" was not found."; \ ${_REPLACE_OLDNAME_CMD}; \ - ${SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX} \ + ${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX} \ PKGREPOSITORY=${WRKDIR} \ ${_PKG_TARUP_CMD} $${oldname} || \ ${FAIL_MSG} "Could not pkg_tarup $${oldname}". @@ -157,7 +157,7 @@ replace-fixup-required-by: .PHONY esac; \ contents="$$pkgdir/+CONTENTS"; \ newcontents="$$contents.$$$$"; \ - ${SETENV} OLDNAME="$$oldname" NEWNAME="$$newname" \ + ${PKGSRC_SETENV} OLDNAME="$$oldname" NEWNAME="$$newname" \ ${AWK} '($$0 ~ "^@pkgdep " ENVIRON["OLDNAME"]) \ { print "@pkgdep " ENVIRON["NEWNAME"]; next } \ { print }' \ |