git: f551531a5740 - main - astro/marble: Decruft

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Sat, 16 Nov 2024 08:40:37 UTC
The branch main has been updated by jhale:

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

commit f551531a5740944419ac3668a3675003ee2bdc21
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-11-16 05:33:13 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-11-16 08:40:30 +0000

    astro/marble: Decruft
    
    Remove long unused dependencies. Move optional Qt components to the
    options that require them.
    
    Remove a few unneed declarations that I think tagged along from KDE4.
---
 astro/marble/Makefile | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 68487f3c6f8a..a0541daf16c8 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	marble
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro education kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -10,42 +10,39 @@ WWW=		https://marble.kde.org/
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libquazip1-qt5.so:archivers/quazip@qt5 \
-		libprotobuf.so:devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext \
 		kde:5 qt:5 shared-mime-info tar:xz xorg
-USE_KDE=	attica auth codecs completion config configwidgets coreaddons \
-		crash doctools i18n jobwidgets kio newstuff package parts phonon \
+USE_KDE=	auth codecs completion config configwidgets coreaddons \
+		crash doctools i18n jobwidgets kio package parts phonon \
 		plasma-framework plasma-workspace-wallpapers runner service solid \
-		sonnet textwidgets wallet widgetsaddons windowsystem xmlgui \
+		sonnet textwidgets widgetsaddons windowsystem xmlgui \
 		ecm:build
-USE_QT=		concurrent core dbus declarative designer gui location network opengl \
-		printsupport script serialport sql svg webchannel widgets xml \
+USE_LDCONFIG=	yes
+USE_QT=		concurrent core dbus declarative designer gui network \
+		printsupport serialport sql svg widgets xml \
 		buildtools:build qmake:build testlib:build
 USE_XORG=	x11
 
-USE_LDCONFIG=	yes
-MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
-# We have to set QT_IMPORTS_PATH, as it does not get picked up
-CMAKE_ARGS=	-DMOBILE:BOOL=FALSE \
-		-DQT_IMPORTS_DIR:PATH=${QT_IMPORTDIR}
+CMAKE_OFF=	MOBILE
 
 # Override shared library version
 KDE_APPLICATIONS_SHLIB_VER=	${KDE_APPLICATIONS_SHLIB_G_VER}
 
-OPTIONS_DEFINE=	GPS DOCS WEBENGINE
-OPTIONS_DEFAULT=GPS
+OPTIONS_DEFINE=		DOCS GPS WEBENGINE
+OPTIONS_DEFAULT=	GPS
 OPTIONS_DEFAULT_amd64=	WEBENGINE
 OPTIONS_DEFAULT_i386=	WEBENGINE
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 GPS_DESC=		Support for GPS position provider
+GPS_USE=		QT=location
 GPS_LIB_DEPENDS=	libgps.so:astro/gpsd
 GPS_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_libgps
 
-WEBENGINE_DESC=		Add dependency on qt5-webengine
-WEBENGINE_USE=		QT=webengine
+WEBENGINE_DESC=		Build various plugins that require qt5-webengine
+WEBENGINE_USE=		QT=webchannel,webengine
 WEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets
 
 .include <bsd.port.mk>