git-package.mk: Welcome to GIT_REVISION

dwb-gtk2-git/Makefile.common

@@ -9,7 +9,7 @@ MASTER_SITES=	https://bitbucket.org/portix/dwb/get/
 
 GIT_REPOSITORIES=	dwb
 GIT_REPO.dwb=	http://bitbucket.org/portix/dwb.git
-GIT_TAG.dwb=	dda5aa74a63abfdbde6c52ad067de628f6b7c615
+GIT_REVISION.dwb=	dda5aa74a63abfdbde6c52ad067de628f6b7c615
 WRKSRC=	${WRKDIR}/dwb
 
 MAINTAINER=	pkgsrc-users@NetBSD.org

fuse-google-drive/Makefile

@@ -12,7 +12,7 @@ LICENSE=	gplv2
 
 GIT_REPOSITORIES=	fuse-google-drive
 GIT_REPO.fuse-google-drive=	http://github.com/jcline/fuse-google-drive.git
-GIT_TAG.fuse-google-drive=	1e1bfa00b6d55cabcb717d0109ffc374c0af0348
+GIT_REVISION.fuse-google-drive=	1e1bfa00b6d55cabcb717d0109ffc374c0af0348
 .include "../../wip/mk/git-package.mk"
 
 GNU_CONFIGURE=	yes

irssi-otr/Makefile

@@ -12,7 +12,7 @@ GIT_REPOSITORIES=	github
 GIT_REPO.github= 	git://github.com/cryptodotis/irssi-otr.git
 GIT_MODULE.github=	irssi-otr
 # v1.01 is not tagged; use a version slightly after that.
-GIT_TAG.github=		4ad3b7b6c85be0154ab3694fe9831796db20c4fe
+GIT_REVISION.github=	4ad3b7b6c85be0154ab3694fe9831796db20c4fe
 
 WRKSRC=			${WRKDIR}/${PKGBASE}
 

mk/git-package.mk

@@ -15,6 +15,9 @@
 #	GIT_BRANCH.${id}
 #		The branch to check out.
 #
+#	GIT_REVISION.${id}
+#		The revision to check out.
+#
 #	GIT_TAG.${id}
 #		Overridable GIT tag for a repository.
 #
@@ -68,7 +71,7 @@ _GIT_DISTDIR=		${DISTDIR}/git-packages
 
 #
 # Generation of repository-specific variables
-#
+
 
 .for repo in ${GIT_REPOSITORIES}
 GIT_MODULE.${repo}?=	${repo}
@@ -77,6 +80,8 @@ _GIT_ENV.${repo}=	${GIT_ENV.${repo}}
 # determine appropriate checkout branch or tag
 .  if defined(GIT_BRANCH.${repo})
 _GIT_FLAG.${repo}=	origin/${GIT_BRANCH.${repo}}
+.  elif defined(GIT_REVISION.${repo})
+_GIT_FLAG.${repo}=	${GIT_REVISION.${repo}}
 .  elif defined(GIT_TAG.${repo})
 _GIT_FLAG.${repo}=	tags/${GIT_TAG.${repo}}
 .  else