git-package.mk: Set GIT_ENV per repo

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Dec 11 02:09:37 2015 +0100
Changeset:	f628ae6748ed41b64b541b58cfc9551dea336e61

Modified Files:
	davical-current/Makefile
	git-modes-git/Makefile
	gr-fcdproplus-git/Makefile
	magit-git/Makefile
	mk/git-package.mk

Log Message:
git-package.mk: Set GIT_ENV per repo

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

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

diffstat:
 davical-current/Makefile   |  2 +-
 git-modes-git/Makefile     |  2 +-
 gr-fcdproplus-git/Makefile |  2 +-
 magit-git/Makefile         |  2 +-
 mk/git-package.mk          | 14 +++++++-------
 5 files changed, 11 insertions(+), 11 deletions(-)

diffs:
diff --git a/davical-current/Makefile b/davical-current/Makefile
index c2948d6..c8163f2 100644
--- a/davical-current/Makefile
+++ b/davical-current/Makefile
@@ -17,7 +17,7 @@ GIT_REPOSITORIES=       master
 GIT_REPO.master=        https://gitlab.com/davical-project/davical.git
 GIT_MODULE.master=      davical
 # for "SSL certificate problem: unable to get local issuer certificate"
-GIT_ENV+=	GIT_SSL_NO_VERIFY=true
+GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
 
 DAVICALDIR=	${PREFIX}/share/davical
 EGDIR=		${PREFIX}/share/examples/davical
diff --git a/git-modes-git/Makefile b/git-modes-git/Makefile
index 987705b..b9c3e3f 100644
--- a/git-modes-git/Makefile
+++ b/git-modes-git/Makefile
@@ -6,7 +6,7 @@ LICENSE=	gnu-gpl-v3
 GIT_REPOSITORIES=	master
 GIT_REPO.master=	https://github.com/magit/git-modes.git
 GIT_MODULE.master=	git-modes
-GIT_ENV+=		GIT_SSL_NO_VERIFY=true
+GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/magit/git-modes
diff --git a/gr-fcdproplus-git/Makefile b/gr-fcdproplus-git/Makefile
index 62d34eb..ccf6a74 100644
--- a/gr-fcdproplus-git/Makefile
+++ b/gr-fcdproplus-git/Makefile
@@ -11,7 +11,7 @@ LICENSE=		gnu-gpl-v2
 GIT_REPOSITORIES=	master
 GIT_REPO.master=	https://github.com/dl1ksv/gr-fcdproplus
 GIT_MODULE.master=	gr-fcdproplus
-GIT_ENV+=		GIT_SSL_NO_VERIFY=true
+GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
 
 USE_LANGUAGES=		c c++
 USE_TOOLS=		cmake
diff --git a/magit-git/Makefile b/magit-git/Makefile
index 932b3f2..27a0473 100644
--- a/magit-git/Makefile
+++ b/magit-git/Makefile
@@ -12,7 +12,7 @@ GIT_REPOSITORIES=	master
 GIT_REPO.master=	https://github.com/magit/magit.git
 GIT_MODULE.master=	magit
 # for "SSL certificate problem: unable to get local issuer certificate"
-GIT_ENV+=	GIT_SSL_NO_VERIFY=true
+GIT_ENV.master+=	GIT_SSL_NO_VERIFY=true
 
 WRKSRC=		${WRKDIR}/${PKGBASE}
 NO_CONFIGURE=	yes
diff --git a/mk/git-package.mk b/mk/git-package.mk
index d26139c..5497f10 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -21,7 +21,7 @@
 #	GIT_TAG.${id}
 #		Overridable GIT tag for a repository.
 #
-#	GIT_ENV
+#	GIT_ENV.${id}
 #		The environment for git, to set e.g. GIT_SSL_NO_VERIFY=true
 
 .if !defined(_PKG_MK_GIT_PACKAGE_MK)
@@ -64,7 +64,6 @@ PKG_FAIL_REASON+=	"[git-package.mk] GIT_REPO."${_repo_:Q}" must be set."
 USE_TOOLS+=		date pax
 
 _GIT_CMD=		git
-_GIT_ENV=		${GIT_ENV}
 _GIT_FETCH_FLAGS=	--quiet --depth 1 --recurse-submodules=yes --tags
 _GIT_CLONE_FLAGS=	--quiet --depth 1 --recursive
 _GIT_CHECKOUT_FLAGS=	--quiet
@@ -78,6 +77,7 @@ _GIT_DISTDIR=		${DISTDIR}/git-packages
 
 .for repo in ${GIT_REPOSITORIES}
 GIT_MODULE.${repo}?=	${repo}
+_GIT_ENV.${repo}=	${GIT_ENV.${repo}}
 
 # determine appropriate checkout branch or tag
 .  if defined(GIT_BRANCH.${repo})
@@ -111,20 +111,20 @@ _GIT_CREATE_CACHE.${repo}=	\
 _GIT_FETCH_REPO.${repo}=	\
 	if [ ! -d ${GIT_MODULE.${repo}:Q} ]; then				\
 	  ${STEP_MSG} "Cloning GIT archive "${GIT_MODULE.${repo}:Q}".";		\
-	  ${SETENV} ${_GIT_ENV} ${_GIT_CMD} clone ${_GIT_CLONE_FLAGS} 		\
+	  ${SETENV} ${_GIT_ENV.${repo}} ${_GIT_CMD} clone ${_GIT_CLONE_FLAGS} 	\
 	    ${GIT_REPO.${repo}:Q} ${GIT_MODULE.${repo}:Q};			\
 	fi;									\
 	${STEP_MSG} "Fetching remote branches of "${_GIT_FLAG.${repo}:Q}".";	\
-	${SETENV} ${_GIT_ENV} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}		\
+	${SETENV} ${_GIT_ENV.${repo}} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}	\
 	  remote set-branches origin '*';					\
 	${STEP_MSG} "Updating GIT archive "${GIT_MODULE.${repo}:Q}".";		\
-	${SETENV} ${_GIT_ENV} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}		\
+	${SETENV} ${_GIT_ENV.${repo}} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}	\
 	  fetch ${_GIT_FETCH_FLAGS};						\
 	${STEP_MSG} "Checking out GIT "${_GIT_FLAG.${repo}:Q}".";		\
-	${SETENV} ${_GIT_ENV} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}		\
+	${SETENV} ${_GIT_ENV.${repo}} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}	\
 	  checkout ${_GIT_CHECKOUT_FLAGS} ${_GIT_FLAG.${repo}:Q};		\
 	${STEP_MSG} "Updating submodules of "${_GIT_FLAG.${repo}:Q}".";		\
-	${SETENV} ${_GIT_ENV} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}		\
+	${SETENV} ${_GIT_ENV.${repo}} ${_GIT_CMD} -C ${GIT_MODULE.${repo}:Q}	\
 	  submodule update --recursive
 .endfor