Fri Aug 18 10:16:11 2017 UTC ()
Fix a wrong dependency from devel/lua-doc to textproc/LDoc.
Fix the wrong MANPATH.


(triaxx)
diff -r1.59 -r1.60 pkgsrc/wm/awesome/Makefile
diff -r1.8 -r1.9 pkgsrc/wm/awesome/PLIST
diff -r1.19 -r1.20 pkgsrc/wm/awesome/distinfo
diff -r1.1 -r1.2 pkgsrc/wm/awesome/options.mk
diff -r1.4 -r1.5 pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake
cvs diff -r1.59 -r1.60 pkgsrc/wm/awesome/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/awesome/Makefile 2017/08/15 10:57:35 1.59
+++ pkgsrc/wm/awesome/Makefile 2017/08/18 10:16:11 1.60
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.59 2017/08/15 10:57:35 triaxx Exp $ 1# $NetBSD: Makefile,v 1.60 2017/08/18 10:16:11 triaxx Exp $
2# 2#
3 3
4DISTNAME= awesome-4.2 4DISTNAME= awesome-4.2
5CATEGORIES= wm 5CATEGORIES= wm
6MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pallegra@gmail.com 9MAINTAINER= pallegra@gmail.com
10HOMEPAGE= https://awesomewm.org/ 10HOMEPAGE= https://awesomewm.org/
11COMMENT= Tiling window manager based on dwm 11COMMENT= Tiling window manager based on dwm
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14CONFLICTS+= awesome<3.0 14CONFLICTS+= awesome<3.0
@@ -16,45 +16,52 @@ CONFLICTS+= awesome<3.0 @@ -16,45 +16,52 @@ CONFLICTS+= awesome<3.0
16USE_TOOLS+= bash gmake pkg-config 16USE_TOOLS+= bash gmake pkg-config
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19REPLACE_BASH+= utils/awesome-client 19REPLACE_BASH+= utils/awesome-client
20 20
21.include "../../wm/awesome/options.mk" 21.include "../../wm/awesome/options.mk"
22 22
23PKG_SYSCONFSUBDIR= xdg/awesome 23PKG_SYSCONFSUBDIR= xdg/awesome
24 24
25CONFIGURE_DIRS= ${WRKDIR}/build 25CONFIGURE_DIRS= ${WRKDIR}/build
26CMAKE_ARG_PATH= ${WRKSRC} 26CMAKE_ARG_PATH= ${WRKSRC}
27 27
28CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q} 28CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q}
 29CMAKE_ARGS+= -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
29CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVERSION_NOREV} 30CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVERSION_NOREV}
30CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR} 31CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
31 32
32EGDIR= ${PREFIX}/share/examples/awesome 33EGDIR= ${PREFIX}/share/examples/awesome
33CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua 34CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua
34 35
35SUBST_CLASSES+= eg 36SUBST_CLASSES+= eg
36SUBST_MESSAGE.eg= Fixing pathnames 37SUBST_MESSAGE.eg= Fixing pathnames
37SUBST_STAGE.eg= pre-configure 38SUBST_STAGE.eg= pre-configure
38SUBST_FILES.eg= CMakeLists.txt 39SUBST_FILES.eg= CMakeLists.txt
39SUBST_SED.eg= -e "s,\$${AWESOME_SYSCONFDIR},${EGDIR}," 40SUBST_SED.eg= -e "s,\$${AWESOME_SYSCONFDIR},${EGDIR},"
40 41
41SUBST_CLASSES+= lua 42SUBST_CLASSES+= lua
42SUBST_MESSAGE.lua= Fixing lua prefix 43SUBST_MESSAGE.lua= Fixing lua prefix
43SUBST_STAGE.lua= pre-configure 44SUBST_STAGE.lua= pre-configure
44SUBST_FILES.lua= CMakeLists.txt awesomeConfig.cmake build-utils/lgi-check.sh \ 45SUBST_FILES.lua= CMakeLists.txt awesomeConfig.cmake build-utils/lgi-check.sh \
45 tests/examples/CMakeLists.txt 46 tests/examples/CMakeLists.txt
46SUBST_SED.lua= -e "s,@LUA_INTERPRETER@,${LUA_INTERPRETER}," 47SUBST_SED.lua= -e "s,@LUA_INTERPRETER@,${LUA_INTERPRETER},"
47 48
 49SUBST_CLASSES+= ldoc
 50SUBST_MESSAGE.ldoc= Fixing ldoc executable
 51SUBST_STAGE.ldoc= pre-configure
 52SUBST_FILES.ldoc= awesomeConfig.cmake
 53SUBST_SED.ldoc= -e "s,@LDOC_EXECUTABLE@,ldoc${_LUA_DOT_VERSION},"
 54
48BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick 55BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
49BUILD_DEPENDS+= asciidoc>=8.3.0:../../textproc/asciidoc 56BUILD_DEPENDS+= asciidoc>=8.3.0:../../textproc/asciidoc
50BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 57BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
51BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml 58BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
52 59
53DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi 60DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi
54 61
55pre-configure: 62pre-configure:
56 ${RUN} mkdir -p ${WRKDIR}/build 63 ${RUN} mkdir -p ${WRKDIR}/build
57 64
58.include "../../devel/glib2/buildlink3.mk" 65.include "../../devel/glib2/buildlink3.mk"
59.include "../../devel/pango/buildlink3.mk" 66.include "../../devel/pango/buildlink3.mk"
60.include "../../graphics/cairo/buildlink3.mk" 67.include "../../graphics/cairo/buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/wm/awesome/PLIST (expand / switch to unified diff)

--- pkgsrc/wm/awesome/PLIST 2017/08/15 10:57:35 1.8
+++ pkgsrc/wm/awesome/PLIST 2017/08/18 10:16:11 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.8 2017/08/15 10:57:35 triaxx Exp $ 1@comment $NetBSD: PLIST,v 1.9 2017/08/18 10:16:11 triaxx Exp $
2bin/awesome 2bin/awesome
3bin/awesome-client 3bin/awesome-client
4share/awesome/icons/awesome16.png 4share/awesome/icons/awesome16.png
5share/awesome/icons/awesome32.png 5share/awesome/icons/awesome32.png
6share/awesome/icons/awesome48.png 6share/awesome/icons/awesome48.png
7share/awesome/icons/awesome64.png 7share/awesome/icons/awesome64.png
8share/awesome/lib/awful/autofocus.lua 8share/awesome/lib/awful/autofocus.lua
9share/awesome/lib/awful/button.lua 9share/awesome/lib/awful/button.lua
10share/awesome/lib/awful/client.lua 10share/awesome/lib/awful/client.lua
11share/awesome/lib/awful/client/focus.lua 11share/awesome/lib/awful/client/focus.lua
12share/awesome/lib/awful/client/shape.lua 12share/awesome/lib/awful/client/shape.lua
13share/awesome/lib/awful/client/urgent.lua 13share/awesome/lib/awful/client/urgent.lua
14share/awesome/lib/awful/completion.lua 14share/awesome/lib/awful/completion.lua
@@ -547,32 +547,32 @@ ${PLIST.doc}share/doc/awesome/doc/librar @@ -547,32 +547,32 @@ ${PLIST.doc}share/doc/awesome/doc/librar
547${PLIST.doc}share/doc/awesome/doc/libraries/objects.client.html 547${PLIST.doc}share/doc/awesome/doc/libraries/objects.client.html
548${PLIST.doc}share/doc/awesome/doc/libraries/objects.drawable.html 548${PLIST.doc}share/doc/awesome/doc/libraries/objects.drawable.html
549${PLIST.doc}share/doc/awesome/doc/libraries/objects.drawin.html 549${PLIST.doc}share/doc/awesome/doc/libraries/objects.drawin.html
550${PLIST.doc}share/doc/awesome/doc/libraries/objects.key.html 550${PLIST.doc}share/doc/awesome/doc/libraries/objects.key.html
551${PLIST.doc}share/doc/awesome/doc/libraries/objects.screen.html 551${PLIST.doc}share/doc/awesome/doc/libraries/objects.screen.html
552${PLIST.doc}share/doc/awesome/doc/libraries/objects.tag.html 552${PLIST.doc}share/doc/awesome/doc/libraries/objects.tag.html
553${PLIST.doc}share/doc/awesome/doc/libraries/objects.window.html 553${PLIST.doc}share/doc/awesome/doc/libraries/objects.window.html
554${PLIST.doc}share/doc/awesome/doc/libraries/root.html 554${PLIST.doc}share/doc/awesome/doc/libraries/root.html
555${PLIST.doc}share/doc/awesome/doc/libraries/selection.html 555${PLIST.doc}share/doc/awesome/doc/libraries/selection.html
556${PLIST.doc}share/doc/awesome/doc/libraries/wibox.hierarchy.html 556${PLIST.doc}share/doc/awesome/doc/libraries/wibox.hierarchy.html
557${PLIST.doc}share/doc/awesome/doc/sample files/rc.lua.html 557${PLIST.doc}share/doc/awesome/doc/sample files/rc.lua.html
558${PLIST.doc}share/doc/awesome/doc/sample files/theme.lua.html 558${PLIST.doc}share/doc/awesome/doc/sample files/theme.lua.html
559share/examples/awesome/rc.lua 559share/examples/awesome/rc.lua
560share/man/de/man1/awesome-client.1 560man/de/man1/awesome-client.1
561share/man/de/man1/awesome.1 561man/de/man1/awesome.1
562share/man/de/man5/awesomerc.5 562man/de/man5/awesomerc.5
563share/man/es/man1/awesome-client.1 563man/es/man1/awesome-client.1
564share/man/es/man1/awesome.1 564man/es/man1/awesome.1
565share/man/es/man5/awesomerc.5 565man/es/man5/awesomerc.5
566share/man/fr/man1/awesome-client.1 566man/fr/man1/awesome-client.1
567share/man/fr/man1/awesome.1 567man/fr/man1/awesome.1
568share/man/fr/man5/awesomerc.5 568man/fr/man5/awesomerc.5
569share/man/it/man1/awesome-client.1 569man/it/man1/awesome-client.1
570share/man/it/man1/awesome.1 570man/it/man1/awesome.1
571share/man/it/man5/awesomerc.5 571man/it/man5/awesomerc.5
572share/man/man1/awesome-client.1 572man/man1/awesome-client.1
573share/man/man1/awesome.1 573man/man1/awesome.1
574share/man/man5/awesomerc.5 574man/man5/awesomerc.5
575share/man/ru/man1/awesome-client.1 575man/ru/man1/awesome-client.1
576share/man/ru/man1/awesome.1 576man/ru/man1/awesome.1
577share/man/ru/man5/awesomerc.5 577man/ru/man5/awesomerc.5
578share/xsessions/awesome.desktop 578share/xsessions/awesome.desktop
cvs diff -r1.19 -r1.20 pkgsrc/wm/awesome/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/awesome/distinfo 2017/08/15 10:57:35 1.19
+++ pkgsrc/wm/awesome/distinfo 2017/08/18 10:16:11 1.20
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.19 2017/08/15 10:57:35 triaxx Exp $ 1$NetBSD: distinfo,v 1.20 2017/08/18 10:16:11 triaxx Exp $
2 2
3SHA1 (awesome-4.2.tar.gz) = e9c6cfb55ffbd81fbf6a9842552215fa8d03fc93 3SHA1 (awesome-4.2.tar.gz) = e9c6cfb55ffbd81fbf6a9842552215fa8d03fc93
4RMD160 (awesome-4.2.tar.gz) = 582a786bed138cf094948150975bf66b206bd2d1 4RMD160 (awesome-4.2.tar.gz) = 582a786bed138cf094948150975bf66b206bd2d1
5SHA512 (awesome-4.2.tar.gz) = 4cca2edd48f2299732e009a3aeaf6a2f5c2b95f4e4b93705c13102f70dbe4ea83306430b69264315d8686ca6746f870b6b9ac3edfdf63a82623508589179a772 5SHA512 (awesome-4.2.tar.gz) = 4cca2edd48f2299732e009a3aeaf6a2f5c2b95f4e4b93705c13102f70dbe4ea83306430b69264315d8686ca6746f870b6b9ac3edfdf63a82623508589179a772
6Size (awesome-4.2.tar.gz) = 1133897 bytes 6Size (awesome-4.2.tar.gz) = 1133897 bytes
7SHA1 (patch-CMakeLists.txt) = 8fbf701c730badb73c0e5cee270a8dd4188c7b6f 7SHA1 (patch-CMakeLists.txt) = 8fbf701c730badb73c0e5cee270a8dd4188c7b6f
8SHA1 (patch-awesomeConfig.cmake) = f0ef2657fb8d87643e3e7605e20dfd74658a8bf4 8SHA1 (patch-awesomeConfig.cmake) = 363032da4186a79eee01d6ce91e404add590e99c
9SHA1 (patch-build-utils_lgi-check.sh) = 3a76c9f56871c4379b1af388bee2e137e5e5bd8d 9SHA1 (patch-build-utils_lgi-check.sh) = 3a76c9f56871c4379b1af388bee2e137e5e5bd8d
10SHA1 (patch-tests_examples_CMakeLists.txt) = d9f4a3e3d2287fd6eaca7476088bac76f5445e12 10SHA1 (patch-tests_examples_CMakeLists.txt) = d9f4a3e3d2287fd6eaca7476088bac76f5445e12
cvs diff -r1.1 -r1.2 pkgsrc/wm/awesome/options.mk (expand / switch to unified diff)

