summaryrefslogtreecommitdiff
path: root/mk/flavor/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'mk/flavor/pkg')
-rw-r--r--mk/flavor/pkg/depends.mk16
-rw-r--r--mk/flavor/pkg/install.mk4
-rw-r--r--mk/flavor/pkg/package.mk4
-rw-r--r--mk/flavor/pkg/replace.mk6
-rw-r--r--mk/flavor/pkg/views.mk8
5 files changed, 19 insertions, 19 deletions
diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk
index 7ce7690627a..b2d06aad0fc 100644
--- a/mk/flavor/pkg/depends.mk
+++ b/mk/flavor/pkg/depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.45 2009/07/17 23:24:57 agc Exp $
+# $NetBSD: depends.mk,v 1.46 2011/09/08 20:17:16 abs Exp $
# This command prints out the dependency patterns for all full (run-time)
# dependencies of the package.
@@ -27,7 +27,7 @@ _RDEPENDS_FILE= ${WRKDIR}/.rdepends
_FULL_DEPENDS_CMD= \
${AWK} '$$1 == "full" { print $$3; }' < ${_RDEPENDS_FILE}
-_REDUCE_DEPENDS_CMD= ${SETENV} CAT=${CAT:Q} \
+_REDUCE_DEPENDS_CMD= ${PKGSRC_SETENV} CAT=${CAT:Q} \
PKG_ADMIN=${PKG_ADMIN_CMD:Q} \
PWD_CMD=${PWD_CMD:Q} TEST=${TEST:Q} \
${AWK} -f ${PKGSRCDIR}/mk/flavor/pkg/reduce-depends.awk
@@ -39,7 +39,7 @@ _flavor-show-depends: .PHONY
esac
_LIST_DEPENDS_CMD= \
- ${SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \
+ ${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \
PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \
${SH} ${PKGSRCDIR}/mk/flavor/pkg/list-dependencies \
" "${BOOTSTRAP_DEPENDS:Q} \
@@ -47,13 +47,13 @@ _LIST_DEPENDS_CMD= \
" "${DEPENDS:Q}
_LIST_DEPENDS_CMD.bootstrap= \
- ${SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \
+ ${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \
PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \
${SH} ${PKGSRCDIR}/mk/flavor/pkg/list-dependencies \
" "${BOOTSTRAP_DEPENDS:Q} " " " "
_RESOLVE_DEPENDS_CMD= \
- ${SETENV} _PKG_DBDIR=${_PKG_DBDIR:Q} PKG_INFO=${PKG_INFO:Q} \
+ ${PKGSRC_SETENV} _PKG_DBDIR=${_PKG_DBDIR:Q} PKG_INFO=${PKG_INFO:Q} \
_DEPENDS_FILE=${_DEPENDS_FILE:Q} \
${SH} ${PKGSRCDIR}/mk/flavor/pkg/resolve-dependencies \
" "${BOOTSTRAP_DEPENDS:Q} \
@@ -79,7 +79,7 @@ _DEPENDS_INSTALL_CMD= \
${STEP_MSG} "Verifying $$target for $$dir"; \
[ -d "$$dir" ] || ${FAIL_MSG} "[depends.mk] The directory \`\`$$dir'' does not exist."; \
cd $$dir; \
- ${SETENV} ${PKGSRC_MAKE_ENV} _PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" PKGNAME_REQD="$$pattern" ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes $$target; \
+ ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} _PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" PKGNAME_REQD="$$pattern" ${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes $$target; \
pkg=`${_PKG_BEST_EXISTS} "$$pattern" || ${TRUE}`; \
case "$$pkg" in \
"") ${ERROR_MSG} "[depends.mk] A package matching \`\`$$pattern'' should"; \
@@ -141,10 +141,10 @@ _flavor-post-install-dependencies: .PHONY ${_RDEPENDS_FILE}
pkg_install-depends:
${RUN}if [ `${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302` -lt ${PKGTOOLS_REQD} ]; then \
${PHASE_MSG} "Trying to handle out-dated pkg_install..."; \
- cd ../../pkgtools/pkg_install && ${SETENV} ${PKGSRC_MAKE_ENV} \
+ cd ../../pkgtools/pkg_install && ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} \
_PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" \
${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes clean && \
- cd ../../pkgtools/pkg_install && ${SETENV} ${PKGSRC_MAKE_ENV} \
+ cd ../../pkgtools/pkg_install && ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} \
_PKGSRC_DEPS=" ${PKGNAME}${_PKGSRC_DEPS}" \
${MAKE} ${MAKEFLAGS} _AUTOMATIC=yes ${DEPENDS_TARGET:Q}; \
fi
diff --git a/mk/flavor/pkg/install.mk b/mk/flavor/pkg/install.mk
index a7e01cdbc76..1ae5ca2a42c 100644
--- a/mk/flavor/pkg/install.mk
+++ b/mk/flavor/pkg/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.14 2009/04/24 14:02:41 joerg Exp $
+# $NetBSD: install.mk,v 1.15 2011/09/08 20:17:16 abs Exp $
#
# _flavor-check-conflicts:
# Checks for conflicts between the package and installed packages.
@@ -53,7 +53,7 @@ _flavor-check-installed: .PHONY error-check
${ECHO} " re-linking dependencies, risking various problems."
_REGISTER_DEPENDENCIES= \
- ${SETENV} PKG_DBDIR=${_PKG_DBDIR:Q} \
+ ${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR:Q} \
AWK=${TOOLS_AWK:Q} \
${SH} ${PKGSRCDIR}/mk/flavor/pkg/register-dependencies
diff --git a/mk/flavor/pkg/package.mk b/mk/flavor/pkg/package.mk
index e911dfdc7bf..1fbf1bd4166 100644
--- a/mk/flavor/pkg/package.mk
+++ b/mk/flavor/pkg/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.21 2011/03/19 09:45:24 wiz Exp $
+# $NetBSD: package.mk,v 1.22 2011/09/08 20:17:16 abs Exp $
.if defined(PKG_SUFX)
WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -113,7 +113,7 @@ tarup: package-remove tarup-pkg package-links
###
tarup-pkg:
${RUN} [ -x ${_PKG_TARUP_CMD} ] || exit 1; \
- ${SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX} \
+ ${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX} \
PKGREPOSITORY=${PKGREPOSITORY} \
${_PKG_TARUP_CMD} -f ${FILEBASE} ${PKGNAME}
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 }' \
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-12 23:06:17 +0000