mk/*-package.mk: clean up, fix pkglint warnings

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mk/*-package.mk: clean up, fix pkglint warnings
From: Roland Illig <rillig%NetBSD.org@localhost>
Date: Wed, 17 Aug 2022 22:00:51 +0000
Module Name:	pkgsrc-wip
Committed By:	Roland Illig <rillig%NetBSD.org@localhost>
Pushed By:	rillig
Date:		Wed Aug 17 22:00:51 2022 +0000
Changeset:	fdc1c929ffefa4f6434d8756f8dcbed171c734ea

Modified Files:
	mk/cvs-package.mk
	mk/fossil-package.mk
	mk/git-package.mk
	mk/hg-package.mk
	mk/svn-package.mk

Log Message:
mk/*-package.mk: clean up, fix pkglint warnings

Remove 3 unused variables.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fdc1c929ffefa4f6434d8756f8dcbed171c734ea

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mk/cvs-package.mk    |  8 +++++---
 mk/fossil-package.mk |  5 +++--
 mk/git-package.mk    |  6 ++++--
 mk/hg-package.mk     |  7 ++++---
 mk/svn-package.mk    | 14 ++++++++------
 5 files changed, 24 insertions(+), 16 deletions(-)

diffs:
diff --git a/mk/cvs-package.mk b/mk/cvs-package.mk
index 9ce8846fa0..f8647e3e33 100644
--- a/mk/cvs-package.mk
+++ b/mk/cvs-package.mk
@@ -223,10 +223,12 @@ do-cvs-extract: .PHONY
 # Debug info for show-all and show-all-cvs
 _VARGROUPS+=		cvs
 _USER_VARS.cvs+=	CHECKOUT_DATE
-_PKG_VARS.cvs+=		CVS_ROOT CVS_MODULE CVS_TAG CHECKOUT_DATE CVS_EXTRACTDIR CVS_REPOSITORIES
+_PKG_VARS.cvs+=		CVS_ROOT CVS_MODULE CVS_TAG CVS_EXTRACTDIR CVS_REPOSITORIES
 _SYS_VARS.cvs+=		DISTFILES PKGNAME PKGREVISION WRKSRC
 _SYS_VARS.cvs+=		CVS_ROOT_GNU CVS_ROOT_NONGNU CVS_ROOT_SOURCEFORGE CVS_PROJECT
-_SYS_VARS.cvs+=		_CVS_DISTDIR _CVS_PKGVERSION
+_DEF_VARS.cvs+=		USE_TOOLS
+_DEF_VARS.cvs+=		_CVS_DISTDIR _CVS_PKGVERSION _CVS_RSH _CVS_ENV
+_DEF_VARS.cvs+=		_CVS_PASSFILE _CVS_CMDLINE _CVS_FLAGS _CVS_CHECKOUT_FLAGS
 .for repo in ${CVS_REPOSITORIES}
 .  for varbase in CVS_ROOT CVS_MODULE CVS_TAG CVS_EXTRACTDIR
 _PKG_VARS.cvs+=		${varbase}.${repo}
@@ -238,4 +240,4 @@ _SYS_VARS.cvs+=		${varbase}.${repo}
 _DEF_VARS.cvs+=		${varbase}.${repo}
 .  endfor
 .endfor
-_USE_VARS.cvs+=		DISTNAME
+_USE_VARS.cvs+=		PKGBASE DISTDIR DISTNAME WRKDIR
diff --git a/mk/fossil-package.mk b/mk/fossil-package.mk
index 141186f6bc..c01e87370d 100644
--- a/mk/fossil-package.mk
+++ b/mk/fossil-package.mk
@@ -165,7 +165,7 @@ _VARGROUPS+=		fossil
 _USER_VARS.fossil+=	CHECKOUT_DATE
 _PKG_VARS.fossil+=	FOSSIL_REPO FOSSIL_EXTRACTDIR FOSSIL_VERSION FOSSIL_REPOSITORIES
 _SYS_VARS.fossil+=	DISTFILES PKGREVISION WRKSRC
-_SYS_VARS.fossil+=	_FOSSIL_DISTDIR
+_DEF_VARS.fossil+=	USE_TOOLS WARNINGS _FOSSIL_DISTDIR
 .for repo in ${FOSSIL_REPOSITORIES}
 .  for varbase in FOSSIL_REPO FOSSIL_EXTRACTDIR FOSSIL_VERSION
 _PKG_VARS.fossil+=	${varbase}.${repo}
@@ -174,4 +174,5 @@ _PKG_VARS.fossil+=	${varbase}.${repo}
 _SYS_VARS.fossil+=	${varbase}.${repo}
 .  endfor
 .endfor
-_USE_VARS.fossil+=	DISTNAME PKGNAME
+_USE_VARS.fossil+=	DISTNAME PKGBASE PKGNAME WRKDIR PREFIX DISTDIR
+_IGN_VARS.fossil+=	BUILD_DEPENDS
diff --git a/mk/git-package.mk b/mk/git-package.mk
index 5e4c1e2701..e34e6a854e 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -132,9 +132,9 @@ _GIT_DISTDIR=		${DISTDIR}/git-packages
 
 # Definition of repository-specific variables
 .for repo in ${GIT_REPOSITORIES}
-.if defined(GIT_MODULE.${repo}) # for backwards compatibility
+.  if defined(GIT_MODULE.${repo}) # for backwards compatibility
 GIT_EXTRACTDIR.${repo}?=	${GIT_MODULE.${repo}}
-.endif
+.  endif
 GIT_EXTRACTDIR.${repo}?=	${repo}
 _GIT_ENV.${repo}=		${GIT_ENV.${repo}}
 
@@ -248,3 +248,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
+_USE_VARS.git+=		PKGBASE DISTDIR WRKDIR PREFIX _GIT_PKGVERSION
diff --git a/mk/hg-package.mk b/mk/hg-package.mk
index bf64788fd6..bcdce38e4d 100644
--- a/mk/hg-package.mk
+++ b/mk/hg-package.mk
@@ -84,7 +84,6 @@ USE_TOOLS+=		date gzip pax
 
 _HG_CMD=		${PREFIX}/bin/hg
 _HG_FLAGS=		-q
-_HG_CONFIG_DIR=		${WRKDIR}/.hg
 _HG_TODAY_CMD=		${DATE} -u +'%Y-%m-%d'
 _HG_TODAY=		${_HG_TODAY_CMD:sh}
 _HG_PKGVERSION_CMD=	${DATE} -u +'%Y.%m.%d'
@@ -176,7 +175,6 @@ _VARGROUPS+=	hg
 _USER_VARS.hg+=	CHECKOUT_DATE
 _PKG_VARS.hg+=	HG_REPO HG_EXTRACTDIR HG_TAG HG_REPOSITORIES
 _SYS_VARS.hg+=	DISTFILES PKGNAME PKGREVISION WRKSRC
-_SYS_VARS.hg+=	_HG_PKGVERSION _HG_DISTDIR
 .for repo in ${HG_REPOSITORIES}
 .  for varbase in HG_REPO HG_EXTRACTDIR HG_TAG
 _PKG_VARS.hg+=	${varbase}.${repo}
@@ -185,6 +183,9 @@ _PKG_VARS.hg+=	${varbase}.${repo}
 _SYS_VARS.hg+=	${varbase}.${repo}
 .  endfor
 .endfor
-_USE_VARS.hg+=	DISTNAME
+_USE_VARS.hg+=	DISTDIR DISTNAME PKGBASE PYPKGPREFIX
+_USE_VARS.hg+=	WRKDIR PREFIX
+_DEF_VARS.hg+=	WARNINGS USE_TOOLS BUILD_DEPENDS
+_DEF_VARS.hg+=	_HG_PKGVERSION _HG_DISTDIR _HG_TODAY _HG_FLAGS
 
 .include "../../lang/python/pyversion.mk"
diff --git a/mk/svn-package.mk b/mk/svn-package.mk
index 7746388d83..195f962f48 100644
--- a/mk/svn-package.mk
+++ b/mk/svn-package.mk
@@ -96,7 +96,6 @@ USE_TOOLS+=		date gzip pax
 
 _SVN_CMD=		${PREFIX}/bin/svn
 _SVN_CONFIG_DIR=	${WRKDIR}/.subversion
-_SVN_CHECKOUT_FLAGS=	--config-dir=${_SVN_CONFIG_DIR} --non-interactive
 _SVN_PKGREVISION_CMD=	${DATE} -u +'%Y%m%d'
 _SVN_DISTDIR=		${DISTDIR}/svn-packages
 
@@ -140,11 +139,11 @@ _SVN_CMD.install_certs.${repo}= \
 _SVN_CMD.fetch_repo.${repo}= \
 	if [ ! -d "$$extractdir" ]; then				\
 	  ${STEP_MSG} "Checking out revision $$revision from repository $$repo."; \
-	  ${_SVN_CMD} checkout -r "$$revision" ${SVN_CHECKOUT_FLAGS}	\
+	  ${_SVN_CMD} checkout -r "$$revision"				\
 	    "$$repo" "$$extractdir";					\
 	else								\
-	  ${STEP_MSG} "Updating to revision $$revision."; \
-	  ${_SVN_CMD} update -r "$$revision" ${SVN_CHECKOUT_FLAGS} "$$extractdir"; \
+	  ${STEP_MSG} "Updating to revision $$revision.";		\
+	  ${_SVN_CMD} update -r "$$revision" "$$extractdir";		\
 	fi
 
 # Create the cached archive from the checked out repository
@@ -173,12 +172,15 @@ _VARGROUPS+=		svn
 _USER_VARS.svn+=	CHECKOUT_DATE
 _PKG_VARS.svn+=		SVN_REPO SVN_REVISION SVN_EXTRACTDIR SVN_REPOSITORIES
 _SYS_VARS.svn+=		DISTFILES PKGREVISION
-_SYS_VARS.svn+=		_SVN_DISTDIR
+_DEF_VARS.svn+=		USE_TOOLS WRKSRC BUILD_DEPENDS
+_DEF_VARS.svn+=		_SVN_DISTDIR _SVN_CONFIG_DIR
+_USE_VARS.svn+=		DISTDIR PKGBASE WRKDIR PREFIX
 .for repo in ${SVN_REPOSITORIES}
 .  for varbase in SVN_REPO SVN_EXTRACTDIR SVN_REVISION SVN_CERTS
 _PKG_VARS.svn+=		${varbase}.${repo}
 .  endfor
 .  for varbase in _SVN_DISTFILE
-_SYS_VARS.svn+=		${varbase}.${repo}
+_DEF_VARS.svn+=		${varbase}.${repo}
 .  endfor
 .endfor
+_IGN_VARS.svn+=		WARNINGS
Prev by Date: swftools: Add recent CVE references
Next by Date: py-ginga: updating to version 3.4.0
Previous by Thread: rspamd31: import rspamd-3.1
Next by Thread: py-ginga: updating to version 3.4.0
Indexes:
Home | Main Index | Thread Index | Old Index