pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lxqt-globalkeys, clean-up



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Thu Jan 9 12:21:34 2020 +0100
Changeset:	4c3d70d0b07d7dd3ba122a85edf46da2c33fa99e

Modified Files:
	lxqt-globalkeys/Makefile
	lxqt-globalkeys/PLIST

Log Message:
lxqt-globalkeys, clean-up

Make lxqt-build-tools a build dependency only.
Clear PLIST errors.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4c3d70d0b07d7dd3ba122a85edf46da2c33fa99e

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

diffstat:
 lxqt-globalkeys/Makefile | 13 ++++++++++++-
 lxqt-globalkeys/PLIST    |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diffs:
diff --git a/lxqt-globalkeys/Makefile b/lxqt-globalkeys/Makefile
index e483fbe671..8a6b589543 100644
--- a/lxqt-globalkeys/Makefile
+++ b/lxqt-globalkeys/Makefile
@@ -19,12 +19,23 @@ CMAKE_ARG_PATH=	..
 
 CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 
+EGDIR=			share/examples/lxqt-globalkeys
+PKG_SYSCONFSUBDIR=	xdg
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/autostart
+CONF_FILES=		${EGDIR}/xdg/autostart/lxqt-globalkeyshortcuts.desktop \
+			${PKG_SYSCONFDIR}/autostart/lxqt-globalkeyshortcuts.desktop
+
+SUBST_CLASSES+=		conf
+SUBST_FILES.conf=	autostart/CMakeLists.txt
+SUBST_SED.conf=		-e 's,$${LXQT_ETC_XDG_DIR}/,${EGDIR}/xdg/,'
+SUBST_STAGE.conf=	pre-configure
+
 INSTALLATION_DIRS+=	bin lib
 
 pre-configure:
 	${MKDIR} -p ${WRKSRC}/build
 
-DEPENDS+=	lxqt-build-tools-[0-9]*:../../wip/lxqt-build-tools
+TOOL_DEPENDS+=	lxqt-build-tools-[0-9]*:../../wip/lxqt-build-tools
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
diff --git a/lxqt-globalkeys/PLIST b/lxqt-globalkeys/PLIST
index c27d5e31d1..b9748e5c69 100644
--- a/lxqt-globalkeys/PLIST
+++ b/lxqt-globalkeys/PLIST
@@ -1,7 +1,6 @@
 @comment $NetBSD$
 bin/lxqt-config-globalkeyshortcuts
 bin/lxqt-globalkeysd
-etc/xdg/autostart/lxqt-globalkeyshortcuts.desktop
 include/lxqt-globalkeys-ui/LXQtGlobalKeysUi/ShortcutSelector
 include/lxqt-globalkeys-ui/shortcut_selector.h
 include/lxqt-globalkeys-ui/shortcutselector.h
@@ -29,6 +28,7 @@ share/cmake/lxqt-globalkeys/lxqt-globalkeys-config-version.cmake
 share/cmake/lxqt-globalkeys/lxqt-globalkeys-config.cmake
 share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets-release.cmake
 share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets.cmake
+share/examples/lxqt-globalkeys/xdg/autostart/lxqt-globalkeyshortcuts.desktop
 share/lxqt/globalkeyshortcuts.conf
 share/lxqt/translations/lxqt-config-globalkeyshortcuts/lxqt-config-globalkeyshortcuts_ar.qm
 share/lxqt/translations/lxqt-config-globalkeyshortcuts/lxqt-config-globalkeyshortcuts_ast.qm


Home | Main Index | Thread Index | Old Index