pkgsrc-WIP-changes archive

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

gromit-mpx: Properly handle configuration file



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun May 4 19:54:21 2025 +0200
Changeset:	e30bd5051bd06d3793f4e77ec8f3025ac1f3a489

Modified Files:
	gromit-mpx/Makefile
	gromit-mpx/PLIST
	gromit-mpx/distinfo
	gromit-mpx/patches/patch-CMakeLists.txt
Removed Files:
	gromit-mpx/TODO

Log Message:
gromit-mpx: Properly handle configuration file

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

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

diffstat:
 gromit-mpx/Makefile                     |  6 ++++++
 gromit-mpx/PLIST                        |  2 +-
 gromit-mpx/TODO                         |  1 -
 gromit-mpx/distinfo                     |  2 +-
 gromit-mpx/patches/patch-CMakeLists.txt | 15 +++++++++++++--
 5 files changed, 21 insertions(+), 5 deletions(-)

diffs:
diff --git a/gromit-mpx/Makefile b/gromit-mpx/Makefile
index ea74aaddce..8fea07cdf9 100644
--- a/gromit-mpx/Makefile
+++ b/gromit-mpx/Makefile
@@ -13,6 +13,12 @@ USE_TOOLS+=	pkg-config
 
 USE_PKGLOCALEDIR=	yes
 
+BUILD_DEFS+=		PKG_SYSCONFBASE
+
+PKG_SYSCONFSUBDIR=	gromit-mpx
+CONF_FILES+=		${PREFIX}/share/examples/gromit-mpx/gromit-mpx.cfg \
+			${PKG_SYSCONFDIR}/gromit-mpx.cfg
+
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/gromit-mpx/PLIST b/gromit-mpx/PLIST
index d64984a214..df758e7879 100644
--- a/gromit-mpx/PLIST
+++ b/gromit-mpx/PLIST
@@ -1,12 +1,12 @@
 @comment $NetBSD$
 bin/gromit-mpx
-etc/gromit-mpx/gromit-mpx.cfg
 man/man1/gromit-mpx.1
 share/applications/net.christianbeier.Gromit-MPX.desktop
 share/doc/gromit-mpx/AUTHORS
 share/doc/gromit-mpx/ChangeLog
 share/doc/gromit-mpx/NEWS.md
 share/doc/gromit-mpx/README.md
+share/examples/gromit-mpx/gromit-mpx.cfg
 share/icons/hicolor/scalable/apps/net.christianbeier.Gromit-MPX.active.svg
 share/icons/hicolor/scalable/apps/net.christianbeier.Gromit-MPX.svg
 share/locale/de/LC_MESSAGES/gromit-mpx.mo
diff --git a/gromit-mpx/TODO b/gromit-mpx/TODO
deleted file mode 100644
index 92c81369ce..0000000000
--- a/gromit-mpx/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- Properly handle configuration file
diff --git a/gromit-mpx/distinfo b/gromit-mpx/distinfo
index 3e45ffc54d..7dfe18c350 100644
--- a/gromit-mpx/distinfo
+++ b/gromit-mpx/distinfo
@@ -3,7 +3,7 @@ $NetBSD$
 BLAKE2s (gromit-mpx-1.7.0.tar.gz) = 828d7483e15bdec3af7ca907dfebf506a5043f7ecd558aed50d66b6b7c5e43b7
 SHA512 (gromit-mpx-1.7.0.tar.gz) = 26baee4ec035eb6cd20faea96c6f6790dce2b6aaaed9578a1e975fb0d4b3a9062f0463607ca2ca53add8193aa0c7a2e94b730604d071dcea48a085aa8fdc4797
 Size (gromit-mpx-1.7.0.tar.gz) = 2165825 bytes
-SHA1 (patch-CMakeLists.txt) = 7c3908e3d4b14369f623168b05feb67a1db7d048
+SHA1 (patch-CMakeLists.txt) = 9b45afa4d42e2f2fc8808d11362681b77e4b24c2
 SHA1 (patch-src_coordlist__ops.c) = e3ff1e823b0ca8911d1707f6db12235a54ecc0d2
 SHA1 (patch-src_main.c) = d36a81c81606db81f79a959d47346221ffb1fd27
 SHA1 (patch-src_main.h) = 2335f833410caf5741266b16f64ca6509da02cae
diff --git a/gromit-mpx/patches/patch-CMakeLists.txt b/gromit-mpx/patches/patch-CMakeLists.txt
index 7ba58bed8c..fa5bd3e19f 100644
--- a/gromit-mpx/patches/patch-CMakeLists.txt
+++ b/gromit-mpx/patches/patch-CMakeLists.txt
@@ -1,8 +1,10 @@
 $NetBSD$
 
-Disable appindicator3 support to avoid dbus dependency.
+- Disable appindicator3 support to avoid dbus dependency.
 
-From OpenBSD ports.
+  From OpenBSD ports.
+- Install configuration files under examples directory so they can be handled
+  via pkgsrc properly.
 
 --- CMakeLists.txt.orig	2024-09-09 18:39:05.000000000 +0000
 +++ CMakeLists.txt
@@ -42,3 +44,12 @@ From OpenBSD ports.
      ${xinput_LIBRARIES}
      ${x11_LIBRARIES}
      ${lz4_LIBRARIES}
+@@ -88,7 +80,7 @@ GETTEXT_PROCESS_PO_FILES(pt_BR ALL PO_FI
+ 
+ install(TARGETS ${target_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(FILES data/net.christianbeier.Gromit-MPX.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+-install(FILES data/gromit-mpx.cfg DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/gromit-mpx)
++install(FILES data/gromit-mpx.cfg DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/gromit-mpx)
+ install(FILES README.md AUTHORS ChangeLog NEWS.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ install(FILES gromit-mpx.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ install(FILES data/net.christianbeier.Gromit-MPX.png data/net.christianbeier.Gromit-MPX.active.png DESTINATION ${CMAKE_INSTALL_DATADIR}/pixmaps)


Home | Main Index | Thread Index | Old Index