CVS commit: pkgsrc

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Mon Jan 13 16:51:57 UTC 2025

Modified Files:
        pkgsrc/wm/obconf-qt: Makefile
        pkgsrc/x11/libfm-qt: Makefile
        pkgsrc/x11/qterminal: Makefile

Log Message:
obconf-qt, libfm-qt, qterminal: Nix explicit CMAKE_PREFIX_PATH.

CMAKE_PREFIX_PATH is already added to CMAKE_CONFIGURE_ARGS by
devel/cmake/build.mk, and ${PREFIX}/qt6 is already included in it by
x11/qt6-qtbase/buildlink3.mk.

Revbump since this could in principle change the package, if the
pkgsrc variable CMAKE_PREFIX_PATH had anything else in it which is
now no longer hidden.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/wm/obconf-qt/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/libfm-qt/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/qterminal/Makefile

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

Modified files:

Index: pkgsrc/wm/obconf-qt/Makefile
diff -u pkgsrc/wm/obconf-qt/Makefile:1.39 pkgsrc/wm/obconf-qt/Makefile:1.40
--- pkgsrc/wm/obconf-qt/Makefile:1.39   Fri Dec 27 08:20:47 2024
+++ pkgsrc/wm/obconf-qt/Makefile        Mon Jan 13 16:51:56 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2024/12/27 08:20:47 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2025/01/13 16:51:56 riastradh Exp $
 
 DISTNAME=      obconf-qt-0.16.5
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    wm
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -15,8 +15,6 @@ LICENSE=      gnu-gpl-v2
 USE_TOOLS+=    pkg-config perl
 USE_LANGUAGES= c c++
 
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt6
-
 TOOL_DEPENDS+= lxqt-build-tools>=2.1.0:../../devel/lxqt-build-tools
 TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
 

Index: pkgsrc/x11/libfm-qt/Makefile
diff -u pkgsrc/x11/libfm-qt/Makefile:1.43 pkgsrc/x11/libfm-qt/Makefile:1.44
--- pkgsrc/x11/libfm-qt/Makefile:1.43   Fri Nov 15 12:28:33 2024
+++ pkgsrc/x11/libfm-qt/Makefile        Mon Jan 13 16:51:56 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2024/11/15 12:28:33 pin Exp $
+# $NetBSD: Makefile,v 1.44 2025/01/13 16:51:56 riastradh Exp $
 
 DISTNAME=      libfm-qt-2.1.0
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -14,8 +15,6 @@ LICENSE=      gnu-lgpl-v2.1 AND modified-bsd
 USE_TOOLS+=    pkg-config perl
 USE_LANGUAGES= c c++
 
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt6
-
 PKG_SYSCONFSUBDIR=     xdg
 
 SUBST_CLASSES+=                prefix

Index: pkgsrc/x11/qterminal/Makefile
diff -u pkgsrc/x11/qterminal/Makefile:1.39 pkgsrc/x11/qterminal/Makefile:1.40
--- pkgsrc/x11/qterminal/Makefile:1.39  Fri Nov 15 12:35:59 2024
+++ pkgsrc/x11/qterminal/Makefile       Mon Jan 13 16:51:56 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2024/11/15 12:35:59 pin Exp $
+# $NetBSD: Makefile,v 1.40 2025/01/13 16:51:56 riastradh Exp $
 
 DISTNAME=      qterminal-2.1.0
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=lxqt/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -14,8 +15,6 @@ LICENSE=      gnu-gpl-v2
 USE_TOOLS+=    pkg-config perl
 USE_LANGUAGES= c c++
 
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${PREFIX}/qt6
-
 TOOL_DEPENDS+= lxqt-build-tools>=2.1.0:../../devel/lxqt-build-tools
 TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools