CVS commit: pkgsrc/wm/awesome

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

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Aug 18 10:16:11 UTC 2017

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

Log Message:
Fix a wrong dependency from devel/lua-doc to textproc/LDoc.
Fix the wrong MANPATH.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/wm/awesome/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/wm/awesome/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/wm/awesome/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/awesome/options.mk
cvs rdiff -u -r1.4 -r1.5 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.59 pkgsrc/wm/awesome/Makefile:1.60
--- pkgsrc/wm/awesome/Makefile:1.59     Tue Aug 15 10:57:35 2017
+++ pkgsrc/wm/awesome/Makefile  Fri Aug 18 10:16:11 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2017/08/15 10:57:35 triaxx Exp $
+# $NetBSD: Makefile,v 1.60 2017/08/18 10:16:11 triaxx Exp $
 #
 
 DISTNAME=      awesome-4.2
@@ -26,6 +26,7 @@ CONFIGURE_DIRS=       ${WRKDIR}/build
 CMAKE_ARG_PATH=        ${WRKSRC}
 
 CMAKE_ARGS+=   -DCOMPRESS_MANPAGES=${MANZ:Q}
+CMAKE_ARGS+=   -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
 CMAKE_ARGS+=   -DOVERRIDE_VERSION=${PKGVERSION_NOREV}
 CMAKE_ARGS+=   -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
 
@@ -45,6 +46,12 @@ SUBST_FILES.lua=     CMakeLists.txt awesomeC
                        tests/examples/CMakeLists.txt
 SUBST_SED.lua=         -e "s,@LUA_INTERPRETER@,${LUA_INTERPRETER},"
 
+SUBST_CLASSES+=                ldoc
+SUBST_MESSAGE.ldoc=    Fixing ldoc executable
+SUBST_STAGE.ldoc=      pre-configure
+SUBST_FILES.ldoc=      awesomeConfig.cmake
+SUBST_SED.ldoc=                -e "s,@LDOC_EXECUTABLE@,ldoc${_LUA_DOT_VERSION},"
+
 BUILD_DEPENDS+=                ImageMagick-[0-9]*:../../graphics/ImageMagick
 BUILD_DEPENDS+=                asciidoc>=8.3.0:../../textproc/asciidoc
 BUILD_DEPENDS+=                xmlto-[0-9]*:../../textproc/xmlto

Index: pkgsrc/wm/awesome/PLIST
diff -u pkgsrc/wm/awesome/PLIST:1.8 pkgsrc/wm/awesome/PLIST:1.9
--- pkgsrc/wm/awesome/PLIST:1.8 Tue Aug 15 10:57:35 2017
+++ pkgsrc/wm/awesome/PLIST     Fri Aug 18 10:16:11 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2017/08/15 10:57:35 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/08/18 10:16:11 triaxx Exp $
 bin/awesome
 bin/awesome-client
 share/awesome/icons/awesome16.png
@@ -557,22 +557,22 @@ ${PLIST.doc}share/doc/awesome/doc/librar
 ${PLIST.doc}share/doc/awesome/doc/sample files/rc.lua.html
 ${PLIST.doc}share/doc/awesome/doc/sample files/theme.lua.html
 share/examples/awesome/rc.lua
-share/man/de/man1/awesome-client.1
-share/man/de/man1/awesome.1
-share/man/de/man5/awesomerc.5
-share/man/es/man1/awesome-client.1
-share/man/es/man1/awesome.1
-share/man/es/man5/awesomerc.5
-share/man/fr/man1/awesome-client.1
-share/man/fr/man1/awesome.1
-share/man/fr/man5/awesomerc.5
-share/man/it/man1/awesome-client.1
-share/man/it/man1/awesome.1
-share/man/it/man5/awesomerc.5
-share/man/man1/awesome-client.1
-share/man/man1/awesome.1
-share/man/man5/awesomerc.5
-share/man/ru/man1/awesome-client.1
-share/man/ru/man1/awesome.1
-share/man/ru/man5/awesomerc.5
+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/xsessions/awesome.desktop

