| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: Makefile,v 1.90 2023/12/28 18:20:02 gutteridge Exp $ | | 1 | # $NetBSD: Makefile,v 1.91 2023/12/30 01:12:40 gutteridge Exp $ |
2 | | | 2 | |
3 | DISTNAME= awesome-4.3 | | 3 | DISTNAME= awesome-4.3 |
4 | PKGREVISION= 14 | | 4 | PKGREVISION= 14 |
5 | CATEGORIES= wm lua | | 5 | CATEGORIES= wm lua |
6 | EXTRACT_SUFX= .tar.xz | | 6 | EXTRACT_SUFX= .tar.xz |
7 | MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/} | | 7 | MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/} |
8 | GITHUB_RELEASE= v${PKGVERSION_NOREV} | | 8 | GITHUB_RELEASE= v${PKGVERSION_NOREV} |
9 | | | 9 | |
10 | MAINTAINER= pallegra@gmail.com | | 10 | MAINTAINER= pallegra@gmail.com |
11 | HOMEPAGE= https://awesomewm.org/ | | 11 | HOMEPAGE= https://awesomewm.org/ |
12 | COMMENT= Window manager based on dwm, with Lua integration | | 12 | COMMENT= Window manager based on dwm, with Lua integration |
13 | LICENSE= gnu-gpl-v2 | | 13 | LICENSE= gnu-gpl-v2 |
14 | | | 14 | |
| @@ -37,26 +37,28 @@ CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVER | | | @@ -37,26 +37,28 @@ CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVER |
37 | CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR} | | 37 | CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR} |
38 | CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PKG_SYSCONFBASEDIR}/xdg | | 38 | CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PKG_SYSCONFBASEDIR}/xdg |
39 | CMAKE_ARGS+= -DGENERATE_DOC=OFF | | 39 | CMAKE_ARGS+= -DGENERATE_DOC=OFF |
40 | | | 40 | |
41 | EGDIR= ${PREFIX}/share/examples/awesome | | 41 | EGDIR= ${PREFIX}/share/examples/awesome |
42 | CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua | | 42 | CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua |
43 | | | 43 | |
44 | .include "../../lang/ruby/rubyversion.mk" | | 44 | .include "../../lang/ruby/rubyversion.mk" |
45 | TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor | | 45 | TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor |
46 | DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi | | 46 | DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi |
47 | | | 47 | |
48 | # Switched to ImageMagick6 to work around image conversion failures with | | 48 | # Switched to ImageMagick6 to work around image conversion failures with |
49 | # the convert tool provided by the most recent ImageMagick 7 releases. | | 49 | # the convert tool provided by the most recent ImageMagick 7 releases. |
| | | 50 | # NB the latest ImageMagick 6 releases (not yet in pkgsrc) also exhibit this |
| | | 51 | # changed behaviour. Needs further investigation. |
50 | TOOL_DEPENDS+= ImageMagick6-[0-9]*:../../graphics/ImageMagick6 | | 52 | TOOL_DEPENDS+= ImageMagick6-[0-9]*:../../graphics/ImageMagick6 |
51 | | | 53 | |
52 | SUBST_CLASSES+= convert | | 54 | SUBST_CLASSES+= convert |
53 | SUBST_STAGE.convert= pre-configure | | 55 | SUBST_STAGE.convert= pre-configure |
54 | SUBST_MESSAGE.convert= Fixing ImageMagick convert executable name. | | 56 | SUBST_MESSAGE.convert= Fixing ImageMagick convert executable name. |
55 | SUBST_FILES.convert+= awesomeConfig.cmake | | 57 | SUBST_FILES.convert+= awesomeConfig.cmake |
56 | SUBST_SED.convert= -e 's|CONVERT_EXECUTABLE convert|CONVERT_EXECUTABLE convert6|' | | 58 | SUBST_SED.convert= -e 's|CONVERT_EXECUTABLE convert|CONVERT_EXECUTABLE convert6|' |
57 | | | 59 | |
58 | SUBST_CLASSES+= lua | | 60 | SUBST_CLASSES+= lua |
59 | SUBST_STAGE.lua= pre-configure | | 61 | SUBST_STAGE.lua= pre-configure |
60 | SUBST_MESSAGE.lua= Fixing lua executable name. | | 62 | SUBST_MESSAGE.lua= Fixing lua executable name. |
61 | SUBST_FILES.lua+= awesomeConfig.cmake | | 63 | SUBST_FILES.lua+= awesomeConfig.cmake |
62 | SUBST_SED.lua= -e 's|COMMAND lua|COMMAND ${LUA_INTERPRETER}|g' | | 64 | SUBST_SED.lua= -e 's|COMMAND lua|COMMAND ${LUA_INTERPRETER}|g' |