Index: head/devel/git-cinnabar/Makefile
===================================================================
--- head/devel/git-cinnabar/Makefile	(revision 538843)
+++ head/devel/git-cinnabar/Makefile	(revision 538844)
@@ -1,54 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.5
 PORTREVISION=	2
 CATEGORIES=	devel
+PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX:N-py27}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Git remote helper to interact with Mercurial repositories
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${NONEXISTENT}:devel/git:configure
-RUN_DEPENDS=	git:devel/git \
-		hg:devel/mercurial
+RUN_DEPENDS=	git:devel/git
+py27_RUN_DEPENDS=	hg:devel/mercurial # XXX bug 242463
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glandium
 
-USES=		gmake python:2.7,run shebangfix
-SHEBANG_LANG=	python2.7
+USES=		gmake python:run shebangfix
+USE_PYTHON=	flavors
+TARGET_ORDER_OVERRIDE=	510:fix-shebang # after do-patch
 SHEBANG_FILES=	${PORTNAME} git-remote-hg
 ALL_TARGET=	${PORTNAME}-helper
 .ifnmake describe
 MAKE_ENV!=	${MAKE} -V MAKE_ENV -C ${.CURDIR}/../git
 MAKE_ARGS!=	${MAKE} -V MAKE_ARGS -C ${.CURDIR}/../git
 .endif
 MAKE_ENV+=	PYTHON_PATH="${PYTHON_CMD}"
 MAKE_ARGS+=	SUBMODULE_STATUS=dummy
 CFLAGS+=	-ffunction-sections -fdata-sections
 LDFLAGS+=	-Wl,--gc-sections
 .export		CPPFLAGS CFLAGS CXXFLAGS LDFLAGS # :configure
 DATADIR=	${PREFIX}/libexec/git-core
 PORTDATA=	*
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
-	@${TAR} cf - -C$$(${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git) . | \
+	@${TAR} cf - -C$$(${SETENV} -u FLAVOR ${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git) . | \
 		${TAR} xof - -C${WRKSRC}/git-core
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${WRKSRC}/git-remote-hg \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/git-core/${PORTNAME}-helper \
 		${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTNAME:S/git-//}" \
 		${STAGEDIR}${DATADIR}/pythonlib)
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/devel/git-cinnabar/files/patch-no-wrapper
===================================================================
--- head/devel/git-cinnabar/files/patch-no-wrapper	(nonexistent)
+++ head/devel/git-cinnabar/files/patch-no-wrapper	(revision 538844)
@@ -0,0 +1,65 @@
+Disable wrappers as Python version is controlled by FLAVORS
+
+--- README.md.orig	2020-04-23 06:16:13 UTC
++++ README.md
+@@ -53,18 +53,6 @@ Setup:
+ 
+   If you want to build git along the helper, you can run `make git`.
+ 
+-Experimental support for python 3.x:
+-------------------------------------
+-
+-Experimental support for python 3.5 or more can be enabled by one of the
+-following:
+-
+-- set the `GIT_CINNABAR_EXPERIMENTS` environment variable to `python3`.
+-- `git config cinnabar.experiments python3`.
+-
+-It has been tested mainly with python 3.5 and 3.7. Corner cases may not work
+-properly.
+-
+ Usage:
+ ------
+ 
+--- git-cinnabar.orig	2020-04-23 06:16:13 UTC
++++ git-cinnabar
+@@ -1,17 +1,4 @@
+-#!/bin/sh
+-''':'
+-experiments=${GIT_CINNABAR_EXPERIMENTS-$(git config cinnabar.experiments)}
+-case ",$experiments," in
+-*,python3,*)
+-  PYTHON=python3
+-  ;;
+-*)
+-  PYTHON=python2.7
+-  ;;
+-esac
+-exec $PYTHON $0 "$@"
+-exit 1
+-'''
++#!/usr/bin/env python
+ 
+ import os
+ import sys
+--- git-remote-hg.orig	2020-04-23 06:16:13 UTC
++++ git-remote-hg
+@@ -1,17 +1,4 @@
+-#!/bin/sh
+-''':'
+-experiments=${GIT_CINNABAR_EXPERIMENTS-$(git config cinnabar.experiments)}
+-case ",$experiments," in
+-*,python3,*)
+-  PYTHON=python3
+-  ;;
+-*)
+-  PYTHON=python2.7
+-  ;;
+-esac
+-exec $PYTHON $0 "$@"
+-exit 1
+-'''
++#!/usr/bin/env python
+ 
+ from __future__ import division
+ import os

Property changes on: head/devel/git-cinnabar/files/patch-no-wrapper
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property