pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
mk: BUILD_DEPENDS -> TOOL_DEPENDS, as in pkgsrc
Module Name: pkgsrc-wip
Committed By: Taylor R Campbell <riastradh%NetBSD.org@localhost>
Pushed By: riastradh
Date: Sat Jun 24 18:36:01 2023 +0000
Changeset: cf31bc6d254429a7176233df6091d29eec3cfdce
Modified Files:
mk/fossil-package.mk
mk/git-package.mk
mk/hg-package.mk
mk/linuxbin.pkg.mk
mk/svn-package.mk
Log Message:
mk: BUILD_DEPENDS -> TOOL_DEPENDS, as in pkgsrc
(TBD: rest of tree)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cf31bc6d254429a7176233df6091d29eec3cfdce
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
mk/fossil-package.mk | 4 ++--
mk/git-package.mk | 4 ++--
mk/hg-package.mk | 6 +++---
mk/linuxbin.pkg.mk | 2 +-
mk/svn-package.mk | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diffs:
diff --git a/mk/fossil-package.mk b/mk/fossil-package.mk
index c01e87370d..ad73fdd613 100644
--- a/mk/fossil-package.mk
+++ b/mk/fossil-package.mk
@@ -61,7 +61,7 @@
#
# Keywords: fossil
-BUILD_DEPENDS+= fossil-[0-9]*:../../devel/fossil
+TOOL_DEPENDS+= fossil-[0-9]*:../../devel/fossil
DISTFILES?= # empty
.if defined(CHECKOUT_DATE)
@@ -175,4 +175,4 @@ _SYS_VARS.fossil+= ${varbase}.${repo}
. endfor
.endfor
_USE_VARS.fossil+= DISTNAME PKGBASE PKGNAME WRKDIR PREFIX DISTDIR
-_IGN_VARS.fossil+= BUILD_DEPENDS
+_IGN_VARS.fossil+= TOOL_DEPENDS
diff --git a/mk/git-package.mk b/mk/git-package.mk
index 9b055ed781..a0c318c148 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -85,7 +85,7 @@
#
# Keywords: git github
-BUILD_DEPENDS+= git-base>=1.6.4:../../devel/git-base
+TOOL_DEPENDS+= git-base>=1.6.4:../../devel/git-base
# Defaults for package-settable variables
DISTFILES?= # empty
@@ -249,5 +249,5 @@ _PKG_VARS.git+= ${varbase}.${repo}
_SYS_VARS.git+= ${varbase}.${repo}
. endfor
.endfor
-_DEF_VARS.git+= BUILD_DEPENDS USE_TOOLS WARNINGS _GIT_DISTDIR _GIT_CHECKOUT_FLAGS
+_DEF_VARS.git+= TOOL_DEPENDS USE_TOOLS WARNINGS _GIT_DISTDIR _GIT_CHECKOUT_FLAGS
_USE_VARS.git+= PKGBASE DISTDIR WRKDIR PREFIX _GIT_PKGVERSION
diff --git a/mk/hg-package.mk b/mk/hg-package.mk
index bcdce38e4d..ed0366a44c 100644
--- a/mk/hg-package.mk
+++ b/mk/hg-package.mk
@@ -42,8 +42,8 @@
#
# Keywords: hg mercurial
-BUILD_DEPENDS+= ${PYPKGPREFIX}-mercurial>=0.9:../../devel/py-mercurial
-BUILD_DEPENDS+= mozilla-rootcerts-openssl>=2.6:../../security/mozilla-rootcerts-openssl
+TOOL_DEPENDS+= ${PYPKGPREFIX}-mercurial>=0.9:../../devel/py-mercurial
+TOOL_DEPENDS+= mozilla-rootcerts-openssl>=2.6:../../security/mozilla-rootcerts-openssl
# Defaults for package-settable variables
DISTFILES?= # empty
@@ -185,7 +185,7 @@ _SYS_VARS.hg+= ${varbase}.${repo}
.endfor
_USE_VARS.hg+= DISTDIR DISTNAME PKGBASE PYPKGPREFIX
_USE_VARS.hg+= WRKDIR PREFIX
-_DEF_VARS.hg+= WARNINGS USE_TOOLS BUILD_DEPENDS
+_DEF_VARS.hg+= WARNINGS USE_TOOLS TOOL_DEPENDS
_DEF_VARS.hg+= _HG_PKGVERSION _HG_DISTDIR _HG_TODAY _HG_FLAGS
.include "../../lang/python/pyversion.mk"
diff --git a/mk/linuxbin.pkg.mk b/mk/linuxbin.pkg.mk
index a6c145dd33..379bc0fc5f 100644
--- a/mk/linuxbin.pkg.mk
+++ b/mk/linuxbin.pkg.mk
@@ -208,7 +208,7 @@ MESSAGE_SUBST+= EMULDIR=${EMULDIR:Q} EMULSUBDIR=${EMULSUBDIR:Q} \
PLIST_SRC?= ${WRKDIR}/PLIST_DYNAMIC
RPM2PKG?= ${PREFIX}/sbin/rpm2pkg
-BUILD_DEPENDS+= rpm2pkg>=1.3:../../pkgtools/rpm2pkg
+TOOL_DEPENDS+= rpm2pkg>=1.3:../../pkgtools/rpm2pkg
RPM2PKGARGS= -d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
.for temp in ${RPMIGNOREPATH}
RPM2PKGARGS+= -i ${temp:Q}
diff --git a/mk/svn-package.mk b/mk/svn-package.mk
index 195f962f48..5ba669e75a 100644
--- a/mk/svn-package.mk
+++ b/mk/svn-package.mk
@@ -50,7 +50,7 @@
#
# Keywords: svn subversion
-BUILD_DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base
+TOOL_DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base
# Defaults for package-settable variables
DISTFILES?= # empty
@@ -172,7 +172,7 @@ _VARGROUPS+= svn
_USER_VARS.svn+= CHECKOUT_DATE
_PKG_VARS.svn+= SVN_REPO SVN_REVISION SVN_EXTRACTDIR SVN_REPOSITORIES
_SYS_VARS.svn+= DISTFILES PKGREVISION
-_DEF_VARS.svn+= USE_TOOLS WRKSRC BUILD_DEPENDS
+_DEF_VARS.svn+= USE_TOOLS WRKSRC TOOL_DEPENDS
_DEF_VARS.svn+= _SVN_DISTDIR _SVN_CONFIG_DIR
_USE_VARS.svn+= DISTDIR PKGBASE WRKDIR PREFIX
.for repo in ${SVN_REPOSITORIES}
Home |
Main Index |
Thread Index |
Old Index