CVS commit: pkgsrc/misc/marble

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Mar 30 09:08:58 UTC 2021

Modified Files:
        pkgsrc/misc/marble: Makefile PLIST

Log Message:
marble: fix some install paths. explicitly disable qtwebengine.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/misc/marble/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/marble/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/marble/Makefile
diff -u pkgsrc/misc/marble/Makefile:1.63 pkgsrc/misc/marble/Makefile:1.64
--- pkgsrc/misc/marble/Makefile:1.63    Sun Feb  7 06:30:32 2021
+++ pkgsrc/misc/marble/Makefile Tue Mar 30 09:08:58 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2021/02/07 06:30:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2021/03/30 09:08:58 markd Exp $
 
 DISTNAME=      marble-${KAPPSVER}
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    misc
 
 HOMEPAGE=      https://kde.org/applications/system/marble/
@@ -14,6 +14,9 @@ BUILD_DEPENDS+=       kdoctools>=5.19.0:../../
 
 USE_TOOLS+=    msgmerge perl
 
+CMAKE_ARGS+=   -DQT_PLUGINS_DIR=${QTDIR}/plugins
+CMAKE_ARGS+=   -DMARBLE_PRI_INSTALL_USE_QT_SYS_PATHS=TRUE
+
 SUBST_CLASSES+=                fix-moc
 SUBST_STAGE.fix-moc=   post-configure
 SUBST_MESSAGE.fix-moc= Cleaning up MOC includes
@@ -41,5 +44,6 @@ CONF_FILES+=  ${PREFIX}/share/examples/kd
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtserialport/buildlink3.mk"
+CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets:BOOL=TRUE
 #.include "../../x11/qt5-qtwebengine/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/marble/PLIST
diff -u pkgsrc/misc/marble/PLIST:1.8 pkgsrc/misc/marble/PLIST:1.9
--- pkgsrc/misc/marble/PLIST:1.8        Sun Feb  2 02:57:46 2020
+++ pkgsrc/misc/marble/PLIST    Tue Mar 30 09:08:58 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2020/02/02 02:57:46 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/03/30 09:08:58 markd Exp $
 bin/marble
 bin/marble-qt
 include/astro/astr2lib.h
@@ -236,10 +236,10 @@ lib/marble/plugins/libSpeedometer.so
 lib/marble/plugins/libStarsPlugin.so
 lib/marble/plugins/libSunPlugin.so
 lib/marble/plugins/libYoursPlugin.so
-lib/plugins/designer/libLatLonEditPlugin.so
-lib/plugins/designer/libMarbleNavigatorPlugin.so
-lib/plugins/designer/libMarbleWidgetPlugin.so
-mkspecs/modules/qt_Marble.pri
+qt5/mkspecs/modules/qt_Marble.pri
+qt5/plugins/designer/libLatLonEditPlugin.so
+qt5/plugins/designer/libMarbleNavigatorPlugin.so
+qt5/plugins/designer/libMarbleWidgetPlugin.so
 qt5/plugins/libmarble_part.so
 qt5/plugins/libmarblethumbnail.so
 qt5/plugins/plasma_runner_marble.so