Index: MOVED
===================================================================
--- MOVED	(revision 552074)
+++ MOVED	(working copy)
@@ -15635,3 +15635,5 @@
 audio/zinf||2020-10-02|Has expired: Does not build, no upstream
 emulators/qemu-sbruno|emulators/qemu|2020-10-02|Has expired: Port will be removed in favor of emulators/qemu
 dns/knot2-lib|dns/knot3-lib|2020-10-04|Replaced by a more recent version
+devel/git-gui|devel/git@gui|2020-10-12|Replaced by a flavor
+devel/git-lite|devel/git@lite|2020-10-12|Replaced by a flavor
Index: devel/Makefile
===================================================================
--- devel/Makefile	(revision 552074)
+++ devel/Makefile	(working copy)
@@ -784,9 +784,7 @@
     SUBDIR += git-cola
     SUBDIR += git-delta
     SUBDIR += git-extras
-    SUBDIR += git-gui
     SUBDIR += git-lfs
-    SUBDIR += git-lite
     SUBDIR += git-merge-changelog
     SUBDIR += git-modes
     SUBDIR += git-review
Index: devel/git/Makefile
===================================================================
--- devel/git/Makefile	(revision 552074)
+++ devel/git/Makefile	(working copy)
@@ -12,15 +12,28 @@
 		${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	garga@FreeBSD.org
-COMMENT?=	Distributed source code management tool
+.if ${FLAVOR:U} == default
+COMMENT=	Distributed source code management tool
+.elif ${FLAVOR:U} == gui
+COMMENT=	Distributed source code management tool (GUI enabled flavor)
+.elif ${FLAVOR:U} == lite
+COMMENT=	Distributed source code management tool (lite flavor)
+.endif
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+FLAVORS=	default gui lite
+default_CONFLICTS_INSTALL=	git-gui git-lite
+gui_CONFLICTS_INSTALL=		git git-lite
+gui_DESCR=			${.CURDIR}/pkg-descr-gui
+gui_PKGNAMESUFFIX=		-gui
+lite_CONFLISTS_INSTALL=		git git-gui
+lite_DESCR=			${.CURDIR}/pkg-descr-lite
+lite_PKGNAMESUFFIX=		-lite
+
 USES=		autoreconf gmake iconv shebangfix ssl tar:xz
 
-CONFLICTS_INSTALL?=	git-gui-[0-9]* git-lite-[0-9]*
-
 USERS=		git_daemon
 GROUPS=		git_daemon
 
@@ -57,6 +70,12 @@
 		SEND_EMAIL NLS SUBTREE
 OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \
 			SUBTREE SVN
+.if ${FLAVOR:U} == gui
+OPTIONS_DEFAULT+=	GUI
+.elif ${FLAVOR:U} == lite
+OPTIONS_EXCLUDE=	GUI SVN GITWEB CONTRIB P4 CVS PERL
+.endif
+
 OPTIONS_SUB=	yes
 
 CONTRIB_DESC=	Install contributed scripts