Mark the fact that now gnome is mosly 3.36.

Actually more 3.38 but because some things like gnome-shell and mutter are
sill 3.36 let's not claim yet we are at 3.38

Some pieces are still 3.38 but will be updated very soon

While here turn the gnome3-lite meta port into a flavor of gnome3

6 files changed, 18 insertions, 28 deletions

diff --git a/MOVED b/MOVED
index 3c69b5038ae7..0e51c0dab696 100644
--- a/MOVED
+++ b/MOVED
@@ -15627,3 +15627,4 @@ net-im/corebird||2020-09-25|Stopped working in august 2018
 devel/py-pyqi||2020-09-25|No longer developed, use devel/py-click instead
 net-im/libnice-gst010|net-im/libnice-gst1|2020-09-25|Not depended on, gstream0.10 support has been removed in newer versions
 graphics/evince-lite|graphics/evince@lite|2020-09-26|Has been replaced by a flavor
+x11/gnome3-lite|x11/gnome3@lite|2020-09-29|HAs been replaced by a flavor
diff --git a/x11/Makefile b/x11/Makefile
index cd5b1a3876d1..93807c53ff54 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -82,7 +82,6 @@
     SUBDIR += gnome-shell-extensions
     SUBDIR += gnome-terminal
     SUBDIR += gnome3
-    SUBDIR += gnome3-lite
     SUBDIR += gnustep-app
     SUBDIR += grabc
     SUBDIR += grim
diff --git a/x11/gnome3-lite/Makefile b/x11/gnome3-lite/Makefile
deleted file mode 100644
index a03a06475ed9..000000000000
--- a/x11/gnome3-lite/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION=	1
-CATEGORIES=	x11 gnome
-PKGNAMESUFFIX=	-lite
-
-COMMENT=	The "meta-port" of the GNOME desktop slimmed down for only the basics
-
-MASTERDIR=	${.CURDIR}/../gnome3
-
-DESCR=		${.CURDIR}/pkg-descr
-PKGMESSAGE=	${.CURDIR}/pkg-message
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 6c11f233df58..681014833726 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -2,12 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	gnome3
-PORTVERSION=	3.28
-PORTREVISION=	2
+PORTVERSION=	3.36
 CATEGORIES?=	x11 gnome
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT?=	"meta-port" for the GNOME 3 integrated X11 desktop
+COMMENT=	"meta-port" for the GNOME 3 integrated X11 desktop
+
+FLAVORS=	full lite
+FLAVOR?=	full
 
 RUN_DEPENDS?=	dconf-editor:devel/dconf-editor \
 		gnome-session>=3.0.0:x11/gnome-session \
@@ -33,20 +35,19 @@ RUN_DEPENDS?=	dconf-editor:devel/dconf-editor \
 		caribou>=0:accessibility/caribou \
 		${LOCALBASE}/share/sounds/freedesktop/index.theme:audio/freedesktop-sound-theme
 
-CONFLICTS?=	gnome3-lite-[0-9]*
+OPTIONS_DEFINE=	DOCS
 
 USES=		metaport
 
-.if ${.CURDIR:T}!="gnome3-lite"
-OPTIONS_DEFINE+=DOCS
-
-DOCS_RUN_DEPENDS=	gnome-user-docs>=0:misc/gnome-user-docs \
-			gnome-getting-started-docs>=0:misc/gnome-getting-started-docs
+.if ${FLAVOR} ==lite
+OPTIONS_EXCLUDE=	DOCS
+PKGNAMESUFFIX=	-lite
+COMMENT=	The "meta-port" of the GNOME desktop slimmed down for only the basics
+PKGMESSAGE=	${.CURDIR}/pkg-message-lite
+DESCR=		${.CURDIR}/pkg-descr-lite
 .endif
 
-.include <bsd.port.options.mk>
-
-.if ${.CURDIR:T}!="gnome3-lite"
+.if ${FLAVOR} == "full"
 RUN_DEPENDS+=	epiphany>=3.0.0:www/epiphany \
 		gucharmap>=3.0.0:deskutils/gucharmap \
 		gnome-characters>=3.0.0:deskutils/gnome-characters \
@@ -75,4 +76,8 @@ RUN_DEPENDS+=	epiphany>=3.0.0:www/epiphany \
 
 .endif # !gnome3-lite section
 
+DOCS_RUN_DEPENDS=	gnome-user-docs>=0:misc/gnome-user-docs \
+			gnome-getting-started-docs>=0:misc/gnome-getting-started-docs
+
+
 .include <bsd.port.mk>
diff --git a/x11/gnome3-lite/pkg-descr b/x11/gnome3/pkg-descr-lite
index f756f3155736..f756f3155736 100644
--- a/x11/gnome3-lite/pkg-descr
+++ b/x11/gnome3/pkg-descr-lite
diff --git a/x11/gnome3-lite/pkg-message b/x11/gnome3/pkg-message-lite
index a0b493deeb8d..a0b493deeb8d 100644
--- a/x11/gnome3-lite/pkg-message
+++ b/x11/gnome3/pkg-message-lite