CVS commit: pkgsrc/mk/fetch

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed May 31 20:30:44 UTC 2023

Modified Files:
        pkgsrc/mk/fetch: github.mk

Log Message:
mk/github: use lowercase variable names in .for loop

There is no need to test that the items of a .for loop are '!empty'.

Use lowercase and short names for the .for loop variables, as these
variables are local to the loop.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mk/fetch/github.mk

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

Modified files:

Index: pkgsrc/mk/fetch/github.mk
diff -u pkgsrc/mk/fetch/github.mk:1.16 pkgsrc/mk/fetch/github.mk:1.17
--- pkgsrc/mk/fetch/github.mk:1.16      Fri May 12 20:09:09 2023
+++ pkgsrc/mk/fetch/github.mk   Wed May 31 20:30:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: github.mk,v 1.16 2023/05/12 20:09:09 dholland Exp $
+# $NetBSD: github.mk,v 1.17 2023/05/31 20:30:44 rillig Exp $
 #
 # github.com master site handling
 #
@@ -75,15 +75,14 @@ SITES.${_GITHUB_DEFAULT_DISTFILES}= -${M
 
 .endif
 
-.if !empty(GITHUB_SUBMODULES)
-.  for _GITHUB_SM_USER _GITHUB_SM_PROJECT _GITHUB_SM_TAG _GITHUB_SM_PLACE in ${GITHUB_SUBMODULES}
-_GITHUB_SM_DISTFILE=                   ${_GITHUB_SM_USER}-${_GITHUB_SM_PROJECT}-${_GITHUB_SM_TAG}${EXTRACT_SUFX}
-_GITHUB_DEFAULT_DISTFILES+=            ${_GITHUB_SM_USER}-${_GITHUB_SM_PROJECT}-${_GITHUB_SM_TAG}${EXTRACT_SUFX}
-SITES.${_GITHUB_SM_DISTFILE}=          -${MASTER_SITE_GITHUB:=${_GITHUB_SM_USER}/${_GITHUB_SM_PROJECT}/archive/${_GITHUB_SM_TAG}${EXTRACT_SUFX}}
-EXTRACT_DIR.${_GITHUB_SM_DISTFILE}=    ${WRKSRC}/${_GITHUB_SM_PLACE}
-EXTRACT_OPTS_TAR.${_GITHUB_SM_DISTFILE}=       --strip-components=1
+.for user project tag place in ${GITHUB_SUBMODULES}
+.  for distfile in ${user}-${project}-${tag}${EXTRACT_SUFX}
+_GITHUB_DEFAULT_DISTFILES+=    ${distfile}
+SITES.${distfile}=             -${MASTER_SITE_GITHUB:=${user}/${project}/archive/${tag}${EXTRACT_SUFX}}
+EXTRACT_DIR.${distfile}=       ${WRKSRC}/${place}
+EXTRACT_OPTS_TAR.${distfile}=  --strip-components=1
 .  endfor
-.endif
+.endfor
 
 _VARGROUPS+=           github
 _PKG_VARS.github=      GITHUB_PROJECT DISTNAME GITHUB_TYPE GITHUB_TAG \