CVS commit: pkgsrc/wm/awesome

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sat May 15 16:42:43 UTC 2021

Modified Files:
        pkgsrc/wm/awesome: Makefile PLIST distinfo
Added Files:
        pkgsrc/wm/awesome/patches: patch-awesomeConfig.cmake

Log Message:
awesome: Fix PLIST for manpages

pkgsrc changes:
---------------
  * Add explicit dependency to textproc/ruby-asciidoctor since
    GENERATE_MANPAGES is ON by default and the man pages are generated
    if the tool is present.
  * Improve the search of asciidoctor binary by including suffixed binaries
    in case pkgtools/pkg_alternatives is not installed.
  * Bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/wm/awesome/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/wm/awesome/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/wm/awesome/distinfo
cvs rdiff -u -r0 -r1.7 pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake

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.74 pkgsrc/wm/awesome/Makefile:1.75
--- pkgsrc/wm/awesome/Makefile:1.74     Mon Aug 17 20:20:15 2020
+++ pkgsrc/wm/awesome/Makefile  Sat May 15 16:42:43 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2020/08/17 20:20:15 leot Exp $
+# $NetBSD: Makefile,v 1.75 2021/05/15 16:42:43 triaxx Exp $
 
 DISTNAME=      awesome-4.3
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    wm lua
 EXTRACT_SUFX=  .tar.xz
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=awesomeWM/}
@@ -31,6 +31,7 @@ LUA_VERSIONS_ACCEPTED=        53 52 51
 
 .include "../../lang/lua/luaversion.mk"
 
+#CMAKE_ARGS+=  -DCOMPRESS_MANPAGES=${MANZ:Q}
 CMAKE_ARGS+=   -DCOMPRESS_MANPAGES=${MANZ:Q}
 CMAKE_ARGS+=   -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
 CMAKE_ARGS+=   -DOVERRIDE_VERSION=${PKGVERSION_NOREV}
@@ -41,6 +42,8 @@ CMAKE_ARGS+=  -DGENERATE_DOC=OFF
 EGDIR=         ${PREFIX}/share/examples/awesome
 CONF_FILES=    ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua
 
+.include "../../lang/ruby/rubyversion.mk"
+BUILD_DEPENDS+=        ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
 TOOL_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
 DEPENDS+=      ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi
 

Index: pkgsrc/wm/awesome/PLIST
diff -u pkgsrc/wm/awesome/PLIST:1.11 pkgsrc/wm/awesome/PLIST:1.12
--- pkgsrc/wm/awesome/PLIST:1.11        Wed Jul 17 22:08:58 2019
+++ pkgsrc/wm/awesome/PLIST     Sat May 15 16:42:43 2021
@@ -1,6 +1,24 @@
-@comment $NetBSD: PLIST,v 1.11 2019/07/17 22:08:58 nia Exp $
+@comment $NetBSD: PLIST,v 1.12 2021/05/15 16:42:43 triaxx Exp $
 bin/awesome
 bin/awesome-client
+man/de/man1/awesome-client.1
+man/de/man1/awesome.1
+man/de/man5/awesomerc.5
+man/es/man1/awesome-client.1
+man/es/man1/awesome.1
+man/es/man5/awesomerc.5
+man/fr/man1/awesome-client.1
+man/fr/man1/awesome.1
+man/fr/man5/awesomerc.5
+man/it/man1/awesome-client.1
+man/it/man1/awesome.1
+man/it/man5/awesomerc.5
+man/man1/awesome-client.1
+man/man1/awesome.1
+man/man5/awesomerc.5
+man/ru/man1/awesome-client.1
+man/ru/man1/awesome.1
+man/ru/man5/awesomerc.5
 share/awesome/icons/awesome16.png
 share/awesome/icons/awesome32.png
 share/awesome/icons/awesome48.png

Index: pkgsrc/wm/awesome/distinfo
diff -u pkgsrc/wm/awesome/distinfo:1.21 pkgsrc/wm/awesome/distinfo:1.22
--- pkgsrc/wm/awesome/distinfo:1.21     Wed Jul 17 22:08:58 2019
+++ pkgsrc/wm/awesome/distinfo  Sat May 15 16:42:43 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.21 2019/07/17 22:08:58 nia Exp $
+$NetBSD: distinfo,v 1.22 2021/05/15 16:42:43 triaxx Exp $
 
 SHA1 (awesome-4.3.tar.xz) = 543f3b2ee17719176f37fbe3f0cfd1d046a9e1cc
 RMD160 (awesome-4.3.tar.xz) = f12f27114c96f0d80314cd54b5c6d1b21cb3ba18
 SHA512 (awesome-4.3.tar.xz) = c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
 Size (awesome-4.3.tar.xz) = 1037816 bytes
 SHA1 (patch-CMakeLists.txt) = a3473fdbea318b0cf280a9c29e77798d38d17d70
+SHA1 (patch-awesomeConfig.cmake) = b457fd84d9e33e967119b02733f6e3fa7a1df400

Added files:

Index: pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake
diff -u /dev/null pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake:1.7
--- /dev/null   Sat May 15 16:42:43 2021
+++ pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake Sat May 15 16:42:43 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-awesomeConfig.cmake,v 1.7 2021/05/15 16:42:43 triaxx Exp $
+
+If pkgtools/pkg_alternatives is not installed, the asciidoctor
+binary is suffixed by the ruby version.
+
+--- awesomeConfig.cmake.orig   2019-01-28 06:53:24.000000000 +0000
++++ awesomeConfig.cmake
+@@ -38,6 +38,9 @@ endmacro()
+ a_find_program(GIT_EXECUTABLE git FALSE)
+ # programs needed for man pages
+ a_find_program(ASCIIDOCTOR_EXECUTABLE asciidoctor FALSE)
++a_find_program(ASCIIDOCTOR_EXECUTABLE asciidoctor26 FALSE)
++a_find_program(ASCIIDOCTOR_EXECUTABLE asciidoctor27 FALSE)
++a_find_program(ASCIIDOCTOR_EXECUTABLE asciidoctor30 FALSE)
+ a_find_program(GZIP_EXECUTABLE gzip FALSE)
+ # Lua documentation
+ if(GENERATE_DOC)