CVS commit: pkgsrc/wm/awesome

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Mon May  8 00:12:41 UTC 2023

Modified Files:
        pkgsrc/wm/awesome: Makefile distinfo
        pkgsrc/wm/awesome/patches: patch-CMakeLists.txt

Log Message:
awesome: revert part of the previous patch which got overwritten.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/wm/awesome/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/wm/awesome/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/awesome/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/wm/awesome/Makefile
diff -u pkgsrc/wm/awesome/Makefile:1.81 pkgsrc/wm/awesome/Makefile:1.82
--- pkgsrc/wm/awesome/Makefile:1.81     Sun May  7 20:48:50 2023
+++ pkgsrc/wm/awesome/Makefile  Mon May  8 00:12:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2023/05/07 20:48:50 nikita Exp $
+# $NetBSD: Makefile,v 1.82 2023/05/08 00:12:41 nikita Exp $
 
 DISTNAME=      awesome-4.3
 PKGREVISION=   11
@@ -56,17 +56,6 @@ SUBST_SED.lua=               -e 's|COMMAND lua|COMMAN
 pre-configure:
        ${RUN} mkdir -p ${WRKSRC}/build
 
-# rc.lua does not end up being installed where the PLIST states it does,
-# so install it manually, then remove the file which now ends up in the
-# default location of the build-system.
-pre-install:
-       ${MKDIR} ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/build/script_files/rc.lua ${DESTDIR}${EGDIR}
-
-post-install:
-       ${RM} ${DESTDIR}${PKG_SYSCONFDIR}/rc.lua
-       ${RMDIR} ${DESTDIR}${PKG_SYSCONFDIR}
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"

Index: pkgsrc/wm/awesome/distinfo
diff -u pkgsrc/wm/awesome/distinfo:1.26 pkgsrc/wm/awesome/distinfo:1.27
--- pkgsrc/wm/awesome/distinfo:1.26     Sun May  7 20:48:50 2023
+++ pkgsrc/wm/awesome/distinfo  Mon May  8 00:12:41 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2023/05/07 20:48:50 nikita Exp $
+$NetBSD: distinfo,v 1.27 2023/05/08 00:12:41 nikita Exp $
 
 BLAKE2s (awesome-4.3.tar.xz) = 996ff487c8d2f850bf78d26f151ea5269c96cff94ccae95626ec2e0cb59e55d4
 SHA512 (awesome-4.3.tar.xz) = c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
 Size (awesome-4.3.tar.xz) = 1037816 bytes
-SHA1 (patch-CMakeLists.txt) = 0e7a55084a038903474e8c05719ad351946ccf60
+SHA1 (patch-CMakeLists.txt) = b4477b425846533dfe2700a9195146b25db0bd9b
 SHA1 (patch-awesomeConfig.cmake) = 5748d5495e9a0e21f7d80b78d2e73423657f1866

Index: pkgsrc/wm/awesome/patches/patch-CMakeLists.txt
diff -u pkgsrc/wm/awesome/patches/patch-CMakeLists.txt:1.3 pkgsrc/wm/awesome/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/wm/awesome/patches/patch-CMakeLists.txt:1.3  Sun May  7 20:48:50 2023
+++ pkgsrc/wm/awesome/patches/patch-CMakeLists.txt      Mon May  8 00:12:41 2023
@@ -1,10 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2023/05/07 20:48:50 nikita Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2023/05/08 00:12:41 nikita Exp $
 
 Do not introduce timestamps in PNG files (for icons).
 See <https://wiki.debian.org/ReproducibleBuilds/TimestampsInPNG>.
 
---- CMakeLists.txt.orig        2023-05-07 21:57:36.859234114 +0200
-+++ CMakeLists.txt     2023-05-07 21:59:09.539145363 +0200
+Install config file to the examples directory.
+
+--- CMakeLists.txt.orig        2019-01-28 07:53:24.000000000 +0100
++++ CMakeLists.txt     2023-05-08 02:08:53.084892550 +0200
 @@ -336,7 +336,7 @@
          set(ALL_ICONS ${ALL_ICONS} ${output})
  
@@ -14,3 +16,12 @@ See <https://wiki.debian.org/Reproducibl
              OUTPUT  ${output}
              DEPENDS ${input}
              VERBATIM)
+@@ -371,7 +371,7 @@
+ install(FILES "utils/awesome-client" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESOME_DATA_PATH}
+     PATTERN "*.in" EXCLUDE)
+-install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${AWESOME_SYSCONFDIR}
++install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/awesome
+         RENAME rc.lua)
+ if(GENERATE_MANPAGES)
+     if(COMPRESS_MANPAGES)