diff options
author | abs <abs> | 2011-09-08 20:17:15 +0000 |
---|---|---|
committer | abs <abs> | 2011-09-08 20:17:15 +0000 |
commit | 4ae596fd3e00d179adcfcbcc14c6950205801269 (patch) | |
tree | 562e841d2aad3c3bded8284d931962beaa26901d /mk/flavor/pkg/views.mk | |
parent | 4ba70618f39d71a4506c33f24769e5dff9248bb5 (diff) | |
download | pkgsrc-4ae596fd3e00d179adcfcbcc14c6950205801269.tar.gz |
Introduce PKGSRC_SETENV, defaulting to SETENV. Can be set to ${SETENV} -i
to santise environment
Diffstat (limited to 'mk/flavor/pkg/views.mk')
-rw-r--r-- | mk/flavor/pkg/views.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/flavor/pkg/views.mk b/mk/flavor/pkg/views.mk index 64af105986c..45fa056e7ee 100644 --- a/mk/flavor/pkg/views.mk +++ b/mk/flavor/pkg/views.mk @@ -1,4 +1,4 @@ -# $NetBSD: views.mk,v 1.6 2009/03/17 22:13:36 rillig Exp $ +# $NetBSD: views.mk,v 1.7 2011/09/08 20:17:16 abs Exp $ # By default, all packages attempt to link into the views. .if ${PKG_INSTALLATION_TYPE} == "pkgviews" @@ -53,7 +53,7 @@ su-build-views: ;; \ esac; \ ${STEP_MSG} "Performing package view overwrite check for ${PKGNAME} in $$viewname view"; \ - dups=`${SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v check ${PKGNAME} || ${TRUE}`; \ + dups=`${PKGSRC_SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v check ${PKGNAME} || ${TRUE}`; \ case "$$dups" in \ "") ;; \ *) ${WARNING_MSG} "***********************************************************"; \ @@ -65,7 +65,7 @@ su-build-views: ;; \ esac; \ ${STEP_MSG} "Linking package into $$viewname view"; \ - ${SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v add ${PKGNAME}; \ + ${PKGSRC_SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v add ${PKGNAME}; \ done ###################################################################### @@ -86,5 +86,5 @@ su-remove-views: *) dbdir=${LOCALBASE}/$$v/.dbdir; viewname=$$v ;; \ esac; \ ${STEP_MSG} "Removing package from $$viewname view"; \ - ${SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v delete ${PKGNAME}; \ + ${PKGSRC_SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v delete ${PKGNAME}; \ done |