git: dfe31131fa62 - main - sysutils/screenfetch: shift sysutils/screenfetch-nox11 to flavors

The branch main has been updated by jgh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dfe31131fa62b531b09593db9eb269f9d8359a95

commit dfe31131fa62b531b09593db9eb269f9d8359a95
Author:     Jason Helfman <jgh@FreeBSD.org>
AuthorDate: 2023-02-24 05:14:48 +0000
Commit:     Jason Helfman <jgh@FreeBSD.org>
CommitDate: 2023-02-24 05:17:15 +0000

    sysutils/screenfetch: shift sysutils/screenfetch-nox11 to flavors
---
 MOVED                               |  1 +
 sysutils/Makefile                   |  1 -
 sysutils/screenfetch-nox11/Makefile |  9 ---------
 sysutils/screenfetch/Makefile       | 15 ++++++++++-----
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/MOVED b/MOVED
index 45fdee339c63..25f85655709a 100644
--- a/MOVED
+++ b/MOVED
@@ -17767,3 +17767,4 @@ databases/mysql-connector-odbc|databases/mysql-connector-odbc-80|2023-02-18|Has
 devel/yaml-cpp03|devel/yaml-cpp|2023-02-21|Used by blender-lts28 which is EOL'd
 sysutils/uutils|sysutils/rust-coreutils|2023-02-22|Request by upstream
 print/harfbuzz-hb-view|print/harfbuzz-cairo|2023-02-23|Match feature and library name
+sysutils/screenfetch-nox11|sysutils/screenfetch@nox11|2023-02-23|Converted to flavor
diff --git a/sysutils/Makefile b/sysutils/Makefile
index b2093586564b..27286768d7fb 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1321,7 +1321,6 @@
     SUBDIR += schilyutils
     SUBDIR += screen
     SUBDIR += screenfetch
-    SUBDIR += screenfetch-nox11
     SUBDIR += screenie
     SUBDIR += scterc
     SUBDIR += sd-agent
diff --git a/sysutils/screenfetch-nox11/Makefile b/sysutils/screenfetch-nox11/Makefile
deleted file mode 100644
index 5f9cb30dfc14..000000000000
--- a/sysutils/screenfetch-nox11/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-PKGNAMESUFFIX=	-nox11
-
-MASTERDIR=	${.CURDIR}/../screenfetch
-
-CONFLICTS_INSTALL=	screenFetch-[0-9].*
-
-OPTIONS_EXCLUDE=	X11
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile
index 0d876836814a..8bf52def095f 100644
--- a/sysutils/screenfetch/Makefile
+++ b/sysutils/screenfetch/Makefile
@@ -12,19 +12,24 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=		bash:shells/bash
-X11_RUN_DEPENDS=	xdpyinfo:x11/xdpyinfo
+default_RUN_DEPENDS=	xdpyinfo:x11/xdpyinfo
 
-CONFLICTS_INSTALL?=	screenFetch-nox11
+FLAVORS=		default nox11
+FLAVOR?=		${FLAVORS:[1]}
+nox11_PKGNAMESUFFIX=	-nox11
 
-OPTIONS_DEFINE=		DOCS X11
-OPTIONS_DEFAULT=	X11
+CONFLICTS_INSTALL=	screenFetch-nox11*
+
+OPTIONS_DEFINE=	DOCS
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	KittyKatt
 
-PLIST_FILES=	bin/screenFetch bin/screenfetch man/man1/screenfetch.1.gz
+PLIST_FILES=	bin/screenFetch \
+		bin/screenfetch \
+		man/man1/screenfetch.1.gz
 PORTDOCS=	CHANGELOG README.mkdn TODO
 
 do-install: