diff options
author | triaxx <triaxx@pkgsrc.org> | 2021-05-15 16:42:43 +0000 |
---|---|---|
committer | triaxx <triaxx@pkgsrc.org> | 2021-05-15 16:42:43 +0000 |
commit | 58d71d819e5ac17ab433ae3bfa96f79be7c9abde (patch) | |
tree | 5625d2eb851f754e25abac2e5215a224a2b03337 | |
parent | d7ae42d91e75bceebefb3228f0903e7954dfbf91 (diff) | |
download | pkgsrc-58d71d819e5ac17ab433ae3bfa96f79be7c9abde.tar.gz |
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
-rw-r--r-- | wm/awesome/Makefile | 7 | ||||
-rw-r--r-- | wm/awesome/PLIST | 20 | ||||
-rw-r--r-- | wm/awesome/distinfo | 3 | ||||
-rw-r--r-- | wm/awesome/patches/patch-awesomeConfig.cmake | 17 |
4 files changed, 43 insertions, 4 deletions
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile index 65fa4997205..0ed733643c5 100644 --- a/wm/awesome/Makefile +++ b/wm/awesome/Makefile @@ -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 diff --git a/wm/awesome/PLIST b/wm/awesome/PLIST index 43581194283..98af32cd9a2 100644 --- a/wm/awesome/PLIST +++ b/wm/awesome/PLIST @@ -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 diff --git a/wm/awesome/distinfo b/wm/awesome/distinfo index bd95cdda3f0..bebdaa9401a 100644 --- a/wm/awesome/distinfo +++ b/wm/awesome/distinfo @@ -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 diff --git a/wm/awesome/patches/patch-awesomeConfig.cmake b/wm/awesome/patches/patch-awesomeConfig.cmake new file mode 100644 index 00000000000..fc73dcdda06 --- /dev/null +++ b/wm/awesome/patches/patch-awesomeConfig.cmake @@ -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) |