--- pkgsrc/wm/awesome/options.mk 2017/08/15 10:57:35 1.1
+++ pkgsrc/wm/awesome/options.mk 2017/08/18 10:16:11 1.2
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
 1# $NetBSD: options.mk,v 1.2 2017/08/18 10:16:11 triaxx Exp $
 2#
 3
1PKG_OPTIONS_VAR= PKG_OPTIONS.awesome 4PKG_OPTIONS_VAR= PKG_OPTIONS.awesome
2PKG_SUPPORTED_OPTIONS= dbus debug doc 5PKG_SUPPORTED_OPTIONS= dbus debug doc
3PLIST_VARS+= doc 6PLIST_VARS+= doc
4 7
5.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
6.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
7 10
8### 11###
9### DBus support 12### DBus support
10### 13###
11.if !empty(PKG_OPTIONS:Mdbus) 14.if !empty(PKG_OPTIONS:Mdbus)
12CMAKE_ARGS+= -DWITH_DBUS=ON 15CMAKE_ARGS+= -DWITH_DBUS=ON
13. include "../../sysutils/dbus/buildlink3.mk" 16. include "../../sysutils/dbus/buildlink3.mk"
@@ -17,18 +20,18 @@ CMAKE_ARGS+= -DWITH_DBUS=OFF @@ -17,18 +20,18 @@ CMAKE_ARGS+= -DWITH_DBUS=OFF
17 20
18### 21###
19### Debug support 22### Debug support
20### 23###
21.if !empty(PKG_OPTIONS:Mdebug) 24.if !empty(PKG_OPTIONS:Mdebug)
22. include "../../devel/libexecinfo/buildlink3.mk" 25. include "../../devel/libexecinfo/buildlink3.mk"
23.endif 26.endif
24 27
25### 28###
26### Doc support 29### Doc support
27### 30###
28.if !empty(PKG_OPTIONS:Mdoc) 31.if !empty(PKG_OPTIONS:Mdoc)
29CMAKE_ARGS+= -DGENERATE_DOC=ON 32CMAKE_ARGS+= -DGENERATE_DOC=ON
30BUILD_DEPENDS+= ${LUA_PKGPREFIX}-doc-[0-9]*:../../devel/lua-doc 33BUILD_DEPENDS+= ${LUA_PKGPREFIX}-LDoc-[0-9]*:../../textproc/LDoc
31PLIST.doc= yes 34PLIST.doc= yes
32.else 35.else
33CMAKE_ARGS+= -DGENERATE_DOC=OFF 36CMAKE_ARGS+= -DGENERATE_DOC=OFF
34.endif 37.endif
cvs diff -r1.4 -r1.5 pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake (expand / switch to unified diff)

--- pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake 2017/08/15 10:57:35 1.4
+++ pkgsrc/wm/awesome/patches/patch-awesomeConfig.cmake 2017/08/18 10:16:11 1.5
@@ -1,19 +1,28 @@ @@ -1,19 +1,28 @@
1$NetBSD: patch-awesomeConfig.cmake,v 1.4 2017/08/15 10:57:35 triaxx Exp $ 1$NetBSD: patch-awesomeConfig.cmake,v 1.5 2017/08/18 10:16:11 triaxx Exp $
2 2
3Use pkgsrc lua interpreter instead of builtin one. 3Use pkgsrc lua interpreter instead of builtin one.
4 4
5--- awesomeConfig.cmake.orig 2017-07-15 13:53:13.000000000 +0000 5--- awesomeConfig.cmake.orig 2017-07-15 13:53:13.000000000 +0000
6+++ awesomeConfig.cmake 6+++ awesomeConfig.cmake
 7@@ -40,7 +40,7 @@ a_find_program(XMLTO_EXECUTABLE xmlto FA
 8 a_find_program(GZIP_EXECUTABLE gzip FALSE)
 9 # Lua documentation
 10 if(GENERATE_DOC)
 11- a_find_program(LDOC_EXECUTABLE ldoc FALSE)
 12+ a_find_program(LDOC_EXECUTABLE @LDOC_EXECUTABLE@ FALSE)
 13 if(NOT LDOC_EXECUTABLE)
 14 a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
 15 endif()
7@@ -361,7 +361,7 @@ file(MAKE_DIRECTORY ${BUILD_DIR}/script_ 16@@ -361,7 +361,7 @@ file(MAKE_DIRECTORY ${BUILD_DIR}/script_
8  17
9 add_custom_command( 18 add_custom_command(
10 OUTPUT ${BUILD_DIR}/docs/06-appearance.md 19 OUTPUT ${BUILD_DIR}/docs/06-appearance.md
11- COMMAND lua ${SOURCE_DIR}/docs/06-appearance.md.lua 20- COMMAND lua ${SOURCE_DIR}/docs/06-appearance.md.lua
12+ COMMAND @LUA_INTERPRETER@ ${SOURCE_DIR}/docs/06-appearance.md.lua 21+ COMMAND @LUA_INTERPRETER@ ${SOURCE_DIR}/docs/06-appearance.md.lua
13 ${BUILD_DIR}/docs/06-appearance.md 22 ${BUILD_DIR}/docs/06-appearance.md
14 DEPENDS lgi-check 23 DEPENDS lgi-check
15 ) 24 )
16@@ -369,7 +369,7 @@ add_custom_command( 25@@ -369,7 +369,7 @@ add_custom_command(
17 add_custom_command( 26 add_custom_command(
18 OUTPUT ${BUILD_DIR}/awesomerc.lua ${BUILD_DIR}/docs/05-awesomerc.md 27 OUTPUT ${BUILD_DIR}/awesomerc.lua ${BUILD_DIR}/docs/05-awesomerc.md
19 ${BUILD_DIR}/script_files/rc.lua 28 ${BUILD_DIR}/script_files/rc.lua