sysutils/android-file-transfer: flavorize, enable Qt6 gui

convert CLI, FUSE, and QT6 options to flavors

PR:		293122
Approved by:	maintainer timeout

3 files changed, 34 insertions, 27 deletions

diff --git a/MOVED b/MOVED
index 447510fe07b3..79fa178094c3 100644
--- a/MOVED
+++ b/MOVED
@@ -5136,7 +5136,7 @@ textproc/rubygem-cucumber-html-formatter21|textproc/rubygem-cucumber-html-format
 textproc/rubygem-loofah222|textproc/rubygem-loofah|2026-02-10|Remove obsoleted port. Use textproc/rubygem-loofah instead
 databases/rubygem-flipper-active_record-rails70|databases/rubygem-flipper-active_record|2026-02-10|Remove obsoleted port. Use databases/rubygem-flipper-active_record instead
 devel/rubygem-flipper-active_support_cache_store-rails70|devel/rubygem-flipper-active_support_cache_store|2026-02-10|Remove obsoleted port. Use devel/rubygem-flipper-active_support_cache_store instead
-sysutils/android-file-transfer-qt5||2026-02-11|Removed as qt5 is being deprecated
+sysutils/android-file-transfer-qt5|sysutils/android-file-transfer@qt6|2026-02-11|Merged into the flavorized port
 databases/postgresql13-contrib||2026-02-12|Has expired: PostgreSQL-13 is end-of-life
 databases/postgresql13-client||2026-02-12|Has expired: PostgreSQL-13 is end-of-life
 databases/postgresql13-plperl||2026-02-12|Has expired: PostgreSQL-13 is end-of-life
diff --git a/sysutils/android-file-transfer/Makefile b/sysutils/android-file-transfer/Makefile
index c088895b79af..cd70bd114016 100644
--- a/sysutils/android-file-transfer/Makefile
+++ b/sysutils/android-file-transfer/Makefile
@@ -1,8 +1,9 @@
 PORTNAME=	android-file-transfer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	tiga@FreeBSD.org
 COMMENT=	Android MTP client with minimalistic UI
@@ -11,42 +12,44 @@ WWW=		https://github.com/whoozle/android-file-transfer-linux
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+FLAVORS=        cli fuse qt6
+FLAVOR?=        ${FLAVORS:[1]}
+
 USES=		cmake compiler:c++11-lib pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	whoozle
 GH_PROJECT=	${PORTNAME}-linux
 
-CMAKE_ON=	USB_BACKEND_LIBUSB
-CMAKE_OFF=	BUILD_PYTHON
+.if ${FLAVOR} == cli
+CMAKE_OFF=	BUILD_FUSE \
+		BUILD_QT_UI
+.elif ${FLAVOR} == fuse
+USES+=		fuse:3
+CMAKE_ON=	BUILD_FUSE
+CMAKE_OFF=	BUILD_QT_UI
+.elif ${FLAVOR} == qt6
+USES+=		qt:6
+USE_QT=		base tools:build
+CMAKE_OFF=	BUILD_FUSE
+CMAKE_ON=	BUILD_QT_UI
+.endif
+
+CMAKE_ON+=	USB_BACKEND_LIBUSB BUILD_MTPZ
+CMAKE_OFF+=	BUILD_PYTHON
+
+FLAVORS_SUB=	yes
 
 PORTSCOUT=	skipv:continuous
 
-PLIST_FILES=	"@comment lib/libmtp-ng-static.a"
-
-OPTIONS_DEFINE=		CLI FUSE OPENSSL QT6 TAGLIB
-OPTIONS_DEFAULT=	CLI OPENSSL TAGLIB
-OPTIONS_EXCLUDE?=	QT6
+OPTIONS_DEFINE=		OPENSSL TAGLIB
+OPTIONS_DEFAULT=	OPENSSL TAGLIB
 
-CLI_DESC=		CLI (Command-Line Interface) support
 TAGLIB_DESC=		Reading audio metadata via taglib
-CLI_PLIST_FILES=	bin/aft-mtp-cli
-
-FUSE_USES=		fuse:3
-FUSE_CMAKE_BOOL=	BUILD_FUSE
-FUSE_PLIST_FILES=	bin/aft-mtp-mount
+OPENSSL_DESC=		MTPZ support via OpenSSL
 
 OPENSSL_USES=		ssl
 OPENSSL_CMAKE_BOOL=	BUILD_MTPZ
 
-QT6_USES=		qt:6
-QT6_USE=		QT=base,tools:build
-QT6_CMAKE_BOOL=		BUILD_QT_UI
-QT6_CMAKE_ON=		-DDESIRED_QT_VERSION:STRING=6
-QT6_PLIST_FILES=	bin/android-file-transfer \
-			share/applications/android-file-transfer.desktop \
-			share/icons/hicolor/512x512/apps/android-file-transfer.png \
-			share/metainfo/android-file-transfer.appdata.xml
-
 TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_BOOL=	BUILD_TAGLIB
 
@@ -54,7 +57,4 @@ post-patch:
 	@${REINPLACE_CMD} '/set.*AFT_VERSION/s/".*"/"${DISTVERSIONFULL}"/' \
 		${WRKSRC}/CMakeLists.txt
 
-post-patch-CLI-off:
-	@${REINPLACE_CMD} '/subdirectory(cli)/d' ${WRKSRC}/CMakeLists.txt
-
 .include <bsd.port.mk>
diff --git a/sysutils/android-file-transfer/pkg-plist b/sysutils/android-file-transfer/pkg-plist
new file mode 100644
index 000000000000..2648e5af88de
--- /dev/null
+++ b/sysutils/android-file-transfer/pkg-plist
@@ -0,0 +1,7 @@
+%%CLI%%bin/aft-mtp-cli
+%%FUSE%%bin/aft-mtp-mount
+%%QT6%%bin/android-file-transfer
+@comment lib/libmtp-ng-static.a
+%%QT6%%share/applications/android-file-transfer.desktop
+%%QT6%%share/icons/hicolor/512x512/apps/android-file-transfer.png
+%%QT6%%share/metainfo/android-file-transfer.appdata.xml