Index: pkgsrc/wm/awesome/distinfo
diff -u pkgsrc/wm/awesome/distinfo:1.19 pkgsrc/wm/awesome/distinfo:1.20
--- pkgsrc/wm/awesome/distinfo:1.19     Tue Aug 15 10:57:35 2017
+++ pkgsrc/wm/awesome/distinfo  Fri Aug 18 10:16:11 2017
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2017/08/15 10:57:35 triaxx Exp $
+$NetBSD: distinfo,v 1.20 2017/08/18 10:16:11 triaxx Exp $
 
 SHA1 (awesome-4.2.tar.gz) = e9c6cfb55ffbd81fbf6a9842552215fa8d03fc93
 RMD160 (awesome-4.2.tar.gz) = 582a786bed138cf094948150975bf66b206bd2d1
 SHA512 (awesome-4.2.tar.gz) = 4cca2edd48f2299732e009a3aeaf6a2f5c2b95f4e4b93705c13102f70dbe4ea83306430b69264315d8686ca6746f870b6b9ac3edfdf63a82623508589179a772
 Size (awesome-4.2.tar.gz) = 1133897 bytes
 SHA1 (patch-CMakeLists.txt) = 8fbf701c730badb73c0e5cee270a8dd4188c7b6f
-SHA1 (patch-awesomeConfig.cmake) = f0ef2657fb8d87643e3e7605e20dfd74658a8bf4
+SHA1 (patch-awesomeConfig.cmake) = 363032da4186a79eee01d6ce91e404add590e99c
 SHA1 (patch-build-utils_lgi-check.sh) = 3a76c9f56871c4379b1af388bee2e137e5e5bd8d
 SHA1 (patch-tests_examples_CMakeLists.txt) = d9f4a3e3d2287fd6eaca7476088bac76f5445e12

Index: pkgsrc/wm/awesome/options.mk
diff -u pkgsrc/wm/awesome/options.mk:1.1 pkgsrc/wm/awesome/options.mk:1.2
--- pkgsrc/wm/awesome/options.mk:1.1    Tue Aug 15 10:57:35 2017
+++ pkgsrc/wm/awesome/options.mk        Fri Aug 18 10:16:11 2017
@@ -1,3 +1,6 @@
+# $NetBSD: options.mk,v 1.2 2017/08/18 10:16:11 triaxx Exp $
+#
+
 PKG_OPTIONS_VAR=               PKG_OPTIONS.awesome
 PKG_SUPPORTED_OPTIONS=         dbus debug doc
 PLIST_VARS+=                   doc
@@ -27,7 +30,7 @@ CMAKE_ARGS+=  -DWITH_DBUS=OFF
 ###
 .if !empty(PKG_OPTIONS:Mdoc)
 CMAKE_ARGS+=   -DGENERATE_DOC=ON
-BUILD_DEPENDS+=        ${LUA_PKGPREFIX}-doc-[0-9]*:../../devel/lua-doc
+BUILD_DEPENDS+=        ${LUA_PKGPREFIX}-LDoc-[0-9]*:../../textproc/LDoc
 PLIST.doc=     yes
 .else
 CMAKE_ARGS+=   -DGENERATE_DOC=OFF

Index: pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake
diff -u pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake:1.4 pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake:1.5
--- pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake:1.4     Tue Aug 15 10:57:35 2017
+++ pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake Fri Aug 18 10:16:11 2017
@@ -1,9 +1,18 @@
-$NetBSD: patch-awesomeConfig.cmake,v 1.4 2017/08/15 10:57:35 triaxx Exp $
+$NetBSD: patch-awesomeConfig.cmake,v 1.5 2017/08/18 10:16:11 triaxx Exp $
 
 Use pkgsrc lua interpreter instead of builtin one.
 
 --- awesomeConfig.cmake.orig   2017-07-15 13:53:13.000000000 +0000
 +++ awesomeConfig.cmake
+@@ -40,7 +40,7 @@ a_find_program(XMLTO_EXECUTABLE xmlto FA
+ a_find_program(GZIP_EXECUTABLE gzip FALSE)
+ # Lua documentation
+ if(GENERATE_DOC)
+-    a_find_program(LDOC_EXECUTABLE ldoc FALSE)
++    a_find_program(LDOC_EXECUTABLE @LDOC_EXECUTABLE@ FALSE)
+     if(NOT LDOC_EXECUTABLE)
+         a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
+     endif()
 @@ -361,7 +361,7 @@ file(MAKE_DIRECTORY ${BUILD_DIR}/script_
  
  add_custom_command(